prefix and capitalize ObMenu ObMenuEntry and ObMenuEntryRenderType

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index d917367bed1d3e7e299d3fff102d0ea70a864231..8c5b1ad80e2b86dfd3e88cba83c61011abe10230 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -6,9 +6,6 @@
 
 struct _ObClient;
 
-/*! The window which gets focus when nothing else will be focused */
-extern Window focus_backup;
-
 /*! The client which is currently focused */
 extern struct _ObClient *focus_client;
 
@@ -23,13 +20,14 @@ void focus_shutdown();
 void focus_set_client(struct _ObClient *client);
 
 typedef enum {
-    Fallback_Desktop,    /* switching desktops */
-    Fallback_Unfocusing, /* forcefully remove focus from the current window */
-    Fallback_NoFocus     /* nothing has focus for some reason */
-} FallbackType;
+    OB_FOCUS_FALLBACK_DESKTOP,    /*!< switching desktops */
+    OB_FOCUS_FALLBACK_UNFOCUSING, /*!< forcefully remove focus from the
+                                    current window */
+    OB_FOCUS_FALLBACK_NOFOCUS     /*!< nothing has focus for some reason */
+} ObFocusFallbackType;
 
 /*! Call this when you need to focus something! */
-void focus_fallback(FallbackType type);
+void focus_fallback(ObFocusFallbackType type);
 
 /*! Cycle focus amongst windows
   Returns the _ObClient to which focus has been cycled, or NULL if none. */