valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Display newline after key was pressed in 'pause' cmd

Browse source 
Move newline from the string message to the WriteOut in command itself.
This makes the PAUSE command behave like the original, which is
important for commands like DIR /P.
This commit is contained in:
Patryk Obara 2019-12-11 22:22:13 +01:00 • committed by Patryk Obara
parent 12ab0da9c8
commit c20579a835
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/shell.cpp
View file

@ -587,7 +587,7 @@ void SHELL_Init() {
MSG_Add("SHELL_CMD_DIR_BYTES_FREE","%5d Dir(s) %17s Bytes free.\n");
MSG_Add("SHELL_EXECUTE_DRIVE_NOT_FOUND","Drive %c does not exist!\nYou must \033[31mmount\033[0m it first. Type \033[1;33mintro\033[0m or \033[1;33mintro mount\033[0m for more information.\n");
MSG_Add("SHELL_EXECUTE_ILLEGAL_COMMAND","Illegal command: %s.\n");
MSG_Add("SHELL_CMD_PAUSE","Press any key to continue.\n");
MSG_Add("SHELL_CMD_PAUSE","Press any key to continue...");
MSG_Add("SHELL_CMD_PAUSE_HELP","Waits for 1 keystroke to continue.\n");
MSG_Add("SHELL_CMD_COPY_FAILURE","Copy failure : %s.\n");
MSG_Add("SHELL_CMD_COPY_SUCCESS"," %d File(s) copied.\n");

11
src/shell/shell_cmds.cpp
View file

@ -1047,12 +1047,15 @@ void DOS_Shell::CMD_REM(char * args) {
HELP("REM");
}
void DOS_Shell::CMD_PAUSE(char * args){
void DOS_Shell::CMD_PAUSE(char *args) {
HELP("PAUSE");
WriteOut(MSG_Get("SHELL_CMD_PAUSE"));
Bit8u c;Bit16u n=1;
DOS_ReadFile(STDIN,&c,&n);
if (c==0) DOS_ReadFile(STDIN,&c,&n); // read extended key
uint8_t c;
uint16_t n = 1;
DOS_ReadFile(STDIN, &c, &n);
if (c == 0)
DOS_ReadFile(STDIN, &c, &n); // read extended key
WriteOut_NoParsing("\n");
}
void DOS_Shell::CMD_CALL(char * args){