X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=6e0b6c520064bd99aa0e7ce735f7f848bfb7ed3c;hb=f41d06f583b0461446aeac93551a2e0931d50ac0;hp=a5b1708e412b459478770f0e4db8e6a58fc10721;hpb=7ebc5c797f0435286f25f077e8329ec821fc5e53;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index a5b1708e..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 {
@@ -85,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;
 };
 
@@ -193,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 */