diff --git a/README b/README index e7ece2b3..6fe210ab 100644 --- a/README +++ b/README @@ -574,7 +574,7 @@ For more information use the /? command line switch with the programs. ================ ALT-ENTER Switch to full screen and back. -CTRL-PAUSE Pause emulation. +ALT-PAUSE Pause emulation. CTRL-F1 Start the keymapper. CTRL-F4 Change between mounted disk-images. Update directory cache for all drives! CTRL-F5 Save a screenshot.(png) diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp index 791cc022..d3030752 100644 --- a/src/debug/debug.cpp +++ b/src/debug/debug.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: debug.cpp,v 1.71 2005-11-24 17:53:48 qbix79 Exp $ */ +/* $Id: debug.cpp,v 1.72 2006-01-22 14:13:00 qbix79 Exp $ */ #include #include @@ -1977,7 +1977,7 @@ void DEBUG_Init(Section* sec) { MSG_Add("DEBUG_CONFIGFILE_HELP","Debugger related options.\n"); DEBUG_DrawScreen(); /* Add some keyhandlers */ - MAPPER_AddHandler(DEBUG_Enable,MK_pause,MMOD1,"debugger","Debugger"); + MAPPER_AddHandler(DEBUG_Enable,MK_pause,MMOD2,"debugger","Debugger"); /* Clear the TBreakpoint list */ memset((void*)&codeViewData,0,sizeof(codeViewData)); /* setup debug.com */ diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp index aa83df83..cb7ed663 100644 --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_programs.cpp,v 1.50 2006-01-05 14:14:52 c2woody Exp $ */ +/* $Id: dos_programs.cpp,v 1.51 2006-01-22 14:13:00 qbix79 Exp $ */ #include #include @@ -936,7 +936,7 @@ void DOS_SetupPrograms(void) { "They can be changed in the \033[33mkeymapper\033[0m.\n" "\n" "\033[33;1mALT-ENTER\033[0m : Go full screen and back.\n" - "\033[33;1mCTRL-PAUSE\033[0m : Pause DOSBox.\n" + "\033[33;1mALT-PAUSE\033[0m : Pause DOSBox.\n" "\033[33;1mCTRL-F1\033[0m : Start the \033[33mkeymapper\033[0m.\n" "\033[33;1mCTRL-F4\033[0m : Update directory cache for all drives! Swap mounted disk-image.\n" "\033[33;1mCTRL-F5\033[0m : Save a screenshot.\n" diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index 3f189057..8b7790e0 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: sdlmain.cpp,v 1.94 2005-12-02 10:02:03 qbix79 Exp $ */ +/* $Id: sdlmain.cpp,v 1.95 2006-01-22 14:13:00 qbix79 Exp $ */ #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -937,7 +937,7 @@ static void GUI_StartUp(Section * sec) { #if C_DEBUG /* Pause binds with activate-debugger */ #else - MAPPER_AddHandler(PauseDOSBox,MK_pause,MMOD1,"pause","Pause"); + MAPPER_AddHandler(PauseDOSBox,MK_pause,MMOD2,"pause","Pause"); #endif /* Get Keyboard state of numlock and capslock */ SDLMod keystate = SDL_GetModState(); diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp index f407c7ec..db6e4127 100644 --- a/src/shell/shell.cpp +++ b/src/shell/shell.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: shell.cpp,v 1.69 2006-01-12 10:20:20 qbix79 Exp $ */ +/* $Id: shell.cpp,v 1.70 2006-01-22 14:13:00 qbix79 Exp $ */ #include #include @@ -467,7 +467,7 @@ void SHELL_Init() { "\xBA \xBA\n" ); MSG_Add("SHELL_STARTUP_DEBUG", - "\xBA Press \033[31mctrl-Pause\033[37m to enter the debugger or start the exe with \033[33mDEBUG\033[37m.\xBA\n" + "\xBA Press \033[31malt-Pause\033[37m to enter the debugger or start the exe with \033[33mDEBUG\033[37m. \xBA\n" "\xBA \xBA\n" ); MSG_Add("SHELL_STARTUP_END",