#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;
static RrAppearance *prompt_a_button;
static RrAppearance *prompt_a_hover;
static RrAppearance *prompt_a_press;
+/* we change the max width which would screw with others */
+static RrAppearance *prompt_a_msg;
-#define msg_appearance(self) (ob_rr_theme->osd_hilite_label)
+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)
{
prompt_a_button->texture[0].data.text.color = c_button;
prompt_a_hover->texture[0].data.text.color = c_hover;
prompt_a_press->texture[0].data.text.color = c_press;
+
+ 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)
RrAppearanceFree(prompt_a_button);
RrAppearanceFree(prompt_a_hover);
RrAppearanceFree(prompt_a_press);
+ RrAppearanceFree(prompt_a_msg);
}
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);
self->ref = 1;
self->super.type = OB_WINDOW_CLASS_PROMPT;
self->super.window = XCreateWindow(obt_display, obt_root(ob_screen),
- 0, 0, 1, 1, 0,
+ 0, 0, 1, 1, ob_rr_theme->obwidth,
CopyFromParent, InputOutput,
CopyFromParent,
- CWOverrideRedirect, &attrib);
- window_add(&self->super.window, PROMPT_AS_WINDOW(self));
+ CWOverrideRedirect | CWBorderPixel,
+ &attrib);
+
+ 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);
window_add(&self->button[i].window, PROMPT_AS_WINDOW(self));
}
+ prompt_list = g_list_prepend(prompt_list, self);
+
return 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);
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)
{
- RrAppearance *a_msg = msg_appearance(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;
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) {
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 */
- a_msg->texture[0].data.text.string = self->msg.text;
- a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
- RrMinSize(a_msg, &self->msg.width, &self->msg.height);
- a_msg->texture[0].data.text.maxwidth = 0;
+ 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);
/* width and height inside the outer margins */
w = MAX(self->msg.width, allbuttonsw);
for (i = 0; i < self->n_buttons; ++i) {
self->button[i].x = buttonx;
buttonx += self->button[i].width + BUTTON_SEPARATION;
- self->button[i].y = h - allbuttonsh;
+ self->button[i].y = t + h - allbuttonsh;
self->button[i].y += (allbuttonsh - self->button[i].height) / 2;
}
/* 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);
RrPaint(self->a_bg, self->super.window, self->width, self->height);
- msg_appearance()->surface.parent = self->a_bg;
- msg_appearance()->surface.parentx = self->msg.x;
- msg_appearance()->surface.parentx = self->msg.y;
+ prompt_a_msg->surface.parent = self->a_bg;
+ prompt_a_msg->surface.parentx = self->msg.x;
+ prompt_a_msg->surface.parenty = self->msg.y;
- msg_appearance()->texture[0].data.text.string = self->msg.text;
- msg_appearance()->texture[0].data.text.maxwidth = self->msg_wbound;
- RrPaint(msg_appearance(), self->msg.window,
- self->msg.width, self->msg.height);
- msg_appearance()->texture[0].data.text.maxwidth = 0;
+ prompt_a_msg->texture[0].data.text.string = self->msg.text;
+ prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
+ RrPaint(prompt_a_msg, self->msg.window, self->msg.width, self->msg.height);
for (i = 0; i < self->n_buttons; ++i)
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;
}
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);
+}
projects / mikachu / openbox.git / blobdiff