Merge branch 'backport' into work

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index 9e1fc269a3c06f512314cdc0f128a1c25ab7d81c..05b5ac85d0f6e2b4203330ea7b1794e1adace9d8 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    misc.h for the Openbox window manager
-   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
@@ -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,8 @@ typedef enum
     OB_KEY_RIGHT,
     OB_KEY_UP,
     OB_KEY_DOWN,
+    OB_KEY_TAB,
+    OB_KEY_SPACE,
     OB_NUM_KEYS
 } ObKey;
 
@@ -51,7 +60,8 @@ typedef enum
 {
     OB_STATE_STARTING,
     OB_STATE_RUNNING,
-    OB_STATE_EXITING
+    OB_STATE_EXITING,
+    OB_STATE_RECONFIGURING
 } ObState;
 
 typedef enum
@@ -98,6 +108,7 @@ typedef enum {
     OB_USER_ACTION_MOUSE_DOUBLE_CLICK,
     OB_USER_ACTION_MOUSE_MOTION,
     OB_USER_ACTION_MENU_SELECTION,
+    OB_USER_ACTION_HOOK,
     OB_NUM_USER_ACTIONS
 } ObUserAction;