X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=84cd01c02273c9be0f16a1d9f2314265da240426;hb=2aa0a6b01ba718217e2b10107abbcd4236ba5a8f;hp=2974083aacda8279daab9547af2a49cfe011c7dc;hpb=e9f6255b187e9f9283a3d3e3533a6995a77749e3;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 2974083a..84cd01c0 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -78,7 +78,8 @@ static void client_get_colormap(ObClient *self);
 static void client_change_allowed_actions(ObClient *self);
 static void client_change_state(ObClient *self);
 static void client_change_wm_state(ObClient *self);
-static void client_apply_startup_state(ObClient *self);
+static void client_apply_startup_state(ObClient *self,
+                                       gint x, gint y, gint w, gint h);
 static void client_restore_session_state(ObClient *self);
 static gboolean client_restore_session_stacking(ObClient *self);
 static ObAppSettings *client_get_settings_state(ObClient *self);
@@ -240,7 +241,8 @@ void client_manage(Window window)
     XWMHints *wmhint;
     gboolean activate = FALSE;
     ObAppSettings *settings;
-    gint placex, placey;
+    gint placex, placey, placew, placeh;
+    gboolean transient = FALSE;
 
     grab_server(TRUE);
 
@@ -321,7 +323,7 @@ void client_manage(Window window)
     client_restore_session_state(self);
 
     /* now we have all of the window's information so we can set this up */
-    client_setup_decor_and_functions(self);
+    client_setup_decor_and_functions(self, FALSE);
 
     {
         Time t = sn_app_started(self->startup_id, self->class);
@@ -359,23 +361,22 @@ void client_manage(Window window)
     /* adjust the frame to the client's size before showing or placing
        the window */
     frame_adjust_area(self->frame, FALSE, TRUE, FALSE);
-    frame_adjust_client_area(self->frame);
 
     /* where the frame was placed is where the window was originally */
     placex = self->area.x;
     placey = self->area.y;
+    placew = self->area.width;
+    placeh = self->area.height;
 
     /* figure out placement for the window if the window is new */
     if (ob_state() == OB_STATE_RUNNING) {
-        gboolean transient;
-
         ob_debug("Positioned: %s @ %d %d\n",
                  (!self->positioned ? "no" :
                   (self->positioned == PPosition ? "program specified" :
                    (self->positioned == USPosition ? "user specified" :
                     (self->positioned == (PPosition | USPosition) ?
                      "program + user specified" :
-                     "BADNESS !?")))), self->area.x, self->area.y);
+                     "BADNESS !?")))), placex, placey);
 
         ob_debug("Sized: %s @ %d %d\n",
                  (!self->sized ? "no" :
@@ -383,39 +384,12 @@ void client_manage(Window window)
                    (self->sized == USSize ? "user specified" :
                     (self->sized == (PSize | USSize) ?
                      "program + user specified" :
-                     "BADNESS !?")))), self->area.width, self->area.height);
+                     "BADNESS !?")))), placew, placeh);
 
         transient = place_client(self, &placex, &placey, settings);
 
-        /* if the window isn't user-positioned, then make it fit inside
-           the visible screen area on its monitor.
-
-           the monitor is chosen by place_client! */
-        if (!(self->sized & USSize)) {
-            /* make a copy to modify */
-            Rect a = *screen_area_monitor(self->desktop, client_monitor(self));
-
-            /* shrink by the frame's area */
-            a.width -= self->frame->size.left + self->frame->size.right;
-            a.height -= self->frame->size.top + self->frame->size.bottom;
-
-            /* fit the window inside the area */
-            if (self->area.width > a.width || self->area.height > a.height) {
-                self->area.width = MIN(self->area.width, a.width);
-                self->area.height = MIN(self->area.height, a.height);
-
-                ob_debug("setting window size to %dx%d\n",
-                         self->area.width, self->area.height);
-
-                /* adjust the frame to the client's new size */
-                frame_adjust_area(self->frame, FALSE, TRUE, FALSE);
-                frame_adjust_client_area(self->frame);
-            }
-        }
-
         /* make sure the window is visible. */
