X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=a2604bcfb58c10e5b6164cd0bcd9d60ae7f9b329;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=5a0d6a02f1867e6b800217a57bf62bab39fc0462;hpb=7c7868f47d42796a236c9a1813bed5fe9f0d4f41;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 5a0d6a02..a2604bcf 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,5 +1,5 @@ #include "openbox.h" -#include "slit.h" +#include "dock.h" #include "client.h" #include "xerror.h" #include "prop.h" @@ -14,18 +14,25 @@ #include "extensions.h" #include "timer.h" #include "dispatch.h" +#include "event.h" #include #include #include +#include + +#ifdef USE_LIBSN +# include +#endif + #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_dock(Dock *s, XEvent *e); +static void event_handle_dockapp(DockApp *app, XEvent *e); static void event_handle_client(Client *c, XEvent *e); static void event_handle_menu(Menu *menu, XEvent *e); @@ -51,6 +58,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]); @@ -77,18 +90,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,16 +133,24 @@ void event_loop() } XNextEvent(ob_display, &e); +#ifdef USE_LIBSN + sn_display_process_event(ob_sn_display, &e); +#endif + 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(); } } @@ -377,15 +402,32 @@ static void event_process(XEvent *e) { Window window; Client *client = NULL; - Slit *slit = NULL; - SlitApp *slitapp = NULL; + Dock *dock = NULL; + DockApp *dockapp = NULL; Menu *menu = NULL; + ObWindow *obwin = 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))) - if (!(slit = g_hash_table_lookup(slit_map, &window))) - menu = g_hash_table_lookup(menu_map, &window); + if ((obwin = g_hash_table_lookup(window_map, &window))) { + switch (obwin->type) { + case Window_Dock: + dock = WINDOW_AS_DOCK(obwin); + break; + case Window_DockApp: + dockapp = WINDOW_AS_DOCKAPP(obwin); + break; + case Window_Menu: + menu = WINDOW_AS_MENU(obwin); + break; + case Window_Client: + client = WINDOW_AS_CLIENT(obwin); + break; + case Window_Internal: + /* not to be used for events */ + g_assert_not_reached(); + break; + } + } event_set_lasttime(e); event_hack_mods(e); @@ -398,10 +440,10 @@ static void event_process(XEvent *e) return; } else if (client) event_handle_client(client, e); - else if (slitapp) - event_handle_slitapp(slitapp, e); - else if (slit) - event_handle_slit(slit, e); + else if (dockapp) + event_handle_dockapp(dockapp, e); + else if (dock) + event_handle_dock(dock, e); else if (window == ob_root) event_handle_root(e); else if (e->type == MapRequest) @@ -504,30 +546,34 @@ static void event_handle_client(Client *client, XEvent *e) 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; + /* Wheel buttons don't draw because they are an instant click, so it + is a waste of resources to go drawing it. */ + if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) { + 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: @@ -918,41 +964,75 @@ static void event_handle_menu(Menu *menu, XEvent *e) } } -static void event_handle_slit(Slit *s, XEvent *e) +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_dock(Dock *s, XEvent *e) { switch (e->type) { case ButtonPress: - stacking_raise(SLIT_AS_WINDOW(s)); + stacking_raise(DOCK_AS_WINDOW(s)); case EnterNotify: - slit_hide(s, FALSE); + dock_hide(FALSE); break; case LeaveNotify: - slit_hide(s, TRUE); + dock_hide(TRUE); break; } } -static void event_handle_slitapp(SlitApp *app, XEvent *e) +static void event_handle_dockapp(DockApp *app, XEvent *e) { switch (e->type) { case MotionNotify: - slit_app_drag(app, &e->xmotion); + dock_app_drag(app, &e->xmotion); break; case UnmapNotify: if (app->ignore_unmaps) { app->ignore_unmaps--; break; } - slit_remove(app, TRUE); + dock_remove(app, TRUE); break; case DestroyNotify: - slit_remove(app, FALSE); + dock_remove(app, FALSE); break; case ReparentNotify: - slit_remove(app, FALSE); + dock_remove(app, FALSE); break; case ConfigureNotify: - slit_app_configure(app, e->xconfigure.width, e->xconfigure.height); + dock_app_configure(app, e->xconfigure.width, e->xconfigure.height); break; } }