80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the handling of the Toshiba Fn keys, fixes #2778.

Browse Source
This commit is contained in:
OBattler
2022-10-31 04:04:47 +01:00
parent 90f67ee4fb
commit fb8dcab3bd
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/keyboard.c
View File

@@ -140,10 +140,10 @@ keyboard_input(int down, uint16_t scan)
if (recv_key[scan & 0x1ff] ^ down) { if (recv_key[scan & 0x1ff] ^ down) {
if (down) { if (down) {
switch (scan & 0x1ff) { switch (scan & 0x1ff) {
case 0x01c: /* Left Ctrl */ case 0x01d: /* Left Ctrl */
shift |= 0x01; shift |= 0x01;
break; break;
case 0x11c: /* Right Ctrl */ case 0x11d: /* Right Ctrl */
shift |= 0x10; shift |= 0x10;
break; break;
case 0x02a: /* Left Shift */ case 0x02a: /* Left Shift */
@@ -161,10 +161,10 @@ keyboard_input(int down, uint16_t scan)
} }
} else { } else {
switch (scan & 0x1ff) { switch (scan & 0x1ff) {
case 0x01c: /* Left Ctrl */ case 0x01d: /* Left Ctrl */
shift &= ~0x01; shift &= ~0x01;
break; break;
case 0x11c: /* Right Ctrl */ case 0x11d: /* Right Ctrl */
shift &= ~0x10; shift &= ~0x10;
break; break;
case 0x02a: /* Left Shift */ case 0x02a: /* Left Shift */

2
src/device/keyboard_at.c
View File

@@ -866,7 +866,7 @@ add_data_kbd(uint16_t val)
} }
/* Test for T3100E 'Fn' key (Right Alt / Right Ctrl) */ /* Test for T3100E 'Fn' key (Right Alt / Right Ctrl) */
if ((dev != NULL) && (kbc_ven == KBC_VEN_TOSHIBA) && (keyboard_recv(0xb8) || keyboard_recv(0x9d))) if ((dev != NULL) && (kbc_ven == KBC_VEN_TOSHIBA) && (keyboard_recv(0x138) || keyboard_recv(0x11d)))
switch (val) { switch (val) {
case 0x4f: case 0x4f:
t3100e_notify_set(0x01); t3100e_notify_set(0x01);

2
src/device/keyboard_xt.c
View File

@@ -429,7 +429,7 @@ kbd_adddata(uint16_t val)
{ {
/* Test for T1000 'Fn' key (Right Alt / Right Ctrl) */ /* Test for T1000 'Fn' key (Right Alt / Right Ctrl) */
if (is_t1x00) { if (is_t1x00) {
if (keyboard_recv(0xb8) || keyboard_recv(0x9d)) { /* 'Fn' pressed */ if (keyboard_recv(0x138) || keyboard_recv(0x11d)) { /* 'Fn' pressed */
t1000_syskey(0x00, 0x04, 0x00); /* Set 'Fn' indicator */ t1000_syskey(0x00, 0x04, 0x00); /* Set 'Fn' indicator */
switch (val) { switch (val) {
case 0x45: /* Num Lock => toggle numpad */ case 0x45: /* Num Lock => toggle numpad */

1
src/include/86box/keyboard.h
View File

@@ -150,6 +150,7 @@ extern const device_t keyboard_pravetz_device;
extern const device_t keyboard_xt_device; extern const device_t keyboard_xt_device;
extern const device_t keyboard_xt86_device; extern const device_t keyboard_xt86_device;
extern const device_t keyboard_xt_compaq_device; extern const device_t keyboard_xt_compaq_device;
extern const device_t keyboard_xt_t1x00_device;
extern const device_t keyboard_tandy_device; extern const device_t keyboard_tandy_device;
# if defined(DEV_BRANCH) && defined(USE_LASERXT) # if defined(DEV_BRANCH) && defined(USE_LASERXT)
extern const device_t keyboard_xt_lxt3_device; extern const device_t keyboard_xt_lxt3_device;