#include "quakedef.h"
#include "cl_video.h"
+#include "utf8lib.h"
cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"};
keydest_t key_dest;
int key_consoleactive;
char *keybindings[MAX_BINDMAPS][MAX_KEYS];
-int history_line;
+
+int history_line;
char history_savedline[MAX_INPUTLINE];
+char history_searchstring[MAX_INPUTLINE];
+qboolean history_matchfound = false;
conbuffer_t history;
-#define HIST_TEXTSIZE 262144
-#define HIST_MAXLINES 4096
extern cvar_t con_textsize;
-static void Key_History_Init()
+static void Key_History_Init(void)
{
qfile_t *historyfile;
ConBuffer_Init(&history, HIST_TEXTSIZE, HIST_MAXLINES, zonemempool);
history_line = -1;
}
-static void Key_History_Shutdown()
+static void Key_History_Shutdown(void)
{
// TODO write history to a file
ConBuffer_Shutdown(&history);
}
-static void Key_History_Push()
+static void Key_History_Push(void)
{
if(key_line[1]) // empty?
if(strcmp(key_line, "]quit")) // putting these into the history just sucks
ConBuffer_AddLine(&history, key_line + 1, strlen(key_line) - 1, 0);
Con_Printf("%s\n", key_line); // don't mark empty lines as history
history_line = -1;
+ if (history_matchfound)
+ history_matchfound = false;
+}
+
+qboolean Key_History_Get_foundCommand(void)
+{
+ if (!history_matchfound)
+ return false;
+ strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+ key_linepos = strlen(key_line);
+ history_matchfound = false;
+ return true;
}
-static void Key_History_Up()
+static void Key_History_Up(void)
{
if(history_line == -1) // editing the "new" line
strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+ if (Key_History_Get_foundCommand())
+ return;
+
if(history_line == -1)
{
history_line = CONBUFFER_LINES_COUNT(&history) - 1;
}
}
-static void Key_History_Down()
+static void Key_History_Down(void)
{
if(history_line == -1) // editing the "new" line
return;
+ if (Key_History_Get_foundCommand())
+ return;
+
if(history_line < CONBUFFER_LINES_COUNT(&history) - 1)
{
++history_line;
key_linepos = strlen(key_line);
}
+static void Key_History_First(void)
+{
+ if(history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+ if (CONBUFFER_LINES_COUNT(&history) > 0)
+ {
+ history_line = 0;
+ strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+ key_linepos = strlen(key_line);
+ }
+}
+
+static void Key_History_Last(void)
+{
+ if(history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+ if (CONBUFFER_LINES_COUNT(&history) > 0)
+ {
+ history_line = CONBUFFER_LINES_COUNT(&history) - 1;
+ strlcpy(key_line + 1, ConBuffer_GetLine(&history, history_line), sizeof(key_line) - 1);
+ key_linepos = strlen(key_line);
+ }
+}
+
+static void Key_History_Find_Backwards(void)
+{
+ int i;
+ const char *partial = key_line + 1;
+ size_t digits = strlen(va("%i", HIST_MAXLINES));
+
+ if (history_line == -1) // editing the "new" line
+ strlcpy(history_savedline, key_line + 1, sizeof(history_savedline));
+
+ if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+ {
+ strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+ i = CONBUFFER_LINES_COUNT(&history) - 1;
+ }
+ else if (history_line == -1)
+ i = CONBUFFER_LINES_COUNT(&history) - 1;
+ else
+ i = history_line - 1;
+
+ if (!*partial)
+ partial = "*";
+ else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+ partial = va("*%s*", partial);
+
+ for ( ; i >= 0; i--)
+ if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+ {
+ Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ history_line = i;
+ history_matchfound = true;
+ return;
+ }
+}
+
+static void Key_History_Find_Forwards(void)
+{
+ int i;
+ const char *partial = key_line + 1;
+ size_t digits = strlen(va("%i", HIST_MAXLINES));
+
+ if (history_line == -1) // editing the "new" line
+ return;
+
+ if (strcmp(key_line + 1, history_searchstring)) // different string? Start a new search
+ {
+ strlcpy(history_searchstring, key_line + 1, sizeof(history_searchstring));
+ i = 0;
+ }
+ else i = history_line + 1;
+
+ if (!*partial)
+ partial = "*";
+ else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+ partial = va("*%s*", partial);
+
+ for ( ; i < CONBUFFER_LINES_COUNT(&history); i++)
+ if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+ {
+ Con_Printf("^2%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ history_line = i;
+ history_matchfound = true;
+ return;
+ }
+}
+
+static void Key_History_Find_All(void)
+{
+ const char *partial = key_line + 1;
+ int i, count = 0;
+ size_t digits = strlen(va("%i", HIST_MAXLINES));
+ Con_Printf("History commands containing \"%s\":\n", key_line + 1);
+
+ if (!*partial)
+ partial = "*";
+ else if (!( strchr(partial, '*') || strchr(partial, '?') )) // no pattern?
+ partial = va("*%s*", partial);
+
+ for (i=0; i<CONBUFFER_LINES_COUNT(&history); i++)
+ if (matchpattern_with_separator(ConBuffer_GetLine(&history, i), partial, true, "", false))
+ {
+ Con_Printf("%s%*i^7 %s\n", (i == history_line) ? "^2" : "^3", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ count++;
+ }
+ Con_Printf("%i result%s\n\n", count, (count != 1) ? "s" : "");
+}
+
+static void Key_History_f(void)
+{
+ char *errchar = NULL;
+ int i = 0;
+ size_t digits = strlen(va("%i", HIST_MAXLINES));
+
+ if (Cmd_Argc () > 1)
+ {
+ if (!strcmp(Cmd_Argv (1), "-c"))
+ {
+ ConBuffer_Clear(&history);
+ return;
+ }
+ i = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((i < 0) || (i > CONBUFFER_LINES_COUNT(&history)) || (errchar && *errchar))
+ i = 0;
+ else
+ i = CONBUFFER_LINES_COUNT(&history) - i;
+ }
+
+ for ( ; i<CONBUFFER_LINES_COUNT(&history); i++)
+ Con_Printf("^3%*i^7 %s\n", (int)digits, i+1, ConBuffer_GetLine(&history, i));
+ Con_Printf("\n");
+}
+
static int key_bmap, key_bmap2;
static unsigned char keydown[MAX_KEYS]; // 0 = up, 1 = down, 2 = repeating
{"KP_ENTER", K_KP_ENTER},
{"KP_EQUALS", K_KP_EQUALS},
+ {"PRINTSCREEN", K_PRINTSCREEN},
+
{"MOUSE1", K_MOUSE1},
{"APOSTROPHE", '\''},
{"BACKSLASH", '\\'}, // because a raw backslash is used for special characters
+ {"MIDINOTE0", K_MIDINOTE0},
+ {"MIDINOTE1", K_MIDINOTE1},
+ {"MIDINOTE2", K_MIDINOTE2},
+ {"MIDINOTE3", K_MIDINOTE3},
+ {"MIDINOTE4", K_MIDINOTE4},
+ {"MIDINOTE5", K_MIDINOTE5},
+ {"MIDINOTE6", K_MIDINOTE6},
+ {"MIDINOTE7", K_MIDINOTE7},
+ {"MIDINOTE8", K_MIDINOTE8},
+ {"MIDINOTE9", K_MIDINOTE9},
+ {"MIDINOTE10", K_MIDINOTE10},
+ {"MIDINOTE11", K_MIDINOTE11},
+ {"MIDINOTE12", K_MIDINOTE12},
+ {"MIDINOTE13", K_MIDINOTE13},
+ {"MIDINOTE14", K_MIDINOTE14},
+ {"MIDINOTE15", K_MIDINOTE15},
+ {"MIDINOTE16", K_MIDINOTE16},
+ {"MIDINOTE17", K_MIDINOTE17},
+ {"MIDINOTE18", K_MIDINOTE18},
+ {"MIDINOTE19", K_MIDINOTE19},
+ {"MIDINOTE20", K_MIDINOTE20},
+ {"MIDINOTE21", K_MIDINOTE21},
+ {"MIDINOTE22", K_MIDINOTE22},
+ {"MIDINOTE23", K_MIDINOTE23},
+ {"MIDINOTE24", K_MIDINOTE24},
+ {"MIDINOTE25", K_MIDINOTE25},
+ {"MIDINOTE26", K_MIDINOTE26},
+ {"MIDINOTE27", K_MIDINOTE27},
+ {"MIDINOTE28", K_MIDINOTE28},
+ {"MIDINOTE29", K_MIDINOTE29},
+ {"MIDINOTE30", K_MIDINOTE30},
+ {"MIDINOTE31", K_MIDINOTE31},
+ {"MIDINOTE32", K_MIDINOTE32},
+ {"MIDINOTE33", K_MIDINOTE33},
+ {"MIDINOTE34", K_MIDINOTE34},
+ {"MIDINOTE35", K_MIDINOTE35},
+ {"MIDINOTE36", K_MIDINOTE36},
+ {"MIDINOTE37", K_MIDINOTE37},
+ {"MIDINOTE38", K_MIDINOTE38},
+ {"MIDINOTE39", K_MIDINOTE39},
+ {"MIDINOTE40", K_MIDINOTE40},
+ {"MIDINOTE41", K_MIDINOTE41},
+ {"MIDINOTE42", K_MIDINOTE42},
+ {"MIDINOTE43", K_MIDINOTE43},
+ {"MIDINOTE44", K_MIDINOTE44},
+ {"MIDINOTE45", K_MIDINOTE45},
+ {"MIDINOTE46", K_MIDINOTE46},
+ {"MIDINOTE47", K_MIDINOTE47},
+ {"MIDINOTE48", K_MIDINOTE48},
+ {"MIDINOTE49", K_MIDINOTE49},
+ {"MIDINOTE50", K_MIDINOTE50},
+ {"MIDINOTE51", K_MIDINOTE51},
+ {"MIDINOTE52", K_MIDINOTE52},
+ {"MIDINOTE53", K_MIDINOTE53},
+ {"MIDINOTE54", K_MIDINOTE54},
+ {"MIDINOTE55", K_MIDINOTE55},
+ {"MIDINOTE56", K_MIDINOTE56},
+ {"MIDINOTE57", K_MIDINOTE57},
+ {"MIDINOTE58", K_MIDINOTE58},
+ {"MIDINOTE59", K_MIDINOTE59},
+ {"MIDINOTE60", K_MIDINOTE60},
+ {"MIDINOTE61", K_MIDINOTE61},
+ {"MIDINOTE62", K_MIDINOTE62},
+ {"MIDINOTE63", K_MIDINOTE63},
+ {"MIDINOTE64", K_MIDINOTE64},
+ {"MIDINOTE65", K_MIDINOTE65},
+ {"MIDINOTE66", K_MIDINOTE66},
+ {"MIDINOTE67", K_MIDINOTE67},
+ {"MIDINOTE68", K_MIDINOTE68},
+ {"MIDINOTE69", K_MIDINOTE69},
+ {"MIDINOTE70", K_MIDINOTE70},
+ {"MIDINOTE71", K_MIDINOTE71},
+ {"MIDINOTE72", K_MIDINOTE72},
+ {"MIDINOTE73", K_MIDINOTE73},
+ {"MIDINOTE74", K_MIDINOTE74},
+ {"MIDINOTE75", K_MIDINOTE75},
+ {"MIDINOTE76", K_MIDINOTE76},
+ {"MIDINOTE77", K_MIDINOTE77},
+ {"MIDINOTE78", K_MIDINOTE78},
+ {"MIDINOTE79", K_MIDINOTE79},
+ {"MIDINOTE80", K_MIDINOTE80},
+ {"MIDINOTE81", K_MIDINOTE81},
+ {"MIDINOTE82", K_MIDINOTE82},
+ {"MIDINOTE83", K_MIDINOTE83},
+ {"MIDINOTE84", K_MIDINOTE84},
+ {"MIDINOTE85", K_MIDINOTE85},
+ {"MIDINOTE86", K_MIDINOTE86},
+ {"MIDINOTE87", K_MIDINOTE87},
+ {"MIDINOTE88", K_MIDINOTE88},
+ {"MIDINOTE89", K_MIDINOTE89},
+ {"MIDINOTE90", K_MIDINOTE90},
+ {"MIDINOTE91", K_MIDINOTE91},
+ {"MIDINOTE92", K_MIDINOTE92},
+ {"MIDINOTE93", K_MIDINOTE93},
+ {"MIDINOTE94", K_MIDINOTE94},
+ {"MIDINOTE95", K_MIDINOTE95},
+ {"MIDINOTE96", K_MIDINOTE96},
+ {"MIDINOTE97", K_MIDINOTE97},
+ {"MIDINOTE98", K_MIDINOTE98},
+ {"MIDINOTE99", K_MIDINOTE99},
+ {"MIDINOTE100", K_MIDINOTE100},
+ {"MIDINOTE101", K_MIDINOTE101},
+ {"MIDINOTE102", K_MIDINOTE102},
+ {"MIDINOTE103", K_MIDINOTE103},
+ {"MIDINOTE104", K_MIDINOTE104},
+ {"MIDINOTE105", K_MIDINOTE105},
+ {"MIDINOTE106", K_MIDINOTE106},
+ {"MIDINOTE107", K_MIDINOTE107},
+ {"MIDINOTE108", K_MIDINOTE108},
+ {"MIDINOTE109", K_MIDINOTE109},
+ {"MIDINOTE110", K_MIDINOTE110},
+ {"MIDINOTE111", K_MIDINOTE111},
+ {"MIDINOTE112", K_MIDINOTE112},
+ {"MIDINOTE113", K_MIDINOTE113},
+ {"MIDINOTE114", K_MIDINOTE114},
+ {"MIDINOTE115", K_MIDINOTE115},
+ {"MIDINOTE116", K_MIDINOTE116},
+ {"MIDINOTE117", K_MIDINOTE117},
+ {"MIDINOTE118", K_MIDINOTE118},
+ {"MIDINOTE119", K_MIDINOTE119},
+ {"MIDINOTE120", K_MIDINOTE120},
+ {"MIDINOTE121", K_MIDINOTE121},
+ {"MIDINOTE122", K_MIDINOTE122},
+ {"MIDINOTE123", K_MIDINOTE123},
+ {"MIDINOTE124", K_MIDINOTE124},
+ {"MIDINOTE125", K_MIDINOTE125},
+ {"MIDINOTE126", K_MIDINOTE126},
+ {"MIDINOTE127", K_MIDINOTE127},
+
{NULL, 0}
};
====================
*/
static void
-Key_Console (int key, int ascii)
+Key_Console (int key, int unicode)
{
// LordHavoc: copied most of this from Q2 to improve keyboard handling
switch (key)
if (i > 0)
{
// terencehill: insert the clipboard text between the characters of the line
+ /*
char *temp = (char *) Z_Malloc(MAX_INPUTLINE);
cbd[i]=0;
temp[0]=0;
strlcat(key_line, temp, sizeof(key_line));
Z_Free(temp);
key_linepos += i;
+ */
+ // blub: I'm changing this to use memmove() like the rest of the code does.
+ cbd[i] = 0;
+ memmove(key_line + key_linepos + i, key_line + key_linepos, sizeof(key_line) - key_linepos - i);
+ memcpy(key_line + key_linepos, cbd, i);
+ key_linepos += i;
}
Z_Free(cbd);
}
else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
{
int pos;
- pos = key_linepos-1;
+ size_t inchar = 0;
+ pos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
while (pos)
if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && isdigit(key_line[pos]))
pos-=2;
pos--;
break;
}
- key_linepos = pos + 1;
+ // we need to move to the beginning of the character when in a wide character:
+ u8_charidx(key_line, pos + 1, &inchar);
+ key_linepos = pos + 1 - inchar;
}
else
- key_linepos--;
+ {
+ key_linepos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ }
return;
}
{
if (key_linepos > 1)
{
- strlcpy(key_line + key_linepos - 1, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
- key_linepos--;
+ int newpos = u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte
+ strlcpy(key_line + newpos, key_line + key_linepos, sizeof(key_line) + 1 - key_linepos);
+ key_linepos = newpos;
}
return;
}
size_t linelen;
linelen = strlen(key_line);
if (key_linepos < (int)linelen)
- memmove(key_line + key_linepos, key_line + key_linepos + 1, linelen - key_linepos);
+ memmove(key_line + key_linepos, key_line + key_linepos + u8_bytelen(key_line + key_linepos, 1), linelen - key_linepos);
return;
}
// skip the char
if (key_line[pos] == STRING_COLOR_TAG && key_line[pos+1] == STRING_COLOR_TAG) // consider ^^ as a character
pos++;
- pos++;
+ pos += u8_bytelen(key_line + pos, 1);
// now go beyond all next consecutive color tags, if any
if(pos < len)
key_linepos = pos;
}
else
- key_linepos++;
+ key_linepos += u8_bytelen(key_line + key_linepos, 1);
return;
}
return;
}
// ~1.0795 = 82/76 using con_textsize 64 76 is height of the char, 6 is the distance between 2 lines
+
+ if (keydown[K_CTRL])
+ {
+ // prints all the matching commands
+ if (key == 'f')
+ {
+ Key_History_Find_All();
+ return;
+ }
+ // Search forwards/backwards, pointing the history's index to the
+ // matching command but without fetching it to let one continue the search.
+ // To fetch it, it suffices to just press UP or DOWN.
+ if (key == 'r')
+ {
+ if (keydown[K_SHIFT])
+ Key_History_Find_Forwards();
+ else
+ Key_History_Find_Backwards();
+ return;
+ }
+ // go to the last/first command of the history
+ if (key == ',')
+ {
+ Key_History_First();
+ return;
+ }
+ if (key == '.')
+ {
+ Key_History_Last();
+ return;
+ }
+ }
+
if (key == K_PGUP || key == K_KP_PGUP)
{
if(keydown[K_CTRL])
{
- con_backscroll += (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
}
else
- con_backscroll += (int)floor((vid_conheight.integer >> 1) / con_textsize.integer)-3;
+ con_backscroll += ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
return;
}
{
if(keydown[K_CTRL])
{
- con_backscroll -= (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
}
else
- con_backscroll -= (int)floor((vid_conheight.integer >> 1) / con_textsize.integer)-3;
+ con_backscroll -= ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
return;
}
if(keydown[K_CTRL])
con_backscroll += 1;
else if(keydown[K_SHIFT])
- con_backscroll += (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
else
con_backscroll += 5;
return;
if(keydown[K_CTRL])
con_backscroll -= 1;
else if(keydown[K_SHIFT])
- con_backscroll -= (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+ con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
else
con_backscroll -= 5;
return;
if (key == K_HOME || key == K_KP_HOME)
{
if (keydown[K_CTRL])
- con_backscroll = INT_MAX;
+ con_backscroll = CON_TEXTSIZE;
else
key_linepos = 1;
return;
}
// non printable
- if (ascii < 32)
+ if (unicode < 32)
return;
if (key_linepos < MAX_INPUTLINE-1)
{
+ char buf[16];
int len;
+ int blen;
+ blen = u8_fromchar(unicode, buf, sizeof(buf));
+ if (!blen)
+ return;
len = (int)strlen(&key_line[key_linepos]);
// check insert mode, or always insert if at end of line
if (key_insert || len == 0)
{
// can't use strcpy to move string to right
len++;
- memmove(&key_line[key_linepos + 1], &key_line[key_linepos], len);
+ //memmove(&key_line[key_linepos + u8_bytelen(key_line + key_linepos, 1)], &key_line[key_linepos], len);
+ memmove(&key_line[key_linepos + blen], &key_line[key_linepos], len);
}
- key_line[key_linepos] = ascii;
- key_linepos++;
+ memcpy(key_line + key_linepos, buf, blen);
+ key_linepos += blen;
+ //key_linepos += u8_fromchar(unicode, key_line + key_linepos, sizeof(key_line) - key_linepos - 1);
+ //key_line[key_linepos] = ascii;
+ //key_linepos++;
}
}
static void
Key_Message (int key, int ascii)
{
-
if (key == K_ENTER || ascii == 10 || ascii == 13)
{
if(chat_mode < 0)
if (key == K_BACKSPACE) {
if (chat_bufferlen) {
- chat_bufferlen--;
+ chat_bufferlen = u8_prevbyte(chat_buffer, chat_bufferlen);
chat_buffer[chat_bufferlen] = 0;
}
return;
return;
}
+ // ctrl+key generates an ascii value < 32 and shows a char from the charmap
+ if (ascii > 0 && ascii < 32 && utf8_enable.integer)
+ ascii = 0xE000 + ascii;
+
if (chat_bufferlen == sizeof (chat_buffer) - 1)
return; // all full
if (!ascii)
return; // non printable
- chat_buffer[chat_bufferlen++] = ascii;
- chat_buffer[chat_bufferlen] = 0;
+ chat_bufferlen += u8_fromchar(ascii, chat_buffer+chat_bufferlen, sizeof(chat_buffer) - chat_bufferlen - 1);
+
+ //chat_buffer[chat_bufferlen++] = ascii;
+ //chat_buffer[chat_bufferlen] = 0;
}
//============================================================================
}
-void
+qboolean
Key_SetBinding (int keynum, int bindmap, const char *binding)
{
char *newbinding;
size_t l;
if (keynum == -1 || keynum >= MAX_KEYS)
- return;
+ return false;
+ if ((bindmap < 0) || (bindmap >= MAX_BINDMAPS))
+ return false;
// free old bindings
if (keybindings[bindmap][keynum]) {
keybindings[bindmap][keynum] = NULL;
}
if(!binding[0]) // make "" binds be removed --blub
- return;
+ return true;
// allocate memory for new binding
l = strlen (binding);
newbinding = (char *)Z_Malloc (l + 1);
memcpy (newbinding, binding, l + 1);
newbinding[l] = 0;
keybindings[bindmap][keynum] = newbinding;
+ return true;
+}
+
+void Key_GetBindMap(int *fg, int *bg)
+{
+ if(fg)
+ *fg = key_bmap;
+ if(bg)
+ *bg = key_bmap2;
+}
+
+qboolean Key_SetBindMap(int fg, int bg)
+{
+ if(fg >= MAX_BINDMAPS)
+ return false;
+ if(bg >= MAX_BINDMAPS)
+ return false;
+ if(fg >= 0)
+ key_bmap = fg;
+ if(bg >= 0)
+ key_bmap2 = bg;
+ return true;
}
static void
}
m = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
return;
}
- Key_SetBinding (b, m, "");
+ if(!Key_SetBinding (b, m, ""))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
}
m = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
strlcat (cmd, " ", sizeof (cmd));
}
- Key_SetBinding (b, m, cmd);
+ if(!Key_SetBinding (b, m, cmd))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
}
m1 = strtol(Cmd_Argv (1), &errchar, 0);
- if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+ if ((m1 < 0) || (m1 >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
m2 = strtol(Cmd_Argv (2), &errchar, 0);
- if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+ if ((m2 < 0) || (m2 >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
return;
}
return;
}
- Key_SetBinding (b, 0, "");
+ if(!Key_SetBinding (b, 0, ""))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
static void
{
int i, j;
- for (j = 0; j < 8; j++)
+ for (j = 0; j < MAX_BINDMAPS; j++)
for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
if (keybindings[j][i])
Key_SetBinding (i, j, "");
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false);
if (j == 0)
Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
else
if(Cmd_Argc() >= 2)
{
m = strtol(Cmd_Argv(1), &errchar, 0);
- if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ if ((m < 0) || (m >= MAX_BINDMAPS) || (errchar && *errchar)) {
Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
strlcat (cmd, " ", sizeof (cmd));
}
- Key_SetBinding (b, 0, cmd);
+ if(!Key_SetBinding (b, 0, cmd))
+ Con_Printf("Key_SetBinding failed for unknown reason\n");
}
/*
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\", false); // don't need to escape $ because cvars are not expanded inside bind
if (j == 0)
FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
else
Cmd_AddCommand ("bindlist", Key_BindList_f, "bindlist: displays bound keys for bindmap 0 bindmaps");
Cmd_AddCommand ("unbindall", Key_Unbindall_f, "removes all commands from all keys in all bindmaps (leaving only shift-escape and escape)");
+ Cmd_AddCommand ("history", Key_History_f, "prints the history of executed commands (history X prints the last X entries, history -c clears the whole history)");
+
Cvar_RegisterVariable (&con_closeontoggleconsole);
}
Key_History_Shutdown();
}
-const char *Key_GetBind (int key)
+const char *Key_GetBind (int key, int bindmap)
{
const char *bind;
if (key < 0 || key >= MAX_KEYS)
return NULL;
- bind = keybindings[key_bmap][key];
- if (!bind)
- bind = keybindings[key_bmap2][key];
+ if(bindmap >= MAX_BINDMAPS)
+ return NULL;
+ if(bindmap >= 0)
+ {
+ bind = keybindings[bindmap][key];
+ }
+ else
+ {
+ bind = keybindings[key_bmap][key];
+ if (!bind)
+ bind = keybindings[key_bmap2][key];
+ }
return bind;
}
+void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bindmap)
+{
+ int count;
+ int j;
+ const char *b;
+
+ for (j = 0;j < numkeys;j++)
+ keys[j] = -1;
+
+ if(bindmap >= MAX_BINDMAPS)
+ return;
+
+ count = 0;
+
+ for (j = 0; j < MAX_KEYS; ++j)
+ {
+ b = Key_GetBind(j, bindmap);
+ if (!b)
+ continue;
+ if (!strcmp (b, command) )
+ {
+ keys[count++] = j;
+ if (count == numkeys)
+ break;
+ }
+ }
+}
+
qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
/*
static char tbl_keyascii[MAX_KEYS];
static keydest_t tbl_keydest[MAX_KEYS];
+typedef struct eventqueueitem_s
+{
+ int key;
+ int ascii;
+ qboolean down;
+}
+eventqueueitem_t;
+static int events_blocked = 0;
+static eventqueueitem_t eventqueue[32];
+static unsigned eventqueue_idx = 0;
+
+static void Key_EventQueue_Add(int key, int ascii, qboolean down)
+{
+ if(eventqueue_idx < sizeof(eventqueue) / sizeof(*eventqueue))
+ {
+ eventqueue[eventqueue_idx].key = key;
+ eventqueue[eventqueue_idx].ascii = ascii;
+ eventqueue[eventqueue_idx].down = down;
+ ++eventqueue_idx;
+ }
+}
+
+void Key_EventQueue_Block(void)
+{
+ // block key events until call to Unblock
+ events_blocked = true;
+}
+
+void Key_EventQueue_Unblock(void)
+{
+ // unblocks key events again
+ unsigned i;
+ events_blocked = false;
+ for(i = 0; i < eventqueue_idx; ++i)
+ Key_Event(eventqueue[i].key, eventqueue[i].ascii, eventqueue[i].down);
+ eventqueue_idx = 0;
+}
+
void
Key_Event (int key, int ascii, qboolean down)
{
if (key < 0 || key >= MAX_KEYS)
return;
+ if(events_blocked)
+ {
+ Key_EventQueue_Add(key, ascii, down);
+ return;
+ }
+
+ if (ascii == 0x80 && utf8_enable.integer) // pressing AltGr-5 (or AltGr-e) and for some reason we get windows-1252 encoding?
+ ascii = 0x20AC; // we want the Euro currency sign
+ // TODO find out which vid_ drivers do it and fix it there
+ // but catching U+0080 here is no loss as that char is not useful anyway
+
// get key binding
bind = keybindings[key_bmap][key];
if (!bind)
bind = keybindings[key_bmap2][key];
- if (developer.integer >= 1000)
- Con_Printf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii, down ? "down" : "up", keydown[key], bind ? bind : "");
+ if (developer_insane.integer)
+ Con_DPrintf("Key_Event(%i, '%c', %s) keydown %i bind \"%s\"\n", key, ascii ? ascii : '?', down ? "down" : "up", keydown[key], bind ? bind : "");
if(key_consoleactive)
keydest = key_console;
if(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
{
key_consoleactive &= ~KEY_CONSOLEACTIVE_USER;
- MR_ToggleMenu_f ();
+ MR_ToggleMenu(1);
}
else
Con_ToggleConsole_f();
// csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
q = CL_VM_InputEvent(down, key, ascii);
if (!q && down)
- MR_ToggleMenu_f ();
+ MR_ToggleMenu(1);
break;
default:
}
// send function keydowns to interpreter no matter what mode is (unless the menu has specifically grabbed the keyboard, for rebinding keys)
+ // VorteX: Omnicide does bind F* keys
if (keydest != key_menu_grabbed)
- if (key >= K_F1 && key <= K_F12)
+ if (key >= K_F1 && key <= K_F12 && gamemode != GAME_BLOODOMNICIDE)
{
if (bind)
{
// ignore binds while a video is played, let the video system handle the key event
if (cl_videoplaying)
{
- CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
+ if (gamemode == GAME_BLOODOMNICIDE) // menu controls key events
+ MR_KeyEvent(key, ascii, down);
+ else
+ CL_Video_KeyEvent (key, ascii, keydown[key] != 0);
return;
}
projects / xonotic / darkplaces.git / blobdiff