#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_focus;
static RrAppearance *prompt_a_press;
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;
+ /* 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);
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;
RrAppearanceRemoveTextures(prompt_a_button);
RrAppearanceRemoveTextures(prompt_a_focus);
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->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 */
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
- /* we make a copy of this appearance for each prompt */
- 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(ob_display, self->super.window,
}
XDestroyWindow(ob_display, self->msg.window);
-
- RrAppearanceFree(self->a_bg);
-
XDestroyWindow(ob_display, self->super.window);
g_free(self);
}
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;
}
/* 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)
{
RrAppearance *a;
else if (self->focus == e) a = prompt_a_focus;
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;
{
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;
void prompt_show(ObPrompt *self, ObClient *parent)
{
- XSizeHints hints;
gint i;
- if (self->mapped) return;
+ if (self->mapped) {
+ /* activate the prompt */
+ PROP_MSG(self->super.window, net_active_window,
+ 1, /* from an application.. */
+ event_curtime,
+ 0,
+ 0);
+ return;
+ }
/* set the focused button (if not found then the first button is used) */
self->focus = &self->button[0];
break;
}
- /* 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);
+ XSetTransientForHint(ob_display, self->super.window,
+ (parent ? parent->window : 0));
/* set up the dialog and render it */
prompt_layout(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;
g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB));
/* 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_cancel(self);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
+ 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)) {
+ 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)
{
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;
render_button(self, but);
}
}
+ return TRUE;
}
void prompt_cancel(ObPrompt *self)
projects / chaz / openbox / blobdiff