#include "event.h"
-#include "config.h"
#include "openbox.h"
#include "client.h"
#include "frame.h"
#include "prop.h"
#include "dispatch.h"
#include "focus.h"
+#include "parse.h"
#include <X11/Xlib.h>
#include <glib.h>
sets the number of desktops */
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()
{
XSetWindowAttributes attrib;
focus_client = NULL;
+ focus_new = TRUE;
+ focus_follow = TRUE;
attrib.override_redirect = TRUE;
focus_backup = XCreateWindow(ob_display, ob_root,
/* start with nothing focused */
focus_set_client(NULL);
+
+ parse_reg_section("focus", NULL, parse_assign);
}
void focus_shutdown()
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);
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 */
- focus_client = NULL;
+ old = NULL;
} else {
- if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
- g_assert_not_reached();
- if (focus_follow.bool)
+ if (focus_follow)
under = focus_under_pointer();
}
if (!under) {
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
- if (it->data != focus_client && client_normal(it->data))
+ if (it->data != old && client_normal(it->data))
if (client_focus(it->data))
break;
if (it == NULL) /* nothing to focus */