[VM][BMJR][FAMILYBASIC][FP1100][M5][MULTI8][MAP1010] Apply before commit to some...

diff --git a/source/src/vm/bmjr/memory.cpp b/source/src/vm/bmjr/memory.cpp
index 8bd248f..85340e8 100644 (file)
--- a/source/src/vm/bmjr/memory.cpp
+++ b/source/src/vm/bmjr/memory.cpp
@@ -267,7 +267,7 @@ void MEMORY::event_frame()
        // If same as bm2, not effect below keys at Qt version.
        if(key_stat[VK_LCONTROL]) key_data &= ~0x10; // 英数     -> LCTRL
        if(key_stat[VK_LSHIFT  ]) key_data &= ~0x20; // 英記号   -> L-SHIFT
-       if(key_stat[VK_RWIN    ]) key_data &= ~0x40; // カナ記号 -> R-Win
+       if(key_stat[VK_RSHIFT  ]) key_data &= ~0x40; // カナ記号 -> R-Win
        if(key_stat[VK_KANA    ]) key_data &= ~0x80; // カナ     -> カタカナひらがな
 #else
        // this is same as "日立ベーシックマスターJr.(MB-6885)エミュレータ bm2"

diff --git a/source/src/vm/familybasic/memory.cpp b/source/src/vm/familybasic/memory.cpp
index 9ffcaf9..1d38d5d 100644 (file)
--- a/source/src/vm/familybasic/memory.cpp
+++ b/source/src/vm/familybasic/memory.cpp
@@ -298,7 +298,11 @@ uint32_t MEMORY::read_data8(uint32_t addr)
                        switch(kb_scan) {
                        case 1:
                                if(key_stat[0x15]) val &= ~0x02;        // KANA
+#if 0                          
 //                             if(key_stat[0x10]) val &= ~0x04;        // RSHIFT
+#else
+                               if(key_stat[VK_RSHIFT]) val &= ~0x04;   // RSHIFT
+#endif
                                if(key_stat[0xdc]) val &= ~0x08;        // '\\'
                                if(key_stat[0x23]) val &= ~0x10;        // STOP
                                break;
@@ -339,7 +343,11 @@ uint32_t MEMORY::read_data8(uint32_t addr)
                                if(key_stat[0x33]) val &= ~0x10;        // 3
                                break;
                        case 8:
+#if 0
                                if(key_stat[0x10]) val &= ~0x02;        // LSHIFT
+#else
+                               if(key_stat[VK_LSHIFT]) val &= ~0x02;   // LSHIFT
+#endif
                                if(key_stat[0x12]) val &= ~0x04;        // GRAPH
                                if(key_stat[0x31]) val &= ~0x08;        // 1
                                if(key_stat[0x32]) val &= ~0x10;        // 2

diff --git a/source/src/vm/fmtowns/fmtowns.h b/source/src/vm/fmtowns/fmtowns.h
index e385bdf..8428a07 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.h
+++ b/source/src/vm/fmtowns/fmtowns.h
@@ -122,7 +122,6 @@
 #define USE_CPU_TYPE           2
 #define USE_FLOPPY_DISK     4 // ??
 #define NOTIFY_KEY_DOWN
-#define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6

diff --git a/source/src/vm/fp1100/fp1100.h b/source/src/vm/fp1100/fp1100.h
index 5bf4787..c1b8911 100644 (file)
--- a/source/src/vm/fp1100/fp1100.h
+++ b/source/src/vm/fp1100/fp1100.h
@@ -32,7 +32,6 @@
 #define USE_TAPE               1
 #define USE_FLOPPY_DISK                2
 #define NOTIFY_KEY_DOWN
-#define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY_SHIFT     2
 #define USE_AUTO_KEY           5

diff --git a/source/src/vm/m5/m5.h b/source/src/vm/m5/m5.h
index 2b6f910..f839af8 100644 (file)
--- a/source/src/vm/m5/m5.h
+++ b/source/src/vm/m5/m5.h
@@ -40,8 +40,6 @@
 #include "../../fileio.h"
 #include "../vm_template.h"
 
-#define NOTIFY_KEY_DOWN_LR_SHIFT
-
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
        _T("PSG"), _T("CMT (Signal)"), _T("Noise (CMT)"),

diff --git a/source/src/vm/multi8/multi8.h b/source/src/vm/multi8/multi8.h
index f6c7b16..3a7445a 100644 (file)
--- a/source/src/vm/multi8/multi8.h
+++ b/source/src/vm/multi8/multi8.h
@@ -33,7 +33,6 @@
 #define TAPE_BINARY_ONLY
 #define USE_FLOPPY_DISK                2
 #define USE_KEY_LOCKED
-#define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6

diff --git a/source/src/vm/phc25/keyboard.cpp b/source/src/vm/phc25/keyboard.cpp
index bb8113b..58fc247 100644 (file)
--- a/source/src/vm/phc25/keyboard.cpp
+++ b/source/src/vm/phc25/keyboard.cpp
@@ -77,10 +77,18 @@ uint32_t KEYBOARD::read_io8(uint32_t addr)
                return key_stat[key_map[addr - 0x7800]] ? 0 : 1;
        } else if(addr == 0x7850) {
                // LSHIFT
+#if 0
                return key_stat[0x10] ? 0 : 1;
+#else
+               return key_stat[VK_LSHIFT] ? 0 : 1;
+#endif         
        } else if(addr == 0x7851) {
                // RSHIFT
+#if 0
                return 1;
+#else
+               return key_stat[VK_RSHIFT] ? 0 : 1;
+#endif
        } else if(addr == 0x7852) {
                // CTRL
                return key_stat[0x11] ? 0 : 1;