]> Dogcows Code - chaz/openbox/blobdiff - openbox/client.c
invisible resizing areas/grips in the top corners of the window
[chaz/openbox] / openbox / client.c
index 7b1b9955a9b47ac67a947e3ac7d646c9d70e5e01..c57c66e84571ec5e4ec90813ffb6e3a150722924 100644 (file)
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "client.h"
 #include "dock.h"
 #include "xerror.h"
@@ -7,6 +8,7 @@
 #include "prop.h"
 #include "extensions.h"
 #include "frame.h"
+#include "session.h"
 #include "event.h"
 #include "grab.h"
 #include "focus.h"
@@ -42,6 +44,7 @@ static void client_showhide(ObClient *self);
 static void client_change_allowed_actions(ObClient *self);
 static void client_change_state(ObClient *self);
 static void client_apply_startup_state(ObClient *self);
+static void client_restore_session_state(ObClient *self);
 
 void client_startup()
 {
@@ -216,7 +219,7 @@ void client_manage(Window window)
        XFree(wmhint);
     }
 
-    g_message("Managing window: %lx", window);
+    ob_debug("Managing window: %lx\n", window);
 
     /* choose the events we want to receive on the CLIENT window */
     attrib_set.event_mask = CLIENT_EVENTMASK;
@@ -230,7 +233,11 @@ void client_manage(Window window)
     self = g_new(ObClient, 1);
     self->obwin.type = Window_Client;
     self->window = window;
+
     client_get_all(self);
+    client_restore_session_state(self);
+
+    client_change_state(self);
 
     /* remove the client's border (and adjust re gravity) */
     client_toggle_border(self, FALSE);
@@ -248,10 +255,6 @@ void client_manage(Window window)
 
     grab_server(FALSE);
 
-    /* add to client list/map */
-    client_list = g_list_append(client_list, self);
-    g_hash_table_insert(window_map, &self->window, self);
-
     /* update the focus lists */
     focus_order_add_new(self);
 
@@ -299,7 +302,7 @@ void client_manage(Window window)
     dispatch_client(Event_Client_New, self, 0, 0);
 
     /* make sure the window is visible */
-    client_move_onscreen(self);
+    client_move_onscreen(self, TRUE);
 
     screen_update_areas();
 
@@ -317,12 +320,16 @@ void client_manage(Window window)
     if (screen_showing_desktop)
         screen_show_desktop(FALSE);
 
+    /* add to client list/map */
+    client_list = g_list_append(client_list, self);
+    g_hash_table_insert(window_map, &self->window, self);
+
     /* update the list hints */
     client_set_list();
 
     dispatch_client(Event_Client_Mapped, self, 0, 0);
 
-    g_message("Managed window 0x%lx (%s)", window, self->class);
+    ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
 }
 
 void client_unmanage_all()
@@ -343,7 +350,7 @@ void client_unmanage(ObClient *self)
     guint j;
     GSList *it;
 
-    g_message("Unmanaging window: %lx (%s)", self->window, self->class);
+    ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class);
 
     dispatch_client(Event_Client_Destroy, self, 0, 0);
     g_assert(self != NULL);
@@ -424,8 +431,9 @@ void client_unmanage(ObClient *self)
     if (ob_state() != OB_STATE_EXITING) {
        /* these values should not be persisted across a window
           unmapping/mapping */
-       prop_erase(self->window, prop_atoms.net_wm_desktop);
-       prop_erase(self->window, prop_atoms.net_wm_state);
+       PROP_ERASE(self->window, net_wm_desktop);
+       PROP_ERASE(self->window, net_wm_state);
+       PROP_ERASE(self->window, wm_state);
     } else {
        /* if we're left in an iconic state, the client wont be mapped. this is
           bad, since we will no longer be managing the window on restart */
@@ -434,7 +442,7 @@ void client_unmanage(ObClient *self)
     }
 
 
