X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.h;h=f42a2027da1833356b117a238a2fe3df9195c175;hb=a09984bbc076bc37b11058237f51fa15114129e2;hp=fdfaaf05d249131942d203ecf32caec63fe7eaeb;hpb=a0691941e88ca8a8388fe17971be637e3aa3d835;p=chaz%2Fopenbox

diff --git a/openbox/dock.h b/openbox/dock.h
index fdfaaf05..f42a2027 100644
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -2,54 +2,55 @@
 #define __dock_h
 
 #include "timer.h"
-#include "render/render.h"
 #include "window.h"
 #include "stacking.h"
+#include "geom.h"
+#include "render/render.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-typedef enum {
-    DockPos_Floating,
-    DockPos_TopLeft,
-    DockPos_Top,
-    DockPos_TopRight,
-    DockPos_Right,
-    DockPos_BottomRight,
-    DockPos_Bottom,
-    DockPos_BottomLeft,
-    DockPos_Left
-} DockPosition;
-
-typedef struct Dock {
+typedef struct _ObDock    ObDock;
+typedef struct _ObDockApp ObDockApp;
+
+struct _ObDock
+{
     ObWindow obwin;
 
     Window frame;
-    Appearance *a_frame;
+    RrAppearance *a_frame;
 
     /* actual position (when not auto-hidden) */
-    int x, y;
-    int w, h;
+    gint x;
+    gint y;
+    gint w;
+    gint h;
 
     gboolean hidden;
-    Timer *hide_timer;
+    ObTimer *hide_timer;
 
     GList *dock_apps;
-} Dock;
+};
 
-typedef struct DockApp {
+struct _ObDockApp {
     ObWindow obwin;
 
-    int ignore_unmaps;
+    gint ignore_unmaps;
 
     Window icon_win;
     Window win;
-    int x;
-    int y;
-    int w;
-    int h;
-} DockApp;
+
+    gchar *name;
+    gchar *class;
+
+    gint x;
+    gint y;
+    gint w;
+    gint h;
+};
+
+extern StrutPartial dock_strut;
 
 void dock_startup();
 void dock_shutdown();
@@ -60,9 +61,9 @@ void dock_hide(gboolean hide);
 void dock_add(Window win, XWMHints *wmhints);
 
 void dock_remove_all();
-void dock_remove(DockApp *app, gboolean reparent);
+void dock_remove(ObDockApp *app, gboolean reparent);
 
-void dock_app_drag(DockApp *app, XMotionEvent *e);
-void dock_app_configure(DockApp *app, int w, int h);
+void dock_app_drag(ObDockApp *app, XMotionEvent *e);
+void dock_app_configure(ObDockApp *app, gint w, gint h);
 
 #endif