Merge branch 'backport' into work

[chaz/openbox] / openbox / dock.h

diff --git a/openbox/dock.h b/openbox/dock.h
index 051747c3f163789553c4beafc7e21098148de12b..3463f27b16d2923f1d867935ab1575c72a6bd9f6 100644 (file)
--- a/openbox/dock.h
+++ b/openbox/dock.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,19 @@ 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);
+
+ObDockApp* dock_find_dockapp(Window xwin);
+
 #endif