only configure the engine if something changed

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 0088085b65241fcd9d273645ae6e330cd11026b1..4be03d9445d71668f4040175a5a39212a309b0dc 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -275,8 +275,6 @@ void event_process(XEvent *e)
        xwc.sibling = e->xconfigurerequest.above;
        xwc.stack_mode = e->xconfigurerequest.detail;
        
-       g_message("Proxying configure event for 0x%lx", window);
-       
        /* we are not to be held responsible if someone sends us an
           invalid request! */
        xerror_set_ignore(TRUE);
@@ -323,6 +321,7 @@ static void event_handle_client(Client *client, XEvent *e)
 {
     XEvent ce;
     Atom msgtype;
+        int i=0;
      
     switch (e->type) {
     case FocusIn:
@@ -330,10 +329,10 @@ static void event_handle_client(Client *client, XEvent *e)
         client_set_focused(client, e->type == FocusIn);
        break;
     case ConfigureRequest:
-       g_message("ConfigureRequest for window %lx", client->window);
        /* compress these */
        while (XCheckTypedWindowEvent(ob_display, client->window,
                                      ConfigureRequest, &ce)) {
+            ++i;
            /* XXX if this causes bad things.. we can compress config req's
               with the same mask. */
            e->xconfigurerequest.value_mask |=
@@ -352,6 +351,7 @@ static void event_handle_client(Client *client, XEvent *e)
            if (ce.xconfigurerequest.value_mask & CWStackMode)
                e->xconfigurerequest.detail = ce.xconfigurerequest.detail;
        }
+        if (i) g_message("Compressed %d Configures", i);
 
        /* if we are iconic (or shaded (fvwm does this)) ignore the event */
        if (client->iconic || client->shaded) return;
@@ -565,7 +565,7 @@ static void event_handle_client(Client *client, XEvent *e)
         ;
 #ifdef SHAPE
         if (extensions_shape && e->type == extensions_shape_event_basep) {
-            client->shaped = ((XShapeEvent*)&e)->shaped;
+            client->shaped = ((XShapeEvent*)e)->shaped;
             engine_frame_adjust_shape(client->frame);
         }
 #endif