]> Dogcows Code - chaz/openbox/blobdiff - openbox/client.c
add a NONE user action, for internal stuff, ie running actions without direct user...
[chaz/openbox] / openbox / client.c
index 59af202a6d426a9b28d14eb41da3c36026161ad7..725416bb922d4a59e14e576f2b4a49375d245199 100644 (file)
@@ -1,3 +1,21 @@
+/* -*- 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"
@@ -165,9 +183,6 @@ void client_manage_all()
        }
     }
     XFree(children);
-
-    if (config_focus_new)
-        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
 }
 
 void client_manage(Window window)
@@ -229,7 +244,6 @@ void client_manage(Window window)
     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);
@@ -262,7 +276,8 @@ void client_manage(Window window)
     client_restore_session_stacking(self);
 
     /* focus the new window? */
-    if (ob_state() != OB_STATE_STARTING && config_focus_new &&
+    if (ob_state() != OB_STATE_STARTING &&
+        (config_focus_new || client_search_focus_parent(self)) &&
         /* note the check against Type_Normal/Dialog, not client_normal(self),
            which would also include other types. in this case we want more
            strict rules for focus */
@@ -754,31 +769,33 @@ static void client_get_state(ObClient *self)
     guint num;
   
     if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) {
-       gulong i;
-       for (i = 0; i < num; ++i) {
-           if (state[i] == prop_atoms.net_wm_state_modal)
-               self->modal = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_shaded)
-               self->shaded = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_hidden)
-               self->iconic = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
-               self->skip_taskbar = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_skip_pager)
-               self->skip_pager = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_fullscreen)
-               self->fullscreen = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
-               self->max_vert = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
-               self->max_horz = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_above)
-               self->above = TRUE;
-           else if (state[i] == prop_atoms.net_wm_state_below)
-               self->below = TRUE;
-       }
+        gulong i;
+        for (i = 0; i < num; ++i) {
+            if (state[i] == prop_atoms.net_wm_state_modal)
+                self->modal = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_shaded)
+                self->shaded = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_hidden)
+                self->iconic = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
+                self->skip_taskbar = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_skip_pager)
+                self->skip_pager = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_fullscreen)
+                self->fullscreen = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
+                self->max_vert = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
+                self->max_horz = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_above)
+                self->above = TRUE;
+            else if (state[i] == prop_atoms.net_wm_state_below)
+                self->below = TRUE;
+            else if (state[i] == prop_atoms.ob_wm_state_undecorated)
+                self->undecorated = TRUE;
+        }
 
-       g_free(state);
+        g_free(state);
     }
 }
 
@@ -1139,7 +1156,7 @@ void client_setup_decor_and_functions(ObClient *self)
 
     /* finally, the user can have requested no decorations, which overrides
        everything */
-    if (!self->decorate)
+    if (self->undecorated)
         self->decorations = OB_FRAME_DECOR_BORDER;
 
     /* if we don't have a titlebar, then we cannot shade! */
@@ -1291,16 +1308,14 @@ void client_update_wmhints(ObClient *self)
         /* the WM_HINTS can contain an icon */
         client_update_icons(self);
 
-       XFree(hints);
+        XFree(hints);
     }
 
     if (ur != self->urgent) {
-       self->urgent = ur;
-       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)
+        self->urgent = ur;
+        /* fire the urgent callback if we're mapped, otherwise, wait until
+           after we're mapped */
+        if (self->frame)
             client_urgent_notify(self);
     }
 }
