X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.h;h=051747c3f163789553c4beafc7e21098148de12b;hb=2442cdfd85e5229c7ee4ac49ca66a7d55ffcb919;hp=d70519a3e3a837a304aa9c2c993246d0c2dec64a;hpb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;p=chaz%2Fopenbox

diff --git a/openbox/dock.h b/openbox/dock.h
index d70519a3..051747c3 100644
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -1,7 +1,24 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   dock.h for the Openbox window manager
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __dock_h
 #define __dock_h
 
-#include "timer.h"
 #include "window.h"
 #include "stacking.h"
 #include "geom.h"
@@ -11,55 +28,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;
     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;
 
-    char *name;
-    char *class;
+    gchar *name;
+    gchar *class;
 
-    int x;
-    int y;
-    int w;
-    int h;
-} DockApp;
+    gint x;
+    gint y;
+    gint w;
+    gint h;
+};
 
-extern Strut dock_strut;
+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);
@@ -67,9 +77,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