X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=17e35766a640d336f2d5b44abe2f1674a5f1aba1;hb=51fdd13fd1a445d5fa3c2d7aab356e7caaf2f902;hp=c4c06fa886db8fcde92d45be0bf291346de69e2f;hpb=8c68c9ab0f75514ee4f0336e566ac2c02ac20b65;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index c4c06fa8..17e35766 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -62,6 +62,7 @@ struct InterDirectionalAction{
     ObDirection direction;
     gboolean dialog;
     gboolean dock_windows;
+    gboolean desktop_windows;
 };
 
 struct DirectionalAction{
@@ -70,6 +71,10 @@ struct DirectionalAction{
     gboolean hang;
 };
 
+struct Debug {
+    gchar *string;
+};
+
 struct Execute {
     struct AnyAction any;
     gchar *path;
@@ -110,7 +115,7 @@ struct SendToDesktopDirection {
 };
 
 struct Desktop {
-    struct InteractiveAction inter;
+    struct AnyAction inter;
     guint desk;
 };
 
@@ -128,8 +133,8 @@ struct DesktopDirection {
 
 struct MoveResize {
     struct AnyAction any;
-    gboolean move;
     gboolean keyboard;
+    guint32 corner;
 };
 
 struct ShowMenu {
@@ -137,12 +142,19 @@ struct ShowMenu {
     gchar *name;
 };
 
+struct AddRemoveDesktop {
+    struct AnyAction any;
+    gboolean current;
+};
+
 struct CycleWindows {
     struct InteractiveAction inter;
     gboolean linear;
     gboolean forward;
     gboolean dialog;
     gboolean dock_windows;
+    gboolean desktop_windows;
+    gboolean all_desktops;
 };
 
 struct Stacking {
@@ -154,6 +166,7 @@ union ActionData {
     struct InteractiveAction inter;
     struct InterDirectionalAction interdiraction;
     struct DirectionalAction diraction;
+    struct Debug debug;
     struct Execute execute;
     struct ClientAction client;
     struct Activate activate;
@@ -167,6 +180,7 @@ union ActionData {
     struct CycleWindows cycle;
     struct Layer layer;
     struct Stacking stacking;
+    struct AddRemoveDesktop addremovedesktop;
 };
 
 struct _ObAction {
@@ -182,6 +196,7 @@ struct _ObAction {
 /* Creates a new Action from the name of the action
    A few action types need data set after making this call still. Check if
    the returned action's "func" is one of these.
+   action_debug - the string to print should be set
    action_execute - the path needs to be set
    action_restart - the path can optionally be set
    action_desktop - the destination desktop needs to be set
@@ -231,6 +246,8 @@ void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
 
 void action_run_string(const gchar *name, struct _ObClient *c, Time time);
 
+/* Debug */
+void action_debug(union ActionData *data);
 /* Execute */
 void action_execute(union ActionData *data);
 /* ActivateAction */
@@ -311,8 +328,10 @@ void action_desktop_dir(union ActionData *data);
 void action_desktop_last(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
-/* MoveResize */
-void action_moveresize(union ActionData *data);
+/* Move */
+void action_move(union ActionData *data);
+/* Resize */
+void action_resize(union ActionData *data);
 /* Any */
 void action_reconfigure(union ActionData *data);
 /* Execute */
@@ -343,5 +362,9 @@ void action_show_desktop(union ActionData *data);
 void action_unshow_desktop(union ActionData *data);
 /* Any */
 void action_break_chroot(union ActionData *data);
+/* AddRemoveDesktop */
+void action_add_desktop(union ActionData *data);
+/* AddRemoveDesktop */
+void action_remove_desktop(union ActionData *data);
 
 #endif