@@ -1567,7 +1582,7 @@ void client_update_icons(ObClient *self)
 static void client_change_state(ObClient *self)
 {
     guint32 state[2];
-    guint32 netstate[10];
+    guint32 netstate[11];
     guint num;
 
     state[0] = self->wmstate;
@@ -1576,31 +1591,33 @@ static void client_change_state(ObClient *self)
 
     num = 0;
     if (self->modal)
-       netstate[num++] = prop_atoms.net_wm_state_modal;
+        netstate[num++] = prop_atoms.net_wm_state_modal;
     if (self->shaded)
-       netstate[num++] = prop_atoms.net_wm_state_shaded;
+        netstate[num++] = prop_atoms.net_wm_state_shaded;
     if (self->iconic)
-       netstate[num++] = prop_atoms.net_wm_state_hidden;
+        netstate[num++] = prop_atoms.net_wm_state_hidden;
     if (self->skip_taskbar)
-       netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
+        netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
     if (self->skip_pager)
-       netstate[num++] = prop_atoms.net_wm_state_skip_pager;
+        netstate[num++] = prop_atoms.net_wm_state_skip_pager;
     if (self->fullscreen)
-       netstate[num++] = prop_atoms.net_wm_state_fullscreen;
+        netstate[num++] = prop_atoms.net_wm_state_fullscreen;
     if (self->max_vert)
-       netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
+        netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
     if (self->max_horz)
-       netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
+        netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
     if (self->above)
-       netstate[num++] = prop_atoms.net_wm_state_above;
+        netstate[num++] = prop_atoms.net_wm_state_above;
     if (self->below)
-       netstate[num++] = prop_atoms.net_wm_state_below;
+        netstate[num++] = prop_atoms.net_wm_state_below;
+    if (self->undecorated)
+        netstate[num++] = prop_atoms.ob_wm_state_undecorated;
     PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
 
     client_calc_layer(self);
 
     if (self->frame)
-       frame_adjust_state(self->frame);
+        frame_adjust_state(self->frame);
 }
 
 ObClient *client_search_focus_tree(ObClient *self)
@@ -1647,7 +1664,9 @@ static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
 
-    if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+    if (self->fullscreen &&
+        (client_focused(self) || client_search_focus_tree(self)))
+        l = OB_STACKING_LAYER_FULLSCREEN;
     else if (self->type == OB_CLIENT_TYPE_DESKTOP)
         l = OB_STACKING_LAYER_DESKTOP;
     else if (self->type == OB_CLIENT_TYPE_DOCK) {
@@ -1728,29 +1747,33 @@ static void client_apply_startup_state(ObClient *self)
     /* these are in a carefully crafted order.. */
 
     if (self->iconic) {
-       self->iconic = FALSE;
-       client_iconify(self, TRUE, FALSE);
+        self->iconic = FALSE;
+        client_iconify(self, TRUE, FALSE);
     }
     if (self->fullscreen) {
-       self->fullscreen = FALSE;
-       client_fullscreen(self, TRUE, FALSE);
+        self->fullscreen = FALSE;
+        client_fullscreen(self, TRUE, FALSE);
+    }
+    if (self->undecorated) {
+        self->undecorated = FALSE;
+        client_set_undecorated(self, TRUE);
     }
     if (self->shaded) {
-       self->shaded = FALSE;
-       client_shade(self, TRUE);
+        self->shaded = FALSE;
+        client_shade(self, TRUE);
     }
     if (self->urgent)
         client_urgent_notify(self);
   
     if (self->max_vert && self->max_horz) {
-       self->max_vert = self->max_horz = FALSE;
-       client_maximize(self, TRUE, 0, FALSE);
+        self->max_vert = self->max_horz = FALSE;
+        client_maximize(self, TRUE, 0, FALSE);
     } else if (self->max_vert) {
-       self->max_vert = FALSE;
-       client_maximize(self, TRUE, 2, FALSE);
+        self->max_vert = FALSE;
+        client_maximize(self, TRUE, 2, FALSE);
     } else if (self->max_horz) {
-       self->max_horz = FALSE;
-       client_maximize(self, TRUE, 1, FALSE);
+        self->max_horz = FALSE;
+        client_maximize(self, TRUE, 1, FALSE);
     }
 
     /* nothing to do for the other states:
@@ -1942,8 +1965,8 @@ void client_configure_full(ObClient *self, ObCorner anchor,
                                     (resized && config_redraw_resize))));
 
     /* if the client is enlarging, the resize the client before the frame */
-    if (send_resize_client && (w > oldw || h > oldh))
-       XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh));
+    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) {
@@ -1973,12 +1996,12 @@ 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 && (w <= oldw || h <= oldh))
-       XResizeWindow(ob_display, self->window, w, h);
+    if (send_resize_client && (!user || (w <= oldw || h <= oldh)))
+        XResizeWindow(ob_display, self->window, w, h);
 
     XFlush(ob_display);
 }
