[Qt][OSD][KEYBOARD] Remove some obsoleted defines.

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 9012c0e..847a324 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,5 +1,5 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 2.22.2)
+SET(THIS_LIB_VERSION 2.22.3)
 
 set(s_qt_osd_headers
        osd_base.h

diff --git a/source/src/qt/common/menu_flags.cpp b/source/src/qt/common/menu_flags.cpp
index d412724..dd0cee7 100644 (file)
--- a/source/src/qt/common/menu_flags.cpp
+++ b/source/src/qt/common/menu_flags.cpp
@@ -94,7 +94,6 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
        base_qd_num = 1;
        
        use_scanline = use_screen_rotate = false;
-       use_shift_numpad_key = false;
        screen_mode_num = 1;
 
 
@@ -137,7 +136,6 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
        vm_buttons_d = NULL;
 
        use_vertical_pixel_lines = false;
-       notify_key_down_lr_shift = false;
        tape_binary_only = false;
 #if defined(DEVICE_NAME)
        device_name = QString::fromUtf8(DEVICE_NAME);
@@ -402,9 +400,6 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
 #if defined(USE_SCREEN_ROTATE)
        use_screen_rotate = true;
 #endif
-#if defined(USE_SHIFT_NUMPAD_KEY)
-       use_shift_numpad_key = true;
-#endif
 #if defined(MAX_SCSI)
        max_scsi = MAX_SCSI;
 #endif
@@ -441,9 +436,6 @@ USING_FLAGS_EXT::USING_FLAGS_EXT(config_t *cfg) : USING_FLAGS(cfg)
 #if defined(USE_VERTICAL_PIXEL_LINES)
        use_vertical_pixel_lines = true;
 #endif
-#if defined(NOTIFY_KEY_DOWN_LR_SHIFT)
-       notify_key_down_lr_shift = true;
-#endif
 #if defined(TAPE_BINARY_ONLY)
        tape_binary_only = true;
 #endif 

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index e44b7a1..0aeeb6a 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/gui")
 
-set(THIS_LIB_VERSION 2.19.10)
+set(THIS_LIB_VERSION 2.19.11)
 #include(cotire)
 #include(PrecompiledHeader)
 

diff --git a/source/src/qt/gui/menu_emulator.cpp b/source/src/qt/gui/menu_emulator.cpp
index 486ab99..c62e12b 100644 (file)
--- a/source/src/qt/gui/menu_emulator.cpp
+++ b/source/src/qt/gui/menu_emulator.cpp
@@ -189,7 +189,7 @@ void Ui_MainWindowBase::rise_keyboard_dialog(void)
                        for(auto i = phys_key_name_map.constBegin(); i != phys_key_name_map.constEnd(); ++i)
                        {
                                bool is_set = false;
-                               if(!using_flags->is_notify_key_down_lr_shift()) {
+//                             if(!using_flags->is_notify_key_down_lr_shift()) {
                                        if(i.key() == VK_SHIFT) {
                                                emit sig_add_keyname_table(VK_LSHIFT, i.value());
                                                emit sig_add_keyname_table(VK_RSHIFT, i.value());
@@ -199,7 +199,7 @@ void Ui_MainWindowBase::rise_keyboard_dialog(void)
                                                emit sig_add_keyname_table(VK_RMENU, i.value());
                                                is_set = true;
                                        }
-                               }
+//                             }
                                if(i.key() == VK_CONTROL) {
                                        emit sig_add_keyname_table(VK_LCONTROL, i.value());
                                        emit sig_add_keyname_table(VK_RCONTROL, i.value());

diff --git a/source/src/qt/gui/menu_flags.h b/source/src/qt/gui/menu_flags.h
index 57e46ba..ca3a0ff 100644 (file)
--- a/source/src/qt/gui/menu_flags.h
+++ b/source/src/qt/gui/menu_flags.h
@@ -120,7 +120,6 @@ protected:
 
        bool use_scanline;
        bool use_screen_rotate;
-       bool use_shift_numpad_key;
 
        int max_scsi;
 
@@ -158,7 +157,6 @@ protected:
        
        int screen_width_aspect;
        int screen_height_aspect;
-       bool notify_key_down_lr_shift;
 
        bool tape_binary_only;
        int screen_mode_num;
@@ -278,7 +276,6 @@ public:
 
        bool is_use_scanline() { return use_scanline; }
        bool is_use_screen_rotate() { return use_screen_rotate; }
-       bool is_use_shift_numpad_key() { return use_shift_numpad_key; }
 
        int get_max_scsi() { return max_scsi; }
 
@@ -318,7 +315,6 @@ public:
        button_desc_t *get_vm_buttons() { return vm_buttons_d; }
        vm_ranges_t *get_draw_ranges() { return vm_ranges_d; }
 
-       bool is_notify_key_down_lr_shift() { return notify_key_down_lr_shift; }
        bool is_tape_binary_only() { return tape_binary_only; }
 
        bool is_machine_basicmaster_variants() { return machine_basicmaster_variants; }

diff --git a/source/src/qt/gui/menu_flags_tmpl.cpp b/source/src/qt/gui/menu_flags_tmpl.cpp
index 0bf95e5..3a62ca0 100644 (file)
--- a/source/src/qt/gui/menu_flags_tmpl.cpp
+++ b/source/src/qt/gui/menu_flags_tmpl.cpp
@@ -60,7 +60,6 @@ USING_FLAGS::USING_FLAGS(config_t *cfg)
        max_qd = 0;
        max_tape = 0;
        use_scanline = use_screen_rotate = false;
-       use_shift_numpad_key = false;
        screen_mode_num = 1;
 
 
@@ -148,7 +147,6 @@ USING_FLAGS::USING_FLAGS(config_t *cfg)
        base_qd_num = 1;
        
        use_scanline = use_screen_rotate = false;
-       use_shift_numpad_key = false;
        screen_mode_num = 1;
 
 
@@ -184,7 +182,6 @@ USING_FLAGS::USING_FLAGS(config_t *cfg)
        vm_ranges_d = NULL;
        
        use_vertical_pixel_lines = false;
-       notify_key_down_lr_shift = false;
        tape_binary_only = false;
        device_name = QString::fromUtf8("");
        config_name = QString::fromUtf8("");

diff --git a/source/src/qt/gui/qt_input.cpp b/source/src/qt/gui/qt_input.cpp
index a93e04a..04f5c0c 100644 (file)
--- a/source/src/qt/gui/qt_input.cpp
+++ b/source/src/qt/gui/qt_input.cpp
@@ -167,11 +167,13 @@ uint32_t GLDrawClass::get106Scancode2VK(uint32_t data)
                        vk = VK_KANJI;
                }
        }
+       /*
        if(!using_flags->is_notify_key_down_lr_shift()) {
                if((vk == VK_LSHIFT) || (vk == VK_RSHIFT)) vk = VK_SHIFT;
                if((vk == VK_LMENU) || (vk == VK_RMENU)) vk = VK_MENU;
        }
-       if((vk == VK_LCONTROL) || (vk == VK_RCONTROL)) vk = VK_CONTROL;
+       */
+//     if((vk == VK_LCONTROL) || (vk == VK_RCONTROL)) vk = VK_CONTROL;
        if(p_config->numpad_enter_as_fullkey) {
                if(vk == VK_OEM_CSP_KPRET) vk = VK_RETURN;
        }
@@ -250,6 +252,7 @@ void GLDrawClass::keyReleaseEvent(QKeyEvent *event)
        if(event->isAutoRepeat()) return;
        scan = event->nativeScanCode();
        vk = get106Scancode2VK(scan);
+       /*
 #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)  
        if(using_flags->is_notify_key_down_lr_shift()) {
                if(vk == VK_SHIFT) {
@@ -262,6 +265,7 @@ void GLDrawClass::keyReleaseEvent(QKeyEvent *event)
                }
        }
 #endif
+       */
        //QThread::msleep(2);
        //printf("Key: UP: VK=%d SCAN=%04x MOD=%08x\n", vk, scan, mod);
        emit sig_key_up(vk, mod);
@@ -286,6 +290,7 @@ void GLDrawClass::keyPressEvent(QKeyEvent *event)
                        return;
                }
        }
