X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=8528d68c5e9676ba2ae59362a0681cb4e7a5e560;hb=c95102751953d4c2800747b0ae12601ee6f414b6;hp=c4b7738a8b82a152ca37346ff7f2b52857c273fe;hpb=917c5c93490e97a2d6d6a74cb8cd562dd5066fcf;p=chaz%2Fopenbox diff --git a/plugins/focus.c b/plugins/focus.c index c4b7738a..8528d68c 100644 --- a/plugins/focus.c +++ b/plugins/focus.c @@ -1,91 +1,118 @@ #include "../kernel/dispatch.h" #include "../kernel/screen.h" #include "../kernel/client.h" +#include "../kernel/frame.h" #include "../kernel/focus.h" #include "../kernel/stacking.h" #include "../kernel/openbox.h" -static GSList **focus_order = NULL; +/* config options */ +static gboolean follow_mouse = TRUE; +static gboolean warp_on_desk_switch = FALSE; +static gboolean focus_new = TRUE; -static void focus_fallback(guint desk, gboolean warp) +/*static int skip_enter = 0;*/ + +static gboolean focus_under_pointer() +{ + Window w; + int i, x, y; + guint u; + GList *it; + + if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) + { + for (it = stacking_list; it != NULL; it = it->next) { + Client *c = it->data; + if (c->desktop == screen_desktop && + RECT_CONTAINS(c->frame->area, x, y)) + break; + } + if (it != NULL) { + client_focus(it->data); + return TRUE; + } + } + return FALSE; +} + +static void focus_fallback(gboolean switching_desks) { - GSList *it; + GList *it; - for (it = focus_order[desk]; it != NULL; it = it->next) - if (client_focus(it->data)) { - if (warp) { /* XXX make this configurable */ + for (it = focus_order[screen_desktop]; it != NULL; it = it->next) + if (client_normal(it->data) && client_focus(it->data)) { + if (switching_desks) { + XEvent e; Client *c = it->data; - XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0, - c->area.width / 2, c->area.height / 2); + + /* XXX... not anymore + skip the next enter event from the desktop switch so focus + doesn't skip briefly to what was under the pointer */ + + /* kill all enter events from prior to the desktop switch, we + aren't interested in them if we have found our own target + to focus. + XXX this is rude to other plugins...can this be done + better? count the events in the queue? */ + while (XCheckTypedEvent(ob_display, EnterNotify, &e)); +/* XPutBackEvent(ob_display, &e); + g_message("skip"); + ++skip_enter; + }*/ + + if (warp_on_desk_switch) { + /* I have to do this warp twice! Otherwise windows dont get + Enter/Leave events when i warp on a desktop switch! */ + XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0, + c->area.width / 2, c->area.height / 2); + XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0, + c->area.width / 2, c->area.height / 2); + } } break; } } -static void events(ObEvent *e, void *foo) +static void event(ObEvent *e, void *foo) { - guint i; - guint new, old; - switch (e->type) { case Event_Client_Mapped: - /* focus new normal windows */ - if (client_normal(e->data.c.client)) + if (focus_new && client_normal(e->data.c.client)) client_focus(e->data.c.client); break; - case Event_Client_Destroy: - i = e->data.c.client->desktop; - focus_order[i] = g_slist_remove(focus_order[i], e->data.c.client); - break; + case Event_Client_Unmapped: + if (ob_state == State_Exiting) break; - case Event_Ob_NumDesktops: - new = e->data.o.num[0]; - old = e->data.o.num[1]; - /* free our lists for the desktops which have disappeared */ - for (i = new; i < old; ++i) - g_slist_free(focus_order[i]); - /* realloc the array */ - focus_order = g_renew(GSList*, focus_order, new); - /* set the new lists to be empty */ - for (i = old; i < new; ++i) - focus_order[i] = NULL; + if (client_focused(e->data.c.client)) + if (!follow_mouse || !focus_under_pointer()) + focus_fallback(FALSE); break; case Event_Client_Desktop: - old = e->data.c.num[1]; - if (old != DESKTOP_ALL) - focus_order[old] = g_slist_remove(focus_order[old], - e->data.c.client); - else - for (i = 0; i < screen_num_desktops; ++i) - focus_order[i] = g_slist_remove(focus_order[i], - e->data.c.client); - break; + /* focus the next available target if moving from the current + desktop. */ + if ((unsigned)e->data.c.num[1] == screen_desktop) + if (!follow_mouse || !focus_under_pointer()) + focus_fallback(FALSE); case Event_Ob_Desktop: - /* focus the next available target */ - focus_fallback(e->data.o.num[0], TRUE); - break; - - case Event_Client_Unfocus: - /* nothing is left with focus! */ - if (focus_client == NULL) - /* focus the next available target */ - focus_fallback(screen_desktop, FALSE); - break; - - case Event_Client_Focus: - /* move to the top of the list */ - focus_order[e->data.c.num[1]] = - g_slist_remove(focus_order[e->data.c.num[1]], e->data.c.client); - focus_order[e->data.c.num[1]] = - g_slist_prepend(focus_order[e->data.c.num[1]], e->data.c.client); + focus_fallback(TRUE); break; case Event_X_EnterNotify: - if (e->data.x.client && client_normal(e->data.x.client)) +/* if (skip_enter) { + if (e->data.x.client != NULL) + g_message("skipped enter %lx", e->data.x.client->window); + else + g_message("skipped enter 'root'"); + --skip_enter; + } + else*/ + if (e->data.x.client != NULL && client_normal(e->data.x.client)) client_focus(e->data.x.client); + break; default: g_assert_not_reached(); @@ -94,27 +121,14 @@ static void events(ObEvent *e, void *foo) void plugin_startup() { - guint i; - - dispatch_register(Event_Client_Mapped | Event_Client_Destroy | - Event_Ob_Desktop | Event_Ob_NumDesktops | - Event_Client_Focus | Event_Client_Unfocus | - Event_X_EnterNotify | - Event_Client_Desktop, - (EventHandler)events, NULL); - - focus_order = g_new(GSList*, screen_num_desktops); - for (i = 0; i < screen_num_desktops; ++i) - focus_order[i] = NULL; + dispatch_register(Event_Client_Mapped | + Event_Ob_Desktop | + Event_Client_Unmapped | + Event_X_EnterNotify, + (EventHandler)event, NULL); } void plugin_shutdown() { - guint i; - - dispatch_register(0, (EventHandler)events, NULL); - - for (i = 0; i < screen_num_desktops; ++i) - g_slist_free(focus_order[i]); - g_free(focus_order); + dispatch_register(0, (EventHandler)event, NULL); }