all repos — openbox @ 3d6e0f941d36ff335ad13ecf83405a40775e4c04

openbox fork - make it a bit more like ryudo

these menus should not be removed, they are good and will be used.
Dana Jansens danakj@orodu.net
commit

3d6e0f941d36ff335ad13ecf83405a40775e4c04

parent

677bc6ed2db3448bd2bee48fd4598079b27b18c1

2 files changed, 173 insertions(+), 0 deletions(-)

jump to
A openbox/menu.c

@@ -0,0 +1,106 @@

+#include <glib.h> +#include "menu.h" +#include <assert.h> + +GHashTable *menu_hash = NULL; + +void menu_destroy_hash_key(const gpointer data) +{ + g_free(data); +} + +void menu_free_entries(const Menu *menu) +{ + GList *it; + + for (it = menu->entries; it; it = it->next) + menu_entry_free((MenuEntry *)it->data); + + g_list_free(menu->entries); +} + +void menu_destroy_hash_value(const gpointer data) +{ + const Menu *del_menu = (Menu *)data; + + g_free(del_menu->label); + g_free(del_menu->name); + + menu_free_entries(del_menu); +} + +void menu_entry_free(const MenuEntry *entry) +{ + g_free(entry->label); + g_free(entry->render_data); +} + +void menu_startup() +{ + menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + menu_destroy_hash_key, + menu_destroy_hash_value); +} + +void menu_shutdown() +{ + g_hash_table_destroy(menu_hash); +} + +Menu *menu_new(const char *label, const char *name, Menu *parent) +{ + Menu *new_menu = g_new0(Menu, 1); + new_menu->label = g_strdup(label); + new_menu->name = g_strdup(name); + new_menu->parent = parent; + + new_menu->entries = NULL; + new_menu->shown = FALSE; + new_menu->invalid = FALSE; + /* default controllers? */ + + g_hash_table_insert(menu_hash, g_strdup(name), new_menu); + return new_menu; +} + +void menu_free(const 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 = g_new(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->render_data = render_data; /*watch out.*/ + menu_entry->submenu = submenu; + + return menu_entry; +} + +void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu) +{ + assert(entry != NULL); + + entry->submenu = submenu; + + if(entry->parent != NULL) + entry->parent->invalid = TRUE; +} + +void menu_add_entry(Menu *menu, MenuEntry *entry) +{ + assert(menu != NULL && entry != NULL); + + menu->entries = g_list_append(menu->entries, entry); + entry->parent = menu; + + menu->invalid = TRUE; +}
A openbox/menu.h

@@ -0,0 +1,67 @@

+#ifndef __menu_h +#define __menu_h + +#include "action.h" +#include <glib.h> + +typedef struct Menu { + char *label; + char *name; + + GList *entries; + /* GList *tail; */ + + /* ? */ + gboolean shown; + gboolean invalid; + + struct Menu *parent; + + /* waste o' pointers */ + void (*show)( /* some bummu */); + void (*hide)( /* some bummu */); + void (*update)( /* some bummu */); + void (*mouseover)( /* some bummu */); + void (*selected)( /* some bummu */); +} Menu; + +typedef enum MenuEntryRenderType { + MenuEntryRenderType_None = 0, + MenuEntryRenderType_Submenu = 1 << 0, + MenuEntryRenderType_Boolean = 1 << 1, + MenuEntryRenderType_Separator = 1 << 2, + + MenuEntryRenderType_Other = 1 << 7 +} MenuEntryRenderType; + + +typedef struct { + char *label; + Menu *parent; + + Action action; + + MenuEntryRenderType render_type; + gboolean enabled; + gboolean boolean_value; + gpointer render_data; /* where the engine can store anything it likes */ + + Menu *submenu; +} MenuEntry; + +Menu *menu_new(const char *label, const char *name, Menu *parent); +void menu_free(const char *name); + +MenuEntry *menu_entry_new_full(const char *label, Action *action, + const MenuEntryRenderType render_type, + gpointer render_data, gpointer submenu); + +#define menu_entry_new(label, action) \ + menu_entry_new(label, action, MenuEntryRenderType_None, NULL, NULL) + +void menu_entry_free(const MenuEntry *entry); + +void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu); + +void menu_add_entry(Menu *menu, MenuEntry *entry); +#endif