Merge branch 'master' into chaz

[chaz/openbox] / openbox / prompt.h

diff --git a/openbox/prompt.h b/openbox/prompt.h
index d07793a9a1ed2d805e20f17f6963ff9d9d493b4f..13585740d8e1850209ca9ced5d82cbebd562ecfc 100644 (file)
--- a/openbox/prompt.h
+++ b/openbox/prompt.h
@@ -21,7 +21,8 @@
 
 #include "window.h"
 #include "geom.h"
-#include "render/render.h"
+#include "obrender/render.h"
+#include "obt/keyboard.h"
 #include <glib.h>
 #include <X11/Xlib.h>
 
@@ -38,6 +39,7 @@ struct _ObPromptElement {
 
     gint x, y, width, height;
     gboolean pressed;
+    gboolean hover;
     gint result;
 };
 
@@ -46,6 +48,7 @@ struct _ObPrompt
     ObInternalWindow super;
     gint ref;
 
+    ObtIC *ic;
     guint event_mask;
 
     /* keep a copy of this because we re-render things that may need it