#include "menu.h"
#include "openbox.h"
#include "stacking.h"
+#include "client.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;
+GSList *menu_visible = NULL;
#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
LeaveWindowMask)
#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask)
-void menu_control_show(Menu *self, int x, int y, Client *client);
+static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data)
+{
+ Action *act;
+ xmlNodePtr nact;
+ gchar *id = NULL, *title = NULL, *label = NULL;
+ Menu *menu, *parent;
+
+ if (!parse_attr_string("id", node->parent, &id))
+ goto parse_menu_fail;
+ if (!parse_attr_string("label", node->parent, &title))
+ goto parse_menu_fail;
+
+ g_message("menu label %s", title);
+
+ menu = menu_new(title, id, data ? *((Menu**)data) : NULL);
+ if (data)
+ *((Menu**)data) = menu;
+
+ while (node) {
+ if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
+ parent = menu;
+ parse_menu(doc, node->xmlChildrenNode, &parent);
+ menu_add_entry(menu, menu_entry_new_submenu(parent->label,
+ parent));
+ }
+ else if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) {
+ if (parse_attr_string("label", node, &label)) {
+ if ((nact = parse_find_node("action", node->xmlChildrenNode)))
+ act = action_parse(doc, nact);
+ else
+ act = NULL;
+ if (act)
+ menu_add_entry(menu, menu_entry_new(label, act));
+ else
+ menu_add_entry(menu, menu_entry_new_separator(label));
+ g_free(label);
+ }
+ }
+ node = node->next;
+ }
+
+parse_menu_fail:
+ g_free(id);
+ g_free(title);
+}
-void menu_destroy_hash_key(gpointer data)
+void menu_control_show(Menu *self, int x, int y, ObClient *client);
+
+void menu_destroy_hash_key(Menu *menu)
{
- g_free(data);
+ g_free(menu);
}
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);
stacking_remove(self);
- appearance_free(self->a_title);
+ RrAppearanceFree(self->a_title);
XDestroyWindow(ob_display, self->title);
XDestroyWindow(ob_display, self->frame);
XDestroyWindow(ob_display, self->items);
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);
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_key,
(GDestroyNotify)menu_destroy_hash_value);
- menu_map = g_hash_table_new(g_int_hash, g_int_equal);
- m = menu_new(NULL, "root", NULL);
+ parse_register("menu", parse_menu, NULL);
+
+/*
+ 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_separator("--"));
a = action_from_string("exit");
menu_add_entry(m, menu_entry_new("exit", a));
+*/
+
+ /*
s = menu_new("subsex menu", "submenu", m);
a = action_from_string("execute");
a->data.execute.path = g_strdup("xclock");
menu_add_entry(m, menu_entry_new_submenu("subz", s));
- t = (Menu *)plugin_create("timed_menu");
- a = action_from_string("execute");
- a->data.execute.path = g_strdup("xeyes");
- menu_add_entry(t, menu_entry_new("xeyes", a));
- menu_add_entry(m, menu_entry_new_submenu("timed", t));
-
s = menu_new("empty", "chub", m);
menu_add_entry(m, menu_entry_new_submenu("empty", s));
menu_add_entry(s, menu_entry_new("exit", a));
menu_add_entry(m, menu_entry_new_submenu("long", s));
-
- m = menu_new(NULL, "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));
-
+ */
}
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);
}
attrib.override_redirect = TRUE;
attrib.event_mask = FRAME_EVENTMASK;
- self->frame = createWindow(ob_root, CWOverrideRedirect|CWEventMask, &attrib);
+ self->frame = createWindow(RootWindow(ob_display, ob_screen),
+ CWOverrideRedirect|CWEventMask, &attrib);
attrib.event_mask = TITLE_EVENTMASK;
self->title = createWindow(self->frame, CWEventMask, &attrib);
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);
+ self->a_title = self->a_items = NULL;
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);
-
- 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(self);
+ stacking_add(MENU_AS_WINDOW(self));
stacking_raise(MENU_AS_WINDOW(self));
return self;
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 = entry->a_disabled = entry->a_hilite = NULL;
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)
+void menu_show(char *name, int x, int y, ObClient *client)
{
Menu *self;
name);
return;
}
-
+
menu_show_full(self, x, y, client);
}
-void menu_show_full(Menu *self, int x, int y, Client *client)
+void menu_show_full(Menu *self, int x, int y, ObClient *client)
{
g_assert(self != NULL);
self->client = client;
+ if (!self->shown) {
+ if (!self->parent) {
+ grab_pointer(TRUE, None);
+ grab_keyboard(TRUE);
+ }
+ menu_visible = g_slist_append(menu_visible, self);
+ }
+
if (self->show) {
self->show(self, x, y, client);
} else {
}
}
-
void menu_hide(Menu *self) {
if (self->shown) {
XUnmapWindow(ob_display, self->frame);
if (self->parent && self->parent->open_submenu == self)
self->parent->open_submenu = NULL;
+ if (!self->parent) {
+ grab_keyboard(FALSE);
+ grab_pointer(FALSE, None);
+ }
+ menu_visible = g_slist_remove(menu_visible, self);
}
}
return NULL;
}
+MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y)
+{
+ if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
+ return NULL;
+
+ y -= menu->title_h + ob_rr_theme->bwidth;
+ if (y < 0) return NULL;
+
+ g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h));
+ return g_list_nth_data(menu->entries, y / menu->item_h);
+}
+
void menu_entry_fire(MenuEntry *self)
{
Menu *m;
Default menu controller action for showing.
*/
-void menu_control_show(Menu *self, int x, int y, Client *client) {
+void menu_control_show(Menu *self, int x, int y, ObClient *client) {
+ guint i;
+ Rect *a = NULL;
+
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));
+ for (i = 0; i < screen_num_monitors; ++i) {
+ a = screen_physical_area_monitor(i);
+ if (RECT_CONTAINS(*a, x, y))
+ break;
+ }
+ g_assert(a != NULL);
+ self->xin_area = i;
+
+ POINT_SET(self->location,
+ MIN(x, a->x + a->width - 1 - self->size.width),
+ MIN(y, a->y + a->height - 1 - self->size.height));
+ XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
if (!self->shown) {
XMapWindow(ob_display, self->frame);
void menu_control_mouseover(MenuEntry *self, gboolean enter) {
int x;
+ Rect *a;
+
self->hilite = enter;
if (enter) {
!= self->parent->open_submenu)
menu_hide(self->parent->open_submenu);
- if (self->submenu) {
+ if (self->submenu && self->parent->open_submenu != self->submenu) {
self->parent->open_submenu = self->submenu;
/* shouldn't be invalid since it must be displayed */
/* 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;
+ ob_rr_theme->bwidth;
/* need to get the width. is this bad?*/
menu_render(self->submenu);
- if (self->submenu->size.width + x > screen_physical_size.width)
+ a = screen_physical_area_monitor(self->parent->xin_area);
+
+ if (self->submenu->size.width + x >= a->x + a->width)
x = self->parent->location.x - self->submenu->size.width -
- theme_bevel;
+ ob_rr_theme->bwidth;
menu_show_full(self->submenu, x,
- self->parent->location.y + self->y, NULL);
+ self->parent->location.y + self->y,
+ self->parent->client);
}
}
}
projects / chaz / openbox / blobdiff