X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=6c4df78045c7621299b3500473fec93ad452658a;hb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;hp=9a351f73ceec24a0f4af0cb11c0ef1d078f8aad0;hpb=4e88712158d5019e09907a5f3ff4b78174712daf;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 9a351f73..6c4df780 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -14,16 +14,20 @@ #include "extensions.h" #include "timer.h" #include "dispatch.h" +#include "event.h" #include #include #include +#include + #ifdef HAVE_SYS_SELECT_H # include #endif static void event_process(XEvent *e); static void event_handle_root(XEvent *e); +static void event_handle_slit(Slit *s, XEvent *e); static void event_handle_slitapp(SlitApp *app, XEvent *e); static void event_handle_client(Client *c, XEvent *e); static void event_handle_menu(Menu *menu, XEvent *e); @@ -50,6 +54,12 @@ static const int mask_table[] = { }; static int mask_table_size; +static fd_set selset, allset; +static int max_fd, x_fd; +static GData *fd_handler_list; + +void fd_event_handle(); + void event_startup() { mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]); @@ -76,18 +86,22 @@ void event_startup() ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; } } + + FD_ZERO(&allset); + max_fd = x_fd = ConnectionNumber(ob_display); + FD_SET(x_fd, &allset); + g_datalist_init(&fd_handler_list); } void event_shutdown() { XFreeModifiermap(modmap); + g_datalist_clear(&fd_handler_list); } void event_loop() { - fd_set selset; XEvent e; - int x_fd; struct timeval *wait; gboolean had_event = FALSE; @@ -116,15 +130,19 @@ void event_loop() XNextEvent(ob_display, &e); event_process(&e); - had_event = TRUE; + 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); + selset = allset; + select(max_fd + 1, &selset, NULL, NULL, wait); + + /* handle the X events as soon as possible? */ + if (FD_ISSET(x_fd, &selset)) + return; + + fd_event_handle(); } } @@ -376,13 +394,15 @@ static void event_process(XEvent *e) { Window window; Client *client = NULL; + Slit *slit = NULL; SlitApp *slitapp = NULL; Menu *menu = NULL; window = event_get_window(e); if (!(client = g_hash_table_lookup(client_map, &window))) if (!(slitapp = g_hash_table_lookup(slit_app_map, &window))) - menu = g_hash_table_lookup(menu_map, &window); + if (!(slit = g_hash_table_lookup(slit_map, &window))) + menu = g_hash_table_lookup(menu_map, &window); event_set_lasttime(e); event_hack_mods(e); @@ -397,6 +417,8 @@ static void event_process(XEvent *e) event_handle_client(client, e); else if (slitapp) event_handle_slitapp(slitapp, e); + else if (slit) + event_handle_slit(slit, e); else if (window == ob_root) event_handle_root(e); else if (e->type == MapRequest) @@ -633,13 +655,13 @@ static void event_handle_client(Client *client, XEvent *e) switch (e->xconfigurerequest.detail) { case Below: case BottomIf: - stacking_lower(client); + stacking_lower(CLIENT_AS_WINDOW(client)); break; case Above: case TopIf: default: - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; } } @@ -684,7 +706,7 @@ static void event_handle_client(Client *client, XEvent *e) if (client->shaded) client_shade(client, FALSE); client_focus(client); - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; case ClientMessage: /* validate cuz we query stuff off the client here */ @@ -869,6 +891,11 @@ static void event_handle_menu(Menu *menu, XEvent *e) g_message("BUTTON PRESS"); if (e->xbutton.button == 3) menu_hide(menu); + else if (e->xbutton.button == 1) { + entry = menu_find_entry(menu, e->xbutton.window); + if (!entry) + stacking_raise(MENU_AS_WINDOW(menu)); + } break; case ButtonRelease: g_message("BUTTON RELEASED"); @@ -889,6 +916,7 @@ static void event_handle_menu(Menu *menu, XEvent *e) e->xbutton.y < (signed)(h+b)) { menu_entry_fire(entry); } + } break; case EnterNotify: @@ -904,13 +932,63 @@ static void event_handle_menu(Menu *menu, XEvent *e) menu_entry_render(entry); } break; - } } } +static void event_handle_slit(Slit *s, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + stacking_raise(SLIT_AS_WINDOW(s)); + case EnterNotify: + slit_hide(s, FALSE); + break; + case LeaveNotify: + slit_hide(s, TRUE); + break; + } +} + +void event_add_fd_handler(event_fd_handler *h) { + g_datalist_id_set_data(&fd_handler_list, h->fd, h); + FD_SET(h->fd, &allset); + max_fd = MAX(max_fd, h->fd); +} + +void find_max_fd_foreach(GQuark n, gpointer data, gpointer max) +{ + *((unsigned int *)max) = MAX(*((unsigned int *)max), n); +} + +void event_remove_fd(int n) +{ + int tmpmax = 0; + FD_CLR(n, &allset); + g_datalist_id_remove_data(&fd_handler_list, (GQuark)n); + g_datalist_foreach(&fd_handler_list, find_max_fd_foreach, (gpointer)&tmpmax); + max_fd = MAX(x_fd, tmpmax); +} + +void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data) +{ + if (FD_ISSET( (int)n, &selset)) { + event_fd_handler *h = (event_fd_handler *)data; + g_assert(h->fd == (int)n); + h->handler(h->fd, h->data); + } +} + +void fd_event_handle() +{ + g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); +} + static void event_handle_slitapp(SlitApp *app, XEvent *e) { switch (e->type) { + case MotionNotify: + slit_app_drag(app, &e->xmotion); + break; case UnmapNotify: if (app->ignore_unmaps) { app->ignore_unmaps--;