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;
void prompt_startup(gboolean reconfig)
{
- 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_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_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, 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_pfocus;
-
- 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_button = RrAppearanceCopy(ob_rr_theme->osd_unpressed_button);
+ prompt_a_focus = RrAppearanceCopy(ob_rr_theme->osd_focused_button);
+ prompt_a_press = RrAppearanceCopy(ob_rr_theme->osd_pressed_button);
prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
prompt_a_msg->texture[0].data.text.flow = TRUE;
void prompt_shutdown(gboolean reconfig)
{
- GList *it;
+ GList *it, *next;
if (!reconfig) {
- for (it = prompt_list; it; it = g_list_next(it)) {
+ for (it = prompt_list; it; it = next) {
ObPrompt *p = it->data;
+ next = it->next;
if (p->cleanup) p->cleanup(p, p->data);
}
RrAppearanceFree(prompt_a_button);
RrAppearanceFree(prompt_a_focus);
RrAppearanceFree(prompt_a_press);
- RrAppearanceFree(prompt_a_pfocus);
RrAppearanceFree(prompt_a_msg);
}
attrib.override_redirect = FALSE;
- self = g_new0(ObPrompt, 1);
+ self = g_slice_new0(ObPrompt);
self->ref = 1;
self->func = func;
self->cleanup = cleanup;
/* set the window's title */
if (title)
- OBT_PROP_SETS(self->super.window, NET_WM_NAME, utf8, title);
+ OBT_PROP_SETS(self->super.window, NET_WM_NAME, title);
/* listen for key presses on the window */
self->event_mask = KeyPressMask;
XDestroyWindow(obt_display, self->msg.window);
XDestroyWindow(obt_display, self->super.window);
- g_free(self);
+ g_slice_free(ObPrompt, self);
}
}
b += OUTSIDE_MARGIN;
{
- Rect *area = screen_physical_area_all_monitors();
+ const 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 */
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_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;
{
RrAppearance *a;
- if (e->hover && self->focus == e) a = prompt_a_pfocus;
+ if (e->hover && e->pressed) a = prompt_a_press;
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 = prompt_a_bg;
a->surface.parenty = e->y;
/* draw the keyfocus line */
- if (a == prompt_a_pfocus || a == prompt_a_focus)
+ if (self->focus == e)
setup_button_focus_tex(e, a, TRUE);
a->texture[0].data.text.string = e->text;
/* turn off the keyfocus line so that it doesn't affect size calculations
*/
- if (a == prompt_a_pfocus || a == prompt_a_focus)
+ if (self->focus == e)
setup_button_focus_tex(e, a, FALSE);
}
/* activate the prompt */
OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW,
1, /* from an application.. */
- event_curtime,
+ event_time(),
0,
0, 0);
return;
if (sym == XK_Escape)
prompt_cancel(self);
- else if (sym == XK_Return || sym == XK_space)
+ else if (sym == XK_Return || sym == XK_KP_Enter || sym == XK_space)
prompt_run_callback(self, self->focus->result);
else if (sym == XK_Tab || sym == XK_Left || sym == XK_Right) {
gint i;
{
prompt_ref(self);
if (self->func) {
- gboolean clean = self->func(self, self->focus->result, self->data);
+ gboolean clean = self->func(self, result, self->data);
if (clean && self->cleanup)
self->cleanup(self, self->data);
}
projects / mikachu / openbox.git / blobdiff