@@ -1995,42 +2018,31 @@ void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
                                   and adjust out layer/stacking */
 
     if (fs) {
-       if (savearea) {
-           guint32 dimensions[4];
-           dimensions[0] = self->area.x;
-           dimensions[1] = self->area.y;
-           dimensions[2] = self->area.width;
-           dimensions[3] = self->area.height;
-  
-           PROP_SETA32(self->window, openbox_premax, cardinal,
-                       dimensions, 4);
-       }
+        if (savearea)
+            self->pre_fullscreen_area = self->area;
 
         /* these are not actually used cuz client_configure will set them
            as appropriate when the window is fullscreened */
         x = y = w = h = 0;
     } else {
-        guint num;
-       gint32 *dimensions;
         Rect *a;
 
-        /* pick some fallbacks... */
-        a = screen_area_monitor(self->desktop, 0);
-        x = a->x + a->width / 4;
-        y = a->y + a->height / 4;
-        w = a->width / 2;
-        h = a->height / 2;
-
-       if (PROP_GETA32(self->window, openbox_premax, cardinal,
-                        (guint32**)&dimensions, &num)) {
-            if (num == 4) {
-                x = dimensions[0];
-                y = dimensions[1];
-                w = dimensions[2];
-                h = dimensions[3];
-            }
-           g_free(dimensions);
-       }
+        if (self->pre_fullscreen_area.width > 0 &&
+            self->pre_fullscreen_area.height > 0)
+        {
+            x = self->pre_fullscreen_area.x;
+            y = self->pre_fullscreen_area.y;
+            w = self->pre_fullscreen_area.width;
+            h = self->pre_fullscreen_area.height;
+            RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0);
+        } else {
+            /* pick some fallbacks... */
+            a = screen_area_monitor(self->desktop, 0);
+            x = a->x + a->width / 4;
+            y = a->y + a->height / 4;
+            w = a->width / 2;
+            h = a->height / 2;
+        }
     }
 
     client_setup_decor_and_functions(self);
