6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #466 from TomHarte/CPCKeyboard

Browse Source 
Improves key state handling under SDL when switching to/from full screen
This commit is contained in:
Thomas Harte 2018-06-14 17:26:11 -04:00 committed by GitHub
commit 1172c4fd97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -546,14 +546,14 @@ class KeyboardState: public GI::AY38910::PortHandler {
Sets the row currently being reported to the AY. Sets the row currently being reported to the AY.
*/ */
void set_row(int row) { void set_row(int row) {
row_ = row; row_ = static_cast<size_t>(row);
} }
/*! /*!
Reports the state of the currently-selected row as Port A to the AY. Reports the state of the currently-selected row as Port A to the AY.
*/ */
uint8_t get_port_input(bool port_b) { uint8_t get_port_input(bool port_b) {
if(!port_b && row_ < 10) { if(!port_b && row_ < sizeof(rows_)) {
return rows_[row_]; return rows_[row_];
} }
@ -565,7 +565,7 @@ class KeyboardState: public GI::AY38910::PortHandler {
*/ */
void set_is_pressed(bool is_pressed, int line, int key) { void set_is_pressed(bool is_pressed, int line, int key) {
int mask = 1 << key; int mask = 1 << key;
assert(line < 10); assert(static_cast<size_t>(line) < sizeof(rows_));
if(is_pressed) rows_[line] &= ~mask; else rows_[line] |= mask; if(is_pressed) rows_[line] &= ~mask; else rows_[line] |= mask;
} }
@ -573,12 +573,12 @@ class KeyboardState: public GI::AY38910::PortHandler {
Sets all keys as currently unpressed. Sets all keys as currently unpressed.
*/ */
void clear_all_keys() { void clear_all_keys() {
memset(rows_, 0xff, 10); memset(rows_, 0xff, sizeof(rows_));
} }
private: private:
uint8_t rows_[10]; uint8_t rows_[10];
int row_; size_t row_;
}; };
/*! /*!

6
OSBindings/SDL/main.cpp
View File

@ -461,6 +461,12 @@ int main(int argc, char *argv[]) {
fullscreen_mode ^= SDL_WINDOW_FULLSCREEN_DESKTOP; fullscreen_mode ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
SDL_SetWindowFullscreen(window, fullscreen_mode); SDL_SetWindowFullscreen(window, fullscreen_mode);
SDL_ShowCursor((fullscreen_mode&SDL_WINDOW_FULLSCREEN_DESKTOP) ? SDL_DISABLE : SDL_ENABLE); SDL_ShowCursor((fullscreen_mode&SDL_WINDOW_FULLSCREEN_DESKTOP) ? SDL_DISABLE : SDL_ENABLE);
// Announce a potential discontinuity in keyboard input.
auto keyboard_machine = machine->keyboard_machine();
if(keyboard_machine) {
keyboard_machine->get_keyboard().reset_all_keys();
}
break; break;
} }