#include "openbox.h"
#include "client.h"
+#include "config.h"
#include "xerror.h"
#include "prop.h"
#include "screen.h"
event_lasttime = e->xproperty.time;
break;
case FocusIn:
- if (e->xfocus.mode == NotifyGrab ||
- !(e->xfocus.detail == NotifyNonlinearVirtual ||
- e->xfocus.detail == NotifyNonlinear))
- return;
+ g_message("FocusIn on %lx mode %d detail %d", window,
+ e->xfocus.mode, e->xfocus.detail);
+ if (e->xfocus.detail == NotifyInferior ||
+ e->xfocus.detail == NotifyAncestor ||
+ e->xfocus.detail > NotifyNonlinearVirtual) return;
+ g_message("FocusIn on %lx", window);*/
break;
case FocusOut:
- if (e->xfocus.mode == NotifyGrab ||
- !(e->xfocus.detail == NotifyNonlinearVirtual ||
- e->xfocus.detail == NotifyNonlinear))
- return;
+ g_message("FocusOut on %lx mode %d detail %d", window,
+ e->xfocus.mode, e->xfocus.detail);
+ if (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. */
{
if (fi.xfocus.window == e->xfocus.window)
return;
- }
+ } else
+ focus_set_client(NULL);
}
break;
case EnterNotify:
caused, like when lowering a window */
if (e->xcrossing.mode == NotifyGrab) return;
break;
+ default:
+ event_lasttime = CurrentTime;
+ break;
}
client = g_hash_table_lookup(client_map, &window);
msgtype = e->xclient.message_type;
if (msgtype == prop_atoms.net_current_desktop) {
unsigned int d = e->xclient.data.l[0];
- if (d <= screen_num_desktops)
+ if (d < screen_num_desktops)
screen_set_desktop(d);
} else if (msgtype == prop_atoms.net_number_of_desktops) {
unsigned int d = e->xclient.data.l[0];
{
XEvent ce;
Atom msgtype;
- int i=0;
+ int i=0;
+ ConfigValue focus_follow;
switch (e->type) {
case FocusIn:
+ focus_set_client(client);
case FocusOut:
- client_set_focused(client, e->type == FocusIn);
+ g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"),
+ client->window);
+ /* focus state can affect the stacking layer */
+ client_calc_layer(client);
+ engine_frame_adjust_focus(client->frame);
break;
+ case EnterNotify:
+ if (ob_state == State_Starting) {
+ /* move it to the top of the focus order */
+ guint 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);
+ } else {
+ if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
+ g_assert_not_reached();
+ if (focus_follow.bool)
+ client_focus(client);
+ }
+ break;
case ConfigureRequest:
/* compress these */
while (XCheckTypedWindowEvent(ob_display, client->window,
}
e->xclient = ce.xclient;
}
- if ((unsigned)e->xclient.data.l[0] < screen_num_desktops)
+ if ((unsigned)e->xclient.data.l[0] < screen_num_desktops ||
+ (unsigned)e->xclient.data.l[0] == DESKTOP_ALL)
client_set_desktop(client, (unsigned)e->xclient.data.l[0]);
} else if (msgtype == prop_atoms.net_wm_state) {
/* can't compress these */