X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=a15e1b165b6e5a8b9190c0fba50fca768ea3483a;hb=02045b14d62bca513bd81d11ca1ae8623edda105;hp=f330e527546c685a297363a03e898acad878772f;hpb=59f318e897a301a40fb46fadbc4b825ccf86c0ba;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index f330e527..a15e1b16 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,33 +17,16 @@ #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 = NULL; -static Popup *focus_cycle_popup = NULL; +static ObClient *focus_cycle_target; +static Popup *focus_cycle_popup; void focus_startup() { - /* 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 */ @@ -57,12 +40,8 @@ void focus_shutdown() 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); /* reset focus to root */ XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, @@ -85,7 +64,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 +73,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 +90,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 +102,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); @@ -209,6 +184,7 @@ void focus_fallback(ObFocusFallbackType type) } } +#if 0 /* try for group relations */ if (old->group) { GSList *sit; @@ -223,6 +199,7 @@ void focus_fallback(ObFocusFallbackType type) return; } } +#endif } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) @@ -259,7 +236,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 +257,8 @@ static void popup_cycle(ObClient *c, gboolean show) } } -ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, - gboolean cancel) +ObClient *focus_cycle(gboolean forward, gboolean linear, + gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; static ObClient *t = NULL; @@ -297,11 +274,9 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, goto done_cycle; } else if (done) { if (focus_cycle_target) - client_activate(focus_cycle_target); + client_activate(focus_cycle_target, FALSE); 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 +305,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,7 +313,7 @@ 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); + popup_cycle(ft, dialog); return ft; } } while (it != start); @@ -350,7 +326,6 @@ done_cycle: order = NULL; popup_cycle(ft, FALSE); - grab_pointer(FALSE, None); return NULL; }