use const Rect* not Rect const*

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index e64fd49c2e0b4a890f852cca627f40e5fabeae85..755e9ad568dfccce9db8b1f75ec83f18b9c13e9a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -335,6 +335,8 @@ 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 */
             !client_is_oldfullscreen(self, &place))
         {
@@ -723,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,
@@ -2040,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 const *a;
+            const Rect *a;
 
             got = TRUE;
 
@@ -2465,10 +2468,10 @@ gboolean client_has_parent(ObClient *self)
     return self->parents != NULL;
 }
 
-gboolean client_is_oldfullscreen(const ObClient const *self,
-                                 const Rect const *area)
+gboolean client_is_oldfullscreen(const ObClient *self,
+                                 const Rect *area)
 {
-    Rect const *monitor, *allmonitors;
+    const Rect *monitor, *allmonitors;
 
     /* No decorations and fills the monitor = oldskool fullscreen.
        But not for maximized windows.
@@ -2486,7 +2489,7 @@ gboolean client_is_oldfullscreen(const ObClient const *self,
 static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
-    Rect const *monitor, *allmonitors;
+    const Rect *monitor, *allmonitors;
 
     monitor = screen_physical_area_monitor(client_monitor(self));
     allmonitors = screen_physical_area_all_monitors();
@@ -2839,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 const *a;
+        const Rect *a;
         guint i;
 
         i = screen_find_monitor(&desired);