Merge branch 'backport' into work

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index 1da94b3411a3a815f1f3244d28094ea4846d61f1..68403f49c727e3d79196249d660dfeb35be0e642 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -19,10 +19,17 @@
 #ifndef __ob__misc_h
 #define __ob__misc_h
 
+/*! The alpha value to use for icons of iconified windows in various places
+  like the focus cycle popup and client list menus.
+  Give iconic windows 7/16 alpha. A little under 50%.
+ */
+#define OB_ICONIC_ALPHA 0x70
+
 typedef enum
 {
     OB_CURSOR_NONE,
     OB_CURSOR_POINTER,
+    OB_CURSOR_BUSYPOINTER,
     OB_CURSOR_BUSY,
     OB_CURSOR_MOVE,
     OB_CURSOR_NORTH,
@@ -44,6 +51,10 @@ typedef enum
     OB_KEY_RIGHT,
     OB_KEY_UP,
     OB_KEY_DOWN,
+    OB_KEY_TAB,
+    OB_KEY_SPACE,
+    OB_KEY_HOME,
+    OB_KEY_END,
     OB_NUM_KEYS
 } ObKey;
 
@@ -51,7 +62,8 @@ typedef enum
 {
     OB_STATE_STARTING,
     OB_STATE_RUNNING,
-    OB_STATE_EXITING
+    OB_STATE_EXITING,
+    OB_STATE_RECONFIGURING
 } ObState;
 
 typedef enum