Merge branch 'master' into chaz

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index 13530ed92f4a4c04f6a7edb36d2af6cba6293ae5..750dddd7ae003d2081e264176bec844eb8a3ab01 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -43,24 +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_KEY_TAB,
-    OB_KEY_SPACE,
-    OB_NUM_KEYS
-} ObKey;
-
 typedef enum
 {
     OB_STATE_STARTING,
     OB_STATE_RUNNING,
-    OB_STATE_EXITING
+    OB_STATE_EXITING,
+    OB_STATE_RECONFIGURING
 } ObState;
 
 typedef enum
@@ -107,7 +95,6 @@ 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;