X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=e63f78678018361bd346a493d32cfd9408fc1be7;hb=32047fd66c796fe837168ce2ac6677aa0d2b20b4;hp=e653ed19f58b2b0d7cebd7a15c90a64ee4b73d73;hpb=3c5f6db04cb577fa3f547b45283eac7a0664be39;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index e653ed19..e63f7867 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1,8 +1,26 @@
-#include "debug.h"
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   client.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "client.h"
+#include "debug.h"
+#include "startupnotify.h"
 #include "dock.h"
 #include "xerror.h"
-#include "startup.h"
 #include "screen.h"
 #include "moveresize.h"
 #include "place.h"
@@ -32,10 +50,12 @@
 #define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
 				ButtonMotionMask)
 
-GList      *client_list      = NULL;
+GList      *client_list        = NULL;
+GSList     *client_destructors = NULL;
 
 static void client_get_all(ObClient *self);
 static void client_toggle_border(ObClient *self, gboolean show);
+static void client_get_startup_id(ObClient *self);
 static void client_get_area(ObClient *self);
 static void client_get_desktop(ObClient *self);
 static void client_get_state(ObClient *self);
@@ -48,16 +68,29 @@ static void client_change_state(ObClient *self);
 static void client_apply_startup_state(ObClient *self);
 static void client_restore_session_state(ObClient *self);
 static void client_restore_session_stacking(ObClient *self);
+static void client_urgent_notify(ObClient *self);
 
-void client_startup()
+void client_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     client_set_list();
 }
 
-void client_shutdown()
+void client_shutdown(gboolean reconfig)
 {
 }
 
+void client_add_destructor(GDestroyNotify func)
+{
+    client_destructors = g_slist_prepend(client_destructors, (gpointer)func);
+}
+
+void client_remove_destructor(GDestroyNotify func)
+{
+    client_destructors = g_slist_remove(client_destructors, (gpointer)func);
+}
+
 void client_set_list()
 {
     Window *windows, *win_it;
@@ -151,35 +184,8 @@ void client_manage_all()
     }
     XFree(children);
 
-    /* stack them as they were on startup!
-       why with stacking_lower? Why, because then windows who aren't in the
-       stacking list are on the top where you can see them instead of buried
-       at the bottom! */
-    for (i = startup_stack_size; i > 0; --i) {
-        ObWindow *obw;
-
-        w = startup_stack_order[i-1];
-        obw = g_hash_table_lookup(window_map, &w);
-        if (obw) {
-            g_assert(WINDOW_IS_CLIENT(obw));
-            stacking_lower(CLIENT_AS_WINDOW(obw));
-        }
-    }
-    g_free(startup_stack_order);
-    startup_stack_order = NULL;
-    startup_stack_size = 0;
-
-    if (config_focus_new) {
-        ObWindow *active;
-
-        active = g_hash_table_lookup(window_map, &startup_active);
-        if (active) {
-            g_assert(WINDOW_IS_CLIENT(active));
-            if (!client_focus(WINDOW_AS_CLIENT(active)))
-                focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
-        } else
-            focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
-    }
+    if (config_focus_new)
+        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
 }
 
 void client_manage(Window window)
@@ -237,9 +243,18 @@ void client_manage(Window window)
     self->obwin.type = Window_Client;
     self->window = window;
 
+    /* non-zero defaults */
+    self->title_count = 1;
+    self->wmstate = NormalState;
+    self->layer = -1;
+    self->decorate = TRUE;
+    self->desktop = screen_num_desktops; /* always an invalid value */
+
     client_get_all(self);
     client_restore_session_state(self);
 
+    sn_app_started(self->class);
+
     client_change_state(self);
 
     /* remove the client's border (and adjust re gravity) */
@@ -312,20 +327,16 @@ void client_manage(Window window)
 
         place_client(self, &x, &y);
 
+        /* make sure the window is visible */
         client_find_onscreen(self, &x, &y,
                              self->frame->area.width,
                              self->frame->area.height,
                              client_normal(self));
 
         if (x != ox || y != oy)
