Make ObPrompt windows get managed as clients, and make them able to reconfigure as...

diff --git a/openbox/client.c b/openbox/client.c
index 6534e1b..3867c39 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -29,6 +29,7 @@
 #include "session.h"
 #include "event.h"
 #include "grab.h"
+#include "prompt.h"
 #include "focus.h"
 #include "stacking.h"
 #include "openbox.h"
@@ -174,7 +175,7 @@ void client_set_list(void)
     stacking_set_list();
 }
 
-void client_manage(Window window)
+void client_manage(Window window, ObPrompt *prompt)
 {
     ObClient *self;
     XSetWindowAttributes attrib_set;
@@ -199,6 +200,7 @@ void client_manage(Window window)
     self = g_new0(ObClient, 1);
     self->obwin.type = OB_WINDOW_CLASS_CLIENT;
     self->window = window;
+    self->prompt = prompt;
 
     /* non-zero defaults */
     self->wmstate = WithdrawnState; /* make sure it gets updated first time */
@@ -218,7 +220,8 @@ void client_manage(Window window)
 
     /* specify that if we exit, the window should not be destroyed and
        should be reparented back to root automatically */
-    XChangeSaveSet(obt_display, window, SetModeInsert);
+    if (!self->prompt)
+        XChangeSaveSet(obt_display, window, SetModeInsert);
 
     /* create the decoration frame for the client window */
     self->frame = frame_new(self);
@@ -617,7 +620,8 @@ void client_unmanage(ObClient *self)
     mouse_grab_for_client(self, FALSE);
 
     /* remove the window from our save set */
-    XChangeSaveSet(obt_display, self->window, SetModeDelete);
+    if (!self->prompt)
+        XChangeSaveSet(obt_display, self->window, SetModeDelete);
 
     /* update the focus lists */
     focus_order_remove(self);
@@ -3250,6 +3254,11 @@ void client_close(ObClient *self)
 {
     if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return;
 
+    if (self->prompt) {
+        prompt_hide(self);
+        return;
+    }
+
     /* in the case that the client provides no means to requesting that it
        close, we just kill it */
     if (!self->delete_window)

diff --git a/openbox/client.h b/openbox/client.h
index 3f92a4e..2012cbd 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -37,6 +37,7 @@
 struct _ObFrame;
 struct _ObGroup;
 struct _ObSessionState;
+struct _ObPrompt;
 
 typedef struct _ObClient      ObClient;
 typedef struct _ObClientIcon  ObClientIcon;
@@ -82,6 +83,10 @@ struct _ObClient
     ObWindow obwin;
     Window  window;
 
+    /*! If this client is managing an ObPrompt window, then this is set to the
+      prompt */
+    struct _ObPrompt *prompt;
+
     /*! The window's decorations. NULL while the window is being managed! */
     struct _ObFrame *frame;
 
@@ -322,8 +327,11 @@ typedef void (*ObClientCallback)(ObClient *client, gpointer data);
 void client_add_destroy_notify(ObClientCallback func, gpointer data);
 void client_remove_destroy_notify(ObClientCallback func);
 
-/*! Manages a given window */
-void client_manage(Window win);
+/*! Manages a given window
+  @param prompt This specifies an ObPrompt which is being managed.  It is
+                possible to manage Openbox-owned windows through this.
+*/
+void client_manage(Window win, struct _ObPrompt *prompt);
 /*! Unmanages all managed windows */
 void client_unmanage_all();
 /*! Unmanages a given client */

diff --git a/openbox/prompt.c b/openbox/prompt.c
index d707e31..ea440e9 100644 (file)
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -19,7 +19,9 @@
 #include "prompt.h"
 #include "openbox.h"
 #include "screen.h"
+#include "client.h"
 #include "obt/display.h"
+#include "obt/prop.h"
 #include "gettext.h"
 
 static GList *prompt_list = NULL;
@@ -31,6 +33,10 @@ static RrAppearance *prompt_a_press;
 /* we change the max width which would screw with others */
 static RrAppearance *prompt_a_msg;
 
+static void prompt_layout(ObPrompt *self);
+static void render_all(ObPrompt *self);
+static void render_button(ObPrompt *self, ObPromptElement *e);
+
 void prompt_startup(gboolean reconfig)
 {
     RrColor *c_button, *c_hover, *c_press;
@@ -62,6 +68,15 @@ void prompt_startup(gboolean reconfig)
 
     prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
     prompt_a_msg->texture[0].data.text.flow = TRUE;
+
+    if (reconfig) {
+        GList *it;
+        for (it = prompt_list; it; it = g_list_next(it)) {
+            ObPrompt *p = it->data;
+            prompt_layout(p);
+            render_all(p);
+        }
+    }
 }
 
 void prompt_shutdown(gboolean reconfig)
@@ -79,7 +94,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
     guint i;
     const gchar *const *c;
 
-    attrib.override_redirect = TRUE;
+    attrib.override_redirect = FALSE;
     attrib.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color);
 
     self = g_new0(ObPrompt, 1);
@@ -91,7 +106,9 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
                                        CopyFromParent,
                                        CWOverrideRedirect | CWBorderPixel,
                                        &attrib);
-    window_add(&self->super.window, PROMPT_AS_WINDOW(self));
+
+    OBT_PROP_SET32(self->super.window, NET_WM_WINDOW_TYPE, ATOM,
+                   OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG));
 
     self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
 
@@ -130,6 +147,8 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
         window_add(&self->button[i].window, PROMPT_AS_WINDOW(self));
     }
 
+    prompt_list = g_list_prepend(prompt_list, self);
+
     return self;
 }
 