+       /*
 #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)  
        if(using_flags->is_notify_key_down_lr_shift()) {
                if(vk == VK_SHIFT) {
@@ -298,6 +303,7 @@ void GLDrawClass::keyPressEvent(QKeyEvent *event)
                }
        }
 #endif
+       */
        emit sig_key_down(vk, mod, false);
 }
 

diff --git a/source/src/qt/osd.cpp b/source/src/qt/osd.cpp
index 5ebb429..8ed7bdf 100644 (file)
--- a/source/src/qt/osd.cpp
+++ b/source/src/qt/osd.cpp
@@ -1150,13 +1150,9 @@ void OSD::set_features(void)
        set_features_debug();
 
        __USE_AUTO_KEY = false;
-       __USE_SHIFT_NUMPAD_KEY = false;
 #ifdef USE_AUTO_KEY
        __USE_AUTO_KEY = true;
 #endif
-#ifdef USE_SHIFT_NUMPAD_KEY
-       __USE_SHIFT_NUMPAD_KEY = true;
-#endif
 }
 
 extern std::string cpp_homedir;

diff --git a/source/src/qt/osd_base.h b/source/src/qt/osd_base.h
index b3e59a0..f07250c 100644 (file)
--- a/source/src/qt/osd_base.h
+++ b/source/src/qt/osd_base.h
@@ -172,7 +172,6 @@ protected:
        QList<supportedlist_t> SupportedFeatures;
        
        bool __USE_AUTO_KEY;
