Merge branch 'master' into chaz

[chaz/openbox] / openbox / prompt.h

diff --git a/openbox/prompt.h b/openbox/prompt.h
index 007dae934cedc75b1e6f7b6e7e96dcdeff969495..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,14 +39,16 @@ struct _ObPromptElement {
 
     gint x, y, width, height;
     gboolean pressed;
+    gboolean hover;
     gint result;
 };
 
 struct _ObPrompt
 {
-    InternalWindow super;
+    ObInternalWindow super;
     gint ref;
 
+    ObtIC *ic;
     guint event_mask;
 
     /* keep a copy of this because we re-render things that may need it
@@ -100,7 +103,7 @@ void prompt_shutdown(gboolean reconfig);
          callback function returns TRUE.
   @param data User defined data which will be passed to the callback
 */
-ObPrompt* prompt_new(const gchar *msg,
+ObPrompt* prompt_new(const gchar *msg, const gchar *title,
                      const ObPromptAnswer *answers, gint n_answers,
                      gint default_result, gint cancel_result,
                      ObPromptCallback func, ObPromptCleanup cleanup,
@@ -116,6 +119,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e);
 gboolean prompt_mouse_event(ObPrompt *self, XEvent *e);
 void prompt_cancel(ObPrompt *self);
 
-void prompt_show_message(const gchar *msg, const gchar *answer);
+ObPrompt* prompt_show_message(const gchar *msg, const gchar *title,
+                              const gchar *answer);
 
 #endif