From ae1be112a25efeca448790ad7af43edec6061afc Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sat, 3 Apr 2010 16:13:51 +0000 Subject: [PATCH] To work or not to work... Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3564 --- src/gui/sdl_mapper.cpp | 6 ++++++ src/ints/bios_keyboard.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index 60393cfd..11b50af9 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -2326,11 +2326,17 @@ void MAPPER_Init(void) { if (SDL_GetModState()&KMOD_CAPS) { for (CBindList_it bit=caps_lock_event->bindlist.begin();bit!=caps_lock_event->bindlist.end();bit++) { (*bit)->ActivateBind(32767,true,true); +#if SDL_VERSION_ATLEAST(1, 2, 14) + (*bit)->DeActivateBind(false); +#endif } } if (SDL_GetModState()&KMOD_NUM) { for (CBindList_it bit=num_lock_event->bindlist.begin();bit!=num_lock_event->bindlist.end();bit++) { (*bit)->ActivateBind(32767,true,true); +#if SDL_VERSION_ATLEAST(1, 2, 14) + (*bit)->DeActivateBind(false); +#endif } } } diff --git a/src/ints/bios_keyboard.cpp b/src/ints/bios_keyboard.cpp index 8ad36559..272e69cc 100644 --- a/src/ints/bios_keyboard.cpp +++ b/src/ints/bios_keyboard.cpp @@ -246,7 +246,7 @@ static Bitu IRQ1_Handler(void) { flags2&=~(0x40+0x20);//remove numlock/capslock pressed (hack for sdl only reporting states) #endif if (DOS_LayoutKey(scancode,flags1,flags2,flags3)) return CBRET_NONE; -LOG_MSG("key input %d %d %d %d",scancode,flags1,flags2,flags3); +//LOG_MSG("key input %d %d %d %d",scancode,flags1,flags2,flags3); switch (scancode) { /* First the hard ones */ case 0xfa: /* ack. Do nothing for now */