#include "openbox.h"
#include "client.h"
-#include "config.h"
#include "xerror.h"
#include "prop.h"
+#include "config.h"
#include "screen.h"
#include "frame.h"
-#include "engine.h"
+#include "menu.h"
+#include "framerender.h"
#include "focus.h"
+#include "moveresize.h"
#include "stacking.h"
#include "extensions.h"
#include "timer.h"
-#include "engine.h"
#include "dispatch.h"
#include <X11/Xlib.h>
static void event_process(XEvent *e);
static void event_handle_root(XEvent *e);
static void event_handle_client(Client *c, XEvent *e);
+static void event_handle_menu(Menu *menu, XEvent *e);
+
+#define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
+ (e)->xfocus.detail > NotifyNonlinearVirtual)
+#define INVALID_FOCUSOUT(e) ((e)->xfocus.mode == NotifyGrab || \
+ (e)->xfocus.detail == NotifyInferior || \
+ (e)->xfocus.detail == NotifyAncestor || \
+ (e)->xfocus.detail > NotifyNonlinearVirtual)
Time event_lasttime = 0;
XEvent e;
int x_fd;
struct timeval *wait;
+ gboolean had_event = FALSE;
while (TRUE) {
/*
XNextEvent(ob_display, &e);
event_process(&e);
+ had_event = TRUE;
+ }
+
+ if (!had_event) {
+ timer_dispatch((GTimeVal**)&wait);
+ x_fd = ConnectionNumber(ob_display);
+ FD_ZERO(&selset);
+ FD_SET(x_fd, &selset);
+ select(x_fd + 1, &selset, NULL, NULL, wait);
}
-
- timer_dispatch((GTimeVal**)&wait);
- x_fd = ConnectionNumber(ob_display);
- FD_ZERO(&selset);
- FD_SET(x_fd, &selset);
- select(x_fd + 1, &selset, NULL, NULL, wait);
}
-void event_process(XEvent *e)
+static Window event_get_window(XEvent *e)
{
- XEvent ce;
- KeyCode *kp;
Window window;
- int i, k;
- Client *client;
/* pick a window */
switch (e->type) {
case ConfigureRequest:
window = e->xconfigurerequest.window;
break;
+ case ConfigureNotify:
+ window = e->xconfigure.window;
+ break;
default:
#ifdef XKB
if (extensions_xkb && e->type == extensions_xkb_event_basep) {
#endif
window = e->xany.window;
}
-
+ return window;
+}
+
+static void event_set_lasttime(XEvent *e)
+{
/* grab the lasttime and hack up the state */
switch (e->type) {
case ButtonPress:
case ButtonRelease:
event_lasttime = e->xbutton.time;
- e->xbutton.state &= ~(LockMask | NumLockMask | ScrollLockMask);
- /* kill off the Button1Mask etc, only want the modifiers */
- e->xbutton.state &= (ControlMask | ShiftMask | Mod1Mask |
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
break;
case KeyPress:
event_lasttime = e->xkey.time;
- e->xkey.state &= ~(LockMask | NumLockMask | ScrollLockMask);
- /* kill off the Button1Mask etc, only want the modifiers */
- e->xkey.state &= (ControlMask | ShiftMask | Mod1Mask |
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
- /* add to the state the mask of the modifier being pressed, if it is
- a modifier key being pressed (this is a little ugly..) */
-/* I'm commenting this out cuz i don't want "C-Control_L" being returned. */
-/* kp = modmap->modifiermap;*/
-/* for (i = 0; i < mask_table_size; ++i) {*/
-/* for (k = 0; k < modmap->max_keypermod; ++k) {*/
-/* if (*kp == e->xkey.keycode) {*/ /* found the keycode */
- /* add the mask for it */
-/* e->xkey.state |= mask_table[i];*/
- /* cause the first loop to break; */
-/* i = mask_table_size;*/
-/* break;*/ /* get outta here! */
-/* }*/
-/* ++kp;*/
-/* }*/
-/* }*/
-
break;
case KeyRelease:
event_lasttime = e->xkey.time;
- e->xkey.state &= ~(LockMask | NumLockMask | ScrollLockMask);
- /* kill off the Button1Mask etc, only want the modifiers */
- e->xkey.state &= (ControlMask | ShiftMask | Mod1Mask |
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ break;
+ case MotionNotify:
+ event_lasttime = e->xmotion.time;
+ break;
+ case PropertyNotify:
+ event_lasttime = e->xproperty.time;
+ break;
+ case EnterNotify:
+ case LeaveNotify:
+ event_lasttime = e->xcrossing.time;
+ break;
+ default:
+ event_lasttime = CurrentTime;
+ break;
+ }
+}
+
+#define STRIP_MODS(s) \
+ s &= ~(LockMask | NumLockMask | ScrollLockMask), \
+ /* kill off the Button1Mask etc, only want the modifiers */ \
+ s &= (ControlMask | ShiftMask | Mod1Mask | \
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask) \
+
+static void event_hack_mods(XEvent *e)
+{
+ KeyCode *kp;
+ int i, k;
+
+ switch (e->type) {
+ case ButtonPress:
+ case ButtonRelease:
+ STRIP_MODS(e->xbutton.state);
+ break;
+ case KeyPress:
+ STRIP_MODS(e->xkey.state);
+ break;
+ case KeyRelease:
+ STRIP_MODS(e->xkey.state);
/* remove from the state the mask of the modifier being released, if
it is a modifier key being released (this is a little ugly..) */
kp = modmap->modifiermap;
}
break;
case MotionNotify:
- event_lasttime = e->xmotion.time;
- e->xmotion.state &= ~(LockMask | NumLockMask | ScrollLockMask);
- /* kill off the Button1Mask etc, only want the modifiers */
- e->xmotion.state &= (ControlMask | ShiftMask | Mod1Mask |
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ STRIP_MODS(e->xmotion.state);
/* compress events */
- while (XCheckTypedWindowEvent(ob_display, window, e->type, &ce)) {
- e->xmotion.x_root = ce.xmotion.x_root;
- e->xmotion.y_root = ce.xmotion.y_root;
+ {
+ XEvent ce;
+ while (XCheckTypedWindowEvent(ob_display, e->xmotion.window,
+ e->type, &ce)) {
+ e->xmotion.x_root = ce.xmotion.x_root;
+ e->xmotion.y_root = ce.xmotion.y_root;
+ }
}
break;
- case PropertyNotify:
- event_lasttime = e->xproperty.time;
- break;
+ }
+}
+
+static gboolean event_ignore(XEvent *e, Client *client)
+{
+ switch(e->type) {
case FocusIn:
- g_message("FocusIn on %lx mode %d detail %d", window,
+ /* 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 (INVALID_FOCUSIN(e) ||
+ client == NULL) {
+#ifdef DEBUG_FOCUS
+ g_message("FocusIn on %lx mode %d detail %d IGNORED", e->xfocus.window,
+ e->xfocus.mode, e->xfocus.detail);
+#endif
+ /* says a client was not found for the event (or a valid FocusIn
+ event was not found.
+ */
+ e->xfocus.window = None;
+ return TRUE;
+ }
+
+#ifdef DEBUG_FOCUS
+ g_message("FocusIn on %lx mode %d detail %d", e->xfocus.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);
+#endif
break;
case FocusOut:
- 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;
+ if (INVALID_FOCUSOUT(e)) {
+#ifdef DEBUG_FOCUS
+ g_message("FocusOut on %lx mode %d detail %d IGNORED",
+ e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
+#endif
+ return TRUE;
+ }
+
+#ifdef DEBUG_FOCUS
+ g_message("FocusOut on %lx mode %d detail %d",
+ e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
+#endif
- g_message("FocusOut on %lx", window);
- /* 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);
-
- if (fi.xfocus.window == e->xfocus.window)
- return;
- /* secret magic way of event_process telling us that no client
- was found for the FocusIn event */
- if (fi.xfocus.window == None)
- focus_fallback(FALSE);
- } else
- focus_fallback(FALSE);
+ XEvent fe;
+ gboolean fallback = TRUE;
+
+ while (TRUE) {
+ if (!XCheckTypedWindowEvent(ob_display, FocusOut,
+ e->xfocus.window,&fe))
+ if (!XCheckTypedEvent(ob_display, FocusIn, &fe))
+ break;
+ if (fe.type == FocusOut) {
+#ifdef DEBUG_FOCUS
+ g_message("found pending FocusOut");
+#endif
+ if (!INVALID_FOCUSOUT(&fe)) {
+ /* if there is a VALID FocusOut still coming, don't
+ fallback focus yet, we'll deal with it then */
+ XPutBackEvent(ob_display, &fe);
+ fallback = FALSE;
+ break;
+ }
+ } else {
+#ifdef DEBUG_FOCUS
+ g_message("found pending FocusIn");
+#endif
+ /* is the focused window getting a FocusOut/In back to
+ itself? */
+ if (fe.xfocus.window == e->xfocus.window) {
+#ifdef DEBUG_FOCUS
+ g_message("focused window got an Out/In back to "
+ "itself IGNORED both");
+#endif
+ return TRUE;
+ }
+
+ /* once all the FocusOut's have been dealt with, if there
+ is a FocusIn still left and it is valid, then use it */
+ event_process(&fe);
+ /* secret magic way of event_process telling us that no
+ client was found for the FocusIn event. ^_^ */
+ if (fe.xfocus.window != None) {
+ fallback = FALSE;
+ break;
+ }
+ }
+ }
+ if (fallback) {
+#ifdef DEBUG_FOCUS
+ g_message("no valid FocusIn and no FocusOut events found, "
+ "falling back");
+#endif
+ focus_fallback(Fallback_NoFocus);
+ }
}
break;
case EnterNotify:
case LeaveNotify:
- event_lasttime = e->xcrossing.time;
/* NotifyUngrab occurs when a mouse button is released and the event is
caused, like when lowering a window */
- if (e->xcrossing.mode == NotifyGrab) return;
+ /* NotifyVirtual occurs when ungrabbing the pointer */
+ if (e->xcrossing.mode == NotifyGrab ||
+ e->xcrossing.detail == NotifyInferior ||
+ (e->xcrossing.mode == NotifyUngrab &&
+ e->xcrossing.detail == NotifyVirtual)) {
+#ifdef DEBUG_FOCUS
+ g_message("%sNotify mode %d detail %d on %lx IGNORED",
+ (e->type == EnterNotify ? "Enter" : "Leave"),
+ e->xcrossing.mode,
+ e->xcrossing.detail, client?client->window:0);
+#endif
+ return TRUE;
+ }
+#ifdef DEBUG_FOCUS
+ g_message("%sNotify mode %d detail %d on %lx",
+ (e->type == EnterNotify ? "Enter" : "Leave"),
+ e->xcrossing.mode,
+ e->xcrossing.detail, client?client->window:0);
+#endif
break;
- default:
- event_lasttime = CurrentTime;
- break;
}
+ return FALSE;
+}
- client = g_hash_table_lookup(client_map, &window);
+static void event_process(XEvent *e)
+{
+ Window window;
+ Client *client;
+ Menu *menu = NULL;
+
+ window = event_get_window(e);
+ if (!(client = g_hash_table_lookup(client_map, &window)))
+ menu = g_hash_table_lookup(menu_map, &window);
+ event_set_lasttime(e);
+ event_hack_mods(e);
+ if (event_ignore(e, client))
+ return;
/* deal with it in the kernel */
- if (client)
+ if (menu) {
+ event_handle_menu(menu, e);
+ return;
+ } else if (client)
event_handle_client(client, e);
else if (window == ob_root)
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 */
xerror_set_ignore(FALSE);
}
+ if (moveresize_in_progress)
+ if (e->type == MotionNotify || e->type == ButtonRelease ||
+ e->type == ButtonPress ||
+ e->type == KeyPress || e->type == KeyRelease) {
+ moveresize_event(e);
+
+ return; /* no dispatch! */
+
+ }
+
+ /* user input (action-bound) events */
+ /*
+ if (e->type == ButtonPress || e->type == ButtonRelease ||
+ e->type == MotionNotify)
+ mouse_event(e, client);
+ else if (e->type == KeyPress || e->type == KeyRelease)
+ ;
+ */
+
/* dispatch the event to registered handlers */
dispatch_x(e, client);
}
else if (e->xproperty.atom == prop_atoms.net_desktop_layout)
screen_update_layout();
break;
+ case ConfigureNotify:
+#ifdef XRANDR
+ XRRUpdateConfiguration(e);
+#endif
+ if (e->xconfigure.width != screen_physical_size.width ||
+ e->xconfigure.height != screen_physical_size.height)
+ screen_resize(e->xconfigure.width, e->xconfigure.height);
+ break;
+ default:
+ ;
+#ifdef VIDMODE
+ if (extensions_vidmode && e->type == extensions_vidmode_event_basep) {
+ g_message("VIDMODE EVENT");
+ }
+#endif
}
}
XEvent ce;
Atom msgtype;
int i=0;
- ConfigValue focus_follow;
switch (e->type) {
+ case ButtonPress:
+ case ButtonRelease:
+ switch (frame_context(client, e->xbutton.window)) {
+ case Context_Maximize:
+ client->frame->max_press = (e->type == ButtonPress);
+ framerender_frame(client->frame);
+ break;
+ case Context_Close:
+ client->frame->close_press = (e->type == ButtonPress);
+ framerender_frame(client->frame);
+ break;
+ case Context_Iconify:
+ client->frame->iconify_press = (e->type == ButtonPress);
+ framerender_frame(client->frame);
+ break;
+ case Context_AllDesktops:
+ client->frame->desk_press = (e->type == ButtonPress);
+ framerender_frame(client->frame);
+ break;
+ case Context_Shade:
+ client->frame->shade_press = (e->type == ButtonPress);
+ framerender_frame(client->frame);
+ break;
+ default:
+ /* nothing changes with clicks for any other contexts */
+ break;
+ }
+ break;
case FocusIn:
+#ifdef DEBUG_FOCUS
+ g_message("FocusIn on client for %lx", client->window);
+#endif
focus_set_client(client);
+ frame_adjust_focus(client->frame, TRUE);
+ break;
case FocusOut:
- 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);
+#ifdef DEBUG_FOCUS
+ g_message("FocusOut on client for %lx", client->window);
+#endif
+ /* are we a fullscreen window or a transient of one? (checks layer)
+ if we are then we need to be iconified since we are losing focus
+ */
+ if (client->layer == Layer_Fullscreen && !client->iconic &&
+ !client_search_focus_tree_full(client))
+ /* iconify fullscreen windows when they and their transients
+ aren't focused */
+ client_iconify(client, TRUE, TRUE);
+ frame_adjust_focus(client->frame, FALSE);
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)
+ if (client_normal(client)) {
+ 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_focus_follow) {
+#ifdef DEBUG_FOCUS
+ g_message("EnterNotify on %lx, focusing window",
+ client->window);
+#endif
client_focus(client);
+ }
}
break;
case ConfigureRequest:
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_unmanage(client);
break;
case MapRequest:
+ g_message("MapRequest for 0x%lx", client->window);
if (!client->iconic) break; /* this normally doesn't happen, but if it
does, we don't want it! */
if (screen_showing_desktop)
}
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]);
+ client_set_desktop(client, (unsigned)e->xclient.data.l[0],
+ FALSE);
} else if (msgtype == prop_atoms.net_wm_state) {
/* can't compress these */
g_message("net_wm_state %s %ld %ld for 0x%lx",
client_shade(client, FALSE);
client_focus(client);
stacking_raise(client);
- }
+ } else if (msgtype == prop_atoms.net_wm_moveresize) {
+ g_message("net_wm_moveresize for 0x%lx", client->window);
+ if ((Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_topleft ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_top ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_topright ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_right ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_right ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_bottomright ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_bottom ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_bottomleft ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_left ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_move ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_size_keyboard ||
+ (Atom)e->xclient.data.l[2] ==
+ prop_atoms.net_wm_moveresize_move_keyboard) {
+
+ moveresize_start(client, e->xclient.data.l[0],
+ e->xclient.data.l[1], e->xclient.data.l[3],
+ e->xclient.data.l[2]);
+ }
+ } else if (msgtype == prop_atoms.net_moveresize_window) {
+ int oldg = client->gravity;
+ int tmpg, x, y, w, h;
+
+ if (e->xclient.data.l[0] & 0xff)
+ tmpg = e->xclient.data.l[0] & 0xff;
+ else
+ tmpg = oldg;
+
+ if (e->xclient.data.l[0] & 1 << 8)
+ x = e->xclient.data.l[1];
+ else
+ x = client->area.x;
+ if (e->xclient.data.l[0] & 1 << 9)
+ y = e->xclient.data.l[2];
+ else
+ y = client->area.y;
+ if (e->xclient.data.l[0] & 1 << 10)
+ w = e->xclient.data.l[3];
+ else
+ w = client->area.y;
+ if (e->xclient.data.l[0] & 1 << 11)
+ h = e->xclient.data.l[4];
+ else
+ h = client->area.y;
+ client->gravity = tmpg;
+ client_configure(client, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
+ client->gravity = oldg;
+ }
break;
case PropertyNotify:
/* validate cuz we query stuff off the client here */
client_setup_decor_and_functions(client);
}
else if (msgtype == prop_atoms.net_wm_name ||
- msgtype == prop_atoms.wm_name)
- client_update_title(client);
- else if (msgtype == prop_atoms.net_wm_icon_name ||
+ msgtype == prop_atoms.wm_name ||
+ msgtype == prop_atoms.net_wm_icon_name ||
msgtype == prop_atoms.wm_icon_name)
- client_update_icon_title(client);
+ client_update_title(client);
else if (msgtype == prop_atoms.wm_class)
client_update_class(client);
else if (msgtype == prop_atoms.wm_protocols) {
#ifdef SHAPE
if (extensions_shape && e->type == extensions_shape_event_basep) {
client->shaped = ((XShapeEvent*)e)->shaped;
- engine_frame_adjust_shape(client->frame);
+ frame_adjust_shape(client->frame);
}
#endif
}
}
+
+static void event_handle_menu(Menu *menu, XEvent *e)
+{
+ MenuEntry *entry;
+
+ g_message("EVENT %d", e->type);
+ switch (e->type) {
+ case ButtonPress:
+ if (e->xbutton.button == 3)
+ menu_hide(menu);
+ break;
+ case ButtonRelease:
+ if (!menu->shown) break;
+
+/* grab_pointer_window(FALSE, None, menu->frame);*/
+
+ entry = menu_find_entry(menu, e->xbutton.window);
+ if (entry) {
+ int junk;
+ Window wjunk;
+ guint ujunk, b, w, h;
+ XGetGeometry(ob_display, e->xbutton.window,
+ &wjunk, &junk, &junk, &w, &h, &b, &ujunk);
+ if (e->xbutton.x >= (signed)-b &&
+ e->xbutton.y >= (signed)-b &&
+ e->xbutton.x < (signed)(w+b) &&
+ e->xbutton.y < (signed)(h+b)) {
+ menu_entry_fire(entry);
+ }
+ }
+ break;
+ case EnterNotify:
+ case LeaveNotify:
+ g_message("enter/leave");
+ entry = menu_find_entry(menu, e->xcrossing.window);
+ if (entry) {
+ entry->hilite = e->type == EnterNotify;
+ menu_entry_render(entry);
+ }
+ break;
+ }
+}
projects / chaz / openbox / blobdiff