#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"};
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
/*
key up events are sent even if in console mode
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;
extern cvar_t con_textsize;
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(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;
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
{"AUX31", K_AUX31},
{"AUX32", K_AUX32},
+ {"X360_DPAD_UP", K_X360_DPAD_UP},
+ {"X360_DPAD_DOWN", K_X360_DPAD_DOWN},
+ {"X360_DPAD_LEFT", K_X360_DPAD_LEFT},
+ {"X360_DPAD_RIGHT", K_X360_DPAD_RIGHT},
+ {"X360_START", K_X360_START},
+ {"X360_BACK", K_X360_BACK},
+ {"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
+ {"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
+ {"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
+ {"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
+ {"X360_A", K_X360_A},
+ {"X360_B", K_X360_B},
+ {"X360_X", K_X360_X},
+ {"X360_Y", K_X360_Y},
+ {"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
+ {"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
+ {"X360_LEFT_THUMB_UP", K_X360_LEFT_THUMB_UP},
+ {"X360_LEFT_THUMB_DOWN", K_X360_LEFT_THUMB_DOWN},
+ {"X360_LEFT_THUMB_LEFT", K_X360_LEFT_THUMB_LEFT},
+ {"X360_LEFT_THUMB_RIGHT", K_X360_LEFT_THUMB_RIGHT},
+ {"X360_RIGHT_THUMB_UP", K_X360_RIGHT_THUMB_UP},
+ {"X360_RIGHT_THUMB_DOWN", K_X360_RIGHT_THUMB_DOWN},
+ {"X360_RIGHT_THUMB_LEFT", K_X360_RIGHT_THUMB_LEFT},
+ {"X360_RIGHT_THUMB_RIGHT", K_X360_RIGHT_THUMB_RIGHT},
+
+ {"JOY_UP", K_JOY_UP},
+ {"JOY_DOWN", K_JOY_DOWN},
+ {"JOY_LEFT", K_JOY_LEFT},
+ {"JOY_RIGHT", K_JOY_RIGHT},
+
{"SEMICOLON", ';'}, // because a raw semicolon separates commands
{"TILDE", '~'},
{"BACKQUOTE", '`'},
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])
}
// ctrl+key generates an ascii value < 32 and shows a char from the charmap
- if (ascii < 32 && utf8_enable.integer)
+ if (ascii > 0 && ascii < 32 && utf8_enable.integer)
ascii = 0xE000 + ascii;
if (chat_bufferlen == sizeof (chat_buffer) - 1)
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
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\"); // don't need to escape $ because cvars are not expanded inside bind
+ 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);
}
// con_closeontoggleconsole enables toggleconsole keys to close the
// console, as long as they are not the color prefix character
// (special exemption for german keyboard layouts)
- if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
+ if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1))
{
Con_ToggleConsole_f ();
return;
// 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