X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=c95111fbe93a00e471b3265400a0f56f6747d9be;hb=e2f3c002248193d800941500c66e7b4c69b26a10;hp=6ba125ef3ca13d259c39c0c7b2969142ddf8b9d1;hpb=c6ad57fc734417deaba6c1634f4a7f81b9001604;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 6ba125ef..c95111fb 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" @@ -22,31 +40,42 @@ GList **focus_order; /* these lists are created when screen_startup sets the number of desktops */ ObClient *focus_cycle_target; -static Popup *focus_cycle_popup; +static ObIconPopup *focus_cycle_popup; + +static void focus_cycle_destructor(ObClient *client, gpointer data) +{ + /* end cycling if the target disappears */ + if (focus_cycle_target == client) + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); +} void focus_startup(gboolean reconfig) { - focus_cycle_popup = popup_new(TRUE); + focus_cycle_popup = icon_popup_new(TRUE); + + if (!reconfig) { + client_add_destructor(focus_cycle_destructor, NULL); - if (!reconfig) /* start with nothing focused */ focus_set_client(NULL); + } } void focus_shutdown(gboolean reconfig) { guint i; - popup_free(focus_cycle_popup); + icon_popup_free(focus_cycle_popup); if (!reconfig) { + client_remove_destructor(focus_cycle_destructor); + 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); + XSetInputFocus(ob_display, PointerRoot, RevertToNone, event_lasttime); } } @@ -74,8 +103,11 @@ void focus_set_client(ObClient *client) screen_install_colormap(client, TRUE); if (client == NULL) { - /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, +#ifdef DEBUG_FOCUS + ob_debug("actively focusing NONWINDOW\n"); +#endif + /* when nothing will be focused, send focus to the backup target */ + XSetInputFocus(ob_display, screen_support_win, RevertToNone, event_lasttime); XSync(ob_display, FALSE); } @@ -101,23 +133,10 @@ void focus_set_client(ObClient *client) static gboolean focus_under_pointer() { - int x, y; - GList *it; + ObClient *c; - if (screen_pointer_pos(&x, &y)) { - for (it = stacking_list; it != NULL; it = it->next) { - if (WINDOW_IS_CLIENT(it->data)) { - ObClient *c = WINDOW_AS_CLIENT(it->data); - if (c->desktop == screen_desktop && - RECT_CONTAINS(c->frame->area, x, y)) - break; - } - } - if (it != NULL) { - g_assert(WINDOW_IS_CLIENT(it->data)); - return client_normal(it->data) && client_focus(it->data); - } - } + if ((c = client_under_pointer())) + return client_normal(c) && client_focus(c); return FALSE; } @@ -162,29 +181,43 @@ 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(); - return; - } - if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { - /* try for transient relations */ if (old->transient_for) { - if (old->transient_for == OB_TRAN_GROUP) { - for (it = focus_order[screen_desktop]; it; it = it->next) { - GSList *sit; + gboolean trans = FALSE; - for (sit = old->group->members; sit; sit = sit->next) - if (sit->data == it->data) - if (focus_fallback_transient(sit->data, old)) - return; + if (!config_focus_follow) + trans = TRUE; + else { + ObClient *c; + + if ((c = client_under_pointer()) && + client_search_transient(client_search_top_transient(c), + old)) + trans = TRUE; + } + + /* try for transient relations */ + if (trans) { + if (old->transient_for == OB_TRAN_GROUP) { + for (it = focus_order[screen_desktop]; it; it = it->next) { + GSList *sit; + + for (sit = old->group->members; sit; sit = sit->next) + if (sit->data == it->data) + if (focus_fallback_transient(sit->data, old)) + return; + } + } else { + if (focus_fallback_transient(old->transient_for, old)) + return; } - } else { - if (focus_fallback_transient(old->transient_for, old)) - return; } } + } + + if (config_focus_follow) + if (focus_under_pointer()) + return; #if 0 /* try for group relations */ @@ -202,16 +235,10 @@ void focus_fallback(ObFocusFallbackType type) } } #endif - } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old) - if (client_normal(it->data) && - /* dont fall back to 'anonymous' fullscreen windows. theres no - checks for this is in transient/group fallbacks, so they can - be fallback targets there. */ - !((ObClient*)it->data)->fullscreen && - client_can_focus(it->data)) { + if (client_normal(it->data) && client_can_focus(it->data)) { gboolean r = client_focus(it->data); assert(r); return; @@ -223,22 +250,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) @@ -252,13 +279,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 && 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) { @@ -266,7 +306,7 @@ void focus_cycle(gboolean forward, gboolean linear, static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; - ObClient *ft; + ObClient *ft = NULL; if (cancel) { if (focus_cycle_target) @@ -279,6 +319,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,16 +341,8 @@ void focus_cycle(gboolean forward, gboolean linear, it = it->prev; if (it == NULL) it = g_list_last(list); } - /*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); @@ -338,7 +373,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) @@ -351,20 +386,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)