X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=4398c97724d9469d1668fa68245328e30226a8f2;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=72ba4d1abe8f019b8ab28dc51a3f904afd857da9;hpb=d1913d1d015efae0687f3703ca846f1ace42ded2;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 72ba4d1a..4398c977 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -2,14 +2,15 @@ #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 "stacking.h" #include "extensions.h" #include "timer.h" -#include "engine.h" #include "dispatch.h" #include @@ -22,6 +23,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; @@ -112,13 +114,9 @@ void event_loop() 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,55 +145,60 @@ void event_process(XEvent *e) #endif window = e->xany.window; } - - client = g_hash_table_lookup(client_map, &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: - if (ob_state != State_Running) return; - 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: - if (ob_state != State_Running) return; - 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: - if (ob_state != State_Running) return; - 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; @@ -213,25 +216,28 @@ void event_process(XEvent *e) } break; case MotionNotify: - if (ob_state != State_Running) return; - - 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: +#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 @@ -245,20 +251,26 @@ void event_process(XEvent *e) event was not found. */ e->xfocus.window = None; - return; + 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 == NotifyInferior || e->xfocus.detail == NotifyAncestor || - e->xfocus.detail > NotifyNonlinearVirtual) return; - - g_message("FocusOut on %lx", window); + 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. */ { @@ -277,27 +289,43 @@ void event_process(XEvent *e) /* 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(FALSE); + focus_fallback(Fallback_NoFocus); if (fi.xfocus.window == e->xfocus.window) - return; + return TRUE; } else - focus_fallback(FALSE); + 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; + if (e->xcrossing.mode == NotifyGrab || + e->xcrossing.detail == NotifyInferior) + return TRUE; break; - default: - event_lasttime = CurrentTime; - break; } + return FALSE; +} + +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); + else if (client) event_handle_client(client, e); else if (window == ob_root) event_handle_root(e); @@ -324,6 +352,15 @@ void event_process(XEvent *e) xerror_set_ignore(FALSE); } + /* 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); } @@ -365,14 +402,44 @@ static void event_handle_client(Client *client, XEvent *e) 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: +#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); - engine_frame_adjust_focus(client->frame); + frame_adjust_focus(client->frame); break; case EnterNotify: if (client_normal(client)) { @@ -384,8 +451,13 @@ static void event_handle_client(Client *client, XEvent *e) client); focus_order[desktop] = g_list_prepend(focus_order[desktop], client); - } else if (focus_follow) + } else if (config_focus_follow) { +#ifdef DEBUG_FOCUS + g_message("EnterNotify on %lx, focusing window", + client->window); +#endif client_focus(client); + } } break; case ConfigureRequest: @@ -411,7 +483,6 @@ static void event_handle_client(Client *client, XEvent *e) 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; @@ -496,6 +567,7 @@ 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) @@ -629,8 +701,25 @@ 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; + + switch (e->type) { + 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; + } +}