aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu/menu.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-02-19 14:08:50 -0800
committerH. Peter Anvin <hpa@zytor.com>2008-02-19 16:51:24 -0800
commit765e685a1bb57eca29df1382501b6c96b478f87f (patch)
tree91e7ba30eac358ef238818b3a3fa9ddef7e6ed2c /com32/menu/menu.h
parent97880e0237a80d76453d722aaa2912417a037f1b (diff)
downloadsyslinux.git-765e685a1bb57eca29df1382501b6c96b478f87f.tar.gz
syslinux.git-765e685a1bb57eca29df1382501b6c96b478f87f.tar.xz
syslinux.git-765e685a1bb57eca29df1382501b6c96b478f87f.zip
Simple menu: use refstrings consistently; now works again
Switch consistently to using refstrings; we now seem to have original functionality back.
Diffstat (limited to 'com32/menu/menu.h')
-rw-r--r--com32/menu/menu.h25
1 files changed, 10 insertions, 15 deletions
diff --git a/com32/menu/menu.h b/com32/menu/menu.h
index bf014b0b..7f452a14 100644
--- a/com32/menu/menu.h
+++ b/com32/menu/menu.h
@@ -44,11 +44,11 @@ enum menu_action {
};
struct menu_entry {
- char *displayname;
- char *label;
- char *passwd;
+ const char *displayname;
+ const char *label;
+ const char *passwd;
char *helptext;
- char *cmdline;
+ const char *cmdline;
struct menu *submenu;
struct menu_entry *next; /* Linked list of all labels across menus */
enum menu_action action;
@@ -115,8 +115,6 @@ struct messages {
const char *defmsg; /* Default message text */
};
-extern const struct messages messages[MSG_COUNT];
-
struct menu_parameter {
const char *name;
int value;
@@ -133,7 +131,7 @@ struct menu {
struct menu *next; /* Linked list of all menus */
const char *label; /* Goto label for this menu */
struct menu *parent;
- int parent_entry;
+ struct menu_entry *parent_entry; /* Entry for self in parent */
struct menu_entry *menu_entries;
struct menu_entry *menu_hotkeys[256];
@@ -146,14 +144,11 @@ struct menu {
int defentry;
int allowedit;
int timeout;
- int shiftkey;
- bool hiddenmenu;
- long long totaltimeout;
-
- char *ontimeout;
- char *onerror;
- char *menu_master_passwd;
- char *menu_background;
+
+ const char *ontimeout;
+ const char *onerror;
+ const char *menu_master_passwd;
+ const char *menu_background;
struct color_table *color_table;