X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=cf6e7b514aef8be24bff6196ac49051bb7481851;hb=fc32577766755a84ac883b4d862fab3c5e681642;hp=9d4f2e6e5afc51acbf99d7a59d9e331031a64427;hpb=4bd182605c8f1d08c83fdb09cc7ffb4d3690b50d;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 9d4f2e6e..cf6e7b51 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,5 +1,4 @@ #include "event.h" -#include "config.h" #include "openbox.h" #include "client.h" #include "frame.h" @@ -7,6 +6,8 @@ #include "prop.h" #include "dispatch.h" #include "focus.h" +#include "parse.h" +#include "engine.h" #include #include @@ -16,6 +17,43 @@ GList **focus_order = NULL; /* these lists are created when screen_startup sets the number of desktops */ Window focus_backup = None; +gboolean focus_new = TRUE; +gboolean focus_follow = FALSE; +static gboolean focus_last = TRUE; +static gboolean focus_last_on_desktop = TRUE; + +static gboolean noreorder = 0; + +static void parse_assign(char *name, ParseToken *value) +{ + if (!g_ascii_strcasecmp(name, "focusnew")) { + if (value->type != TOKEN_BOOL) + yyerror("invalid value"); + else { + focus_new = value->data.bool; + } + } else if (!g_ascii_strcasecmp(name, "followmouse")) { + if (value->type != TOKEN_BOOL) + yyerror("invalid value"); + else { + focus_follow = value->data.bool; + } + } else if (!g_ascii_strcasecmp(name, "focuslast")) { + if (value->type != TOKEN_BOOL) + yyerror("invalid value"); + else { + focus_last = value->data.bool; + } + } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) { + if (value->type != TOKEN_BOOL) + yyerror("invalid value"); + else { + focus_last_on_desktop = value->data.bool; + } + } else + yyerror("invalid option"); + parse_free_token(value); +} void focus_startup() { @@ -25,6 +63,10 @@ void focus_startup() XSetWindowAttributes attrib; focus_client = NULL; + focus_new = TRUE; + focus_follow = FALSE; + focus_last = TRUE; + focus_last_on_desktop = TRUE; attrib.override_redirect = TRUE; focus_backup = XCreateWindow(ob_display, ob_root, @@ -35,6 +77,8 @@ void focus_startup() /* start with nothing focused */ focus_set_client(NULL); + + parse_reg_section("focus", NULL, parse_assign); } void focus_shutdown() @@ -53,11 +97,20 @@ void focus_shutdown() event_lasttime); } +static void push_to_top(Client *client) +{ + guint desktop; + + desktop = client->desktop; + if (desktop == DESKTOP_ALL) desktop = screen_desktop; + focus_order[desktop] = g_list_remove(focus_order[desktop], client); + focus_order[desktop] = g_list_prepend(focus_order[desktop], client); +} + void focus_set_client(Client *client) { Window active; Client *old; - guint desktop; /* uninstall the old colormap, and install the new one */ screen_install_colormap(focus_client, FALSE); @@ -74,12 +127,10 @@ void focus_set_client(Client *client) focus_client = client; /* move to the top of the list */ - if (client != NULL) { - desktop = client->desktop; - if (desktop == DESKTOP_ALL) desktop = screen_desktop; - focus_order[desktop] = g_list_remove(focus_order[desktop], client); - focus_order[desktop] = g_list_prepend(focus_order[desktop], client); - } + if (noreorder) + --noreorder; + else if (client != NULL) + push_to_top(client); /* set the NET_ACTIVE_WINDOW hint */ active = client ? client->window : None; @@ -113,36 +164,86 @@ static gboolean focus_under_pointer() void focus_fallback(gboolean switching_desks) { - ConfigValue focus_follow; GList *it; - gboolean under = FALSE; Client *old = NULL; + old = focus_client; + + /* unfocus any focused clients.. they can be focused by Pointer events + and such, and then when I try focus them, I won't get a FocusIn event + at all for them. + */ + focus_set_client(NULL); + if (switching_desks) { /* don't skip any windows when switching desktops */ - old = focus_client; - focus_client = NULL; - } else { - if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow)) - g_assert_not_reached(); - if (focus_follow.bool) - under = focus_under_pointer(); + old = NULL; } - if (!under) { - for (it = focus_order[screen_desktop]; it != NULL; it = it->next) { - if (it->data != focus_client && client_normal(it->data)) { - /* if we're switching desktops, and we get the already focused - window, then we wont get a FocusIn for it, so just restore - the focus_client so that we know it is focused */ - if (it->data == old) { - focus_client = old; - break; - } else if (client_focus(it->data)) - break; - } + if (!(switching_desks ? focus_last_on_desktop : focus_last)) { + if (focus_follow) focus_under_pointer(); + return; + } + + for (it = focus_order[screen_desktop]; it != NULL; it = it->next) + if (it->data != old && client_normal(it->data)) + if (client_focus(it->data)) + return; + + /* nothing to focus */ + focus_set_client(NULL); +} + +void focus_cycle(gboolean forward, gboolean linear, gboolean done, + gboolean cancel) +{ + static Client *first = NULL; + static Client *t = NULL; + static GList *order = NULL; + GList *it, *start, *list; + Client *ft; + + if (cancel) { + if (first) client_focus(first); + goto done_cycle; + } else if (done) { + if (focus_client) { + push_to_top(focus_client); /* move to top of focus_order */ + stacking_raise(focus_client); } - if (it == NULL) /* nothing to focus */ - focus_set_client(NULL); + goto done_cycle; } + if (!first) first = focus_client; + + if (linear) list = client_list; + else list = focus_order[screen_desktop]; + + start = it = g_list_find(list, focus_client); + if (!start) /* switched desktops or something? */ + start = it = forward ? g_list_last(list) : g_list_first(list); + if (!start) goto done_cycle; + + do { + if (forward) { + it = it->next; + if (it == NULL) it = list; + } else { + it = it->prev; + if (it == NULL) it = g_list_last(list); + } + ft = client_focus_target(it->data); + if (ft == it->data && focus_client != ft && client_focusable(ft)) { + if (client_focus(ft)) { + noreorder++; /* avoid reordering the focus_order */ + break; + } + } + } while (it != start); + return; + +done_cycle: + t = NULL; + first = NULL; + g_list_free(order); + order = NULL; }