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

diff --git a/openbox/window.c b/openbox/window.c
index 99e20081..d312fc36 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,7 +1,7 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    window.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   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
@@ -22,14 +22,19 @@
 #include "dock.h"
 #include "client.h"
 #include "frame.h"
+#include "prompt.h"
 
 GHashTable *window_map;
 
+static guint window_hash(Window *w) { return *w; }
+static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
+
 void window_startup(gboolean reconfig)
 {
     if (reconfig) return;
 
-    window_map = g_hash_table_new(g_int_hash, g_int_equal);
+    window_map = g_hash_table_new((GHashFunc)window_hash,
+                                  (GEqualFunc)window_comp);
 }
 
 void window_shutdown(gboolean reconfig)
@@ -53,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:
@@ -74,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;