@@ -2056,7 +2068,14 @@ static void client_iconify_recursive(ObClient *self,
 
         if (iconic) {
             if (self->functions & OB_CLIENT_FUNC_ICONIFY) {
+                long old;
+
+                old = self->wmstate;
                 self->wmstate = IconicState;
+                if (old != self->wmstate)
+                    PROP_MSG(self->window, kde_wm_change_state,
+                             self->wmstate, 1, 0, 0);
+
                 self->ignore_unmaps++;
                 /* we unmap the client itself so that we can get MapRequest
                    events, and because the ICCCM tells us to! */
@@ -2070,9 +2089,17 @@ static void client_iconify_recursive(ObClient *self,
                 changed = TRUE;
             }
         } else {
+            long old;
+
             if (curdesk)
                 client_set_desktop(self, screen_desktop, FALSE);
+
+            old = self->wmstate;
             self->wmstate = self->shaded ? IconicState : NormalState;
+            if (old != self->wmstate)
+                PROP_MSG(self->window, kde_wm_change_state,
+                         self->wmstate, 1, 0, 0);
+
             XMapWindow(ob_display, self->window);
 
             /* this puts it after the current focused window */
@@ -2119,98 +2146,66 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
 
     /* check if already done */
     if (max) {
-       if (dir == 0 && self->max_horz && self->max_vert) return;
-       if (dir == 1 && self->max_horz) return;
-       if (dir == 2 && self->max_vert) return;
+        if (dir == 0 && self->max_horz && self->max_vert) return;
+        if (dir == 1 && self->max_horz) return;
+        if (dir == 2 && self->max_vert) return;
     } else {
-       if (dir == 0 && !self->max_horz && !self->max_vert) return;
-       if (dir == 1 && !self->max_horz) return;
-       if (dir == 2 && !self->max_vert) return;
+        if (dir == 0 && !self->max_horz && !self->max_vert) return;
+        if (dir == 1 && !self->max_horz) return;
+        if (dir == 2 && !self->max_vert) return;
     }
 
-    /* work with the frame's coords */
-    x = self->frame->area.x;
-    y = self->frame->area.y;
+    /* we just tell it to configure in the same place and client_configure
+       worries about filling the screen with the window */
+    x = self->area.x;
+    y = self->area.y;
     w = self->area.width;
     h = self->area.height;
 
     if (max) {
-       if (savearea) {
-           gint32 dimensions[4];
-           gint32 *readdim;
-            guint num;
-
-           dimensions[0] = x;
-           dimensions[1] = y;
-           dimensions[2] = w;
-           dimensions[3] = h;
-
-           /* get the property off the window and use it for the dimensions
-              we are already maxed on */
-           if (PROP_GETA32(self->window, openbox_premax, cardinal,
-                           (guint32**)&readdim, &num)) {
-                if (num == 4) {
-                    if (self->max_horz) {
-                        dimensions[0] = readdim[0];
-                        dimensions[2] = readdim[2];
-                    }
-                    if (self->max_vert) {
-                        dimensions[1] = readdim[1];
-                        dimensions[3] = readdim[3];
-                    }
-                }
-               g_free(readdim);
-           }
-
-           PROP_SETA32(self->window, openbox_premax, cardinal,
-                       (guint32*)dimensions, 4);
-       }
+        if (savearea)
+            self->pre_max_area = self->area;
     } else {
-        guint num;
-       gint32 *dimensions;
         Rect *a;
 
-        /* pick some fallbacks... */
         a = screen_area_monitor(self->desktop, 0);
-        if (dir == 0 || dir == 1) { /* horz */
-            x = a->x + a->width / 4;
-            w = a->width / 2;
-        }
-        if (dir == 0 || dir == 2) { /* vert */
-            y = a->y + a->height / 4;
-            h = a->height / 2;
+        if ((dir == 0 || dir == 1) && self->max_horz) { /* horz */
+            if (self->pre_max_area.width > 0) {
+                x = self->pre_max_area.x;
+                w = self->pre_max_area.width;
+
+                RECT_SET(self->pre_max_area, 0, self->pre_max_area.y,
+                         0, self->pre_max_area.height);
+            } else {
+                /* pick some fallbacks... */
+                x = a->x + a->width / 4;
+                w = a->width / 2;
+            }
         }
+        if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */
+            if (self->pre_max_area.height > 0) {
+                y = self->pre_max_area.y;
+                h = self->pre_max_area.height;
 
-       if (PROP_GETA32(self->window, openbox_premax, cardinal,
-                       (guint32**)&dimensions, &num)) {
-            if (num == 4) {
-                if (dir == 0 || dir == 1) { /* horz */
-                    x = dimensions[0];
-                    w = dimensions[2];
-                }
-                if (dir == 0 || dir == 2) { /* vert */
-                    y = dimensions[1];
-                    h = dimensions[3];
-                }
+                RECT_SET(self->pre_max_area, self->pre_max_area.x, 0,
+                         self->pre_max_area.width, 0);
+            } else {
+                /* pick some fallbacks... */
+                y = a->y + a->height / 4;
+                h = a->height / 2;
             }
-            g_free(dimensions);
-       }
+        }
     }
 
     if (dir == 0 || dir == 1) /* horz */
-       self->max_horz = max;
+        self->max_horz = max;
     if (dir == 0 || dir == 2) /* vert */
-       self->max_vert = max;
-
-    if (!self->max_horz && !self->max_vert)
-       PROP_ERASE(self->window, openbox_premax);
+        self->max_vert = max;
 
     client_change_state(self); /* change the state hints on the client */
 
     client_setup_decor_and_functions(self);
 
-    /* figure out where the client should be going */
-    frame_frame_gravity(self->frame, &x, &y);
     client_move_resize(self, x, y, w, h);
 }
 
@@ -2221,8 +2216,16 @@ void client_shade(ObClient *self, gboolean shade)
        self->shaded == shade) return;     /* already done */
 
     /* when we're iconic, don't change the wmstate */
-    if (!self->iconic)
-       self->wmstate = shade ? IconicState : NormalState;
+    if (!self->iconic) {
+        long old;
+
+        old = self->wmstate;
+        self->wmstate = shade ? IconicState : NormalState;
+        if (old != self->wmstate)
+            PROP_MSG(self->window, kde_wm_change_state,
+                     self->wmstate, 1, 0, 0);
+    }
+
     self->shaded = shade;
     client_change_state(self);
     /* resize the frame to just the titlebar */
@@ -2354,122 +2357,132 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2)
 {
     gboolean shaded = self->shaded;
     gboolean fullscreen = self->fullscreen;
+    gboolean undecorated = self->undecorated;
     gboolean max_horz = self->max_horz;
     gboolean max_vert = self->max_vert;
     int i;
 
     if (!(action == prop_atoms.net_wm_state_add ||
-         action == prop_atoms.net_wm_state_remove ||
-         action == prop_atoms.net_wm_state_toggle))
-       /* an invalid action was passed to the client message, ignore it */
-       return; 
+          action == prop_atoms.net_wm_state_remove ||
+          action == prop_atoms.net_wm_state_toggle))
+        /* an invalid action was passed to the client message, ignore it */
+        return; 
 
     for (i = 0; i < 2; ++i) {
-       Atom state = i == 0 ? data1 : data2;
+        Atom state = i == 0 ? data1 : data2;
     
-       if (!state) continue;
-
-       /* if toggling, then pick whether we're adding or removing */
-       if (action == prop_atoms.net_wm_state_toggle) {
-           if (state == prop_atoms.net_wm_state_modal)
-               action = self->modal ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_maximized_vert)
-               action = self->max_vert ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_maximized_horz)
-               action = self->max_horz ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_shaded)
-               action = self->shaded ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_skip_taskbar)
-               action = self->skip_taskbar ?
-                   prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_skip_pager)
-               action = self->skip_pager ?
-                   prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_fullscreen)
-               action = self->fullscreen ?
-                   prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_above)
-               action = self->above ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-           else if (state == prop_atoms.net_wm_state_below)
-               action = self->below ? prop_atoms.net_wm_state_remove :
-                   prop_atoms.net_wm_state_add;
-       }
+        if (!state) continue;
+
+        /* if toggling, then pick whether we're adding or removing */
+        if (action == prop_atoms.net_wm_state_toggle) {
+            if (state == prop_atoms.net_wm_state_modal)
+                action = self->modal ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_maximized_vert)
+                action = self->max_vert ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_maximized_horz)
+                action = self->max_horz ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_shaded)
+                action = shaded ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_skip_taskbar)
+                action = self->skip_taskbar ?
+                    prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_skip_pager)
+                action = self->skip_pager ?
+                    prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_fullscreen)
+                action = fullscreen ?
+                    prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_above)
+                action = self->above ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.net_wm_state_below)
+                action = self->below ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+            else if (state == prop_atoms.ob_wm_state_undecorated)
+                action = undecorated ? prop_atoms.net_wm_state_remove :
+                    prop_atoms.net_wm_state_add;
+        }
     
