Merge branch 'master' into chaz

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index f86c448419d05e00b2f66ca5be848859a4726e9a..750dddd7ae003d2081e264176bec844eb8a3ab01 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -1,10 +1,35 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   misc.h for the Openbox window manager
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #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,
@@ -18,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
@@ -72,6 +87,7 @@ typedef enum {
 } ObMouseAction;
 
 typedef enum {
+    OB_USER_ACTION_NONE, /* being fired from inside another action and such */
     OB_USER_ACTION_KEYBOARD_KEY,
     OB_USER_ACTION_MOUSE_PRESS,
     OB_USER_ACTION_MOUSE_RELEASE,