focus new windows

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 3100993b2747c909e865b3147e84cd9d92adc502..3ef71e92f510a82bf5d2373b8d1edb9662d63cf5 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -237,6 +237,9 @@ void client_unmanage(Client *client)
 
     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);
 
@@ -273,9 +276,9 @@ void client_unmanage(Client *client)
 
     /* unfocus the client (dispatchs the focus event) (we're out of the
      transient lists already, so being modal doesn't matter) */
-    if (client->focused)
+    if (client_focused(client))
        client_unfocus(client);
-    
+
     if (ob_state != State_Exiting) {
        /* these values should not be persisted across a window
           unmapping/mapping */
@@ -382,7 +385,6 @@ static void client_get_all(Client *self)
     self->title = self->icon_title = NULL;
     self->res_name = self->res_class = self->role = NULL;
     self->wmstate = NormalState;
-    self->focused = FALSE;
     self->transient = FALSE;
     self->transients = NULL;
     self->transient_for = NULL;
@@ -1168,7 +1170,7 @@ static Client *search_focus_tree(Client *node, Client *skip)
        Client *c = it->data;
        if (c == skip) continue; /* circular? */
        if ((ret = search_focus_tree(c, skip))) return ret;
-       if (c->focused) return c;
+       if (client_focused(c)) return c;
     }
     return NULL;
 }
@@ -1281,6 +1283,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;
 
@@ -1393,7 +1420,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 */
@@ -1404,11 +1430,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];
@@ -1420,15 +1446,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)) {
@@ -1539,17 +1565,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;
 
@@ -1875,7 +1897,10 @@ gboolean client_focus(Client *self)
            return FALSE;
        }
     }
-     
+
+    if (client_focused(self))
+        return TRUE;
+
     if (self->can_focus)
        XSetInputFocus(ob_display, self->window, RevertToNone, CurrentTime);
 
@@ -1894,7 +1919,7 @@ gboolean client_focus(Client *self)
        XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
     }
 
-    /*XSync(ob_display, FALSE); XXX Why sync? */
+    /* XSync(ob_display, FALSE); XXX Why sync? */
     return TRUE;
 }
 
@@ -1903,3 +1928,8 @@ void client_unfocus(Client *self)
     g_assert(focus_client == self);
     focus_set_client(NULL);
 }
+
+gboolean client_focused(Client *self)
+{
+    return self == focus_client;
+}