Merge branch 'master' into chaz

[chaz/openbox] / openbox / dock.h

diff --git a/openbox/dock.h b/openbox/dock.h
index b2ded2d2191c2dff78b5f50efb7e91e4d32e7cf5..cb4fd6cada01524b9f368b9e1d4951004aff8b4b 100644 (file)
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    dock.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #include "window.h"
 #include "stacking.h"
 #include "geom.h"
-#include "render/render.h"
+#include "obrender/render.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -39,23 +39,19 @@ struct _ObDock
     RrAppearance *a_frame;
 
     /* actual position (when not auto-hidden) */
-    gint x;
-    gint y;
-    gint w;
-    gint h;
+    Rect area;
 
     gboolean hidden;
 
     GList *dock_apps;
+    GHashTable *dock_map;
 };
 
 struct _ObDockApp {
-    ObWindow obwin;
-
     gint ignore_unmaps;
 
     Window icon_win;
-    Window win;
+    Window name_win;
 
     gchar *name;
     gchar *class;
@@ -71,15 +67,22 @@ extern StrutPartial dock_strut;
 void dock_startup(gboolean reconfig);
 void dock_shutdown(gboolean reconfig);
 
-void dock_configure();
+void dock_configure(void);
 void dock_hide(gboolean hide);
 
-void dock_add(Window win, XWMHints *wmhints);
+void dock_manage(Window icon_win, Window name_win);
 
-void dock_remove_all();
-void dock_remove(ObDockApp *app, gboolean reparent);
+void dock_unmanage_all(void);
+void dock_unmanage(ObDockApp *app, gboolean reparent);
 
 void dock_app_drag(ObDockApp *app, XMotionEvent *e);
 void dock_app_configure(ObDockApp *app, gint w, gint h);
 
+void dock_get_area(Rect *a);
+
+void dock_raise_dock(void);
+void dock_lower_dock(void);
+
+ObDockApp* dock_find_dockapp(Window xwin);
+
 #endif