Lephenixnoir
/
CGDoom
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support space and digits in alphanumeric input mode

This commit is contained in:
Lephenixnoir 2021-09-19 16:17:14 +02:00
parent 26c451697d
commit 988cbc9fd1
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cgdoom/i_system.c
View File

@ -363,6 +363,7 @@ void I_StartTic (void)
static const int input_keys[] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-'0', -'1', -'2', -'3', -'4', -'5', -'6', -'7', -'8', -'9', -' ',
KEY_BACKSPACE, KEY_ESCAPE, KEY_ENTER,
0
};
@ -381,7 +382,7 @@ void I_StartTic (void)
e.type = ev_keyup;
else continue;
e.data1 = keys[i];
e.data1 = (keys[i] < 0) ? -keys[i] : keys[i];
D_PostEvent(&e);
}
}

28
src-cg/keyboard.c
View File

@ -147,21 +147,45 @@ static int DoomKeyToKeycode(int key)
case 'X': return KEYCODE_PLUS;
case 'Y': return KEYCODE_MINUS;
case 'Z': return KEYCODE_0;
case -' ': return KEYCODE_DOT;
case KEY_BACKSPACE: return KEYCODE_DEL;
/* Numeric keys (handled differently, require a modifier) */
case -'0': return KEYCODE_0;
case -'1': return KEYCODE_1;
case -'2': return KEYCODE_2;
case -'3': return KEYCODE_3;
case -'4': return KEYCODE_4;
case -'5': return KEYCODE_5;
case -'6': return KEYCODE_6;
case -'7': return KEYCODE_7;
case -'8': return KEYCODE_8;
case -'9': return KEYCODE_9;
default: return -1;
}
}
static int KeyDown(KeyboardState state, int key)
static int KeycodeDown(KeyboardState state, int code)
{
int code = DoomKeyToKeycode(key);
if(code < 0) return 0;
int row = (code >> 4) ^ 1;
int col = 0x80 >> (code & 0x7);
return (state[row] & col) != 0;
}
static int KeyDown(KeyboardState state, int key)
{
int code = DoomKeyToKeycode(key);
if(key >= -'9' && key <= -'0')
return KeycodeDown(state, code) && KeycodeDown(state, KEYCODE_ALPHA);
else if(code == KEYCODE_ALPHA)
return KeycodeDown(state, code);
else
return KeycodeDown(state, code) && !KeycodeDown(state, KEYCODE_ALPHA);
}
void UpdateKeyboardState(void)
{
memcpy(st_prev, st_now, sizeof st_now);