Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-28 13:29:29 +00:00
Code Issues Projects Releases Wiki Activity

key handling improvements

Browse Source 
- keyboard joystick axes handled separately
    - discriminate more classic-interface-only codepaths
This commit is contained in:
Aaron Culliney 2014-12-01 22:00:45 -08:00
parent a6935b18c8
commit dd0085e3d7
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/keys.c
View File

@ -253,11 +253,13 @@ void c_keys_handle_input(int scancode, int pressed, int is_cooked)
break; break;
} }
#ifdef INTERFACE_CLASSIC
if (current_key == kF9) if (current_key == kF9)
{ {
timing_toggle_cpu_speed(); timing_toggle_cpu_speed();
break; break;
} }
#endif
if (current_key == kEND) if (current_key == kEND)
{ {
@ -282,10 +284,13 @@ void c_keys_handle_input(int scancode, int pressed, int is_cooked)
// Keypad emulated joystick relies on "raw" keyboard input // Keypad emulated joystick relies on "raw" keyboard input
if (joy_mode == JOY_KPAD) if (joy_mode == JOY_KPAD)
{ {
bool joy_axis_unpressed = !( key_pressed[SCODE_KPAD_U] || key_pressed[SCODE_KPAD_D] || key_pressed[SCODE_KPAD_L] || key_pressed[SCODE_KPAD_R] || bool joy_x_axis_unpressed = !( key_pressed[SCODE_KPAD_L] || key_pressed[SCODE_KPAD_R] ||
key_pressed[SCODE_KPAD_UL] || key_pressed[SCODE_KPAD_DL] || key_pressed[SCODE_KPAD_UR] || key_pressed[SCODE_KPAD_DR] ||
// and allow regular PC arrow keys to manipulate joystick...
key_pressed[SCODE_L] || key_pressed[SCODE_R]);
bool joy_y_axis_unpressed = !( key_pressed[SCODE_KPAD_U] || key_pressed[SCODE_KPAD_D] ||
key_pressed[SCODE_KPAD_UL] || key_pressed[SCODE_KPAD_DL] || key_pressed[SCODE_KPAD_UR] || key_pressed[SCODE_KPAD_DR] || key_pressed[SCODE_KPAD_UL] || key_pressed[SCODE_KPAD_DL] || key_pressed[SCODE_KPAD_UR] || key_pressed[SCODE_KPAD_DR] ||
// and allow regular PC arrow keys to manipulate joystick... key_pressed[SCODE_U] || key_pressed[SCODE_D]);
key_pressed[SCODE_U] || key_pressed[SCODE_D] || key_pressed[SCODE_L] || key_pressed[SCODE_R]);
if (key_pressed[ SCODE_KPAD_C ]) if (key_pressed[ SCODE_KPAD_C ])
{ {
@ -294,16 +299,25 @@ void c_keys_handle_input(int scancode, int pressed, int is_cooked)
} }
if (joy_auto_recenter) { if (joy_auto_recenter) {
static int unpressed_count = 0; static int x_unpressed_count = 0;
if (joy_axis_unpressed) { if (joy_x_axis_unpressed) {
++unpressed_count; ++x_unpressed_count;
if (unpressed_count > 2) { if (x_unpressed_count > 2) {
unpressed_count = 0; x_unpressed_count = 0;
joy_x = HALF_JOY_RANGE; joy_x = HALF_JOY_RANGE;
}
} else {
x_unpressed_count = 0;
}
static int y_unpressed_count = 0;
if (joy_y_axis_unpressed) {
++y_unpressed_count;
if (y_unpressed_count > 2) {
y_unpressed_count = 0;
joy_y = HALF_JOY_RANGE; joy_y = HALF_JOY_RANGE;
} }
} else { } else {
unpressed_count = 0; y_unpressed_count = 0;
} }
} }
@ -382,6 +396,7 @@ int c_mygetch(int block)
return retval; return retval;
} }
#ifdef INTERFACE_CLASSIC
void c_keys_set_key(int key) void c_keys_set_key(int key)
{ {
next_key = key; next_key = key;
@ -405,4 +420,5 @@ bool c_keys_is_interface_key(int key)
} }
return false; return false;
} }
#endif

2
src/keys.h
View File

@ -143,8 +143,10 @@ extern bool caps_lock;
int c_mygetch(int block); int c_mygetch(int block);
int c_rawkey(); int c_rawkey();
#ifdef INTERFACE_CLASSIC
void c_keys_set_key(int key); void c_keys_set_key(int key);
bool c_keys_is_interface_key(int key); bool c_keys_is_interface_key(int key);
#endif
int c_keys_is_shifted(); int c_keys_is_shifted();
int c_keys_ascii_to_scancode(int ch); int c_keys_ascii_to_scancode(int ch);
void c_keys_handle_input(int scancode, int pressed, int is_cooked); void c_keys_handle_input(int scancode, int pressed, int is_cooked);