-       if (action == prop_atoms.net_wm_state_add) {
-           if (state == prop_atoms.net_wm_state_modal) {
-               /* XXX raise here or something? */
-               self->modal = TRUE;
-           } else if (state == prop_atoms.net_wm_state_maximized_vert) {
-               max_vert = TRUE;
-           } else if (state == prop_atoms.net_wm_state_maximized_horz) {
-               max_horz = TRUE;
-           } else if (state == prop_atoms.net_wm_state_shaded) {
-               shaded = TRUE;
-           } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
-               self->skip_taskbar = TRUE;
-           } else if (state == prop_atoms.net_wm_state_skip_pager) {
-               self->skip_pager = TRUE;
-           } else if (state == prop_atoms.net_wm_state_fullscreen) {
-               fullscreen = TRUE;
-           } else if (state == prop_atoms.net_wm_state_above) {
-               self->above = TRUE;
-           } else if (state == prop_atoms.net_wm_state_below) {
-               self->below = TRUE;
-           }
+        if (action == prop_atoms.net_wm_state_add) {
+            if (state == prop_atoms.net_wm_state_modal) {
+                /* XXX raise here or something? */
+                self->modal = TRUE;
+            } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+                max_vert = TRUE;
+            } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+                max_horz = TRUE;
+            } else if (state == prop_atoms.net_wm_state_shaded) {
+                shaded = TRUE;
+            } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+                self->skip_taskbar = TRUE;
+            } else if (state == prop_atoms.net_wm_state_skip_pager) {
+                self->skip_pager = TRUE;
+            } else if (state == prop_atoms.net_wm_state_fullscreen) {
+                fullscreen = TRUE;
+            } else if (state == prop_atoms.net_wm_state_above) {
+                self->above = TRUE;
+            } else if (state == prop_atoms.net_wm_state_below) {
+                self->below = TRUE;
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
+                undecorated = TRUE;
+            }
 
