X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=961c6bbf3c696c2bad8498984a88857cb15ceb10;hb=0964b804a135243968de22695b953f19f9e8b9d1;hp=c57c66e84571ec5e4ec90813ffb6e3a150722924;hpb=4a2400c5c2f86cacbf907cfc13488cd212cc3d17;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index c57c66e8..961c6bbf 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -18,6 +18,8 @@
 #include "group.h"
 #include "config.h"
 #include "menu.h"
+#include "keyboard.h"
+#include "mouse.h"
 #include "render/render.h"
 
 #include <glib.h>
@@ -45,6 +47,7 @@ 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);
+static void client_restore_session_stacking(ObClient *self);
 
 void client_startup()
 {
@@ -259,6 +262,7 @@ void client_manage(Window window)
     focus_order_add_new(self);
 
     stacking_add(CLIENT_AS_WINDOW(self));
+    client_restore_session_stacking(self);
 
     /* focus the new window? */
     if (ob_state() != OB_STATE_STARTING && config_focus_new &&
@@ -302,7 +306,8 @@ void client_manage(Window window)
     dispatch_client(Event_Client_New, self, 0, 0);
 
     /* make sure the window is visible */
-    client_move_onscreen(self, TRUE);
+    if (ob_state() == OB_STATE_RUNNING)
+        client_move_onscreen(self, TRUE);
 
     screen_update_areas();
 
@@ -327,6 +332,9 @@ void client_manage(Window window)
     /* update the list hints */
     client_set_list();
 
+    keyboard_grab_for_client(self, TRUE);
+    mouse_grab_for_client(self, TRUE);
+
     dispatch_client(Event_Client_Mapped, self, 0, 0);
 
     ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
@@ -355,6 +363,9 @@ void client_unmanage(ObClient *self)
     dispatch_client(Event_Client_Destroy, self, 0, 0);
     g_assert(self != NULL);
 
+    keyboard_grab_for_client(self, FALSE);
+    mouse_grab_for_client(self, FALSE);
+
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, self->window, SetModeDelete);
 
@@ -463,30 +474,55 @@ void client_unmanage(ObClient *self)
 
 static void client_restore_session_state(ObClient *self)
 {
-    ObSessionState *s;
+    GList *it;
+
+    if (!(it = session_state_find(self)))
+        return;
 
-    s = session_state_find(self);
-    if (!(s)) return;
+    self->session = it->data;
 
-    RECT_SET(self->area, s->x, s->y, s->w, s->h);
+    RECT_SET(self->area, self->session->x, self->session->y,
+             self->session->w, self->session->h);
     self->positioned = TRUE;
-    XResizeWindow(ob_display, self->window, s->w, s->h);
+    XResizeWindow(ob_display, self->window,
+                  self->session->w, self->session->h);
 
-    self->desktop = s->desktop == DESKTOP_ALL ? s->desktop :
-        MIN(screen_num_desktops - 1, s->desktop);
+    self->desktop = (self->session->desktop == DESKTOP_ALL ?
+                     self->session->desktop :
+                     MIN(screen_num_desktops - 1, self->session->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;
+    self->shaded = self->session->shaded;
+    self->iconic = self->session->iconic;
+    self->skip_pager = self->session->skip_pager;
+    self->skip_taskbar = self->session->skip_taskbar;
+    self->fullscreen = self->session->fullscreen;
+    self->above = self->session->above;
+    self->below = self->session->below;
+    self->max_horz = self->session->max_horz;
+    self->max_vert = self->session->max_vert;
+}
 
-    session_state_free(s);
+static void client_restore_session_stacking(ObClient *self)
+{
+    GList *it;
+
+    if (!self->session) return;
+
+    it = g_list_find(session_saved_state, self->session);
+    for (it = g_list_previous(it); it; it = g_list_previous(it)) {
+        GList *cit;
+
+        for (cit = client_list; cit; cit = g_list_next(cit))
+            if (session_state_cmp(it->data, cit->data))
+                break;
+        if (cit) {
+            client_calc_layer(self);
+            stacking_below(CLIENT_AS_WINDOW(self),
+                           CLIENT_AS_WINDOW(cit->data));
+            break;
+        }
+    }
 }
 
 void client_move_onscreen(ObClient *self, gboolean rude)
@@ -494,7 +530,8 @@ 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)) {
+                             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);
@@ -620,6 +657,7 @@ static void client_get_all(ObClient *self)
   
     /* defaults */
     self->frame = NULL;
+    self->session = NULL;
     self->title = self->icon_title = NULL;
     self->title_count = 1;
     self->name = self->class = self->role = NULL;
@@ -1096,7 +1134,7 @@ void client_setup_decor_and_functions(ObClient *self)
     /* finally, the user can have requested no decorations, which overrides
        everything */
     if (!self->decorate)
-        self->decorations = 0;
+        self->decorations = OB_FRAME_DECOR_BORDER;
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
@@ -1113,13 +1151,8 @@ void client_setup_decor_and_functions(ObClient *self)
     client_change_allowed_actions(self);
 
     if (self->frame) {
-        /* this makes sure that these windows appear on all desktops */
-        if (self->type == OB_CLIENT_TYPE_DESKTOP &&
-            self->desktop != DESKTOP_ALL)
-            client_set_desktop(self, DESKTOP_ALL, FALSE);
-
-	/* adjust the client's decorations, etc. */
-	client_reconfigure(self);
+        /* adjust the client's decorations, etc. */
+        client_reconfigure(self);
     } else {
         /* this makes sure that these windows appear on all desktops */
         if (self->type == OB_CLIENT_TYPE_DESKTOP &&
@@ -1709,6 +1742,12 @@ void client_configure_full(ObClient *self, ObCorner anchor,
                            gboolean force_reply)
 {
     gboolean moved = FALSE, resized = FALSE;
+    guint fdecor = self->frame->decorations;
+
+    /* make the frame recalculate its dimentions n shit without changing
+       anything visible for real, this way the constraints below can work with
+       the updated frame dimensions. */
+    frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
 
     /* gets the frame's position */
     frame_client_gravity(self->frame, &x, &y);
@@ -1755,8 +1794,8 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
         /* set the size and position if maximized */
         if (self->max_horz) {
-            x = a->x - self->frame->size.left;
-            w = a->width;
+            x = a->x;
+            w = a->width - self->frame->size.left - self->frame->size.right;
         }
         if (self->max_vert) {
             y = a->y;
@@ -1887,18 +1926,18 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
     /* for app-requested resizes, always resize if 'resized' is true.
        for user-requested ones, only resize if final is true, or when
-       resizing in opaque mode */
+       resizing in redraw mode */
     if ((!user && resized) ||
-        (user && (final || (resized && config_opaque_resize))))
+        (user && (final || (resized && config_redraw_resize))))
 	XResizeWindow(ob_display, self->window, w, h);
 
     /* move/resize the frame to match the request */
     if (self->frame) {
-        if (self->decorations != self->frame->decorations)
+        if (self->decorations != fdecor)
             moved = resized = TRUE;
 
         if (moved || resized)
-            frame_adjust_area(self->frame, moved, resized);
+            frame_adjust_area(self->frame, moved, resized, FALSE);
 
         if (!resized && (force_reply || ((!user && moved) || (user && final))))
         {
@@ -2168,7 +2207,7 @@ void client_shade(ObClient *self, gboolean shade)
     self->shaded = shade;
     client_change_state(self);
     /* resize the frame to just the titlebar */
-    frame_adjust_area(self->frame, FALSE, FALSE);
+    frame_adjust_area(self->frame, FALSE, FALSE, FALSE);
 }
 
 void client_close(ObClient *self)
@@ -2522,16 +2561,19 @@ void client_unfocus(ObClient *self)
     focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
 
-void client_activate(ObClient *self)
+void client_activate(ObClient *self, gboolean here)
 {
     if (client_normal(self) && screen_showing_desktop)
         screen_show_desktop(FALSE);
     if (self->iconic)
         client_iconify(self, FALSE, FALSE);
     if (self->desktop != DESKTOP_ALL &&
-        self->desktop != screen_desktop)
-        screen_set_desktop(self->desktop);
-    else if (!self->frame->visible)
+        self->desktop != screen_desktop) {
+        if (here)
+            client_set_desktop(self, screen_desktop, FALSE);
+        else
+            screen_set_desktop(self->desktop);
+    } else if (!self->frame->visible)
         /* if its not visible for other reasons, then don't mess
            with it */
         return;
@@ -2614,7 +2656,8 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir)
         his_cy = (cur->frame->area.y - my_cy)
             + cur->frame->area.height / 2;
 
-        if(dir > 3) { 
+        if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST ||
+           dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) {
             int tx;
             /* Rotate the diagonals 45 degrees counterclockwise.
              * To do this, multiply the matrix /+h +h\ with the
@@ -2742,3 +2785,194 @@ gchar* client_get_sm_client_id(ObClient *self)
         PROP_GETS(self->group->leader, sm_client_id, locale, &id);
     return id;
 }
+
+/* finds the nearest edge in the given direction from the current client
+ * note to self: the edge is the -frame- edge (the actual one), not the
+ * client edge.
+ */
+int client_directional_edge_search(ObClient *c, ObDirection dir)
+{
+    int dest;
+    int my_edge_start, my_edge_end, my_offset;
+    GList *it;
+    Rect *a;
+    
+    if(!client_list)
+        return -1;
+
+    a = screen_area(c->desktop);
+
+    switch(dir) {
+    case OB_DIRECTION_NORTH:
+        my_edge_start = c->frame->area.x;
+        my_edge_end = c->frame->area.x + c->frame->area.width;
+        my_offset = c->frame->area.y;
+        
+        dest = a->y; /* default: top of screen */
+
+        for(it = g_list_first(client_list); it; it = it->next) {
+            int his_edge_start, his_edge_end, his_offset;
+            ObClient *cur = it->data;
+
+            if(cur == c)
+                continue;
+            if(!client_normal(cur))
+                continue;
+            if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+                continue;
+            if(cur->iconic)
+                continue;
+
+            his_edge_start = cur->frame->area.x;
+            his_edge_end = cur->frame->area.x + cur->frame->area.width;
+            his_offset = cur->frame->area.y + cur->frame->area.height;
+
+            if(his_offset + 1 > my_offset)
+                continue;
+
+            if(his_offset < dest)
+                continue;
+            
+            if(his_edge_start >= my_edge_start &&
+               his_edge_start <= my_edge_end)
+                dest = his_offset;
+
+            if(my_edge_start >= his_edge_start &&
+               my_edge_start <= his_edge_end)
+                dest = his_offset;
+
+        }
+        break;
+    case OB_DIRECTION_SOUTH:
+        my_edge_start = c->frame->area.x;
+        my_edge_end = c->frame->area.x + c->frame->area.width;
+        my_offset = c->frame->area.y + c->frame->area.height;
+        
+        dest = a->y + a->height; /* default: bottom of screen */
+
+        for(it = g_list_first(client_list); it; it = it->next) {
+            int his_edge_start, his_edge_end, his_offset;
+            ObClient *cur = it->data;
+
+            if(cur == c)
+                continue;
+            if(!client_normal(cur))
+                continue;
+            if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+                continue;
+            if(cur->iconic)
+                continue;
+
+            his_edge_start = cur->frame->area.x;
+            his_edge_end = cur->frame->area.x + cur->frame->area.width;
+            his_offset = cur->frame->area.y;
+
+
+            if(his_offset - 1 < my_offset)
+                continue;
+            
+            if(his_offset > dest)
+                continue;
+            
+            if(his_edge_start >= my_edge_start &&
+               his_edge_start <= my_edge_end)
+                dest = his_offset;
+
+            if(my_edge_start >= his_edge_start &&
+               my_edge_start <= his_edge_end)
+                dest = his_offset;
+
+        }
+        break;
+    case OB_DIRECTION_WEST:
+        my_edge_start = c->frame->area.y;
+        my_edge_end = c->frame->area.y + c->frame->area.height;
+        my_offset = c->frame->area.x;
+
+        dest = a->x; /* default: leftmost egde of screen */
+
+        for(it = g_list_first(client_list); it; it = it->next) {
+            int his_edge_start, his_edge_end, his_offset;
+            ObClient *cur = it->data;
+
+            if(cur == c)
+                continue;
+            if(!client_normal(cur))
+                continue;
+            if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+                continue;
+            if(cur->iconic)
+                continue;
+
+            his_edge_start = cur->frame->area.y;
+            his_edge_end = cur->frame->area.y + cur->frame->area.height;
+            his_offset = cur->frame->area.x + cur->frame->area.width;
+
+            if(his_offset + 1 > my_offset)
+                continue;
+            
+            if(his_offset < dest)
+                continue;
+            
+            if(his_edge_start >= my_edge_start &&
+               his_edge_start <= my_edge_end)
+                dest = his_offset;
+
+            if(my_edge_start >= his_edge_start &&
+               my_edge_start <= his_edge_end)
+                dest = his_offset;
+                
+
+        }
+        break;
+    case OB_DIRECTION_EAST:
+        my_edge_start = c->frame->area.y;
+        my_edge_end = c->frame->area.y + c->frame->area.height;
+        my_offset = c->frame->area.x + c->frame->area.width;
+        
+        dest = a->x + a->width; /* default: rightmost edge of screen */
+
+        for(it = g_list_first(client_list); it; it = it->next) {
+            int his_edge_start, his_edge_end, his_offset;
+            ObClient *cur = it->data;
+
+            if(cur == c)
+                continue;
+            if(!client_normal(cur))
+                continue;
+            if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+                continue;
+            if(cur->iconic)
+                continue;
+
+            his_edge_start = cur->frame->area.y;
+            his_edge_end = cur->frame->area.y + cur->frame->area.height;
+            his_offset = cur->frame->area.x;
+
+            if(his_offset - 1 < my_offset)
+                continue;
+            
+            if(his_offset > dest)
+                continue;
+            
+            if(his_edge_start >= my_edge_start &&
+               his_edge_start <= my_edge_end)
+                dest = his_offset;
+
+            if(my_edge_start >= his_edge_start &&
+               my_edge_start <= his_edge_end)
+                dest = his_offset;
+
+        }
+        break;
+    case OB_DIRECTION_NORTHEAST:
+    case OB_DIRECTION_SOUTHEAST:
+    case OB_DIRECTION_NORTHWEST:
+    case OB_DIRECTION_SOUTHWEST:
+        /* not implemented */
+        break;
+    default:
+            g_assert_not_reached();
+    }
+    return dest;
+}