6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-12-28 05:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Capture Ctrl keys in keydown, not keypress

Browse Source
This commit is contained in:
Micah Cowan 2022-01-28 00:01:51 -08:00
parent b3d42f944b
commit 45ee1b5c28
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/emu.ts
View File

@ -53,7 +53,7 @@ export enum KeyFlags {
export function _setKeyboardEvents(canvas:HTMLElement, callback:KeyboardCallback) { export function _setKeyboardEvents(canvas:HTMLElement, callback:KeyboardCallback) {
canvas.onkeydown = (e) => { canvas.onkeydown = (e) => {
callback(e.which, 0, KeyFlags.KeyDown|_metakeyflags(e)); callback(e.which, 0, KeyFlags.KeyDown|_metakeyflags(e));
if (e.which == 8 || e.which == 9 || e.which == 27) { // eat backspace, tab, escape keys if (e.ctrlKey || e.which == 8 || e.which == 9 || e.which == 27) { // eat backspace, tab, escape keys
e.preventDefault(); e.preventDefault();
} }
}; };

12
src/machine/apple2.ts
View File

@ -303,6 +303,18 @@ export class AppleII extends BasicScanlineMachine {
case 39: code=21; break; // right case 39: code=21; break; // right
case 38: code=11; break; // up case 38: code=11; break; // up
case 40: code=10; break; // down case 40: code=10; break; // down
default:
if (flags & KeyFlags.Ctrl) {
code = key;
if (code >= 0x61 && code <= 0x7a)
code -= 32;
if (key >= 65 && code < 65+26) {
code -= 64; // ctrl
}
else {
code = 0;
}
}
} }
if (code) if (code)
this.kbdlatch = (code | 0x80) & 0xff; this.kbdlatch = (code | 0x80) & 0xff;