X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.h;h=6e0b6c520064bd99aa0e7ce735f7f848bfb7ed3c;hb=a8a4a2cca30602b66b7a7f68bb9f3fffd34e92c9;hp=0fe42f64b31494cbea9ab621a53e80d6b65c3f1f;hpb=cbbf90a718ecc6836ef7a77b9040aebb9da348b8;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 0fe42f64..6e0b6c52 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -48,24 +48,19 @@ 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 {
-    Client *c;
-    char *menuName;
 };
 
 struct CycleWindows {
@@ -73,6 +68,7 @@ struct CycleWindows {
     gboolean linear;
     gboolean forward;
     gboolean final;
+    gboolean cancel;
 };
 
 union ActionData {
@@ -84,9 +80,8 @@ union ActionData {
     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;
 };
 
@@ -192,10 +187,8 @@ 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 */