fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: Some text input restructuring in preparation of numpad translation support. 

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1075 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2014-09-30 19:29:58 +00:00
parent 8c327e3ff2
commit 5a86e8511d
4 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quakespasm/Quake/in_sdl.c
View File

@ -603,7 +603,7 @@ void IN_SendKeyEvents (void)
// SDL2: We use SDL_TEXTINPUT for typing in the console / chat.
// SDL2 uses the local keyboard layout and handles modifiers
// (shift for uppercase, etc.) for us.
if (!Key_ConsoleBindable(lastKeyDown))
if (!Key_IgnoreTextInput(lastKeyDown))
{
int i;
for (i = 0; event.text.text[i]; i++)
@ -644,7 +644,7 @@ void IN_SendKeyEvents (void)
Key_Event (sym, event.type == SDL_KEYDOWN);
if (event.type == SDL_KEYDOWN && !Key_ConsoleBindable(sym) &&
if (event.type == SDL_KEYDOWN && !Key_IgnoreTextInput(sym) &&
event.key.keysym.unicode != 0 && (event.key.keysym.unicode & 0xFF80) == 0)
{
sym = event.key.keysym.unicode & 0x7F;

126
quakespasm/Quake/keys.c
View File

@ -43,11 +43,14 @@ keydest_t key_dest;
int key_count; // incremented every key event
char *keybindings[256];
int key_repeats[256]; // if > 1, it is autorepeating
qboolean consolekeys[256]; // if true, can't be rebound while in console
qboolean menubound[256]; // if true, can't be rebound while in menu
qboolean keydown[256];
#define MAX_KEYS 256
char *keybindings[MAX_KEYS];
int key_repeats[MAX_KEYS]; // if > 1, it is autorepeating
qboolean consolekeys[MAX_KEYS]; // if true, can't be rebound while in console
qboolean menubound[MAX_KEYS]; // if true, can't be rebound while in menu
qboolean ignoretext[MAX_KEYS]; // if true, should never cause text input
qboolean keydown[MAX_KEYS];
typedef struct
{
@ -440,15 +443,6 @@ void Char_Console (int key)
size_t len;
char *workline = key_lines[edit_line];
if (key < 32 || key > 126)
return; // non printable
if (!consolekeys[key])
return; // bindable
if (keydown[K_CTRL])
return; // control character
if (key_linepos < MAXCMDLINE-1)
{
qboolean endpos = !workline[key_linepos];
@ -529,12 +523,6 @@ void Key_Message (int key)
void Char_Message (int key)
{
if (key < 32 || key > 126)
return; // non printable
if (keydown[K_CTRL])
return; // control character
if (chat_bufferlen == sizeof(chat_buffer) - 1)
return; // all full
@ -654,7 +642,7 @@ void Key_Unbindall_f (void)
{
int i;
for (i = 0; i < 256; i++)
for (i = 0; i < MAX_KEYS; i++)
{
if (keybindings[i])
Key_SetBinding (i, "");
@ -671,7 +659,7 @@ void Key_Bindlist_f (void)
int i, count;
count = 0;
for (i = 0; i < 256; i++)
for (i = 0; i < MAX_KEYS; i++)
{
if (keybindings[i] && *keybindings[i])
{
@ -741,7 +729,7 @@ void Key_WriteBindings (FILE *f)
// unbindall before loading stored bindings:
if (cfg_unbindall.value)
fprintf (f, "unbindall\n");
for (i = 0; i < 256; i++)
for (i = 0; i < MAX_KEYS; i++)
{
if (keybindings[i] && *keybindings[i])
fprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString(i), keybindings[i]);
@ -858,6 +846,42 @@ void Key_Init (void)
for (i = 0; i < 12; i++)
menubound[K_F1+i] = true;
ignoretext[K_ENTER] = true;
ignoretext[K_TAB] = true;
ignoretext[K_ESCAPE] = true;
ignoretext[K_UPARROW] = true;
ignoretext[K_DOWNARROW] = true;
ignoretext[K_LEFTARROW] = true;
ignoretext[K_RIGHTARROW] = true;
ignoretext[K_ALT] = true;
ignoretext[K_CTRL] = true;
ignoretext[K_SHIFT] = true;
for (i = 0; i < 12; i++)
ignoretext[K_F1+i] = true;
ignoretext[K_BACKSPACE] = true;
ignoretext[K_INS] = true;
ignoretext[K_DEL] = true;
ignoretext[K_PGDN] = true;
ignoretext[K_PGUP] = true;
ignoretext[K_HOME] = true;
ignoretext[K_END] = true;
ignoretext[K_KP_NUMLOCK] = true;
ignoretext[K_KP_HOME] = true;
ignoretext[K_KP_UPARROW] = true;
ignoretext[K_KP_PGUP] = true;
ignoretext[K_KP_LEFTARROW] = true;
ignoretext[K_KP_RIGHTARROW] = true;
ignoretext[K_KP_END] = true;
ignoretext[K_KP_DOWNARROW] = true;
ignoretext[K_KP_PGDN] = true;
ignoretext[K_KP_ENTER] = true;
ignoretext[K_KP_INS] = true;
ignoretext[K_KP_DEL] = true;
ignoretext[K_COMMAND] = true;
ignoretext[K_PAUSE] = true;
ignoretext[K_MWHEELUP] = true;
ignoretext[K_MWHEELDOWN] = true;
//
// register our functions
//
@ -880,7 +904,7 @@ void Key_Event (int key, qboolean down)
char *kb;
char cmd[1024];
if (key < 0 || key > 255)
if (key < 0 || key >= MAX_KEYS)
return;
keydown[key] = down;
@ -1004,6 +1028,9 @@ Called by the backend when the user has input a character.
*/
void Char_Event (int key)
{
if (key < 32 || key > 126)
return;
switch (key_dest)
{
case key_message:
@ -1031,6 +1058,42 @@ qboolean Key_InputtingText(void)
key_dest == key_message || (key_dest == key_menu && M_InputtingText()));
}
/*
===================
Key_IgnoreTextInput
===================
*/
qboolean Key_IgnoreTextInput (int key)
{
if (keydown[K_CTRL])
return true;
if (key < 0 || key >= MAX_KEYS)
return false;
if (ignoretext[key])
return true;
if (!keybindings[key])
return false;
switch (key_dest)
{
case key_message:
return false;
case key_menu:
return menubound[key];
case key_game:
if (!con_forcedup)
return true;
/* fallthrough */
case key_console:
return !consolekeys[key];
default:
return true;
}
}
/*
===================
Key_ClearStates
@ -1040,7 +1103,7 @@ void Key_ClearStates (void)
{
int i;
for (i = 0; i < 256; i++)
for (i = 0; i < MAX_KEYS; i++)
{
if (keydown[i])
Key_Event (i, false);
@ -1083,16 +1146,3 @@ void Key_UpdateForDest (void)
break;
}
}
/*
===================
Key_ConsoleBindable
===================
*/
qboolean Key_ConsoleBindable(int key)
{
if (Key_StringToKeynum(Key_KeynumToString(key)) == -1)
return false;
return ((key_dest == key_console || (key_dest == key_game && con_forcedup)) && !consolekeys[key]);
}

2
quakespasm/Quake/keys.h
View File

@ -164,11 +164,11 @@ extern qboolean chat_team;
void Key_Init (void);
void Key_ClearStates (void);
void Key_UpdateForDest (void);
qboolean Key_ConsoleBindable (int key);
void Key_Event (int key, qboolean down);
void Char_Event (int key);
qboolean Key_InputtingText (void);
qboolean Key_IgnoreTextInput (int key);
void Key_SetBinding (int keynum, const char *binding);
const char *Key_KeynumToString (int keynum);

6
quakespasm/Quake/menu.c
View File

@ -821,9 +821,6 @@ void M_Setup_Char (int k)
{
int l;
if (k < 32 || k > 126)
return;
switch (setup_cursor)
{
case 0:
@ -1808,9 +1805,6 @@ void M_LanConfig_Char (int key)
{
int l;
if (key < 32 || key > 126)
return;
switch (lanConfig_cursor)
{
case 0: