aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-03 14:16:17 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-03 14:16:17 -0700
commit6e64433a5db40467759ca858d8f998d52d921b5f (patch)
tree7fbf0d45f647465fb34894c2c4c9d0367cdcf091
parentbe67a5d4fa9705b36fe36bebed708a0a2e95946b (diff)
downloadsyslinux-6e64433a5db40467759ca858d8f998d52d921b5f.tar.gz
syslinux-6e64433a5db40467759ca858d8f998d52d921b5f.tar.xz
syslinux-6e64433a5db40467759ca858d8f998d52d921b5f.zip
cmenu: use getscreensize to access number of rows/columns
The simple menu system already uses getscreensize. Another step towards unification. Impact: exported getnumcols and getnumrows are now deprecated. Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
-rw-r--r--com32/cmenu/adv_menu.tpl21
-rw-r--r--com32/cmenu/complex.c25
-rw-r--r--com32/cmenu/libmenu/com32io.h10
-rw-r--r--com32/cmenu/libmenu/help.c57
-rw-r--r--com32/cmenu/libmenu/menu.c1264
-rw-r--r--com32/cmenu/libmenu/menu.h5
6 files changed, 702 insertions, 680 deletions
diff --git a/com32/cmenu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl
index 7e738cc5..22932fcb 100644
--- a/com32/cmenu/adv_menu.tpl
+++ b/com32/cmenu/adv_menu.tpl
@@ -40,6 +40,7 @@ modify this template to suit your needs
#include "com32io.h"
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
#define MAX_CMD_LINE_LENGTH 514
@@ -194,7 +195,13 @@ TIMEOUTCODE ontotaltimeout()
void keys_handler(t_menuitem *mi,unsigned int scancode)
{
- char nc;
+ int nc, nr;
+
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
if ( ((scancode >> 8) == F1) && (mi->helpid != 0xFFFF) ) { // If scancode of F1 and non-trivial helpid
runhelpsystem(mi->helpid);
@@ -203,9 +210,8 @@ void keys_handler(t_menuitem *mi,unsigned int scancode)
// If user hit TAB, and item is an "executable" item
// and user has privileges to edit it, edit it in place.
if (((scancode & 0xFF) == 0x09) && (mi->action == OPT_RUN) &&
- (EDIT_ROW < getnumrows()) && (EDIT_ROW > 0) &&
+ (EDIT_ROW < nr) && (EDIT_ROW > 0) &&
(isallowed(username,"editcmd") || isallowed(username,"root"))) {
- nc = getnumcols();
// User typed TAB and has permissions to edit command line
gotoxy(EDIT_ROW,1);
csprint("Command line:",0x07);
@@ -220,14 +226,19 @@ t_handler_return login_handler(t_menuitem *mi)
(void)mi; // Unused
char pwd[40];
char login[40];
- char nc;
+ int nc, nr;
t_handler_return rv;
rv = ACTION_INVALID;
if (PWD_ROW < 0) return rv; // No need to authenticate
if (mi->item == loginstr) { /* User wants to login */
- nc = getnumcols();
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
+
gotoxy(PWD_ROW,1);
csprint("Enter Username: ",0x07);
getstring(login, sizeof username);
diff --git a/com32/cmenu/complex.c b/com32/cmenu/complex.c
index fb68a319..4bd74d54 100644
--- a/com32/cmenu/complex.c
+++ b/com32/cmenu/complex.c
@@ -21,6 +21,7 @@
#include "des.h"
#include <stdlib.h>
#include <stdio.h>
+#include <unistd.h>
/* Global variables */
char infoline[160];
@@ -67,7 +68,7 @@ TIMEOUTCODE ontimeout()
void keys_handler(t_menuitem * mi, unsigned int scancode)
{
- char nc;
+ int nc, nr;
if ((scancode >> 8) == F1) { // If scancode of F1
runhelpsystem(mi->helpid);
@@ -76,7 +77,11 @@ void keys_handler(t_menuitem * mi, unsigned int scancode)
// and user has privileges to edit it, edit it in place.
if (((scancode & 0xFF) == 0x09) && (mi->action == OPT_RUN) &&
(isallowed(username, "editcmd") || isallowed(username, "root"))) {
- nc = getnumcols();
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
// User typed TAB and has permissions to edit command line
gotoxy(EDITPROMPT, 1);
csprint("Command line:", 0x07);
@@ -91,11 +96,15 @@ t_handler_return login_handler(t_menuitem * mi)
(void)mi; // Unused
char pwd[40];
char login[40];
- char nc;
+ int nc, nr;
t_handler_return rv;
if (mi->item == loginstr) { /* User wants to login */
- nc = getnumcols();
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
gotoxy(PWDPROMPT, 1);
csprint("Enter Username: ", 0x07);
getstring(login, sizeof username);
@@ -133,10 +142,14 @@ t_handler_return login_handler(t_menuitem * mi)
void msys_handler(t_menusystem * ms, t_menuitem * mi)
{
- char nc;
+ int nc, nr;
void *v;
- nc = getnumcols(); // Get number of columns
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
gotoxy(PWDLINE, PWDCOLUMN);
csprint("User: ", PWDATTR);
cprint(ms->fillchar, ms->fillattr, sizeof username);
diff --git a/com32/cmenu/libmenu/com32io.h b/com32/cmenu/libmenu/com32io.h
index b23aeeeb..91324d77 100644
--- a/com32/cmenu/libmenu/com32io.h
+++ b/com32/cmenu/libmenu/com32io.h
@@ -93,16 +93,6 @@ static inline unsigned char readbiosb(unsigned int ofs)
return *((unsigned char *)MK_PTR(0, ofs));
}
-static inline char getnumrows()
-{
- return 25;
-}
-
-static inline char getnumcols(void)
-{
- return 80;
-}
-
static inline char getshiftflags(void)
{
return readbiosb(0x417);
diff --git a/com32/cmenu/libmenu/help.c b/com32/cmenu/libmenu/help.c
index b0011c0d..22f6f3dc 100644
--- a/com32/cmenu/libmenu/help.c
+++ b/com32/cmenu/libmenu/help.c
@@ -16,10 +16,11 @@
#include "com32io.h"
#include <syslinux/loadfile.h> // to read entire file into memory
+int nc, nr; // Number of columns/rows of the screen
char helpbasedir[HELPDIRLEN]; // name of help directory limited to HELPDIRLEN
// Find the occurence of the count'th \n in buffer (or NULL) if not found
-char *findline(char *buffer, int count)
+static char *findline(char *buffer, int count)
{
int ctr;
char *p = buffer - 1;
@@ -35,7 +36,7 @@ char *findline(char *buffer, int count)
}
// return the number of lines in buffer
-int countlines(char *buffer)
+static int countlines(char *buffer)
{
int ans;
const char *p;
@@ -50,14 +51,14 @@ int countlines(char *buffer)
}
// Print numlines of text starting from buf
-void printtext(char *buf, int from)
+static void printtext(char *buf, int from)
{
char *p, *f;
- char right, bot, nlines;
+ int right, bot, nlines;
// clear window to print
- right = getnumcols() - HELP_RIGHT_MARGIN;
- bot = getnumrows() - HELP_BOTTOM_MARGIN;
+ right = nc - HELP_RIGHT_MARGIN;
+ bot = nr - HELP_BOTTOM_MARGIN;
nlines = bot - HELP_BODY_ROW + 1;
scrollupwindow(HELP_BODY_ROW, HELP_LEFT_MARGIN, bot, right, 0x07, nlines);
@@ -77,7 +78,7 @@ void printtext(char *buf, int from)
void showhelp(const char *filename)
{
- char nc, nr, ph;
+ char ph;
char *title, *text;
union {
char *buffer;
@@ -89,38 +90,25 @@ void showhelp(const char *filename)
char scan;
int rv, numlines, curr_line;
- nc = getnumcols();
- nr = getnumrows();
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
ph = nr - HELP_BOTTOM_MARGIN - HELP_BODY_ROW - 1;
cls();
drawbox(0, 0, nr, nc - 1, 0x07);
drawhorizline(2, 0, nc - 1, 0x07, 0); // dumb==0
if (filename == NULL) { // print file contents
- gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN);
- csprint("Filename not given", 0x07);
- while (1) {
- inputc(&scan);
- if (scan == ESCAPE)
- break;
- }
- cls();
- return;
+ strcpy(line, "Filename not given");
+ goto puke;
}
rv = loadfile(filename, (void **)&buf.vbuf, &size); // load entire file into memory
if (rv < 0) { // Error reading file or no such file
- sprintf(line, "Error reading file or file not found\n file=%s",
- filename);
- gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN);
- csprint(line, 0x07);
- while (1) {
- inputc(&scan);
- if (scan == ESCAPE)
- break;
- }
- cls();
- return;
+ sprintf(line, "Error reading file or file not found\n file=%s", filename);
+ goto puke;
}
title = buf.buffer;
@@ -176,8 +164,19 @@ void showhelp(const char *filename)
if (curr_line < 0)
curr_line = 0;
}
+out:
cls();
return;
+
+puke:
+ gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN);
+ csprint(line, 0x07);
+ while (1) {
+ inputc(&scan);
+ if (scan == ESCAPE)
+ break;
+ }
+ goto out;
}
void runhelp(const char *filename)
diff --git a/com32/cmenu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c
index b60e7b7a..f437520e 100644
--- a/com32/cmenu/libmenu/menu.c
+++ b/com32/cmenu/libmenu/menu.c
@@ -16,7 +16,7 @@
#include <console.h>
// Local Variables
-static pt_menusystem ms; // Pointer to the menusystem
+static pt_menusystem ms; // Pointer to the menusystem
char TITLESTR[] =
"COMBOOT Menu System for SYSLINUX developed by Murali Krishnan Ganapathy";
char TITLELONG[] = " TITLE too long ";
@@ -48,37 +48,37 @@ char getch(char *scan)
// Wait until keypress if no handler specified
if ((ms->ontimeout == NULL) && (ms->ontotaltimeout == NULL))
- return inputc(scan);
+ return inputc(scan);
th = ms->ontimeout;
- while (1) // Forever do
+ while (1) // Forever do
{
- for (i = 0; i < ms->tm_numsteps; i++) {
- if (checkkbdbuf())
- return inputc(scan);
- sleep(ms->tm_stepsize);
- if ((ms->tm_total_timeout == 0) || (ms->ontotaltimeout == NULL))
- continue; // Dont bother with calculations if no handler
- ms->tm_sofar_timeout += ms->tm_stepsize;
- if (ms->tm_sofar_timeout >= ms->tm_total_timeout) {
- th = ms->ontotaltimeout;
- ms->tm_sofar_timeout = 0;
- break; // Get out of the for loop
- }
- }
- if (!th)
- continue; // no handler dont call
- c = th();
- switch (c) {
- case CODE_ENTER: // Pretend user hit enter
- *scan = ENTERA;
- return '\015'; // \015 octal = 13
- case CODE_ESCAPE: // Pretend user hit escape
- *scan = ESCAPE;
- return '\033'; // \033 octal = 27
- default:
- break;
- }
+ for (i = 0; i < ms->tm_numsteps; i++) {
+ if (checkkbdbuf())
+ return inputc(scan);
+ sleep(ms->tm_stepsize);
+ if ((ms->tm_total_timeout == 0) || (ms->ontotaltimeout == NULL))
+ continue; // Dont bother with calculations if no handler
+ ms->tm_sofar_timeout += ms->tm_stepsize;
+ if (ms->tm_sofar_timeout >= ms->tm_total_timeout) {
+ th = ms->ontotaltimeout;
+ ms->tm_sofar_timeout = 0;
+ break; // Get out of the for loop
+ }
+ }
+ if (!th)
+ continue; // no handler dont call
+ c = th();
+ switch (c) {
+ case CODE_ENTER: // Pretend user hit enter
+ *scan = ENTERA;
+ return '\015'; // \015 octal = 13
+ case CODE_ESCAPE: // Pretend user hit escape
+ *scan = ESCAPE;
+ return '\033'; // \033 octal = 27
+ default:
+ break;
+ }
}
return 0;
}
@@ -90,23 +90,23 @@ char getch(char *scan)
*/
void printmenuitem(const char *str, uchar * attr)
{
- int hlite = NOHLITE; // Initially no highlighting
-
- while (*str) {
- switch (*str) {
- case BELL: // No Bell Char
- break;
- case ENABLEHLITE: // Switch on highlighting
- hlite = HLITE;
- break;
- case DISABLEHLITE: // Turn off highlighting
- hlite = NOHLITE;
- break;
- default:
- putch(*str, attr[hlite]);
- }
- str++;
- }
+ int hlite = NOHLITE; // Initially no highlighting
+
+ while (*str) {
+ switch (*str) {
+ case BELL: // No Bell Char
+ break;
+ case ENABLEHLITE: // Switch on highlighting
+ hlite = HLITE;
+ break;
+ case DISABLEHLITE: // Turn off highlighting
+ hlite = NOHLITE;
+ break;
+ default:
+ putch(*str, attr[hlite]);
+ }
+ str++;
+ }
}
int find_shortcut(pt_menu menu, uchar shortcut, int index)
@@ -117,246 +117,246 @@ int find_shortcut(pt_menu menu, uchar shortcut, int index)
// Garbage in garbage out
if ((index < 0) || (index >= menu->numitems))
- return index;
+ return index;
ans = index + 1;
// Go till end of menu
while (ans < menu->numitems) {
- mi = menu->items[ans];
- if ((mi->action == OPT_INVISIBLE) || (mi->action == OPT_SEP)
- || (mi->shortcut != shortcut))
- ans++;
- else
- return ans;
+ mi = menu->items[ans];
+ if ((mi->action == OPT_INVISIBLE) || (mi->action == OPT_SEP)
+ || (mi->shortcut != shortcut))
+ ans++;
+ else
+ return ans;
}
// Start at the beginning and try again
ans = 0;
while (ans < index) {
- mi = menu->items[ans];
- if ((mi->action == OPT_INVISIBLE) || (mi->action == OPT_SEP)
- || (mi->shortcut != shortcut))
- ans++;
- else
- return ans;
+ mi = menu->items[ans];
+ if ((mi->action == OPT_INVISIBLE) || (mi->action == OPT_SEP)
+ || (mi->shortcut != shortcut))
+ ans++;
+ else
+ return ans;
}
- return index; // Sorry not found
+ return index; // Sorry not found
}
// print the menu starting from FIRST
// will print a maximum of menu->menuheight items
void printmenu(pt_menu menu, int curr, uchar top, uchar left, uchar first)
{
- int x, row; // x = index, row = position from top
+ int x, row; // x = index, row = position from top
int numitems, menuwidth;
- char fchar[6], lchar[6]; // The first and last char in for each entry
- const char *str; // and inbetween the item or a seperator is printed
- char sep[MENULEN]; // Separator (OPT_SEP)
- uchar *attr; // attribute attr
+ char fchar[6], lchar[6]; // The first and last char in for each entry
+ const char *str; // and inbetween the item or a seperator is printed
+ char sep[MENULEN]; // Separator (OPT_SEP)
+ uchar *attr; // attribute attr
pt_menuitem ci;
numitems = calc_visible(menu, first);
if (numitems > menu->menuheight)
- numitems = menu->menuheight;
+ numitems = menu->menuheight;
menuwidth = menu->menuwidth + 3;
clearwindow(top, left - 2, top + numitems + 1, left + menuwidth + 1,
- ms->fillchar, ms->shadowattr);
+ ms->fillchar, ms->shadowattr);
drawbox(top - 1, left - 3, top + numitems, left + menuwidth,
- ms->normalattr[NOHLITE]);
+ ms->normalattr[NOHLITE]);
// Menu title
x = (menuwidth - strlen(menu->title) - 1) >> 1;
gotoxy(top - 1, left + x);
printmenuitem(menu->title, ms->normalattr);
- row = -1; // 1 less than inital value of x
+ row = -1; // 1 less than inital value of x
for (x = first; x < menu->numitems; x++) {
- ci = menu->items[x];
- if (ci->action == OPT_INVISIBLE)
- continue;
- row++;
- if (row >= numitems)
- break; // Already have enough number of items
- // Setup the defaults now
- lchar[0] = fchar[0] = ' ';
- lchar[1] = fchar[1] = '\0'; // fchar and lchar are just spaces
- str = ci->item; // Pointer to item string
- attr = (x == curr ? ms->reverseattr : ms->normalattr); // Normal attributes
- switch (ci->action) // set up attr,str,fchar,lchar for everything
- {
- case OPT_INACTIVE:
- attr = (x == curr ? ms->revinactattr : ms->inactattr);
- break;
- case OPT_SUBMENU:
- lchar[0] = '>';
- lchar[1] = 0;
- break;
- case OPT_RADIOMENU:
- lchar[0] = RADIOMENUCHAR;
- lchar[1] = 0;
- break;
- case OPT_CHECKBOX:
- lchar[0] = (ci->itemdata.checked ? CHECKED : UNCHECKED);
- lchar[1] = 0;
- break;
- case OPT_SEP:
- fchar[0] = '\b';
- fchar[1] = SO;
- fchar[2] = LEFT_MIDDLE_BORDER;
- fchar[3] = MIDDLE_BORDER;
- fchar[4] = MIDDLE_BORDER;
- fchar[5] = 0;
- memset(sep, MIDDLE_BORDER, menuwidth);
- sep[menuwidth - 1] = 0;
- str = sep;
- lchar[0] = MIDDLE_BORDER;
- lchar[1] = RIGHT_MIDDLE_BORDER;
- lchar[2] = SI;
- lchar[3] = 0;
- break;
- case OPT_EXITMENU:
- fchar[0] = '<';
- fchar[1] = 0;
- break;
- default: // Just to keep the compiler happy
- break;
- }
- gotoxy(top + row, left - 2);
- cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2); // Wipe area with spaces
- gotoxy(top + row, left - 2);
- csprint(fchar, attr[NOHLITE]); // Print first part
- gotoxy(top + row, left);
- printmenuitem(str, attr); // Print main part
- gotoxy(top + row, left + menuwidth - 1); // Last char if any
- csprint(lchar, attr[NOHLITE]); // Print last part
+ ci = menu->items[x];
+ if (ci->action == OPT_INVISIBLE)
+ continue;
+ row++;
+ if (row >= numitems)
+ break; // Already have enough number of items
+ // Setup the defaults now
+ lchar[0] = fchar[0] = ' ';
+ lchar[1] = fchar[1] = '\0'; // fchar and lchar are just spaces
+ str = ci->item; // Pointer to item string
+ attr = (x == curr ? ms->reverseattr : ms->normalattr); // Normal attributes
+ switch (ci->action) // set up attr,str,fchar,lchar for everything
+ {
+ case OPT_INACTIVE:
+ attr = (x == curr ? ms->revinactattr : ms->inactattr);
+ break;
+ case OPT_SUBMENU:
+ lchar[0] = '>';
+ lchar[1] = 0;
+ break;
+ case OPT_RADIOMENU:
+ lchar[0] = RADIOMENUCHAR;
+ lchar[1] = 0;
+ break;
+ case OPT_CHECKBOX:
+ lchar[0] = (ci->itemdata.checked ? CHECKED : UNCHECKED);
+ lchar[1] = 0;
+ break;
+ case OPT_SEP:
+ fchar[0] = '\b';
+ fchar[1] = SO;
+ fchar[2] = LEFT_MIDDLE_BORDER;
+ fchar[3] = MIDDLE_BORDER;
+ fchar[4] = MIDDLE_BORDER;
+ fchar[5] = 0;
+ memset(sep, MIDDLE_BORDER, menuwidth);
+ sep[menuwidth - 1] = 0;
+ str = sep;
+ lchar[0] = MIDDLE_BORDER;
+ lchar[1] = RIGHT_MIDDLE_BORDER;
+ lchar[2] = SI;
+ lchar[3] = 0;
+ break;
+ case OPT_EXITMENU:
+ fchar[0] = '<';
+ fchar[1] = 0;
+ break;
+ default: // Just to keep the compiler happy
+ break;
+ }
+ gotoxy(top + row, left - 2);
+ cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2); // Wipe area with spaces
+ gotoxy(top + row, left - 2);
+ csprint(fchar, attr[NOHLITE]); // Print first part
+ gotoxy(top + row, left);
+ printmenuitem(str, attr); // Print main part
+ gotoxy(top + row, left + menuwidth - 1); // Last char if any
+ csprint(lchar, attr[NOHLITE]); // Print last part
}
// Check if we need to MOREABOVE and MOREBELOW to be added
// reuse x
row = 0;
- x = next_visible_sep(menu, 0); // First item
- if (!isvisible(menu, first, x)) // There is more above
+ x = next_visible_sep(menu, 0); // First item
+ if (!isvisible(menu, first, x)) // There is more above
{
- row = 1;
- gotoxy(top, left + menuwidth);
- cprint(MOREABOVE, ms->normalattr[NOHLITE], 1);
+ row = 1;
+ gotoxy(top, left + menuwidth);
+ cprint(MOREABOVE, ms->normalattr[NOHLITE], 1);
}
- x = prev_visible_sep(menu, menu->numitems); // last item
- if (!isvisible(menu, first, x)) // There is more above
+ x = prev_visible_sep(menu, menu->numitems); // last item
+ if (!isvisible(menu, first, x)) // There is more above
{
- row = 1;
- gotoxy(top + numitems - 1, left + menuwidth);
- cprint(MOREBELOW, ms->normalattr[NOHLITE], 1);
+ row = 1;
+ gotoxy(top + numitems - 1, left + menuwidth);
+ cprint(MOREBELOW, ms->normalattr[NOHLITE], 1);
}
// Add a scroll box
x = ((numitems - 1) * curr) / (menu->numitems);
if ((x > 0) && (row == 1)) {
- gotoxy(top + x, left + menuwidth);
- cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1);
+ gotoxy(top + x, left + menuwidth);
+ cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1);
}
if (ms->handler)
- ms->handler(ms, menu->items[curr]);
+ ms->handler(ms, menu->items[curr]);
}
// Difference between this and regular menu, is that only
// OPT_INVISIBLE, OPT_SEP are honoured
void printradiomenu(pt_menu menu, int curr, uchar top, uchar left, int first)
{
- int x, row; // x = index, row = position from top
+ int x, row; // x = index, row = position from top
int numitems, menuwidth;
- char fchar[5], lchar[5]; // The first and last char in for each entry
- const char *str; // and inbetween the item or a seperator is printed
- uchar *attr; // all in the attribute attr
- char sep[MENULEN]; // and inbetween the item or a seperator is printed
+ char fchar[5], lchar[5]; // The first and last char in for each entry
+ const char *str; // and inbetween the item or a seperator is printed
+ uchar *attr; // all in the attribute attr
+ char sep[MENULEN]; // and inbetween the item or a seperator is printed
pt_menuitem ci;
numitems = calc_visible(menu, first);
if (numitems > menu->menuheight)
- numitems = menu->menuheight;
+ numitems = menu->menuheight;
menuwidth = menu->menuwidth + 3;
clearwindow(top, left - 2, top + numitems + 1, left + menuwidth + 1,
- ms->fillchar, ms->shadowattr);
+ ms->fillchar, ms->shadowattr);
drawbox(top - 1, left - 3, top + numitems, left + menuwidth,
- ms->normalattr[NOHLITE]);
- memset(sep, ms->box_horiz, menuwidth); // String containing the seperator string
+ ms->normalattr[NOHLITE]);
+ memset(sep, ms->box_horiz, menuwidth); // String containing the seperator string
sep[menuwidth - 1] = 0;
// Menu title
x = (menuwidth - strlen(menu->title) - 1) >> 1;
gotoxy(top - 1, left + x);
printmenuitem(menu->title, ms->normalattr);
- row = -1; // 1 less than inital value of x
+ row = -1; // 1 less than inital value of x
for (x = first; x < menu->numitems; x++) {
- ci = menu->items[x];
- if (ci->action == OPT_INVISIBLE)
- continue;
- row++;
- if (row > numitems)
- break;
- // Setup the defaults now
- fchar[0] = RADIOUNSEL;
- fchar[1] = '\0'; // Unselected ( )
- lchar[0] = '\0'; // Nothing special after
- str = ci->item; // Pointer to item string
- attr = ms->normalattr; // Always same attribute
- fchar[0] = (x == curr ? RADIOSEL : RADIOUNSEL);
- switch (ci->action) // set up attr,str,fchar,lchar for everything
- {
- case OPT_INACTIVE:
- attr = ms->inactattr;
- break;
- case OPT_SEP:
- fchar[0] = '\b';
- fchar[1] = ms->box_ltrt;
- fchar[2] = ms->box_horiz;
- fchar[3] = ms->box_horiz;
- fchar[4] = 0;
- lchar[0] = ms->box_horiz;
- lchar[1] = ms->box_rtlt;
- lchar[3] = 0;
- str = sep;
- break;
- default: // To keep the compiler happy
- break;
- }
- gotoxy(top + row, left - 2);
- cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2); // Wipe area with spaces
- gotoxy(top + row, left - 2);
- csprint(fchar, attr[NOHLITE]); // Print first part
- gotoxy(top + row, left);
- printmenuitem(str, attr); // Print main part
- gotoxy(top + row, left + menuwidth - 1); // Last char if any
- csprint(lchar, attr[NOHLITE]); // Print last part
+ ci = menu->items[x];
+ if (ci->action == OPT_INVISIBLE)
+ continue;
+ row++;
+ if (row > numitems)
+ break;
+ // Setup the defaults now
+ fchar[0] = RADIOUNSEL;
+ fchar[1] = '\0'; // Unselected ( )
+ lchar[0] = '\0'; // Nothing special after
+ str = ci->item; // Pointer to item string
+ attr = ms->normalattr; // Always same attribute
+ fchar[0] = (x == curr ? RADIOSEL : RADIOUNSEL);
+ switch (ci->action) // set up attr,str,fchar,lchar for everything
+ {
+ case OPT_INACTIVE:
+ attr = ms->inactattr;
+ break;
+ case OPT_SEP:
+ fchar[0] = '\b';
+ fchar[1] = ms->box_ltrt;
+ fchar[2] = ms->box_horiz;
+ fchar[3] = ms->box_horiz;
+ fchar[4] = 0;
+ lchar[0] = ms->box_horiz;
+ lchar[1] = ms->box_rtlt;
+ lchar[3] = 0;
+ str = sep;
+ break;
+ default: // To keep the compiler happy
+ break;
+ }
+ gotoxy(top + row, left - 2);
+ cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2); // Wipe area with spaces
+ gotoxy(top + row, left - 2);
+ csprint(fchar, attr[NOHLITE]); // Print first part
+ gotoxy(top + row, left);
+ printmenuitem(str, attr); // Print main part
+ gotoxy(top + row, left + menuwidth - 1); // Last char if any
+ csprint(lchar, attr[NOHLITE]); // Print last part
}
// Check if we need to MOREABOVE and MOREBELOW to be added
// reuse x
row = 0;
- x = next_visible_sep(menu, 0); // First item
- if (!isvisible(menu, first, x)) // There is more above
+ x = next_visible_sep(menu, 0); // First item
+ if (!isvisible(menu, first, x)) // There is more above
{
- row = 1;
- gotoxy(top, left + menuwidth);
- cprint(MOREABOVE, ms->normalattr[NOHLITE], 1);
+ row = 1;
+ gotoxy(top, left + menuwidth);
+ cprint(MOREABOVE, ms->normalattr[NOHLITE], 1);
}
- x = prev_visible_sep(menu, menu->numitems); // last item
- if (!isvisible(menu, first, x)) // There is more above
+ x = prev_visible_sep(menu, menu->numitems); // last item
+ if (!isvisible(menu, first, x)) // There is more above
{
- row = 1;
- gotoxy(top + numitems - 1, left + menuwidth);
- cprint(MOREBELOW, ms->normalattr[NOHLITE], 1);
+ row = 1;
+ gotoxy(top + numitems - 1, left + menuwidth);
+ cprint(MOREBELOW, ms->normalattr[NOHLITE], 1);
}
// Add a scroll box
x = ((numitems - 1) * curr) / (menu->numitems);
if ((x > 0) && (row == 1)) {
- gotoxy(top + x, left + menuwidth);
- cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1);
+ gotoxy(top + x, left + menuwidth);
+ cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1);
}
if (ms->handler)
- ms->handler(ms, menu->items[curr]);
+ ms->handler(ms, menu->items[curr]);
}
void cleanupmenu(pt_menu menu, uchar top, uchar left, int numitems)
{
if (numitems > menu->menuheight)
- numitems = menu->menuheight;
- clearwindow(top, left - 2, top + numitems + 1, left + menu->menuwidth + 4, ms->fillchar, ms->fillattr); // Clear the shadow
- clearwindow(top - 1, left - 3, top + numitems, left + menu->menuwidth + 3, ms->fillchar, ms->fillattr); // main window
+ numitems = menu->menuheight;
+ clearwindow(top, left - 2, top + numitems + 1, left + menu->menuwidth + 4, ms->fillchar, ms->fillattr); // Clear the shadow
+ clearwindow(top - 1, left - 3, top + numitems, left + menu->menuwidth + 3, ms->fillchar, ms->fillattr); // main window
}
/* Handle a radio menu */
@@ -366,7 +366,7 @@ pt_menuitem getradiooption(pt_menu menu, uchar top, uchar left, uchar startopt)
int curr, i, first, tmp;
uchar asc, scan;
uchar numitems;
- pt_menuitem ci; // Current item
+ pt_menuitem ci; // Current item
numitems = calc_visible(menu, 0);
// Setup status line
@@ -381,77 +381,77 @@ pt_menuitem getradiooption(pt_menu menu, uchar top, uchar left, uchar startopt)
gotoxy(ms->minrow + ms->statline, ms->mincol);
printmenuitem(menu->items[curr]->status, ms->statusattr);
first = calc_first_early(menu, curr);
- while (1) // Forever
+ while (1) // Forever
{
- printradiomenu(menu, curr, top, left, first);
- ci = menu->items[curr];
-
- asc = getch(&scan);
- switch (scan) {
- case HOMEKEY:
- curr = next_visible(menu, 0);
- first = calc_first_early(menu, curr);
- break;
- case ENDKEY:
- curr = prev_visible(menu, numitems - 1);
- first = calc_first_late(menu, curr);
- break;
- case PAGEDN:
- for (i = 0; i < 5; i++)
- curr = next_visible(menu, curr + 1);
- first = calc_first_late(menu, curr);
- break;
- case PAGEUP:
- for (i = 0; i < 5; i++)
- curr = prev_visible(menu, curr - 1);
- first = calc_first_early(menu, curr);
- break;
- case UPARROW:
- curr = prev_visible(menu, curr - 1);
- if (curr < first)
- first = calc_first_early(menu, curr);
- break;
- case DNARROW:
- curr = next_visible(menu, curr + 1);
- if (!isvisible(menu, first, curr))
- first = calc_first_late(menu, curr);
- break;
- case LTARROW:
- case ESCAPE:
- return NULL;
- break;
- case RTARROW:
- case ENTERA:
- case ENTERB:
- if (ci->action == OPT_INACTIVE)
- break;
- if (ci->action == OPT_SEP)
- break;
- return ci;
- break;
- default:
- // Check if this is a shortcut key
- if (((asc >= 'A') && (asc <= 'Z')) ||
- ((asc >= 'a') && (asc <= 'z')) ||
- ((asc >= '0') && (asc <= '9'))) {
- tmp = find_shortcut(menu, asc, curr);
- if ((tmp > curr) && (!isvisible(menu, first, tmp)))
- first = calc_first_late(menu, tmp);
- if (tmp < curr)
- first = calc_first_early(menu, tmp);
- curr = tmp;
- } else {
- if (ms->keys_handler) // Call extra keys handler
- ms->keys_handler(ms, menu->items[curr], (scan << 8) | asc);
- }
- break;
- }
- // Update status line
- gotoxy(ms->minrow + ms->statline, ms->mincol);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
- printmenuitem(menu->items[curr]->status, ms->statusattr);
+ printradiomenu(menu, curr, top, left, first);
+ ci = menu->items[curr];
+
+ asc = getch(&scan);
+ switch (scan) {
+ case HOMEKEY:
+ curr = next_visible(menu, 0);
+ first = calc_first_early(menu, curr);
+ break;
+ case ENDKEY:
+ curr = prev_visible(menu, numitems - 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case PAGEDN:
+ for (i = 0; i < 5; i++)
+ curr = next_visible(menu, curr + 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case PAGEUP:
+ for (i = 0; i < 5; i++)
+ curr = prev_visible(menu, curr - 1);
+ first = calc_first_early(menu, curr);
+ break;
+ case UPARROW:
+ curr = prev_visible(menu, curr - 1);
+ if (curr < first)
+ first = calc_first_early(menu, curr);
+ break;
+ case DNARROW:
+ curr = next_visible(menu, curr + 1);
+ if (!isvisible(menu, first, curr))
+ first = calc_first_late(menu, curr);
+ break;
+ case LTARROW:
+ case ESCAPE:
+ return NULL;
+ break;
+ case RTARROW:
+ case ENTERA:
+ case ENTERB:
+ if (ci->action == OPT_INACTIVE)
+ break;
+ if (ci->action == OPT_SEP)
+ break;
+ return ci;
+ break;
+ default:
+ // Check if this is a shortcut key
+ if (((asc >= 'A') && (asc <= 'Z')) ||
+ ((asc >= 'a') && (asc <= 'z')) ||
+ ((asc >= '0') && (asc <= '9'))) {
+ tmp = find_shortcut(menu, asc, curr);
+ if ((tmp > curr) && (!isvisible(menu, first, tmp)))
+ first = calc_first_late(menu, tmp);
+ if (tmp < curr)
+ first = calc_first_early(menu, tmp);
+ curr = tmp;
+ } else {
+ if (ms->keys_handler) // Call extra keys handler
+ ms->keys_handler(ms, menu->items[curr], (scan << 8) | asc);
+ }
+ break;
}
- return NULL; // Should never come here
+ // Update status line
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
+ cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
+ printmenuitem(menu->items[curr]->status, ms->statusattr);
+ }
+ return NULL; // Should never come here
}
/* Handle one menu */
@@ -461,8 +461,8 @@ pt_menuitem getmenuoption(pt_menu menu, uchar top, uchar left, uchar startopt)
int curr, i, first, tmp;
uchar asc, scan;
uchar numitems;
- pt_menuitem ci; // Current item
- t_handler_return hr; // Return value of handler
+ pt_menuitem ci; // Current item
+ t_handler_return hr; // Return value of handler
numitems = calc_visible(menu, 0);
// Setup status line
@@ -477,124 +477,124 @@ pt_menuitem getmenuoption(pt_menu menu, uchar top, uchar left, uchar startopt)
gotoxy(ms->minrow + ms->statline, ms->mincol);
printmenuitem(menu->items[curr]->status, ms->statusattr);
first = calc_first_early(menu, curr);
- while (1) // Forever
+ while (1) // Forever
{
- printmenu(menu, curr, top, left, first);
- ci = menu->items[curr];
- asc = getch(&scan);
- switch (scan) {
- case HOMEKEY:
- curr = next_visible(menu, 0);
- first = calc_first_early(menu, curr);
- break;
- case ENDKEY:
- curr = prev_visible(menu, numitems - 1);
- first = calc_first_late(menu, curr);
- break;
- case PAGEDN:
- for (i = 0; i < 5; i++)
- curr = next_visible(menu, curr + 1);
- first = calc_first_late(menu, curr);
- break;
- case PAGEUP:
- for (i = 0; i < 5; i++)
- curr = prev_visible(menu, curr - 1);
- first = calc_first_early(menu, curr);
- break;
- case UPARROW:
- curr = prev_visible(menu, curr - 1);
- if (curr < first)
- first = calc_first_early(menu, curr);
- break;
- case DNARROW:
- curr = next_visible(menu, curr + 1);
- if (!isvisible(menu, first, curr))
- first = calc_first_late(menu, curr);
- break;
- case LTARROW:
- case ESCAPE:
- return NULL;
- break;
- case RTARROW:
- case ENTERA:
- case ENTERB:
- if (ci->action == OPT_INACTIVE)
- break;
- if (ci->action == OPT_CHECKBOX)
- break;
- if (ci->action == OPT_SEP)
- break;
- if (ci->action == OPT_EXITMENU)
- return NULL; // As if we hit Esc
- // If we are going into a radio menu, dont call handler, return ci
- if (ci->action == OPT_RADIOMENU)
- return ci;
- if (ci->handler != NULL) // Do we have a handler
- {
- hr = ci->handler(ms, ci);
- if (hr.refresh) // Do we need to refresh
- {
- // Cleanup menu using old number of items
- cleanupmenu(menu, top, left, numitems);
- // Recalculate the number of items
- numitems = calc_visible(menu, 0);
- // Reprint the menu
- printmenu(menu, curr, top, left, first);
- }
- if (hr.valid)
- return ci;
- } else
- return ci;
- break;
- case SPACEKEY:
- if (ci->action != OPT_CHECKBOX)
- break;
- ci->itemdata.checked = !ci->itemdata.checked;
- if (ci->handler != NULL) // Do we have a handler
- {
- hr = ci->handler(ms, ci);
- if (hr.refresh) // Do we need to refresh
- {
- // Cleanup menu using old number of items
- cleanupmenu(menu, top, left, numitems);
- // Recalculate the number of items
- numitems = calc_visible(menu, 0);
- // Reprint the menu
- printmenu(menu, curr, top, left, first);
- }
- }
- break;
- default:
- // Check if this is a shortcut key
- if (((asc >= 'A') && (asc <= 'Z')) ||
- ((asc >= 'a') && (asc <= 'z')) ||
- ((asc >= '0') && (asc <= '9'))) {
- tmp = find_shortcut(menu, asc, curr);
- if ((tmp > curr) && (!isvisible(menu, first, tmp)))
- first = calc_first_late(menu, tmp);
- if (tmp < curr)
- first = calc_first_early(menu, tmp);
- curr = tmp;
- } else {
- if (ms->keys_handler) // Call extra keys handler
- ms->keys_handler(ms, menu->items[curr], (scan << 8) | asc);
- }
- break;
- }
- // Update status line
- /* Erase the previous status */
- gotoxy(ms->minrow + ms->statline, ms->mincol);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
- /* Print the new status */
- gotoxy(ms->minrow + ms->statline, ms->mincol);
- printmenuitem(menu->items[curr]->status, ms->statusattr);
+ printmenu(menu, curr, top, left, first);
+ ci = menu->items[curr];
+ asc = getch(&scan);
+ switch (scan) {
+ case HOMEKEY:
+ curr = next_visible(menu, 0);
+ first = calc_first_early(menu, curr);
+ break;
+ case ENDKEY:
+ curr = prev_visible(menu, numitems - 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case PAGEDN:
+ for (i = 0; i < 5; i++)
+ curr = next_visible(menu, curr + 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case PAGEUP:
+ for (i = 0; i < 5; i++)
+ curr = prev_visible(menu, curr - 1);
+ first = calc_first_early(menu, curr);
+ break;
+ case UPARROW:
+ curr = prev_visible(menu, curr - 1);
+ if (curr < first)
+ first = calc_first_early(menu, curr);
+ break;
+ case DNARROW:
+ curr = next_visible(menu, curr + 1);
+ if (!isvisible(menu, first, curr))
+ first = calc_first_late(menu, curr);
+ break;
+ case LTARROW:
+ case ESCAPE:
+ return NULL;
+ break;
+ case RTARROW:
+ case ENTERA:
+ case ENTERB:
+ if (ci->action == OPT_INACTIVE)
+ break;
+ if (ci->action == OPT_CHECKBOX)
+ break;
+ if (ci->action == OPT_SEP)
+ break;
+ if (ci->action == OPT_EXITMENU)
+ return NULL; // As if we hit Esc
+ // If we are going into a radio menu, dont call handler, return ci
+ if (ci->action == OPT_RADIOMENU)
+ return ci;
+ if (ci->handler != NULL) // Do we have a handler
+ {
+ hr = ci->handler(ms, ci);
+ if (hr.refresh) // Do we need to refresh
+ {
+ // Cleanup menu using old number of items
+ cleanupmenu(menu, top, left, numitems);
+ // Recalculate the number of items
+ numitems = calc_visible(menu, 0);
+ // Reprint the menu
+ printmenu(menu, curr, top, left, first);
+ }
+ if (hr.valid)
+ return ci;
+ } else
+ return ci;
+ break;
+ case SPACEKEY:
+ if (ci->action != OPT_CHECKBOX)
+ break;
+ ci->itemdata.checked = !ci->itemdata.checked;
+ if (ci->handler != NULL) // Do we have a handler
+ {
+ hr = ci->handler(ms, ci);
+ if (hr.refresh) // Do we need to refresh
+ {
+ // Cleanup menu using old number of items
+ cleanupmenu(menu, top, left, numitems);
+ // Recalculate the number of items
+ numitems = calc_visible(menu, 0);
+ // Reprint the menu
+ printmenu(menu, curr, top, left, first);
+ }
+ }
+ break;
+ default:
+ // Check if this is a shortcut key
+ if (((asc >= 'A') && (asc <= 'Z')) ||
+ ((asc >= 'a') && (asc <= 'z')) ||
+ ((asc >= '0') && (asc <= '9'))) {
+ tmp = find_shortcut(menu, asc, curr);
+ if ((tmp > curr) && (!isvisible(menu, first, tmp)))
+ first = calc_first_late(menu, tmp);
+ if (tmp < curr)
+ first = calc_first_early(menu, tmp);
+ curr = tmp;
+ } else {
+ if (ms->keys_handler) // Call extra keys handler
+ ms->keys_handler(ms, menu->items[curr], (scan << 8) | asc);
+ }
+ break;
}
- return NULL; // Should never come here
+ // Update status line
+ /* Erase the previous status */
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
+ cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
+ /* Print the new status */
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
+ printmenuitem(menu->items[curr]->status, ms->statusattr);
+ }
+ return NULL; // Should never come here
}
/* Handle the entire system of menu's. */
pt_menuitem runmenusystem(uchar top, uchar left, pt_menu cmenu, uchar startopt,
- uchar menutype)
+ uchar menutype)
/*
* cmenu
* Which menu should be currently displayed
@@ -614,36 +614,37 @@ pt_menuitem runmenusystem(uchar top, uchar left, pt_menu cmenu, uchar startopt,
uchar row, col;
if (cmenu == NULL)
- return NULL;
+ return NULL;
+
startover:
// Set the menu height
cmenu->menuheight = ms->maxrow - top - 3;
if (cmenu->menuheight > ms->maxmenuheight)
- cmenu->menuheight = ms->maxmenuheight;
+ cmenu->menuheight = ms->maxmenuheight;
if (menutype == NORMALMENU)
- opt = getmenuoption(cmenu, top, left, startopt);
- else // menutype == RADIOMENU
- opt = getradiooption(cmenu, top, left, startopt);
+ opt = getmenuoption(cmenu, top, left, startopt);
+ else // menutype == RADIOMENU
+ opt = getradiooption(cmenu, top, left, startopt);
if (opt == NULL) {
- // User hit Esc
- cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
- return NULL;
+ // User hit Esc
+ cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
+ return NULL;
}
// Are we done with the menu system?
if ((opt->action != OPT_SUBMENU) && (opt->action != OPT_RADIOMENU)) {
- cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
- return opt; // parent cleanup other menus
+ cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
+ return opt; // parent cleanup other menus
}
// Either radiomenu or submenu
// Do we have a valid menu number? The next hack uses the fact that
// itemdata.submenunum = itemdata.radiomenunum (since enum data type)
- if (opt->itemdata.submenunum >= ms->nummenus) // This is Bad....
+ if (opt->itemdata.submenunum >= ms->nummenus) // This is Bad....
{
- gotoxy(12, 12); // Middle of screen
- csprint("ERROR: Invalid submenu requested.", 0x07);
- cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
- return NULL; // Pretend user hit esc
+ gotoxy(12, 12); // Middle of screen
+ csprint("ERROR: Invalid submenu requested.", 0x07);
+ cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
+ return NULL; // Pretend user hit esc
}
// Call recursively for submenu
// Position the submenu below the current item,
@@ -651,32 +652,32 @@ startover:
row = ms->menus[(unsigned int)opt->itemdata.submenunum]->row;
col = ms->menus[(unsigned int)opt->itemdata.submenunum]->col;
if (row == 0xFF)
- row = top + opt->index + 2;
+ row = top + opt->index + 2;
if (col == 0xFF)
- col = left + 3 + (cmenu->menuwidth >> 1);
+ col = left + 3 + (cmenu->menuwidth >> 1);
mt = (opt->action == OPT_SUBMENU ? NORMALMENU : RADIOMENU);
startat = 0;
if ((opt->action == OPT_RADIOMENU) && (opt->data != NULL))
- startat = ((t_menuitem *) opt->data)->index;
+ startat = ((t_menuitem *) opt->data)->index;
choice = runmenusystem(row, col,
- ms->menus[(unsigned int)opt->itemdata.submenunum],
- startat, mt);
+ ms->menus[(unsigned int)opt->itemdata.submenunum],
+ startat, mt);
if (opt->action == OPT_RADIOMENU) {
- if (choice != NULL)
- opt->data = (void *)choice; // store choice in data field
- if (opt->handler != NULL)
- opt->handler(ms, opt);
- choice = NULL; // Pretend user hit esc
+ if (choice != NULL)
+ opt->data = (void *)choice; // store choice in data field
+ if (opt->handler != NULL)
+ opt->handler(ms, opt);
+ choice = NULL; // Pretend user hit esc
}
- if (choice == NULL) // User hit Esc in submenu
+ if (choice == NULL) // User hit Esc in submenu
{
- // Startover
- startopt = opt->index;
- goto startover;
+ // Startover
+ startopt = opt->index;
+ goto startover;
} else {
- cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
- return choice;
+ cleanupmenu(cmenu, top, left, calc_visible(cmenu, 0));
+ return choice;
}
}
@@ -687,11 +688,11 @@ uchar find_menu_num(const char *name)
pt_menu m;
if (name == NULL)
- return (uchar) (-1);
+ return (uchar) (-1);
for (i = 0; i < ms->nummenus; i++) {
- m = ms->menus[i];
- if ((m->name) && (strcmp(m->name, name) == 0))
- return i;
+ m = ms->menus[i];
+ if ((m->name) && (strcmp(m->name, name) == 0))
+ return i;
}
return (uchar) (-1);
}
@@ -707,16 +708,16 @@ void fix_submenus()
i = 0;
for (i = 0; i < ms->nummenus; i++) {
- m = ms->menus[i];
- for (j = 0; j < m->numitems; j++) {
- mi = m->items[j];
- // if item is a submenu and has non-empty non-trivial data string
- if (mi->data && strlen(mi->data) > 0 &&
- ((mi->action == OPT_SUBMENU)
- || (mi->action == OPT_RADIOMENU))) {
- mi->itemdata.submenunum = find_menu_num(mi->data);
- }
- }
+ m = ms->menus[i];
+ for (j = 0; j < m->numitems; j++) {
+ mi = m->items[j];
+ // if item is a submenu and has non-empty non-trivial data string
+ if (mi->data && strlen(mi->data) > 0 &&
+ ((mi->action == OPT_SUBMENU)
+ || (mi->action == OPT_RADIOMENU))) {
+ mi->itemdata.submenunum = find_menu_num(mi->data);
+ }
+ }
}
}
@@ -727,27 +728,27 @@ pt_menuitem showmenus(uchar startmenu)
pt_menuitem rv;
uchar tpos;
- fix_submenus(); // Fix submenu numbers incase nick names were used
+ fix_submenus(); // Fix submenu numbers incase nick names were used
// Setup screen for menusystem
cls();
clearwindow(ms->minrow, ms->mincol, ms->maxrow, ms->maxcol,
- ms->fillchar, ms->fillattr);
- tpos = (ms->numcols - strlen(ms->title) - 1) >> 1; // center it on line
+ ms->fillchar, ms->fillattr);
+ tpos = (ms->numcols - strlen(ms->title) - 1) >> 1; // center it on line
gotoxy(ms->minrow, ms->mincol);
cprint(ms->tfillchar, ms->titleattr, ms->numcols);
gotoxy(ms->minrow, ms->mincol + tpos);
csprint(ms->title, ms->titleattr);
- cursoroff(); // Doesn't seem to work?
+ cursoroff(); // Doesn't seem to work?
// Go, main menu cannot be a radio menu
rv = runmenusystem(ms->minrow + MENUROW, ms->mincol + MENUCOL,
- ms->menus[(unsigned int)startmenu], 0, NORMALMENU);
+ ms->menus[(unsigned int)startmenu], 0, NORMALMENU);
// Hide the garbage we left on the screen
cursoron();
- cls();
+ cls();
// Return user choice
return rv;
@@ -760,17 +761,17 @@ pt_menusystem init_menusystem(const char *title)
ms = NULL;
ms = (pt_menusystem) malloc(sizeof(t_menusystem));
if (ms == NULL)
- return NULL;
+ return NULL;
ms->nummenus = 0;
// Initialise all menu pointers
for (i = 0; i < MAXMENUS; i++)
- ms->menus[i] = NULL;
+ ms->menus[i] = NULL;
ms->title = (char *)malloc(TITLELEN + 1);
if (title == NULL)
- strcpy(ms->title, TITLESTR); // Copy string
+ strcpy(ms->title, TITLESTR); // Copy string
else
- strcpy(ms->title, title);
+ strcpy(ms->title, title);
// Timeout settings
ms->tm_stepsize = TIMEOUTSTEPSIZE;
@@ -800,12 +801,12 @@ pt_menusystem init_menusystem(const char *title)
ms->spacechar = SPACECHAR;
ms->shadowattr = SHADOWATTR;
- ms->menupage = MENUPAGE; // Usually no need to change this at all
+ ms->menupage = MENUPAGE; // Usually no need to change this at all
// Initialise all handlers
ms->handler = NULL;
ms->keys_handler = NULL;
- ms->ontimeout = NULL; // No timeout handler
+ ms->ontimeout = NULL; // No timeout handler
ms->tm_total_timeout = 0;
ms->tm_sofar_timeout = 0;
ms->ontotaltimeout = NULL;
@@ -818,82 +819,85 @@ pt_menusystem init_menusystem(const char *title)
// Figure out the size of the screen we are in now.
// By default we use the whole screen for our menu
+ if (getscreensize(1, &ms->numrows, &ms->numcols)) {
+ /* Unknown screen size? */
+ ms->numcols = 80;
+ ms->numrows = 24;
+ }
ms->minrow = ms->mincol = 0;
- ms->numcols = getnumcols();
- ms->numrows = getnumrows();
ms->maxcol = ms->numcols - 1;
ms->maxrow = ms->numrows - 1;
// How many entries per menu can we display at a time
ms->maxmenuheight = ms->maxrow - ms->minrow - 3;
if (ms->maxmenuheight > MAXMENUHEIGHT)
- ms->maxmenuheight = MAXMENUHEIGHT;
+ ms->maxmenuheight = MAXMENUHEIGHT;
// Set up the look of the box
set_box_type(MENUBOXTYPE);
- openconsole(&dev_stdcon_r, &dev_ansiserial_w);
+ openconsole(&dev_stdcon_r, &dev_ansiserial_w);
return ms;
}
void set_normal_attr(uchar normal, uchar selected, uchar inactivenormal,
- uchar inactiveselected)
+ uchar inactiveselected)
{
if (normal != 0xFF)
- ms->normalattr[0] = normal;
+ ms->normalattr[0] = normal;
if (selected != 0xFF)
- ms->reverseattr[0] = selected;
+ ms->reverseattr[0] = selected;
if (inactivenormal != 0xFF)
- ms->inactattr[0] = inactivenormal;
+ ms->inactattr[0] = inactivenormal;
if (inactiveselected != 0xFF)
- ms->revinactattr[0] = inactiveselected;
+ ms->revinactattr[0] = inactiveselected;
}
void set_normal_hlite(uchar normal, uchar selected, uchar inactivenormal,
- uchar inactiveselected)
+ uchar inactiveselected)
{
if (normal != 0xFF)
- ms->normalattr[1] = normal;
+ ms->normalattr[1] = normal;
if (selected != 0xFF)
- ms->reverseattr[1] = selected;
+ ms->reverseattr[1] = selected;
if (inactivenormal != 0xFF)
- ms->inactattr[1] = inactivenormal;
+ ms->inactattr[1] = inactivenormal;
if (inactiveselected != 0xFF)
- ms->revinactattr[1] = inactiveselected;
+ ms->revinactattr[1] = inactiveselected;
}
void set_status_info(uchar statusattr, uchar statushlite, uchar statline)
{
if (statusattr != 0xFF)
- ms->statusattr[NOHLITE] = statusattr;
+ ms->statusattr[NOHLITE] = statusattr;
if (statushlite != 0xFF)
- ms->statusattr[HLITE] = statushlite;
+ ms->statusattr[HLITE] = statushlite;
// statline is relative to minrow
if (statline >= ms->numrows)
- statline = ms->numrows - 1;
- ms->statline = statline; // relative to ms->minrow, 0 based
+ statline = ms->numrows - 1;
+ ms->statline = statline; // relative to ms->minrow, 0 based
}
void set_title_info(uchar tfillchar, uchar titleattr)
{
if (tfillchar != 0xFF)
- ms->tfillchar = tfillchar;
+ ms->tfillchar = tfillchar;
if (titleattr != 0xFF)
- ms->titleattr = titleattr;
+ ms->titleattr = titleattr;
}
void set_misc_info(uchar fillchar, uchar fillattr, uchar spacechar,
- uchar shadowattr)
+ uchar shadowattr)
{
if (fillchar != 0xFF)
- ms->fillchar = fillchar;
+ ms->fillchar = fillchar;
if (fillattr != 0xFF)
- ms->fillattr = fillattr;
+ ms->fillattr = fillattr;
if (spacechar != 0xFF)
- ms->spacechar = spacechar;
+ ms->spacechar = spacechar;
if (shadowattr != 0xFF)
- ms->shadowattr = shadowattr;
+ ms->shadowattr = shadowattr;
}
void set_box_type(boxtype bt)
@@ -901,7 +905,7 @@ void set_box_type(boxtype bt)
uchar *bxc;
ms->menubt = bt;
bxc = getboxchars(bt);
- ms->box_horiz = bxc[BOX_HORIZ]; // The char used to draw top line
+ ms->box_horiz = bxc[BOX_HORIZ]; // The char used to draw top line
ms->box_ltrt = bxc[BOX_LTRT];
ms->box_rtlt = bxc[BOX_RTLT];
}
@@ -909,22 +913,26 @@ void set_box_type(boxtype bt)
void set_menu_options(uchar maxmenuheight)
{
if (maxmenuheight != 0xFF)
- ms->maxmenuheight = maxmenuheight;
+ ms->maxmenuheight = maxmenuheight;
}
// Set the window which menusystem should use
void set_window_size(uchar top, uchar left, uchar bot, uchar right)
{
+ int nr, nc;
- uchar nr, nc;
if ((top > bot) || (left > right))
- return; // Sorry no change will happen here
- nr = getnumrows();
- nc = getnumcols();
+ return; // Sorry no change will happen here
+
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nr = 80;
+ nc = 24;
+ }
if (bot >= nr)
- bot = nr - 1;
+ bot = nr - 1;
if (right >= nc)
- right = nc - 1;
+ right = nc - 1;
ms->minrow = top;
ms->mincol = left;
ms->maxrow = bot;
@@ -932,7 +940,7 @@ void set_window_size(uchar top, uchar left, uchar bot, uchar right)
ms->numcols = right - left + 1;
ms->numrows = bot - top + 1;
if (ms->statline >= ms->numrows)
- ms->statline = ms->numrows - 1; // Clip statline if need be
+ ms->statline = ms->numrows - 1; // Clip statline if need be
}
void reg_handler(t_handler htype, void *handler)
@@ -940,11 +948,11 @@ void reg_handler(t_handler htype, void *handler)
// If bad value set to default screen handler
switch (htype) {
case HDLR_KEYS:
- ms->keys_handler = (t_keys_handler) handler;
- break;
+ ms->keys_handler = (t_keys_handler) handler;
+ break;
default:
- ms->handler = (t_menusystem_handler) handler;
- break;
+ ms->handler = (t_menusystem_handler) handler;
+ break;
}
}
@@ -952,22 +960,22 @@ void unreg_handler(t_handler htype)
{
switch (htype) {
case HDLR_KEYS:
- ms->keys_handler = NULL;
- break;
+ ms->keys_handler = NULL;
+ break;
default:
- ms->handler = NULL;
- break;
+ ms->handler = NULL;
+ break;
}
}
void reg_ontimeout(t_timeout_handler handler, unsigned int numsteps,
- unsigned int stepsize)
+ unsigned int stepsize)
{
ms->ontimeout = handler;
if (numsteps != 0)
- ms->tm_numsteps = numsteps;
+ ms->tm_numsteps = numsteps;
if (stepsize != 0)
- ms->tm_stepsize = stepsize;
+ ms->tm_stepsize = stepsize;
}
void unreg_ontimeout()
@@ -976,12 +984,12 @@ void unreg_ontimeout()
}
void reg_ontotaltimeout(t_timeout_handler handler,
- unsigned long numcentiseconds)
+ unsigned long numcentiseconds)
{
if (numcentiseconds != 0) {
- ms->ontotaltimeout = handler;
- ms->tm_total_timeout = numcentiseconds * 10; // to convert to milliseconds
- ms->tm_sofar_timeout = 0;
+ ms->ontotaltimeout = handler;
+ ms->tm_total_timeout = numcentiseconds * 10; // to convert to milliseconds
+ ms->tm_sofar_timeout = 0;
}
}
@@ -994,31 +1002,31 @@ int next_visible(pt_menu menu, int index)
{
int ans;
if (index < 0)
- ans = 0;
+ ans = 0;
else if (index >= menu->numitems)
- ans = menu->numitems - 1;
+ ans = menu->numitems - 1;
else
- ans = index;
+ ans = index;
while ((ans < menu->numitems - 1) &&
- ((menu->items[ans]->action == OPT_INVISIBLE) ||
- (menu->items[ans]->action == OPT_SEP)))
- ans++;
+ ((menu->items[ans]->action == OPT_INVISIBLE) ||
+ (menu->items[ans]->action == OPT_SEP)))
+ ans++;
return ans;
}
-int prev_visible(pt_menu menu, int index) // Return index of prev visible
+int prev_visible(pt_menu menu, int index) // Return index of prev visible
{
int ans;
if (index < 0)
- ans = 0;
+ ans = 0;
else if (index >= menu->numitems)
- ans = menu->numitems - 1;
+ ans = menu->numitems - 1;
else
- ans = index;
+ ans = index;
while ((ans > 0) &&
- ((menu->items[ans]->action == OPT_INVISIBLE) ||
- (menu->items[ans]->action == OPT_SEP)))
- ans--;
+ ((menu->items[ans]->action == OPT_INVISIBLE) ||
+ (menu->items[ans]->action == OPT_SEP)))
+ ans--;
return ans;
}
@@ -1026,28 +1034,28 @@ int next_visible_sep(pt_menu menu, int index)
{
int ans;
if (index < 0)
- ans = 0;
+ ans = 0;
else if (index >= menu->numitems)
- ans = menu->numitems - 1;
+ ans = menu->numitems - 1;
else
- ans = index;
+ ans = index;
while ((ans < menu->numitems - 1) &&
- (menu->items[ans]->action == OPT_INVISIBLE))
- ans++;
+ (menu->items[ans]->action == OPT_INVISIBLE))
+ ans++;
return ans;
}
-int prev_visible_sep(pt_menu menu, int index) // Return index of prev visible
+int prev_visible_sep(pt_menu menu, int index) // Return index of prev visible
{
int ans;
if (index < 0)
- ans = 0;
+ ans = 0;
else if (index >= menu->numitems)
- ans = menu->numitems - 1;
+ ans = menu->numitems - 1;
else
- ans = index;
+ ans = index;
while ((ans > 0) && (menu->items[ans]->action == OPT_INVISIBLE))
- ans--;
+ ans--;
return ans;
}
@@ -1056,11 +1064,11 @@ int calc_visible(pt_menu menu, int first)
int ans, i;
if (menu == NULL)
- return 0;
+ return 0;
ans = 0;
for (i = first; i < menu->numitems; i++)
- if (menu->items[i]->action != OPT_INVISIBLE)
- ans++;
+ if (menu->items[i]->action != OPT_INVISIBLE)
+ ans++;
return ans;
}
@@ -1068,9 +1076,9 @@ int calc_visible(pt_menu menu, int first)
int isvisible(pt_menu menu, int first, int curr)
{
if (curr < first)
- return 0;
+ return 0;
return (calc_visible(menu, first) - calc_visible(menu, curr) <
- menu->menuheight);
+ menu->menuheight);
}
// Calculate the first entry to be displayed
@@ -1081,11 +1089,11 @@ int calc_first_late(pt_menu menu, int curr)
nv = calc_visible(menu, 0);
if (nv <= menu->menuheight)
- return 0;
+ return 0;
// Start with curr and go back menu->menuheight times
ans = curr + 1;
for (i = 0; i < menu->menuheight; i++)
- ans = prev_visible_sep(menu, ans - 1);
+ ans = prev_visible_sep(menu, ans - 1);
return ans;
}
@@ -1097,13 +1105,13 @@ int calc_first_early(pt_menu menu, int curr)
nv = calc_visible(menu, 0);
if (nv <= menu->menuheight)
- return 0;
+ return 0;
// Start with curr and go back till >= menu->menuheight
// items are visible
- nv = calc_visible(menu, curr); // Already nv of them are visible
+ nv = calc_visible(menu, curr); // Already nv of them are visible
ans = curr;
for (i = 0; i < menu->menuheight - nv; i++)
- ans = prev_visible_sep(menu, ans - 1);
+ ans = prev_visible_sep(menu, ans - 1);
return ans;
}
@@ -1115,51 +1123,51 @@ uchar add_menu(const char *title, int maxmenusize)
num = ms->nummenus;
if (num >= MAXMENUS)
- return -1;
+ return -1;
m = NULL;
m = (pt_menu) malloc(sizeof(t_menu));
if (m == NULL)
- return -1;
+ return -1;
ms->menus[num] = m;
m->numitems = 0;
m->name = NULL;
m->row = 0xFF;
m->col = 0xFF;
if (maxmenusize < 1)
- m->maxmenusize = MAXMENUSIZE;
+ m->maxmenusize = MAXMENUSIZE;
else
- m->maxmenusize = maxmenusize;
+ m->maxmenusize = maxmenusize;
m->items = (pt_menuitem *) malloc(sizeof(pt_menuitem) * (m->maxmenusize));
for (i = 0; i < m->maxmenusize; i++)
- m->items[i] = NULL;
+ m->items[i] = NULL;
m->title = (char *)malloc(MENULEN + 1);
if (title) {
- if (strlen(title) > MENULEN - 2)
- strcpy(m->title, TITLELONG);
- else
- strcpy(m->title, title);
+ if (strlen(title) > MENULEN - 2)
+ strcpy(m->title, TITLELONG);
+ else
+ strcpy(m->title, title);
} else
- strcpy(m->title, EMPTYSTR);
+ strcpy(m->title, EMPTYSTR);
m->menuwidth = strlen(m->title);
ms->nummenus++;
return ms->nummenus - 1;
}
-void set_menu_name(const char *name) // Set the "name" of this menu
+void set_menu_name(const char *name) // Set the "name" of this menu
{
pt_menu m;
m = ms->menus[ms->nummenus - 1];
- if (m->name) // Free up previous name
+ if (m->name) // Free up previous name
{
- free(m->name);
- m->name = NULL;
+ free(m->name);
+ m->name = NULL;
}
if (name) {
- m->name = (char *)malloc(strlen(name) + 1);
- strcpy(m->name, name);
+ m->name = (char *)malloc(strlen(name) + 1);
+ strcpy(m->name, name);
}
}
@@ -1171,7 +1179,7 @@ uchar add_named_menu(const char *name, const char *title, int maxmenusize)
return ms->nummenus - 1;
}
-void set_menu_pos(uchar row, uchar col) // Set the position of this menu.
+void set_menu_pos(uchar row, uchar col) // Set the position of this menu.
{
pt_menu m;
@@ -1180,7 +1188,7 @@ void set_menu_pos(uchar row, uchar col) // Set the position of this menu.
m->col = col;
}
-pt_menuitem add_sep() // Add a separator to current menu
+pt_menuitem add_sep() // Add a separator to current menu
{
pt_menuitem mi;
pt_menu m;
@@ -1189,9 +1197,9 @@ pt_menuitem add_sep() // Add a separator to current menu
mi = NULL;
mi = (pt_menuitem) malloc(sizeof(t_menuitem));
if (mi == NULL)
- return NULL;
+ return NULL;
m->items[(unsigned int)m->numitems] = mi;
- mi->handler = NULL; // No handler
+ mi->handler = NULL; // No handler
mi->item = mi->status = mi->data = NULL;
mi->action = OPT_SEP;
mi->index = m->numitems++;
@@ -1203,20 +1211,20 @@ pt_menuitem add_sep() // Add a separator to current menu
// Add item to the "current" menu
pt_menuitem add_item(const char *item, const char *status, t_action action,
- const char *data, uchar itemdata)
+ const char *data, uchar itemdata)
{
pt_menuitem mi;
pt_menu m;
const char *str;
- uchar inhlite = 0; // Are we inside hlite area
+ uchar inhlite = 0; // Are we inside hlite area
m = (ms->menus[ms->nummenus - 1]);
mi = NULL;
mi = (pt_menuitem) malloc(sizeof(t_menuitem));
if (mi == NULL)
- return NULL;
+ return NULL;
m->items[(unsigned int)m->numitems] = mi;
- mi->handler = NULL; // No handler
+ mi->handler = NULL; // No handler
// Allocate space to store stuff
mi->item = (char *)malloc(MENULEN + 1);
@@ -1224,74 +1232,74 @@ pt_menuitem add_item(const char *item, const char *status, t_action action,
mi->data = (char *)malloc(ACTIONLEN + 1);
if (item) {
- if (strlen(item) > MENULEN) {
- strcpy(mi->item, ITEMLONG);
- } else {
- strcpy(mi->item, item);
- }
- if (strlen(mi->item) > m->menuwidth)
- m->menuwidth = strlen(mi->item);
+ if (strlen(item) > MENULEN) {
+ strcpy(mi->item, ITEMLONG);
+ } else {
+ strcpy(mi->item, item);
+ }
+ if (strlen(mi->item) > m->menuwidth)
+ m->menuwidth = strlen(mi->item);
} else
- strcpy(mi->item, EMPTYSTR);
+ strcpy(mi->item, EMPTYSTR);
if (status) {
- if (strlen(status) > STATLEN) {
- strcpy(mi->status, STATUSLONG);
- } else {
- strcpy(mi->status, status);
- }
+ if (strlen(status) > STATLEN) {
+ strcpy(mi->status, STATUSLONG);
+ } else {
+ strcpy(mi->status, status);
+ }
} else
- strcpy(mi->status, EMPTYSTR);
+ strcpy(mi->status, EMPTYSTR);
mi->action = action;
str = mi->item;
mi->shortcut = 0;
mi->helpid = 0xFFFF;
- inhlite = 0; // We have not yet seen an ENABLEHLITE char
+ inhlite = 0; // We have not yet seen an ENABLEHLITE char
// Find the first char in [A-Za-z0-9] after ENABLEHLITE and not arg to control char
while (*str) {
- if (*str == ENABLEHLITE) {
- inhlite = 1;
- }
- if (*str == DISABLEHLITE) {
- inhlite = 0;
- }
- if ((inhlite == 1) &&
- (((*str >= 'A') && (*str <= 'Z')) ||
- ((*str >= 'a') && (*str <= 'z')) ||
- ((*str >= '0') && (*str <= '9')))) {
- mi->shortcut = *str;
- break;
- }
- ++str;
+ if (*str == ENABLEHLITE) {
+ inhlite = 1;
}
- if ((mi->shortcut >= 'A') && (mi->shortcut <= 'Z')) // Make lower case
- mi->shortcut = mi->shortcut - 'A' + 'a';
+ if (*str == DISABLEHLITE) {
+ inhlite = 0;
+ }
+ if ((inhlite == 1) &&
+ (((*str >= 'A') && (*str <= 'Z')) ||
+ ((*str >= 'a') && (*str <= 'z')) ||
+ ((*str >= '0') && (*str <= '9')))) {
+ mi->shortcut = *str;
+ break;
+ }
+ ++str;
+ }
+ if ((mi->shortcut >= 'A') && (mi->shortcut <= 'Z')) // Make lower case
+ mi->shortcut = mi->shortcut - 'A' + 'a';
if (data) {
- if (strlen(data) > ACTIONLEN) {
- strcpy(mi->data, ACTIONLONG);
- } else {
- strcpy(mi->data, data);
- }
+ if (strlen(data) > ACTIONLEN) {
+ strcpy(mi->data, ACTIONLONG);
+ } else {
+ strcpy(mi->data, data);
+ }
} else
- strcpy(mi->data, EMPTYSTR);
+ strcpy(mi->data, EMPTYSTR);
switch (action) {
case OPT_SUBMENU:
- mi->itemdata.submenunum = itemdata;
- break;
+ mi->itemdata.submenunum = itemdata;
+ break;
case OPT_CHECKBOX:
- mi->itemdata.checked = itemdata;
- break;
+ mi->itemdata.checked = itemdata;
+ break;
case OPT_RADIOMENU:
- mi->itemdata.radiomenunum = itemdata;
- if (mi->data)
- free(mi->data);
- mi->data = NULL; // No selection made
- break;
- default: // to keep the compiler happy
- break;
+ mi->itemdata.radiomenunum = itemdata;
+ if (mi->data)
+ free(mi->data);
+ mi->data = NULL; // No selection made
+ break;
+ default: // to keep the compiler happy
+ break;
}
mi->index = m->numitems++;
mi->parindex = ms->nummenus - 1;
@@ -1306,13 +1314,13 @@ void set_item_options(uchar shortcut, int helpid)
m = (ms->menus[ms->nummenus - 1]);
if (m->numitems <= 0)
- return;
+ return;
mi = m->items[(unsigned int)m->numitems - 1];
if (shortcut != 0xFF)
- mi->shortcut = shortcut;
+ mi->shortcut = shortcut;
if (helpid != 0xFFFF)
- mi->helpid = helpid;
+ mi->helpid = helpid;
}
// Free internal datasutructures
@@ -1330,29 +1338,29 @@ void append_line_helper(int menunum, char *line)
menu = ms->menus[menunum];
for (ctr = 0; ctr < (int)menu->numitems; ctr++) {
- mi = menu->items[ctr];
- app = NULL; //What to append
- switch (mi->action) {
- case OPT_CHECKBOX:
- if (mi->itemdata.checked)
- app = mi->data;
- break;
- case OPT_RADIOMENU:
- if (mi->data) { // Some selection has been made
- ri = (pt_menuitem) (mi->data);
- app = ri->data;
- }
- break;
- case OPT_SUBMENU:
- append_line_helper(mi->itemdata.submenunum, line);
- break;
- default:
- break;
- }
- if (app) {
- strcat(line, " ");
- strcat(line, app);
- }
+ mi = menu->items[ctr];
+ app = NULL; //What to append
+ switch (mi->action) {
+ case OPT_CHECKBOX:
+ if (mi->itemdata.checked)
+ app = mi->data;
+ break;
+ case OPT_RADIOMENU:
+ if (mi->data) { // Some selection has been made
+ ri = (pt_menuitem) (mi->data);
+ app = ri->data;
+ }
+ break;
+ case OPT_SUBMENU:
+ append_line_helper(mi->itemdata.submenunum, line);
+ break;
+ default:
+ break;
+ }
+ if (app) {
+ strcat(line, " ");
+ strcat(line, app);
+ }
}
}
@@ -1364,6 +1372,6 @@ void gen_append_line(const char *menu_name, char *line)
menunum = find_menu_num(menu_name);
if (menunum < 0)
- return; // No such menu
+ return; // No such menu
append_line_helper(menunum, line);
}
diff --git a/com32/cmenu/libmenu/menu.h b/com32/cmenu/libmenu/menu.h
index 16ef528f..98c48594 100644
--- a/com32/cmenu/libmenu/menu.h
+++ b/com32/cmenu/libmenu/menu.h
@@ -24,6 +24,7 @@
#include "syslnx.h"
#include "scancodes.h"
#include <string.h>
+#include <unistd.h>
// TIMEOUT PARAMETERS
/* If no key is pressed within TIMEOUTNUMSTEPS * TIMEOUTSTEPSIZE milliseconds
@@ -214,8 +215,8 @@ typedef struct s_menusystem {
uchar shadowattr;
uchar statline;
uchar menupage;
- uchar maxrow, minrow, numrows; // Number of rows in the window
- uchar maxcol, mincol, numcols; // Number of columns in the window
+ int maxrow, minrow, numrows; // Number of rows in the window
+ int maxcol, mincol, numcols; // Number of columns in the window
// Menu box look
boxtype menubt; // What type of boxes should be drawn