X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=a1b06e10ddcf3073db0496181cdd013c2313a624;hb=43fded6a10351a8f9f99344a102d79ece6afe8a8;hp=725b1a18b732047284a392a1e436cab57a8dbc90;hpb=9e85e930da614ebef4e714ec890644d6e7241871;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 725b1a18..a1b06e10 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -170,6 +170,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); } } @@ -223,7 +225,6 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) switch (self->entry->type) { case OB_MENU_ENTRY_TYPE_NORMAL: - case OB_MENU_ENTRY_TYPE_SUBMENU: XMoveResizeWindow(ob_display, self->text, self->frame->text_x, 0, self->frame->text_w, self->frame->item_h); @@ -233,6 +234,18 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h); XMapWindow(ob_display, self->text); 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->item_h); + 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, + self->frame->item_h); + XMapWindow(ob_display, self->text); + break; case OB_MENU_ENTRY_TYPE_SEPARATOR: XUnmapWindow(ob_display, self->text); break; @@ -260,11 +273,12 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) 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->text_x + self->frame->text_w + - self->frame->item_h, 0, self->frame->item_h, self->frame->item_h); self->a_bullet->surface.parent = item_a; self->a_bullet->surface.parentx = - self->frame->text_x + self->frame->text_w; + self->frame->text_x + self->frame->text_w - self->frame->item_h; self->a_bullet->surface.parenty = 0; RrPaint(self->a_bullet, self->bullet, self->frame->item_h, self->frame->item_h); @@ -279,7 +293,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); @@ -336,7 +350,7 @@ 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; + tw += self->item_h; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: tw = 0; @@ -352,8 +366,6 @@ static void menu_frame_render(ObMenuFrame *self) 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; @@ -424,6 +436,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 +454,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 +475,12 @@ 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; + + menu_frame_visible = g_list_delete_link(menu_frame_visible, it); if (self->child) menu_frame_hide(self->child); @@ -563,7 +591,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,13 +599,16 @@ 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(); @@ -590,7 +621,7 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) for (it = acts; it; it = g_slist_next(it)) { ObAction *act = it->data; - act->data.any.c = self->frame->client; + act->data.any.c = client; act->func(&act->data); } }