-    g_message("Unmanaged window 0x%lx", self->window);
+    ob_debug("Unmanaged window 0x%lx\n", self->window);
 
     /* free all data allocated in the client struct */
     g_slist_free(self->transients);
@@ -453,27 +461,89 @@ void client_unmanage(ObClient *self)
     client_set_list();
 }
 
-void client_move_onscreen(ObClient *self)
+static void client_restore_session_state(ObClient *self)
+{
+    ObSessionState *s;
+
+    s = session_state_find(self);
+    if (!(s)) return;
+
+    RECT_SET(self->area, s->x, s->y, s->w, s->h);
+    self->positioned = TRUE;
+    XResizeWindow(ob_display, self->window, s->w, s->h);
+
+    self->desktop = s->desktop == DESKTOP_ALL ? s->desktop :
+        MIN(screen_num_desktops - 1, s->desktop);
+    PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
+
+    self->shaded = s->shaded;
+    self->iconic = s->iconic;
+    self->skip_pager = s->skip_pager;
+    self->skip_taskbar = s->skip_taskbar;
+    self->fullscreen = s->fullscreen;
+    self->above = s->above;
+    self->below = s->below;
+    self->max_horz = s->max_horz;
+    self->max_vert = s->max_vert;
+
+    session_state_free(s);
+}
+
+void client_move_onscreen(ObClient *self, gboolean rude)
+{
+    int x = self->area.x;
+    int y = self->area.y;
+    if (client_find_onscreen(self, &x, &y,
+                             self->area.width, self->area.height, rude)) {
+        client_configure(self, OB_CORNER_TOPLEFT, x, y,
+                         self->area.width, self->area.height,
+                         TRUE, TRUE);
+    }
+}
+
+gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h,
+                              gboolean rude)
 {
     Rect *a;
-    int x = self->frame->area.x, y = self->frame->area.y;
+    int ox = *x, oy = *y;
+
+    frame_client_gravity(self->frame, x, y); /* get where the frame
+                                                would be */
 
     /* XXX watch for xinerama dead areas */
+
     a = screen_area(self->desktop);
-    if (x >= a->x + a->width - 1)
-        x = a->x + a->width - self->frame->area.width;
-    if (y >= a->y + a->height - 1)
-        y = a->y + a->height - self->frame->area.height;
-    if (x + self->frame->area.width - 1 < a->x)
-        x = a->x;
-    if (y + self->frame->area.height - 1< a->y)
-        y = a->y;
-
-    frame_frame_gravity(self->frame, &x, &y); /* get where the client
-                                                 should be */
-    client_configure(self, OB_CORNER_TOPLEFT, x, y,
-                     self->area.width, self->area.height,
-                     TRUE, TRUE);
+    if (!self->strut.right && *x >= a->x + a->width - 1)
+        *x = a->x + a->width - self->frame->area.width;
+    if (!self->strut.bottom && *y >= a->y + a->height - 1)
+        *y = a->y + a->height - self->frame->area.height;
+    if (!self->strut.left && *x + self->frame->area.width - 1 < a->x)
+        *x = a->x;
+    if (!self->strut.top && *y + self->frame->area.height - 1 < a->y)
+        *y = a->y;
+
+    if (rude) {
+        /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good.
+           Java can suck it too. */
+
+        /* dont let windows map/move into the strut unless they
+           are bigger than the available area */
+        if (w <= a->width) {
+            if (!self->strut.left && *x < a->x) *x = a->x;
+            if (!self->strut.right && *x + w > a->x + a->width)
+                *x = a->x + a->width - w;
+        }
+        if (h <= a->height) {
+            if (!self->strut.top && *y < a->y) *y = a->y;
+            if (!self->strut.bottom && *y + h > a->y + a->height)
+                *y = a->y + a->height - h;
+        }
+    }
+
+    frame_frame_gravity(self->frame, x, y); /* get where the client
+                                               should be */
+
+    return ox != *x || oy != *y;
 }
 
 static void client_toggle_border(ObClient *self, gboolean show)
