X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=5ece36c7250d4eeba9300e483484e1f450c74136;hb=e68e6c6a536a2132570ddf1d1d3759bb31ef781e;hp=6f91e0b1649f0f6304ed17170bc02d326de2d0ae;hpb=06252b307676bd02f3eb74ea43ebcc4cbaddd3da;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 6f91e0b1..5ece36c7 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -8,6 +8,7 @@ #define PADDING 2 #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) @@ -103,7 +103,7 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, 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_selected); @@ -115,11 +115,14 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, 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_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 = @@ -148,7 +151,8 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self) 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); } @@ -171,7 +175,7 @@ void menu_frame_move_on_screen(ObMenuFrame *self) 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)); @@ -194,6 +198,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) ? @@ -280,9 +285,12 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) 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 = @@ -291,46 +299,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, + 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) @@ -352,6 +384,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 = MIN(tw, MAX_MENU_WIDTH); tw += 2*PADDING; th += 2*PADDING; w = MAX(w, tw); @@ -364,13 +397,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; @@ -391,6 +447,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) @@ -400,6 +457,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) @@ -458,6 +516,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) @@ -508,7 +568,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); } @@ -549,7 +609,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); } @@ -655,7 +715,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) @@ -669,31 +729,16 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) ObClient *client = self->frame->client; /* release grabs before executing the shit */ - if (hide) + 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); } } }