-       } else { /* action == prop_atoms.net_wm_state_remove */
-           if (state == prop_atoms.net_wm_state_modal) {
-               self->modal = FALSE;
-           } else if (state == prop_atoms.net_wm_state_maximized_vert) {
-               max_vert = FALSE;
-           } else if (state == prop_atoms.net_wm_state_maximized_horz) {
-               max_horz = FALSE;
-           } else if (state == prop_atoms.net_wm_state_shaded) {
-               shaded = FALSE;
-           } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
-               self->skip_taskbar = FALSE;
-           } else if (state == prop_atoms.net_wm_state_skip_pager) {
-               self->skip_pager = FALSE;
-           } else if (state == prop_atoms.net_wm_state_fullscreen) {
-               fullscreen = FALSE;
-           } else if (state == prop_atoms.net_wm_state_above) {
-               self->above = FALSE;
-           } else if (state == prop_atoms.net_wm_state_below) {
-               self->below = FALSE;
-           }
-       }
+        } else { /* action == prop_atoms.net_wm_state_remove */
+            if (state == prop_atoms.net_wm_state_modal) {
+                self->modal = FALSE;
+            } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+                max_vert = FALSE;
+            } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+                max_horz = FALSE;
+            } else if (state == prop_atoms.net_wm_state_shaded) {
+                shaded = FALSE;
+            } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+                self->skip_taskbar = FALSE;
+            } else if (state == prop_atoms.net_wm_state_skip_pager) {
+                self->skip_pager = FALSE;
+            } else if (state == prop_atoms.net_wm_state_fullscreen) {
+                fullscreen = FALSE;
+            } else if (state == prop_atoms.net_wm_state_above) {
+                self->above = FALSE;
+            } else if (state == prop_atoms.net_wm_state_below) {
+                self->below = FALSE;
+            } else if (state == prop_atoms.ob_wm_state_undecorated) {
+                undecorated = FALSE;
+            }
+        }
     }
     if (max_horz != self->max_horz || max_vert != self->max_vert) {
-       if (max_horz != self->max_horz && max_vert != self->max_vert) {
-           /* toggling both */
-           if (max_horz == max_vert) { /* both going the same way */
-               client_maximize(self, max_horz, 0, TRUE);
-           } else {
-               client_maximize(self, max_horz, 1, TRUE);
-               client_maximize(self, max_vert, 2, TRUE);
-           }
-       } else {
-           /* toggling one */
-           if (max_horz != self->max_horz)
-               client_maximize(self, max_horz, 1, TRUE);
-           else
-               client_maximize(self, max_vert, 2, TRUE);
-       }
+        if (max_horz != self->max_horz && max_vert != self->max_vert) {
+            /* toggling both */
+            if (max_horz == max_vert) { /* both going the same way */
+                client_maximize(self, max_horz, 0, TRUE);
+            } else {
+                client_maximize(self, max_horz, 1, TRUE);
+                client_maximize(self, max_vert, 2, TRUE);
+            }
+        } else {
+            /* toggling one */
+            if (max_horz != self->max_horz)
+                client_maximize(self, max_horz, 1, TRUE);
+            else
+                client_maximize(self, max_vert, 2, TRUE);
+        }
     }
     /* change fullscreen state before shading, as it will affect if the window
        can shade or not */
     if (fullscreen != self->fullscreen)
