#include "openbox.h"
#include "client.h"
#include "prop.h"
+#include "modkeys.h"
+#include "event.h"
#include "gettext.h"
static GList *prompt_list = NULL;
/* we construct these */
+static RrAppearance *prompt_a_bg;
static RrAppearance *prompt_a_button;
-static RrAppearance *prompt_a_hover;
+static RrAppearance *prompt_a_focus;
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);
+static void prompt_resize(ObPrompt *self, gint w, gint h);
void prompt_startup(gboolean reconfig)
{
- RrColor *c_button, *c_hover, *c_press;
+ RrColor *c_button, *c_focus, *c_press;
+
+ /* 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_hover = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
+ prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
c_button = prompt_a_button->texture[0].data.mask.color;
- c_hover = 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;
RrAppearanceRemoveTextures(prompt_a_button);
- RrAppearanceRemoveTextures(prompt_a_hover);
+ RrAppearanceRemoveTextures(prompt_a_focus);
RrAppearanceRemoveTextures(prompt_a_press);
RrAppearanceAddTextures(prompt_a_button, 1);
- RrAppearanceAddTextures(prompt_a_hover, 1);
+ RrAppearanceAddTextures(prompt_a_focus, 1);
RrAppearanceAddTextures(prompt_a_press, 1);
/* totally cheating here.. */
prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0];
- prompt_a_hover->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_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_button->texture[0].data.text.color = c_button;
- prompt_a_hover->texture[0].data.text.color = c_hover;
+ prompt_a_focus->texture[0].data.text.color = c_focus;
prompt_a_press->texture[0].data.text.color = c_press;
prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
void prompt_shutdown(gboolean reconfig)
{
RrAppearanceFree(prompt_a_button);
- RrAppearanceFree(prompt_a_hover);
+ RrAppearanceFree(prompt_a_focus);
RrAppearanceFree(prompt_a_press);
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 = Window_Prompt;
self->super.window = XCreateWindow(ob_display,
RootWindow(ob_display, 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 */
PROP_SET32(self->super.window, net_wm_window_type, atom,
prop_atoms.net_wm_window_type_dialog);
- self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ /* listen for key presses on the window */
+ self->event_mask = KeyPressMask;
+ /* set up the text message widow */
self->msg.text = g_strdup(msg);
self->msg.window = XCreateWindow(ob_display, self->super.window,
0, 0, 1, 1, 0,
CopyFromParent, 0, NULL);
XMapWindow(ob_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) {
XMapWindow(ob_display, self->button[i].window);
g_hash_table_insert(window_map, &self->button[i].window,
PROMPT_AS_WINDOW(self));
+
+ /* listen for button presses on the buttons */
+ XSelectInput(ob_display, self->button[i].window,
+ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask);
}
prompt_list = g_list_prepend(prompt_list, self);
void prompt_unref(ObPrompt *self)
{
if (self && --self->ref == 0) {
- guint i;
+ gint i;
prompt_list = g_list_remove(prompt_list, self);
}
XDestroyWindow(ob_display, self->msg.window);
-
- RrAppearanceFree(self->a_bg);
-
XDestroyWindow(ob_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;
gint bw, bh;
prompt_a_button->texture[0].data.text.string = self->button[i].text;
- prompt_a_hover->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;
RrMinSize(prompt_a_button, &bw, &bh);
self->button[i].width = bw;
self->button[i].height = bh;
- RrMinSize(prompt_a_hover, &bw, &bh);
+ RrMinSize(prompt_a_focus, &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);
+ self->button[i].width += BUTTON_HMARGIN * 2;
+ self->button[i].height += BUTTON_VMARGIN * 2;
+
allbuttonsw += self->button[i].width + (i > 0 ? BUTTON_SEPARATION : 0);
allbuttonsh = MAX(allbuttonsh, self->button[i].height);
}
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(ob_display, self->super.window, self->width, self->height);
+ /* move and resize the internal windows */
XMoveResizeWindow(ob_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(ob_display, self->super.window, &hints);
+
+ if (self->mapped) {
+ /* send a configure request like a normal client would */
+ req.type = ConfigureRequest;
+ req.display = ob_display;
+ req.parent = RootWindow(ob_display, 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(ob_display, self->super.window, w, h);
+}
+
static void render_button(ObPrompt *self, ObPromptElement *e)
{
- prompt_a_button->surface.parent = self->a_bg;
- prompt_a_button->surface.parentx = e->x;
- prompt_a_button->surface.parentx = e->y;
+ RrAppearance *a;
- prompt_a_button->texture[0].data.text.string = e->text;
- RrPaint(prompt_a_button, e->window, e->width, e->height);
+ if (e->pressed) a = prompt_a_press;
+ else if (self->focus == e) a = prompt_a_focus;
+ else a = prompt_a_button;
+
+ a->surface.parent = prompt_a_bg;
+ a->surface.parentx = e->x;
+ a->surface.parentx = e->y;
+
+ a->texture[0].data.text.string = e->text;
+ RrPaint(a, e->window, e->width, e->height);
}
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.parentx = self->msg.y;
+ prompt_a_msg->surface.parenty = self->msg.y;
prompt_a_msg->texture[0].data.text.string = self->msg.text;
prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound;
void prompt_show(ObPrompt *self, ObClient *parent)
{
- XSizeHints hints;
+ gint i;
+
+ if (self->mapped) {
+ /* activate the prompt */
+ PROP_MSG(self->super.window, net_active_window,
+ 1, /* from an application.. */
+ event_curtime,
+ 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;
+ }
+ XSetTransientForHint(ob_display, self->super.window,
+ (parent ? parent->window : 0));
+
+ /* set up the dialog and render it */
prompt_layout(self);
render_all(self);
- /* 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(ob_display, self->super.window, &hints);
-
- XSetTransientForHint(ob_display, (parent ? parent->window : 0),
- self->super.window);
-
client_manage(self->super.window, self);
self->mapped = TRUE;
self->mapped = FALSE;
}
-void prompt_hide_window(Window window)
+gboolean prompt_key_event(ObPrompt *self, XEvent *e)
{
- GList *it;
- ObPrompt *p = NULL;
+ gboolean shift;
+ guint shift_mask;
- for (it = prompt_list; it; it = g_list_next(it)) {
- p = it->data;
- if (p->super.window == window) break;
+ 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);
+
+ /* only accept shift */
+ if (e->xkey.state != 0 && e->xkey.state != shift_mask)
+ return FALSE;
+
+ if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+ 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) ||
+ 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 += (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);
}
- g_assert(it != NULL);
- prompt_hide(p);
+ return TRUE;
+}
+
+gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
+{
+ gint i;
+ ObPromptElement *but;
+
+ if (e->type != ButtonPress && e->type != ButtonRelease &&
+ 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;
+ }
+ if (!but) return FALSE;
+
+ if (e->type == ButtonPress) {
+ ObPromptElement *oldfocus;
+
+ oldfocus = self->focus;
+
+ but->pressed = TRUE;
+ self->focus = but;
+
+ if (oldfocus != but) render_button(self, oldfocus);
+ render_button(self, but);
+ }
+ else if (e->type == ButtonRelease) {
+ if (but->pressed) {
+ if (self->func) self->func(self, but->result, self->data);
+ prompt_hide(self);
+ }
+ }
+ else if (e->type == MotionNotify) {
+ gboolean press;
+
+ press = (e->xmotion.x >= 0 && e->xmotion.y >= 0 &&
+ e->xmotion.x < but->width && e->xmotion.y < but->height);
+
+ if (press != but->pressed) {
+ but->pressed = press;
+ 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 / mikachu / openbox.git / blobdiff