X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=36be7456659e74719596657a1545886dd1f1258c;hb=fcdcd0fab4141d2d8bc1c156096ac5dbedbeaf61;hp=b64d3e0071e4332feeff8b3fa25e4c83e04bd5a8;hpb=e4be1f860bc579fd4a0d9dee6a6ca590030a791e;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index b64d3e00..36be7456 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "event.h" #include "openbox.h" #include "grab.h" @@ -8,7 +9,6 @@ #include "screen.h" #include "group.h" #include "prop.h" -#include "dispatch.h" #include "focus.h" #include "stacking.h" #include "popup.h" @@ -17,56 +17,37 @@ #include #include -ObClient *focus_client = NULL; -GList **focus_order = NULL; /* these lists are created when screen_startup - sets the number of desktops */ +ObClient *focus_client; +GList **focus_order; /* these lists are created when screen_startup + sets the number of desktops */ -Window focus_backup = None; +static ObClient *focus_cycle_target; +static Popup *focus_cycle_popup; -static ObClient *focus_cycle_target = NULL; -static Popup *focus_cycle_popup = NULL; - -void focus_startup() +void focus_startup(gboolean reconfig) { - /* create the window which gets focus when no clients get it. Have to - make it override-redirect so we don't try manage it, since it is - mapped. */ - XSetWindowAttributes attrib; - - focus_client = NULL; - - attrib.override_redirect = TRUE; - focus_backup = XCreateWindow(ob_display, ob_root, - -100, -100, 1, 1, 0, - CopyFromParent, InputOutput, CopyFromParent, - CWOverrideRedirect, &attrib); - XMapRaised(ob_display, focus_backup); - - /* do this *after* focus_backup is created, since it is used for - stacking */ 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); - focus_order = NULL; - popup_free(focus_cycle_popup); - focus_cycle_popup = NULL; - XDestroyWindow(ob_display, focus_backup); + 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) @@ -85,7 +66,7 @@ void focus_set_client(ObClient *client) ObClient *old; #ifdef DEBUG_FOCUS - g_message("focus_set_client 0x%lx", client ? client->window : 0); + ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0); #endif /* uninstall the old colormap, and install the new one */ @@ -94,14 +75,14 @@ void focus_set_client(ObClient *client) if (client == NULL) { /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot, + XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, event_lasttime); XSync(ob_display, FALSE); } /* in the middle of cycling..? kill it. */ if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); old = focus_client; focus_client = client; @@ -111,15 +92,11 @@ void focus_set_client(ObClient *client) push_to_top(client); /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ - if (ob_state != OB_STATE_EXITING) { + if (ob_state() != OB_STATE_EXITING) { active = client ? client->window : None; - PROP_SET32(ob_root, net_active_window, window, active); + PROP_SET32(RootWindow(ob_display, ob_screen), + net_active_window, window, active); } - - if (focus_client != NULL) - dispatch_client(Event_Client_Focus, focus_client, 0, 0); - if (old != NULL) - dispatch_client(Event_Client_Unfocus, old, 0, 0); } static gboolean focus_under_pointer() @@ -127,7 +104,7 @@ static gboolean focus_under_pointer() int x, y; GList *it; - if (ob_pointer_pos(&x, &y)) { + 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); @@ -172,7 +149,7 @@ static gboolean focus_fallback_transient(ObClient *top, ObClient *old) return client_focus(target); } -void focus_fallback(FallbackType type) +void focus_fallback(ObFocusFallbackType type) { GList *it; ObClient *old = NULL; @@ -185,13 +162,13 @@ void focus_fallback(FallbackType type) */ focus_set_client(NULL); - if (!(type == Fallback_Desktop ? + if (!(type == OB_FOCUS_FALLBACK_DESKTOP ? config_focus_last_on_desktop : config_focus_last)) { if (config_focus_follow) focus_under_pointer(); return; } - if (type == Fallback_Unfocusing && old) { + if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ if (old->transient_for) { if (old->transient_for == OB_TRAN_GROUP) { @@ -209,6 +186,7 @@ void focus_fallback(FallbackType type) } } +#if 0 /* try for group relations */ if (old->group) { GSList *sit; @@ -223,10 +201,11 @@ void focus_fallback(FallbackType type) return; } } +#endif } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - if (type != Fallback_Unfocusing || it->data != old) + 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 @@ -259,7 +238,7 @@ static void popup_cycle(ObClient *c, gboolean show) */ /* XXX the size and the font extents need to be related on some level */ - popup_size(focus_cycle_popup, 320, 48); + 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) @@ -280,8 +259,8 @@ static void popup_cycle(ObClient *c, gboolean show) } } -ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, - gboolean cancel) +void focus_cycle(gboolean forward, gboolean linear, + gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; static ObClient *t = NULL; @@ -294,14 +273,11 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, frame_adjust_focus(focus_cycle_target->frame, FALSE); if (focus_client) frame_adjust_focus(focus_client->frame, TRUE); + focus_cycle_target = NULL; goto done_cycle; - } else if (done) { - if (focus_cycle_target) - client_activate(focus_cycle_target); + } else if (done && dialog) { goto done_cycle; } - if (!first) - grab_pointer(TRUE, None); if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -330,6 +306,7 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, 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 (ft != focus_cycle_target) { /* prevents flicker */ if (focus_cycle_target) @@ -337,12 +314,15 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, focus_cycle_target = ft; frame_adjust_focus(focus_cycle_target->frame, TRUE); } - popup_cycle(ft, config_focus_popup); - return ft; + popup_cycle(ft, dialog); + return; } } while (it != start); done_cycle: + if (done && focus_cycle_target) + client_activate(focus_cycle_target, FALSE); + t = NULL; first = NULL; focus_cycle_target = NULL; @@ -350,9 +330,52 @@ done_cycle: order = NULL; popup_cycle(ft, FALSE); - grab_pointer(FALSE, None); - return NULL; + return; +} + +void focus_directional_cycle(ObDirection dir, + gboolean dialog, gboolean done, gboolean cancel) +{ + static ObClient *first = NULL; + ObClient *ft; + + if (cancel) { + if (focus_cycle_target) + frame_adjust_focus(focus_cycle_target->frame, FALSE); + if (focus_client) + frame_adjust_focus(focus_client->frame, TRUE); + focus_cycle_target = NULL; + goto done_cycle; + } else if (done && dialog) { + 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 (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; + +done_cycle: + if (done && focus_cycle_target) + client_activate(focus_cycle_target, FALSE); + + first = NULL; + focus_cycle_target = NULL; + + popup_cycle(ft, FALSE); + + return; } void focus_order_add_new(ObClient *c)