#include "openbox.h"
#include "client.h"
-#include "config.h"
#include "xerror.h"
#include "prop.h"
#include "screen.h"
window = e->xany.window;
}
+ client = g_hash_table_lookup(client_map, &window);
+
/* grab the lasttime and hack up the state */
switch (e->type) {
case ButtonPress:
case FocusIn:
g_message("FocusIn on %lx mode %d detail %d", window,
e->xfocus.mode, e->xfocus.detail);
+ /* NotifyAncestor is not ignored in FocusIn like it is in FocusOut
+ because of RevertToPointerRoot. If the focus ends up reverting to
+ pointer root on a workspace change, then the FocusIn event that we
+ want will be of type NotifyAncestor. This situation does not occur
+ for FocusOut, so it is safely ignored there.
+ */
if (e->xfocus.detail == NotifyInferior ||
- e->xfocus.detail == NotifyAncestor ||
- e->xfocus.detail > NotifyNonlinearVirtual) return;
- g_message("FocusIn on %lx", window);
+ e->xfocus.detail > NotifyNonlinearVirtual ||
+ client == NULL) {
+ /* says a client was not found for the event (or a valid FocusIn
+ event was not found.
+ */
+ e->xfocus.window = None;
+ return;
+ }
+
+ g_message("FocusIn on %lx", window);
break;
case FocusOut:
g_message("FocusOut on %lx mode %d detail %d", window,
e->xfocus.mode, e->xfocus.detail);
- if (e->xfocus.detail == NotifyInferior ||
+ if (e->xfocus.mode == NotifyGrab ||
+ e->xfocus.detail == NotifyInferior ||
e->xfocus.detail == NotifyAncestor ||
e->xfocus.detail > NotifyNonlinearVirtual) return;
g_message("FocusOut on %lx", window);
- /* FocusOut events just make us look for FocusIn events. They
- are mostly ignored otherwise. */
+ /* Try process a FocusIn first, and if a legit one isn't found, then
+ do the fallback shiznit. */
{
- XEvent fi;
+ XEvent fi, fo;
+ gboolean isfo = FALSE;
+
if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
event_process(&fi);
- if (fi.xfocus.window == e->xfocus.window)
- return;
+ /* when we have gotten a fi/fo pair, then see if there are any
+ more fo's coming. if there are, then don't fallback just yet
+ */
+ if ((isfo = XCheckTypedEvent(ob_display, FocusOut, &fo)))
+ XPutBackEvent(ob_display, &fo);
+
/* secret magic way of event_process telling us that no client
- was found for the FocusIn event */
- if (fi.xfocus.window == None)
+ was found for the FocusIn event. ^_^ */
+ if (!isfo && fi.xfocus.window == None)
focus_fallback(FALSE);
+ if (fi.xfocus.window == e->xfocus.window)
+ return;
} else
focus_fallback(FALSE);
}
break;
}
- client = g_hash_table_lookup(client_map, &window);
-
/* deal with it in the kernel */
if (client)
event_handle_client(client, e);
event_handle_root(e);
else if (e->type == MapRequest)
client_manage(window);
- else if (e->type == FocusIn)
- e->xfocus.window = None; /* says no client was found for the event */
else if (e->type == ConfigureRequest) {
/* unhandled configure requests must be used to configure the
window directly */
XEvent ce;
Atom msgtype;
int i=0;
- ConfigValue focus_follow;
switch (e->type) {
case FocusIn:
client);
focus_order[desktop] = g_list_prepend(focus_order[desktop],
client);
- } else {
- if (!config_get("focusFollowsMouse",Config_Bool,&focus_follow))
- g_assert_not_reached();
- if (focus_follow.bool)
- client_focus(client);
- }
+ } else if (focus_follow)
+ client_focus(client);
}
break;
case ConfigureRequest: