X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=6548d83e993b4c983f5ee4e26667ccb0ce6e08c2;hb=e7e2a69fd0ed5073a57ce2974892ad5cf97f7faa;hp=f6a198cca826113fc34ceb968d16ba407f7663ec;hpb=432ac0983e058133e03885171f266dc4ba07f488;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index f6a198cc..6548d83e 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -7,16 +7,17 @@ #include "engine.h" #include "focus.h" #include "stacking.h" -#include "keyboard.h" -#include "pointer.h" -#include "hooks.h" #include "extensions.h" #include "timer.h" #include "engine.h" +#include "dispatch.h" #include #include #include +#ifdef HAVE_SYS_SELECT_H +# include +#endif static void event_process(XEvent *e); static void event_handle_root(XEvent *e); @@ -24,12 +25,10 @@ static void event_handle_client(Client *c, XEvent *e); Time event_lasttime = 0; -/*! A list of all possible combinations of keyboard lock masks */ -static unsigned int mask_list[8]; /*! The value of the mask for the NumLock modifier */ -static unsigned int NumLockMask; +unsigned int NumLockMask; /*! The value of the mask for the ScrollLock modifier */ -static unsigned int ScrollLockMask; +unsigned int ScrollLockMask; /*! The key codes for the modifier keys */ static XModifierKeymap *modmap; /*! Table of the constant modifier masks */ @@ -65,15 +64,6 @@ void event_startup() ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; } } - - mask_list[0] = 0; - mask_list[1] = LockMask; - mask_list[2] = NumLockMask; - mask_list[3] = LockMask | NumLockMask; - mask_list[4] = ScrollLockMask; - mask_list[5] = ScrollLockMask | LockMask; - mask_list[6] = ScrollLockMask | NumLockMask; - mask_list[7] = ScrollLockMask | LockMask | NumLockMask; } void event_shutdown() @@ -132,6 +122,9 @@ void event_process(XEvent *e) /* pick a window */ switch (e->type) { + case MapRequest: + window = e->xmap.window; + break; case UnmapNotify: window = e->xunmap.window; break; @@ -250,17 +243,23 @@ void event_process(XEvent *e) case EnterNotify: case LeaveNotify: event_lasttime = e->xcrossing.time; - if (e->xcrossing.mode != NotifyNormal) - return; /* skip me! */ + /* 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; break; } client = g_hash_table_lookup(client_map, (gpointer)window); + g_message("EVENT: 0x%lx -> 0x%lx", window, client); - if (client) { + /* deal with it in the kernel */ + 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 */ @@ -284,45 +283,8 @@ void event_process(XEvent *e) xerror_set_ignore(FALSE); } - /* dispatch Crossing, Pointer and Key events to the hooks */ - switch(e->type) { - case EnterNotify: - if (client != NULL) engine_mouse_enter(client->frame, window); - HOOKFIRECLIENT(pointerenter, client); - break; - case LeaveNotify: - if (client != NULL) engine_mouse_leave(client->frame, window); - HOOKFIRECLIENT(pointerleave, client); - break; - case ButtonPress: - if (client != NULL) - engine_mouse_press(client->frame, window, - e->xbutton.x, e->xbutton.y); - pointer_event(e, client); - break; - case ButtonRelease: - if (client != NULL) - engine_mouse_release(client->frame, window, - e->xbutton.x, e->xbutton.y); - pointer_event(e, client); - break; - case MotionNotify: - pointer_event(e, client); - break; - case KeyPress: - case KeyRelease: - keyboard_event(&e->xkey); - break; - default: - /* XKB events */ - if (e->type == extensions_xkb_event_basep) { - switch (((XkbAnyEvent*)&e)->xkb_type) { - case XkbBellNotify: - HOOKFIRECLIENT(bell, client); - break; - } - } - } + /* dispatch the event to registered handlers */ + dispatch_x(e, client); } static void event_handle_root(XEvent *e) @@ -330,10 +292,6 @@ static void event_handle_root(XEvent *e) 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; @@ -366,23 +324,10 @@ static void event_handle_client(Client *client, XEvent *e) switch (e->type) { case FocusIn: - client->focused = TRUE; - engine_frame_adjust_focus(client->frame); - - /* focus state can affect the stacking layer */ - client_calc_layer(client); - - focus_set_client(client); + client_set_focused(client, TRUE); break; case FocusOut: - client->focused = FALSE; - engine_frame_adjust_focus(client->frame); - - /* focus state can affect the stacking layer */ - client_calc_layer(client); - - if (focus_client == client) - focus_set_client(NULL); + client_set_focused(client, FALSE); break; case ConfigureRequest: g_message("ConfigureRequest for window %lx", client->window); @@ -493,10 +438,16 @@ static void event_handle_client(Client *client, XEvent *e) client_unmanage(client); break; case MapRequest: - /* we shouldn't be able to get this unless we're iconic */ - g_assert(client->iconic); - - HOOKFIRECLIENT(requestactivate, client); + if (screen_showing_desktop) + screen_show_desktop(FALSE); + client_iconify(client, FALSE, TRUE); + if (!client->frame->visible) + /* if its not visible still, then don't mess with it */ + break; + if (client->shaded) + client_shade(client, FALSE); + client_focus(client); + stacking_raise(client); break; case ClientMessage: /* validate cuz we query stuff off the client here */ @@ -555,8 +506,11 @@ static void event_handle_client(Client *client, XEvent *e) else if (!client->frame->visible) /* if its not visible for other reasons, then don't mess with it */ - return; - HOOKFIRECLIENT(requestactivate, client); + break; + if (client->shaded) + client_shade(client, FALSE); + client_focus(client); + stacking_raise(client); } break; case PropertyNotify: