add RECT_CONTAINS

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 0d319652dcfe4839a3a66f62e29382226aa37af6..6f4dd16a48fae1a3559ea6792eb62c3b91da3898 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -207,9 +207,6 @@ void client_manage(Window window)
 
     dispatch_client(Event_Client_Mapped, client, 0, 0);
 
-    /* grab all mouse bindings */
-    /*pointer_grab_all(client, TRUE);XXX*/
-
     /* update the list hints */
     client_set_list();
 
@@ -238,11 +235,11 @@ void client_unmanage(Client *client)
     /* we dont want events no more */
     XSelectInput(ob_display, client->window, NoEventMask);
 
-    /* ungrab any mouse bindings */
-    /*pointer_grab_all(client, FALSE);XXX*/
-     
     engine_frame_hide(client->frame);
 
+    /* dispatch the unmapped event */
+    dispatch_client(Event_Client_Unmapped, client, 0, 0);
+
     /* give the client its border back */
     client_toggle_border(client, TRUE);
 
@@ -281,7 +278,7 @@ void client_unmanage(Client *client)
      transient lists already, so being modal doesn't matter) */
     if (client->focused)
        client_unfocus(client);
-    
+
     if (ob_state != State_Exiting) {
        /* these values should not be persisted across a window
           unmapping/mapping */
@@ -1287,6 +1284,31 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 {
     gboolean moved = FALSE, resized = FALSE;
 
+    /* set the size and position if fullscreen */
+    if (self->fullscreen) {
+       x = 0;
+       y = 0;
+       w = screen_physical_size.width;
+       h = screen_physical_size.height;
+    } else {
+        /* set the size and position if maximized */
+        if (self->max_horz) {
+            x = screen_area(self->desktop)->x - self->frame->size.left;
+            w = screen_area(self->desktop)->x +
+                screen_area(self->desktop)->width;
+        }
+        if (self->max_vert) {
+            y = screen_area(self->desktop)->y;
+            h = screen_area(self->desktop)->y +
+                screen_area(self->desktop)->height -
+                self->frame->size.top - self->frame->size.bottom;
+        }
+    }
+
+    if (x == self->area.x && y == self->area.y && w == self->area.width &&
+        h == self->area.height)
+        return; /* no change */
+
     w -= self->base_size.width;
     h -= self->base_size.height;
 
@@ -1399,7 +1421,6 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 
 void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 {
-    static int saved_func, saved_decor;
     int x, y, w, h;
 
     if (!(self->functions & Func_Fullscreen) || /* can't */
@@ -1410,11 +1431,11 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 
     if (fs) {
        /* save the functions and remove them */
-       saved_func = self->functions;
+       self->pre_fs_func = self->functions;
        self->functions &= (Func_Close | Func_Fullscreen |
                            Func_Iconify);
        /* save the decorations and remove them */
-       saved_decor = self->decorations;
+       self->pre_fs_decor = self->decorations;
        self->decorations = 0;
        if (savearea) {
            long dimensions[4];
@@ -1426,15 +1447,15 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
            PROP_SET32A(self->window, openbox_premax, cardinal,
                        dimensions, 4);
        }
-       x = 0;
-       y = 0;
-       w = screen_physical_size.width;
-       h = screen_physical_size.height;
+
+        /* these are not actually used cuz client_configure will set them
+           as appropriate when the window is fullscreened */
+        x = y = w = h = 0;
     } else {
        long *dimensions;
 
-       self->functions = saved_func;
-       self->decorations = saved_decor;
+       self->functions = self->pre_fs_func;
+       self->decorations = self->pre_fs_decor;
          
        if (PROP_GET32A(self->window, openbox_premax, cardinal,
                        dimensions, 4)) {
@@ -1471,7 +1492,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
 {
     if (self->iconic == iconic) return; /* nothing to do */
 
-    g_message("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+    g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
              self->window);
 
     self->iconic = iconic;
@@ -1545,17 +1566,13 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
            PROP_SET32A(self->window, openbox_premax, cardinal,
                        dimensions, 4);
        }
-       if (dir == 0 || dir == 1) { /* horz */
-           x = screen_area(self->desktop)->x - self->frame->size.left;
-           w = screen_area(self->desktop)->x +
-               screen_area(self->desktop)->width;
-       }
-       if (dir == 0 || dir == 2) { /* vert */
-           y = screen_area(self->desktop)->y;
-           h = screen_area(self->desktop)->y +
-               screen_area(self->desktop)->height -
-               self->frame->size.top - self->frame->size.bottom;
-       }
+
+        /* pass the client's current position info. the client_configure
+           will move/size stuff as appropriate for a maximized window */
+        x = self->area.x;
+        y = self->area.y;
+        w = self->area.width;
+        h = self->area.height;
     } else {
        long *dimensions;