X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=7052296e14fadec50bd60e50e3fb79f2413cf49e;hb=a991c07bc1a1f86fd47db0e5442a629f3c39b407;hp=053034b3869a783ddae60bfb6821447368e4e4f1;hpb=5efc7236a682dc64db5bb7929b88efa72fdb1198;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 053034b3..7052296e 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -6,7 +6,8 @@ #include "openbox.h" #include "render/theme.h" -#define SEPARATOR_HEIGHT 5 +#define PADDING 2 +#define SEPARATOR_HEIGHT 3 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ LeaveWindowMask) @@ -104,10 +105,16 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, 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_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); - self->a_bullet->texture[0].type = RR_TEXTURE_MASK; + 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 = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); + } self->a_text_normal = RrAppearanceCopy(ob_rr_theme->a_menu_text_item); @@ -131,7 +138,9 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self) 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); @@ -170,6 +179,8 @@ void menu_frame_move_on_screen(ObMenuFrame *self) for (f = self; f; f = f->parent) menu_frame_move(f, f->area.x + dx, f->area.y + dy); + for (f = self->child; f; f = f->child) + menu_frame_move(f, f->area.x + dx, f->area.y + dy); XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy); } } @@ -192,7 +203,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); @@ -223,26 +234,53 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) switch (self->entry->type) { case OB_MENU_ENTRY_TYPE_NORMAL: + XMoveResizeWindow(ob_display, self->text, + self->frame->text_x, PADDING, + self->frame->text_w, + self->frame->item_h - 2*PADDING); + text_a->surface.parent = item_a; + text_a->surface.parentx = self->frame->text_x; + text_a->surface.parenty = PADDING; + RrPaint(text_a, self->text, self->frame->text_w, + self->frame->item_h - 2*PADDING); + break; case OB_MENU_ENTRY_TYPE_SUBMENU: XMoveResizeWindow(ob_display, self->text, - self->frame->text_x, 0, - self->frame->text_w, self->frame->item_h); + self->frame->text_x, PADDING, + self->frame->text_w - self->frame->item_h, + self->frame->item_h - 2*PADDING); text_a->surface.parent = item_a; text_a->surface.parentx = self->frame->text_x; - text_a->surface.parenty = 0; - RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h); - XMapWindow(ob_display, self->text); + text_a->surface.parenty = PADDING; + RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h, + self->frame->item_h - 2*PADDING); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - XUnmapWindow(ob_display, self->text); + XMoveResizeWindow(ob_display, self->text, + self->frame->text_x, PADDING, + self->frame->text_w - 2*PADDING, + SEPARATOR_HEIGHT); + self->a_separator->surface.parent = item_a; + self->a_separator->surface.parentx = self->frame->text_x; + 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->frame->text_w - 6*PADDING; + self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2; + RrPaint(self->a_separator, self->text, + self->frame->text_w - 2*PADDING, SEPARATOR_HEIGHT); break; } - if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && self->entry->data.normal.icon_data) { - XMoveResizeWindow(ob_display, self->icon, 0, 0, - self->frame->item_h, self->frame->item_h); + XMoveResizeWindow(ob_display, self->icon, PADDING, 0, + self->frame->item_h, + self->frame->item_h); self->a_icon->texture[0].data.rgba.width = self->entry->data.normal.icon_width; self->a_icon->texture[0].data.rgba.height = @@ -250,24 +288,44 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->a_icon->texture[0].data.rgba.data = self->entry->data.normal.icon_data; self->a_icon->surface.parent = item_a; - self->a_icon->surface.parentx = 0; + self->a_icon->surface.parentx = PADDING; self->a_icon->surface.parenty = 0; RrPaint(self->a_icon, self->icon, self->frame->item_h, self->frame->item_h); 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); + 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; + self->a_mask->surface.parent = item_a; + self->a_mask->surface.parentx = PADDING; + self->a_mask->surface.parenty = 0; + RrPaint(self->a_mask, self->icon, + self->frame->item_h, self->frame->item_h); + XMapWindow(ob_display, self->icon); } else XUnmapWindow(ob_display, self->icon); if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { XMoveResizeWindow(ob_display, self->bullet, - self->frame->text_x + self->frame->text_w, 0, - self->frame->item_h, self->frame->item_h); + 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 = - self->frame->text_x + self->frame->text_w; - self->a_bullet->surface.parenty = 0; + 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, - self->frame->item_h, self->frame->item_h); + self->frame->item_h - 2*PADDING, + self->frame->item_h - 2*PADDING); XMapWindow(ob_display, self->bullet); } else XUnmapWindow(ob_display, self->bullet); @@ -279,7 +337,7 @@ static void menu_frame_render(ObMenuFrame *self) gint allitems_h = 0; gint tw, th; /* temps */ GList *it; - gboolean has_icon = FALSE, has_bullet = FALSE; + gboolean has_icon = FALSE; ObMenu *sub; XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->bwidth); @@ -292,6 +350,8 @@ 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; w = MAX(w, tw); h += (self->title_h = th + ob_rr_theme->bwidth); @@ -306,6 +366,8 @@ static void menu_frame_render(ObMenuFrame *self) ObMenuEntryFrame *e = self->entries->data; 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; } else self->item_h = 0; @@ -328,7 +390,8 @@ static void menu_frame_render(ObMenuFrame *self) text_a->texture[0].data.text.string = e->entry->data.normal.label; RrMinsize(text_a, &tw, &th); - if (e->entry->data.normal.icon_data) + if (e->entry->data.normal.icon_data || + e->entry->data.normal.mask) has_icon = TRUE; break; case OB_MENU_ENTRY_TYPE_SUBMENU: @@ -336,27 +399,31 @@ static void menu_frame_render(ObMenuFrame *self) text_a->texture[0].data.text.string = sub ? sub->title : ""; RrMinsize(text_a, &tw, &th); - has_bullet = TRUE; + if (e->entry->data.normal.icon_data || + e->entry->data.normal.mask) + has_icon = TRUE; + + tw += self->item_h - PADDING; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: tw = 0; th = SEPARATOR_HEIGHT; break; } + tw += 2*PADDING; + th += 2*PADDING; w = MAX(w, tw); h += th; allitems_h += th; } - self->text_x = 0; + self->text_x = PADDING; self->text_w = w; if (self->entries) { - if (has_bullet) - w += self->item_h; if (has_icon) { - w += self->item_h; - self->text_x += self->item_h; + w += self->item_h + PADDING; + self->text_x += self->item_h + PADDING; } } @@ -395,6 +462,7 @@ static void menu_frame_update(ObMenuFrame *self) { GList *mit, *fit; + menu_pipe_execute(self->menu); menu_find_submenus(self->menu); self->selected = NULL; @@ -424,6 +492,11 @@ static void menu_frame_update(ObMenuFrame *self) void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) { + GList *it; + + if (g_list_find(menu_frame_visible, self)) + return; + if (parent) { if (parent->child) menu_frame_hide(parent->child); @@ -437,14 +510,20 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) grab_keyboard(TRUE); } - if (!g_list_find(menu_frame_visible, self)) { - menu_frame_visible = g_list_prepend(menu_frame_visible, self); - + /* determine if the underlying menu is already visible */ + for (it = menu_frame_visible; it; it = g_list_next(it)) { + ObMenuFrame *f = it->data; + if (f->menu == self->menu) + break; + } + if (!it) { if (self->menu->update_func) self->menu->update_func(self, self->menu->data); - menu_frame_update(self); } + menu_frame_visible = g_list_prepend(menu_frame_visible, self); + menu_frame_update(self); + menu_frame_move_on_screen(self); XMapWindow(ob_display, self->window); @@ -452,7 +531,10 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) void menu_frame_hide(ObMenuFrame *self) { - menu_frame_visible = g_list_remove(menu_frame_visible, self); + GList *it = g_list_find(menu_frame_visible, self); + + if (!it) + return; if (self->child) menu_frame_hide(self->child); @@ -461,6 +543,8 @@ void menu_frame_hide(ObMenuFrame *self) self->parent->child = NULL; self->parent = NULL; + menu_frame_visible = g_list_delete_link(menu_frame_visible, it); + if (menu_frame_visible == NULL) { /* last menu shown */ grab_pointer(FALSE, None); @@ -563,7 +647,7 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self) self->frame->client); menu_frame_move(f, self->frame->area.x + self->frame->area.width - - ob_rr_theme->menu_overlap, + - ob_rr_theme->menu_overlap - ob_rr_theme->bwidth, self->frame->area.y + self->frame->title_h + self->area.y + ob_rr_theme->menu_overlap); menu_frame_show(f, self->frame); @@ -571,22 +655,94 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self) void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) { - if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { + if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + self->entry->data.normal.enabled) + { + /* grab all this shizzle, cuz when the menu gets hidden, 'self' + gets freed */ + ObMenuEntry *entry = self->entry; + ObMenuExecuteFunc func = self->frame->menu->execute_func; + gpointer data = self->frame->menu->data; + GSList *acts = self->entry->data.normal.actions; + ObClient *client = self->frame->client; + /* release grabs before executing the shit */ menu_frame_hide_all(); - if (self->frame->menu->execute_func) - self->frame->menu->execute_func(self, self->frame->menu->data); + if (func) + func(entry, data); else { GSList *it; - for (it = self->entry->data.normal.actions; it; - it = g_slist_next(it)) + for (it = acts; it; it = g_slist_next(it)) { ObAction *act = it->data; - act->data.any.c = self->frame->client; - act->func(&act->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); + } + } + } + } +} + +void menu_frame_select_previous(ObMenuFrame *self) +{ + GList *it = NULL, *start; + + if (self->entries) { + start = it = g_list_find(self->entries, self->selected); + while (TRUE) { + ObMenuEntryFrame *e; + + it = it ? g_list_previous(it) : g_list_last(self->entries); + if (it == start) + break; + + if (it) { + e = it->data; + if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) + break; + if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + e->entry->data.normal.enabled) + break; + } + } + } + menu_frame_select(self, it ? it->data : NULL); +} + +void menu_frame_select_next(ObMenuFrame *self) +{ + GList *it = NULL, *start; + + if (self->entries) { + start = it = g_list_find(self->entries, self->selected); + while (TRUE) { + ObMenuEntryFrame *e; + + it = it ? g_list_next(it) : self->entries; + if (it == start) + break; + + if (it) { + e = it->data; + if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) + break; + if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + e->entry->data.normal.enabled) + break; } } } + menu_frame_select(self, it ? it->data : NULL); }