Merge branch 'master' into chaz

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index 1da94b3411a3a815f1f3244d28094ea4846d61f1..750dddd7ae003d2081e264176bec844eb8a3ab01 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,
@@ -36,22 +43,12 @@ typedef enum
     OB_NUM_CURSORS
 } ObCursor;
 
-typedef enum
-{
-    OB_KEY_RETURN,
-    OB_KEY_ESCAPE,
-    OB_KEY_LEFT,
-    OB_KEY_RIGHT,
-    OB_KEY_UP,
-    OB_KEY_DOWN,
-    OB_NUM_KEYS
-} ObKey;
-
 typedef enum
 {
     OB_STATE_STARTING,
     OB_STATE_RUNNING,
-    OB_STATE_EXITING
+    OB_STATE_EXITING,
+    OB_STATE_RECONFIGURING
 } ObState;
 
 typedef enum