make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / dock.h

diff --git a/openbox/dock.h b/openbox/dock.h
index 14411499a165ddb7699057e6ed9b0ff88af03cd5..cf35bff998048c54870272c104b1de2a9fd44d0c 100644 (file)
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -1,7 +1,6 @@
 #ifndef __dock_h
 #define __dock_h
 
-#include "timer.h"
 #include "window.h"
 #include "stacking.h"
 #include "geom.h"
@@ -11,51 +10,48 @@
 #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;
 
     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;
 
-extern Strut dock_strut;
+    gchar *name;
+    gchar *class;
+
+    gint x;
+    gint y;
+    gint w;
+    gint h;
+};
+
+extern StrutPartial dock_strut;
 
-void dock_startup();
-void dock_shutdown();
+void dock_startup(gboolean reconfig);
+void dock_shutdown(gboolean reconfig);
 
 void dock_configure();
 void dock_hide(gboolean hide);
@@ -63,9 +59,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