-       bool __USE_SHIFT_NUMPAD_KEY;
    
        _TCHAR app_path[_MAX_PATH];
        QElapsedTimer osd_timer;

diff --git a/source/src/qt/osd_input.cpp b/source/src/qt/osd_input.cpp
index 6a62f80..25cc343 100644 (file)
--- a/source/src/qt/osd_input.cpp
+++ b/source/src/qt/osd_input.cpp
@@ -277,26 +277,29 @@ void OSD_BASE::key_down(int code, bool extended, bool repeat)
                //csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_OSD, "KEY DOWN %d", code);
                //if(!dinput_key_available) {
                        if(code == VK_SHIFT) {
+                               if(!(key_status[VK_RSHIFT] & 0x80) && (GetAsyncKeyState(VK_RSHIFT) & 0x8000)) {
+                                       key_down_native(VK_RSHIFT, repeat);
+                               }
                                if(!(key_status[VK_LSHIFT] & 0x80) && (GetAsyncKeyState(VK_LSHIFT) & 0x8000)) {
                                        code = VK_LSHIFT;
-                               } else if(!(key_status[VK_RSHIFT] & 0x80) && (GetAsyncKeyState(VK_RSHIFT) & 0x8000)) {
-                                       code = VK_RSHIFT;
                                } else {
                                        return;
                                }
                        } else if(code == VK_CONTROL) {
+                               if(!(key_status[VK_RCONTROL] & 0x80) && (GetAsyncKeyState(VK_RCONTROL) & 0x8000)) {
+                                       key_down_native(VK_RCONTROL, repeat);
+                               }
                                if(!(key_status[VK_LCONTROL] & 0x80) && (GetAsyncKeyState(VK_LCONTROL) & 0x8000)) {
                                        code = VK_LCONTROL;
-                               } else if(!(key_status[VK_RCONTROL] & 0x80) && (GetAsyncKeyState(VK_RCONTROL) & 0x8000)) {
-                                       code = VK_RCONTROL;
                                } else {
                                        return;
                                }
                        } else if(code == VK_MENU) {
+                               if(!(key_status[VK_RMENU] & 0x80) && (GetAsyncKeyState(VK_RMENU) & 0x8000)) {
+                                       key_down_native(VK_RMENU, repeat);
+                               }
                                if(!(key_status[VK_LMENU] & 0x80) && (GetAsyncKeyState(VK_LMENU) & 0x8000)) {
                                        code = VK_LMENU;
-                               } else if(!(key_status[VK_RMENU] & 0x80) && (GetAsyncKeyState(VK_RMENU) & 0x8000)) {
-                                       code = VK_RMENU;
                                } else {
                                        return;
                                }
@@ -331,8 +334,6 @@ void OSD_BASE::key_down(int code, bool extended, bool repeat)
                                break;
                        }
    
-//#ifdef USE_SHIFT_NUMPAD_KEY
-                       if(__USE_SHIFT_NUMPAD_KEY) {
 //                     if(code == VK_LSHIFT || code == VK_RSHIFT) {
                        if(code == VK_LSHIFT) {
                                key_shift_pressed = true;
@@ -402,9 +403,6 @@ void OSD_BASE::key_down(int code, bool extended, bool repeat)
                                        break;
                                }
                        }
-                  }
-                  
-//#endif
                        key_down_native(code, repeat);
                //} else {
                //      if(repeat || code == 0xf0 || code == 0xf1 || code == 0xf2 || code == 0xf3 || code == 0xf4) {
@@ -478,9 +476,6 @@ void OSD_BASE::key_up(int code, bool extended)
                                break;
                        }
                                        
-//#ifdef USE_SHIFT_NUMPAD_KEY
-                       if(__USE_SHIFT_NUMPAD_KEY) {
-                       
 //                     if(code == VK_LSHIFT || code == VK_RSHIFT) {
                                if(code == VK_LSHIFT) {
                                        key_shift_pressed = false;
@@ -532,13 +527,8 @@ void OSD_BASE::key_up(int code, bool extended)
                                                return;
                                        }
                                }
-                       }
-//#endif
                        key_up_native(code);
-               }
-//#ifdef USE_AUTO_KEY
-//}
-//#endif
+       }
 }