Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented chat start event from disabling alt-enter fullscreen

This commit is contained in:
MysterD 2020-09-15 09:54:04 -07:00
parent 7f1a3631b1
commit d44ae27393
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pc/controller/controller_keyboard.c
View File

@ -58,7 +58,7 @@ static int keyboard_map_scancode(int scancode) {
return ret;
}
static void keyboard_alter_text_input_modifier(int scancode, bool down) {
static void keyboard_alter_modifier(int scancode, bool down) {
if (down) {
switch (scancode) {
case SCANCODE_CTRL1: held_ctrl |= (1 << 0); break;
@ -81,15 +81,15 @@ static void keyboard_alter_text_input_modifier(int scancode, bool down) {
}
bool keyboard_on_key_down(int scancode) {
// alter the held value of modifier keys
keyboard_alter_modifier(scancode, true);
#ifdef DEBUG
if (!inTextInput) {
debug_keyboard_on_key_down(scancode);
}
#endif
if (inTextInput) {
// alter the held value of modifier keys
keyboard_alter_text_input_modifier(scancode, true);
// perform text-input-specific actions
switch (scancode) {
case SCANCODE_BACKSPACE:
@ -113,7 +113,7 @@ bool keyboard_on_key_down(int scancode) {
return FALSE;
}
if (scancode == SCANCODE_ENTER) {
if (!held_alt && (scancode == SCANCODE_ENTER)) {
if (sSelectedFileNum != 0) {
chat_start_input();
return FALSE;
@ -127,10 +127,10 @@ bool keyboard_on_key_down(int scancode) {
}
bool keyboard_on_key_up(int scancode) {
if (inTextInput) {
// alter the held value of modifier keys
keyboard_alter_text_input_modifier(scancode, false);
// alter the held value of modifier keys
keyboard_alter_modifier(scancode, false);
if (inTextInput) {
// ignore any key up event if we're in text-input mode
return FALSE;
}