-            client_configure(self, OB_CORNER_TOPLEFT, x, y,
-                             self->area.width, self->area.height,
-                             TRUE, TRUE);
+            client_move(self, x, y);
     }
 
-    /* make sure the window is visible */
-        client_move_onscreen(self, client_normal(self));
-
     client_showhide(self);
 
     /* use client_focus instead of client_activate cuz client_activate does
@@ -414,13 +425,11 @@ void client_unmanage(ObClient *self)
         }
     }
 
-    if (moveresize_client == self)
-        moveresize_end(TRUE);
-
-    /* menus can be associated with a client, so close any that are since
-       we are disappearing now */
-    menu_frame_hide_all_client(self);
-    
+    for (it = client_destructors; it; it = g_slist_next(it)) {
+        GDestroyNotify func = (GDestroyNotify) it->data;
+        func(self);
+    }
+        
     if (focus_client == self) {
         XEvent e;
 
@@ -470,12 +479,21 @@ void client_unmanage(ObClient *self)
     g_free(self->name);
     g_free(self->class);
     g_free(self->role);
+    g_free(self->sm_client_id);
     g_free(self);
      
     /* update the list hints */
     client_set_list();
 }
 
+static void client_urgent_notify(ObClient *self)
+{
+    if (self->urgent)
+        frame_flash_start(self->frame);
+    else
+        frame_flash_stop(self->frame);
+}
+
 static void client_restore_session_state(ObClient *self)
 {
     GList *it;
@@ -536,9 +554,7 @@ void client_move_onscreen(ObClient *self, gboolean rude)
     if (client_find_onscreen(self, &x, &y,
                              self->frame->area.width,
                              self->frame->area.height, rude)) {
-        client_configure(self, OB_CORNER_TOPLEFT, x, y,
-                         self->area.width, self->area.height,
-                         TRUE, TRUE);
+        client_move(self, x, y);
     }
 }
 
@@ -554,14 +570,16 @@ gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h,
     /* XXX watch for xinerama dead areas */
 
     a = screen_area(self->desktop);
-    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 (client_normal(self)) {
+        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.
@@ -655,15 +673,10 @@ static void client_toggle_border(ObClient *self, gboolean show)
 
 static void client_get_all(ObClient *self)
 {
-    /* non-zero defaults */
-    self->title_count = 1;
-    self->wmstate = NormalState;
-    self->layer = -1;
-    self->decorate = TRUE;
-
     client_get_area(self);
     client_update_transient_for(self);
     client_update_wmhints(self);
+    client_get_startup_id(self);
     client_get_desktop(self);
     client_get_state(self);
     client_get_shaped(self);
@@ -683,10 +696,19 @@ static void client_get_all(ObClient *self)
   
     client_update_title(self);
     client_update_class(self);
+    client_update_sm_client_id(self);
     client_update_strut(self);
     client_update_icons(self);
 }
 
+static void client_get_startup_id(ObClient *self)
+{
+    if (!(PROP_GETS(self->window, net_startup_id, utf8, &self->startup_id)))
+        if (self->group)
+            PROP_GETS(self->group->leader,
+                      net_startup_id, utf8, &self->startup_id);
+}
+
 static void client_get_area(ObClient *self)
 {
     XWindowAttributes wattrib;
@@ -727,9 +749,16 @@ static void client_get_desktop(ObClient *self)
                     }
             }
        }
