X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=eac0dce1ce6435cf7bc41cb53977446fc08db950;hb=fb341869b1f1d82db06b7c92cacff7db58633344;hp=0f80a58bfbd975e5b0734a7f7b64c799fe6ae046;hpb=0855269035e17a1c4702d3cae85c98f46af66191;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 0f80a58b..eac0dce1 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" @@ -24,13 +42,23 @@ ObClient *focus_cycle_target; static ObIconPopup *focus_cycle_popup; +static void focus_cycle_destructor(ObClient *c) +{ + /* end cycling if the target disappears */ + if (focus_cycle_target == c) + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); +} + void focus_startup(gboolean reconfig) { focus_cycle_popup = icon_popup_new(TRUE); - if (!reconfig) + if (!reconfig) { + client_add_destructor((GDestroyNotify) focus_cycle_destructor); + /* start with nothing focused */ focus_set_client(NULL); + } } void focus_shutdown(gboolean reconfig) @@ -40,6 +68,8 @@ void focus_shutdown(gboolean reconfig) icon_popup_free(focus_cycle_popup); if (!reconfig) { + client_remove_destructor((GDestroyNotify) focus_cycle_destructor); + for (i = 0; i < screen_num_desktops; ++i) g_list_free(focus_order[i]); g_free(focus_order); @@ -101,23 +131,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,11 +179,9 @@ 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 (!config_focus_last && config_focus_follow) + if (focus_under_pointer()) + return; if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ @@ -222,7 +237,7 @@ void focus_fallback(ObFocusFallbackType type) static void popup_cycle(ObClient *c, gboolean show) { - if (!show) { + if (!show || !config_dialog_focus) { icon_popup_hide(focus_cycle_popup); } else { Rect *a; @@ -260,6 +275,18 @@ static void popup_cycle(ObClient *c, gboolean show) } } +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) { @@ -267,7 +294,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) @@ -283,9 +310,8 @@ void focus_cycle(gboolean forward, gboolean linear, if (!focus_order[screen_desktop]) goto done_cycle; - if (!first) first = focus_order[screen_desktop]->data; - if (!focus_cycle_target) focus_cycle_target = - focus_order[screen_desktop]->data; + if (!first) first = focus_client; + if (!focus_cycle_target) focus_cycle_target = focus_client; if (linear) list = client_list; else list = focus_order[screen_desktop]; @@ -305,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); @@ -343,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) @@ -359,21 +378,33 @@ void focus_directional_cycle(ObDirection dir, if (!focus_order[screen_desktop]) goto done_cycle; - if (!first) first = focus_order[screen_desktop]->data; - if (!focus_cycle_target) focus_cycle_target = - focus_order[screen_desktop]->data; + if (!first) first = focus_client; + if (!focus_cycle_target) focus_cycle_target = focus_client; + + if (focus_cycle_target) + ft = client_find_directional(focus_cycle_target, dir); + else { + GList *it; - if ((ft = client_find_directional(focus_cycle_target, dir))) { + 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)