X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=0e41e2ebc9cc448a0a2294119bc4020b810c2c28;hb=cbbf90a718ecc6836ef7a77b9040aebb9da348b8;hp=f0c703ffd152a05f28c2a0c12ad83e55d34c2082;hpb=92bea590c0eff5f56f70093dfa1edef2f65b113f;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index f0c703ff..0e41e2eb 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -52,6 +52,10 @@ Action *action_from_string(char *name)
         a = action_new(action_close);
     } else if (!g_ascii_strcasecmp(name, "kill")) {
         a = action_new(action_kill);
+    } else if (!g_ascii_strcasecmp(name, "shadelower")) {
+        a = action_new(action_shadelower);
+    } else if (!g_ascii_strcasecmp(name, "unshaderaise")) {
+        a = action_new(action_unshaderaise);
     } else if (!g_ascii_strcasecmp(name, "shade")) {
         a = action_new(action_shade);
     } else if (!g_ascii_strcasecmp(name, "unshade")) {
@@ -86,6 +90,9 @@ Action *action_from_string(char *name)
         a = action_new(action_unmaximize_vert);
     } else if (!g_ascii_strcasecmp(name, "togglemaximizevert")) {
         a = action_new(action_toggle_maximize_vert);
+    } else if (!g_ascii_strcasecmp(name, "sendtodesktop")) {
+        a = action_new(action_send_to_desktop);
+        a->data.sendto.follow = TRUE;
     } else if (!g_ascii_strcasecmp(name, "sendtonextdesktop")) {
         a = action_new(action_send_to_next_desktop);
         a->data.sendtonextprev.wrap = FALSE;
@@ -140,6 +147,8 @@ Action *action_from_string(char *name)
     } else if (!g_ascii_strcasecmp(name, "previousdesktoprowwrap")) {
         a = action_new(action_previous_desktop_row);
         a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "toggledecorations")) {
+        a = action_new(action_toggle_decorations);
     } else if (!g_ascii_strcasecmp(name, "move")) {
         a = action_new(action_move);
     } else if (!g_ascii_strcasecmp(name, "resize")) {
@@ -148,7 +157,18 @@ Action *action_from_string(char *name)
         a = action_new(action_restart);
     } else if (!g_ascii_strcasecmp(name, "exit")) {
         a = action_new(action_exit);
+    } else if (!g_ascii_strcasecmp(name, "showmenu")) {
+        a = action_new(action_showmenu);
+    } else if (!g_ascii_strcasecmp(name, "nextwindowlinear")) {
+        a = action_new(action_cycle_windows);
+        a->data.cycle.linear = TRUE;
+        a->data.cycle.forward = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "previouswindowlinear")) {
+        a = action_new(action_cycle_windows);
+        a->data.cycle.linear = TRUE;
+        a->data.cycle.forward = FALSE;
     }
+    
     return a;
 }
 
@@ -194,6 +214,26 @@ void action_raise(union ActionData *data)
         stacking_raise(data->client.c);
 }
 
