X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=8e2a8583f88f52085aedcfd4b2570fa5177c4958;hb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;hp=5c8dcc9de75586afa2ba08a543cd802930485898;hpb=3d6e0f941d36ff335ad13ecf83405a40775e4c04;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 5c8dcc9d..8e2a8583 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,45 +1,119 @@
-#include <glib.h>
 #include "menu.h"
-#include <assert.h>
+#include "openbox.h"
+#include "stacking.h"
+#include "grab.h"
+#include "render/theme.h"
+#include "screen.h"
+#include "geom.h"
+#include "plugin.h"
 
 GHashTable *menu_hash = NULL;
 
-void menu_destroy_hash_key(const gpointer data)
+#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(Menu *menu)
 {
-    g_free(data);
+    g_free(menu);
 }
 
-void menu_free_entries(const Menu *menu)
+void menu_destroy_hash_value(Menu *self)
 {
     GList *it;
 
-    for (it = menu->entries; it; it = it->next)
-        menu_entry_free((MenuEntry *)it->data);
+    for (it = self->entries; it; it = it->next)
+        menu_entry_free(it->data);
+    g_list_free(self->entries);
 
-    g_list_free(menu->entries);
-}
+    g_free(self->label);
+    g_free(self->name);
 
-void menu_destroy_hash_value(const gpointer data)
-{
-    const Menu *del_menu = (Menu *)data;
+    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);
 
-    g_free(del_menu->label);
-    g_free(del_menu->name);
+    RrAppearanceFree(self->a_title);
+    XDestroyWindow(ob_display, self->title);
+    XDestroyWindow(ob_display, self->frame);
+    XDestroyWindow(ob_display, self->items);
 
-    menu_free_entries(del_menu);
+    g_free(self);
 }
 
-void menu_entry_free(const MenuEntry *entry)
+void menu_entry_free(MenuEntry *self)
 {
-    g_free(entry->label);
-    g_free(entry->render_data);
+    g_free(self->label);
+    action_free(self->action);
+
+    g_hash_table_remove(window_map, &self->item);
+
+    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,
-                                      menu_destroy_hash_value);
+                                      (GDestroyNotify)menu_destroy_hash_value);
+
+    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_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(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()
@@ -47,39 +121,90 @@ void menu_shutdown()
     g_hash_table_destroy(menu_hash);
 }
 
-Menu *menu_new(const char *label, const char *name, Menu *parent)
+static Window createWindow(Window parent, unsigned long mask,
+			   XSetWindowAttributes *attrib)
 {
-    Menu *new_menu = g_new0(Menu, 1);
-    new_menu->label = g_strdup(label);
-    new_menu->name = g_strdup(name);
-    new_menu->parent = parent;
+    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
+			 RrDepth(ob_rr_inst), InputOutput,
+                         RrVisual(ob_rr_inst), mask, attrib);
+                       
+}
+
+Menu *menu_new_full(char *label, char *name, Menu *parent, 
+                    menu_controller_show show, menu_controller_update update)
+{
+    XSetWindowAttributes attrib;
+    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 = 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);
+    attrib.event_mask = TITLE_EVENTMASK;
+    self->title = createWindow(self->frame, CWEventMask, &attrib);
+    self->items = createWindow(self->frame, 0, &attrib);
+
+    XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
+    XSetWindowBackground(ob_display, self->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
+    XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
 
-    new_menu->entries = NULL;
-    new_menu->shown = FALSE;
-    new_menu->invalid = FALSE;
-    /* default controllers? */
+    XMapWindow(ob_display, self->title);
+    XMapWindow(ob_display, self->items);
 
-    g_hash_table_insert(menu_hash, g_strdup(name), new_menu);
-    return new_menu;
+    self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
+    self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
+
+    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;
 }
 
-void menu_free(const char *name)
+void menu_free(char *name)
 {
     g_hash_table_remove(menu_hash, name);
 }
 
-MenuEntry *menu_entry_new_full(const char *label, Action *action,
-                          const MenuEntryRenderType render_type,
-                          gpointer render_data, gpointer submenu)
+MenuEntry *menu_entry_new_full(char *label, Action *action,
+                               MenuEntryRenderType render_type,
+                               gpointer submenu)
 {
-    MenuEntry *menu_entry = g_new(MenuEntry, 1);
+    MenuEntry *menu_entry = g_new0(MenuEntry, 1);
 
     menu_entry->label = g_strdup(label);
     menu_entry->render_type = render_type;
-    menu_entry->action.func = action->func;
-    menu_entry->action.data = action->data; /*watch out. copying Client * ptr*/
+    menu_entry->action = action;
+
+    menu_entry->hilite = FALSE;
+    menu_entry->enabled = TRUE;
 
-    menu_entry->render_data = render_data; /*watch out.*/
     menu_entry->submenu = submenu;
 
     return menu_entry;
@@ -87,7 +212,7 @@ MenuEntry *menu_entry_new_full(const char *label, Action *action,
 
 void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
 {
-    assert(entry != NULL);
+    g_assert(entry != NULL);
     
     entry->submenu = submenu;
 
@@ -97,10 +222,159 @@ void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
 
 void menu_add_entry(Menu *menu, MenuEntry *entry)
 {
-    assert(menu != NULL && entry != NULL);
+    XSetWindowAttributes attrib;
+
+    g_assert(menu != NULL);
+    g_assert(entry != NULL);
+    g_assert(entry->item == None);
 
     menu->entries = g_list_append(menu->entries, entry);
     entry->parent = menu;
 
+    attrib.event_mask = ENTRY_EVENTMASK;
+    entry->item = createWindow(menu->items, CWEventMask, &attrib);
+    XMapWindow(ob_display, entry->item);
+    entry->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item);
+    entry->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
+    entry->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
+
     menu->invalid = TRUE;
+
+    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);
+}  
+
+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);
+    } else {
+      menu_control_show(self, x, y, client);
+    }
+}
+
+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;
+
+    for (it = menu->entries; it; it = it->next) {
+        MenuEntry *entry = it->data;
+        if (entry->item == win)
+            return entry;
+    }
+    return NULL;
+}
+
+void menu_entry_fire(MenuEntry *self)
+{
+    Menu *m;
+
+    if (self->action) {
+        self->action->data.any.c = self->parent->client;
+        self->action->func(&self->action->data);
+
+        /* hide the whole thing */
+        m = self->parent;
+        while (m->parent) m = m->parent;
+        menu_hide(m);
+    }
+}
+
+/* 
+   Default menu controller action for showing.
+*/
+
+void menu_control_show(Menu *self, int x, int y, Client *client) {
+    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);
+    }
+}
+
+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 + 
+		ob_rr_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 - 
+		    ob_rr_theme->bevel;
+	    
+	    menu_show_full(self->submenu, x,
+			   self->parent->location.y + self->y,
+                           self->parent->client);
+	} 
+    }
 }