X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=6cc8b1f0625f78d3623a6c80f47c517e88de371d;hb=c4af950903820221bc8617de81231de32eef4f07;hp=1844e3f61bdcbe338dd5ac30cdb29ea73c0a686d;hpb=2bdc37e9200bef650867d7b9b2a251327b922629;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 1844e3f6..6cc8b1f0 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -2,14 +2,16 @@ #include "client.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 @@ -22,6 +24,7 @@ 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); Time event_lasttime = 0; @@ -77,6 +80,7 @@ void event_loop() XEvent e; int x_fd; struct timeval *wait; + gboolean had_event = FALSE; while (TRUE) { /* @@ -103,22 +107,21 @@ void event_loop() 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) { @@ -147,47 +150,60 @@ void event_process(XEvent *e) #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; @@ -205,58 +221,119 @@ void event_process(XEvent *e) } 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: - if (e->xfocus.mode == NotifyGrab || - !(e->xfocus.detail == NotifyNonlinearVirtual || - e->xfocus.detail == NotifyNonlinear)) - return; +#ifdef DEBUG_FOCUS + g_message("FocusIn on %lx mode %d detail %d", window, + e->xfocus.mode, e->xfocus.detail); +#endif + /* 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 > 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 TRUE; + } + +#ifdef DEBUG_FOCUS + g_message("FocusIn on %lx", window); +#endif break; case FocusOut: +#ifdef DEBUG_FOCUS + g_message("FocusOut on %lx mode %d detail %d", window, + e->xfocus.mode, e->xfocus.detail); +#endif 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. */ + e->xfocus.detail == NotifyInferior || + e->xfocus.detail == NotifyAncestor || + e->xfocus.detail > NotifyNonlinearVirtual) return TRUE; + +#ifdef DEBUG_FOCUS + g_message("FocusOut on %lx", window); +#endif + /* 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); + /* 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 (!isfo && fi.xfocus.window == None) + focus_fallback(Fallback_NoFocus); if (fi.xfocus.window == e->xfocus.window) - return; - } + return TRUE; + } else + focus_fallback(Fallback_NoFocus); } 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 */ + /* NotifyVirtual occurs when ungrabbing the pointer */ + if (e->xcrossing.mode == NotifyGrab || + e->xcrossing.detail == NotifyInferior || + e->xcrossing.detail == NotifyVirtual) + return TRUE; break; } + return FALSE; +} - client = g_hash_table_lookup(client_map, (gpointer)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); @@ -275,8 +352,6 @@ void event_process(XEvent *e) 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); @@ -285,6 +360,23 @@ void event_process(XEvent *e) 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); } @@ -300,7 +392,7 @@ static void event_handle_root(XEvent *e) 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]; @@ -323,17 +415,72 @@ static void event_handle_client(Client *client, XEvent *e) { XEvent ce; Atom msgtype; + int i=0; 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: + focus_set_client(client); case FocusOut: - client_set_focused(client, e->type == FocusIn); +#ifdef DEBUG_FOCUS + g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"), + client->window); +#endif + /* focus state can affect the stacking layer */ + client_calc_layer(client); + frame_adjust_focus(client->frame); break; + case EnterNotify: + 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: - 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 |= @@ -413,11 +560,9 @@ static void event_handle_client(Client *client, XEvent *e) 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: @@ -438,6 +583,9 @@ static void event_handle_client(Client *client, XEvent *e) 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) screen_show_desktop(FALSE); client_iconify(client, FALSE, TRUE); @@ -483,7 +631,10 @@ static void event_handle_client(Client *client, XEvent *e) } 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], + FALSE); } else if (msgtype == prop_atoms.net_wm_state) { /* can't compress these */ g_message("net_wm_state %s %ld %ld for 0x%lx", @@ -511,7 +662,70 @@ static void event_handle_client(Client *client, XEvent *e) 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) { + + g_message("client %lx x %d y %d button %d corner %d", + client, e->xclient.data.l[0], + e->xclient.data.l[1], e->xclient.data.l[3], + e->xclient.data.l[2]); + 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 */ @@ -566,8 +780,50 @@ static void event_handle_client(Client *client, XEvent *e) #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; + } +}