fix frame rendering to match layout fixes

[chaz/openbox] / openbox / action.h

diff --git a/openbox/action.h b/openbox/action.h
index 26ae55d54d4606aac6b6f91eef30b8b89ff80c48..38452e44081747b0b984432a134df992e9ac0a26 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -2,7 +2,7 @@
 
    action.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -61,6 +61,8 @@ struct InterDirectionalAction{
     struct InteractiveAction inter;
     ObDirection direction;
     gboolean dialog;
+    gboolean dock_windows;
+    gboolean desktop_windows;
 };
 
 struct DirectionalAction{
@@ -69,6 +71,10 @@ struct DirectionalAction{
     gboolean hang;
 };
 
+struct Debug {
+    gchar *string;
+};
+
 struct Execute {
     struct AnyAction any;
     gchar *path;
@@ -109,7 +115,7 @@ struct SendToDesktopDirection {
 };
 
 struct Desktop {
-    struct InteractiveAction inter;
+    struct AnyAction inter;
     guint desk;
 };
 
@@ -127,8 +133,8 @@ struct DesktopDirection {
 
 struct MoveResize {
     struct AnyAction any;
-    gboolean move;
     gboolean keyboard;
+    guint32 corner;
 };
 
 struct ShowMenu {
@@ -141,6 +147,9 @@ struct CycleWindows {
     gboolean linear;
     gboolean forward;
     gboolean dialog;
+    gboolean dock_windows;
+    gboolean desktop_windows;
+    gboolean all_desktops;
 };
 
 struct Stacking {
@@ -152,6 +161,7 @@ union ActionData {
     struct InteractiveAction inter;
     struct InterDirectionalAction interdiraction;
     struct DirectionalAction diraction;
+    struct Debug debug;
     struct Execute execute;
     struct ClientAction client;
     struct Activate activate;
@@ -180,6 +190,7 @@ struct _ObAction {
 /* Creates a new Action from the name of the action
    A few action types need data set after making this call still. Check if
    the returned action's "func" is one of these.
+   action_debug - the string to print should be set
    action_execute - the path needs to be set
    action_restart - the path can optionally be set
    action_desktop - the destination desktop needs to be set
@@ -212,7 +223,7 @@ ObAction* action_copy(const ObAction *a);
          affects interactive actions, but should generally always be FALSE.
 */
 void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
-                     guint state, gint button, gint x, gint y, Time time,
+                     guint state, guint button, gint x, gint y, Time time,
                      gboolean cancel, gboolean done);
 
 #define action_run_mouse(a, c, n, s, b, x, y, t) \
@@ -222,13 +233,15 @@ void action_run_list(GSList *acts, struct _ObClient *c, ObFrameContext context,
     action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, t, n, d)
 
 #define action_run_key(a, c, s, x, y, t) \
-    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, -1, x, y, t, FALSE, FALSE)
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, t, FALSE, FALSE)
 
 #define action_run(a, c, s, t) \
     action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, t, FALSE, FALSE)
 
 void action_run_string(const gchar *name, struct _ObClient *c, Time time);
 
+/* Debug */
+void action_debug(union ActionData *data);
 /* Execute */
 void action_execute(union ActionData *data);
 /* ActivateAction */
@@ -309,8 +322,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 */
@@ -339,5 +354,7 @@ void action_toggle_show_desktop(union ActionData *data);
 void action_show_desktop(union ActionData *data);
 /* Any */
 void action_unshow_desktop(union ActionData *data);
+/* Any */
+void action_break_chroot(union ActionData *data);
 
 #endif