Apple-2-Tools
/
apple2ix
mirror of https://github.com/mauiaaron/apple2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lite refactor keys API

This commit is contained in:
Aaron Culliney 2019-06-01 07:27:54 -07:00
parent 1a32756bd4
commit 20852bf737
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/keys.c
View File

@ -15,13 +15,6 @@
#include "common.h"
#define DEBUG_KEYS 0
#if DEBUG_KEYS
# define KEY_LOG(...) LOG(__VA_ARGS__)
#else
# define KEY_LOG(...)
#endif
static int next_key = -1;
static int last_scancode = -1;
@ -195,6 +188,23 @@ int keys_ascii2Scancode(uint8_t c) {
return scode_map[c&0x7f];
}
int keys_scancode2ASCII(int scancode, bool is_shifted, bool is_ctrl) {
if (scancode < 0) {
return -1;
}
int *keymap = NULL;
if (is_shifted && is_ctrl) {
keymap = apple_iie_keymap_shift_ctrl;
} else if (is_ctrl) {
keymap = apple_iie_keymap_ctrl;
} else if (is_shifted) {
keymap = apple_iie_keymap_shifted;
} else {
keymap = apple_iie_keymap_plain;
}
return keymap[scancode & 0x7f];
}
bool keys_isShifted(void) {
return key_pressed[SCODE_L_SHIFT] || key_pressed[SCODE_R_SHIFT];
}
@ -204,7 +214,7 @@ bool keys_isShifted(void) {
//
// NOTE: `scancode` can be either a scancode or an ASCII key.
void keys_handleInput(int scancode, bool is_pressed, bool is_ascii) {
KEY_LOG("keys ... scancode:%d is_pressed:%d is_ascii:%d", scancode, is_pressed, is_ascii);
SCOPE_TRACE_INTERFACE("keys_handleInput: scancode:%d is_pressed:%d is_ascii:%d", scancode, is_pressed, is_ascii);
if (is_ascii) {
last_scancode = -1;

1
src/keys.h
View File

@ -149,6 +149,7 @@ bool keys_isShifted(void);
int keys_ascii2Scancode(uint8_t ch);
void keys_handleInput(int scan_or_key, bool is_pressed, bool is_ascii);
int keys_scancode2ASCII(int scancode, bool is_shifted, bool is_ctrl);
uint8_t keys_apple2ASCII(uint8_t c, OUTPARM font_mode_t *mode);
#if INTERFACE_TOUCH