aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-07 16:23:48 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-07 16:23:48 -0700
commit47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19 (patch)
treecad3d89e5ffbc713877091eee96493a9471f848c
parente9069caefc1460ec7f4d058796005474c125fc61 (diff)
parent39758675d88eb2b0d5c64239aa5d47df61e4d106 (diff)
downloadhdt-pierre-hdt-next.tar.gz
hdt-pierre-hdt-next.tar.xz
hdt-pierre-hdt-next.zip
Merge branch 'cmenu-video' into hdt-nexthdt-next
Conflicts: com32/hdt/hdt-cli-disk.c com32/hdt/hdt-common.c Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
-rw-r--r--NEWS6
-rw-r--r--com32/cmenu/adv_menu.tpl45
-rw-r--r--com32/cmenu/complex.c109
-rw-r--r--com32/cmenu/libmenu/com32io.c69
-rw-r--r--com32/cmenu/libmenu/com32io.h69
-rw-r--r--com32/cmenu/libmenu/help.c147
-rw-r--r--com32/cmenu/libmenu/help.h6
-rw-r--r--com32/cmenu/libmenu/menu.c1370
-rw-r--r--com32/cmenu/libmenu/menu.h23
-rw-r--r--com32/cmenu/libmenu/scancodes.h86
-rw-r--r--com32/cmenu/libmenu/tui.c235
-rw-r--r--com32/cmenu/libmenu/tui.h56
-rw-r--r--com32/hdt/hdt-cli.c1
-rw-r--r--com32/hdt/hdt-common.c15
-rw-r--r--com32/hdt/hdt-common.h2
-rw-r--r--com32/hdt/hdt-menu-kernel.c2
-rw-r--r--com32/hdt/hdt-menu-pci.c2
-rw-r--r--com32/hdt/hdt-menu-summary.c2
-rw-r--r--com32/hdt/hdt-menu-syslinux.c3
-rw-r--r--com32/hdt/hdt-menu.c23
-rw-r--r--com32/hdt/hdt-menu.h3
-rw-r--r--com32/hdt/lib-ansi.c104
-rw-r--r--com32/hdt/lib-ansi.h44
-rw-r--r--com32/include/libansi.h114
-rw-r--r--com32/lib/Makefile2
-rw-r--r--com32/lib/sys/ansi.c67
-rw-r--r--com32/lib/sys/ansi.h37
-rw-r--r--com32/lib/sys/ansicon_write.c18
-rw-r--r--com32/lib/sys/libansi.c214
-rw-r--r--doc/memdisk.txt6
30 files changed, 1334 insertions, 1546 deletions
diff --git a/NEWS b/NEWS
index 735bed73..594cf755 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,12 @@ Changes in 3.83:
* MEMDISK: fix problems booting from USB on Thinkpads, and
possibly other machines or hardware combinations.
* isohybrid: fix the -id option.
+ * HDT: updated to version 0.3.4.
+ * MEMDISK: the stack size is now configurable, with the stack=
+ option.
+ * Simple menu: fix Ctrl-W (word erase) in command-line edit.
+ * Simple menu: fix crash on some platforms.
+ * Gfxboot: fixes to the configuration file parsing.
Changes in 3.82:
* isohybrid: fix the -partok logic for loading from a partition.
diff --git a/com32/cmenu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl
index 6ce4acf8..be3c558e 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
@@ -192,51 +193,61 @@ TIMEOUTCODE ontotaltimeout()
return timeout(totaltimeoutcmd);
}
-void keys_handler(t_menusystem *ms, t_menuitem *mi,unsigned int scancode)
+void keys_handler(t_menusystem * ms __attribute__ (( unused )), t_menuitem * mi, int scancode)
{
- char nc;
+ int nc, nr;
- if ( ((scancode >> 8) == F1) && (mi->helpid != 0xFFFF) ) { // If scancode of F1 and non-trivial helpid
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
+
+ if ( (scancode == KEY_F1) && (mi->helpid != 0xFFFF) ) { // If scancode of F1 and non-trivial helpid
runhelpsystem(mi->helpid);
}
// 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) &&
+ if ((scancode == KEY_TAB) && (mi->action == OPT_RUN) &&
+ (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,ms->menupage);
+ gotoxy(EDIT_ROW,1);
csprint("Command line:",0x07);
editstring(mi->data,ACTIONLEN);
- gotoxy(EDIT_ROW,1,ms->menupage);
- cprint(' ',0x07,nc-1,ms->menupage);
+ gotoxy(EDIT_ROW,1);
+ cprint(' ',0x07,nc-1);
}
}
-t_handler_return login_handler(t_menusystem *ms, t_menuitem *mi)
+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();
- gotoxy(PWD_ROW,1,ms->menupage);
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
+
+ gotoxy(PWD_ROW,1);
csprint("Enter Username: ",0x07);
getstring(login, sizeof username);
- gotoxy(PWD_ROW,1,ms->menupage);
- cprint(' ',0x07,nc,ms->menupage);
+ gotoxy(PWD_ROW,1);
+ cprint(' ',0x07,nc);
csprint("Enter Password: ",0x07);
getpwd(pwd, sizeof pwd);
- gotoxy(PWD_ROW,1,ms->menupage);
- cprint(' ',0x07,nc,ms->menupage);
+ gotoxy(PWD_ROW,1);
+ cprint(' ',0x07,nc);
if (authenticate_user(login,pwd))
{
diff --git a/com32/cmenu/complex.c b/com32/cmenu/complex.c
index 063125d6..1ac51997 100644
--- a/com32/cmenu/complex.c
+++ b/com32/cmenu/complex.c
@@ -21,6 +21,8 @@
#include "des.h"
#include <stdlib.h>
#include <stdio.h>
+#include <unistd.h>
+#include <getkey.h>
/* Global variables */
char infoline[160];
@@ -65,46 +67,54 @@ TIMEOUTCODE ontimeout()
#define PWDATTR 0x74
#define EDITPROMPT 21
-void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode)
+void keys_handler(t_menusystem * ms __attribute__ (( unused )), t_menuitem * mi, int scancode)
{
- char nc;
+ int nc, nr;
- if ((scancode >> 8) == F1) { // If scancode of F1
+ if ((scancode) == KEY_F1 && mi->helpid != 0xFFFF) { // If scancode of F1
runhelpsystem(mi->helpid);
}
// 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) &&
+ if ((scancode == KEY_TAB) && (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, ms->menupage);
+ gotoxy(EDITPROMPT, 1);
csprint("Command line:", 0x07);
editstring(mi->data, ACTIONLEN);
- gotoxy(EDITPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc - 1, ms->menupage);
+ gotoxy(EDITPROMPT, 1);
+ clear_line();
}
}
-t_handler_return login_handler(t_menusystem * ms, t_menuitem * mi)
+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();
- gotoxy(PWDPROMPT, 1, ms->menupage);
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
+ gotoxy(PWDPROMPT, 1);
csprint("Enter Username: ", 0x07);
getstring(login, sizeof username);
- gotoxy(PWDPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
+ gotoxy(PWDPROMPT, 1);
+ clear_line();
csprint("Enter Password: ", 0x07);
getpwd(pwd, sizeof pwd);
- gotoxy(PWDPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
+ gotoxy(PWDPROMPT, 1);
+ clear_line();
if (authenticate_user(login, pwd)) {
strcpy(username, login);
@@ -133,22 +143,27 @@ t_handler_return login_handler(t_menusystem * ms, 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
- gotoxy(PWDLINE, PWDCOLUMN, ms->menupage);
+ 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, ms->menupage);
- gotoxy(PWDLINE, PWDCOLUMN + 6, ms->menupage);
+ cprint(ms->fillchar, ms->fillattr, sizeof username);
+ gotoxy(PWDLINE, PWDCOLUMN + 6);
csprint(username, PWDATTR);
if (mi->parindex != PREPMENU) // If we are not in the PREP MENU
{
- gotoxy(INFLINE, 0, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
- gotoxy(INFLINE + 1, 0, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
+ gotoxy(INFLINE, 0);
+ reset_colors();
+ clear_line();
+ gotoxy(INFLINE + 1, 0);
+ clear_line();
return;
}
strcpy(infoline, " ");
@@ -167,13 +182,14 @@ void msys_handler(t_menusystem * ms, t_menuitem * mi)
if (flags.linrep)
strcat(infoline, "repair=lin ");
- gotoxy(INFLINE, 0, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
- gotoxy(INFLINE + 1, 0, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
- gotoxy(INFLINE, 0, ms->menupage);
+ gotoxy(INFLINE, 0);
+ reset_colors();
+ clear_line();
+ gotoxy(INFLINE + 1, 0);
+ clear_line();
+ gotoxy(INFLINE, 0);
csprint("Kernel Arguments:", 0x07);
- gotoxy(INFLINE, 17, ms->menupage);
+ gotoxy(INFLINE, 17);
csprint(infoline, 0x07);
}
@@ -195,6 +211,8 @@ t_handler_return checkbox_handler(t_menusystem * ms, t_menuitem * mi)
{
(void)ms; /* Unused */
+ t_handler_return rv;
+
if (mi->action != OPT_CHECKBOX)
return ACTION_INVALID;
@@ -220,26 +238,10 @@ t_handler_return checkbox_handler(t_menusystem * ms, t_menuitem * mi)
}
if (strcmp(mi->data, "mountcd") == 0)
flags.mountcd = (mi->itemdata.checked ? 1 : 0);
- return ACTION_VALID;
-}
-/*
- Clears keyboard buffer and then
- wait for stepsize*numsteps milliseconds for user to press any key
- checks for keypress every stepsize milliseconds.
- Returns: 1 if user pressed a key (not read from the buffer),
- 0 if time elapsed
-*/
-int checkkeypress(int stepsize, int numsteps)
-{
- int i;
- clearkbdbuf();
- for (i = 0; i < numsteps; i++) {
- if (checkkbdbuf())
- return 1;
- sleep(stepsize);
- }
- return 0;
+ rv.valid = 0;
+ rv.refresh = 1;
+ return rv;
}
int main()
@@ -271,7 +273,7 @@ int main()
reg_handler(HDLR_SCREEN, &msys_handler);
reg_handler(HDLR_KEYS, &keys_handler);
// Register the ontimeout handler, with a time out of 10 seconds
- reg_ontimeout(ontimeout, 1000, 0);
+ reg_ontimeout(ontimeout, 10, 0);
NETMENU = add_menu(" Init Network ", -1);
none = add_item("<N>one", "Dont start network", OPT_RADIOITEM, "no ", 0);
@@ -401,12 +403,11 @@ int main()
0);
set_item_options(-1, 30);
csprint("Press any key within 5 seconds to show menu...", 0x07);
- if (!checkkeypress(100, 50)) // Granularity of 100 milliseconds
+ if (get_key(stdin, 50) == KEY_NONE) // Granularity of 100 milliseconds
{
csprint("Sorry! Time's up.\r\n", 0x07);
return 1;
- } else
- clearkbdbuf(); // Just in case user pressed something important
+ }
curr = showmenus(MAIN);
if (curr) {
if (curr->action == OPT_RUN) {
diff --git a/com32/cmenu/libmenu/com32io.c b/com32/cmenu/libmenu/com32io.c
index d99eb87f..6a27d1a1 100644
--- a/com32/cmenu/libmenu/com32io.c
+++ b/com32/cmenu/libmenu/com32io.c
@@ -13,35 +13,11 @@
#include <string.h>
#include <com32.h>
#include "com32io.h"
+#include "tui.h"
#include "syslnx.h"
com32sys_t inreg, outreg; // Global register sets for use
-/* Print character and attribute at cursor */
-void cprint(char chr, char attr, unsigned int times, char disppage)
-{
- REG_AH(inreg) = 0x09;
- REG_AL(inreg) = chr;
- REG_BH(inreg) = disppage;
- REG_BL(inreg) = attr;
- REG_CX(inreg) = times;
- __intcall(0x10, &inreg, &outreg);
-}
-
-void setdisppage(char num) // Set the display page to specified number
-{
- REG_AH(inreg) = 0x05;
- REG_AL(inreg) = num;
- __intcall(0x10, &inreg, &outreg);
-}
-
-char getdisppage() // Get current display page
-{
- REG_AH(inreg) = 0x0f;
- __intcall(0x10, &inreg, &outreg);
- return REG_BH(outreg);
-}
-
void getpos(char *row, char *col, char page)
{
REG_AH(inreg) = 0x03;
@@ -51,14 +27,6 @@ void getpos(char *row, char *col, char page)
*col = REG_DL(outreg);
}
-void gotoxy(char row, char col, char page)
-{
- REG_AH(inreg) = 0x02;
- REG_BH(inreg) = page;
- REG_DX(inreg) = (row << 8) + col;
- __intcall(0x10, &inreg, &outreg);
-}
-
unsigned char sleep(unsigned int msec)
{
unsigned long micro = 1000 * msec;
@@ -70,25 +38,6 @@ unsigned char sleep(unsigned int msec)
return REG_AH(outreg);
}
-void beep()
-{
- REG_AH(inreg) = 0x0E;
- REG_AL(inreg) = 0x07;
- REG_BH(inreg) = 0;
- __intcall(0x10, &inreg, &outreg);
-}
-
-void scrollupwindow(char top, char left, char bot, char right, char attr,
- char numlines)
-{
- REG_AH(inreg) = 0x06;
- REG_AL(inreg) = numlines;
- REG_BH(inreg) = attr; // Attribute to write blanks lines
- REG_DX(inreg) = (bot << 8) + right; // BOT RIGHT corner of window
- REG_CX(inreg) = (top << 8) + left; // TOP LEFT of window
- __intcall(0x10, &inreg, &outreg);
-}
-
char inputc(char *scancode)
{
syslinux_idle(); /* So syslinux can perform periodic activity */
@@ -101,7 +50,7 @@ char inputc(char *scancode)
void getcursorshape(char *start, char *end)
{
- char page = getdisppage();
+ char page = 0; // XXX TODO
REG_AH(inreg) = 0x03;
REG_BH(inreg) = page;
__intcall(0x10, &inreg, &outreg);
@@ -117,13 +66,6 @@ void setcursorshape(char start, char end)
__intcall(0x10, &inreg, &outreg);
}
-char getchar(void)
-{
- REG_AH(inreg) = 0x08;
- __intcall(0x21, &inreg, &outreg);
- return REG_AL(outreg);
-}
-
void setvideomode(char mode)
{
REG_AH(inreg) = 0x00;
@@ -131,13 +73,6 @@ void setvideomode(char mode)
__intcall(0x10, &inreg, &outreg);
}
-unsigned char checkkbdbuf()
-{
- REG_AH(inreg) = 0x11;
- __intcall(0x16, &inreg, &outreg);
- return !(outreg.eflags.l & EFLAGS_ZF);
-}
-
// Get char displayed at current position
unsigned char getcharat(char page)
{
diff --git a/com32/cmenu/libmenu/com32io.h b/com32/cmenu/libmenu/com32io.h
index cdaf0a84..6ff6857e 100644
--- a/com32/cmenu/libmenu/com32io.h
+++ b/com32/cmenu/libmenu/com32io.h
@@ -14,71 +14,41 @@
#define __COM32IO_H__
#include <com32.h>
+#include <stdio.h>
+#include <libansi.h>
#ifndef NULL
#define NULL ((void *)0)
#endif
-/* BIOS Assisted output routines */
-
-void cswprint(const char *str, char attr, char left);
-// Print a C str (NUL-terminated) respecting the left edge of window
-// i.e. \n in str will move cursor to column left
-// Print a C str (NUL-terminated)
-
-static inline void csprint(const char *str, char attr)
-{
- cswprint(str, attr, 0);
-}
-
-void cprint(char chr, char attr, unsigned int times, char disppage); // Print a char
+/* Bits representing ShiftFlags, See Int16/Function 2 or Mem[0x417] to get this info */
-void setdisppage(char num); // Set the display page to specified number
+#define INSERT_ON (1<<7)
+#define CAPSLOCK_ON (1<<6)
+#define NUMLOCK_ON (1<<5)
+#define SCRLLOCK_ON (1<<4)
+#define ALT_PRESSED (1<<3)
+#define CTRL_PRESSED (1<<2)
+// actually 1<<1 is Left Shift, 1<<0 is right shift
+#define SHIFT_PRESSED (1<<1 | 1 <<0)
-char getdisppage(); // Get current display page
-
-void gotoxy(char row, char col, char page);
+/* BIOS Assisted output routines */
void getpos(char *row, char *col, char page);
char inputc(char *scancode); // Return ASCII char by val, and scancode by reference
-static inline void putch(char x, char attr, char page)
-{
- cprint(x, attr, 1, page);
-}
-
void setcursorshape(char start, char end); // Set cursor shape
void getcursorshape(char *start, char *end); // Get shape for current page
// Get char displayed at current position in specified page
unsigned char getcharat(char page);
-static inline void cursoroff(void)
-{ /* Turns off cursor */
- setcursorshape(32, 33);
-}
-
-static inline void cursoron(void)
-{ /* Turns on cursor */
- setcursorshape(6, 7);
-}
-
static inline unsigned char readbiosb(unsigned int ofs)
{
return *((unsigned char *)MK_PTR(0, ofs));
}
-static inline char getnumrows()
-{
- return readbiosb(0x484)+1; // Actually numrows - 1
-}
-
-static inline char getnumcols(void)
-{
- return readbiosb(0x44a); // Actually numcols
-}
-
static inline char getshiftflags(void)
{
return readbiosb(0x417);
@@ -86,11 +56,6 @@ static inline char getshiftflags(void)
void scrollupwindow(char top, char left, char bot, char right, char attr, char numlines); //Scroll up given window
-static inline void scrollup(void) //Scroll up display screen by one line
-{
- scrollupwindow(0, 0, getnumrows(), getnumcols(), 0x07, 1);
-}
-
void setvideomode(char mode); // Set the video mode.
static inline char getvideomode(void) // Get the current video mode
@@ -100,14 +65,4 @@ static inline char getvideomode(void) // Get the current video mode
unsigned char sleep(unsigned int msec); // Sleep for specified time
-void beep(); // A Bell
-
-unsigned char checkkbdbuf(); // Check to see if there is kbd buffer is non-empty?
-
-static inline void clearkbdbuf() // Clear the kbd buffer (how many chars removed?)
-{
- while (checkkbdbuf())
- inputc(NULL);
-}
-
#endif
diff --git a/com32/cmenu/libmenu/help.c b/com32/cmenu/libmenu/help.c
index a635bd21..0df1e103 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,34 +51,45 @@ 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;
+ char *f, *t;
+ int right, nlines, i;
// clear window to print
- right = getnumcols() - HELP_RIGHT_MARGIN;
- bot = getnumrows() - HELP_BOTTOM_MARGIN;
- nlines = bot - HELP_BODY_ROW + 1;
- scrollupwindow(HELP_BODY_ROW, HELP_LEFT_MARGIN, bot, right, 0x07, nlines);
+ right = nc - HELP_RIGHT_MARGIN;
+ nlines = nr - HELP_BODY_ROW - HELP_BOTTOM_MARGIN - 1;
f = findline(buf, from);
if (!f)
return; // nothing to print
if (*f == '\n')
f++; // start of from+1st line
- p = findline(f, nlines);
- if (p && (*p == '\n'))
- *p = '\0'; // change to NUL
- gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN, HELPPAGE);
- cswprint(f, 0x07, HELP_LEFT_MARGIN);
- if (p)
- *p = '\n'; // set it back
+ t = f;
+ while (i < nlines) {
+ gotoxy(HELP_BODY_ROW + i, HELP_LEFT_MARGIN);
+ clear_end_of_line();
+ putchar(SO);
+ gotoxy(HELP_BODY_ROW + i, nc - 1);
+ putch(LEFT_BORDER, 0x07);
+ putchar(SI);
+
+ gotoxy(HELP_BODY_ROW + i, HELP_LEFT_MARGIN);
+ while (*t != '\n') {
+ if (*t == '\0')
+ return;
+ putchar(*t);
+ t++;
+ }
+ putchar('\n');
+ t++;
+ i++;
+ }
}
void showhelp(const char *filename)
{
- char nc, nr, ph;
+ char ph;
char *title, *text;
union {
char *buffer;
@@ -86,41 +98,29 @@ void showhelp(const char *filename)
char line[512];
size_t size;
- char scan;
+ int scan;
int rv, numlines, curr_line;
- nc = getnumcols();
- nr = getnumrows();
- ph = nr - HELP_BOTTOM_MARGIN - HELP_BODY_ROW - 1;
+ if (getscreensize(1, &nr, &nc)) {
+ /* Unknown screen size? */
+ nc = 80;
+ nr = 24;
+ }
+ ph = nr - HELP_BODY_ROW;
cls();
- drawbox(0, 0, nr, nc - 1, HELPPAGE, 0x07, HELPBOX);
- drawhorizline(2, 0, nc - 1, HELPPAGE, 0x07, HELPBOX, 0); // dumb==0
+ /* Turn autowrap off, to avoid scrolling the menu */
+ printf(CSI "?7l");
+
if (filename == NULL) { // print file contents
- gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN, HELPPAGE);
- cswprint("Filename not given", 0x07, HELP_LEFT_MARGIN);
- 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, HELPPAGE);
- cswprint(line, 0x07, HELP_LEFT_MARGIN);
- 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;
@@ -128,44 +128,49 @@ void showhelp(const char *filename)
*text++ = '\0'; // end the title string and increment text
// Now we have a file just print it.
- gotoxy(1, (nc - strlen(title)) / 2, HELPPAGE);
- csprint(title, 0x07);
numlines = countlines(text);
curr_line = 0;
- scan = ESCAPE + 1; // anything except ESCAPE
-
- while (scan != ESCAPE) {
+ scan = KEY_ESC + 1; // anything except ESCAPE
+
+ /* top, left, bottom, right, attr */
+ drawbox(0, 0, nr - 1, nc - 1, 0x07);
+ while (scan != KEY_ESC) {
+ /* Title */
+ gotoxy(1, (nc - strlen(title)) / 2);
+ fputs(title, stdout);
+ drawhorizline(2, HELP_LEFT_MARGIN - 1, nc - HELP_RIGHT_MARGIN, 0x07, 0); // dumb==0
+ /* Text */
printtext(text, curr_line);
- gotoxy(HELP_BODY_ROW - 1, nc - HELP_RIGHT_MARGIN, HELPPAGE);
+ gotoxy(HELP_BODY_ROW - 1, nc - HELP_RIGHT_MARGIN);
if (curr_line > 0)
- putch(HELP_MORE_ABOVE, 0x07, HELPPAGE);
+ putchar(HELP_MORE_ABOVE);
else
- putch(' ', 0x07, HELPPAGE);
- gotoxy(nr - HELP_BOTTOM_MARGIN + 1, nc - HELP_RIGHT_MARGIN, HELPPAGE);
+ putchar(' ');
+ gotoxy(nr - HELP_BOTTOM_MARGIN - 1, nc - HELP_RIGHT_MARGIN);
if (curr_line < numlines - ph)
- putch(HELP_MORE_BELOW, 0x07, HELPPAGE);
+ putchar(HELP_MORE_BELOW);
else
- putch(' ', 0x07, HELPPAGE);
+ putchar(' ');
- inputc(&scan); // wait for user keypress
+ scan = get_key(stdout, 0); // wait for user keypress
switch (scan) {
- case HOMEKEY:
+ case KEY_HOME:
curr_line = 0;
break;
- case ENDKEY:
+ case KEY_END:
curr_line = numlines;
break;
- case UPARROW:
+ case KEY_UP:
curr_line--;
break;
- case DNARROW:
+ case KEY_DOWN:
curr_line++;
break;
- case PAGEUP:
+ case KEY_PGUP:
curr_line -= ph;
break;
- case PAGEDN:
+ case KEY_PGDN:
curr_line += ph;
break;
default:
@@ -176,18 +181,26 @@ void showhelp(const char *filename)
if (curr_line < 0)
curr_line = 0;
}
+out:
cls();
return;
+
+puke:
+ gotoxy(HELP_BODY_ROW, HELP_LEFT_MARGIN);
+ fputs(line, stdout);
+ while (1) {
+ scan = get_key(stdin, 0);
+ if (scan == KEY_ESC)
+ break;
+ }
+ goto out;
}
void runhelp(const char *filename)
{
- char dp;
char fullname[HELPDIRLEN + 16];
- dp = getdisppage();
- if (dp != HELPPAGE)
- setdisppage(HELPPAGE);
+ cls();
cursoroff();
if (helpbasedir[0] != 0) {
strcpy(fullname, helpbasedir);
@@ -196,15 +209,13 @@ void runhelp(const char *filename)
showhelp(fullname);
} else
showhelp(filename); // Assume filename is absolute
- if (dp != HELPPAGE)
- setdisppage(dp);
}
void runhelpsystem(unsigned int helpid)
{
char filename[15];
- sprintf(filename, "hlp%5d.txt", helpid);
+ sprintf(filename, "hlp%05d.txt", helpid);
runhelp(filename);
}
diff --git a/com32/cmenu/libmenu/help.h b/com32/cmenu/libmenu/help.h
index 0fff524f..de01b46e 100644
--- a/com32/cmenu/libmenu/help.h
+++ b/com32/cmenu/libmenu/help.h
@@ -23,14 +23,14 @@
#define HELP_BODY_ROW (HELP_TITLE_HEIGHT+3)
#define HELP_LEFT_MARGIN 2
#define HELP_RIGHT_MARGIN 2 // Assume all lines dont cross this
-#define HELP_BOTTOM_MARGIN 2 // Number of lines not use from bottom of screen
+#define HELP_BOTTOM_MARGIN 1 // Number of lines not use from bottom of screen
#define HELPBOX BOX_SINSIN
#define HELPDIRLEN 64
#define HELPPAGE 2
-#define HELP_MORE_ABOVE 24 // to print when more is available above
-#define HELP_MORE_BELOW 25 // same as above but for below
+#define HELP_MORE_ABOVE '^' // to print when more is available above
+#define HELP_MORE_BELOW 'v' // same as above but for below
// Display one screen of help information
void showhelp(const char *filename);
diff --git a/com32/cmenu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c
index cfe8f39f..3a761aa8 100644
--- a/com32/cmenu/libmenu/menu.c
+++ b/com32/cmenu/libmenu/menu.c
@@ -13,9 +13,10 @@
#include "menu.h"
#include "com32io.h"
#include <stdlib.h>
+#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 ";
@@ -39,92 +40,45 @@ int isvisible(pt_menu menu, int first, int curr);
// This is same as inputc except it honors the ontimeout handler
// and calls it when needed. For the callee, there is no difference
// as this will not return unless a key has been pressed.
-char getch(char *scan)
+static int getch()
{
- unsigned long i;
- TIMEOUTCODE c;
t_timeout_handler th;
+ int key;
+ unsigned long i;
// Wait until keypress if no handler specified
if ((ms->ontimeout == NULL) && (ms->ontotaltimeout == NULL))
- return inputc(scan);
+ return get_key(stdin, 0);
th = ms->ontimeout;
- 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;
- }
- }
- return 0;
-}
-
-/* Print a menu item */
-/* attr[0] is non-hilite attr, attr[1] is highlight attr */
-void printmenuitem(const char *str, uchar * attr)
-{
- uchar page = getdisppage();
- uchar row, col;
- int hlite = NOHLITE; // Initially no highlighting
-
- getpos(&row, &col, page);
- while (*str) {
- switch (*str) {
- case '\b':
- --col;
- break;
- case '\n':
- ++row;
- break;
- case '\r':
- col = 0;
- break;
- 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], page);
- ++col;
- }
- if (col > getnumcols()) {
- ++row;
- col = 0;
- }
- if (row > getnumrows()) {
- scrollup();
- row = getnumrows();
- }
- gotoxy(row, col, page);
- str++;
+ for (;;) {
+ for (i = 0; i < ms->tm_numsteps; i++) {
+ key = get_key(stdin, ms->tm_stepsize);
+ if (key != KEY_NONE)
+ return key;
+
+ 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
+ key = th();
+ switch (key) {
+ case CODE_ENTER: // Pretend user hit enter
+ return KEY_ENTER;
+ case CODE_ESCAPE: // Pretend user hit escape
+ return KEY_ESC;
+ default:
+ break;
+ }
}
+ return KEY_NONE;
}
int find_shortcut(pt_menu menu, uchar shortcut, int index)
@@ -135,481 +89,427 @@ 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)
+/* Redraw background and title */
+static void reset_ui(void)
+{
+ uchar tpos;
+
+ 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
+ gotoxy(ms->minrow, ms->mincol);
+ cprint(ms->tfillchar, ms->titleattr, ms->numcols);
+ gotoxy(ms->minrow, ms->mincol + tpos);
+ csprint(ms->title, ms->titleattr);
+
+ cursoroff();
+}
+
+/*
+ * Print a menu item
+ *
+ * attr[0] is non-hilite attr, attr[1] is highlight attr
+ */
+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++;
+ }
+}
+
+
+/**
+ * print_line - Print a whole line in a menu
+ * @menu: current menu to handle
+ * @curr: index of the current entry highlighted
+ * @top: top coordinate of the @menu
+ * @left: left coordinate of the @menu
+ * @x: index in the menu of curr
+ * @row: row currently displayed
+ * @radio: radio item?
+ **/
+static void print_line(pt_menu menu, int curr, uchar top, uchar left,
+ int x, int row, bool radio)
{
- 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; // attribute attr
- char sep[MENULEN]; // and inbetween the item or a seperator is printed
pt_menuitem ci;
+ char fchar[6], lchar[6]; // The first and last char in for each entry
+ const char *str; // Item string (cf printmenuitem)
+ char sep[MENULEN]; // Separator (OPT_SEP)
+ uchar *attr; // Attribute
+ int menuwidth = menu->menuwidth + 3;
- numitems = calc_visible(menu, first);
- if (numitems > menu->menuheight)
- numitems = menu->menuheight;
+ if (row >= menu->menuheight)
+ return;
- menuwidth = menu->menuwidth + 3;
- clearwindow(top, left - 2, top + numitems + 1, left + menuwidth + 1,
- ms->menupage, ms->fillchar, ms->shadowattr);
- drawbox(top - 1, left - 3, top + numitems, left + menuwidth,
- ms->menupage, ms->normalattr[NOHLITE], ms->menubt);
- memset(sep, ms->box_horiz, menuwidth); // String containing the seperator string
+ ci = menu->items[x];
+
+ memset(sep, ms->box_horiz, menuwidth);
sep[menuwidth - 1] = 0;
- // Menu title
- x = (menuwidth - strlen(menu->title) - 1) >> 1;
- gotoxy(top - 1, left + x, ms->menupage);
- printmenuitem(menu->title, ms->normalattr);
- 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] = SUBMENUCHAR;
- 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] = 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[2] = 0;
- str = sep;
- break;
- case OPT_EXITMENU:
- fchar[0] = EXITMENUCHAR;
- fchar[1] = 0;
- break;
- default: // Just to keep the compiler happy
- break;
- }
- gotoxy(top + row, left - 2, ms->menupage);
- cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2, ms->menupage); // Wipe area with spaces
- gotoxy(top + row, left - 2, ms->menupage);
- csprint(fchar, attr[NOHLITE]); // Print first part
- gotoxy(top + row, left, ms->menupage);
- printmenuitem(str, attr); // Print main part
- gotoxy(top + row, left + menuwidth - 1, ms->menupage); // 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
- {
- row = 1;
- gotoxy(top, left + menuwidth, ms->menupage);
- cprint(MOREABOVE, ms->normalattr[NOHLITE], 1, ms->menupage);
+
+ // Setup the defaults now
+ if (radio) {
+ fchar[0] = '\b';
+ fchar[1] = SO;
+ fchar[2] = (x == curr ? RADIOSEL : RADIOUNSEL);
+ fchar[3] = SI;
+ fchar[4] = '\0'; // Unselected ( )
+ lchar[0] = '\0'; // Nothing special after
+ attr = ms->normalattr; // Always same attribute
+ } else {
+ lchar[0] = fchar[0] = ' ';
+ lchar[1] = fchar[1] = '\0'; // fchar and lchar are just spaces
+ attr = (x == curr ? ms->reverseattr : ms->normalattr); // Normal attributes
}
- x = prev_visible_sep(menu, menu->numitems); // last item
- if (!isvisible(menu, first, x)) // There is more above
+ str = ci->item; // Pointer to item string
+ switch (ci->action) // set up attr,str,fchar,lchar for everything
{
- row = 1;
- gotoxy(top + numitems - 1, left + menuwidth, ms->menupage);
- cprint(MOREBELOW, ms->normalattr[NOHLITE], 1, ms->menupage);
- }
- // Add a scroll box
- x = ((numitems - 1) * curr) / (menu->numitems);
- if ((x > 0) && (row == 1)) {
- gotoxy(top + x, left + menuwidth, ms->menupage);
- cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1, ms->menupage);
+ case OPT_INACTIVE:
+ if (radio)
+ attr = ms->inactattr;
+ else
+ attr = (x == curr ? ms->revinactattr : ms->inactattr);
+ break;
+ case OPT_SUBMENU:
+ if (radio)
+ break; // Not supported for radio menu
+ lchar[0] = '>';
+ lchar[1] = 0;
+ break;
+ case OPT_RADIOMENU:
+ if (radio)
+ break; // Not supported for radio menu
+ lchar[0] = RADIOMENUCHAR;
+ lchar[1] = 0;
+ break;
+ case OPT_CHECKBOX:
+ if (radio)
+ break; // Not supported for radio menu
+ lchar[0] = '\b';
+ lchar[1] = SO;
+ lchar[2] = (ci->itemdata.checked ? CHECKED : UNCHECKED);
+ lchar[3] = SI;
+ lchar[4] = 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:
+ if (radio)
+ break; // Not supported for radio menu
+ fchar[0] = '<';
+ fchar[1] = 0;
+ break;
+ default: // Just to keep the compiler happy
+ break;
}
- if (ms->handler)
- ms->handler(ms, menu->items[curr]);
+
+ // Wipe area with spaces
+ gotoxy(top + row, left - 2);
+ cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2);
+
+ // Print first part
+ gotoxy(top + row, left - 2);
+ csprint(fchar, attr[NOHLITE]);
+
+ // Print main part
+ gotoxy(top + row, left);
+ printmenuitem(str, attr);
+
+ // Print last part
+ gotoxy(top + row, left + menuwidth - 1);
+ csprint(lchar, attr[NOHLITE]);
}
-// 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)
+// print the menu starting from FIRST
+// will print a maximum of menu->menuheight items
+static void printmenu(pt_menu menu, int curr, uchar top, uchar left, uchar first, bool radio)
{
- 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
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->menupage, ms->fillchar, ms->shadowattr);
+ ms->fillchar, ms->shadowattr);
drawbox(top - 1, left - 3, top + numitems, left + menuwidth,
- ms->menupage, ms->normalattr[NOHLITE], ms->menubt);
- memset(sep, ms->box_horiz, menuwidth); // String containing the seperator string
- sep[menuwidth - 1] = 0;
+ ms->normalattr[NOHLITE]);
+
// Menu title
x = (menuwidth - strlen(menu->title) - 1) >> 1;
- gotoxy(top - 1, left + x, ms->menupage);
+ gotoxy(top - 1, left + x);
printmenuitem(menu->title, ms->normalattr);
- row = -1; // 1 less than inital value of x
+
+ // All lines in the menu
+ 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, ms->menupage);
- cprint(ms->spacechar, attr[NOHLITE], menuwidth + 2, ms->menupage); // Wipe area with spaces
- gotoxy(top + row, left - 2, ms->menupage);
- csprint(fchar, attr[NOHLITE]); // Print first part
- gotoxy(top + row, left, ms->menupage);
- printmenuitem(str, attr); // Print main part
- gotoxy(top + row, left + menuwidth - 1, ms->menupage); // 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
+ print_line(menu, curr, top, left, x, row, radio);
}
// 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, ms->menupage);
- cprint(MOREABOVE, ms->normalattr[NOHLITE], 1, ms->menupage);
+ 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, ms->menupage);
- cprint(MOREBELOW, ms->normalattr[NOHLITE], 1, ms->menupage);
+ 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, ms->menupage);
- cprint(SCROLLBOX, ms->normalattr[NOHLITE], 1, ms->menupage);
+ gotoxy(top + x, left + menuwidth);
+ csprint("\016\141\017", ms->normalattr[NOHLITE]);
}
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->menupage, ms->fillchar, ms->fillattr); // Clear the shadow
- clearwindow(top - 1, left - 3, top + numitems, left + menu->menuwidth + 3, ms->menupage, 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 */
-pt_menuitem getradiooption(pt_menu menu, uchar top, uchar left, uchar startopt)
- // Return item chosen or NULL if ESC was hit.
-{
- int curr, i, first, tmp;
- uchar asc, scan;
- uchar numitems;
- pt_menuitem ci; // Current item
-
- numitems = calc_visible(menu, 0);
- // Setup status line
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols, ms->menupage);
-
- // Initialise current menu item
- curr = next_visible(menu, startopt);
-
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols, 1);
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- printmenuitem(menu->items[curr]->status, ms->statusattr);
- first = calc_first_early(menu, curr);
- 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, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols,
- ms->menupage);
- printmenuitem(menu->items[curr]->status, ms->statusattr);
- }
- return NULL; // Should never come here
-}
/* Handle one menu */
-pt_menuitem getmenuoption(pt_menu menu, uchar top, uchar left, uchar startopt)
+static pt_menuitem getmenuoption(pt_menu menu, uchar top, uchar left, uchar startopt, bool radio)
// Return item chosen or NULL if ESC was hit.
{
- int curr, i, first, tmp;
- uchar asc, scan;
+ int prev, prev_first, curr, i, first, tmp;
+ int asc = 0;
+ bool redraw = true; // Need to draw the menu the first time
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
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols, ms->menupage);
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
+ cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
// Initialise current menu item
curr = next_visible(menu, startopt);
+ prev = curr;
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols, 1);
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
+ cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols);
+ gotoxy(ms->minrow + ms->statline, ms->mincol);
printmenuitem(menu->items[curr]->status, ms->statusattr);
first = calc_first_early(menu, curr);
- while (1) // Forever
+ prev_first = first;
+ 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
- gotoxy(ms->minrow + ms->statline, ms->mincol, ms->menupage);
- cprint(ms->spacechar, ms->statusattr[NOHLITE], ms->numcols,
- ms->menupage);
- printmenuitem(menu->items[curr]->status, ms->statusattr);
+ /* Redraw everything if:
+ * + we need to scroll (take care of scroll bars, ...)
+ * + menuoption
+ */
+ if (prev_first != first || redraw) {
+ printmenu(menu, curr, top, left, first, radio);
+ } else {
+ /* Redraw only the highlighted entry */
+ print_line(menu, curr, top, left, prev, prev - first, radio);
+ print_line(menu, curr, top, left, curr, curr - first, radio);
+ }
+ redraw = false;
+ prev = curr;
+ prev_first = first;
+ ci = menu->items[curr];
+ asc = getch();
+ switch (asc) {
+ case KEY_CTRL('L'):
+ redraw = true;
+ break;
+ case KEY_HOME:
+ curr = next_visible(menu, 0);
+ first = calc_first_early(menu, curr);
+ break;
+ case KEY_END:
+ curr = prev_visible(menu, numitems - 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case KEY_PGDN:
+ for (i = 0; i < 5; i++)
+ curr = next_visible(menu, curr + 1);
+ first = calc_first_late(menu, curr);
+ break;
+ case KEY_PGUP:
+ for (i = 0; i < 5; i++)
+ curr = prev_visible(menu, curr - 1);
+ first = calc_first_early(menu, curr);
+ break;
+ case KEY_UP:
+ curr = prev_visible(menu, curr - 1);
+ if (curr < first)
+ first = calc_first_early(menu, curr);
+ break;
+ case KEY_DOWN:
+ curr = next_visible(menu, curr + 1);
+ if (!isvisible(menu, first, curr))
+ first = calc_first_late(menu, curr);
+ break;
+ case KEY_LEFT:
+ case KEY_ESC:
+ return NULL;
+ break;
+ case KEY_RIGHT:
+ case KEY_ENTER:
+ 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, radio);
+ }
+ if (hr.valid)
+ return ci;
+ } else
+ return ci;
+ break;
+ case SPACECHAR:
+ 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, radio);
+ }
+ }
+ 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], asc);
+
+ /* The handler may have changed the UI, reset it on exit */
+ reset_ui();
+ // 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, radio);
+ }
+ 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);
}
- return NULL; // Should never come here
+ 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
@@ -629,36 +529,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, false);
+ else // menutype == RADIOMENU
+ opt = getmenuoption(cmenu, top, left, startopt, true);
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, ms->menupage); // 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,
@@ -666,32 +567,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;
}
}
@@ -702,11 +603,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);
}
@@ -722,16 +623,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);
+ }
+ }
}
}
@@ -740,34 +641,22 @@ void fix_submenus()
pt_menuitem showmenus(uchar startmenu)
{
pt_menuitem rv;
- uchar oldpage, 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
- oldpage = getdisppage();
- setdisppage(ms->menupage);
- cls();
- clearwindow(ms->minrow, ms->mincol, ms->maxrow, ms->maxcol,
- ms->menupage, ms->fillchar, ms->fillattr);
- tpos = (ms->numcols - strlen(ms->title) - 1) >> 1; // center it on line
- gotoxy(ms->minrow, ms->mincol, ms->menupage);
- cprint(ms->tfillchar, ms->titleattr, ms->numcols, ms->menupage);
- gotoxy(ms->minrow, ms->mincol + tpos, ms->menupage);
- csprint(ms->title, ms->titleattr);
+ /* Turn autowrap off, to avoid scrolling the menu */
+ printf(CSI "?7l");
- cursoroff(); // Doesn't seem to work?
+ // Setup screen for menusystem
+ reset_ui();
// 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();
- if (oldpage == ms->menupage)
- cls();
- else
- setdisppage(oldpage);
+ cls();
// Return user choice
return rv;
@@ -780,17 +669,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;
@@ -820,12 +709,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;
@@ -838,110 +727,107 @@ 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;
+
+ console_ansi_raw();
- // Set up the look of the box
- set_box_type(MENUBOXTYPE);
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;
-}
-
-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_ltrt = bxc[BOX_LTRT];
- ms->box_rtlt = bxc[BOX_RTLT];
+ ms->shadowattr = shadowattr;
}
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;
@@ -949,7 +835,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)
@@ -957,11 +843,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;
}
}
@@ -969,22 +855,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()
@@ -993,12 +879,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;
}
}
@@ -1011,31 +897,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;
}
@@ -1043,28 +929,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;
}
@@ -1073,11 +959,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;
}
@@ -1085,9 +971,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
@@ -1098,11 +984,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;
}
@@ -1114,13 +1000,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;
}
@@ -1132,51 +1018,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);
}
}
@@ -1188,7 +1074,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;
@@ -1197,7 +1083,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;
@@ -1206,9 +1092,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++;
@@ -1220,20 +1106,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);
@@ -1241,74 +1127,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 (*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 ((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;
@@ -1323,13 +1209,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
@@ -1344,34 +1230,32 @@ void append_line_helper(int menunum, char *line)
pt_menuitem mi, ri;
char *app;
int ctr;
- char dp;
- dp = getdisppage();
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);
+ }
}
}
@@ -1383,6 +1267,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 68adf278..44acb122 100644
--- a/com32/cmenu/libmenu/menu.h
+++ b/com32/cmenu/libmenu/menu.h
@@ -22,8 +22,8 @@
#include "com32io.h"
#include "tui.h"
#include "syslnx.h"
-#include "scancodes.h"
#include <string.h>
+#include <unistd.h>
// TIMEOUT PARAMETERS
/* If no key is pressed within TIMEOUTNUMSTEPS * TIMEOUTSTEPSIZE milliseconds
@@ -59,8 +59,8 @@
#define STATUSATTR 0x74
#define STATUSHLITE 0x7B // Status highlight
-#define FILLCHAR 177
-#define FILLATTR 0x01
+#define FILLCHAR ' '
+#define FILLATTR NORMALATTR
#define SHADOWATTR 0x00
#define SPACECHAR ' '
@@ -72,9 +72,8 @@
#define NOHLITE 0 // The offset into attrib array for non-hilite
#define HLITE 1 // The offset for Hlite attrib
-#define MOREABOVE 24 // char to print when more menu items available above
-#define MOREBELOW 25 // more items available below
-#define SCROLLBOX 176 // Filled char to display
+#define MOREABOVE '^' // char to print when more menu items available above
+#define MOREBELOW 'v' // more items available below
// Attributes of the menu system
#define MAXMENUS 150 // Maximum number of menu's allowed
@@ -99,11 +98,9 @@
#define DEBUGLINE 23 // debugging info goes here
// Other Chars
-#define SUBMENUCHAR 175 // This is >> symbol
#define RADIOMENUCHAR '>' // > symbol for radio menu?
-#define EXITMENUCHAR 174 // This is << symbol
-#define CHECKED 251 // Check mark
-#define UNCHECKED 250 // Light bullet
+#define CHECKED '\140' // Check mark
+#define UNCHECKED '\146' // Light bullet
#define RADIOSEL '.' // Current Radio Selection
#define RADIOUNSEL ' ' // Radio option not selected
@@ -214,11 +211,10 @@ 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
char box_horiz, box_ltrt, box_rtlt; // Some chars of the box, for redrawing portions of the box
} t_menusystem;
@@ -243,7 +239,6 @@ void set_title_info(uchar tfillchar, uchar titleattr);
void set_misc_info(uchar fillchar, uchar fillattr, uchar spacechar,
uchar shadowattr);
-void set_box_type(boxtype bt);
void set_window_size(uchar top, uchar left, uchar bot, uchar right); // Set the window which menusystem should use
diff --git a/com32/cmenu/libmenu/scancodes.h b/com32/cmenu/libmenu/scancodes.h
deleted file mode 100644
index b70f6c67..00000000
--- a/com32/cmenu/libmenu/scancodes.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- c -*- ------------------------------------------------------------- *
- *
- * Copyright 2004-2005 Murali Krishnan Ganapathy - All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
- * (at your option) any later version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-#ifndef __SCANCODES_H__
-#define __SCANCODES_H__
-
-// Scancodes of some keys
-#define ESCAPE 1
-#define ENTERA 28
-#define ENTERB 224
-
-#define HOMEKEY 71
-#define UPARROW 72
-#define PAGEUP 73
-#define LTARROW 75
-#define RTARROW 77
-#define ENDKEY 79
-#define DNARROW 80
-#define PAGEDN 81
-#define INSERT 82
-#define DELETE 83
-#define SPACEKEY 57 // Scan code for SPACE
-
-#define CTRLLT 0x73
-#define CTRLRT 0x74
-
-#define F1 0x3B
-#define F2 0x3C
-#define F3 0x3D
-#define F4 0x3E
-#define F5 0x3F
-#define F6 0x40
-#define F7 0x41
-#define F8 0x42
-#define F9 0x43
-#define F10 0x44
-#define F11 0x85
-#define F12 0x86
-
-#define CTRLF1 0x5E
-#define CTRLF2 0x5F
-#define CTRLF3 0x60
-#define CTRLF4 0x61
-#define CTRLF5 0x62
-#define CTRLF6 0x63
-#define CTRLF7 0x64
-#define CTRLF8 0x65
-#define CTRLF9 0x66
-#define CTRLF10 0x67
-#define CTRLF11 0x89
-#define CTRLF12 0x8A
-
-#define ALTF1 0x68
-#define ALTF2 0x69
-#define ALTF3 0x6A
-#define ALTF4 0x6B
-#define ALTF5 0x6C
-#define ALTF6 0x6D
-#define ALTF7 0x6E
-#define ALTF8 0x6F
-#define ALTF9 0x70
-#define ALTF10 0x71
-#define ALTF11 0x8B
-#define ALTF12 0x8C
-
-/* Bits representing ShiftFlags, See Int16/Function 2 or Mem[0x417] to get this info */
-
-#define INSERT_ON (1<<7)
-#define CAPSLOCK_ON (1<<6)
-#define NUMLOCK_ON (1<<5)
-#define SCRLLOCK_ON (1<<4)
-#define ALT_PRESSED (1<<3)
-#define CTRL_PRESSED (1<<2)
-// actually 1<<1 is Left Shift, 1<<0 is right shift
-#define SHIFT_PRESSED (1<<1 | 1 <<0)
-
-#endif
diff --git a/com32/cmenu/libmenu/tui.c b/com32/cmenu/libmenu/tui.c
index 81e40793..dd69277a 100644
--- a/com32/cmenu/libmenu/tui.c
+++ b/com32/cmenu/libmenu/tui.c
@@ -14,12 +14,12 @@
#include <string.h>
#include <com32.h>
#include <stdlib.h>
+#include "com32io.h"
com32sys_t inreg, outreg; // Global register sets for use
char bkspstr[] = " \b$";
char eolstr[] = "\n$";
-#define GETSTRATTR 0x07
// Reads a line of input from stdin. Replace CR with NUL byte
// password <> 0 implies not echoed on screen
@@ -29,18 +29,16 @@ char eolstr[] = "\n$";
void getuserinput(char *stra, unsigned int size, unsigned int password,
unsigned int showoldvalue)
{
- unsigned char c, scan;
+ unsigned int c;
char *p, *q; // p = current char of string, q = tmp
char *last; // The current last char of string
char *str; // pointer to string which is going to be allocated
- char page;
char row, col;
char start, end; // Cursor shape
char fudge; // How many chars should be removed from output
char insmode; // Are we in insert or overwrite
- page = getdisppage();
- getpos(&row, &col, page); // Get current position
+ getpos(&row, &col, 0); // Get current position
getcursorshape(&start, &end);
insmode = 1;
@@ -67,14 +65,14 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
// col is the corresponding column on the screen
if (password == 0) // Not a password, print initial value
{
- gotoxy(row, col, page);
+ gotoxy(row, col);
csprint(str, GETSTRATTR);
}
while (1) { // Do forever
- c = inputc(&scan);
- if (c == '\r')
+ c = get_key(stdin, 0);
+ if (c == KEY_ENTER)
break; // User hit Enter getout of loop
- if (scan == ESCAPE) // User hit escape getout and nullify string
+ if (c == KEY_ESC) // User hit escape getout and nullify string
{
*str = 0;
break;
@@ -83,18 +81,18 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
// if scan code is regognized do something
// else if char code is recognized do something
// else ignore
- switch (scan) {
- case HOMEKEY:
+ switch (c) {
+ case KEY_HOME:
p = str;
break;
- case ENDKEY:
+ case KEY_END:
p = last;
break;
- case LTARROW:
+ case KEY_LEFT:
if (p > str)
p--;
break;
- case CTRLLT:
+ case KEY_CTRL(KEY_LEFT):
if (p == str)
break;
if (*p == ' ')
@@ -110,11 +108,11 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
while ((p > str) && ((*p == ' ') || (*(p - 1) != ' ')))
p--;
break;
- case RTARROW:
+ case KEY_RIGHT:
if (p < last)
p++;
break;
- case CTRLRT:
+ case KEY_CTRL(KEY_RIGHT):
if (*p == 0)
break; // At end of string
if (*p != ' ')
@@ -125,7 +123,8 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
if (*p == ' ')
p++;
break;
- case DELETE:
+ case KEY_DEL:
+ case KEY_DELETE:
q = p;
while (*(q + 1)) {
*q = *(q + 1);
@@ -135,17 +134,14 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
last--;
fudge = 1;
break;
- case INSERT:
+ case KEY_INSERT:
insmode = 1 - insmode; // Switch mode
if (insmode == 0)
setcursorshape(1, 7); // Block cursor
else
setcursorshape(6, 7); // Normal cursor
break;
-
- default: // Unrecognized scan code, look at the ascii value
- switch (c) {
- case '\b': // Move over by one
+ case KEY_BACKSPACE: // Move over by one
q = p;
while (q <= last) {
*(q - 1) = *q;
@@ -157,7 +153,7 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
p--;
fudge = 1;
break;
- case '\x15': /* Ctrl-U: kill input */
+ case KEY_CTRL('U'): /* Ctrl-U: kill input */
fudge = last - str;
while (p > str)
*p-- = 0;
@@ -165,7 +161,7 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
*p = 0;
last = str;
break;
- default: // Handle insert and overwrite mode
+ default: // Handle insert and overwrite mode
if ((c >= ' ') && (c < 128) &&
((unsigned int)(p - str) < size - 1)) {
if (insmode == 0) { // Overwrite mode
@@ -189,190 +185,59 @@ void getuserinput(char *stra, unsigned int size, unsigned int password,
}
} else
beep();
- }
break;
}
// Now the string has been modified, print it
if (password == 0) {
- gotoxy(row, col, page);
+ gotoxy(row, col);
csprint(str, GETSTRATTR);
if (fudge > 0)
- cprint(' ', GETSTRATTR, fudge, page);
- gotoxy(row, col + (p - str), page);
+ cprint(' ', GETSTRATTR, fudge);
+ gotoxy(row, col + (p - str));
}
- }
+ } /* while */
*p = '\0';
if (password == 0)
csprint("\r\n", GETSTRATTR);
setcursorshape(start, end); // Block cursor
// If user hit ESCAPE so return without any changes
- if (scan != ESCAPE)
+ if (c != KEY_ESC)
strcpy(stra, str);
free(str);
}
-/* Print a C string (NUL-terminated) */
-void cswprint(const char *str, char attr, char left)
-{
- char page = getdisppage();
- char newattr = 0, cha, chb;
- char row, col;
- char nr, nc;
-
- nr = getnumrows();
- nc = getnumcols();
- getpos(&row, &col, page);
- while (*str) {
- switch (*str) {
- case '\b':
- --col;
- break;
- case '\n':
- ++row;
- col = left;
- break;
- case '\r':
- //col=left;
- break;
- case BELL: // Bell Char
- beep();
- break;
- case CHRELATTR: // change attribute (relatively)
- case CHABSATTR: // change attribute (absolute)
- cha = *(str + 1);
- chb = *(str + 2);
- if ((((cha >= '0') && (cha <= '9')) || ((cha >= 'A') && (cha <= 'F'))) && (((chb >= '0') && (chb <= '9')) || ((chb >= 'A') && (chb <= 'F')))) // Next two chars are legal
- {
- if ((cha >= 'A') && (cha <= 'F'))
- cha = cha - 'A' + 10;
- else
- cha = cha - '0';
- if ((chb >= 'A') && (chb <= 'F'))
- chb = chb - 'A' + 10;
- else
- chb = chb - '0';
- newattr = (cha << 4) + chb;
- attr = (*str == CHABSATTR ? newattr : attr ^ newattr);
- str += 2; // Will be incremented again later
- }
- break;
- default:
- putch(*str, attr, page);
- ++col;
- }
- if (col >= nc) {
- ++row;
- col = left;
- }
- if (row > nr) {
- scrollup();
- row = nr;
- }
- gotoxy(row, col, page);
- str++;
- }
-}
-
-void clearwindow(char top, char left, char bot, char right, char page,
- char fillchar, char fillattr)
-{
- char x;
- for (x = top; x < bot + 1; x++) {
- gotoxy(x, left, page);
- cprint(fillchar, fillattr, right - left + 1, page);
- }
-}
-
-void cls(void)
-{
- unsigned char dp = getdisppage();
- gotoxy(0, 0, dp);
- cprint(' ', GETSTRATTR, (1 + getnumrows()) * getnumcols(), dp);
-}
-
//////////////////////////////Box Stuff
-// This order of numbers must match
-// the values of BOX_TOPLEFT,... in the header file
-
-unsigned char SINSIN_CHARS[] = { 218, 192, 191, 217, //Corners
- 196, 179, // Horiz and Vertical
- 195, 180, 194, 193, 197
-}; // Connectors & Middle
-
-unsigned char DBLDBL_CHARS[] = { 201, 200, 187, 188, // Corners
- 205, 186, // Horiz and Vertical
- 199, 182, 203, 202, 206
-}; // Connectors & Middle
-
-unsigned char SINDBL_CHARS[] = { 214, 211, 183, 189, // Corners
- 196, 186, // Horiz & Vert
- 199, 182, 210, 208, 215
-}; // Connectors & Middle
-
-unsigned char DBLSIN_CHARS[] = { 213, 212, 184, 190, // Corners
- 205, 179, // Horiz & Vert
- 198, 181, 209, 207, 216
-}; // Connectors & Middle
-
-unsigned char *getboxchars(boxtype bt)
-{
- switch (bt) {
- case BOX_SINSIN:
- return SINSIN_CHARS;
- break;
- case BOX_DBLDBL:
- return DBLDBL_CHARS;
- break;
- case BOX_SINDBL:
- return SINDBL_CHARS;
- break;
- case BOX_DBLSIN:
- return DBLSIN_CHARS;
- break;
- default:
- return SINSIN_CHARS;
- break;
- }
- return SINSIN_CHARS;
-}
-
// Draw box and lines
-void drawbox(char top, char left, char bot, char right,
- char page, char attr, boxtype bt)
+void drawbox(const char top, const char left, const char bot,
+ const char right, const char attr)
{
- unsigned char *box_chars; // pointer to array of box chars
unsigned char x;
-
- box_chars = getboxchars(bt);
+ putchar(SO);
// Top border
- gotoxy(top, left, page);
- cprint(box_chars[BOX_TOPLEFT], attr, 1, page);
- gotoxy(top, left + 1, page);
- cprint(box_chars[BOX_TOP], attr, right - left, page);
- gotoxy(top, right, page);
- cprint(box_chars[BOX_TOPRIGHT], attr, 1, page);
+ gotoxy(top, left);
+ putch(TOP_LEFT_CORNER_BORDER, attr);
+ cprint(TOP_BORDER, attr, right - left - 1);
+ putch(TOP_RIGHT_CORNER_BORDER, attr);
// Bottom border
- gotoxy(bot, left, page);
- cprint(box_chars[BOX_BOTLEFT], attr, 1, page);
- gotoxy(bot, left + 1, page);
- cprint(box_chars[BOX_BOT], attr, right - left, page);
- gotoxy(bot, right, page);
- cprint(box_chars[BOX_BOTRIGHT], attr, 1, page);
+ gotoxy(bot, left);
+ putch(BOTTOM_LEFT_CORNER_BORDER, attr);
+ cprint(BOTTOM_BORDER, attr, right - left - 1);
+ putch(BOTTOM_RIGHT_CORNER_BORDER, attr);
// Left & right borders
for (x = top + 1; x < bot; x++) {
- gotoxy(x, left, page);
- cprint(box_chars[BOX_LEFT], attr, 1, page);
- gotoxy(x, right, page);
- cprint(box_chars[BOX_RIGHT], attr, 1, page);
+ gotoxy(x, left);
+ putch(LEFT_BORDER, attr);
+ gotoxy(x, right);
+ putch(RIGHT_BORDER, attr);
}
+ putchar(SI);
}
-void drawhorizline(char top, char left, char right, char page, char attr,
- boxtype bt, char dumb)
+void drawhorizline(const char top, const char left, const char right,
+ const char attr, char dumb)
{
unsigned char start, end;
- unsigned char *box_chars = getboxchars(bt);
if (dumb == 0) {
start = left + 1;
end = right - 1;
@@ -380,12 +245,14 @@ void drawhorizline(char top, char left, char right, char page, char attr,
start = left;
end = right;
}
- gotoxy(top, start, page);
- cprint(box_chars[BOX_HORIZ], attr, end - start + 1, page);
+ gotoxy(top, start);
+ putchar(SO);
+ cprint(MIDDLE_BORDER, attr, end - start + 1);
if (dumb == 0) {
- gotoxy(top, left, page);
- cprint(box_chars[BOX_LTRT], attr, 1, page);
- gotoxy(top, right, page);
- cprint(box_chars[BOX_RTLT], attr, 1, page);
+ gotoxy(top, left);
+ putch(MIDDLE_BORDER, attr);
+ gotoxy(top, right);
+ putch(MIDDLE_BORDER, attr);
}
+ putchar(SI);
}
diff --git a/com32/cmenu/libmenu/tui.h b/com32/cmenu/libmenu/tui.h
index 4df15327..ed554878 100644
--- a/com32/cmenu/libmenu/tui.h
+++ b/com32/cmenu/libmenu/tui.h
@@ -14,23 +14,32 @@
#define __TUI_H__
#include <com32.h>
+#include <getkey.h>
+#include <consoles.h>
#include "syslnx.h"
#include "com32io.h"
-#include "scancodes.h"
#ifndef NULL
#define NULL ((void *)0)
#endif
-#define BELL 0x07
-// CHRELATTR = ^N, CHABSATTR = ^O
-#define CHABSATTR 15
-#define CHRELATTR 14
-
-void clearwindow(char top, char left, char bot, char right,
- char page, char fillchar, char fillattr);
+#define SO '\016'
+#define SI '\017'
+
+#define TOP_LEFT_CORNER_BORDER '\154'
+#define TOP_BORDER '\161'
+#define TOP_RIGHT_CORNER_BORDER '\153'
+#define BOTTOM_LEFT_CORNER_BORDER '\155'
+#define BOTTOM_BORDER '\161'
+#define BOTTOM_RIGHT_CORNER_BORDER '\152'
+#define LEFT_BORDER '\170'
+#define RIGHT_BORDER '\170'
+#define LEFT_MIDDLE_BORDER '\164'
+#define MIDDLE_BORDER '\161'
+#define RIGHT_MIDDLE_BORDER '\165'
-void cls(void); /* Clears the entire current screen page */
+#define BELL 0x07
+#define GETSTRATTR 0x07
// Generic user input,
// password = 0 iff chars echoed on screen
@@ -53,35 +62,14 @@ static inline void getpwd(char *str, unsigned int size)
getuserinput(str, size, 1, 0);
}
-// Box drawing Chars offsets into array
-#define BOX_TOPLEFT 0x0
-#define BOX_BOTLEFT 0x1
-#define BOX_TOPRIGHT 0x2
-#define BOX_BOTRIGHT 0x3
-#define BOX_TOP 0x4 // TOP = BOT = HORIZ
-#define BOX_BOT 0x4
-#define BOX_HORIZ 0x4
-#define BOX_LEFT 0x5
-#define BOX_RIGHT 0x5
-#define BOX_VERT 0x5 // LEFT=RIGHT=VERT
-#define BOX_LTRT 0x6
-#define BOX_RTLT 0x7
-#define BOX_TOPBOT 0x8
-#define BOX_BOTTOP 0x9
-#define BOX_MIDDLE 0xA
-
-typedef enum { BOX_SINSIN, BOX_DBLDBL, BOX_SINDBL, BOX_DBLSIN } boxtype;
-
-unsigned char *getboxchars(boxtype bt);
-
-void drawbox(char top, char left, char bot, char right,
- char page, char attr, boxtype bt);
+void drawbox(const char, const char, const char, const char,
+ const char);
// Draw a horizontal line
// dumb == 1, means just draw the line
// dumb == 0 means check the first and last positions and depending on what is
// currently on the screen make it a LTRT and/or RTLT appropriately.
-void drawhorizline(char top, char left, char right, char page, char attr,
- boxtype bt, char dumb);
+void drawhorizline(const char, const char, const char, const char,
+ const char dumb);
#endif
diff --git a/com32/hdt/hdt-cli.c b/com32/hdt/hdt-cli.c
index 222480ee..86e818f9 100644
--- a/com32/hdt/hdt-cli.c
+++ b/com32/hdt/hdt-cli.c
@@ -32,7 +32,6 @@
#include <getkey.h>
#include "hdt-cli.h"
#include "hdt-common.h"
-#include "lib-ansi.h"
struct cli_mode_descr *list_modes[] = {
&hdt_mode,
diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c
index 11887c39..28330a4c 100644
--- a/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@ -33,7 +33,6 @@
#include "syslinux/config.h"
#include "../lib/sys/vesa/vesa.h"
#include "hdt-common.h"
-#include "lib-ansi.h"
#include <disk/util.h>
#include <disk/mbrs.h>
@@ -538,6 +537,20 @@ char *remove_spaces(char *p)
return p;
}
+/* remove trailing LF */
+char *remove_trailing_lf(char *p)
+{
+ char *save=p;
+ p+=strlen(p)-1;
+ while (*p && *p == 10) {
+ *p='\0';
+ p--;
+ }
+ p=save;
+
+ return p;
+}
+
/* delete multiple spaces, one is enough */
char *del_multi_spaces(char *p) {
/* Saving the original pointer*/
diff --git a/com32/hdt/hdt-common.h b/com32/hdt/hdt-common.h
index ef9382b7..8ef24e7b 100644
--- a/com32/hdt/hdt-common.h
+++ b/com32/hdt/hdt-common.h
@@ -47,6 +47,7 @@
#include "hdt-ata.h"
#include "../lib/sys/vesa/vesa.h"
#include <vpd/vpd.h>
+#include <libansi.h>
/* Declare a variable or data structure as unused. */
#define __unused __attribute__ (( unused ))
@@ -161,6 +162,7 @@ struct s_hardware {
void reset_more_printf();
const char *find_argument(const char **argv, const char *argument);
char *remove_spaces(char *p);
+char *remove_trailing_lf(char *p);
char *skip_spaces(char *p);
char *del_multi_spaces(char *p);
int detect_dmi(struct s_hardware *hardware);
diff --git a/com32/hdt/hdt-menu-kernel.c b/com32/hdt/hdt-menu-kernel.c
index 7e2d6cab..81b44dbf 100644
--- a/com32/hdt/hdt-menu-kernel.c
+++ b/com32/hdt/hdt-menu-kernel.c
@@ -75,7 +75,7 @@ void compute_kernel(struct s_my_menu *menu, struct s_hardware *hardware)
kernel_modules,
pci_device->dev_info->class_name);
snprintf(infobar, sizeof infobar,
- "%04x:%04x %s : %s\n",
+ "%04x:%04x %s : %s",
pci_device->vendor,
pci_device->product,
pci_device->dev_info->vendor_name,
diff --git a/com32/hdt/hdt-menu-pci.c b/com32/hdt/hdt-menu-pci.c
index 4e0d5887..d4a6b7e7 100644
--- a/com32/hdt/hdt-menu-pci.c
+++ b/com32/hdt/hdt-menu-pci.c
@@ -167,7 +167,7 @@ int compute_PCI(struct s_hdt_menu *hdt_menu, struct s_hardware *hardware)
pci_device->dev_info->vendor_name,
pci_device->dev_info->product_name);
snprintf(infobar[i], STATLEN,
- "%02x:%02x.%01x # %s # ID:%04x:%04x[%04x:%04x] # Kmod:%s\n",
+ "%02x:%02x.%01x # %s # ID:%04x:%04x[%04x:%04x] # Kmod:%s",
__pci_bus, __pci_slot, __pci_func,
pci_device->dev_info->class_name, pci_device->vendor,
pci_device->product, pci_device->sub_vendor,
diff --git a/com32/hdt/hdt-menu-summary.c b/com32/hdt/hdt-menu-summary.c
index 6401221a..e8e2fc65 100644
--- a/com32/hdt/hdt-menu-summary.c
+++ b/com32/hdt/hdt-menu-summary.c
@@ -189,7 +189,7 @@ void compute_summarymenu(struct s_my_menu *menu, struct s_hardware *hardware)
kernel_modules,
pci_device->dev_info->class_name);
snprintf(statbuffer, sizeof statbuffer,
- "%04x:%04x %s : %s\n",
+ "%04x:%04x %s : %s",
pci_device->vendor,
pci_device->product,
pci_device->dev_info->vendor_name,
diff --git a/com32/hdt/hdt-menu-syslinux.c b/com32/hdt/hdt-menu-syslinux.c
index 4c874d0e..758274fe 100644
--- a/com32/hdt/hdt-menu-syslinux.c
+++ b/com32/hdt/hdt-menu-syslinux.c
@@ -76,8 +76,9 @@ void compute_syslinuxmenu(struct s_my_menu *menu, struct s_hardware *hardware)
snprintf(buffer, sizeof buffer, "%s",
hardware->sv->copyright_string + 1);
+ /* Remove the trailing LF in the copyright string to avoid scrolling */
snprintf(statbuffer, sizeof statbuffer, "%s",
- hardware->sv->copyright_string + 1);
+ remove_trailing_lf(hardware->sv->copyright_string + 1));
add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu->items_count++;
diff --git a/com32/hdt/hdt-menu.c b/com32/hdt/hdt-menu.c
index 53afefc9..298abae2 100644
--- a/com32/hdt/hdt-menu.c
+++ b/com32/hdt/hdt-menu.c
@@ -27,6 +27,7 @@
*/
#include "hdt-menu.h"
+#include <unistd.h>
int start_menu_mode(struct s_hardware *hardware, char *version_string)
{
@@ -84,26 +85,32 @@ TIMEOUTCODE ontimeout()
}
/* Keyboard handler for the menu system */
-void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode)
+void keys_handler(t_menusystem * ms __attribute__ (( unused )), t_menuitem * mi, int scancode)
{
- char nc;
+ int nr, nc;
- if ((scancode >> 8) == F1) { // If scancode of F1
+ /* 0xFFFF is an invalid helpid */
+ if (scancode == KEY_F1 && mi->helpid != 0xFFFF) {
runhelpsystem(mi->helpid);
}
+
/*
* 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)) {
+ if ((scancode == KEY_TAB) && (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, ms->menupage);
+ gotoxy(EDITPROMPT, 1);
csprint("Command line:", 0x07);
editstring(mi->data, ACTIONLEN);
- gotoxy(EDITPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc - 1, ms->menupage);
+ gotoxy(EDITPROMPT, 1);
+ cprint(' ', 0x07, nc - 1);
}
}
diff --git a/com32/hdt/hdt-menu.h b/com32/hdt/hdt-menu.h
index 6ac688f7..8743da35 100644
--- a/com32/hdt/hdt-menu.h
+++ b/com32/hdt/hdt-menu.h
@@ -29,6 +29,7 @@
#ifndef DEFINE_HDT_MENU_H
#define DEFINE_HDT_MENU_H
#include <stdio.h>
+#include <getkey.h>
#include "menu.h"
#include "help.h"
@@ -82,7 +83,7 @@ struct s_hdt_menu {
};
TIMEOUTCODE ontimeout();
-void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode);
+void keys_handler(t_menusystem * ms __attribute__ (( unused )), t_menuitem * mi, int scancode);
// PCI Stuff
int compute_PCI(struct s_hdt_menu *hdt_menu, struct s_hardware *hardware);
diff --git a/com32/hdt/lib-ansi.c b/com32/hdt/lib-ansi.c
deleted file mode 100644
index 411dba80..00000000
--- a/com32/hdt/lib-ansi.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *
- * Copyright 2009 Erwan Velu - All Rights Reserved
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall
- * be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * -----------------------------------------------------------------------
- * Ansi Sequences can be found here :
- * http://ascii-table.com/ansi-escape-sequences-vt-100.php
- * http://en.wikipedia.org/wiki/ANSI_escape_code
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-
-void display_cursor(bool status)
-{
- if (status == true) {
- fputs("\033[?25h", stdout);
- } else {
- fputs("\033[?25l", stdout);
- }
-}
-
-void clear_end_of_line() {
- fputs("\033[0K", stdout);
-}
-
-void move_cursor_left(int count) {
- char buffer[10];
- memset(buffer,0,sizeof(buffer));
- sprintf(buffer,"\033[%dD",count);
- fputs(buffer, stdout);
-}
-
-void move_cursor_right(int count) {
- char buffer[10];
- memset(buffer,0,sizeof(buffer));
- sprintf(buffer,"\033[%dC",count);
- fputs(buffer, stdout);
-}
-
-void set_cursor_blink(bool status) {
- if (status == true)
- fputs("\033[05m",stdout);
- else
- fputs("\033[0m",stdout);
-}
-
-void clear_line() {
- fputs("\033[2K", stdout);
-}
-
-void clear_beginning_of_line() {
- fputs("\033[1K", stdout);
-}
-
-void move_cursor_to_column(int count) {
- char buffer[10];
- memset(buffer,0,sizeof(buffer));
- sprintf(buffer,"\033[%dG",count);
- fputs(buffer, stdout);
-}
-
-void move_cursor_to_next_line() {
- fputs("\033e", stdout);
-}
-
-void disable_utf8() {
- fputs("\033%@", stdout);
-}
-
-void set_g1_special_char(){
- fputs("\033)0", stdout);
-}
-
-void set_us_g0_charset() {
- fputs("\033(B\1#0", stdout);
-}
-
-void clear_entire_screen() {
- fputs("\033[2J", stdout);
-}
diff --git a/com32/hdt/lib-ansi.h b/com32/hdt/lib-ansi.h
deleted file mode 100644
index 0b0d0d18..00000000
--- a/com32/hdt/lib-ansi.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *
- * Copyright 2009 Erwan Velu - All Rights Reserved
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall
- * be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * -----------------------------------------------------------------------
- */
-
-#ifndef DEFINE_LIB_ANSI_H
-#define DEFINE_LIB_ANSI_H
-void display_cursor(bool status);
-void clear_end_of_line();
-void move_cursor_left(int count);
-void move_cursor_right(int count);
-void clear_line();
-void clear_beginning_of_line();
-void move_cursor_to_column(int count);
-void move_cursor_to_next_line();
-void disable_utf8();
-void set_g1_special_char();
-void set_us_g0_charset();
-void clear_entire_screen();
-void set_cursor_blink(bool status);
-#endif
diff --git a/com32/include/libansi.h b/com32/include/libansi.h
new file mode 100644
index 00000000..f51c9a06
--- /dev/null
+++ b/com32/include/libansi.h
@@ -0,0 +1,114 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2009 Erwan Velu - All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall
+ * be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+#ifndef DEFINE_LIB_ANSI_H
+#define DEFINE_LIB_ANSI_H
+
+#define CSI "\e["
+
+void display_cursor(bool status);
+void clear_end_of_line(void);
+void move_cursor_left(int count);
+void move_cursor_right(int count);
+void clear_line(void);
+void clear_beginning_of_line(void);
+void move_cursor_to_column(int count);
+void move_cursor_to_next_line(void);
+void disable_utf8(void);
+void set_g1_special_char(void);
+void set_us_g0_charset(void);
+void clear_entire_screen(void);
+void set_cursor_blink(bool status);
+void move_cursor_to_next_line(void);
+void disable_utf8(void);
+void set_g1_special_char(void);
+void set_us_g0_charset(void);
+void clear_entire_screen(void);
+void clearwindow(const char top, const char left, const char bot,
+ const char right, const char fillchar, const char fillattr);
+
+static inline void beep(void)
+{
+ fputs("\007", stdout);
+}
+
+void reset_colors(void);
+
+/* Print a string */
+void csprint(const char *, const char);
+
+/* Print one character, one or more times */
+void cprint(const char, const char, unsigned int);
+
+/* Print one character, once */
+static inline void putch(const char x, char attr)
+{
+ cprint(x, attr, 1);
+}
+
+/*
+ * cls - clear and initialize the entire screen
+ *
+ * Note: when initializing xterm, one has to specify that
+ * G1 points to the alternate character set (this is not true
+ * by default). Without the initial printf "\033)0", line drawing
+ * characters won't be displayed.
+ */
+static inline void cls(void)
+{
+ fputs("\033e\033%@\033)0\033(B\1#0\033[?25l\033[2J", stdout);
+}
+
+static inline void cursoroff(void)
+{
+ display_cursor(false);
+}
+
+static inline void cursoron(void)
+{
+ display_cursor(true);
+}
+
+static inline void scrollup(int times)
+{
+ if (times > 0)
+ printf(CSI "%dS", times);
+}
+
+/* Scroll up display screen by one line */
+static inline void scrollup_once(void)
+{
+ printf(CSI "S");
+}
+
+static inline void gotoxy(const char row, const char col)
+{
+ printf(CSI "%d;%dH", row + 1, col + 1);
+}
+
+#endif
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 2bcffe80..3a9eafd6 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -53,6 +53,8 @@ LIBOBJS = \
\
sys/ansi.o \
\
+ sys/libansi.o \
+ \
sys/ansicon_write.o sys/ansiserial_write.o \
\
sys/vesacon_write.o sys/vesaserial_write.o \
diff --git a/com32/lib/sys/ansi.c b/com32/lib/sys/ansi.c
index 7d580856..17ace1d4 100644
--- a/com32/lib/sys/ansi.c
+++ b/com32/lib/sys/ansi.c
@@ -36,21 +36,22 @@
#include "ansi.h"
static const struct term_state default_state = {
+ .state = st_init,
+ .pvt = false,
+ .nparms = 0,
.xy = {0, 0},
.cindex = 0, /* First color table entry */
- .vtgraphics = 0,
+ .vtgraphics = false,
.intensity = 1,
- .underline = 0,
- .blink = 0,
- .reverse = 0,
+ .underline = false,
+ .blink = false,
+ .reverse = false,
.fg = 7,
.bg = 0,
- .autocr = 1, /* Mimic \n -> \r\n conversion by default */
+ .autocr = true, /* Mimic \n -> \r\n conversion by default */
+ .autowrap = true, /* Wrap lines by default */
.saved_xy = {0, 0},
- .cursor = 1,
- .state = st_init,
- .pvt = 0,
- .nparms = 0,
+ .cursor = true,
};
/* DEC VT graphics to codepage 437 table (characters 0x60-0x7F only) */
@@ -123,7 +124,7 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
if (st->vtgraphics && (ch & 0xe0) == 0x60)
ch = decvt_to_cp437[ch - 0x60];
- op->write_char(xy.x, xy.y, ch, st);
+ op->write_char(xy.x, xy.y, BIOS_PAGE, ch, st);
xy.x++;
}
break;
@@ -141,7 +142,8 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
break;
case '[':
st->state = st_csi;
- st->nparms = st->pvt = 0;
+ st->nparms = 0;
+ st->pvt = false;
memset(st->parms, 0, sizeof st->parms);
break;
case 'c':
@@ -170,7 +172,7 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
st->nparms = ANSI_MAX_PARMS - 1;
break;
} else if (ch == '?') {
- st->pvt = 1;
+ st->pvt = true;
} else {
switch (ch) {
case 'A':
@@ -278,22 +280,25 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
break;
case 'h':
case 'l':
- {
- int set = (ch == 'h');
- switch (st->parms[0]) {
- case 20:
- st->autocr = set;
- break;
- case 25:
- st->cursor = set;
- op->showcursor(st);
- break;
- default:
- /* Ignore */
- break;
- }
+ {
+ bool set = (ch == 'h');
+ switch (st->parms[0]) {
+ case 7: /* DECAWM */
+ st->autowrap = set;
+ break;
+ case 20: /* LNM */
+ st->autocr = set;
+ break;
+ case 25: /* DECTECM */
+ st->cursor = set;
+ op->showcursor(st);
+ break;
+ default:
+ /* Ignore */
+ break;
}
break;
+ }
case 'm':
{
static const int ansi2pc[8] =
@@ -421,8 +426,12 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
/* If we fell off the end of the screen, adjust */
if (xy.x >= cols) {
- xy.x = 0;
- xy.y++;
+ if (st->autowrap) {
+ xy.x = 0;
+ xy.y++;
+ } else {
+ xy.x = cols - 1;
+ }
}
while (xy.y >= rows) {
xy.y--;
@@ -430,6 +439,6 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch)
}
/* Update cursor position */
- op->set_cursor(xy.x, xy.y, st->cursor);
+ op->set_cursor(xy.x, xy.y, BIOS_PAGE, st->cursor);
st->xy = xy;
}
diff --git a/com32/lib/sys/ansi.h b/com32/lib/sys/ansi.h
index 0d1f1025..ed4b01cb 100644
--- a/com32/lib/sys/ansi.h
+++ b/com32/lib/sys/ansi.h
@@ -6,9 +6,15 @@
#define COM32_LIB_SYS_ANSI_H
#include <inttypes.h>
+#include <stdbool.h>
#define ANSI_MAX_PARMS 16
+#define BIOS_CURXY ((struct curxy *)0x450) /* Array for each page */
+#define BIOS_ROWS (*(uint8_t *)0x484) /* Minus one; if zero use 24 (= 25 lines) */
+#define BIOS_COLS (*(uint16_t *)0x44A) /* Number of columns on screen */
+#define BIOS_PAGE (*(uint8_t *)0x462) /* Current page number */
+
enum ansi_state {
st_init,
st_esc,
@@ -22,31 +28,32 @@ struct curxy {
} __attribute__ ((packed));
struct term_state {
- struct curxy xy;
- int cindex; /* SOH color index */
- int vtgraphics; /* VT graphics on/off */
- int intensity;
- int underline;
- int blink;
- int reverse;
- int fg;
- int bg;
- int autocr;
- struct curxy saved_xy;
- int cursor;
enum ansi_state state;
- int pvt; /* Private code? */
int nparms; /* Number of parameters seen */
int parms[ANSI_MAX_PARMS];
+ bool pvt; /* Private code? */
+ struct curxy xy;
+ struct curxy saved_xy;
+ uint8_t cindex; /* SOH color index */
+ uint8_t fg;
+ uint8_t bg;
+ uint8_t intensity;
+ bool vtgraphics; /* VT graphics on/off */
+ bool underline;
+ bool blink;
+ bool reverse;
+ bool autocr;
+ bool autowrap;
+ bool cursor;
};
struct ansi_ops {
void (*erase) (const struct term_state * st, int x0, int y0, int x1,
int y1);
- void (*write_char) (int x, int y, uint8_t ch, const struct term_state * st);
+ void (*write_char) (int x, int y, int page, uint8_t ch, const struct term_state * st);
void (*showcursor) (const struct term_state * st);
void (*scroll_up) (const struct term_state * st);
- void (*set_cursor) (int x, int y, int visible);
+ void (*set_cursor) (int x, int y, int page, int visible);
void (*beep) (void);
};
diff --git a/com32/lib/sys/ansicon_write.c b/com32/lib/sys/ansicon_write.c
index 7c2754e7..8ec16b0a 100644
--- a/com32/lib/sys/ansicon_write.c
+++ b/com32/lib/sys/ansicon_write.c
@@ -44,10 +44,10 @@
#include "ansi.h"
static void ansicon_erase(const struct term_state *, int, int, int, int);
-static void ansicon_write_char(int, int, uint8_t, const struct term_state *);
+static void ansicon_write_char(int, int, int, uint8_t, const struct term_state *);
static void ansicon_showcursor(const struct term_state *);
static void ansicon_scroll_up(const struct term_state *);
-static void ansicon_set_cursor(int, int, int);
+static void ansicon_set_cursor(int, int, int, int);
static struct term_state ts;
struct ansi_ops __ansicon_ops = {
@@ -65,11 +65,6 @@ static struct term_info ti = {
.op = &__ansicon_ops
};
-#define BIOS_CURXY ((struct curxy *)0x450) /* Array for each page */
-#define BIOS_ROWS (*(uint8_t *)0x484) /* Minus one; if zero use 24 (= 25 lines) */
-#define BIOS_COLS (*(uint16_t *)0x44A)
-#define BIOS_PAGE (*(uint8_t *)0x462)
-
/* Reference counter to the screen, to keep track of if we need
reinitialization. */
static int ansicon_counter = 0;
@@ -176,9 +171,8 @@ static void ansicon_showcursor(const struct term_state *st)
__intcall(0x10, &ireg, NULL);
}
-static void ansicon_set_cursor(int x, int y, int visible)
+static void ansicon_set_cursor(int x, int y, int page, int visible)
{
- const int page = BIOS_PAGE;
struct curxy xy = BIOS_CURXY[page];
static com32sys_t ireg;
@@ -193,16 +187,16 @@ static void ansicon_set_cursor(int x, int y, int visible)
}
}
-static void ansicon_write_char(int x, int y, uint8_t ch,
+static void ansicon_write_char(int x, int y, int page, uint8_t ch,
const struct term_state *st)
{
static com32sys_t ireg;
- ansicon_set_cursor(x, y, 0);
+ ansicon_set_cursor(x, y, 0, page);
ireg.eax.b[1] = 0x09;
ireg.eax.b[0] = ch;
- ireg.ebx.b[1] = BIOS_PAGE;
+ ireg.ebx.b[1] = page;
ireg.ebx.b[0] = ansicon_attribute(st);
ireg.ecx.w[0] = 1;
__intcall(0x10, &ireg, NULL);
diff --git a/com32/lib/sys/libansi.c b/com32/lib/sys/libansi.c
new file mode 100644
index 00000000..1c29aea0
--- /dev/null
+++ b/com32/lib/sys/libansi.c
@@ -0,0 +1,214 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2009 Erwan Velu - All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall
+ * be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * -----------------------------------------------------------------------
+ * Ansi Sequences can be found here :
+ * http://ascii-table.com/ansi-escape-sequences-vt-100.php
+ * http://en.wikipedia.org/wiki/ANSI_escape_code
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "libansi.h"
+
+void display_cursor(bool status)
+{
+ if (status == true) {
+ fputs(CSI "?25h", stdout);
+ } else {
+ fputs(CSI "?25l", stdout);
+ }
+}
+
+void clear_end_of_line() {
+ fputs(CSI "0K", stdout);
+}
+
+void move_cursor_left(int count) {
+ char buffer[10];
+ memset(buffer,0,sizeof(buffer));
+ sprintf(buffer,CSI "%dD",count);
+ fputs(buffer, stdout);
+}
+
+void move_cursor_right(int count) {
+ char buffer[10];
+ memset(buffer,0,sizeof(buffer));
+ sprintf(buffer, CSI "%dC", count);
+ fputs(buffer, stdout);
+}
+
+void set_cursor_blink(bool status) {
+ if (status == true)
+ fputs("\033[05m",stdout);
+ else
+ fputs("\033[0m",stdout);
+}
+
+void clear_line() {
+ fputs(CSI "2K", stdout);
+}
+
+void clear_beginning_of_line() {
+ fputs(CSI "1K", stdout);
+}
+
+void move_cursor_to_column(int count) {
+ char buffer[10];
+ memset(buffer,0,sizeof(buffer));
+ sprintf(buffer, CSI "%dG", count);
+ fputs(buffer, stdout);
+}
+
+void move_cursor_to_next_line() {
+ fputs("\033e", stdout);
+}
+
+void disable_utf8() {
+ fputs("\033%@", stdout);
+}
+
+void set_g1_special_char(){
+ fputs("\033)0", stdout);
+}
+
+void set_us_g0_charset() {
+ fputs("\033(B\1#0", stdout);
+}
+
+void clear_entire_screen() {
+ fputs(CSI "2J", stdout);
+}
+
+/**
+ * cprint_vga2ansi - given a VGA attribute, print a character
+ * @chr: character to print
+ * @attr: vga attribute
+ *
+ * Convert the VGA attribute @attr to an ANSI escape sequence and
+ * print it.
+ **/
+static void cprint_vga2ansi(const char chr, const char attr)
+{
+ static const char ansi_char[8] = "04261537";
+ static uint16_t last_attr = 0x300;
+ char buf[16], *p;
+
+ if (attr != last_attr) {
+ bool reset = false;
+ p = buf;
+ *p++ = '\033';
+ *p++ = '[';
+
+ if (last_attr & ~attr & 0x88) {
+ *p++ = '0';
+ *p++ = ';';
+ /* Reset last_attr to unknown to handle
+ * background/foreground attributes correctly */
+ last_attr = 0x300;
+ reset = true;
+ }
+ if (attr & 0x08) {
+ *p++ = '1';
+ *p++ = ';';
+ }
+ if (attr & 0x80) {
+ *p++ = '4';
+ *p++ = ';';
+ }
+ if (reset || (attr ^ last_attr) & 0x07) {
+ *p++ = '3';
+ *p++ = ansi_char[attr & 7];
+ *p++ = ';';
+ }
+ if (reset || (attr ^ last_attr) & 0x70) {
+ *p++ = '4';
+ *p++ = ansi_char[(attr >> 4) & 7];
+ *p++ = ';';
+ }
+ p[-1] = 'm'; /* We'll have generated at least one semicolon */
+ p[0] = '\0';
+
+ last_attr = attr;
+
+ fputs(buf, stdout);
+ }
+
+ putchar(chr);
+}
+
+void reset_colors()
+{
+ csprint(CSI "1D", 0x07);
+}
+
+/**
+ * cprint - given a VGA attribute, print a single character at cursor
+ * @chr: character to print
+ * @attr: VGA attribute
+ * @times: number of times to print @chr
+ *
+ * Note: @attr is a VGA attribute.
+ **/
+void cprint(const char chr, const char attr, unsigned int times)
+{
+ while (times--)
+ cprint_vga2ansi(chr, attr);
+}
+
+/**
+ * csprint - given a VGA attribute, print a NULL-terminated string
+ * @str: string to print
+ * @attr: VGA attribute
+ **/
+void csprint(const char *str, const char attr)
+{
+ while (*str) {
+ cprint(*str, attr, 1);
+ str++;
+ }
+}
+
+/**
+ * clearwindow - fill a given a region on the screen
+ * @top, @left, @bot, @right: coordinates to fill
+ * @fillchar: character to use to fill the region
+ * @fillattr: character attribute (VGA)
+ **/
+void clearwindow(const char top, const char left, const char bot,
+ const char right, const char fillchar, const char fillattr)
+{
+ char x;
+ for (x = top; x < bot + 1; x++) {
+ gotoxy(x, left);
+ cprint(fillchar, fillattr, right - left + 1);
+ }
+}
+
+
diff --git a/doc/memdisk.txt b/doc/memdisk.txt
index 79d76400..58ec748b 100644
--- a/doc/memdisk.txt
+++ b/doc/memdisk.txt
@@ -122,6 +122,12 @@ f) The following option can be used to pause to view the messages:
pause Wait for a keypress right before booting
+g) The following option can be used to set the real-mode stack size.
+ The default is 512 bytes, but if there is a failure it might be
+ interesting to set it to something larger:
+
+ stack=size Set the stack to "size" bytes
+
Some interesting things to note: