X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=4ff85c5d4ae74cb2afea62196b1faedfd4518602;hb=747679b80728d7903c39cafa7f0c1756c59a48ea;hp=b676c1279956e42ac87b3d015d82c19fec74f8b6;hpb=cbbf90a718ecc6836ef7a77b9040aebb9da348b8;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index b676c127..4ff85c5d 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -6,6 +6,7 @@ #include "prop.h" #include "dispatch.h" #include "focus.h" +#include "parse.h" #include #include @@ -17,6 +18,26 @@ GList **focus_order = NULL; /* these lists are created when screen_startup Window focus_backup = None; gboolean focus_new = TRUE; gboolean focus_follow = TRUE; +int focus_ignore_in = 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 + yyerror("invalid option"); + parse_free_token(value); +} void focus_startup() { @@ -38,6 +59,8 @@ void focus_startup() /* start with nothing focused */ focus_set_client(NULL); + + parse_reg_section("focus", NULL, parse_assign); } void focus_shutdown() @@ -77,7 +100,10 @@ void focus_set_client(Client *client) focus_client = client; /* move to the top of the list */ - if (client != NULL) { + if (focus_ignore_in) { + g_assert(focus_ignore_in > 0); + --focus_ignore_in; + } else if (client != NULL) { desktop = client->desktop; if (desktop == DESKTOP_ALL) desktop = screen_desktop; focus_order[desktop] = g_list_remove(focus_order[desktop], client);