@@ -588,8 +658,6 @@ static void client_get_all(ObClient *self)
     client_update_class(self);
     client_update_strut(self);
     client_update_icons(self);
-
-    client_change_state(self);
 }
 
 static void client_get_area(ObClient *self)
@@ -635,7 +703,6 @@ static void client_get_desktop(ObClient *self)
        if (!trdesk)
            /* defaults to the current desktop */
            self->desktop = screen_desktop;
-
     }
     if (self->desktop != d) {
         /* set the desktop hint, to make sure that it always exists */
@@ -890,7 +957,7 @@ void client_update_normal_hints(ObClient *self)
 
     /* get the hints from the window */
     if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
-       self->positioned = !!(size.flags & (PPosition|USPosition));
+        self->positioned = !!(size.flags & (PPosition|USPosition));
 
        if (size.flags & PWinGravity) {
            self->gravity = size.win_gravity;
@@ -1098,7 +1165,6 @@ static void client_change_allowed_actions(ObClient *self)
        else self->shaded = FALSE;
     }
     if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) {
-        g_message("UNSETTING ICONIC");
        if (self->frame) client_iconify(self, FALSE, TRUE);
        else self->iconic = FALSE;
     }
@@ -1176,9 +1242,6 @@ void client_update_wmhints(ObClient *self)
                 }
             }
 
-            /* the WM_HINTS can contain an icon */
-            client_update_icons(self);
-
             /* because the self->transient flag wont change from this call,
                we don't need to update the window's type and such, only its
                transient_for, and the transients lists of other windows in
@@ -1186,13 +1249,16 @@ void client_update_wmhints(ObClient *self)
             client_update_transient_for(self);
         }
 
+        /* the WM_HINTS can contain an icon */
+        client_update_icons(self);
+
        XFree(hints);
     }
 
     if (ur != self->urgent) {
        self->urgent = ur;
-       g_message("Urgent Hint for 0x%lx: %s", self->window,
-                 ur ? "ON" : "OFF");
+       ob_debug("Urgent Hint for 0x%lx: %s\n", self->window,
+                 ur ? "ON" : "OFF");
        /* fire the urgent callback if we're mapped, otherwise, wait until
           after we're mapped */
        if (self->frame)
@@ -1308,17 +1374,35 @@ void client_update_strut(ObClient *self)
 {
     guint num;
     guint32 *data;
+    gboolean got = FALSE;
+
+    if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal,
+                    &data, &num)) {
+        if (num == 12) {
+            got = TRUE;
+            STRUT_PARTIAL_SET(self->strut,
+                              data[0], data[2], data[1], data[3],
+                              data[4], data[5], data[8], data[9],
+                              data[6], data[7], data[10], data[11]);
+        }
+        g_free(data);
+    }
 
-    if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
-       STRUT_SET(self->strut, 0, 0, 0, 0);
-    } else {
-        if (num == 4)
-            STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
-        else
-            STRUT_SET(self->strut, 0, 0, 0, 0);
-       g_free(data);
+    if (!got &&
+        PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
+        if (num == 4) {
+            got = TRUE;
+            STRUT_PARTIAL_SET(self->strut,
+                              data[0], data[2], data[1], data[3],
+                              0, 0, 0, 0, 0, 0, 0, 0);
+        }
+        g_free(data);
     }
 
+    if (!got)
+        STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
+
     /* updating here is pointless while we're being mapped cuz we're not in
        the client list yet */
     if (self->frame)
@@ -1619,9 +1703,10 @@ static void client_apply_startup_state(ObClient *self)
     */
 }
 
