split out edge detecting code a bit so it is easy to add the dock area and do that too

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index cd66014b89a271a8bbb2dc1ff089618b56415fc0..c3a17fbdddc9649929144946f534b7e377488d1d 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1219,7 +1219,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                                        it can happen now when the window is on
                                        another desktop, but we still don't
                                        want it! */
-        client_activate(client, FALSE, TRUE);
+        client_activate(client, FALSE, TRUE, TRUE, TRUE);
         break;
     case ClientMessage:
         /* validate cuz we query stuff off the client here */
@@ -1297,7 +1297,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 ob_debug_type(OB_DEBUG_APP_BUGS,
                               "_NET_ACTIVE_WINDOW message for window %s is "
                               "missing source indication\n");
-            client_activate(client, FALSE,
+            client_activate(client, FALSE, TRUE, TRUE,
                             (e->xclient.data.l[0] == 0 ||
                              e->xclient.data.l[0] == 2));
         } else if (msgtype == prop_atoms.net_wm_moveresize) {
@@ -1529,7 +1529,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 #ifdef SHAPE
         if (extensions_shape && e->type == extensions_shape_event_basep) {
             client->shaped = ((XShapeEvent*)e)->shaped;
-            frame_adjust_area(client->frame, FALSE, TRUE, FALSE);
+            frame_adjust_shape(client->frame);
         }
 #endif
     }