#include "openbox.h"
#include "screen.h"
#include "client.h"
+#include "group.h"
+#include "event.h"
#include "obt/display.h"
#include "obt/keyboard.h"
#include "obt/prop.h"
static GList *prompt_list = NULL;
/* we construct these */
+static RrAppearance *prompt_a_bg;
static RrAppearance *prompt_a_button;
static RrAppearance *prompt_a_focus;
static RrAppearance *prompt_a_press;
+static RrAppearance *prompt_a_pfocus;
/* we change the max width which would screw with others */
static RrAppearance *prompt_a_msg;
+/* sizing stuff */
+#define OUTSIDE_MARGIN 4
+#define MSG_BUTTON_SEPARATION 4
+#define BUTTON_SEPARATION 4
+#define BUTTON_VMARGIN 4
+#define BUTTON_HMARGIN 12
+#define MAX_WIDTH 400
+
static void prompt_layout(ObPrompt *self);
static void render_all(ObPrompt *self);
static void render_button(ObPrompt *self, ObPromptElement *e);
+static void prompt_resize(ObPrompt *self, gint w, gint h);
void prompt_startup(gboolean reconfig)
{
- RrColor *c_button, *c_focus, *c_press;
+ RrColor *c_button, *c_focus, *c_press, *c_pfocus;
+
+ /* note: this is not a copy, don't free it */
+ prompt_a_bg = ob_rr_theme->osd_hilite_bg;
prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close);
prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
+ prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
c_button = prompt_a_button->texture[0].data.mask.color;
- c_focus = prompt_a_button->texture[0].data.mask.color;
- c_press = prompt_a_button->texture[0].data.mask.color;
+ c_focus = prompt_a_focus->texture[0].data.mask.color;
+ c_press = prompt_a_press->texture[0].data.mask.color;
+ c_pfocus = prompt_a_press->texture[0].data.mask.color;
RrAppearanceRemoveTextures(prompt_a_button);
RrAppearanceRemoveTextures(prompt_a_focus);
RrAppearanceRemoveTextures(prompt_a_press);
+ RrAppearanceRemoveTextures(prompt_a_pfocus);
+ /* texture[0] is the text and texture[1-4] (for prompt_a_focus and
+ prompt_a_pfocus) is lineart to show where keyboard focus is */
RrAppearanceAddTextures(prompt_a_button, 1);
- RrAppearanceAddTextures(prompt_a_focus, 1);
+ RrAppearanceAddTextures(prompt_a_focus, 5);
RrAppearanceAddTextures(prompt_a_press, 1);
+ RrAppearanceAddTextures(prompt_a_pfocus, 5);
/* totally cheating here.. */
prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
prompt_a_focus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
prompt_a_press->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
+ prompt_a_pfocus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
prompt_a_button->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
prompt_a_focus->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
prompt_a_press->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
+ prompt_a_pfocus->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
prompt_a_button->texture[0].data.text.color = c_button;
prompt_a_focus->texture[0].data.text.color = c_focus;
prompt_a_press->texture[0].data.text.color = c_press;
+ prompt_a_pfocus->texture[0].data.text.color = c_press;
+
+ prompt_a_focus->texture[1].data.lineart.color = c_focus;
+ prompt_a_focus->texture[2].data.lineart.color = c_focus;
+ prompt_a_focus->texture[3].data.lineart.color = c_focus;
+ prompt_a_focus->texture[4].data.lineart.color = c_focus;
+
+ prompt_a_pfocus->texture[1].data.lineart.color = c_press;
+ prompt_a_pfocus->texture[2].data.lineart.color = c_press;
+ prompt_a_pfocus->texture[3].data.lineart.color = c_press;
+ prompt_a_pfocus->texture[4].data.lineart.color = c_press;
prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
prompt_a_msg->texture[0].data.text.flow = TRUE;
RrAppearanceFree(prompt_a_button);
RrAppearanceFree(prompt_a_focus);
RrAppearanceFree(prompt_a_press);
+ RrAppearanceFree(prompt_a_pfocus);
RrAppearanceFree(prompt_a_msg);
}
-ObPrompt* prompt_new(const gchar *msg, const gchar *const *answers)
+ObPrompt* prompt_new(const gchar *msg,
+ const ObPromptAnswer *answers, gint n_answers,
+ gint default_result, gint cancel_result,
+ ObPromptCallback func, gpointer data)
{
ObPrompt *self;
XSetWindowAttributes attrib;
- guint i;
- const gchar *const *c;
+ gint i;
attrib.override_redirect = FALSE;
- attrib.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color);
self = g_new0(ObPrompt, 1);
self->ref = 1;
+ self->func = func;
+ self->data = data;
+ self->default_result = default_result;
+ self->cancel_result = cancel_result;
self->super.type = OB_WINDOW_CLASS_PROMPT;
self->super.window = XCreateWindow(obt_display, obt_root(ob_screen),
- 0, 0, 1, 1, ob_rr_theme->obwidth,
+ 0, 0, 1, 1, 0,
CopyFromParent, InputOutput,
CopyFromParent,
- CWOverrideRedirect | CWBorderPixel,
+ CWOverrideRedirect,
&attrib);
/* make it a dialog type window */
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
- self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
-
+ /* set up the text message widow */
self->msg.text = g_strdup(msg);
self->msg.window = XCreateWindow(obt_display, self->super.window,
0, 0, 1, 1, 0,
CopyFromParent, 0, NULL);
XMapWindow(obt_display, self->msg.window);
- self->n_buttons = 0;
- for (c = answers; *c != NULL; ++c)
- ++self->n_buttons;
+ /* set up the buttons from the answers */
+ self->n_buttons = n_answers;
if (!self->n_buttons)
self->n_buttons = 1;
- self->button = g_new(ObPromptElement, self->n_buttons);
+ self->button = g_new0(ObPromptElement, self->n_buttons);
- if (!answers) {
+ if (n_answers == 0) {
g_assert(self->n_buttons == 1); /* should be set to this above.. */
self->button[0].text = g_strdup(_("OK"));
}
else {
g_assert(self->n_buttons > 0);
- for (i = 0; i < self->n_buttons; ++i)
- self->button[i].text = g_strdup(answers[i]);
+ for (i = 0; i < self->n_buttons; ++i) {
+ self->button[i].text = g_strdup(answers[i].text);
+ self->button[i].result = answers[i].result;
+ }
}
for (i = 0; i < self->n_buttons; ++i) {
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
}
- /* set the focus to the first button */
- self->focus = &self->button[0];
-
prompt_list = g_list_prepend(prompt_list, self);
return self;
void prompt_unref(ObPrompt *self)
{
if (self && --self->ref == 0) {
- guint i;
+ gint i;
prompt_list = g_list_remove(prompt_list, self);
}
XDestroyWindow(obt_display, self->msg.window);
-
- RrAppearanceFree(self->a_bg);
-
XDestroyWindow(obt_display, self->super.window);
g_free(self);
}
static void prompt_layout(ObPrompt *self)
{
gint l, r, t, b;
- guint i;
+ gint 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 BUTTON_VMARGIN = 4;
- const gint BUTTON_HMARGIN = 12;
- const gint MAX_WIDTH = 600;
-
- RrMargins(self->a_bg, &l, &t, &r, &b);
+ RrMargins(prompt_a_bg, &l, &t, &r, &b);
l += OUTSIDE_MARGIN;
t += OUTSIDE_MARGIN;
r += OUTSIDE_MARGIN;
prompt_a_button->texture[0].data.text.string = self->button[i].text;
prompt_a_focus->texture[0].data.text.string = self->button[i].text;
prompt_a_press->texture[0].data.text.string = self->button[i].text;
+ prompt_a_pfocus->texture[0].data.text.string = self->button[i].text;
RrMinSize(prompt_a_button, &bw, &bh);
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);
self->button[i].width = MAX(self->button[i].width, bw);
self->button[i].height = MAX(self->button[i].height, bh);
+ RrMinSize(prompt_a_pfocus, &bw, &bh);
+ self->button[i].width = MAX(self->button[i].width, bw);
+ self->button[i].height = MAX(self->button[i].height, bh);
+
self->button[i].width += BUTTON_HMARGIN * 2;
self->button[i].height += BUTTON_VMARGIN * 2;
self->msg.x = l + (w - self->msg.width) / 2;
self->msg.y = t;
- /* position the button buttons */
- buttonx = l + (w - allbuttonsw) / 2;
- for (i = 0; i < self->n_buttons; ++i) {
- self->button[i].x = buttonx;
- buttonx += self->button[i].width + BUTTON_SEPARATION;
+ /* position the button buttons on the right of the dialog */
+ buttonx = l + w;
+ for (i = self->n_buttons - 1; i >= 0; --i) {
+ self->button[i].x = buttonx - self->button[i].width;
+ buttonx -= self->button[i].width + BUTTON_SEPARATION;
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;
+ prompt_resize(self, w + l + r, h + t + b);
- /* move and resize the actual windows */
- XResizeWindow(obt_display, self->super.window, self->width, self->height);
+ /* move and resize the internal windows */
XMoveResizeWindow(obt_display, self->msg.window,
self->msg.x, self->msg.y,
self->msg.width, self->msg.height);
self->button[i].width, self->button[i].height);
}
+static void prompt_resize(ObPrompt *self, gint w, gint h)
+{
+ XConfigureRequestEvent req;
+ XSizeHints hints;
+
+ self->width = w;
+ self->height = h;
+
+ /* the user can't resize the prompt */
+ hints.flags = PMinSize | PMaxSize;
+ hints.min_width = hints.max_width = w;
+ hints.min_height = hints.max_height = h;
+ XSetWMNormalHints(obt_display, self->super.window, &hints);
+
+ if (self->mapped) {
+ /* send a configure request like a normal client would */
+ req.type = ConfigureRequest;
+ req.display = obt_display;
+ req.parent = obt_root(ob_screen);
+ req.window = self->super.window;
+ req.width = w;
+ req.height = h;
+ req.value_mask = CWWidth | CWHeight;
+ XSendEvent(req.display, req.window, FALSE, StructureNotifyMask,
+ (XEvent*)&req);
+ }
+ else
+ XResizeWindow(obt_display, self->super.window, w, h);
+}
+
+static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
+ gboolean on)
+{
+ gint i, l, r, t, b;
+
+ for (i = 1; i < 5; ++i)
+ a->texture[i].type = on ? RR_TEXTURE_LINE_ART : RR_TEXTURE_NONE;
+
+ if (!on) return;
+
+ RrMargins(a, &l, &t, &r, &b);
+ l += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+ r += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+ t += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+ b += MIN(BUTTON_HMARGIN, BUTTON_VMARGIN) / 2;
+
+ /* top line */
+ a->texture[1].data.lineart.x1 = l;
+ a->texture[1].data.lineart.x2 = e->width - r - 1;
+ a->texture[1].data.lineart.y1 = t;
+ a->texture[1].data.lineart.y2 = t;
+
+ /* bottom line */
+ a->texture[2].data.lineart.x1 = l;
+ a->texture[2].data.lineart.x2 = e->width - r - 1;
+ a->texture[2].data.lineart.y1 = e->height - b - 1;
+ a->texture[2].data.lineart.y2 = e->height - b - 1;
+
+ /* left line */
+ a->texture[3].data.lineart.x1 = l;
+ a->texture[3].data.lineart.x2 = l;
+ a->texture[3].data.lineart.y1 = t;
+ a->texture[3].data.lineart.y2 = e->height - b - 1;
+
+ /* right line */
+ a->texture[4].data.lineart.x1 = e->width - r - 1;
+ 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)
{
RrAppearance *a;
- if (e->pressed) a = prompt_a_press;
- else if (self->focus == e) a = prompt_a_focus;
- else a = prompt_a_button;
+ if (e->pressed && self->focus == e) a = prompt_a_pfocus;
+ else if (self->focus == e) a = prompt_a_focus;
+ else if (e->pressed) a = prompt_a_press;
+ else a = prompt_a_button;
- a->surface.parent = self->a_bg;
+ a->surface.parent = prompt_a_bg;
a->surface.parentx = e->x;
- a->surface.parentx = e->y;
+ a->surface.parenty = e->y;
+
+ /* draw the keyfocus line */
+ if (a == prompt_a_pfocus || a == prompt_a_focus)
+ setup_button_focus_tex(e, a, TRUE);
a->texture[0].data.text.string = e->text;
RrPaint(a, e->window, e->width, e->height);
+
+ /* turn off the keyfocus line so that it doesn't affect size calculations
+ */
+ if (a == prompt_a_pfocus || a == prompt_a_focus)
+ setup_button_focus_tex(e, a, FALSE);
}
static void render_all(ObPrompt *self)
{
- guint i;
+ gint i;
- RrPaint(self->a_bg, self->super.window, self->width, self->height);
+ RrPaint(prompt_a_bg, self->super.window, self->width, self->height);
- prompt_a_msg->surface.parent = self->a_bg;
+ prompt_a_msg->surface.parent = prompt_a_bg;
prompt_a_msg->surface.parentx = self->msg.x;
prompt_a_msg->surface.parenty = self->msg.y;
render_button(self, &self->button[i]);
}
-void prompt_show(ObPrompt *self, ObClient *parent)
+void prompt_show(ObPrompt *self, ObClient *parent, gboolean modal)
{
- XSizeHints hints;
+ gint i;
+
+ if (self->mapped) {
+ /* activate the prompt */
+ OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW,
+ 1, /* from an application.. */
+ event_curtime,
+ 0,
+ 0, 0);
+ return;
+ }
- if (self->mapped) return;
+ /* set the focused button (if not found then the first button is used) */
+ self->focus = &self->button[0];
+ for (i = 0; i < self->n_buttons; ++i)
+ if (self->button[i].result == self->default_result) {
+ self->focus = &self->button[i];
+ break;
+ }
- prompt_layout(self);
- render_all(self);
+ 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 = obt_root(ob_screen);
+ }
+ else {
+ /* make it transient for the window directly */
+ h.flags = 0;
+ p = parent->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);
+ XSetWMHints(obt_display, self->super.window, &h);
+ OBT_PROP_SET32(self->super.window, WM_TRANSIENT_FOR, WINDOW, p);
- XSetTransientForHint(obt_display, (parent ? parent->window : 0),
- self->super.window);
+ states[0] = OBT_PROP_ATOM(NET_WM_STATE_MODAL);
+ nstates = (modal ? 1 : 0);
+ OBT_PROP_SETA32(self->super.window, NET_WM_STATE, ATOM,
+ states, nstates);
+ }
+ else
+ OBT_PROP_ERASE(self->super.window, WM_TRANSIENT_FOR);
+
+ /* set up the dialog and render it */
+ prompt_layout(self);
+ render_all(self);
client_manage(self->super.window, self);
self->mapped = FALSE;
}
-void prompt_key_event(ObPrompt *self, XEvent *e)
+gboolean prompt_key_event(ObPrompt *self, XEvent *e)
{
gboolean shift;
guint shift_mask;
- if (e->type != KeyPress) return;
+ if (e->type != KeyPress) return FALSE;
shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT);
shift = !!(e->xkey.state & shift_mask);
/* only accept shift */
if (e->xkey.state != 0 && e->xkey.state != shift_mask)
- return;
+ return FALSE;
if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
- prompt_hide(self);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
- /* XXX run stuff */
+ prompt_cancel(self);
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) ||
+ e->xkey.keycode == ob_keycode(OB_KEY_SPACE))
+ {
+ if (self->func) self->func(self, self->focus->result, self->data);
prompt_hide(self);
}
- else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB)) {
- guint i;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) ||
+ e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
+ e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
+ {
+ gint i;
+ gboolean left;
ObPromptElement *oldfocus;
+ left = e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
+ (e->xkey.keycode == ob_keycode(OB_KEY_TAB) && shift);
oldfocus = self->focus;
for (i = 0; i < self->n_buttons; ++i)
if (self->focus == &self->button[i]) break;
- i += (shift ? -1 : 1);
+ i += (left ? -1 : 1);
if (i < 0) i = self->n_buttons - 1;
else if (i >= self->n_buttons) i = 0;
self->focus = &self->button[i];
if (oldfocus != self->focus) render_button(self, oldfocus);
render_button(self, self->focus);
}
+ return TRUE;
}
-void prompt_mouse_event(ObPrompt *self, XEvent *e)
+gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
{
- guint i;
+ gint i;
ObPromptElement *but;
if (e->type != ButtonPress && e->type != ButtonRelease &&
- e->type != MotionNotify) return;
+ e->type != MotionNotify) return FALSE;
/* find the button */
+ but = NULL;
for (i = 0; i < self->n_buttons; ++i)
if (self->button[i].window ==
(e->type == MotionNotify ? e->xmotion.window : e->xbutton.window))
but = &self->button[i];
break;
}
- g_assert(but != NULL);
+ if (!but) return FALSE;
if (e->type == ButtonPress) {
ObPromptElement *oldfocus;
}
else if (e->type == ButtonRelease) {
if (but->pressed) {
- /* XXX run stuff */
+ if (self->func) self->func(self, but->result, self->data);
prompt_hide(self);
}
}
render_button(self, but);
}
}
+ return TRUE;
+}
+
+void prompt_cancel(ObPrompt *self)
+{
+ if (self->func) self->func(self, self->cancel_result, self->data);
+ prompt_hide(self);
}
projects / dana / openbox.git / blobdiff