-        client_find_onscreen(self, &placex, &placey,
-                             self->area.width, self->area.height,
+        client_find_onscreen(self, &placex, &placey, placew, placeh,
                              /* non-normal clients has less rules, and
                                 windows that are being restored from a
                                 session do also. we can assume you want
@@ -432,34 +406,53 @@ void client_manage(Window window)
                               !self->session));
     }
 
-    ob_debug("placing window 0x%x at %d, %d with size %d x %d\n",
-             self->window, placex, placey,
-             self->area.width, self->area.height);
+    /* if the window isn't user-sized, then make it fit inside
+       the visible screen area on its monitor. Use basically the same rules
+       for forcing the window on screen in the client_find_onscreen call.
+
+       do this after place_client, it chooses the monitor! */
+    if (transient ||
+        (!(self->sized & USSize) &&
+         client_normal(self) &&
+         !self->session))
+    {
+        /* make a copy to modify */
+        Rect a = *screen_area_monitor(self->desktop, client_monitor(self));
+
+        /* shrink by the frame's area */
+        a.width -= self->frame->size.left + self->frame->size.right;
+        a.height -= self->frame->size.top + self->frame->size.bottom;
+
+        /* fit the window inside the area */
+        if (placew > a.width || self->area.height > a.height) {
+            placew = MAX(MIN(MIN(self->area.width, a.width),
+                             self->max_size.width),
+                         self->min_size.width);
+            placeh = MAX(MIN(MIN(self->area.height, a.height),
+                             self->max_size.height),
+                         self->min_size.height);
+
+            ob_debug("setting window size to %dx%d\n",
+                     self->area.width, self->area.height);
+        }
+    }
+
+
+    ob_debug("placing window 0x%x at %d, %d with size %d x %d. "
+             "some restrictions may apply\n",
+             self->window, placex, placey, placew, placeh);
     if (self->session)
-        ob_debug("  but session requested %d %d instead, overriding\n",
-                 self->session->x, self->session->y);
+        ob_debug("  but session requested %d, %d  %d x %d instead, "
+                 "overriding\n",
+                 self->session->x, self->session->y,
+                 self->session->w, self->session->h);
 
     /* do this after the window is placed, so the premax/prefullscreen numbers
        won't be all wacko!!
-       also, this moves the window to the position where it has been placed
-    */
-    client_apply_startup_state(self);
 
-    /* move the client to its placed position, or it it's already there,
-       generate a ConfigureNotify telling the client where it is.
-
-       do this after adjusting the frame. otherwise it gets all weird and
-       clients don't work right
-
-       also do this after applying the startup state so maximize and fullscreen
-       will get the right sizes and positions if the client is starting with
-       those states
+       this also places the window
     */
-    client_configure(self, placex, placey,
-                     self->area.width, self->area.height,
-                     self->border_width,
-                     FALSE, TRUE);
-
+    client_apply_startup_state(self, placex, placey, placew, placeh);
 
     if (activate) {
         guint32 last_time = focus_client ?
@@ -498,7 +491,7 @@ void client_manage(Window window)
                is ambiguous (either the current focus target doesn't have
                a timestamp, or they are the same (we probably inherited it
                from them) */
-            else if (self->transient_for != NULL &&
+            else if (client_has_parent(self) &&
                      (!last_time || self->user_time == last_time))
             {
                 activate = FALSE;
@@ -576,7 +569,7 @@ void client_manage(Window window)
     g_free(settings);
 
     ob_debug("Managed window 0x%lx plate 0x%x (%s)\n",
-             window, self->frame->plate, self->class);
+             window, self->frame->window, self->class);
 
     return;
 }
@@ -599,7 +592,7 @@ ObClient *client_fake_manage(Window window)
        uses too. this returns a shallow copy that needs to be freed */
     settings = client_get_settings_state(self);
 
-    client_setup_decor_and_functions(self);
+    client_setup_decor_and_functions(self, FALSE);
 
     /* create the decoration frame for the client window and adjust its size */
     self->frame = frame_new(self);
@@ -627,7 +620,7 @@ void client_unmanage(ObClient *self)
     GSList *it;
 
     ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)\n",
-             self->window, self->frame->plate,
+             self->window, self->frame->window,
              self->class, self->title ? self->title : "");
 
     g_assert(self != NULL);
@@ -1596,9 +1589,7 @@ void client_update_normal_hints(ObClient *self)
     }
 }
 