-       client_fullscreen(self, fullscreen, TRUE);
+        client_fullscreen(self, fullscreen, TRUE);
     if (shaded != self->shaded)
-       client_shade(self, shaded);
+        client_shade(self, shaded);
+    if (undecorated != self->undecorated)
+        client_set_undecorated(self, undecorated);
     client_calc_layer(self);
     client_change_state(self); /* change the hint to reflect these changes */
 }
@@ -2576,11 +2589,12 @@ gboolean client_focus(ObClient *self)
 
 void client_unfocus(ObClient *self)
 {
-    g_assert(focus_client == self);
+    if (focus_client == self) {
 #ifdef DEBUG_FOCUS
-    ob_debug("client_unfocus for %lx\n", self->window);
+        ob_debug("client_unfocus for %lx\n", self->window);
 #endif
-    focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
+        focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
+    }
 }
 
 void client_activate(ObClient *self, gboolean here)
@@ -2601,8 +2615,8 @@ void client_activate(ObClient *self, gboolean here)
         return;
     if (self->shaded)
         client_shade(self, FALSE);
-    client_focus(self);
-    stacking_raise(CLIENT_AS_WINDOW(self));
+    action_run_string("Focus", self);
+    action_run_string("Raise", self);
 }
 
 gboolean client_focused(ObClient *self)
@@ -2746,6 +2760,15 @@ void client_set_layer(ObClient *self, int layer)
     client_change_state(self); /* reflect this in the state hints */
 }
 
+void client_set_undecorated(ObClient *self, gboolean undecorated)
+{
+    if (self->undecorated != undecorated) {
+        self->undecorated = undecorated;
+        client_setup_decor_and_functions(self);
+        client_change_state(self); /* reflect this in the state hints */
+    }
+}
+
 guint client_monitor(ObClient *self)
 {
     guint i;
@@ -2784,6 +2807,52 @@ ObClient *client_search_top_transient(ObClient *self)
     return self;
 }
 
+ObClient *client_search_focus_parent(ObClient *self)
+{
+    if (self->transient_for) {
+        if (self->transient_for != OB_TRAN_GROUP) {
+            if (client_focused(self->transient_for))
+                return self->transient_for;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next) {
+                ObClient *c = it->data;
+
+                /* checking transient_for prevents infinate loops! */
+                if (c != self && !c->transient_for)
+                    if (client_focused(c))
+                        return c;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+ObClient *client_search_parent(ObClient *self, ObClient *search)
+{
+    if (self->transient_for) {
+        if (self->transient_for != OB_TRAN_GROUP) {
+            if (self->transient_for == search)
+                return search;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next) {
+                ObClient *c = it->data;
+
+                /* checking transient_for prevents infinate loops! */
+                if (c != self && !c->transient_for)
+                    if (c == search)
+                        return search;
+            }
+        }
+    }
+
+    return NULL;
+}
+
 ObClient *client_search_transient(ObClient *self, ObClient *search)
 {
     GSList *sit;
@@ -2992,9 +3061,29 @@ int client_directional_edge_search(ObClient *c, ObDirection dir)
     case OB_DIRECTION_NORTHWEST:
     case OB_DIRECTION_SOUTHWEST:
         /* not implemented */
-        break;
     default:
-            g_assert_not_reached();
+        g_assert_not_reached();
     }
     return dest;
 }
+
+ObClient* client_under_pointer()
+{
+    int x, y;
+    GList *it;
+    ObClient *ret = NULL;
+
+    if (screen_pointer_pos(&x, &y)) {
+        for (it = stacking_list; it != NULL; it = it->next) {
+            if (WINDOW_IS_CLIENT(it->data)) {
+                ObClient *c = WINDOW_AS_CLIENT(it->data);
+                if (c->desktop == screen_desktop &&
+                    RECT_CONTAINS(c->frame->area, x, y)) {
+                    ret = c;
+                    break;
+                }
+            }
+        }
+    }
+    return ret;
+}
This page took 0.048877 seconds and 4 git commands to generate.