From f6efa75ba5611997d00e8bfbac1f29c6745a8688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Thu, 9 Feb 2006 21:29:19 +0000 Subject: [PATCH] fix a few key combinations of the numblock when numlock enabled Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2481 --- src/ints/bios_keyboard.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ints/bios_keyboard.cpp b/src/ints/bios_keyboard.cpp index ffce76d3..b80817e4 100644 --- a/src/ints/bios_keyboard.cpp +++ b/src/ints/bios_keyboard.cpp @@ -368,10 +368,10 @@ static Bitu IRQ1_Handler(void) { if(scancode == 0x52) flags2 |=0x80; /* press insert */ if(flags1 &0x08) { add_key(scan_to_scanascii[scancode].normal+0x5000); - } else if( ((flags1 &0x3) != 0) ^ ((flags1 &0x20) != 0) ) { - add_key((scan_to_scanascii[scancode].shift&0xff00)|0xe0); } else if (flags1 &0x04) { add_key((scan_to_scanascii[scancode].control&0xff00)|0xe0); + } else if( ((flags1 &0x3) != 0) || ((flags1 &0x20) != 0) ) { + add_key((scan_to_scanascii[scancode].shift&0xff00)|0xe0); } else add_key((scan_to_scanascii[scancode].normal&0xff00)|0xe0); break; } @@ -381,7 +381,7 @@ static Bitu IRQ1_Handler(void) { mem_writeb(BIOS_KEYBOARD_TOKEN,token); } else if (flags1 &0x04) { add_key(scan_to_scanascii[scancode].control); - } else if( ((flags1 &0x3) != 0) ^ ((flags1 &0x20) != 0) ) { + } else if( ((flags1 &0x3) != 0) || ((flags1 &0x20) != 0) ) { add_key(scan_to_scanascii[scancode].shift); } else add_key(scan_to_scanascii[scancode].normal); break;