-/*! This needs to be followed by a call to client_configure to make
-  the changes show */
-void client_setup_decor_and_functions(ObClient *self)
+void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
 {
     /* start with everything (cept fullscreen) */
     self->decorations =
@@ -1754,6 +1745,9 @@ void client_setup_decor_and_functions(ObClient *self)
     }
 
     client_change_allowed_actions(self);
+
+    if (reconfig)
+        client_reconfigure(self);
 }
 
 static void client_change_allowed_actions(ObClient *self)
@@ -2374,6 +2368,25 @@ ObClient *client_search_focus_tree_full(ObClient *self)
     return client_search_focus_tree(self);
 }
 
+gboolean client_has_parent(ObClient *self)
+{
+    if (self->transient_for) {
+        if (self->transient_for != OB_TRAN_GROUP) {
+            if (client_normal(self->transient_for))
+                return TRUE;
+        }
+        else if (self->group) {
+            GSList *it;
+
+            for (it = self->group->members; it; it = g_slist_next(it)) {
+                if (it->data != self && client_normal(it->data))
+                    return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
 static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
@@ -2528,44 +2541,59 @@ gboolean client_enter_focusable(ObClient *self)
 }
 
 
-static void client_apply_startup_state(ObClient *self)
+static void client_apply_startup_state(ObClient *self,
+                                       gint x, gint y, gint w, gint h)
 {
-    /* set the desktop hint, to make sure that it always exists */
-    PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
+    /* save the states that we are going to apply */
+    gboolean iconic = self->iconic;
+    gboolean fullscreen = self->fullscreen;
+    gboolean undecorated = self->undecorated;
+    gboolean shaded = self->shaded;
+    gboolean demands_attention = self->demands_attention;
+    gboolean max_horz = self->max_horz;
+    gboolean max_vert = self->max_vert;
+
+    /* turn them all off in the client, so they won't affect the window
+       being placed */
+    self->iconic = self->fullscreen = self->undecorated = self->shaded =
+        self->demands_attention = self->max_horz = self->max_vert = FALSE;
+
+    /* move the client to its placed position, or it it's already there,
+       generate a ConfigureNotify telling the client where it is.
+
+       do this after adjusting the frame. otherwise it gets all weird and
+       clients don't work right
 
-    /* these are in a carefully crafted order.. */
+       do this before applying the states so they have the correct
+       pre-max/pre-fullscreen values
+    */
+    client_configure(self, x, y, w, h, self->border_width, FALSE, TRUE);
+    ob_debug("placed window 0x%x at %d, %d with size %d x %d\n",
+             self->window, self->area.x, self->area.y,
+             self->area.width, self->area.height);
 
-    if (self->iconic) {
-        self->iconic = FALSE;
+    /* apply the states. these are in a carefully crafted order.. */
+
+    if (iconic)
         client_iconify(self, TRUE, FALSE, TRUE);
-    }
-    if (self->fullscreen) {
-        self->fullscreen = FALSE;
+    if (fullscreen)
         client_fullscreen(self, TRUE);
-    }
-    if (self->undecorated) {
-        self->undecorated = FALSE;
+    if (undecorated)
         client_set_undecorated(self, TRUE);
-    }
-    if (self->shaded) {
-        self->shaded = FALSE;
+    if (shaded)
         client_shade(self, TRUE);
-    }
-    if (self->demands_attention) {
-        self->demands_attention = FALSE;
+    if (demands_attention)
         client_hilite(self, TRUE);
-    }
   
-    if (self->max_vert && self->max_horz) {
-        self->max_vert = self->max_horz = FALSE;
+    if (max_vert && max_horz)
         client_maximize(self, TRUE, 0);
-    } else if (self->max_vert) {
-        self->max_vert = FALSE;
+    else if (max_vert)
         client_maximize(self, TRUE, 2);
-    } else if (self->max_horz) {
-        self->max_horz = FALSE;
+    else if (max_horz)
         client_maximize(self, TRUE, 1);
-    }
+
+    /* set the desktop hint, to make sure that it always exists */
+    PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
 
     /* nothing to do for the other states:
        skip_taskbar
@@ -2828,16 +2856,14 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
     /* if the client is enlarging, then resize the client before the frame */
     if (send_resize_client && (w > oldw || h > oldh)) {
         XWindowChanges changes;
-        changes.x = -self->border_width;
-        changes.y = -self->border_width;
+        changes.x = self->frame->size.left - self->border_width;
+        changes.y = self->frame->size.top -self->border_width;
         changes.width = MAX(w, oldw);
         changes.height = MAX(h, oldh);
         changes.border_width = self->border_width;
         XConfigureWindow(ob_display, self->window,
                          CWX|CWY|CWWidth|CWHeight|CWBorderWidth,
                          &changes);
-        /* resize the plate to show the client padding color underneath */
-        frame_adjust_client_area(self->frame);
     }
 
     /* find the frame's dimensions and move/resize it */
@@ -2889,13 +2915,10 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
 
     /* if the client is shrinking, then resize the frame before the client */
     if (send_resize_client && (w <= oldw && h <= oldh)) {
-        /* resize the plate to show the client padding color underneath */
-        frame_adjust_client_area(self->frame);
-
         if (send_resize_client) {
             XWindowChanges changes;
-            changes.x = -self->border_width;
-            changes.y = -self->border_width;
+            changes.x = self->frame->size.left - self->border_width;
+            changes.y = self->frame->size.top -self->border_width;
             changes.width = w;
             changes.height = h;
             changes.border_width = self->border_width;
@@ -2948,8 +2971,7 @@ void client_fullscreen(ObClient *self, gboolean fs)
         RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0);
     }
 
-    client_setup_decor_and_functions(self);
-
+    client_setup_decor_and_functions(self, FALSE);
     client_move_resize(self, x, y, w, h);
 
     /* and adjust our layer/stacking. do this after resizing the window,
@@ -3093,8 +3115,7 @@ void client_maximize(ObClient *self, gboolean max, gint dir)
 
     client_change_state(self); /* change the state hints on the client */
 
-    client_setup_decor_and_functions(self);
-
+    client_setup_decor_and_functions(self, FALSE);
     client_move_resize(self, x, y, w, h);
 }
 
@@ -3473,6 +3494,8 @@ gboolean client_focus(ObClient *self)
             /* update the focus lists */
             focus_order_to_top(self);
         }
+        ob_debug_type(OB_DEBUG_FOCUS,
+                      "Client %s can't be focused\n", self->title);
         return FALSE;
     }
 
@@ -3698,8 +3721,7 @@ void client_set_undecorated(ObClient *self, gboolean undecorated)
         (self->functions & OB_CLIENT_FUNC_UNDECORATE || !undecorated))
     {
         self->undecorated = undecorated;
-        client_setup_decor_and_functions(self);
-        client_reconfigure(self); /* show the lack of decorations */
+        client_setup_decor_and_functions(self, TRUE);
         client_change_state(self); /* reflect this in the state hints */
     }
 }