X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=b6126464ccb5119a1ce76e3f7cd33149e9ad05d6;hb=e0fa57d21c83bbfe87b15224f699bc24628fd89f;hp=6c4df78045c7621299b3500473fec93ad452658a;hpb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 6c4df780..b6126464 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,18 +21,23 @@ #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); +static void event_handle_menu(Menu *menu, Client *c, XEvent *e); #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \ + (e)->xfocus.detail == NotifyAncestor || \ (e)->xfocus.detail > NotifyNonlinearVirtual) #define INVALID_FOCUSOUT(e) ((e)->xfocus.mode == NotifyGrab || \ (e)->xfocus.detail == NotifyInferior || \ @@ -129,6 +134,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; } @@ -332,14 +341,33 @@ static gboolean event_ignore(XEvent *e, Client *client) g_message("found pending FocusIn"); #endif /* is the focused window getting a FocusOut/In back to - itself? */ + itself? + */ if (fe.xfocus.window == e->xfocus.window && !event_ignore(&fe, client)) { + /* + if focus_client is not set, then we can't do + this. we need the FocusIn. This happens in the + case when the set_focus_client(NULL) in the + focus_fallback function fires and then + focus_fallback picks the currently focused + window (such as on a SendToDesktop-esque action. + */ + if (focus_client) { +#ifdef DEBUG_FOCUS + g_message("focused window got an Out/In back to " + "itself IGNORED both"); +#endif + return TRUE; + } else { + event_process(&fe); #ifdef DEBUG_FOCUS - g_message("focused window got an Out/In back to " - "itself IGNORED both"); + g_message("focused window got an Out/In back to " + "itself but focus_client was null " + "IGNORED just the Out"); #endif - return TRUE; + return TRUE; + } } /* once all the FocusOut's have been dealt with, if there @@ -394,15 +422,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); @@ -411,14 +456,14 @@ static void event_process(XEvent *e) /* deal with it in the kernel */ if (menu) { - event_handle_menu(menu, e); + event_handle_menu(menu, client, 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,38 +566,44 @@ 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: #ifdef DEBUG_FOCUS g_message("FocusIn on client for %lx", client->window); #endif - focus_set_client(client); - frame_adjust_focus(client->frame, TRUE); + if (client != focus_client) { + focus_set_client(client); + frame_adjust_focus(client->frame, TRUE); + } break; case FocusOut: #ifdef DEBUG_FOCUS @@ -866,10 +917,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 @@ -881,7 +931,7 @@ static void event_handle_client(Client *client, XEvent *e) } } -static void event_handle_menu(Menu *menu, XEvent *e) +static void event_handle_menu(Menu *menu, Client *client, XEvent *e) { MenuEntry *entry; @@ -903,18 +953,20 @@ static void event_handle_menu(Menu *menu, XEvent *e) /* grab_pointer_window(FALSE, None, menu->frame);*/ - entry = menu_find_entry(menu, e->xbutton.window); - if (entry) { - int junk; - Window wjunk; - guint ujunk, b, w, h; - XGetGeometry(ob_display, e->xbutton.window, - &wjunk, &junk, &junk, &w, &h, &b, &ujunk); - if (e->xbutton.x >= (signed)-b && - e->xbutton.y >= (signed)-b && - e->xbutton.x < (signed)(w+b) && - e->xbutton.y < (signed)(h+b)) { - menu_entry_fire(entry); + if (e->xbutton.button == 1) { + entry = menu_find_entry(menu, e->xbutton.window); + if (entry) { + int junk; + Window wjunk; + guint ujunk, b, w, h; + XGetGeometry(ob_display, e->xbutton.window, + &wjunk, &junk, &junk, &w, &h, &b, &ujunk); + if (e->xbutton.x >= (signed)-b && + e->xbutton.y >= (signed)-b && + e->xbutton.x < (signed)(w+b) && + e->xbutton.y < (signed)(h+b)) { + menu_entry_fire(entry); + } } } @@ -935,20 +987,6 @@ static void event_handle_menu(Menu *menu, XEvent *e) } } -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); @@ -983,27 +1021,42 @@ void fd_event_handle() g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); } -static void event_handle_slitapp(SlitApp *app, XEvent *e) +static void event_handle_dock(Dock *s, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + stacking_raise(DOCK_AS_WINDOW(s)); + break; + case EnterNotify: + dock_hide(FALSE); + break; + case LeaveNotify: + dock_hide(TRUE); + break; + } +} + +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; } }