X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.c;h=19b39c0912d4174650dcd3bcc12f5603cbed0caa;hb=0f677834e253dfd18a246c8811bf4a4e364d5e0e;hp=521d9e2d4cd1908cb9bca909a07f5a1f7b0cdf2a;hpb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;p=chaz%2Fopenbox

diff --git a/openbox/window.c b/openbox/window.c
index 521d9e2d..19b39c09 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,5 +1,23 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   window.c 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.
+*/
+
 #include "window.h"
-#include "menu.h"
+#include "menuframe.h"
 #include "config.h"
 #include "dock.h"
 #include "client.h"
@@ -7,13 +25,21 @@
 
 GHashTable *window_map;
 
-void window_startup()
+static guint window_hash(Window *w) { return *w; }
+static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
+
+void window_startup(gboolean reconfig)
 {
-    window_map = g_hash_table_new(g_int_hash, g_int_equal);
+    if (reconfig) return;
+
+    window_map = g_hash_table_new((GHashFunc)window_hash,
+                                  (GEqualFunc)window_comp);
 }
 
-void window_shutdown()
+void window_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(window_map);
 }
 
@@ -21,7 +47,7 @@ Window window_top(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return ((ObMenu*)self)->frame;
+        return ((ObMenuFrame*)self)->window;
     case Window_Dock:
         return ((ObDock*)self)->frame;
     case Window_DockApp: