X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=088986f83c6ea23bd5d90c2fe2c46c3b9b263cdb;hb=f3285a3d0bf118ce0eba0014ea53b11f47d710d6;hp=ce77fc0fe689e9adda7ce242d2976d12f4becbe4;hpb=4c7cc1cfa64bf5722f059eae0528d510c2ae636f;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index ce77fc0f..088986f8 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -21,7 +21,9 @@ #include "client.h" #include "menu.h" #include "screen.h" +#include "prop.h" #include "actions.h" +#include "event.h" #include "grab.h" #include "openbox.h" #include "mainloop.h" @@ -29,7 +31,6 @@ #include "render/theme.h" #define PADDING 2 -#define SEPARATOR_HEIGHT 3 #define MAX_MENU_WIDTH 400 #define ITEM_HEIGHT (ob_rr_theme->menu_font_height + 2*PADDING) @@ -40,14 +41,19 @@ ButtonPressMask | ButtonReleaseMask) GList *menu_frame_visible; +GHashTable *menu_frame_map; + +static RrAppearance *a_sep; static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ObMenuFrame *frame); static void menu_entry_frame_free(ObMenuEntryFrame *self); static void menu_frame_update(ObMenuFrame *self); -static gboolean menu_entry_frame_submenu_timeout(gpointer data); +static gboolean submenu_show_timeout(gpointer data); static void menu_frame_hide(ObMenuFrame *self); +static gboolean submenu_hide_timeout(gpointer data); + static Window createWindow(Window parent, gulong mask, XSetWindowAttributes *attrib) { @@ -56,10 +62,18 @@ static Window createWindow(Window parent, gulong mask, RrVisual(ob_rr_inst), mask, attrib); } -GHashTable *menu_frame_map; - void menu_frame_startup(gboolean reconfig) { + gint i; + + a_sep = RrAppearanceCopy(ob_rr_theme->a_clear); + RrAppearanceAddTextures(a_sep, ob_rr_theme->menu_sep_width); + for (i = 0; i < ob_rr_theme->menu_sep_width; ++i) { + a_sep->texture[i].type = RR_TEXTURE_LINE_ART; + a_sep->texture[i].data.lineart.color = + ob_rr_theme->menu_sep_color; + } + if (reconfig) return; menu_frame_map = g_hash_table_new(g_int_hash, g_int_equal); @@ -67,6 +81,8 @@ void menu_frame_startup(gboolean reconfig) void menu_frame_shutdown(gboolean reconfig) { + RrAppearanceFree(a_sep); + if (reconfig) return; g_hash_table_destroy(menu_frame_map); @@ -89,6 +105,10 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client) self->window = createWindow(RootWindow(ob_display, ob_screen), CWEventMask, &attr); + /* make it a popup menu type window */ + PROP_SET32(self->window, net_wm_window_type, atom, + prop_atoms.net_wm_window_type_popup_menu); + XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth); XSetWindowBorder(ob_display, self->window, RrColorPixel(ob_rr_theme->menu_border_color)); @@ -175,6 +195,7 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self) void menu_frame_move(ObMenuFrame *self, gint x, gint y) { RECT_SET_POINT(self->area, x, y); + self->monitor = screen_find_monitor_point(x, y); XMoveWindow(ob_display, self->window, self->area.x, self->area.y); } @@ -277,7 +298,7 @@ void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y, *dx = *dy = 0; - a = screen_physical_area_monitor(self->monitor); + a = screen_physical_area_monitor(screen_find_monitor_point(x, y)); half = g_list_length(self->entries) / 2; pos = g_list_index(self->entries, self->selected); @@ -328,7 +349,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) th = ob_rr_theme->menu_title_height; } else { item_a = ob_rr_theme->a_menu_normal; - th = SEPARATOR_HEIGHT + 2*PADDING; + th = ob_rr_theme->menu_sep_width + + 2*ob_rr_theme->menu_sep_paddingy; } break; default: @@ -432,26 +454,31 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) ob_rr_theme->menu_title_height - 2*ob_rr_theme->paddingy); } else { - RrAppearance *clear; - - /* unlabeled separaator */ - XMoveResizeWindow(ob_display, self->text, PADDING, PADDING, - self->area.width - 2*PADDING, SEPARATOR_HEIGHT); - - clear = ob_rr_theme->a_clear_tex; - RrAppearanceClearTextures(clear); - clear->texture[0].type = RR_TEXTURE_LINE_ART; - clear->surface.parent = item_a; - clear->surface.parentx = PADDING; - clear->surface.parenty = PADDING; - clear->texture[0].data.lineart.color = - text_a->texture[0].data.text.color; - clear->texture[0].data.lineart.x1 = 2*PADDING; - clear->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT/2; - clear->texture[0].data.lineart.x2 = self->area.width - 4*PADDING; - clear->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT/2; - RrPaint(clear, self->text, - self->area.width - 2*PADDING, SEPARATOR_HEIGHT); + gint i; + + /* unlabeled separator */ + XMoveResizeWindow(ob_display, self->text, 0, 0, + self->area.width, + ob_rr_theme->menu_sep_width + + 2*ob_rr_theme->menu_sep_paddingy); + + a_sep->surface.parent = item_a; + a_sep->surface.parentx = 0; + a_sep->surface.parenty = 0; + for (i = 0; i < ob_rr_theme->menu_sep_width; ++i) { + a_sep->texture[i].data.lineart.x1 = + ob_rr_theme->menu_sep_paddingx; + a_sep->texture[i].data.lineart.y1 = + ob_rr_theme->menu_sep_paddingy + i; + a_sep->texture[i].data.lineart.x2 = + self->area.width - ob_rr_theme->menu_sep_paddingx - 1; + a_sep->texture[i].data.lineart.y2 = + ob_rr_theme->menu_sep_paddingy + i; + } + + RrPaint(a_sep, self->text, self->area.width, + ob_rr_theme->menu_sep_width + + 2*ob_rr_theme->menu_sep_paddingy); } break; } @@ -587,7 +614,8 @@ static gint menu_entry_frame_get_height(ObMenuEntryFrame *self, if (last_entry) h -= ob_rr_theme->mbwidth; } else { - h += SEPARATOR_HEIGHT; + h += ob_rr_theme->menu_sep_width + + 2*ob_rr_theme->menu_sep_paddingy - PADDING * 2; } break; } @@ -672,7 +700,6 @@ void menu_frame_render(ObMenuFrame *self) XSetWindowBorder(ob_display, e->window, RrColorPixel(ob_rr_theme->menu_border_color)); - text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && !e->entry->data.normal.enabled ? /* disabled */ @@ -718,7 +745,8 @@ void menu_frame_render(ObMenuFrame *self) (ob_rr_theme->mbwidth - PADDING) *2; } else { tw = 0; - th = SEPARATOR_HEIGHT; + th = ob_rr_theme->menu_sep_width + + 2*ob_rr_theme->menu_sep_paddingy - 2*PADDING; } break; } @@ -922,24 +950,12 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y, gboolean mouse) { gint px, py; - guint i; if (menu_frame_is_visible(self)) return TRUE; if (!menu_frame_show(self)) return FALSE; - /* find the monitor the menu is on */ - for (i = 0; i < screen_num_monitors; ++i) { - Rect *a = screen_physical_area_monitor(i); - gboolean contains = RECT_CONTAINS(*a, x, y); - g_free(a); - if (contains) { - self->monitor = i; - break; - } - } - if (self->menu->place_func) self->menu->place_func(self, &x, &y, mouse, self->menu->data); else @@ -958,6 +974,15 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y, return TRUE; } +/*! Stop hiding an open submenu. + @child The OnMenuFrame of the submenu to be hidden +*/ +static void remove_submenu_hide_timeout(ObMenuFrame *child) +{ + ob_main_loop_timeout_remove_data(ob_main_loop, submenu_hide_timeout, + child, FALSE); +} + gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, ObMenuEntryFrame *parent_entry) { @@ -972,9 +997,12 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, self->parent_entry = parent_entry; /* set up parent's child to be us */ - if (parent->child) - menu_frame_hide(parent->child); - parent->child = self; + if ((parent->child) != self) { + if (parent->child) + menu_frame_hide(parent->child); + parent->child = self; + parent->child_entry = parent_entry; + } if (!menu_frame_show(self)) return FALSE; @@ -1004,6 +1032,7 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, static void menu_frame_hide(ObMenuFrame *self) { GList *it = g_list_find(menu_frame_visible, self); + gulong ignore_start; if (!it) return; @@ -1014,8 +1043,12 @@ static void menu_frame_hide(ObMenuFrame *self) if (self->child) menu_frame_hide(self->child); - if (self->parent) + if (self->parent) { + remove_submenu_hide_timeout(self); + self->parent->child = NULL; + self->parent->child_entry = NULL; + } self->parent = NULL; self->parent_entry = NULL; @@ -1027,7 +1060,9 @@ static void menu_frame_hide(ObMenuFrame *self) ungrab_keyboard(); } + ignore_start = event_start_ignore_all_enters(); XUnmapWindow(ob_display, self->window); + event_end_ignore_all_enters(ignore_start); menu_frame_free(self); } @@ -1038,8 +1073,7 @@ void menu_frame_hide_all(void) if (config_submenu_show_delay) { /* remove any submenu open requests */ - ob_main_loop_timeout_remove(ob_main_loop, - menu_entry_frame_submenu_timeout); + ob_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout); } if ((it = g_list_last(menu_frame_visible))) menu_frame_hide(it->data); @@ -1054,14 +1088,13 @@ void menu_frame_hide_all_client(ObClient *client) if (config_submenu_show_delay) { /* remove any submenu open requests */ ob_main_loop_timeout_remove(ob_main_loop, - menu_entry_frame_submenu_timeout); + submenu_show_timeout); } menu_frame_hide(f); } } } - ObMenuFrame* menu_frame_under(gint x, gint y) { ObMenuFrame *ret = NULL; @@ -1100,50 +1133,91 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y) return ret; } -static gboolean menu_entry_frame_submenu_timeout(gpointer data) +static gboolean submenu_show_timeout(gpointer data) { g_assert(menu_frame_visible); menu_entry_frame_show_submenu((ObMenuEntryFrame*)data); return FALSE; } +static gboolean submenu_hide_timeout(gpointer data) +{ + g_assert(menu_frame_visible); + menu_frame_hide((ObMenuFrame*)data); + return FALSE; +} + void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry, gboolean immediate) { ObMenuEntryFrame *old = self->selected; ObMenuFrame *oldchild = self->child; + ObMenuEntryFrame *oldchild_entry = self->child_entry; + /* if the user selected a separator, ignore it and reselect what we had + selected before */ if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) entry = old; - if (old == entry) return; + if (old == entry && (old->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)) + return; + + /* if the user left this menu but we have a submenu open, move the + selection back to that submenu */ + if (!entry && oldchild_entry) + entry = oldchild_entry; if (config_submenu_show_delay) { /* remove any submenu open requests */ - ob_main_loop_timeout_remove(ob_main_loop, - menu_entry_frame_submenu_timeout); + ob_main_loop_timeout_remove(ob_main_loop, submenu_show_timeout); } self->selected = entry; if (old) menu_entry_frame_render(old); - if (oldchild) - menu_frame_hide(oldchild); + + if (oldchild_entry) { + /* There is an open submenu */ + if (oldchild_entry == self->selected) { + /* The open submenu has been reselected, so stop hiding the + submenu */ + remove_submenu_hide_timeout(oldchild); + } + else if (oldchild_entry == old) { + /* The open submenu was selected and is no longer, so hide the + submenu */ + if (immediate || config_submenu_hide_delay == 0) + menu_frame_hide(oldchild); + else if (config_submenu_hide_delay > 0) + ob_main_loop_timeout_add(ob_main_loop, + config_submenu_hide_delay * 1000, + submenu_hide_timeout, + oldchild, g_direct_equal, + NULL); + } + } if (self->selected) { menu_entry_frame_render(self->selected); if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { - if (config_submenu_show_delay && !immediate) { - /* initiate a new submenu open request */ - ob_main_loop_timeout_add(ob_main_loop, - config_submenu_show_delay * 1000, - menu_entry_frame_submenu_timeout, - self->selected, g_direct_equal, - NULL); - } else { - menu_entry_frame_show_submenu(self->selected); + /* only show if the submenu isn't already showing */ + if (oldchild_entry != self->selected) { + if (immediate || config_submenu_hide_delay == 0) + menu_entry_frame_show_submenu(self->selected); + else if (config_submenu_hide_delay > 0) + ob_main_loop_timeout_add(ob_main_loop, + config_submenu_show_delay * 1000, + submenu_show_timeout, + self->selected, g_direct_equal, + NULL); + } + /* hide the grandchildren of this menu. and move the cursor to + the current menu */ + else if (immediate && self->child && self->child->child) { + menu_frame_hide(self->child->child); + menu_frame_select(self->child, NULL, TRUE); } } }