X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=81eafa7d0110b0e9d6775e65230dba69f8f7fcf0;hb=f4979de3f5257bf70591d4ccf0ecab7da567b27d;hp=191fa9943331ac148f61659861e090f9272f77d1;hpb=d94fba72624f88f7e0457dc4eb9a0f6b1699f23b;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 191fa994..81eafa7d 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>
@@ -302,7 +304,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 +330,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 +361,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);
 
@@ -1097,7 +1106,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))
@@ -1705,7 +1714,7 @@ void client_configure_full(ObClient *self, ObCorner anchor,
                            gboolean force_reply)
 {
     gboolean moved = FALSE, resized = FALSE;
-    gint fdecor = self->frame->decorations;
+    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
@@ -2616,7 +2625,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
@@ -2744,3 +2754,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 + c->size_inc.height > 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 - c->size_inc.height < 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 + c->size_inc.width > 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 - c->size_inc.width < 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;
+}