X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=ecd2b59045340d6eabb83c06a41b0439fd9068ea;hb=3a607fad9df628ab16e0f7436dfbfc9b22634003;hp=2b64aaa8b0ceba028a29434d8886c73fcb6864f6;hpb=5d4cbbc67444c3955f705b3aeddf29be1c731866;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 2b64aaa8..ecd2b590 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -7,7 +7,8 @@ #include "render/theme.h" #define PADDING 2 -#define SEPARATOR_HEIGHT 5 +#define SEPARATOR_HEIGHT 3 +#define MAX_MENU_WIDTH 400 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ LeaveWindowMask) @@ -29,7 +30,6 @@ static Window createWindow(Window parent, unsigned long mask, return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attrib); - } ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client) @@ -94,29 +94,39 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, attr.event_mask = ENTRY_EVENTMASK; self->window = createWindow(self->frame->items, CWEventMask, &attr); - self->icon = createWindow(self->window, 0, NULL); self->text = createWindow(self->window, 0, NULL); - self->bullet = createWindow(self->window, 0, NULL); + if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + self->icon = createWindow(self->window, 0, NULL); + self->bullet = createWindow(self->window, 0, NULL); + } XMapWindow(ob_display, self->window); XMapWindow(ob_display, self->text); - self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_item); + self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_normal); self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); - self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); - - self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); - self->a_icon->texture[0].type = RR_TEXTURE_RGBA; - self->a_mask = RrAppearanceCopy(ob_rr_theme->a_clear_tex); - self->a_mask->texture[0].type = RR_TEXTURE_MASK; - self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); + self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_selected); + + if (entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) { + self->a_separator = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_separator->texture[0].type = RR_TEXTURE_LINE_ART; + } else { + self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_icon->texture[0].type = RR_TEXTURE_RGBA; + self->a_mask = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_mask->texture[0].type = RR_TEXTURE_MASK; + self->a_bullet_normal = + RrAppearanceCopy(ob_rr_theme->a_menu_bullet_normal); + self->a_bullet_selected = + RrAppearanceCopy(ob_rr_theme->a_menu_bullet_selected); + } self->a_text_normal = - RrAppearanceCopy(ob_rr_theme->a_menu_text_item); + RrAppearanceCopy(ob_rr_theme->a_menu_text_normal); self->a_text_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled); self->a_text_selected = - RrAppearanceCopy(ob_rr_theme->a_menu_text_hilite); + RrAppearanceCopy(ob_rr_theme->a_menu_text_selected); return self; } @@ -124,21 +134,25 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, static void menu_entry_frame_free(ObMenuEntryFrame *self) { if (self) { - XDestroyWindow(ob_display, self->icon); XDestroyWindow(ob_display, self->text); - XDestroyWindow(ob_display, self->bullet); XDestroyWindow(ob_display, self->window); + if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + XDestroyWindow(ob_display, self->icon); + XDestroyWindow(ob_display, self->bullet); + } RrAppearanceFree(self->a_normal); RrAppearanceFree(self->a_disabled); RrAppearanceFree(self->a_selected); + RrAppearanceFree(self->a_separator); RrAppearanceFree(self->a_icon); RrAppearanceFree(self->a_mask); RrAppearanceFree(self->a_text_normal); RrAppearanceFree(self->a_text_disabled); RrAppearanceFree(self->a_text_selected); - RrAppearanceFree(self->a_bullet); + RrAppearanceFree(self->a_bullet_normal); + RrAppearanceFree(self->a_bullet_selected); g_free(self); } @@ -155,18 +169,32 @@ void menu_frame_move_on_screen(ObMenuFrame *self) Rect *a; guint i; gint dx = 0, dy = 0; + gint pos, half; for (i = 0; i < screen_num_monitors; ++i) { a = screen_physical_area_monitor(i); if (RECT_INTERSECTS_RECT(*a, self->area)) break; } - if (a) a = screen_physical_area_monitor(0); + if (!a) a = screen_physical_area_monitor(0); - dx = MIN(0, (a->x + a->width) - (self->area.x + self->area.width)); - dy = MIN(0, (a->y + a->height) - (self->area.y + self->area.height)); - if (!dx) dx = MAX(0, a->x - self->area.x); - if (!dy) dy = MAX(0, a->y - self->area.y); + half = g_list_length(self->entries) / 2; + pos = g_list_index(self->entries, self->selected); + + /* if in the bottom half then check this shit first, will keep the bottom + edge of the menu visible */ + if (pos > half) { + dx = MAX(dx, a->x - self->area.x); + dy = MAX(dy, a->y - self->area.y); + } + dx = MIN(dx, (a->x + a->width) - (self->area.x + self->area.width)); + dy = MIN(dy, (a->y + a->height) - (self->area.y + self->area.height)); + /* if in the top half then check this shit last, will keep the top + edge of the menu visible */ + if (pos <= half) { + dx = MAX(dx, a->x - self->area.x); + dy = MAX(dy, a->y - self->area.y); + } if (dx || dy) { ObMenuFrame *f; @@ -184,6 +212,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) RrAppearance *item_a, *text_a; gint th; /* temp */ ObMenu *sub; + ObMenuFrame *frame = self->frame; item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && !self->entry->data.normal.enabled) ? @@ -197,7 +226,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) th = self->frame->item_h; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - th = SEPARATOR_HEIGHT; + th = SEPARATOR_HEIGHT + 2*PADDING; break; } RECT_SET_SIZE(self->area, self->frame->inner_w, th); @@ -237,7 +266,6 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) text_a->surface.parenty = PADDING; RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h - 2*PADDING); - XMapWindow(ob_display, self->text); break; case OB_MENU_ENTRY_TYPE_SUBMENU: XMoveResizeWindow(ob_display, self->text, @@ -249,19 +277,34 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) text_a->surface.parenty = PADDING; RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h, self->frame->item_h - 2*PADDING); - XMapWindow(ob_display, self->text); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - XUnmapWindow(ob_display, self->text); + XMoveResizeWindow(ob_display, self->text, PADDING, PADDING, + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); + self->a_separator->surface.parent = item_a; + self->a_separator->surface.parentx = PADDING; + self->a_separator->surface.parenty = PADDING; + self->a_separator->texture[0].data.lineart.color = + text_a->texture[0].data.text.color; + self->a_separator->texture[0].data.lineart.x1 = 2*PADDING; + self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2; + self->a_separator->texture[0].data.lineart.x2 = + self->area.width - 4*PADDING; + self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2; + RrPaint(self->a_separator, self->text, + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); break; } if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && self->entry->data.normal.icon_data) { - XMoveResizeWindow(ob_display, self->icon, PADDING, 0, - self->frame->item_h, - self->frame->item_h); + XMoveResizeWindow(ob_display, self->icon, + PADDING, frame->item_margin.top, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); self->a_icon->texture[0].data.rgba.width = self->entry->data.normal.icon_width; self->a_icon->texture[0].data.rgba.height = @@ -270,46 +313,70 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->entry->data.normal.icon_data; self->a_icon->surface.parent = item_a; self->a_icon->surface.parentx = PADDING; - self->a_icon->surface.parenty = 0; + self->a_icon->surface.parenty = frame->item_margin.top; RrPaint(self->a_icon, self->icon, - self->frame->item_h, self->frame->item_h); + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); XMapWindow(ob_display, self->icon); } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && self->entry->data.normal.mask) { - XMoveResizeWindow(ob_display, self->icon, PADDING, 0, - self->frame->item_h, - self->frame->item_h); + RrColor *c; + + XMoveResizeWindow(ob_display, self->icon, + PADDING, frame->item_margin.top, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); self->a_mask->texture[0].data.mask.mask = self->entry->data.normal.mask; - self->a_mask->texture[0].data.mask.color = - self->entry->data.normal.mask_color; + + c = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + !self->entry->data.normal.enabled) ? + self->entry->data.normal.mask_disabled_color : + (self == self->frame->selected ? + self->entry->data.normal.mask_selected_color : + self->entry->data.normal.mask_normal_color)); + self->a_mask->texture[0].data.mask.color = c; + self->a_mask->surface.parent = item_a; self->a_mask->surface.parentx = PADDING; - self->a_mask->surface.parenty = 0; + self->a_mask->surface.parenty = frame->item_margin.top; RrPaint(self->a_mask, self->icon, - self->frame->item_h, self->frame->item_h); + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); XMapWindow(ob_display, self->icon); } else XUnmapWindow(ob_display, self->icon); if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { + RrAppearance *bullet_a; XMoveResizeWindow(ob_display, self->bullet, self->frame->text_x + self->frame->text_w - self->frame->item_h + PADDING, PADDING, self->frame->item_h - 2*PADDING, self->frame->item_h - 2*PADDING); - self->a_bullet->surface.parent = item_a; - self->a_bullet->surface.parentx = + bullet_a = (self == self->frame->selected ? + self->a_bullet_selected : + self->a_bullet_normal); + bullet_a->surface.parent = item_a; + bullet_a->surface.parentx = self->frame->text_x + self->frame->text_w - self->frame->item_h - - PADDING; - self->a_bullet->surface.parenty = PADDING; - RrPaint(self->a_bullet, self->bullet, + + PADDING; + bullet_a->surface.parenty = PADDING; + RrPaint(bullet_a, self->bullet, self->frame->item_h - 2*PADDING, self->frame->item_h - 2*PADDING); XMapWindow(ob_display, self->bullet); } else XUnmapWindow(ob_display, self->bullet); + + XFlush(ob_display); } static void menu_frame_render(ObMenuFrame *self) @@ -331,8 +398,7 @@ static void menu_frame_render(ObMenuFrame *self) self->a_title->texture[0].data.text.string = self->menu->title; RrMinsize(self->a_title, &tw, &th); - tw += 2*PADDING; - th += 2*PADDING; + tw = MIN(tw, MAX_MENU_WIDTH); w = MAX(w, tw); h += (self->title_h = th + ob_rr_theme->bwidth); @@ -343,13 +409,36 @@ static void menu_frame_render(ObMenuFrame *self) XMoveWindow(ob_display, self->items, 0, h); + STRUT_SET(self->item_margin, 0, 0, 0, 0); + if (self->entries) { ObMenuEntryFrame *e = self->entries->data; + gint l, t, r, b; + e->a_text_normal->texture[0].data.text.string = ""; RrMinsize(e->a_text_normal, &tw, &th); tw += 2*PADDING; th += 2*PADDING; self->item_h = th; + + RrMargins(e->a_normal, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); + RrMargins(e->a_selected, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); + RrMargins(e->a_disabled, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); } else self->item_h = 0; @@ -370,6 +459,7 @@ static void menu_frame_render(ObMenuFrame *self) case OB_MENU_ENTRY_TYPE_NORMAL: text_a->texture[0].data.text.string = e->entry->data.normal.label; RrMinsize(text_a, &tw, &th); + tw = MIN(tw, MAX_MENU_WIDTH); if (e->entry->data.normal.icon_data || e->entry->data.normal.mask) @@ -379,6 +469,7 @@ static void menu_frame_render(ObMenuFrame *self) sub = e->entry->data.submenu.submenu; text_a->texture[0].data.text.string = sub ? sub->title : ""; RrMinsize(text_a, &tw, &th); + tw = MIN(tw, MAX_MENU_WIDTH); if (e->entry->data.normal.icon_data || e->entry->data.normal.mask) @@ -437,6 +528,8 @@ static void menu_frame_render(ObMenuFrame *self) h += ob_rr_theme->bwidth * 2; RECT_SET_SIZE(self->area, w, h); + + XFlush(ob_display); } static void menu_frame_update(ObMenuFrame *self) @@ -487,7 +580,7 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) if (menu_frame_visible == NULL) { /* no menus shown yet */ - grab_pointer(TRUE, None); + grab_pointer(TRUE, OB_CURSOR_NONE); grab_keyboard(TRUE); } @@ -502,9 +595,10 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) self->menu->update_func(self, self->menu->data); } - menu_frame_visible = g_list_prepend(menu_frame_visible, self); menu_frame_update(self); + menu_frame_visible = g_list_prepend(menu_frame_visible, self); + menu_frame_move_on_screen(self); XMapWindow(ob_display, self->window); @@ -528,7 +622,7 @@ void menu_frame_hide(ObMenuFrame *self) if (menu_frame_visible == NULL) { /* last menu shown */ - grab_pointer(FALSE, None); + grab_pointer(FALSE, OB_CURSOR_NONE); grab_keyboard(FALSE); } @@ -598,12 +692,12 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry) ObMenuEntryFrame *old = self->selected; ObMenuFrame *oldchild = self->child; + if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) + entry = old; + if (old == entry) return; - if (entry && entry->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) - self->selected = entry; - else - self->selected = NULL; + self->selected = entry; if (old) menu_entry_frame_render(old); @@ -634,7 +728,7 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self) menu_frame_show(f, self->frame); } -void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) +void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state) { if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && self->entry->data.normal.enabled) @@ -648,30 +742,16 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) ObClient *client = self->frame->client; /* release grabs before executing the shit */ - menu_frame_hide_all(); + if (!(state & ControlMask)) + menu_frame_hide_all(); if (func) - func(entry, data); + func(entry, state, data); else { GSList *it; for (it = acts; it; it = g_slist_next(it)) - { - ObAction *act = it->data; - act->data.any.c = client; - - if (act->func == action_moveresize) - screen_pointer_pos(&act->data.moveresize.x, - &act->data.moveresize.y); - - if (!(act->func == action_cycle_windows || - act->func == action_desktop_dir || - act->func == action_send_to_desktop_dir || - act->func == action_showmenu)) - { - act->func(&act->data); - } - } + action_run(it->data, client, state); } } }