X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=6084d798a063b05d510d648ec19b7393c93ada8d;hb=b8960827b76ad499170e8b5b9ae8bf202188f0b0;hp=84fe2d0d8dcd0cb00979237dceb461747413126a;hpb=58788c781713092c6aa3a4544f8a06cd499ec4fd;p=chaz%2Fopenbox

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 84fe2d0d..6084d798 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -21,12 +21,14 @@
 #include "screen.h"
 #include "openbox.h"
 #include "client.h"
+#include "group.h"
 #include "prop.h"
 #include "modkeys.h"
 #include "event.h"
 #include "gettext.h"
 
 static GList *prompt_list = NULL;
+static GList *prompt_msg_list = NULL;
 
 /* we construct these */
 static RrAppearance *prompt_a_bg;
@@ -120,6 +122,9 @@ void prompt_startup(gboolean reconfig)
 
 void prompt_shutdown(gboolean reconfig)
 {
+    while (prompt_msg_list)
+        prompt_cancel(prompt_msg_list->data);
+
     RrAppearanceFree(prompt_a_button);
     RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
@@ -217,6 +222,9 @@ void prompt_unref(ObPrompt *self)
     if (self && --self->ref == 0) {
         gint i;
 
+        if (self->mapped)
+            prompt_hide(self);
+
         prompt_list = g_list_remove(prompt_list, self);
 
         for (i = 0; i < self->n_buttons; ++i) {
@@ -263,7 +271,6 @@ static void prompt_layout(ObPrompt *self)
         self->button[i].width = bw;
         self->button[i].height = bh;
         RrMinSize(prompt_a_focus, &bw, &bh);
-        g_print("button w %d h %d\n", bw, bh);
         self->button[i].width = MAX(self->button[i].width, bw);
         self->button[i].height = MAX(self->button[i].height, bh);
         RrMinSize(prompt_a_press, &bw, &bh);
@@ -387,8 +394,6 @@ static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
     a->texture[4].data.lineart.x2 = e->width - r - 1;
     a->texture[4].data.lineart.y1 = t;
     a->texture[4].data.lineart.y2 = e->height - b - 1;
-
-    g_print("setting x2 %d\n", e->width - r - 1);
 }
 
 static void render_button(ObPrompt *self, ObPromptElement *e)
@@ -435,7 +440,7 @@ static void render_all(ObPrompt *self)
         render_button(self, &self->button[i]);
 }
 
-void prompt_show(ObPrompt *self, ObClient *parent)
+void prompt_show(ObPrompt *self, ObClient *parent, gboolean modal)
 {
     gint i;
 
@@ -457,8 +462,33 @@ void prompt_show(ObPrompt *self, ObClient *parent)
             break;
         }
 
-    XSetTransientForHint(ob_display, self->super.window,
-                         (parent ? parent->window : 0));
+    if (parent) {
+        Atom states[1];
+        gint nstates;
+        Window p;
+        XWMHints h;
+
+        if (parent->group) {
+            /* make it transient for the window's group */
+            h.flags = WindowGroupHint;
+            h.window_group = parent->group->leader;
+            p = RootWindow(ob_display, ob_screen);
+        }
+        else {
+            /* make it transient for the window directly */
+            h.flags = 0;
+            p = parent->window;
+        }
+
+        XSetWMHints(ob_display, self->super.window, &h);
+        PROP_SET32(self->super.window, wm_transient_for, window, p);
+
+        states[0] = prop_atoms.net_wm_state_modal;
+        nstates = (modal ? 1 : 0);
+        PROP_SETA32(self->super.window, net_wm_state, atom, states, nstates);
+    }
+    else
+        PROP_ERASE(self->super.window, wm_transient_for);
 
     /* set up the dialog and render it */
     prompt_layout(self);
@@ -482,8 +512,6 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
 
     if (e->type != KeyPress) return FALSE;
 
-    g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB));
-
     shift_mask = modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT);
     shift = !!(e->xkey.state & shift_mask);
 
@@ -579,3 +607,21 @@ void prompt_cancel(ObPrompt *self)
     if (self->func) self->func(self, self->cancel_result, self->data);
     prompt_hide(self);
 }
+
+static void prompt_show_message_cb(ObPrompt *p, int res, gpointer data)
+{
+    prompt_msg_list = g_list_remove(prompt_msg_list, p);
+    prompt_unref(p);
+}
+
+void prompt_show_message(const gchar *msg, const gchar *answer)
+{
+    ObPrompt *p;
+    ObPromptAnswer ans[] = {
+        { answer, 0 }
+    };
+
+    p = prompt_new(msg, ans, 1, 0, 0, prompt_show_message_cb, NULL);
+    prompt_msg_list = g_list_prepend(prompt_msg_list, p);
+    prompt_show(p, NULL, FALSE);
+}