X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=b1bc081fe93e657cee398045828b53ee12b761e7;hb=2244bc036a9c96704675318dc382ea3abd6f3fdf;hp=3ef5aa734a3cc8a5fb83c5ceb02b5669187f1265;hpb=916e24d9c4e86f878e677512d82647d6038a2dbe;p=chaz%2Fopenbox

diff --git a/openbox/action.h b/openbox/action.h
index 3ef5aa73..b1bc081f 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    action.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -47,6 +48,7 @@ struct AnyAction {
     gint x;
     gint y;
     gint button;
+    Time time;
 };
 
 struct InteractiveAction {
@@ -64,11 +66,15 @@ struct InterDirectionalAction{
 struct DirectionalAction{
     struct AnyAction any;
     ObDirection direction;
+    gboolean hang;
 };
 
 struct Execute {
     struct AnyAction any;
     gchar *path;
+    gboolean startupnotify;
+    gchar *name;
+    gchar *icon_name;
 };
 
 struct ClientAction {
@@ -82,7 +88,10 @@ struct Activate {
 
 struct MoveResizeRelative {
     struct AnyAction any;
-    gint delta;
+    gint deltax;
+    gint deltay;
+    gint deltaxl;
+    gint deltayu;
 };
 
 struct SendToDesktop {
@@ -136,7 +145,6 @@ struct CycleWindows {
 
 struct Stacking {
     struct AnyAction any;
-    gboolean group;
 };
 
 union ActionData {
@@ -180,6 +188,8 @@ struct _ObAction {
    action_move_relative_vert - the delta
    action_resize_relative_horz - the delta
    action_resize_relative_vert - the delta
+   action_move_relative - the deltas
+   action_resize_relative - the deltas
 */
 
 ObAction* action_from_string(const gchar *name, ObUserAction uact);
@@ -202,22 +212,22 @@ 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, guint button, gint x, gint y,
+                     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) \
-    action_run_list(a, c, n, s, b, x, y, FALSE, FALSE)
+#define action_run_mouse(a, c, n, s, b, x, y, t) \
+    action_run_list(a, c, n, s, b, x, y, t, FALSE, FALSE)
 
-#define action_run_interactive(a, c, s, n, d) \
-    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, n, d)
+#define action_run_interactive(a, c, s, t, n, d) \
+    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) \
-    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, FALSE, FALSE)
+#define action_run_key(a, c, s, x, y, t) \
+    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, x, y, t, FALSE, FALSE)
 
-#define action_run(a, c, s) \
-    action_run_list(a, c, OB_FRAME_CONTEXT_NONE, s, 0, -1, -1, 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);
+void action_run_string(const gchar *name, struct _ObClient *c, Time time);
 
 /* Execute */
 void action_execute(union ActionData *data);
@@ -257,6 +267,10 @@ void action_toggle_omnipresent(union ActionData *data);
 void action_move_relative_horz(union ActionData *data);
 /* MoveResizeRelative */
 void action_move_relative_vert(union ActionData *data);
+/* MoveResizeRelative */
+void action_move_relative(union ActionData *data);
+/* MoveResizeRelative */
+void action_resize_relative(union ActionData *data);
 /* ClientAction */
 void action_move_to_center(union ActionData *data);
 /* MoveResizeRelative */