X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=b6126464ccb5119a1ce76e3f7cd33149e9ad05d6;hb=e0fa57d21c83bbfe87b15224f699bc24628fd89f;hp=732857e0886486a6b29b60267b88443f773effe7;hpb=b77e40e1c7710323aa59a778338d8e18b591f718;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 732857e0..b6126464 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -21,6 +21,10 @@ #include #include +#ifdef USE_LIBSN +# include +#endif + #ifdef HAVE_SYS_SELECT_H # include #endif @@ -30,9 +34,10 @@ static void event_handle_root(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"); + g_message("focused window got an Out/In back to " + "itself IGNORED both"); #endif - return TRUE; + return TRUE; + } else { + event_process(&fe); +#ifdef DEBUG_FOCUS + g_message("focused window got an Out/In back to " + "itself but focus_client was null " + "IGNORED just the Out"); +#endif + return TRUE; + } } /* once all the FocusOut's have been dealt with, if there @@ -428,7 +456,7 @@ 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); @@ -538,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 @@ -883,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 @@ -898,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; @@ -920,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); + } } } @@ -991,6 +1026,7 @@ 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;