half way through the changes to new menu code/design. hot shit. static menus work, on to plugins next.
@@ -26,12 +26,12 @@ kernel/openbox \
tools/kdetrayproxy/kdetrayproxy plugin_LTLIBRARIES = \ - plugins/placement/placement.la \ - plugins/menu/timed_menu.la \ - plugins/menu/fifo_menu.la \ - plugins/menu/client_menu.la \ - plugins/menu/include_menu.la \ - plugins/menu/client_list_menu.la + plugins/placement/placement.la +# plugins/menu/timed_menu.la \ +# plugins/menu/fifo_menu.la \ +# plugins/menu/client_menu.la \ +# plugins/menu/include_menu.la \ +# plugins/menu/client_list_menu.la if OBCONF bin_PROGRAMS += \@@ -156,9 +156,10 @@ kernel/keyboard.c \
kernel/keyboard.h \ kernel/keytree.c \ kernel/keytree.h \ + kernel/menuframe.c \ + kernel/menuframe.h \ kernel/menu.c \ kernel/menu.h \ - kernel/menu_render.c \ kernel/misc.h \ kernel/mouse.c \ kernel/mouse.h \@@ -277,7 +278,7 @@ plugins_menu_client_list_menu_la_LDFLAGS = \
-module \ -avoid-version plugins_menu_client_list_menu_la_SOURCES = \ - plugins/menu/client_list_menu.c +o plugins/menu/client_list_menu.c ## obconf ##
@@ -350,13 +350,6 @@ while (client_list != NULL)
client_unmanage(client_list->data); } -/* called by client_unmanage() to close any menus referencing this client */ -void client_close_menus(gpointer key, gpointer value, gpointer self) -{ - if (((ObMenu *)value)->client == (ObClient *)self) - menu_hide((ObMenu *)value); -} - void client_unmanage(ObClient *self) { guint j;@@ -413,9 +406,7 @@
if (moveresize_client == self) moveresize_end(TRUE); - /* close any windows that are attached to this window */ - g_hash_table_foreach(menu_hash, client_close_menus, self); - + /* XXX close any windows that are attached to this window */ if (focus_client == self) { XEvent e;
@@ -8,6 +8,7 @@ #include "config.h"
#include "screen.h" #include "frame.h" #include "menu.h" +#include "menuframe.h" #include "keyboard.h" #include "mouse.h" #include "framerender.h"@@ -41,10 +42,10 @@ #endif
static void event_process(XEvent *e); static void event_handle_root(XEvent *e); +static void event_handle_menu(XEvent *e); static void event_handle_dock(ObDock *s, XEvent *e); static void event_handle_dockapp(ObDockApp *app, XEvent *e); static void event_handle_client(ObClient *c, XEvent *e); -static void event_handle_menu(ObClient *c, XEvent *e); static void fd_event_handle(); #ifdef USE_SM static void ice_watch(IceConn conn, IcePointer data, Bool opening,@@ -298,6 +299,7 @@ }
break; case MotionNotify: STRIP_MODS(e->xmotion.state); +#if 0 /* compress events */ { XEvent ce;@@ -307,6 +309,7 @@ e->xmotion.x_root = ce.xmotion.x_root;
e->xmotion.y_root = ce.xmotion.y_root; } } +#endif break; } }@@ -461,7 +464,6 @@ Window window;
ObClient *client = NULL; ObDock *dock = NULL; ObDockApp *dockapp = NULL; - ObMenu *menu = NULL; ObWindow *obwin = NULL; window = event_get_window(e);@@ -473,12 +475,10 @@ break;
case Window_DockApp: dockapp = WINDOW_AS_DOCKAPP(obwin); break; - case Window_Menu: - menu = WINDOW_AS_MENU(obwin); - break; case Window_Client: client = WINDOW_AS_CLIENT(obwin); break; + case Window_Menu: case Window_Internal: /* not to be used for events */ g_assert_not_reached();@@ -523,11 +523,11 @@ e->xconfigurerequest.value_mask, &xwc);
xerror_set_ignore(FALSE); } - if (menu_visible) + if (menu_frame_visible) if (e->type == MotionNotify || e->type == ButtonRelease || e->type == ButtonPress || e->type == KeyPress || e->type == KeyRelease) { - event_handle_menu(client, e); + event_handle_menu(e); return; /* no dispatch! */ }@@ -539,7 +539,6 @@ e->type == KeyPress || e->type == KeyRelease) {
moveresize_event(e); return; /* no dispatch! */ - } /* user input (action-bound) events */@@ -1081,74 +1080,6 @@ #endif
} } -static void event_handle_menu(ObClient *client, XEvent *e) -{ - ObMenuEntry *entry; - ObMenu *top; - GList *it = NULL; - - top = g_list_nth_data(menu_visible, 0); - - ob_debug("EVENT %d\n", e->type); - switch (e->type) { - case KeyPress: - menu_control_keyboard_nav(e->xkey.keycode); - break; - case ButtonPress: - ob_debug("BUTTON PRESS\n"); - - break; - case ButtonRelease: - ob_debug("BUTTON RELEASED\n"); - - for (it = menu_visible; it; it = g_list_next(it)) { - ObMenu *m = it->data; - if (e->xbutton.x_root >= m->location.x - ob_rr_theme->bwidth && - e->xbutton.y_root >= m->location.y - ob_rr_theme->bwidth && - e->xbutton.x_root < m->location.x + m->size.width + - ob_rr_theme->bwidth && - e->xbutton.y_root < m->location.y + m->size.height + - ob_rr_theme->bwidth) { - if ((entry = menu_find_entry_by_pos(it->data, - e->xbutton.x_root - - m->location.x, - e->xbutton.y_root - - m->location.y))) { - m->selected(entry, e->xbutton.button, - e->xbutton.x_root, - e->xbutton.y_root); - break; - } - break; - } - } - - /* will call the menu_hide() for each submenu as well */ - if (!it) - menu_control_keyboard_nav(ob_keycode(OB_KEY_ESCAPE)); - - break; - case MotionNotify: - ob_debug("motion\n"); - for (it = menu_visible; it; it = g_list_next(it)) { - ObMenu *m = it->data; - if ((entry = menu_find_entry_by_pos(it->data, - e->xmotion.x_root - - m->location.x, - e->xmotion.y_root - - m->location.y))) { - if (m->over && m->over->data != entry) - m->mouseover(m->over->data, FALSE); - - m->mouseover(entry, TRUE); - break; - } - } - - break; - } -} - void event_add_fd_handler(event_fd_handler *h) { g_datalist_id_set_data(&fd_handler_list, h->fd, h); FD_SET(h->fd, &allset);@@ -1231,3 +1162,31 @@ dock_app_configure(app, e->xconfigure.width, e->xconfigure.height);
break; } } + +static void event_handle_menu(XEvent *ev) +{ + ObMenuFrame *f; + ObMenuEntryFrame *e; + + switch (ev->type) { + case ButtonRelease: + if (!(f = menu_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) + menu_frame_hide_all(); + else { + if ((e = menu_entry_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) + menu_entry_frame_execute(e); + } + break; + case MotionNotify: + if ((f = menu_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) { + menu_frame_move_on_screen(f); + if (e = menu_entry_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root)) + menu_frame_select(f, e); + } + break; + } +}
@@ -1,158 +0,0 @@
-/* Functions for default rendering of menus. Might become pluginnable */ - -#include "debug.h" -#include "menu.h" -#include "openbox.h" -#include "render/theme.h" - -void menu_render(ObMenu *self) { - GList *it; - int items_h = 0; - int nitems = 0; /* each item, only one is used */ - int item_y; - - self->size.width = 1; - self->item_h = 1; - - if (self->a_title == NULL) { - XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth); - XSetWindowBackground(ob_display, self->frame, - RrColorPixel(ob_rr_theme->b_color)); - XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth); - XSetWindowBorder(ob_display, self->frame, - RrColorPixel(ob_rr_theme->b_color)); - XSetWindowBorder(ob_display, self->title, - RrColorPixel(ob_rr_theme->b_color)); - - self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title); - self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu); - } - - /* set texture data and size them mofos out */ - if (self->label && !(self->parent && self->parent->shown)) { - self->a_title->texture[0].data.text.string = self->label; - RrMinsize(self->a_title, &self->title_min_w, &self->title_h); - self->title_min_w += ob_rr_theme->bevel * 2; - self->title_h += ob_rr_theme->bevel * 2; - self->size.width = MAX(self->size.width, self->title_min_w); - } else - self->title_h = -ob_rr_theme->bwidth; - - for (it = self->entries; it; it = it->next) { - ObMenuEntry *e = it->data; - int h; - - if (e->a_item == NULL) { - e->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item); - e->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); - e->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); - e->a_submenu = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); - } - - e->a_item->texture[0].data.text.string = e->label; - RrMinsize(e->a_item, &e->min_w, &self->item_h); - self->size.width = MAX(self->size.width, e->min_w); - - e->a_disabled->texture[0].data.text.string = e->label; - RrMinsize(e->a_disabled, &e->min_w, &h); - self->item_h = MAX(self->item_h, h); - self->size.width = MAX(self->size.width, e->min_w); - - e->a_hilite->texture[0].data.text.string = e->label; - RrMinsize(e->a_hilite, &e->min_w, &h); - self->item_h = MAX(self->item_h, h); - self->size.width = MAX(self->size.width, e->min_w); - - e->min_w += ob_rr_theme->bevel * 2; - ++nitems; - } - self->bullet_w = self->item_h + ob_rr_theme->bevel; - self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel; - self->item_h += ob_rr_theme->bevel * 2; - items_h = self->item_h * MAX(nitems, 1); - - self->size.height = MAX(self->title_h + items_h + ob_rr_theme->bwidth, 1); - XResizeWindow(ob_display, self->frame, self->size.width,self->size.height); - if (self->label && !(self->parent && self->parent->shown)) { - XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth, - -ob_rr_theme->bwidth, - self->size.width, self->title_h); - XMapWindow(ob_display, self->title); - } else - XUnmapWindow(ob_display, self->title); - - XMoveResizeWindow(ob_display, self->items, 0, - self->title_h + ob_rr_theme->bwidth, self->size.width, - items_h); - - if (self->label && !(self->parent && self->parent->shown)) - RrPaint(self->a_title, self->title, self->size.width, self->title_h); - RrPaint(self->a_items, self->items, self->size.width, items_h); - - item_y = 0; - for (it = self->entries; it; it = it->next) { - ((ObMenuEntry*)it->data)->y = item_y; - menu_entry_render(it->data); - item_y += self->item_h; - } - - self->invalid = FALSE; -} - -void menu_entry_render(ObMenuEntry *self) -{ - ObMenu *menu = self->parent; - RrAppearance *a, *s = NULL; - - switch (self->render_type) { - case OB_MENU_ENTRY_RENDER_TYPE_SUBMENU: - a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item) - : self->a_disabled; - s = self->a_submenu; - break; - case OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN: - /* TODO: boolean check */ - a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item) - : self->a_disabled; - break; - case OB_MENU_ENTRY_RENDER_TYPE_NONE: - a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item ) - : self->a_disabled; - break; - case OB_MENU_ENTRY_RENDER_TYPE_SEPARATOR: - a = self->a_item; - break; - - default: - g_assert_not_reached(); /* unhandled rendering type */ - break; - } - - XMoveResizeWindow(ob_display, self->item, 0, self->y, - menu->size.width, menu->item_h); - if (s) { - XMoveResizeWindow(ob_display, self->submenu_pic, - menu->size.width - - menu->bullet_w + (menu->bullet_w - 8) / 2, - self->y + (menu->item_h - 8) / 2, - 8, 8); - XMapWindow(ob_display, self->submenu_pic); - } else - XUnmapWindow(ob_display, self->submenu_pic); - - a->surface.parent = menu->a_items; - a->surface.parentx = 0; - a->surface.parenty = self->y; - - if (s) { - s->surface.parent = a; - s->surface.parentx = menu->size.width - - menu->bullet_w + (menu->bullet_w - 8) / 2, - s->surface.parenty = (menu->item_h - 8) / 2; - } - - RrPaint(a, self->item, menu->size.width, menu->item_h); - - if (s) - RrPaint(s, self->submenu_pic, 8, 8); -}
@@ -127,7 +127,7 @@ /* create the shit if needed */
if (!self->a_bg) self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg); if (self->hasicon && !self->a_icon) - self->a_icon = RrAppearanceCopy(ob_rr_theme->app_icon); + self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); if (!self->a_text) self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
@@ -1,5 +1,5 @@
#include "window.h" -#include "menu.h" +#include "menuframe.h" #include "config.h" #include "dock.h" #include "client.h"@@ -21,7 +21,7 @@ Window window_top(ObWindow *self)
{ switch (self->type) { case Window_Menu: - return ((ObMenu*)self)->frame; + return ((ObMenuFrame*)self)->window; case Window_Dock: return ((ObDock*)self)->frame; case Window_DockApp:
@@ -38,7 +38,7 @@ struct _ObDock;
struct _ObDockApp; struct _ObClient; -#define WINDOW_AS_MENU(win) ((struct _ObMenu*)win) +#define WINDOW_AS_MENU(win) ((struct _ObMenuFrame*)win) #define WINDOW_AS_DOCK(win) ((struct _ObDock*)win) #define WINDOW_AS_DOCKAPP(win) ((struct _ObDockApp*)win) #define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win)
@@ -133,7 +133,7 @@ int RrFontMeasureString(const RrFont *f, const gchar *str)
{ gint x, y; font_measure_full (f, str, &x, &y); - return x; + return x + 4; } int RrFontHeight(const RrFont *f)
@@ -56,17 +56,20 @@ theme->a_focused_handle = RrAppearanceNew(inst, 0);
theme->a_unfocused_handle = RrAppearanceNew(inst, 0); theme->a_menu = RrAppearanceNew(inst, 0); theme->a_menu_title = RrAppearanceNew(inst, 1); - theme->a_menu_item = RrAppearanceNew(inst, 1); - theme->a_menu_disabled = RrAppearanceNew(inst, 1); - theme->a_menu_hilite = RrAppearanceNew(inst, 1); + theme->a_menu_item = RrAppearanceNew(inst, 0); + theme->a_menu_disabled = RrAppearanceNew(inst, 0); + theme->a_menu_hilite = RrAppearanceNew(inst, 0); + theme->a_menu_text_item = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_hilite = RrAppearanceNew(inst, 1); theme->a_menu_bullet = RrAppearanceNew(inst, 1); theme->a_clear = RrAppearanceNew(inst, 0); + theme->a_clear_tex = RrAppearanceNew(inst, 1); theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); theme->app_hilite_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1); - theme->app_icon = RrAppearanceNew(inst, 1); if (name) { db = loaddb(theme, name);@@ -607,8 +610,15 @@ RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_iconify = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_icon->surface.grad = RR_SURFACE_PARENTREL; - theme->a_clear->surface.grad = RR_SURFACE_PARENTREL; + theme->a_icon->surface.grad = + theme->a_clear->surface.grad = + theme->a_clear_tex->surface.grad = + theme->a_menu_item->surface.grad = + theme->a_menu_disabled->surface.grad = + theme->a_menu_text_item->surface.grad = + theme->a_menu_text_disabled->surface.grad = + theme->a_menu_text_hilite->surface.grad = + theme->a_menu_bullet->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type =@@ -638,24 +648,19 @@ theme->a_menu_title->texture[0].data.text.justify = mtitlejust;
theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; - theme->a_menu_item->surface.grad = - theme->a_menu_disabled->surface.grad = - theme->a_menu_bullet->surface.grad = - theme->app_icon->surface.grad = RR_SURFACE_PARENTREL; - - theme->a_menu_item->texture[0].type = - theme->a_menu_disabled->texture[0].type = - theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_item->texture[0].data.text.justify = - theme->a_menu_disabled->texture[0].data.text.justify = - theme->a_menu_hilite->texture[0].data.text.justify = mjust; - theme->a_menu_item->texture[0].data.text.font = - theme->a_menu_disabled->texture[0].data.text.font = - theme->a_menu_hilite->texture[0].data.text.font = theme->mfont; - theme->a_menu_item->texture[0].data.text.color = theme->menu_color; - theme->a_menu_disabled->texture[0].data.text.color = + theme->a_menu_text_item->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_hilite->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_item->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_hilite->texture[0].data.text.justify = mjust; + theme->a_menu_text_item->texture[0].data.text.font = + theme->a_menu_text_disabled->texture[0].data.text.font = + theme->a_menu_text_hilite->texture[0].data.text.font = theme->mfont; + theme->a_menu_text_item->texture[0].data.text.color = theme->menu_color; + theme->a_menu_text_disabled->texture[0].data.text.color = theme->menu_disabled_color; - theme->a_menu_hilite->texture[0].data.text.color = + theme->a_menu_text_hilite->texture[0].data.text.color = theme->menu_hilite_color; theme->a_menu_bullet->texture[0].data.mask.color = theme->menu_bullet_color;@@ -843,7 +848,7 @@
theme->label_height = theme->winfont_height; theme->title_height = theme->label_height + theme->bevel * 2; theme->button_size = theme->label_height - 2; - theme->grip_width = theme->button_size * 2; + theme->grip_width = theme->title_height * 1.5; return theme; }@@ -963,12 +968,15 @@ RrAppearanceFree(theme->a_menu_title);
RrAppearanceFree(theme->a_menu_item); RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->a_menu_text_item); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_hilite); RrAppearanceFree(theme->a_clear); + RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->app_hilite_bg); RrAppearanceFree(theme->app_unhilite_bg); RrAppearanceFree(theme->app_hilite_label); RrAppearanceFree(theme->app_unhilite_label); - RrAppearanceFree(theme->app_icon); } }
@@ -143,14 +143,17 @@ RrAppearance *a_menu;
RrAppearance *a_menu_item; RrAppearance *a_menu_disabled; RrAppearance *a_menu_hilite; + RrAppearance *a_menu_text_item; + RrAppearance *a_menu_text_disabled; + RrAppearance *a_menu_text_hilite; RrAppearance *a_menu_bullet; - RrAppearance *a_clear; + RrAppearance *a_clear; /* clear with no texture */ + RrAppearance *a_clear_tex; /* clear with a texture */ RrAppearance *app_hilite_bg; RrAppearance *app_unhilite_bg; RrAppearance *app_hilite_label; RrAppearance *app_unhilite_label; - RrAppearance *app_icon; };