-       if (!trdesk)
-           /* defaults to the current desktop */
-           self->desktop = screen_desktop;
+       if (!trdesk) {
+           /* try get from the startup-notification protocol */
+           if (sn_get_desktop(self->startup_id, &self->desktop)) {
+               if (self->desktop >= screen_num_desktops &&
+                   self->desktop != DESKTOP_ALL)
+                   self->desktop = screen_num_desktops - 1;
+           } else
+               /* defaults to the current desktop */
+               self->desktop = screen_desktop;
+       }
     }
     if (self->desktop != d) {
         /* set the desktop hint, to make sure that it always exists */
@@ -742,10 +771,6 @@ static void client_get_state(ObClient *self)
     guint32 *state;
     guint num;
   
-    self->modal = self->shaded = self->max_horz = self->max_vert =
-	self->fullscreen = self->above = self->below = self->iconic =
-	self->skip_taskbar = self->skip_pager = FALSE;
-
     if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) {
 	gulong i;
 	for (i = 0; i < num; ++i) {
@@ -805,7 +830,11 @@ void client_update_transient_for(ObClient *self)
             target = g_hash_table_lookup(window_map, &t);
             /* if this happens then we need to check for it*/
             g_assert(target != self);
-            g_assert(!target || WINDOW_IS_CLIENT(target));
+            if (target && !WINDOW_IS_CLIENT(target)) {
+                /* this can happen when a dialog is a child of
+                   a dockapp, for example */
+                target = NULL;
+            }
             
             if (!target && self->group) {
                 /* not transient to a client, see if it is transient for a
@@ -1024,20 +1053,22 @@ void client_update_normal_hints(ObClient *self)
 void client_setup_decor_and_functions(ObClient *self)
 {
     /* start with everything (cept fullscreen) */
-    self->decorations = (OB_FRAME_DECOR_TITLEBAR |
-                         OB_FRAME_DECOR_HANDLE |
-                         OB_FRAME_DECOR_GRIPS |
-                         OB_FRAME_DECOR_BORDER |
-                         OB_FRAME_DECOR_ICON |
-                         OB_FRAME_DECOR_ALLDESKTOPS |
-                         OB_FRAME_DECOR_ICONIFY |
-                         OB_FRAME_DECOR_MAXIMIZE |
-                         OB_FRAME_DECOR_SHADE);
-    self->functions = (OB_CLIENT_FUNC_RESIZE |
-                       OB_CLIENT_FUNC_MOVE |
-                       OB_CLIENT_FUNC_ICONIFY |
-                       OB_CLIENT_FUNC_MAXIMIZE |
-                       OB_CLIENT_FUNC_SHADE);
+    self->decorations =
+        (OB_FRAME_DECOR_TITLEBAR |
+         (ob_rr_theme->show_handle ? OB_FRAME_DECOR_HANDLE : 0) |
+         OB_FRAME_DECOR_GRIPS |
+         OB_FRAME_DECOR_BORDER |
+         OB_FRAME_DECOR_ICON |
+         OB_FRAME_DECOR_ALLDESKTOPS |
+         OB_FRAME_DECOR_ICONIFY |
+         OB_FRAME_DECOR_MAXIMIZE |
+         OB_FRAME_DECOR_SHADE);
+    self->functions =
+        (OB_CLIENT_FUNC_RESIZE |
+         OB_CLIENT_FUNC_MOVE |
+         OB_CLIENT_FUNC_ICONIFY |
+         OB_CLIENT_FUNC_MAXIMIZE |
+         OB_CLIENT_FUNC_SHADE);
     if (self->delete_window) {
 	self->functions |= OB_CLIENT_FUNC_CLOSE;
         self->decorations |= OB_FRAME_DECOR_CLOSE;
@@ -1287,9 +1318,8 @@ void client_update_wmhints(ObClient *self)
                  ur ? "ON" : "OFF");
 	/* fire the urgent callback if we're mapped, otherwise, wait until
 	   after we're mapped */
-	if (self->frame) {
-            /* XXX do shit */
-        }
+	if (self->frame)
+            client_urgent_notify(self);
     }
 }
 
@@ -1298,10 +1328,11 @@ void client_update_title(ObClient *self)
     GList *it;
     guint32 nums;
     guint i;
-    char *data = NULL;
+    gchar *data = NULL;
     gboolean read_title;
+    gchar *old_title;
 
-    g_free(self->title);
+    old_title = self->title;
      
     /* try netwm */
     if (!PROP_GETS(self->window, net_wm_name, utf8, &data))
@@ -1309,6 +1340,10 @@ void client_update_title(ObClient *self)
 	if (!PROP_GETS(self->window, wm_name, locale, &data))
 	    data = g_strdup("Unnamed Window");
 
+    /* did the title change? then reset the title_count */
+    if (old_title && 0 != strncmp(old_title, data, strlen(data)))
+        self->title_count = 1;
+
     /* look for duplicates and append a number */
     nums = 0;
     for (it = client_list; it; it = it->next)
@@ -1326,12 +1361,10 @@ void client_update_title(ObClient *self)
         }
     /* dont display the number for the first window */
     if (self->title_count > 1) {
-        char *vdata, *ndata;
-        ndata = g_strdup_printf(" - [%u]", self->title_count);
-        vdata = g_strconcat(data, ndata, NULL);
-        g_free(ndata);
+        char *ndata;
+        ndata = g_strdup_printf("%s - [%u]", data, self->title_count);
         g_free(data);
-        data = vdata;
+        data = ndata;
     }
 
     PROP_SETS(self->window, net_wm_visible_name, data);