-void client_configure(ObClient *self, ObCorner anchor,
-                      int x, int y, int w, int h,
-                     gboolean user, gboolean final)
+void client_configure_full(ObClient *self, ObCorner anchor,
+                           int x, int y, int w, int h,
+                           gboolean user, gboolean final,
+                           gboolean force_reply)
 {
     gboolean moved = FALSE, resized = FALSE;
 
@@ -1750,11 +1835,13 @@ void client_configure(ObClient *self, ObCorner anchor,
         h /= self->size_inc.height;
 
         /* you cannot resize to nothing */
-        if (w < 1) w = 1;
-        if (h < 1) h = 1;
+        if (basew + w < 1) w = 1 - basew;
+        if (baseh + h < 1) h = 1 - baseh;
   
         /* store the logical size */
-        SIZE_SET(self->logical_size, w, h);
+        SIZE_SET(self->logical_size,
+                 self->size_inc.width > 1 ? w : w + basew,
+                 self->size_inc.height > 1 ? h : h + baseh);
 
         w *= self->size_inc.width;
         h *= self->size_inc.height;
@@ -1813,21 +1900,19 @@ void client_configure(ObClient *self, ObCorner anchor,
         if (moved || resized)
             frame_adjust_area(self->frame, moved, resized);
 
-        /* If you send this and the client hasn't changed you end up with buggy
-           clients (emacs) freaking out, cuz they send back a configure every
-           time they receive this event, which resends them this event... etc.
-        */
-        if ((!user && moved) || (user && final)) {
+        if (!resized && (force_reply || ((!user && moved) || (user && final))))
+        {
             XEvent event;
             event.type = ConfigureNotify;
             event.xconfigure.display = ob_display;
             event.xconfigure.event = self->window;
             event.xconfigure.window = self->window;
-    
+
             /* root window real coords */
-            event.xconfigure.x = self->frame->area.x + self->frame->size.left;
-            event.xconfigure.y = self->frame->area.y + self->frame->size.top;
-    
+            event.xconfigure.x = self->frame->area.x + self->frame->size.left -
+                self->border_width;
+            event.xconfigure.y = self->frame->area.y + self->frame->size.top -
+                self->border_width;
             event.xconfigure.width = w;
             event.xconfigure.height = h;
             event.xconfigure.border_width = 0;
@@ -1905,8 +1990,8 @@ static void client_iconify_recursive(ObClient *self,
 
 
     if (self->iconic != iconic) {
-        g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
-                  self->window);
+        ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+                 self->window);
 
         self->iconic = iconic;
 
@@ -2126,7 +2211,7 @@ void client_set_desktop_recursive(ObClient *self,
 
     if (target != self->desktop) {
 
-        g_message("Setting desktop %u", target+1);
+        ob_debug("Setting desktop %u\n", target+1);
 
         g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
 
@@ -2416,9 +2501,9 @@ gboolean client_focus(ObClient *self)
     }
 
 #ifdef DEBUG_FOCUS
-    g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"),
-              self->window, (int)
-              event_lasttime);
+    ob_debug("%sively focusing %lx at %d\n",
+             (self->can_focus ? "act" : "pass"),
+             self->window, (int) event_lasttime);
 #endif
 
     /* Cause the FocusIn to come back to us. Important for desktop switches,
@@ -2432,7 +2517,7 @@ void client_unfocus(ObClient *self)
 {
     g_assert(focus_client == self);
 #ifdef DEBUG_FOCUS
-    g_message("client_unfocus for %lx", self->window);
+    ob_debug("client_unfocus for %lx\n", self->window);
 #endif
     focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
@@ -2635,3 +2720,25 @@ ObClient *client_search_top_transient(ObClient *self)
 
     return self;
 }
+
+ObClient *client_search_transient(ObClient *self, ObClient *search)
+{
+    GSList *sit;
+
+    for (sit = self->transients; sit; sit = g_slist_next(sit)) {
+        if (sit->data == search)
+            return search;
+        if (client_search_transient(sit->data, search))
+            return search;
+    }
+    return NULL;
+}
+
+gchar* client_get_sm_client_id(ObClient *self)
+{
+    gchar *id = NULL;
+
+    if (!PROP_GETS(self->window, sm_client_id, locale, &id) && self->group)
+        PROP_GETS(self->group->leader, sm_client_id, locale, &id);
+    return id;
+}
This page took 0.033655 seconds and 4 git commands to generate.