aboutsummaryrefslogtreecommitdiffstats
path: root/com32/cmenu/complex.c
diff options
context:
space:
mode:
Diffstat (limited to 'com32/cmenu/complex.c')
-rw-r--r--com32/cmenu/complex.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/com32/cmenu/complex.c b/com32/cmenu/complex.c
index 063125d6..fb68a319 100644
--- a/com32/cmenu/complex.c
+++ b/com32/cmenu/complex.c
@@ -65,7 +65,7 @@ TIMEOUTCODE ontimeout()
#define PWDATTR 0x74
#define EDITPROMPT 21
-void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode)
+void keys_handler(t_menuitem * mi, unsigned int scancode)
{
char nc;
@@ -78,15 +78,15 @@ void keys_handler(t_menusystem * ms, t_menuitem * mi, unsigned int scancode)
(isallowed(username, "editcmd") || isallowed(username, "root"))) {
nc = getnumcols();
// 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);
}
}
-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];
@@ -96,15 +96,15 @@ t_handler_return login_handler(t_menusystem * ms, t_menuitem * mi)
if (mi->item == loginstr) { /* User wants to login */
nc = getnumcols();
- gotoxy(PWDPROMPT, 1, ms->menupage);
+ gotoxy(PWDPROMPT, 1);
csprint("Enter Username: ", 0x07);
getstring(login, sizeof username);
- gotoxy(PWDPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
+ gotoxy(PWDPROMPT, 1);
+ cprint(' ', 0x07, nc);
csprint("Enter Password: ", 0x07);
getpwd(pwd, sizeof pwd);
- gotoxy(PWDPROMPT, 1, ms->menupage);
- cprint(' ', 0x07, nc, ms->menupage);
+ gotoxy(PWDPROMPT, 1);
+ cprint(' ', 0x07, nc);
if (authenticate_user(login, pwd)) {
strcpy(username, login);
@@ -137,18 +137,18 @@ void msys_handler(t_menusystem * ms, t_menuitem * mi)
void *v;
nc = getnumcols(); // Get number of columns
- gotoxy(PWDLINE, PWDCOLUMN, ms->menupage);
+ 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);
+ cprint(' ', 0x07, nc);
+ gotoxy(INFLINE + 1, 0);
+ cprint(' ', 0x07, nc);
return;
}
strcpy(infoline, " ");
@@ -167,13 +167,13 @@ 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);
+ cprint(' ', 0x07, nc);
+ gotoxy(INFLINE + 1, 0);
+ cprint(' ', 0x07, nc);
+ gotoxy(INFLINE, 0);
csprint("Kernel Arguments:", 0x07);
- gotoxy(INFLINE, 17, ms->menupage);
+ gotoxy(INFLINE, 17);
csprint(infoline, 0x07);
}