X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=adbbc13b9d849f5ceb0baf05f5f1b2f256d1e9c0;hb=d35605823736410c4910ec1affe9563e4e8a8769;hp=481d7d2bd24f047d953bdd7d16d22eeee6d6bfe8;hpb=1d57f7b08590255e57dd5931a1993507b4f116c2;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 481d7d2b..adbbc13b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -202,7 +202,7 @@ void client_manage(Window window, ObPrompt *prompt)
     gboolean activate = FALSE;
     ObAppSettings *settings;
     gboolean transient = FALSE;
-    Rect place, *monitor, *allmonitors;
+    Rect place;
     Time launch_time, map_time;
     guint32 user_time;
     gboolean obplaced;
@@ -311,8 +311,6 @@ void client_manage(Window window, ObPrompt *prompt)
 
     /* where the frame was placed is where the window was originally */
     place = self->area;
-    monitor = screen_physical_area_monitor(screen_find_monitor(&place));
-    allmonitors = screen_physical_area_all_monitors();
 
     /* figure out placement for the window if the window is new */
     if (ob_state() == OB_STATE_RUNNING) {
@@ -337,16 +335,19 @@ void client_manage(Window window, ObPrompt *prompt)
         /* watch for buggy apps that ask to be placed at (0,0) when there is
            a strut there */
         if (!obplaced && place.x == 0 && place.y == 0 &&
+            /* non-normal windows are allowed */
+            client_normal(self) &&
             /* oldschool fullscreen windows are allowed */
-            !(self->decorations == 0 && (RECT_EQUAL(place, *monitor) ||
-                                         RECT_EQUAL(place, *allmonitors))))
+            !client_is_oldfullscreen(self, &place))
         {
             Rect *r;
 
             r = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, NULL);
-            place.x = r->x;
-            place.y = r->y;
-            ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            if (r->x || r->y) {
+                place.x = r->x;
+                place.y = r->y;
+                ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            }
             g_slice_free(Rect, r);
         }
 
@@ -379,9 +380,7 @@ void client_manage(Window window, ObPrompt *prompt)
                                   fit inside the struts (fixes Acroread, which
                                   makes its fullscreen window fit the screen
                                   but it is not USSize'd or USPosition'd) */
-                               !(self->decorations == 0 &&
-                                 (RECT_EQUAL(place, *monitor) ||
-                                  RECT_EQUAL(place, *allmonitors))))));
+                               !client_is_oldfullscreen(self, &place))));
     }
 
     /* if the window isn't user-sized, then make it fit inside
@@ -401,8 +400,7 @@ void client_manage(Window window, ObPrompt *prompt)
           /* don't shrink oldschool fullscreen windows to fit inside the
              struts (fixes Acroread, which makes its fullscreen window
              fit the screen but it is not USSize'd or USPosition'd) */
-          !(self->decorations == 0 && (RECT_EQUAL(place, *monitor) ||
-                                       RECT_EQUAL(place, *allmonitors))))))
+          !client_is_oldfullscreen(self, &place))))
     {
         Rect *a = screen_area(self->desktop, SCREEN_AREA_ONE_MONITOR, &place);
 
@@ -440,11 +438,6 @@ void client_manage(Window window, ObPrompt *prompt)
     client_apply_startup_state(self, place.x, place.y,
                                place.width, place.height);
 
-    g_free(monitor);
-    monitor = NULL;
-    g_free(allmonitors);
-    allmonitors = NULL;
-
     ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s",
                   activate ? "yes" : "no");
     if (activate) {
@@ -503,7 +496,7 @@ void client_manage(Window window, ObPrompt *prompt)
     client_set_list();
 
     /* free the ObAppSettings shallow copy */
-    g_free(settings);
+    g_slice_free(ObAppSettings, settings);
 
     ob_debug("Managed window 0x%lx plate 0x%x (%s)",
              window, self->frame->window, self->class);
@@ -537,7 +530,7 @@ ObClient *client_fake_manage(Window window)
              self->frame->size.top, self->frame->size.bottom);
 
     /* free the ObAppSettings shallow copy */
-    g_free(settings);
+    g_slice_free(ObAppSettings, settings);
 
     return self;
 }
@@ -703,7 +696,7 @@ void client_fake_unmanage(ObClient *self)
     /* this is all that got allocated to get the decorations */
 
     frame_free(self->frame);
-    g_free(self);
+    g_slice_free(ObClient, self);
 }
 
 static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
@@ -723,7 +716,7 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
 
     /* This is focus stealing prevention */
     ob_debug_type(OB_DEBUG_FOCUS,
-                  "Want to focus new window 0x%x at time %u "
+                  "Want to focus window 0x%x at time %u "
                   "launched at %u (last user interaction time %u)",
                   self->window, steal_time, launch_time,
                   event_last_user_time);
@@ -732,8 +725,9 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
     if (!(self->desktop == screen_desktop ||
           self->desktop == DESKTOP_ALL) &&
         /* the timestamp is from before you changed desktops */
-        launch_time && screen_desktop_user_time &&
-        !event_time_after(launch_time, screen_desktop_user_time))
+        (!launch_time ||
+         (screen_desktop_user_time &&
+          !event_time_after(launch_time, screen_desktop_user_time))))
     {
         steal = FALSE;
         ob_debug_type(OB_DEBUG_FOCUS,
@@ -2049,7 +2043,7 @@ void client_update_strut(ObClient *self)
     if (!got &&
         OBT_PROP_GETA32(self->window, NET_WM_STRUT, CARDINAL, &data, &num)) {
         if (num == 4) {
-            Rect *a;
+            Rect const *a;
 
             got = TRUE;
 
@@ -2062,7 +2056,6 @@ void client_update_strut(ObClient *self)
                               a->x, a->x + a->width - 1,
                               a->y, a->y + a->height - 1,
                               a->x, a->x + a->width - 1);
-            g_free(a);
         }
         g_free(data);
     }
@@ -2475,10 +2468,28 @@ gboolean client_has_parent(ObClient *self)
     return self->parents != NULL;
 }
 
