typo

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 732857e0886486a6b29b60267b88443f773effe7..900cb9438de372ae926eb535a50bdb08851f51e8 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -21,6 +21,10 @@
 #include <X11/Xatom.h>
 #include <glib.h>
 
+#ifdef USE_LIBSN
+#  include <libsn/sn.h>
+#endif
+
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
@@ -30,7 +34,7 @@ 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 > NotifyNonlinearVirtual)
@@ -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;
     }
@@ -428,7 +436,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,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:
@@ -883,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
@@ -898,7 +909,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;