X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=3328a1b231f749fddc1dcf122cff7824c751aeb2;hb=db49122dece88956856606fe4c17158859f81837;hp=381524118fb0b5199fb75111456ffcef52499e9f;hpb=c313b219a226c3b968ff312b96120eef0c527d91;p=chaz%2Fopenbox diff --git a/openbox/prompt.c b/openbox/prompt.c index 38152411..3328a1b2 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -19,114 +19,189 @@ #include "prompt.h" #include "openbox.h" #include "screen.h" -#include "openbox.h" +#include "client.h" +#include "event.h" +#include "obt/display.h" +#include "obt/keyboard.h" +#include "obt/prop.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; - -#define msg_appearance(self) (ob_rr_theme->osd_hilite_label) +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_hover, *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_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); + prompt_a_pfocus = 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; + c_pfocus = prompt_a_press->texture[0].data.mask.color; RrAppearanceRemoveTextures(prompt_a_button); - RrAppearanceRemoveTextures(prompt_a_hover); + 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_hover, 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_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_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_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_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; + + 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_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 = TRUE; + attrib.override_redirect = FALSE; self = g_new0(ObPrompt, 1); self->ref = 1; - self->super.type = Window_Prompt; - self->super.window = XCreateWindow(ob_display, - RootWindow(ob_display, ob_screen), + 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, 0, CopyFromParent, InputOutput, CopyFromParent, - CWOverrideRedirect, &attrib); - g_hash_table_insert(window_map, &self->super.window, - PROMPT_AS_WINDOW(self)); + CWOverrideRedirect, + &attrib); + + /* make it a dialog type window */ + 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); + /* 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, + self->msg.window = XCreateWindow(obt_display, self->super.window, 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL); - XMapWindow(ob_display, self->msg.window); + 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) { - self->button[i].window = XCreateWindow(ob_display, self->super.window, + self->button[i].window = XCreateWindow(obt_display, self->super.window, 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL); - XMapWindow(ob_display, self->button[i].window); - g_hash_table_insert(window_map, &self->button[i].window, - PROMPT_AS_WINDOW(self)); + XMapWindow(obt_display, self->button[i].window); + window_add(&self->button[i].window, PROMPT_AS_WINDOW(self)); + + /* listen for button presses on the buttons */ + XSelectInput(obt_display, self->button[i].window, + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask); } + prompt_list = g_list_prepend(prompt_list, self); + return self; } @@ -138,70 +213,78 @@ void prompt_ref(ObPrompt *self) void prompt_unref(ObPrompt *self) { if (self && --self->ref == 0) { - guint i; + gint i; + + prompt_list = g_list_remove(prompt_list, self); for (i = 0; i < self->n_buttons; ++i) { - g_hash_table_remove(window_map, &self->button[i].window); - XDestroyWindow(ob_display, self->button[i].window); + window_remove(self->button[i].window); + XDestroyWindow(obt_display, self->button[i].window); } - XDestroyWindow(ob_display, self->msg.window); - - RrAppearanceFree(self->a_bg); - - g_hash_table_remove(window_map, &self->super.window); - XDestroyWindow(ob_display, self->super.window); + XDestroyWindow(obt_display, self->msg.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 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; - - 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; 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) { 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; + 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_hover, &bw, &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; allbuttonsw += self->button[i].width + (i > 0 ? BUTTON_SEPARATION : 0); 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); @@ -211,76 +294,288 @@ static void prompt_layout(ObPrompt *self, const Rect *area) 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; - self->button[i].y = h - allbuttonsh; + /* 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; - self->x = (area->width - self->width) / 2; - self->y = (area->height - self->height) / 2; - - /* move and resize the actual windows */ - XMoveResizeWindow(ob_display, self->super.window, - self->x, self->y, self->width, self->height); - XMoveResizeWindow(ob_display, self->msg.window, + prompt_resize(self, w + l + r, h + t + b); + + /* move and resize the internal windows */ + XMoveResizeWindow(obt_display, self->msg.window, self->msg.x, self->msg.y, self->msg.width, self->msg.height); for (i = 0; i < self->n_buttons; ++i) - XMoveResizeWindow(ob_display, self->button[i].window, + XMoveResizeWindow(obt_display, self->button[i].window, self->button[i].x, self->button[i].y, 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 l, r, t, b; + + if (!on) { + gint i; + + 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) { - prompt_a_button->surface.parent = self->a_bg; - prompt_a_button->surface.parentx = e->x; - prompt_a_button->surface.parentx = e->y; + RrAppearance *a; + + 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 = prompt_a_bg; + a->surface.parentx = e->x; + 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); - prompt_a_button->texture[0].data.text.string = e->text; - RrPaint(prompt_a_button, e->window, e->width, e->height); + 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); - 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 = prompt_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) { - if (self->mapped) return; + 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; + } + + /* 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, area); + XSetTransientForHint(obt_display, self->super.window, + (parent ? parent->window : 0)); + + /* set up the dialog and render it */ + prompt_layout(self); render_all(self); - XMapWindow(ob_display, self->super.window); + + client_manage(self->super.window, self); self->mapped = TRUE; } void prompt_hide(ObPrompt *self) { - XUnmapWindow(ob_display, self->super.window); + XUnmapWindow(obt_display, self->super.window); self->mapped = FALSE; } + +gboolean prompt_key_event(ObPrompt *self, XEvent *e) +{ + gboolean shift; + guint shift_mask; + + 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 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); + } + 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); +}