@@ -1341,6 +1374,8 @@ void client_update_title(ObClient *self)
     if (self->frame)
 	frame_adjust_title(self->frame);
 
+    g_free(old_title);
+
     /* update the icon title */
     data = NULL;
     g_free(self->icon_title);
@@ -1390,7 +1425,7 @@ void client_update_class(ObClient *self)
     }
 
     if (PROP_GETS(self->window, wm_window_role, locale, &s))
-	self->role = g_strdup(s);
+	self->role = s;
 
     if (self->name == NULL) self->name = g_strdup("");
     if (self->class == NULL) self->class = g_strdup("");
@@ -1533,6 +1568,16 @@ void client_update_icons(ObClient *self)
         }
     }
 
+    if (!self->nicons) {
+        self->nicons++;
+        self->icons = g_new(ObClientIcon, self->nicons);
+        self->icons[self->nicons-1].width = 48;
+        self->icons[self->nicons-1].height = 48;
+        self->icons[self->nicons-1].data = g_memdup(ob_rr_theme->def_win_icon,
+                                                    sizeof(RrPixel32)
+                                                    * 48 * 48);
+    }
+
     if (self->frame)
 	frame_adjust_icon(self->frame);
 }
@@ -1713,7 +1758,7 @@ static void client_apply_startup_state(ObClient *self)
 	client_shade(self, TRUE);
     }
     if (self->urgent)
