X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=523c7b5d057cf262181a65f38bffe2f20c71475a;hb=5f5160b40c89c28a7e86dc66c08d1788bb6b0f1d;hp=6e738d4a0642c3b5529816c0019e1f1226831ff3;hpb=0745e2ee0aa6b8e7dbab1a4124e60ccb5b4e8441;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 6e738d4a..523c7b5d 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + focus.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "debug.h" #include "event.h" #include "openbox.h" @@ -20,32 +38,34 @@ ObClient *focus_client; GList **focus_order; /* these lists are created when screen_startup sets the number of desktops */ +ObClient *focus_cycle_target; -static ObClient *focus_cycle_target; -static Popup *focus_cycle_popup; +static ObIconPopup *focus_cycle_popup; -void focus_startup() +void focus_startup(gboolean reconfig) { + focus_cycle_popup = icon_popup_new(TRUE); - focus_cycle_popup = popup_new(TRUE); - - /* start with nothing focused */ - focus_set_client(NULL); + if (!reconfig) + /* start with nothing focused */ + focus_set_client(NULL); } -void focus_shutdown() +void focus_shutdown(gboolean reconfig) { guint i; - for (i = 0; i < screen_num_desktops; ++i) - g_list_free(focus_order[i]); - g_free(focus_order); + icon_popup_free(focus_cycle_popup); - popup_free(focus_cycle_popup); + if (!reconfig) { + for (i = 0; i < screen_num_desktops; ++i) + g_list_free(focus_order[i]); + g_free(focus_order); - /* reset focus to root */ - XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, - event_lasttime); + /* reset focus to root */ + XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, + event_lasttime); + } } static void push_to_top(ObClient *client) @@ -160,11 +180,8 @@ void focus_fallback(ObFocusFallbackType type) */ focus_set_client(NULL); - if (!(type == OB_FOCUS_FALLBACK_DESKTOP ? - config_focus_last_on_desktop : config_focus_last)) { - if (config_focus_follow) focus_under_pointer(); + if (config_focus_follow && focus_under_pointer()) return; - } if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ @@ -221,22 +238,22 @@ void focus_fallback(ObFocusFallbackType type) static void popup_cycle(ObClient *c, gboolean show) { if (!show) { - popup_hide(focus_cycle_popup); + icon_popup_hide(focus_cycle_popup); } else { Rect *a; ObClient *p = c; char *title; a = screen_physical_area_monitor(0); - popup_position(focus_cycle_popup, CenterGravity, - a->x + a->width / 2, a->y + a->height / 2); -/* popup_size(focus_cycle_popup, a->height/2, a->height/16); - popup_show(focus_cycle_popup, c->title, - client_icon(c, a->height/16, a->height/16)); + icon_popup_position(focus_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); +/* icon_popup_size(focus_cycle_popup, a->height/2, a->height/16); + icon_popup_show(focus_cycle_popup, c->title, + client_icon(c, a->height/16, a->height/16)); */ /* XXX the size and the font extents need to be related on some level */ - popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); + icon_popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); /* use the transient's parent's title/icon */ while (p->transient_for && p->transient_for != OB_TRAN_GROUP) @@ -250,13 +267,26 @@ static void popup_cycle(ObClient *c, gboolean show) (p->iconic ? p->icon_title : p->title), NULL); - popup_show(focus_cycle_popup, - (title ? title : (c->iconic ? c->icon_title : c->title)), - client_icon(p, 48, 48)); + icon_popup_show(focus_cycle_popup, + (title ? title : + (c->iconic ? c->icon_title : c->title)), + client_icon(p, 48, 48)); g_free(title); } } +static gboolean valid_focus_target(ObClient *ft) +{ + /* we don't use client_can_focus here, because that doesn't let you + focus an iconic window, but we want to be able to, so we just check + if the focus flags on the window allow it, and its on the current + desktop */ + return (ft->transients == NULL && client_normal(ft) && + ((ft->can_focus || ft->focus_notify) && + !ft->skip_taskbar && + (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))); +} + void focus_cycle(gboolean forward, gboolean linear, gboolean dialog, gboolean done, gboolean cancel) { @@ -277,6 +307,9 @@ void focus_cycle(gboolean forward, gboolean linear, goto done_cycle; } + if (!focus_order[screen_desktop]) + goto done_cycle; + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -298,14 +331,7 @@ void focus_cycle(gboolean forward, gboolean linear, } /*ft = client_focus_target(it->data);*/ ft = it->data; - /* we don't use client_can_focus here, because that doesn't let you - focus an iconic window, but we want to be able to, so we just check - if the focus flags on the window allow it, and its on the current - desktop */ - if (ft->transients == NULL && client_normal(ft) && - ((ft->can_focus || ft->focus_notify) && - !ft->skip_taskbar && - (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) { + if (valid_focus_target(ft)) { if (ft != focus_cycle_target) { /* prevents flicker */ if (focus_cycle_target) frame_adjust_focus(focus_cycle_target->frame, FALSE); @@ -336,7 +362,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; - ObClient *ft; + ObClient *ft = NULL; if (cancel) { if (focus_cycle_target) @@ -349,20 +375,36 @@ void focus_directional_cycle(ObDirection dir, goto done_cycle; } + if (!focus_order[screen_desktop]) + goto done_cycle; + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; - if ((ft = client_find_directional(focus_cycle_target, dir))) { + if (focus_cycle_target) + ft = client_find_directional(focus_cycle_target, dir); + else { + GList *it; + + for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) + if (valid_focus_target(it->data)) + ft = it->data; + } + + if (ft) { if (ft != focus_cycle_target) {/* prevents flicker */ if (focus_cycle_target) frame_adjust_focus(focus_cycle_target->frame, FALSE); focus_cycle_target = ft; frame_adjust_focus(focus_cycle_target->frame, TRUE); } - popup_cycle(ft, dialog); } - if (dialog) - return; + if (focus_cycle_target) { + popup_cycle(focus_cycle_target, dialog); + if (dialog) + return; + } + done_cycle: if (done && focus_cycle_target) @@ -422,7 +464,7 @@ static void to_top(ObClient *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; it && !((ObClient*)it->data)->iconic; it = it->next); - g_list_insert_before(focus_order[d], it, c); + focus_order[d] = g_list_insert_before(focus_order[d], it, c); } }