@@ -143,6 +162,8 @@ void prompt_unref(ObPrompt *self)
     if (self && --self->ref == 0) {
         guint i;
 
+        prompt_list = g_list_remove(prompt_list, self);
+
         for (i = 0; i < self->n_buttons; ++i) {
             window_remove(self->button[i].window);
             XDestroyWindow(obt_display, self->button[i].window);
@@ -152,22 +173,23 @@ void prompt_unref(ObPrompt *self)
 
         RrAppearanceFree(self->a_bg);
 
-        window_remove(self->super.window);
         XDestroyWindow(obt_display, self->super.window);
         g_free(self);
     }
 }
 
-static void prompt_layout(ObPrompt *self, const Rect *area)
+static void prompt_layout(ObPrompt *self)
 {
     gint l, r, t, b;
     guint i;
     gint allbuttonsw, allbuttonsh, buttonx;
     gint w, h;
+    gint maxw;
 
     const gint OUTSIDE_MARGIN = 4;
     const gint MSG_BUTTON_SEPARATION = 4;
     const gint BUTTON_SEPARATION = 4;
+    const gint MAX_WIDTH = 600;
 
     RrMargins(self->a_bg, &l, &t, &r, &b);
     l += OUTSIDE_MARGIN;
@@ -175,6 +197,12 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
     r += OUTSIDE_MARGIN;
     b += OUTSIDE_MARGIN;
 
+    {
+        Rect *area = screen_physical_area_all_monitors();
+        maxw = MIN(MAX_WIDTH, area->width*4/5);
+        g_free(area);
+    }
+
     /* find the button sizes and how much space we need for them */
     allbuttonsw = allbuttonsh = 0;
     for (i = 0; i < self->n_buttons; ++i) {
@@ -197,15 +225,13 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
         allbuttonsh = MAX(allbuttonsh, self->button[i].height);
     }
 
-    self->msg_wbound = MAX(allbuttonsw, area->width*3/5);
+    self->msg_wbound = MAX(allbuttonsw, maxw);
 
     /* measure the text message area */
     prompt_a_msg->texture[0].data.text.string = self->msg.text;
     prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
     RrMinSize(prompt_a_msg, &self->msg.width, &self->msg.height);
 
-    g_print("height %d\n", self->msg.height);
-
     /* width and height inside the outer margins */
     w = MAX(self->msg.width, allbuttonsw);
     h = self->msg.height + MSG_BUTTON_SEPARATION + allbuttonsh;
@@ -226,12 +252,9 @@ static void prompt_layout(ObPrompt *self, const Rect *area)
     /* size and position the toplevel window */
     self->width = w + l + r;
     self->height = h + t + b;
-    self->x = (area->width - self->width) / 2;
-    self->y = (area->height - self->height) / 2;
 
     /* move and resize the actual windows */
-    XMoveResizeWindow(obt_display, self->super.window,
-                      self->x, self->y, self->width, self->height);
+    XResizeWindow(obt_display, self->super.window, self->width, self->height);
     XMoveResizeWindow(obt_display, self->msg.window,
                       self->msg.x, self->msg.y,
                       self->msg.width, self->msg.height);
@@ -269,13 +292,25 @@ static void render_all(ObPrompt *self)
         render_button(self, &self->button[i]);
 }
 
-void prompt_show(ObPrompt *self, const Rect *area)
+void prompt_show(ObPrompt *self, ObClient *parent)
 {
+    XSizeHints hints;
+
     if (self->mapped) return;
 
-    prompt_layout(self, area);
+    prompt_layout(self);
     render_all(self);
-    XMapWindow(obt_display, self->super.window);
+
+    /* you can't resize the prompt */
+    hints.flags = PMinSize | PMaxSize;
+    hints.min_width = hints.max_width = self->width;
+    hints.min_height = hints.max_height = self->height;
+    XSetWMNormalHints(obt_display, self->super.window, &hints);
+
+    XSetTransientForHint(obt_display, (parent ? parent->window : 0),
+                         self->super.window);
+
+    client_manage(self->super.window, self);
 
     self->mapped = TRUE;
 }
@@ -285,3 +320,16 @@ void prompt_hide(ObPrompt *self)
     XUnmapWindow(obt_display, self->super.window);
     self->mapped = FALSE;
 }
+
+void prompt_hide_window(Window window)
+{
+    GList *it;
+    ObPrompt *p = NULL;
+
+    for (it = prompt_list; it; it = g_list_next(it)) {
+        p = it->data;
+        if (p->super.window == window) break;
+    }
+    g_assert(it != NULL);
+    prompt_hide(p);
+}

diff --git a/openbox/prompt.h b/openbox/prompt.h
index deef3f2..8d996ef 100644 (file)
--- a/openbox/prompt.h
+++ b/openbox/prompt.h
@@ -44,7 +44,7 @@ struct _ObPrompt
     RrAppearance *a_bg;
 
     gboolean mapped;
-    gint x, y, width, height;
+    gint width, height;
     gint msg_wbound;
 
     ObPromptElement msg;
@@ -62,7 +62,8 @@ void prompt_ref(ObPrompt *self);
 void prompt_unref(ObPrompt *self);
 
 /*! Show the prompt.  It will be centered within the given area rectangle */
-void prompt_show(ObPrompt *self, const Rect *area);
+void prompt_show(ObPrompt *self, struct _ObClient *parent);
 void prompt_hide(ObPrompt *self);
+void prompt_hide_window(Window window);
 
 #endif

diff --git a/openbox/window.c b/openbox/window.c
index 88a727d..c895174 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -193,7 +193,7 @@ void window_manage(Window win)
             dock_manage(icon_win, win);
         }
         else
-            client_manage(win);
+            client_manage(win, NULL);
     }
     else {
         grab_server(FALSE);