rename the Client struct to ObClient

[chaz/openbox] / openbox / window.h

diff --git a/openbox/window.h b/openbox/window.h
index 409697c1efc4503cef5c0358248a5e18cdfb0614..edb54e17951ce89e73c3534151ec4e1da640433e 100644 (file)
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -2,32 +2,54 @@
 #define __window_h
 
 #include <X11/Xlib.h>
+#include <glib.h>
 
 typedef enum {
     Window_Menu,
-    Window_Slit,
-    Window_Client
+    Window_Dock,
+    Window_DockApp, /* used for events but not stacking */
+    Window_Client,
+    Window_Internal /* used for stacking but not events */
 } Window_InternalType;
 
 typedef struct ObWindow {
     Window_InternalType type;
 } ObWindow;
 
+/* Wrapper for internal stuff. If its struct matches this then it can be used
+   as an ObWindow */
+typedef struct InternalWindow {
+    ObWindow obwin;
+    Window win;
+} InternalWindow;
+
 #define WINDOW_IS_MENU(win) (((ObWindow*)win)->type == Window_Menu)
-#define WINDOW_IS_SLIT(win) (((ObWindow*)win)->type == Window_Slit)
+#define WINDOW_IS_DOCK(win) (((ObWindow*)win)->type == Window_Dock)
+#define WINDOW_IS_DOCKAPP(win) (((ObWindow*)win)->type == Window_DockApp)
 #define WINDOW_IS_CLIENT(win) (((ObWindow*)win)->type == Window_Client)
+#define WINDOW_IS_INTERNAL(win) (((ObWindow*)win)->type == Window_Internal)
 
 struct Menu;
-struct Slit;
-struct Client;
+struct Dock;
+struct DockApp;
+struct _ObClient;
 
 #define WINDOW_AS_MENU(win) ((struct Menu*)win)
-#define WINDOW_AS_SLIT(win) ((struct Slit*)win)
-#define WINDOW_AS_CLIENT(win) ((struct Client*)win)
+#define WINDOW_AS_DOCK(win) ((struct Dock*)win)
+#define WINDOW_AS_DOCKAPP(win) ((struct DockApp*)win)
+#define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win)
+#define WINDOW_AS_INTERNAL(win) ((struct InternalWindow*)win)
 
 #define MENU_AS_WINDOW(menu) ((ObWindow*)menu)
-#define SLIT_AS_WINDOW(slit) ((ObWindow*)slit)
+#define DOCK_AS_WINDOW(dock) ((ObWindow*)dock)
+#define DOCKAPP_AS_WINDOW(dockapp) ((ObWindow*)dockapp)
 #define CLIENT_AS_WINDOW(client) ((ObWindow*)client)
+#define INTERNAL_AS_WINDOW(intern) ((ObWindow*)intern)
+
+extern GHashTable *window_map;
+
+void window_startup();
+void window_shutdown();
 
 Window window_top(ObWindow *self);
 Window window_layer(ObWindow *self);