X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.c;h=d312fc365844ec92392cbb25739f10d829c5db71;hb=911413d86c771248994727cfd53a7aa2e122993c;hp=8ca01b6f76838173f93b79500d94839bcd8ac18f;hpb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;p=chaz%2Fopenbox

diff --git a/openbox/window.c b/openbox/window.c
index 8ca01b6f..d312fc36 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,19 +1,46 @@
+/* -*- 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"
 #include "frame.h"
+#include "prompt.h"
 
 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 +48,7 @@ Window window_top(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return ((Menu*)self)->frame;
+        return ((ObMenuFrame*)self)->window;
     case Window_Dock:
         return ((ObDock*)self)->frame;
     case Window_DockApp:
@@ -31,13 +58,15 @@ Window window_top(ObWindow *self)
     case Window_Client:
         return ((ObClient*)self)->frame->window;
     case Window_Internal:
-        return ((InternalWindow*)self)->win;
+        return ((InternalWindow*)self)->window;
+    case Window_Prompt:
+        return ((ObPrompt*)self)->super.window;
     }
     g_assert_not_reached();
     return None;
 }
 
-Window window_layer(ObWindow *self)
+ObStackingLayer window_layer(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
@@ -52,6 +81,10 @@ Window window_layer(ObWindow *self)
         return ((ObClient*)self)->layer;
     case Window_Internal:
         return OB_STACKING_LAYER_INTERNAL;
+    case Window_Prompt:
+        /* not used directly for stacking, prompts are managed as clients */
+        g_assert_not_reached();
+        break;
     }
     g_assert_not_reached();
     return None;