/* pick a window */
switch (e->type) {
+ case MapRequest:
+ window = e->xmap.window;
+ break;
case UnmapNotify:
window = e->xunmap.window;
break;
window = e->xconfigurerequest.window;
break;
default:
- /* XKB events */
- if (e->type == extensions_xkb_event_basep) {
+#ifdef XKB
+ if (extensions_xkb && e->type == extensions_xkb_event_basep) {
switch (((XkbAnyEvent*)&e)->xkb_type) {
case XkbBellNotify:
window = ((XkbBellNotifyEvent*)&e)->window;
default:
window = None;
}
- } else
- window = e->xany.window;
+ } else
+#endif
+ window = e->xany.window;
}
/* grab the lasttime and hack up the state */
event_lasttime = e->xproperty.time;
break;
case FocusIn:
+ if (e->xfocus.mode == NotifyGrab ||
+ !(e->xfocus.detail == NotifyNonlinearVirtual ||
+ e->xfocus.detail == NotifyNonlinear))
+ return;
+ break;
case FocusOut:
- if (e->xfocus.mode == NotifyGrab)
- /*|| e.xfocus.mode == NotifyUngrab ||*/
-
- /* From Metacity, from WindowMaker, ignore all funky pointer
- root events. Its commented out cuz I don't think we need this
- at all. If problems arise we can look into it */
- /*e.xfocus.detail > NotifyNonlinearVirtual) */
- return; /* skip me! */
- if (e->type == FocusOut) {
- /* FocusOut events just make us look for FocusIn events. They
- are mostly ignored otherwise. */
- XEvent fi;
- if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
+ if (e->xfocus.mode == NotifyGrab ||
+ !(e->xfocus.detail == NotifyNonlinearVirtual ||
+ e->xfocus.detail == NotifyNonlinear))
+ return;
+
+ /* FocusOut events just make us look for FocusIn events. They
+ are mostly ignored otherwise. */
+ {
+ XEvent fi;
+ if (XCheckTypedEvent(ob_display, FocusIn, &fi)) {
event_process(&fi);
- /* dont unfocus the window we just focused! */
- if (fi.xfocus.window == e->xfocus.window)
- return;
- }
- }
+
+ if (fi.xfocus.window == e->xfocus.window)
+ return;
+ }
+ }
break;
case EnterNotify:
case LeaveNotify:
event_lasttime = e->xcrossing.time;
- /* XXX this caused problems before... but i don't remember why. hah.
- so back it is. if problems arise again, then try filtering on the
- detail instead of the mode. */
- if (e->xcrossing.mode != NotifyNormal) return;
+ /* NotifyUngrab occurs when a mouse button is released and the event is
+ caused, like when lowering a window */
+ if (e->xcrossing.mode == NotifyGrab) return;
break;
}
- client = g_hash_table_lookup(client_map, (gpointer)window);
+ client = g_hash_table_lookup(client_map, &window);
/* deal with it in the kernel */
- if (client) {
+ if (client)
event_handle_client(client, e);
- } else if (window == ob_root)
+ else if (window == ob_root)
event_handle_root(e);
+ else if (e->type == MapRequest)
+ client_manage(window);
else if (e->type == ConfigureRequest) {
/* unhandled configure requests must be used to configure the
window directly */
xwc.sibling = e->xconfigurerequest.above;
xwc.stack_mode = e->xconfigurerequest.detail;
- g_message("Proxying configure event for 0x%lx", window);
-
/* we are not to be held responsible if someone sends us an
invalid request! */
xerror_set_ignore(TRUE);
Atom msgtype;
switch(e->type) {
- case MapRequest:
- g_message("MapRequest on root");
- client_manage(e->xmap.window);
- break;
case ClientMessage:
if (e->xclient.format != 32) break;
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;
switch (e->type) {
case FocusIn:
- client_set_focused(client, TRUE);
- break;
case FocusOut:
- client_set_focused(client, FALSE);
+ client_set_focused(client, e->type == FocusIn);
break;
case ConfigureRequest:
- g_message("ConfigureRequest for window %lx", client->window);
/* compress these */
while (XCheckTypedWindowEvent(ob_display, client->window,
ConfigureRequest, &ce)) {
+ ++i;
/* XXX if this causes bad things.. we can compress config req's
with the same mask. */
e->xconfigurerequest.value_mask |=
if (ce.xconfigurerequest.value_mask & CWStackMode)
e->xconfigurerequest.detail = ce.xconfigurerequest.detail;
}
+ if (i) g_message("Compressed %d Configures", i);
/* if we are iconic (or shaded (fvwm does this)) ignore the event */
if (client->iconic || client->shaded) return;
client->ignore_unmaps--;
break;
}
- g_message("UnmapNotify for %lx", client->window);
client_unmanage(client);
break;
case DestroyNotify:
- g_message("DestroyNotify for %lx", client->window);
client_unmanage(client);
break;
case ReparentNotify:
client_unmanage(client);
break;
case MapRequest:
- /* we shouldn't be able to get this unless we're iconic */
- g_assert(client->iconic);
-
+ if (!client->iconic) break; /* this normally doesn't happen, but if it
+ does, we don't want it! */
if (screen_showing_desktop)
screen_show_desktop(FALSE);
client_iconify(client, FALSE, TRUE);
}
e->xclient = ce.xclient;
}
- client_set_desktop(client, e->xclient.data.l[0]);
+ 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 */
- g_message("net_wm_state %s %ld %ld for 0x%lx\n",
+ g_message("net_wm_state %s %ld %ld for 0x%lx",
(e->xclient.data.l[0] == 0 ? "Remove" :
e->xclient.data.l[0] == 1 ? "Add" :
e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"),
client_set_state(client, e->xclient.data.l[0],
e->xclient.data.l[1], e->xclient.data.l[2]);
} else if (msgtype == prop_atoms.net_close_window) {
- g_message("net_close_window for 0x%lx\n", client->window);
+ g_message("net_close_window for 0x%lx", client->window);
client_close(client);
} else if (msgtype == prop_atoms.net_active_window) {
- g_message("net_active_window for 0x%lx\n", client->window);
+ g_message("net_active_window for 0x%lx", client->window);
if (screen_showing_desktop)
screen_show_desktop(FALSE);
if (client->iconic)
client_update_icons(client);
else if (msgtype == prop_atoms.kwm_win_icon)
client_update_kwm_icon(client);
+ default:
+ ;
+#ifdef SHAPE
+ if (extensions_shape && e->type == extensions_shape_event_basep) {
+ client->shaped = ((XShapeEvent*)e)->shaped;
+ engine_frame_adjust_shape(client->frame);
+ }
+#endif
}
}
projects / chaz / openbox / blobdiff