+gboolean client_is_oldfullscreen(const ObClient const *self,
+                                 const Rect const *area)
+{
+    Rect const *monitor, *allmonitors;
+
+    /* No decorations and fills the monitor = oldskool fullscreen.
+       But not for maximized windows.
+    */
+
+    if (self->decorations || self->max_horz || self->max_vert) return FALSE;
+
+    monitor = screen_physical_area_monitor(screen_find_monitor(area));
+    allmonitors = screen_physical_area_all_monitors();
+
+    return (RECT_EQUAL(*area, *monitor) ||
+            RECT_EQUAL(*area, *allmonitors));
+}
+
 static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
-    Rect *monitor, *allmonitors;
+    Rect const *monitor, *allmonitors;
 
     monitor = screen_physical_area_monitor(client_monitor(self));
     allmonitors = screen_physical_area_all_monitors();
@@ -2490,13 +2501,7 @@ static ObStackingLayer calc_layer(ObClient *self)
         else l = OB_STACKING_LAYER_ABOVE;
     }
     else if ((self->fullscreen ||
-              /* No decorations and fills the monitor = oldskool fullscreen.
-                 But not for maximized windows.
-              */
-              (self->decorations == 0 &&
-               !(self->max_horz && self->max_vert) &&
-               (RECT_EQUAL(self->area, *monitor) ||
-                RECT_EQUAL(self->area, *allmonitors)))) &&
+              client_is_oldfullscreen(self, &self->area)) &&
              /* you are fullscreen while you or your children are focused.. */
              (client_focused(self) || client_search_focus_tree(self) ||
               /* you can be fullscreen if you're on another desktop */
@@ -2511,9 +2516,6 @@ static ObStackingLayer calc_layer(ObClient *self)
     else if (self->below) l = OB_STACKING_LAYER_BELOW;
     else l = OB_STACKING_LAYER_NORMAL;
 
-    g_free(monitor);
-    g_free(allmonitors);
-
     return l;
 }
 
@@ -2840,7 +2842,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
 
     /* set the size and position if fullscreen */
     if (self->fullscreen) {
-        Rect *a;
+        Rect const *a;
         guint i;
 
         i = screen_find_monitor(&desired);
@@ -2853,8 +2855,6 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
 
         user = FALSE; /* ignore if the client can't be moved/resized when it
                          is fullscreening */
-
-        g_free(a);
     } else if (self->max_horz || self->max_vert) {
         Rect *a;
         guint i;
@@ -2995,8 +2995,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
 void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
                       gboolean user, gboolean final, gboolean force_reply)
 {
-    Rect oldframe;
-    gint oldw, oldh;
+    Rect oldframe, oldclient;
     gboolean send_resize_client;
     gboolean moved = FALSE, resized = FALSE, rootmoved = FALSE;
     gboolean fmoved, fresized;
@@ -3016,9 +3015,8 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
     moved = (x != self->area.x || y != self->area.y);
     resized = (w != self->area.width || h != self->area.height);
 
-    oldw = self->area.width;
-    oldh = self->area.height;
     oldframe = self->frame->area;
+    oldclient = self->area;
     RECT_SET(self->area, x, y, w, h);
 
     /* for app-requested resizes, always resize if 'resized' is true.
@@ -3029,10 +3027,10 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
                                     (resized && config_resize_redraw))));
 
     /* if the client is enlarging, then resize the client before the frame */
-    if (send_resize_client && (w > oldw || h > oldh)) {
+    if (send_resize_client && (w > oldclient.width || h > oldclient.height)) {
         XMoveResizeWindow(obt_display, self->window,
                           self->frame->size.left, self->frame->size.top,
-                          MAX(w, oldw), MAX(h, oldh));
+                          MAX(w, oldclient.width), MAX(h, oldclient.height));
         frame_adjust_client_area(self->frame);
     }
 
@@ -3120,7 +3118,8 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
        both of these resize sections may run, because the top one only resizes
        in the direction that is growing
      */
-    if (send_resize_client && (w <= oldw || h <= oldh)) {
+    if (send_resize_client && (w <= oldclient.width || h <= oldclient.height))
+    {
         frame_adjust_client_area(self->frame);
         XMoveResizeWindow(obt_display, self->window,
                           self->frame->size.left, self->frame->size.top, w, h);
@@ -3129,9 +3128,13 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
     XFlush(obt_display);
 
     /* if it moved between monitors, then this can affect the stacking
-       layer of this window or others - for fullscreen windows */
+       layer of this window or others - for fullscreen windows.
+       also if it changed to/from oldschool fullscreen then its layer may
+       change */
     if (screen_find_monitor(&self->frame->area) !=
-        screen_find_monitor(&oldframe))
+        screen_find_monitor(&oldframe) ||
+        (final && (client_is_oldfullscreen(self, &oldclient) !=
+                   client_is_oldfullscreen(self, &self->area))))
     {
         client_calc_layer(self);
     }