make things compile again. hover does not work yet.

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index ce5be14d0c276d1db03ddb3a6ce5a9f5264b65ca..4f9f61dc6022bb093b7e85d08dbefdf5a352e2a6 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -600,6 +600,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
     XEvent ce;
     Atom msgtype;
     int i=0;
+    ObFrameContext con;
      
     switch (e->type) {
     case ButtonPress:
@@ -658,6 +659,19 @@ static void event_handle_client(ObClient *client, XEvent *e)
         frame_adjust_focus(client->frame, FALSE);
        break;
     case EnterNotify:
+        switch (con) {
+        case OB_FRAME_CONTEXT_MAXIMIZE:
+        case OB_FRAME_CONTEXT_ALLDESKTOPS:
+        case OB_FRAME_CONTEXT_SHADE:
+        case OB_FRAME_CONTEXT_ICONIFY:
+        case OB_FRAME_CONTEXT_CLOSE:
+            g_message("hi");
+            frame_adjust_state(client->frame);
+            break;
+        default:
+            break;
+        }
+        con = frame_context(client, e->xcrossing.subwindow);
         if (client_normal(client)) {
             if (ob_state() == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
@@ -711,7 +725,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                                               CWX | CWY)) {
            int x, y, w, h;
            ObCorner corner;
-              
+            Rect *a;
+
            x = (e->xconfigurerequest.value_mask & CWX) ?
                e->xconfigurerequest.x : client->area.x;
            y = (e->xconfigurerequest.value_mask & CWY) ?
@@ -720,6 +735,16 @@ static void event_handle_client(ObClient *client, XEvent *e)
                e->xconfigurerequest.width : client->area.width;
            h = (e->xconfigurerequest.value_mask & CWHeight) ?
                e->xconfigurerequest.height : client->area.height;
+
+            /* dont let windows move above/left into the strut unless they are
+               bigger than the available area */
+            a = screen_area(client->desktop);
+            if (e->xconfigurerequest.value_mask & CWX &&
+                w <= a->width && x < a->x)
+                x = a->x;
+            if (e->xconfigurerequest.value_mask & CWY &&
+                h <= a->height && y < a->y)
+                y = a->y;
               
            switch (client->gravity) {
            case NorthEastGravity:
@@ -885,6 +910,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         } else if (msgtype == prop_atoms.net_moveresize_window) {
             int oldg = client->gravity;
             int tmpg, x, y, w, h;
+            Rect *a;
 
             if (e->xclient.data.l[0] & 0xff)
                 tmpg = e->xclient.data.l[0] & 0xff;
@@ -908,8 +934,26 @@ static void event_handle_client(ObClient *client, XEvent *e)
             else
                 h = client->area.y;
             client->gravity = tmpg;
+
+            /* get the frame position */
+            frame_client_gravity(client->frame, &x, &y);
+
+            /* dont let windows move above/left into the strut unless they are
+               bigger than the available area */
+            a = screen_area(client->desktop);
+            if (e->xconfigurerequest.value_mask & CWX &&
+                w <= a->width && x < a->x)
+                x = a->x;
+            if (e->xconfigurerequest.value_mask & CWY &&
+                h <= a->height && y < a->y)
+                y = a->y;
+              
+            /* go back to the client position */
+            frame_frame_gravity(client->frame, &x, &y);
+
             client_configure(client, OB_CORNER_TOPLEFT,
                              x, y, w, h, FALSE, TRUE);
+
             client->gravity = oldg;
         }
        break;