X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=4398c97724d9469d1668fa68245328e30226a8f2;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=9d31e6bcdf42206b9aed6975fcc76898488e2f73;hpb=a6ce30cba9e5f4feeb9ce1a31735b1a6867a6912;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 9d31e6bc..4398c977 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -5,12 +5,12 @@ #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 @@ -23,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; @@ -113,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) { @@ -148,49 +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: 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; @@ -208,20 +216,23 @@ 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: #ifdef DEBUG_FOCUS g_message("FocusIn on %lx mode %d detail %d", window, @@ -240,7 +251,7 @@ void event_process(XEvent *e) event was not found. */ e->xfocus.window = None; - return; + return TRUE; } #ifdef DEBUG_FOCUS @@ -255,7 +266,7 @@ void event_process(XEvent *e) if (e->xfocus.mode == NotifyGrab || e->xfocus.detail == NotifyInferior || e->xfocus.detail == NotifyAncestor || - e->xfocus.detail > NotifyNonlinearVirtual) return; + e->xfocus.detail > NotifyNonlinearVirtual) return TRUE; #ifdef DEBUG_FOCUS g_message("FocusOut on %lx", window); @@ -280,27 +291,41 @@ void event_process(XEvent *e) 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; /* NotifyUngrab occurs when a mouse button is released and the event is caused, like when lowering a window */ if (e->xcrossing.mode == NotifyGrab || e->xcrossing.detail == NotifyInferior) - return; + 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); @@ -327,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); } @@ -368,6 +402,34 @@ 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: @@ -377,7 +439,7 @@ static void event_handle_client(Client *client, XEvent *e) #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)) { @@ -639,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; + } +}