X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.h;h=ef29edd7adc000d1852c2948298c04f903dac3f5;hb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;hp=7e7e4d34a3bf3111e107e9a8fe91df162c01472a;hpb=d206303a9f0742ff330aebe8129d6044ade30a94;p=chaz%2Fopenbox

diff --git a/openbox/window.h b/openbox/window.h
index 7e7e4d34..ef29edd7 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -1,9 +1,30 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   window.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 __window_h
 #define __window_h
 
 #include <X11/Xlib.h>
 #include <glib.h>
 
+typedef struct _ObWindow         ObWindow;
+typedef struct _ObInternalWindow ObInternalWindow;
+
 typedef enum {
     Window_Menu,
     Window_Dock,
@@ -12,9 +33,10 @@ typedef enum {
     Window_Internal /* used for stacking but not events */
 } Window_InternalType;
 
-typedef struct ObWindow {
+struct _ObWindow
+{
     Window_InternalType type;
-} ObWindow;
+};
 
 /* Wrapper for internal stuff. If its struct matches this then it can be used
    as an ObWindow */
@@ -29,12 +51,12 @@ typedef struct InternalWindow {
 #define WINDOW_IS_CLIENT(win) (((ObWindow*)win)->type == Window_Client)
 #define WINDOW_IS_INTERNAL(win) (((ObWindow*)win)->type == Window_Internal)
 
-struct Menu;
+struct _ObMenu;
 struct _ObDock;
 struct _ObDockApp;
 struct _ObClient;
 
-#define WINDOW_AS_MENU(win) ((struct Menu*)win)
+#define WINDOW_AS_MENU(win) ((struct _ObMenuFrame*)win)
 #define WINDOW_AS_DOCK(win) ((struct _ObDock*)win)
 #define WINDOW_AS_DOCKAPP(win) ((struct _ObDockApp*)win)
 #define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win)
@@ -48,8 +70,8 @@ struct _ObClient;
 
 extern GHashTable *window_map;
 
-void window_startup();
-void window_shutdown();
+void window_startup(gboolean reconfig);
+void window_shutdown(gboolean reconfig);
 
 Window window_top(ObWindow *self);
 Window window_layer(ObWindow *self);