rename the openbox_* atoms back to ob_*

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index c4c06fa886db8fcde92d45be0bf291346de69e2f..8a1726bc5e33e63b2722cd614cd877e668b5219b 100644 (file)
--- 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{
@@ -128,8 +129,8 @@ struct DesktopDirection {
 
 struct MoveResize {
     struct AnyAction any;
-    gboolean move;
     gboolean keyboard;
+    guint32 corner;
 };
 
 struct ShowMenu {
@@ -143,6 +144,8 @@ struct CycleWindows {
     gboolean forward;
     gboolean dialog;
     gboolean dock_windows;
+    gboolean desktop_windows;
+    gboolean all_desktops;
 };
 
 struct Stacking {
@@ -311,8 +314,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 */