X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.h;h=6c557d184fb224eab8f25f2c6523c435b5320cca;hb=8fe0cb8989c1fe12b30b9030b446345f25340d35;hp=150323c775e6f548e3eff9553111b2d367f331f5;hpb=7c7868f47d42796a236c9a1813bed5fe9f0d4f41;p=chaz%2Fopenbox

diff --git a/openbox/window.h b/openbox/window.h
index 150323c7..6c557d18 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -2,17 +2,23 @@
 #define __window_h
 
 #include <X11/Xlib.h>
+#include <glib.h>
+
+typedef struct _ObWindow         ObWindow;
+typedef struct _ObInternalWindow ObInternalWindow;
 
 typedef enum {
     Window_Menu,
-    Window_Slit,
+    Window_Dock,
+    Window_DockApp, /* used for events but not stacking */
     Window_Client,
-    Window_Internal
+    Window_Internal /* used for stacking but not events */
 } Window_InternalType;
 
-typedef struct ObWindow {
+struct _ObWindow
+{
     Window_InternalType type;
-} ObWindow;
+};
 
 /* Wrapper for internal stuff. If its struct matches this then it can be used
    as an ObWindow */
@@ -22,24 +28,33 @@ typedef struct InternalWindow {
 } 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 _ObMenu;
+struct _ObDock;
+struct _ObDockApp;
+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_MENU(win) ((struct _ObMenuFrame*)win)
+#define WINDOW_AS_DOCK(win) ((struct _ObDock*)win)
+#define WINDOW_AS_DOCKAPP(win) ((struct _ObDockApp*)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(gboolean reconfig);
+void window_shutdown(gboolean reconfig);
+
 Window window_top(ObWindow *self);
 Window window_layer(ObWindow *self);