X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=b0048e3725c158c4eac5296394f9083b735fbfef;hb=9f501638b55f023a6dff7c557f208083df74e4c9;hp=230626bf7844a616d44f675b53d49efc90545290;hpb=8367ab14e82ac23d9cf9eed6fa9d355becea154c;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 230626bf..b0048e37 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" @@ -21,14 +21,18 @@ #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); @@ -129,6 +133,10 @@ 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; } @@ -394,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); @@ -415,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) @@ -521,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: @@ -866,10 +895,9 @@ static void event_handle_client(Client *client, XEvent *e) } else if (msgtype == prop_atoms.net_wm_strut) client_update_strut(client); - else if (msgtype == prop_atoms.net_wm_icon) + else if (msgtype == prop_atoms.net_wm_icon || + msgtype == prop_atoms.kwm_win_icon) client_update_icons(client); - else if (msgtype == prop_atoms.kwm_win_icon) - client_update_kwm_icon(client); default: ; #ifdef SHAPE @@ -969,41 +997,41 @@ void fd_event_handle() g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); } -static void event_handle_slit(Slit *s, XEvent *e) +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; } }