static int key_bmap, key_bmap2;
static qbyte keydown[MAX_KEYS]; // 0 = up, 1 = down, 2 = repeating
-typedef struct {
+typedef struct keyname_s
+{
const char *name;
int keynum;
-} keyname_t;
+}
+keyname_t;
static const keyname_t keynames[] = {
{"TAB", K_TAB},
{
int i;
strtok(cbd, "\n\r\b");
- i = strlen(cbd);
+ i = (int)strlen(cbd);
if (i + key_linepos >= MAX_INPUTLINE)
i= MAX_INPUTLINE - key_linepos;
if (i > 0)
// delete char on cursor
if (key == K_DEL || key == K_KP_DEL)
{
- if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+ if (key_linepos < (int)strlen(key_lines[edit_line]))
strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
return;
}
// otherwise just go right one
if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
{
- if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+ if (key_linepos < (int)strlen(key_lines[edit_line]))
key_linepos++;
return;
{
history_line--;
strcpy(key_lines[edit_line], key_lines[history_line]);
- key_linepos = strlen(key_lines[edit_line]);
+ key_linepos = (int)strlen(key_lines[edit_line]);
}
return;
}
else
{
strcpy(key_lines[edit_line], key_lines[history_line]);
- key_linepos = strlen(key_lines[edit_line]);
+ key_linepos = (int)strlen(key_lines[edit_line]);
}
return;
}
if (key_linepos < MAX_INPUTLINE-1)
{
int len;
- len = strlen(&key_lines[edit_line][key_linepos]);
+ len = (int)strlen(&key_lines[edit_line][key_linepos]);
// check insert mode, or always insert if at end of line
if (key_insert || len == 0)
{
void
Key_SetBinding (int keynum, int bindmap, const char *binding)
{
- char *new;
- int l;
+ char *newbinding;
+ size_t l;
if (keynum == -1)
return;
}
// allocate memory for new binding
l = strlen (binding);
- new = Z_Malloc (l + 1);
- strcpy (new, binding);
- new[l] = 0;
- keybindings[bindmap][keynum] = new;
+ newbinding = (char *)Z_Malloc (l + 1);
+ strcpy (newbinding, binding);
+ newbinding[l] = 0;
+ keybindings[bindmap][keynum] = newbinding;
}
static void
// key_menu - go to parent menu (or key_game)
// key_game - open menu
// in all modes shift-escape toggles console
- if (key_consoleactive || keydown[K_SHIFT])
+ if ((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT])
{
Con_ToggleConsole_f ();
return;
if(UI_Callback_IsSlotUsed(key_dest - 3))
UI_Callback_KeyDown (key, ascii);
else
- Sys_Error ("Bad key_dest");
+ Con_Printf ("Key_Event: Bad key_dest");
}
return;
}
if(UI_Callback_IsSlotUsed(key_dest - 3))
UI_Callback_KeyDown (key, ascii);
else
- Sys_Error ("Bad key_dest");
+ Con_Printf ("Key_Event: Bad key_dest");
}
}