X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=862917685a2d70eea83db54270e197dc265525ee;hb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;hp=88eef9c558d5278ef51625daf0d8100494b5b003;hpb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index 88eef9c5..86291768 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -3,20 +3,23 @@ #include "stacking.h" #include "grab.h" #include "render/theme.h" +#include "screen.h" +#include "geom.h" +#include "plugin.h" -static GHashTable *menu_hash = NULL; -GHashTable *menu_map = NULL; +GHashTable *menu_hash = NULL; -#define FRAME_EVENTMASK (ButtonMotionMask | EnterWindowMask | LeaveWindowMask) +#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \ + LeaveWindowMask) #define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask) #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ ButtonPressMask | ButtonReleaseMask) void menu_control_show(Menu *self, int x, int y, Client *client); -void menu_destroy_hash_key(gpointer data) +void menu_destroy_hash_key(Menu *menu) { - g_free(data); + g_free(menu); } void menu_destroy_hash_value(Menu *self) @@ -30,11 +33,13 @@ void menu_destroy_hash_value(Menu *self) g_free(self->label); g_free(self->name); - g_hash_table_remove(menu_map, &self->title); - g_hash_table_remove(menu_map, &self->frame); - g_hash_table_remove(menu_map, &self->items); + g_hash_table_remove(window_map, &self->title); + g_hash_table_remove(window_map, &self->frame); + g_hash_table_remove(window_map, &self->items); - appearance_free(self->a_title); + stacking_remove(self); + + RrAppearanceFree(self->a_title); XDestroyWindow(ob_display, self->title); XDestroyWindow(ob_display, self->frame); XDestroyWindow(ob_display, self->items); @@ -47,11 +52,11 @@ void menu_entry_free(MenuEntry *self) g_free(self->label); action_free(self->action); - g_hash_table_remove(menu_map, &self->item); + g_hash_table_remove(window_map, &self->item); - appearance_free(self->a_item); - appearance_free(self->a_disabled); - appearance_free(self->a_hilite); + RrAppearanceFree(self->a_item); + RrAppearanceFree(self->a_disabled); + RrAppearanceFree(self->a_hilite); XDestroyWindow(ob_display, self->item); g_free(self); @@ -60,46 +65,68 @@ void menu_entry_free(MenuEntry *self) void menu_startup() { Menu *m; + Menu *s; + Menu *t; Action *a; menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, menu_destroy_hash_key, (GDestroyNotify)menu_destroy_hash_value); - menu_map = g_hash_table_new(g_int_hash, g_int_equal); m = menu_new("sex menu", "root", NULL); + a = action_from_string("execute"); a->data.execute.path = g_strdup("xterm"); menu_add_entry(m, menu_entry_new("xterm", a)); a = action_from_string("restart"); menu_add_entry(m, menu_entry_new("restart", a)); - menu_add_entry(m, menu_entry_new("--", NULL)); + menu_add_entry(m, menu_entry_new_separator("--")); a = action_from_string("exit"); menu_add_entry(m, menu_entry_new("exit", a)); - m = menu_new("client menu", "client", NULL); - a = action_from_string("iconify"); - menu_add_entry(m, menu_entry_new("iconify", a)); - a = action_from_string("toggleshade"); - menu_add_entry(m, menu_entry_new("(un)shade", a)); - a = action_from_string("togglemaximizefull"); - menu_add_entry(m, menu_entry_new("(un)maximize", a)); - a = action_from_string("close"); - menu_add_entry(m, menu_entry_new("close", a)); + /* + s = menu_new("subsex menu", "submenu", m); + a = action_from_string("execute"); + a->data.execute.path = g_strdup("xclock"); + menu_add_entry(s, menu_entry_new("xclock", a)); + + menu_add_entry(m, menu_entry_new_submenu("subz", s)); + + s = menu_new("empty", "chub", m); + menu_add_entry(m, menu_entry_new_submenu("empty", s)); + + s = menu_new("", "s-club", m); + menu_add_entry(m, menu_entry_new_submenu("empty", s)); + + s = menu_new(NULL, "h-club", m); + menu_add_entry(m, menu_entry_new_submenu("empty", s)); + + s = menu_new(NULL, "g-club", m); + + a = action_from_string("execute"); + a->data.execute.path = g_strdup("xterm"); + menu_add_entry(s, menu_entry_new("xterm", a)); + a = action_from_string("restart"); + menu_add_entry(s, menu_entry_new("restart", a)); + menu_add_entry(s, menu_entry_new_separator("--")); + a = action_from_string("exit"); + menu_add_entry(s, menu_entry_new("exit", a)); + + menu_add_entry(m, menu_entry_new_submenu("long", s)); + */ } void menu_shutdown() { g_hash_table_destroy(menu_hash); - g_hash_table_destroy(menu_map); } static Window createWindow(Window parent, unsigned long mask, XSetWindowAttributes *attrib) { return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - render_depth, InputOutput, render_visual, - mask, attrib); + RrDepth(ob_rr_inst), InputOutput, + RrVisual(ob_rr_inst), mask, attrib); } @@ -110,21 +137,26 @@ Menu *menu_new_full(char *label, char *name, Menu *parent, Menu *self; self = g_new0(Menu, 1); + self->obwin.type = Window_Menu; self->label = g_strdup(label); self->name = g_strdup(name); self->parent = parent; + self->open_submenu = NULL; self->entries = NULL; self->shown = FALSE; - self->invalid = FALSE; - /* default controllers? */ - + self->invalid = TRUE; + + /* default controllers */ self->show = show; self->hide = NULL; self->update = update; self->mouseover = NULL; self->selected = NULL; + self->plugin = NULL; + self->plugin_data = NULL; + attrib.override_redirect = TRUE; attrib.event_mask = FRAME_EVENTMASK; self->frame = createWindow(ob_root, CWOverrideRedirect|CWEventMask, &attrib); @@ -133,6 +165,7 @@ Menu *menu_new_full(char *label, char *name, Menu *parent, self->items = createWindow(self->frame, 0, &attrib); XSetWindowBorderWidth(ob_display, self->frame, theme_bwidth); + XSetWindowBackground(ob_display, self->frame, theme_b_color->pixel); XSetWindowBorderWidth(ob_display, self->title, theme_bwidth); XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel); XSetWindowBorder(ob_display, self->title, theme_b_color->pixel); @@ -140,13 +173,17 @@ Menu *menu_new_full(char *label, char *name, Menu *parent, XMapWindow(ob_display, self->title); XMapWindow(ob_display, self->items); - self->a_title = appearance_copy(theme_a_menu_title); - self->a_items = appearance_copy(theme_a_menu); + self->a_title = RrAppearanceCopy(theme_a_menu_title); + self->a_items = RrAppearanceCopy(theme_a_menu); - g_hash_table_insert(menu_map, &self->frame, self); - g_hash_table_insert(menu_map, &self->title, self); - g_hash_table_insert(menu_map, &self->items, self); + g_hash_table_insert(window_map, &self->frame, self); + g_hash_table_insert(window_map, &self->title, self); + g_hash_table_insert(window_map, &self->items, self); g_hash_table_insert(menu_hash, g_strdup(name), self); + + stacking_add(MENU_AS_WINDOW(self)); + stacking_raise(MENU_AS_WINDOW(self)); + return self; } @@ -187,7 +224,9 @@ void menu_add_entry(Menu *menu, MenuEntry *entry) { XSetWindowAttributes attrib; - g_assert(menu != NULL && entry != NULL && entry->item == None); + g_assert(menu != NULL); + g_assert(entry != NULL); + g_assert(entry->item == None); menu->entries = g_list_append(menu->entries, entry); entry->parent = menu; @@ -195,38 +234,39 @@ void menu_add_entry(Menu *menu, MenuEntry *entry) attrib.event_mask = ENTRY_EVENTMASK; entry->item = createWindow(menu->items, CWEventMask, &attrib); XMapWindow(ob_display, entry->item); - entry->a_item = appearance_copy(theme_a_menu_item); - entry->a_disabled = appearance_copy(theme_a_menu_disabled); - entry->a_hilite = appearance_copy(theme_a_menu_hilite); + entry->a_item = RrAppearanceCopy(theme_a_menu_item); + entry->a_disabled = RrAppearanceCopy(theme_a_menu_disabled); + entry->a_hilite = RrAppearanceCopy(theme_a_menu_hilite); menu->invalid = TRUE; - g_hash_table_insert(menu_map, &entry->item, menu); + g_hash_table_insert(window_map, &entry->item, menu); } void menu_show(char *name, int x, int y, Client *client) { Menu *self; - + self = g_hash_table_lookup(menu_hash, name); if (!self) { g_warning("Attempted to show menu '%s' but it does not exist.", name); return; } + + menu_show_full(self, x, y, client); +} - if (self->invalid) { - if (self->update) { - self->update(self); - } else { - menu_render(self); - } - } +void menu_show_full(Menu *self, int x, int y, Client *client) +{ + g_assert(self != NULL); + + menu_render(self); self->client = client; if (self->show) { - self->show(self, x, y, client); + self->show(self, x, y, client); } else { menu_control_show(self, x, y, client); } @@ -236,9 +276,26 @@ void menu_hide(Menu *self) { if (self->shown) { XUnmapWindow(ob_display, self->frame); self->shown = FALSE; + if (self->open_submenu) + menu_hide(self->open_submenu); + if (self->parent && self->parent->open_submenu == self) + self->parent->open_submenu = NULL; + + } +} + +void menu_clear(Menu *self) { + GList *it; + + for (it = self->entries; it; it = it->next) { + MenuEntry *entry = it->data; + menu_entry_free(entry); } + self->entries = NULL; + self->invalid = TRUE; } + MenuEntry *menu_find_entry(Menu *menu, Window win) { GList *it; @@ -251,29 +308,6 @@ MenuEntry *menu_find_entry(Menu *menu, Window win) return NULL; } -void menu_entry_render(MenuEntry *self) -{ - Menu *menu = self->parent; - Appearance *a; - - a = !self->enabled ? self->a_disabled : - (self->hilite && self->action ? self->a_hilite : self->a_item); - - RECT_SET(a->area, 0, 0, menu->width, - menu->item_h); - RECT_SET(a->texture[0].position, menu->bullet_w, - 0, menu->width - 2 * menu->bullet_w, - menu->item_h); - - XMoveResizeWindow(ob_display, self->item, 0, self->y, - menu->width, menu->item_h); - a->surface.data.planar.parent = menu->a_items; - a->surface.data.planar.parentx = 0; - a->surface.data.planar.parenty = self->y; - - paint(self->item, a); -} - void menu_entry_fire(MenuEntry *self) { Menu *m; @@ -294,11 +328,53 @@ void menu_entry_fire(MenuEntry *self) */ void menu_control_show(Menu *self, int x, int y, Client *client) { - XMoveWindow(ob_display, self->frame, x, y); + g_assert(!self->invalid); + + XMoveWindow(ob_display, self->frame, + MIN(x, screen_physical_size.width - self->size.width), + MIN(y, screen_physical_size.height - self->size.height)); + POINT_SET(self->location, + MIN(x, screen_physical_size.width - self->size.width), + MIN(y, screen_physical_size.height - self->size.height)); + + if (!self->shown) { + XMapWindow(ob_display, self->frame); + stacking_raise(MENU_AS_WINDOW(self)); + self->shown = TRUE; + } else if (self->shown && self->open_submenu) { + menu_hide(self->open_submenu); + } +} - if (!self->shown) { - stacking_raise_internal(self->frame); - XMapWindow(ob_display, self->frame); - self->shown = TRUE; - } +void menu_control_mouseover(MenuEntry *self, gboolean enter) { + int x; + self->hilite = enter; + + if (enter) { + if (self->parent->open_submenu && self->submenu + != self->parent->open_submenu) + menu_hide(self->parent->open_submenu); + + if (self->submenu) { + self->parent->open_submenu = self->submenu; + + /* shouldn't be invalid since it must be displayed */ + g_assert(!self->parent->invalid); + /* TODO: I don't understand why these bevels should be here. + Something must be wrong in the width calculation */ + x = self->parent->location.x + self->parent->size.width + + theme_bevel; + + /* need to get the width. is this bad?*/ + menu_render(self->submenu); + + if (self->submenu->size.width + x > screen_physical_size.width) + x = self->parent->location.x - self->submenu->size.width - + theme_bevel; + + menu_show_full(self->submenu, x, + self->parent->location.y + self->y, + self->parent->client); + } + } }