X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=17ab20ef40915d974991698043ec7c07bab191f6;hb=ebab4adb85ed6cbe8f651e828791deb2a9f4154b;hp=6a805478bef673b1889a0ee148834bd69182fa48;hpb=6cb4d8bca80cd5338ad03ae02a1b754a4fba41c9;p=chaz%2Fopenbox diff --git a/plugins/focus.c b/plugins/focus.c index 6a805478..17ab20ef 100644 --- a/plugins/focus.c +++ b/plugins/focus.c @@ -5,13 +5,33 @@ #include "../kernel/focus.h" #include "../kernel/stacking.h" #include "../kernel/openbox.h" +#include "../kernel/config.h" -/* config options */ -static gboolean follow_mouse = TRUE; -static gboolean warp_on_desk_switch = TRUE; -static gboolean focus_new = FALSE; +void plugin_setup_config() +{ + ConfigValue val; + + config_def_set(config_def_new("focus.followMouse", Config_Bool, + "Focus Follows Mouse", + "Focus windows when the mouse pointer " + "enters them.")); + val.bool = TRUE; + config_set("focus.followMouse", Config_Bool, val); + config_def_set(config_def_new("focus.focusNew", Config_Bool, + "Focus New Windows", + "Focus windows when they first appear.")); + val.bool = TRUE; + config_set("focus.focusNew", Config_Bool, val); +/* + config_def_set(config_def_new("focus.warpOnDeskSwitch", Config_Bool, + "Warp Pointer On Desktop Switch", + "Warps the pointer to the focused window " + "when switching desktops.")); + config_set("focus.warpOnDeskSwitch", Config_Bool, FALSE); +*/ +} -static int skip_enter = 0; +/*static int skip_enter = 0;*/ static gboolean focus_under_pointer() { @@ -29,13 +49,35 @@ static gboolean focus_under_pointer() break; } if (it != NULL) { - client_focus(it->data); - return TRUE; + return client_normal(it->data) && client_focus(it->data); } } return FALSE; } +static void chew_enter_events() +{ + XEvent e; + + /* 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; + } +*/ +} + static void focus_fallback(gboolean switching_desks) { GList *it; @@ -43,25 +85,11 @@ static void focus_fallback(gboolean switching_desks) 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; - /* 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) { + chew_enter_events(); + + if (FALSE /*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, @@ -74,19 +102,39 @@ static void focus_fallback(gboolean switching_desks) } } -static void events(ObEvent *e, void *foo) +static void focus_desktop() +{ + GList *it; + + for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + Client *client = it->data; + if (client->type == Type_Desktop && client->frame->visible) + if (client_focus(client)) + break; + } + chew_enter_events(); +} + +static void event(ObEvent *e, void *foo) { + ConfigValue follow_mouse, focus_new; + + if (!config_get("focus.followMouse", Config_Bool, &follow_mouse)) + g_assert_not_reached(); + switch (e->type) { case Event_Client_Mapped: - if (focus_new && client_normal(e->data.c.client)) + if (!config_get("focus.focusNew", Config_Bool, &focus_new)) + g_assert_not_reached(); + if (focus_new.bool && client_normal(e->data.c.client)) client_focus(e->data.c.client); break; case Event_Client_Unmapped: if (ob_state == State_Exiting) break; - if (e->data.c.client->focused) - if (!follow_mouse || !focus_under_pointer()) + if (client_focused(e->data.c.client)) + if (!follow_mouse.bool || !focus_under_pointer()) focus_fallback(FALSE); break; @@ -94,25 +142,33 @@ static void events(ObEvent *e, void *foo) /* 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()) + if (!follow_mouse.bool || !focus_under_pointer()) focus_fallback(FALSE); case Event_Ob_Desktop: focus_fallback(TRUE); break; + case Event_Ob_ShowDesktop: + if (!e->data.o.num[0]) { /* hiding the desktop, showing the clients */ + if (!follow_mouse.bool || !focus_under_pointer()) + focus_fallback(TRUE); + } else /* hiding clients, showing the desktop */ + focus_desktop(); + break; + case Event_X_EnterNotify: - if (skip_enter) { +/* 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)) { - g_message("enter %lx", e->data.x.client->window); - client_focus(e->data.x.client); - } + else*/ + if (follow_mouse.bool) + if (e->data.x.client != NULL && client_normal(e->data.x.client)) + client_focus(e->data.x.client); break; default: @@ -125,11 +181,12 @@ void plugin_startup() dispatch_register(Event_Client_Mapped | Event_Ob_Desktop | Event_Client_Unmapped | - Event_X_EnterNotify, - (EventHandler)events, NULL); + Event_X_EnterNotify | + Event_Ob_ShowDesktop, + (EventHandler)event, NULL); } void plugin_shutdown() { - dispatch_register(0, (EventHandler)events, NULL); + dispatch_register(0, (EventHandler)event, NULL); }