move the move/resize functionality into moveresize.c, for use with the netwm atoms...

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index a8f37e1574c5f20a0397503c1f1b9835321feba0..6e0b6c520064bd99aa0e7ce735f7f848bfb7ed3c 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -26,6 +26,12 @@ struct MoveResizeRelative {
     int delta;
 };
 
+struct SendToDesktop {
+    Client *c;
+    guint desk;
+    gboolean follow;
+};
+
 struct SendToNextPreviousDesktop {
     Client *c;
     gboolean wrap;
@@ -42,24 +48,27 @@ struct NextPreviousDesktop {
     gboolean wrap;
 };
 
-struct Move {
+struct MoveResize {
     Client *c;
     int x;
     int y;
-    gboolean final;
+    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
+    guint button;
 };
 
-struct Resize {
+struct ShowMenu {
     Client *c;
+    char *name;
     int x;
     int y;
-    gboolean final;
-    Corner corner;
 };
 
-struct ShowMenu {
+struct CycleWindows {
     Client *c;
-    char * menuName;
+    gboolean linear;
+    gboolean forward;
+    gboolean final;
+    gboolean cancel;
 };
 
 union ActionData {
@@ -67,12 +76,13 @@ union ActionData {
     struct Execute execute;
     struct ClientAction client;
     struct MoveResizeRelative relative;
+    struct SendToDesktop sendto;
     struct SendToNextPreviousDesktop sendtonextprev;
     struct Desktop desktop;
     struct NextPreviousDesktop nextprevdesktop;
-    struct Move move;
-    struct Resize resize;
-    struct ShowMenu showMenu;
+    struct MoveResize moveresize;
+    struct ShowMenu showmenu;
+    struct CycleWindows cycle;
 };
 
 typedef struct {
@@ -155,7 +165,7 @@ void action_maximize_vert(union ActionData *data);
 void action_unmaximize_vert(union ActionData *data);
 /* ClientAction */
 void action_toggle_maximize_vert(union ActionData *data);
-/* Desktop */
+/* SendToDesktop */
 void action_send_to_desktop(union ActionData *data);
 /* SendToNextPreviousDesktop */
 void action_send_to_next_desktop(union ActionData *data);
@@ -177,14 +187,14 @@ void action_next_desktop_row(union ActionData *data);
 void action_previous_desktop_row(union ActionData *data);
 /* ClientAction */
 void action_toggle_decorations(union ActionData *data);
-/* Move */
-void action_move(union ActionData *data);
-/* Resize */
-void action_resize(union ActionData *data);
+/* MoveResize */
+void action_moveresize(union ActionData *data);
 /* Execute */
 void action_restart(union ActionData *data);
 /* Any */
 void action_exit(union ActionData *data);
 /* ShowMenu */
 void action_showmenu(union ActionData *data);
+/* CycleWindows */
+void action_cycle_windows(union ActionData *data);
 #endif