+void action_unshaderaise(union ActionData *data)
+{
+    if (data->client.c) {
+        if (data->client.c->shaded)
+            client_shade(data->client.c, FALSE);
+        else
+            stacking_raise(data->client.c);
+    }
+}
+
+void action_shadelower(union ActionData *data)
+{
+    if (data->client.c) {
+        if (data->client.c->shaded)
+            stacking_lower(data->client.c);
+        else
+            client_shade(data->client.c, TRUE);
+    }
+}
+
 void action_lower(union ActionData *data)
 {
     if (data->client.c)
@@ -268,7 +308,7 @@ void action_resize_relative_horz(union ActionData *data)
 void action_resize_relative_vert(union ActionData *data)
 {
     Client *c = data->relative.c;
-    if (c)
+    if (c && !c->shaded)
         client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
                          c->area.width, c->area.height + data->relative.delta,
                          TRUE, TRUE);
@@ -333,17 +373,21 @@ void action_toggle_maximize_vert(union ActionData *data)
 
 void action_send_to_desktop(union ActionData *data)
 {
-    if (data->sendto.c)
-        if (data->sendto.desktop < screen_num_desktops ||
-            data->sendto.desktop == DESKTOP_ALL)
-            client_set_desktop(data->sendto.c, data->sendto.desktop, TRUE);
+    if (data->sendto.c) {
+        if (data->sendto.desk < screen_num_desktops ||
+            data->sendto.desk == DESKTOP_ALL) {
+            client_set_desktop(data->desktop.c,
+                               data->sendto.desk, data->sendto.follow);
+            if (data->sendto.follow) screen_set_desktop(data->sendto.desk);
+        }
+    }
 }
 
 void action_send_to_next_desktop(union ActionData *data)
 {
     guint d;
 
-    if (!data->sendto.c) return;
+    if (!data->sendtonextprev.c) return;
 
     d = screen_desktop + 1;
     if (d >= screen_num_desktops) {
@@ -358,7 +402,7 @@ void action_send_to_previous_desktop(union ActionData *data)
 {
     guint d;
 
-    if (!data->sendto.c) return;
+    if (!data->sendtonextprev.c) return;
 
     d = screen_desktop - 1;
     if (d >= screen_num_desktops) {
@@ -414,7 +458,6 @@ static void cur_row_col(guint *r, guint *c)
                 screen_desktop / screen_desktop_layout.columns;
             *c = screen_desktop % screen_desktop_layout.columns;
             break;
-        break;
         case Corner_TopRight:
             *r = screen_desktop / screen_desktop_layout.columns;
             *c = screen_desktop_layout.columns - 1 -
@@ -426,8 +469,8 @@ static void cur_row_col(guint *r, guint *c)
             *c = screen_desktop_layout.columns - 1 -
                 screen_desktop % screen_desktop_layout.columns;
             break;
-        break;
         }
+        break;
     case Orientation_Vert:
         switch (screen_desktop_layout.start_corner) {
         case Corner_TopLeft:
@@ -439,7 +482,6 @@ static void cur_row_col(guint *r, guint *c)
                 screen_desktop % screen_desktop_layout.rows;
             *c = screen_desktop / screen_desktop_layout.rows;
             break;
-        break;
         case Corner_TopRight:
             *r = screen_desktop % screen_desktop_layout.rows;
             *c = screen_desktop_layout.columns - 1 -
@@ -451,7 +493,6 @@ static void cur_row_col(guint *r, guint *c)
             *c = screen_desktop_layout.columns - 1 -
                 screen_desktop / screen_desktop_layout.rows;
             break;
-        break;
         }
         break;
     }
@@ -592,13 +633,16 @@ void action_move(union ActionData *data)
 void action_resize(union ActionData *data)
 {
     Client *c = data->resize.c;
-    int w = data->resize.x - c->frame->size.left - c->frame->size.right;
-    int h = data->resize.y - c->frame->size.top - c->frame->size.bottom;
+    int w = data->resize.x;
+    int h = data->resize.y;
  
-    if (!c || !client_normal(c)) return;
-
-    /* XXX window snapping/struts */
+    if (!c || c->shaded || !client_normal(c)) return;
 
+    dispatch_resize(c, &w, &h, data->resize.corner);
+    
+    w -= c->frame->size.left + c->frame->size.right;
+    h -= c->frame->size.top + c->frame->size.bottom;
+    
     client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h,
                      TRUE, data->resize.final);
 }
@@ -613,3 +657,32 @@ void action_exit(union ActionData *data)
 {
     ob_shutdown = TRUE;
 }
+
+void action_showmenu(union ActionData *data)
+{
+    g_message(__FUNCTION__);
+}
+
+void action_cycle_windows(union ActionData *data)
+{
+    if (data->cycle.linear) {
+        if (!data->cycle.final) {
+            GList *it, *start;
+
+            start = it = g_list_find(client_list, data->cycle.c);
+            do {
+                if (data->cycle.forward) {
+                    it = it->next;
+                    if (it == NULL) it = client_list;
+                } else {
+                    it = it->prev;
+                    if (it == NULL) it = g_list_last(client_list);
+                }
+                if (client_focus(it->data))
+                    break;
+            } while (it != start);
+        }
+    } else {
+    }
+}
+