-        /* XXX do shit */;
+        client_urgent_notify(self);
   
     if (self->max_vert && self->max_horz) {
 	self->max_vert = self->max_horz = FALSE;
@@ -1740,6 +1785,8 @@ void client_configure_full(ObClient *self, ObCorner anchor,
                            gboolean user, gboolean final,
                            gboolean force_reply)
 {
+    gint oldw, oldh;
+    gboolean send_resize_client;
     gboolean moved = FALSE, resized = FALSE;
     guint fdecor = self->frame->decorations;
     gboolean fhorz = self->frame->max_horz;
@@ -1820,7 +1867,6 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
     if (!(w == self->area.width && h == self->area.height)) {
         int basew, baseh, minw, minh;
-        int mw, mh, aw, ah;
 
         /* base size is substituted with min size if not specified */
         if (self->base_size.width || self->base_size.height) {
@@ -1839,23 +1885,6 @@ void client_configure_full(ObClient *self, ObCorner anchor,
             minh = self->base_size.height;
         }
 
-        /* for interactive resizing. have to move half an increment in each
-           direction. */
-
-        /* how far we are towards the next size inc */
-        mw = (w - basew) % self->size_inc.width; 
-        mh = (h - baseh) % self->size_inc.height;
-        /* amount to add */
-        aw = self->size_inc.width / 2;
-        ah = self->size_inc.height / 2;
-        /* don't let us move into a new size increment */
-        if (mw + aw >= self->size_inc.width)
-            aw = self->size_inc.width - mw - 1;
-        if (mh + ah >= self->size_inc.height)
-            ah = self->size_inc.height - mh - 1;
-        w += aw;
-        h += ah;
-    
         /* if this is a user-requested resize, then check against min/max
            sizes */
 
@@ -1919,14 +1948,20 @@ void client_configure_full(ObClient *self, ObCorner anchor,
     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;
     RECT_SET(self->area, x, y, w, h);
 
     /* for app-requested resizes, always resize if 'resized' is true.
        for user-requested ones, only resize if final is true, or when
        resizing in redraw mode */
-    if ((!user && resized) ||
-        (user && (final || (resized && config_redraw_resize))))
-	XResizeWindow(ob_display, self->window, w, h);
+    send_resize_client = ((!user && resized) ||
+                          (user && (final ||
+                                    (resized && config_redraw_resize))));
+
+    /* if the client is enlarging, the resize the client before the frame */
+    if (send_resize_client && user && (w > oldw || h > oldh))
+        XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh));
 
     /* move/resize the frame to match the request */
     if (self->frame) {
@@ -1956,8 +1991,14 @@ void client_configure_full(ObClient *self, ObCorner anchor,
             event.xconfigure.override_redirect = FALSE;
             XSendEvent(event.xconfigure.display, event.xconfigure.window,
                        FALSE, StructureNotifyMask, &event);
-	}
+        }
     }
+
+    /* if the client is shrinking, then resize the frame before the client */
+    if (send_resize_client && (!user || (w <= oldw || h <= oldh)))
+        XResizeWindow(ob_display, self->window, w, h);
+
+    XFlush(ob_display);
 }
 
 void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
@@ -2012,7 +2053,7 @@ void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
 
     client_setup_decor_and_functions(self);
 
-    client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE);
+    client_move_resize(self, x, y, w, h);
 
     /* try focus us when we go into fullscreen mode */
     client_focus(self);
@@ -2188,7 +2229,7 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
 
     /* figure out where the client should be going */
     frame_frame_gravity(self->frame, &x, &y);
-    client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE);
+    client_move_resize(self, x, y, w, h);
 }
 
 void client_shade(ObClient *self, gboolean shade)
@@ -2511,12 +2552,17 @@ gboolean client_focus(ObClient *self)
         return FALSE;
     }
 
-    if (self->can_focus)
+    if (self->can_focus) {
         /* RevertToPointerRoot causes much more headache than RevertToNone, so
            I choose to use it always, hopefully to find errors quicker, if any
-           are left. (I hate X. I hate focus events.) */
-	XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
+           are left. (I hate X. I hate focus events.)
+           
+           Update: Changing this to RevertToNone fixed a bug with mozilla (bug
+           #799. So now it is RevertToNone again.
+        */
+	XSetInputFocus(ob_display, self->window, RevertToNone,
                        event_lasttime);
+    }
 
     if (self->focus_notify) {
 	XEvent ce;
@@ -2589,8 +2635,6 @@ ObClientIcon *client_icon(ObClient *self, int w, int h)
     /* li is the largest image < req */
     unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
 
-    if (!self->nicons) return NULL;
-
     for (i = 0; i < self->nicons; ++i) {
         size = self->icons[i].width * self->icons[i].height;
         if (size < smallest && size >= (unsigned)(w * h)) {
@@ -2771,13 +2815,15 @@ ObClient *client_search_transient(ObClient *self, ObClient *search)
     return NULL;
 }
 
-gchar* client_get_sm_client_id(ObClient *self)
+void client_update_sm_client_id(ObClient *self)
 {
-    gchar *id = NULL;
+    g_free(self->sm_client_id);
+    self->sm_client_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;
+    if (!PROP_GETS(self->window, sm_client_id, locale, &self->sm_client_id) &&
+        self->group)
+        PROP_GETS(self->group->leader, sm_client_id, locale,
+                  &self->sm_client_id);
 }
 
 /* finds the nearest edge in the given direction from the current client