X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=6e0b6c520064bd99aa0e7ce735f7f848bfb7ed3c;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=989b975dd8062a11ea8e8cd1a31aea35d9a8d8e3;hpb=55c424d38bb119bd04199ed5e73b035b00474dd9;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 989b975d..6e0b6c52 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -48,19 +48,12 @@ struct NextPreviousDesktop {
     gboolean wrap;
 };
 
-struct Move {
+struct MoveResize {
     Client *c;
     int x;
     int y;
-    gboolean final;
-};
-
-struct Resize {
-    Client *c;
-    int x;
-    int y;
-    gboolean final;
-    Corner corner;
+    guint32 corner; /* prop_atoms.net_wm_moveresize_* */
+    guint button;
 };
 
 struct ShowMenu {
@@ -87,8 +80,7 @@ union ActionData {
     struct SendToNextPreviousDesktop sendtonextprev;
     struct Desktop desktop;
     struct NextPreviousDesktop nextprevdesktop;
-    struct Move move;
-    struct Resize resize;
+    struct MoveResize moveresize;
     struct ShowMenu showmenu;
     struct CycleWindows cycle;
 };
@@ -195,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 */