gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Make OPEN_MENU be able to include PropList menus

Browse Source 
Signed-off-by: Tamas TEVESZ <ice@extreme.hu>
This commit is contained in:
Tamas TEVESZ
2010-09-30 17:36:22 +02:00
committed by Carlos R. Mafra
parent c37046e6a9
commit 70abda81d0
1 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/rootmenu.c
View File

@@ -63,6 +63,7 @@ extern WPreferences wPreferences;
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command);
static WMenu *configureMenu(WScreen * scr, WMPropList * definition, Bool includeGlobals);
typedef struct Shortcut {
struct Shortcut *next;
@@ -575,6 +576,26 @@ static void separateCommand(char *line, char ***file, char **command)
WMFreeArray(array);
}
static WMenu *constructPLMenu(WScreen *screen, char *path)
{
WMPropList *pl = NULL;
WMenu *menu = NULL;
if (!path)
return NULL;
pl = WMReadPropListFromFile(path);
if (!pl)
return NULL;
menu = configureMenu(screen, pl, False);
if (!menu)
return NULL;
menu->on_destroy = removeShortcutsForMenu;
return menu;
}
static void constructMenu(WMenu * menu, WMenuEntry * entry)
{
WMenu *submenu;
@@ -610,6 +631,12 @@ static void constructMenu(WMenu * menu, WMenuEntry * entry)
}
} else {
/* try interpreting path as a proplist file */
submenu = constructPLMenu(menu->frame->screen_ptr, path[0]);
/* if unsuccessful, try it as an old-style file */
if (!submenu) {
i = 0;
while (path[i] != NULL) {
char *tmp;
@@ -673,6 +700,7 @@ static void constructMenu(WMenu * menu, WMenuEntry * entry)
submenu = NULL;
}
}
}
if (submenu) {
wMenuEntryRemoveCascade(menu, entry);
@@ -1473,7 +1501,7 @@ static WMenu *makeDefaultMenu(WScreen * scr)
*
*----------------------------------------------------------------------
*/
static WMenu *configureMenu(WScreen * scr, WMPropList * definition)
static WMenu *configureMenu(WScreen * scr, WMPropList * definition, Bool includeGlobals)
{
WMenu *menu = NULL;
WMPropList *elem;
@@ -1552,7 +1580,7 @@ static WMenu *configureMenu(WScreen * scr, WMPropList * definition)
menu->on_destroy = removeShortcutsForMenu;
#ifdef GLOBAL_SUBMENU_FILE
{
if (includeGlobals) {
WMenu *submenu;
WMenuEntry *mentry;
@@ -1583,7 +1611,7 @@ static WMenu *configureMenu(WScreen * scr, WMPropList * definition)
WMenuEntry *mentry;
/* submenu */
submenu = configureMenu(scr, elem);
submenu = configureMenu(scr, elem, True);
if (submenu) {
mentry = wMenuAddCallback(menu, submenu->frame->title, NULL, NULL);
wMenuEntrySetCascade(menu, mentry, submenu);
@@ -1678,14 +1706,14 @@ void OpenRootMenu(WScreen * scr, int x, int y, int keyboard)
if (definition) {
if (WMIsPLArray(definition)) {
if (!scr->root_menu || WDRootMenu->timestamp > scr->root_menu->timestamp) {
menu = configureMenu(scr, definition);
menu = configureMenu(scr, definition, True);
if (menu)
menu->timestamp = WDRootMenu->timestamp;
} else
menu = NULL;
} else {
menu = configureMenu(scr, definition);
menu = configureMenu(scr, definition, True);
}
}