From: cloudwalk Date: Mon, 29 Jun 2020 03:21:08 +0000 (+0000) Subject: Implement standards-compliant chat input editing functionality X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d0c3037e2e74a1df265131a8b1b82c70011a0da2;p=xonotic%2Fdarkplaces.git Implement standards-compliant chat input editing functionality Contributed by terencehill. This, among other things, implements Key_Parse_CommonKeys, which replaces Key_Console and unifies key handling code. It's now possible to: * move cursor to an arbitrary position with rightarrow/leftarrow and insert text * paste text with ctrl-v * enable insert mode with the Insert key * clear the whole message with ctrl-u * move to the beginning/end of the message with home/end * move to the previous/next word with ctrl-rightarrow/leftarrow * move to the previous/next character ignoring colors with shift-rightarrow/leftarrow git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12754 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/console.c b/console.c index 5bbf112c..5efad941 100644 --- a/console.c +++ b/console.c @@ -716,7 +716,7 @@ static void Con_MessageMode_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } } @@ -733,7 +733,7 @@ static void Con_MessageMode2_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } } @@ -748,7 +748,7 @@ static void Con_CommandMode_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } chat_mode = -1; // command } @@ -1498,38 +1498,55 @@ DRAWING ================ Con_DrawInput +It draws either the console input line or the chat input line (if is_console is false) The input line scrolls horizontally if typing goes beyond the right edge Modified by EvilTypeGuy eviltypeguy@qeradiant.com ================ */ -static void Con_DrawInput (void) +static void Con_DrawInput(qboolean is_console, float x, float v, float inputsize) { - int y; - int i; - char text[sizeof(key_line)+5+1]; // space for ^^xRGB too - float x, xo; + int y, i, col_out, linepos, text_start, prefix_start; + char text[MAX_INPUTLINE + 5 + 9 + 1]; // space for ^xRGB, "say_team:" and \0 + float xo; size_t len_out; - int col_out; + char *prefix; + dp_font_t *fnt; - if (!key_consoleactive) + if (is_console && !key_consoleactive) return; // don't draw anything - strlcpy(text, key_line, sizeof(text)); - - // Advanced Console Editing by Radix radix@planetquake.com - // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com + if (is_console) + { + // empty prefix because ] is part of the console edit line + prefix = ""; + strlcpy(text, key_line, sizeof(text)); + linepos = key_linepos; + fnt = FONT_CONSOLE; + } + else + { + if (chat_mode < 0) + prefix = "]"; + else if(chat_mode) + prefix = "say_team:"; + else + prefix = "say:"; + strlcpy(text, chat_buffer, sizeof(text)); + linepos = chat_bufferpos; + fnt = FONT_CHAT; + } y = (int)strlen(text); // make the color code visible when the cursor is inside it - if(text[key_linepos] != 0) + if(text[linepos] != 0) { - for(i=1; i < 5 && key_linepos - i > 0; ++i) - if(text[key_linepos-i] == STRING_COLOR_TAG) + for(i=1; i < 5 && linepos - i > 0; ++i) + if(text[linepos-i] == STRING_COLOR_TAG) { int caret_pos, ofs = 0; - caret_pos = key_linepos - i; + caret_pos = linepos - i; if(i == 1 && text[caret_pos+1] == STRING_COLOR_TAG) ofs = 1; else if(i == 1 && isdigit(text[caret_pos+1])) @@ -1555,15 +1572,28 @@ static void Con_DrawInput (void) } } - len_out = key_linepos; + if (!is_console) + { + prefix_start = x; + x += DrawQ_TextWidth(prefix, 0, inputsize, inputsize, false, fnt); + } + + len_out = linepos; col_out = -1; - xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, con_textsize.value, con_textsize.value, &col_out, false, FONT_CONSOLE, 1000000000); - x = vid_conwidth.value * 0.95 - xo; // scroll - if(x >= 0) - x = 0; + xo = 0; + if (linepos > 0) + xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, inputsize, inputsize, &col_out, false, fnt, 1000000000); - // draw it - DrawQ_String(x, con_vislines - con_textsize.value*2, text, y + 3, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE ); + text_start = x + (vid_conwidth.value - x) * 0.95 - xo; // scroll + if(text_start >= x) + text_start = x; + else if (!is_console) + prefix_start -= (x - text_start); + + if (!is_console) + DrawQ_String(prefix_start, v, prefix, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, fnt); + + DrawQ_String(text_start, v, text, y + 3, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, fnt); // draw a cursor on top of this if ((int)(host.realtime*con_cursorspeed) & 1) // cursor is visible @@ -1582,7 +1612,7 @@ static void Con_DrawInput (void) memcpy(text, curbuf, len); text[len] = 0; } - DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE); + DrawQ_String(text_start + xo, v, text, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, fnt); } } @@ -1737,10 +1767,9 @@ Draws the last few lines of output transparently over the game top */ void Con_DrawNotify (void) { - float x, v, xr; + float x, v; float chatstart, notifystart, inputsize, height; float align; - char temptext[MAX_INPUTLINE]; int numChatlines; int chatpos; @@ -1816,26 +1845,12 @@ void Con_DrawNotify (void) } if (key_dest == key_message) { - //static char *cursor[2] = { "\xee\x80\x8a", "\xee\x80\x8b" }; // { off, on } - int colorindex = -1; - const char *cursor; - char charbuf16[16]; - cursor = u8_encodech(0xE00A + ((int)(host.realtime * con_cursorspeed)&1), NULL, charbuf16); - - // LadyHavoc: speedup, and other improvements - if (chat_mode < 0) - dpsnprintf(temptext, sizeof(temptext), "]%s%s", chat_buffer, cursor); - else if(chat_mode) - dpsnprintf(temptext, sizeof(temptext), "say_team:%s%s", chat_buffer, cursor); - else - dpsnprintf(temptext, sizeof(temptext), "say:%s%s", chat_buffer, cursor); - - // FIXME word wrap inputsize = (numChatlines ? con_chatsize : con_notifysize).value; - xr = vid_conwidth.value - DrawQ_TextWidth(temptext, 0, inputsize, inputsize, false, FONT_CHAT); - x = min(xr, x); - DrawQ_String(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT); + Con_DrawInput(false, x, v, inputsize); } + else + chat_bufferpos = 0; + if (con_mutex) Thread_UnlockMutex(con_mutex); } @@ -2063,7 +2078,7 @@ void Con_DrawConsole (int lines) #endif // draw the input prompt, user text, and cursor if desired - Con_DrawInput (); + Con_DrawInput(true, 0, con_vislines - con_textsize.value * 2, con_textsize.value); r_draw2d_force = false; if (con_mutex) Thread_UnlockMutex(con_mutex); @@ -2404,8 +2419,7 @@ static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean is { if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'') { - if(!(isCon && line[spos-1] == ']' && spos == 1) && // console start - !(spos > 1 && line[spos-1] >= '0' && line[spos-1] <= '9' && line[spos-2] == STRING_COLOR_TAG)) // color start + if(!(isCon && spos == 1)) // console start { --spos; continue; @@ -2689,45 +2703,6 @@ static int Nicks_AddLastColor(char *buffer, int pos) return pos; } -int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) -{ - int n; - /*if(!con_nickcompletion.integer) - return; is tested in Nicks_CompletionCountPossible */ - n = Nicks_CompleteCountPossible(buffer, pos, &buffer[pos], false); - if(n == 1) - { - size_t len; - char *msg; - - msg = Nicks_list[0]; - len = min(size - Nicks_matchpos - 3, strlen(msg)); - memcpy(&buffer[Nicks_matchpos], msg, len); - if(len < size - 7) // space for color code (^[0-9] or ^xrgb), space and \0 - len = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len); - buffer[len++] = ' '; - buffer[len] = 0; - return (int)len; - } else if(n > 1) - { - int len; - char *msg; - Con_Printf("\n%i possible nicks:\n", n); - Cmd_CompleteNicksPrint(n); - - Nicks_CutMatches(n); - - msg = Nicks_sanlist[0]; - len = (int)min(size - Nicks_matchpos, strlen(msg)); - memcpy(&buffer[Nicks_matchpos], msg, len); - buffer[Nicks_matchpos + len] = 0; - //pos += len; - return Nicks_matchpos + len; - } - return pos; -} - - /* Con_CompleteCommandLine @@ -2738,7 +2713,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) Enhanced to tab-complete map names by [515] */ -void Con_CompleteCommandLine (cmd_state_t *cmd) +int Con_CompleteCommandLine(cmd_state_t *cmd, qboolean is_console) { const char *text = ""; char *s; @@ -2750,24 +2725,46 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) const char *space, *patterns; char vabuf[1024]; + char *line; + int linestart, linepos; + unsigned int linesize; + if (is_console) + { + line = key_line; + linepos = key_linepos; + linesize = sizeof(key_line); + linestart = 1; + } + else + { + line = chat_buffer; + linepos = chat_bufferpos; + linesize = sizeof(chat_buffer); + linestart = 0; + } + //find what we want to complete - pos = key_linepos; - while(--pos) + pos = linepos; + while(--pos >= linestart) { - k = key_line[pos]; + k = line[pos]; if(k == '\"' || k == ';' || k == ' ' || k == '\'') break; } pos++; - s = key_line + pos; - strlcpy(s2, key_line + key_linepos, sizeof(s2)); //save chars after cursor - key_line[key_linepos] = 0; //hide them + s = line + pos; + strlcpy(s2, line + linepos, sizeof(s2)); //save chars after cursor + line[linepos] = 0; //hide them - space = strchr(key_line + 1, ' '); - if(space && pos == (space - key_line) + 1) + c = v = a = n = cmd_len = 0; + if (!is_console) + goto nicks; + + space = strchr(line + 1, ' '); + if(space && pos == (space - line) + 1) { - strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line))); + strlcpy(command, line + 1, min(sizeof(command), (unsigned int)(space - line))); patterns = Cvar_VariableString(cmd->cvars, va(vabuf, sizeof(vabuf), "con_completion_%s", command), CVAR_CLIENT | CVAR_SERVER); // TODO maybe use a better place for this? if(patterns && !*patterns) @@ -2780,18 +2777,18 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (GetMapList(s, t, sizeof(t))) { // first move the cursor - key_linepos += (int)strlen(t) - (int)strlen(s); + linepos += (int)strlen(t) - (int)strlen(s); // and now do the actual work *s = 0; - strlcat(key_line, t, MAX_INPUTLINE); - strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor + strlcat(line, t, MAX_INPUTLINE); + strlcat(line, s2, MAX_INPUTLINE); //add back chars after cursor // and fix the cursor - if(key_linepos > (int) strlen(key_line)) - key_linepos = (int) strlen(key_line); + if(linepos > (int) strlen(line)) + linepos = (int) strlen(line); } - return; + return linepos; } else { @@ -2920,21 +2917,21 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) } // first move the cursor - key_linepos += (int)strlen(t) - (int)strlen(s); + linepos += (int)strlen(t) - (int)strlen(s); // and now do the actual work *s = 0; - strlcat(key_line, t, MAX_INPUTLINE); - strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor + strlcat(line, t, MAX_INPUTLINE); + strlcat(line, s2, MAX_INPUTLINE); //add back chars after cursor // and fix the cursor - if(key_linepos > (int) strlen(key_line)) - key_linepos = (int) strlen(key_line); + if(linepos > (int) strlen(line)) + linepos = (int) strlen(line); } stringlistfreecontents(&resultbuf); stringlistfreecontents(&dirbuf); - return; // bail out, when we complete for a command that wants a file name + return linepos; // bail out, when we complete for a command that wants a file name } } } @@ -2958,7 +2955,9 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":"); Cmd_CompleteAliasPrint(cmd, s); } - n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true); + +nicks: + n = Nicks_CompleteCountPossible(line, linepos, s, is_console); if (n) { Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":"); @@ -2968,8 +2967,8 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (!(c + v + a + n)) // No possible matches { if(s2[0]) - strlcpy(&key_line[key_linepos], s2, sizeof(key_line) - key_linepos); - return; + strlcpy(&line[linepos], s2, linesize - linepos); + return linepos; } if (c) @@ -2979,7 +2978,12 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (a) text = *(list[2] = Cmd_CompleteAliasBuildList(cmd, s)); if (n) - text = *(list[3] = Nicks_CompleteBuildList(n)); + { + if (is_console) + text = *(list[3] = Nicks_CompleteBuildList(n)); + else + text = *(Nicks_CompleteBuildList(n)); + } for (cmd_len = (int)strlen(s);;cmd_len++) { @@ -3000,37 +3004,42 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) done: // prevent a buffer overrun by limiting cmd_len according to remaining space - cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos); + cmd_len = min(cmd_len, (int)linesize - 1 - pos); if (text) { - key_linepos = pos; - memcpy(&key_line[key_linepos], text, cmd_len); - key_linepos += cmd_len; + linepos = pos; + memcpy(&line[linepos], text, cmd_len); + linepos += cmd_len; // if there is only one match, add a space after it - if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_line) - 1) + if (c + v + a + n == 1 && linepos < (int)linesize - 1) { if(n) { // was a nick, might have an offset, and needs colors ;) --blub - key_linepos = pos - Nicks_offset[0]; + linepos = pos - Nicks_offset[0]; cmd_len = (int)strlen(Nicks_list[0]); - cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos); + cmd_len = min(cmd_len, (int)linesize - 3 - pos); - memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len); - key_linepos += cmd_len; - if(key_linepos < (int)(sizeof(key_line) - 7)) // space for color code (^[0-9] or ^xrgb), space and \0 - key_linepos = Nicks_AddLastColor(key_line, key_linepos); + memcpy(&line[linepos] , Nicks_list[0], cmd_len); + linepos += cmd_len; + if(linepos < (int)(linesize - 7)) // space for color code (^[0-9] or ^xrgb), space and \0 + linepos = Nicks_AddLastColor(line, linepos); } - key_line[key_linepos++] = ' '; + line[linepos++] = ' '; } } // use strlcat to avoid a buffer overrun - key_line[key_linepos] = 0; - strlcat(key_line, s2, sizeof(key_line)); + line[linepos] = 0; + strlcat(line, s2, linesize); + + if (!is_console) + return linepos; // free the command, cvar, and alias lists for (i = 0; i < 4; i++) if (list[i]) Mem_Free((void *)list[i]); + + return linepos; } diff --git a/console.h b/console.h index 033c2754..079b538d 100644 --- a/console.h +++ b/console.h @@ -63,15 +63,13 @@ void Con_DrawNotify (void); void Con_ClearNotify (void); void Con_ToggleConsole_f(cmd_state_t *cmd); -int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos); - qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength); /// wrapper function to attempt to either complete the command line /// or to list possible matches grouped by type /// (i.e. will display possible variables, aliases, commands /// that match what they've typed so far) -void Con_CompleteCommandLine(cmd_state_t *cmd); +int Con_CompleteCommandLine(cmd_state_t *cmd, qboolean is_console); /// Generic libs/util/console.c function to display a list /// formatted in columns on the console diff --git a/keys.c b/keys.c index e78a1c12..6daa68cb 100644 --- a/keys.c +++ b/keys.c @@ -663,12 +663,19 @@ static const keyname_t keynames[] = { ============================================================================== */ -void -Key_ClearEditLine (int edit_line) +int Key_ClearEditLine(qboolean is_console) { - memset (key_line, '\0', sizeof(key_line)); - key_line[0] = ']'; - key_linepos = 1; + if (is_console) + { + key_line[0] = ']'; + key_line[1] = 0; + return 1; + } + else + { + chat_buffer[0] = 0; + return 0; + } } // key modifier states @@ -686,34 +693,77 @@ Key_ClearEditLine (int edit_line) Interactive line editing and console scrollback ==================== */ -static void -Key_Console (cmd_state_t *cmd, int key, int unicode) + +int chat_mode; // 0 for say, 1 for say_team, -1 for command +char chat_buffer[MAX_INPUTLINE]; +int chat_bufferpos = 0; + +int Key_AddChar(int unicode, qboolean is_console) { - // LadyHavoc: copied most of this from Q2 to improve keyboard handling - switch (key) + char *line; + char buf[16]; + int len, blen, linepos; + + if (is_console) { - case K_KP_SLASH: key = '/'; break; - case K_KP_MINUS: key = '-'; break; - case K_KP_PLUS: key = '+'; break; - case K_KP_HOME: key = '7'; break; - case K_KP_UPARROW: key = '8'; break; - case K_KP_PGUP: key = '9'; break; - case K_KP_LEFTARROW: key = '4'; break; - case K_KP_5: key = '5'; break; - case K_KP_RIGHTARROW: key = '6'; break; - case K_KP_END: key = '1'; break; - case K_KP_DOWNARROW: key = '2'; break; - case K_KP_PGDN: key = '3'; break; - case K_KP_INS: key = '0'; break; - case K_KP_DEL: key = '.'; break; + line = key_line; + linepos = key_linepos; + } + else + { + line = chat_buffer; + linepos = chat_bufferpos; } - // Forbid Ctrl Alt shortcuts since on Windows they are used to type some characters - // in certain non-English keyboards using the AltGr key (which emulates Ctrl Alt) - // Reference: "Why Ctrl+Alt shouldn't be used as a shortcut modifier" - // https://blogs.msdn.microsoft.com/oldnewthing/20040329-00/?p=40003 - if (keydown[K_CTRL] && keydown[K_ALT]) - goto add_char; + if (linepos >= MAX_INPUTLINE-1) + return linepos; + + blen = u8_fromchar(unicode, buf, sizeof(buf)); + if (!blen) + return linepos; + len = (int)strlen(&line[linepos]); + // check insert mode, or always insert if at end of line + if (key_insert || len == 0) + { + if (linepos + len + blen >= MAX_INPUTLINE) + return linepos; + // can't use strcpy to move string to right + len++; + if (linepos + blen + len >= MAX_INPUTLINE) + return linepos; + memmove(&line[linepos + blen], &line[linepos], len); + } + else if (linepos + len + blen - u8_bytelen(line + linepos, 1) >= MAX_INPUTLINE) + return linepos; + memcpy(line + linepos, buf, blen); + if (blen > len) + line[linepos + blen] = 0; + linepos += blen; + return linepos; +} + +// returns -1 if no key has been recognized +// returns linepos (>= 0) otherwise +// if is_console is true can modify key_line (doesn't change key_linepos) +int Key_Parse_CommonKeys(cmd_state_t *cmd, qboolean is_console, int key, int unicode) +{ + char *line; + int linepos, linestart; + unsigned int linesize; + if (is_console) + { + line = key_line; + linepos = key_linepos; + linesize = sizeof(key_line); + linestart = 1; + } + else + { + line = chat_buffer; + linepos = chat_bufferpos; + linesize = sizeof(chat_buffer); + linestart = 0; + } if ((key == 'v' && KM_CTRL) || ((key == K_INS || key == K_KP_INS) && KM_SHIFT)) { @@ -738,121 +788,81 @@ Key_Console (cmd_state_t *cmd, int key, int unicode) strtok(cbd, "\n\r\b"); #endif i = (int)strlen(cbd); - if (i + key_linepos >= MAX_INPUTLINE) - i= MAX_INPUTLINE - key_linepos - 1; + if (i + linepos >= MAX_INPUTLINE) + i= MAX_INPUTLINE - linepos - 1; if (i > 0) { 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; + memmove(line + linepos + i, line + linepos, linesize - linepos - i); + memcpy(line + linepos, cbd, i); + linepos += i; } Z_Free(cbd); } - return; - } - - if (key == 'l' && KM_CTRL) - { - Cbuf_AddText (cmd, "clear\n"); - return; + return linepos; } if (key == 'u' && KM_CTRL) // like vi/readline ^u: delete currently edited line { - // clear line - key_line[0] = ']'; - key_line[1] = 0; - key_linepos = 1; - return; - } - - if (key == 'q' && KM_CTRL) // like zsh ^q: push line to history, don't execute, and clear - { - // clear line - Key_History_Push(); - key_line[0] = ']'; - key_line[1] = 0; - key_linepos = 1; - return; - } - - if ((key == K_ENTER || key == K_KP_ENTER) && KM_NONE) - { - Cbuf_AddText (cmd, key_line+1); // skip the ] - Cbuf_AddText (cmd, "\n"); - Key_History_Push(); - key_line[0] = ']'; - key_line[1] = 0; // EvilTypeGuy: null terminate - key_linepos = 1; - // force an update, because the command may take some time - if (cls.state == ca_disconnected) - CL_UpdateScreen (); - return; + return Key_ClearEditLine(is_console); } if (key == K_TAB) { - if (KM_CTRL) // append the cvar value to the cvar name + if (is_console && KM_CTRL) // append the cvar value to the cvar name { int cvar_len, cvar_str_len, chars_to_move; char k; char cvar[MAX_INPUTLINE]; const char *cvar_str; - + // go to the start of the variable - while(--key_linepos) + while(--linepos) { - k = key_line[key_linepos]; + k = line[linepos]; if(k == '\"' || k == ';' || k == ' ' || k == '\'') break; } - key_linepos++; - + linepos++; + // save the variable name in cvar - for(cvar_len=0; (k = key_line[key_linepos + cvar_len]) != 0; cvar_len++) + for(cvar_len=0; (k = line[linepos + cvar_len]) != 0; cvar_len++) { if(k == '\"' || k == ';' || k == ' ' || k == '\'') break; cvar[cvar_len] = k; } if (cvar_len==0) - return; + return linepos; cvar[cvar_len] = 0; - + // go to the end of the cvar - key_linepos += cvar_len; - + linepos += cvar_len; + // save the content of the variable in cvar_str cvar_str = Cvar_VariableString(&cvars_all, cvar, CVAR_CLIENT | CVAR_SERVER); cvar_str_len = (int)strlen(cvar_str); if (cvar_str_len==0) - return; - - // insert space and cvar_str in key_line - chars_to_move = (int)strlen(&key_line[key_linepos]); - if (key_linepos + 1 + cvar_str_len + chars_to_move < MAX_INPUTLINE) + return linepos; + + // insert space and cvar_str in line + chars_to_move = (int)strlen(&line[linepos]); + if (linepos + 1 + cvar_str_len + chars_to_move < MAX_INPUTLINE) { if (chars_to_move) - memmove(&key_line[key_linepos + 1 + cvar_str_len], &key_line[key_linepos], chars_to_move); - key_line[key_linepos++] = ' '; - memcpy(&key_line[key_linepos], cvar_str, cvar_str_len); - key_linepos += cvar_str_len; - key_line[key_linepos + chars_to_move] = 0; + memmove(&line[linepos + 1 + cvar_str_len], &line[linepos], chars_to_move); + line[linepos++] = ' '; + memcpy(&line[linepos], cvar_str, cvar_str_len); + linepos += cvar_str_len; + line[linepos + chars_to_move] = 0; } else Con_Printf("Couldn't append cvar value, edit line too long.\n"); - return; + return linepos; } if (KM_NONE) - { - // Enhanced command completion - // by EvilTypeGuy eviltypeguy@qeradiant.com - // Thanks to Fett, Taniwha - Con_CompleteCommandLine(cmd); - return; - } + return Con_CompleteCommandLine(cmd, is_console); } // Advanced Console Editing by Radix radix@planetquake.com @@ -867,87 +877,93 @@ Key_Console (cmd_state_t *cmd, int key, int unicode) { int pos; char k; - if (key_linepos < 2) - return; - pos = key_linepos-1; + if (linepos <= linestart + 1) + return linestart; + pos = linepos; - if(pos) // skip all "; ' after the word - while(--pos) - { - k = key_line[pos]; - if (!(k == '\"' || k == ';' || k == ' ' || k == '\'')) - break; - } + do { + k = line[--pos]; + if (!(k == '\"' || k == ';' || k == ' ' || k == '\'')) + break; + } while(pos > linestart); // skip all "; ' after the word - if(pos) - while(--pos) + if (pos == linestart) + return linestart; + + do { + k = line[--pos]; + if (k == '\"' || k == ';' || k == ' ' || k == '\'') { - k = key_line[pos]; - if(k == '\"' || k == ';' || k == ' ' || k == '\'') - break; + pos++; + break; } - key_linepos = pos + 1; - return; + } while(pos > linestart); + + linepos = pos; + return linepos; } if(KM_SHIFT) // move cursor to the previous character ignoring colors { int pos; size_t inchar = 0; - if (key_linepos < 2) - return; - pos = (int)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])) + if (linepos <= linestart + 1) + return linestart; + pos = (int)u8_prevbyte(line + linestart, linepos - linestart) + linestart; + while (pos > linestart) + if(pos-1 >= linestart && line[pos-1] == STRING_COLOR_TAG && isdigit(line[pos])) pos-=2; - else if(pos-4 > 0 && key_line[pos-4] == STRING_COLOR_TAG && key_line[pos-3] == STRING_COLOR_RGB_TAG_CHAR - && isxdigit(key_line[pos-2]) && isxdigit(key_line[pos-1]) && isxdigit(key_line[pos])) + else if(pos-4 >= linestart && line[pos-4] == STRING_COLOR_TAG && line[pos-3] == STRING_COLOR_RGB_TAG_CHAR + && isxdigit(line[pos-2]) && isxdigit(line[pos-1]) && isxdigit(line[pos])) pos-=5; else { - if(pos-1 > 0 && key_line[pos-1] == STRING_COLOR_TAG && key_line[pos] == STRING_COLOR_TAG) // consider ^^ as a character + if(pos-1 >= linestart && line[pos-1] == STRING_COLOR_TAG && line[pos] == STRING_COLOR_TAG) // consider ^^ as a character pos--; pos--; break; } + if (pos < linestart) + return linestart; // we need to move to the beginning of the character when in a wide character: - u8_charidx(key_line, pos + 1, &inchar); - key_linepos = (int)(pos + 1 - inchar); - return; + u8_charidx(line, pos + 1, &inchar); + linepos = (int)(pos + 1 - inchar); + return linepos; } if(KM_NONE) { - if (key_linepos < 2) - return; - key_linepos = (int)u8_prevbyte(key_line+1, key_linepos-1) + 1; // do NOT give the ']' to u8_prevbyte - return; + if (linepos <= linestart + 1) + return linestart; + // hide ']' from u8_prevbyte otherwise it could go out of bounds + linepos = (int)u8_prevbyte(line + linestart, linepos - linestart) + linestart; + return linepos; } } // delete char before cursor if ((key == K_BACKSPACE && KM_NONE) || (key == 'h' && KM_CTRL)) { - if (key_linepos > 1) + if (linepos > linestart) { - int newpos = (int)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; + // hide ']' from u8_prevbyte otherwise it could go out of bounds + int newpos = (int)u8_prevbyte(line + linestart, linepos - linestart) + linestart; + strlcpy(line + newpos, line + linepos, linesize + 1 - linepos); + linepos = newpos; } - return; + return linepos; } // delete char on cursor if ((key == K_DEL || key == K_KP_DEL) && KM_NONE) { size_t linelen; - linelen = strlen(key_line); - if (key_linepos < (int)linelen) - memmove(key_line + key_linepos, key_line + key_linepos + u8_bytelen(key_line + key_linepos, 1), linelen - key_linepos); - return; + linelen = strlen(line); + if (linepos < (int)linelen) + memmove(line + linepos, line + linepos + u8_bytelen(line + linepos, 1), linelen - linepos); + return linepos; } - // move cursor to the next character if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW) { @@ -955,81 +971,176 @@ Key_Console (cmd_state_t *cmd, int key, int unicode) { int pos, len; char k; - len = (int)strlen(key_line); - if (key_linepos >= len) - return; - pos = key_linepos; + len = (int)strlen(line); + if (linepos >= len) + return linepos; + pos = linepos; while(++pos < len) { - k = key_line[pos]; + k = line[pos]; if(k == '\"' || k == ';' || k == ' ' || k == '\'') break; } - + if (pos < len) // skip all "; ' after the word while(++pos < len) { - k = key_line[pos]; + k = line[pos]; if (!(k == '\"' || k == ';' || k == ' ' || k == '\'')) break; } - key_linepos = pos; - return; + linepos = pos; + return linepos; } if (KM_SHIFT) // move cursor to the next character ignoring colors { int pos, len; - len = (int)strlen(key_line); - if (key_linepos >= len) - return; - pos = key_linepos; - + len = (int)strlen(line); + if (linepos >= len) + return linepos; + pos = linepos; + // go beyond all initial consecutive color tags, if any if(pos < len) - while (key_line[pos] == STRING_COLOR_TAG) + while (line[pos] == STRING_COLOR_TAG) { - if(isdigit(key_line[pos+1])) + if(isdigit(line[pos+1])) pos+=2; - else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4])) + else if(line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(line[pos+2]) && isxdigit(line[pos+3]) && isxdigit(line[pos+4])) pos+=5; else break; } - + // skip the char - if (key_line[pos] == STRING_COLOR_TAG && key_line[pos+1] == STRING_COLOR_TAG) // consider ^^ as a character + if (line[pos] == STRING_COLOR_TAG && line[pos+1] == STRING_COLOR_TAG) // consider ^^ as a character pos++; - pos += (int)u8_bytelen(key_line + pos, 1); - + pos += (int)u8_bytelen(line + pos, 1); + // now go beyond all next consecutive color tags, if any if(pos < len) - while (key_line[pos] == STRING_COLOR_TAG) + while (line[pos] == STRING_COLOR_TAG) { - if(isdigit(key_line[pos+1])) + if(isdigit(line[pos+1])) pos+=2; - else if(key_line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_line[pos+2]) && isxdigit(key_line[pos+3]) && isxdigit(key_line[pos+4])) + else if(line[pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(line[pos+2]) && isxdigit(line[pos+3]) && isxdigit(line[pos+4])) pos+=5; else break; } - key_linepos = pos; - return; + linepos = pos; + return linepos; } if (KM_NONE) { - if (key_linepos >= (int)strlen(key_line)) - return; - key_linepos += (int)u8_bytelen(key_line + key_linepos, 1); - return; + if (linepos >= (int)strlen(line)) + return linepos; + linepos += (int)u8_bytelen(line + linepos, 1); + return linepos; } } if ((key == K_INS || key == K_KP_INS) && KM_NONE) // toggle insert mode { key_insert ^= 1; + return linepos; + } + + if (key == K_HOME || key == K_KP_HOME) + { + if (is_console && KM_CTRL) + { + con_backscroll = CON_TEXTSIZE; + return linepos; + } + if (KM_NONE) + return linestart; + } + + if (key == K_END || key == K_KP_END) + { + if (is_console && KM_CTRL) + { + con_backscroll = 0; + return linepos; + } + if (KM_NONE) + return (int)strlen(line); + } + + return -1; +} + +static int Key_Convert_NumPadKey(int key) +{ + // LadyHavoc: copied most of this from Q2 to improve keyboard handling + switch (key) + { + case K_KP_SLASH: return '/'; + case K_KP_MINUS: return '-'; + case K_KP_PLUS: return '+'; + case K_KP_HOME: return '7'; + case K_KP_UPARROW: return '8'; + case K_KP_PGUP: return '9'; + case K_KP_LEFTARROW: return '4'; + case K_KP_5: return '5'; + case K_KP_RIGHTARROW: return '6'; + case K_KP_END: return '1'; + case K_KP_DOWNARROW: return '2'; + case K_KP_PGDN: return '3'; + case K_KP_INS: return '0'; + case K_KP_DEL: return '.'; + } + return key; +} + +static void +Key_Console(cmd_state_t *cmd, int key, int unicode) +{ + int linepos; + + key = Key_Convert_NumPadKey(key); + + // Forbid Ctrl Alt shortcuts since on Windows they are used to type some characters + // in certain non-English keyboards using the AltGr key (which emulates Ctrl Alt) + // Reference: "Why Ctrl+Alt shouldn't be used as a shortcut modifier" + // https://blogs.msdn.microsoft.com/oldnewthing/20040329-00/?p=40003 + if (keydown[K_CTRL] && keydown[K_ALT]) + goto add_char; + + linepos = Key_Parse_CommonKeys(cmd, true, key, unicode); + if (linepos >= 0) + { + key_linepos = linepos; + return; + } + + if ((key == K_ENTER || key == K_KP_ENTER) && KM_NONE) + { + Cbuf_AddText (cmd, key_line+1); // skip the ] + Cbuf_AddText (cmd, "\n"); + Key_History_Push(); + key_linepos = Key_ClearEditLine(true); + // force an update, because the command may take some time + if (cls.state == ca_disconnected) + CL_UpdateScreen (); + return; + } + + if (key == 'l' && KM_CTRL) + { + Cbuf_AddText (cmd, "clear\n"); + return; + } + + if (key == 'q' && KM_CTRL) // like zsh ^q: push line to history, don't execute, and clear + { + // clear line + Key_History_Push(); + key_linepos = Key_ClearEditLine(true); return; } @@ -1172,80 +1283,25 @@ Key_Console (cmd_state_t *cmd, int key, int unicode) } } - if (key == K_HOME || key == K_KP_HOME) - { - if (KM_CTRL) - { - con_backscroll = CON_TEXTSIZE; - return; - } - if (KM_NONE) - { - key_linepos = 1; - return; - } - } - - if (key == K_END || key == K_KP_END) - { - if (KM_CTRL) - { - con_backscroll = 0; - return; - } - if (KM_NONE) - { - key_linepos = (int)strlen(key_line); - return; - } - } - add_char: // non printable 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) - { - if (key_linepos + len + blen >= MAX_INPUTLINE) - return; - // can't use strcpy to move string to right - len++; - if (key_linepos + blen + len >= MAX_INPUTLINE) - return; - memmove(&key_line[key_linepos + blen], &key_line[key_linepos], len); - } - else if (key_linepos + len + blen - u8_bytelen(key_line + key_linepos, 1) >= MAX_INPUTLINE) - return; - memcpy(key_line + key_linepos, buf, blen); - if (blen > len) - key_line[key_linepos + blen] = 0; - // END OF FIXME - key_linepos += blen; - } + key_linepos = Key_AddChar(unicode, true); } //============================================================================ -int chat_mode; -char chat_buffer[MAX_INPUTLINE]; -unsigned int chat_bufferlen = 0; - static void Key_Message (cmd_state_t *cmd, int key, int ascii) { + int linepos; char vabuf[1024]; + + key = Key_Convert_NumPadKey(key); + if (key == K_ENTER || key == K_KP_ENTER || ascii == 10 || ascii == 13) { if(chat_mode < 0) @@ -1254,30 +1310,20 @@ Key_Message (cmd_state_t *cmd, int key, int ascii) Cmd_ForwardStringToServer(va(vabuf, sizeof(vabuf), "%s %s", chat_mode ? "say_team" : "say ", chat_buffer)); key_dest = key_game; - chat_bufferlen = 0; - chat_buffer[0] = 0; + chat_bufferpos = Key_ClearEditLine(false); return; } - // TODO add support for arrow keys and simple editing - if (key == K_ESCAPE) { key_dest = key_game; - chat_bufferlen = 0; - chat_buffer[0] = 0; - return; - } - - if (key == K_BACKSPACE) { - if (chat_bufferlen) { - chat_bufferlen = (unsigned int)u8_prevbyte(chat_buffer, chat_bufferlen); - chat_buffer[chat_bufferlen] = 0; - } + chat_bufferpos = Key_ClearEditLine(false); return; } - if(key == K_TAB) { - chat_bufferlen = Nicks_CompleteChatLine(chat_buffer, sizeof(chat_buffer), chat_bufferlen); + linepos = Key_Parse_CommonKeys(cmd, false, key, ascii); + if (linepos >= 0) + { + chat_bufferpos = linepos; return; } @@ -1285,16 +1331,10 @@ Key_Message (cmd_state_t *cmd, int key, int ascii) 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_bufferlen += u8_fromchar(ascii, chat_buffer+chat_bufferlen, sizeof(chat_buffer) - chat_bufferlen - 1); - - //chat_buffer[chat_bufferlen++] = ascii; - //chat_buffer[chat_bufferlen] = 0; + chat_bufferpos = Key_AddChar(ascii, false); } //============================================================================ @@ -1666,9 +1706,7 @@ void Key_Init (void) { Key_History_Init(); - key_line[0] = ']'; - key_line[1] = 0; - key_linepos = 1; + key_linepos = Key_ClearEditLine(true); // // register our functions diff --git a/keys.h b/keys.h index 1cf6f2cb..6c10a6f1 100644 --- a/keys.h +++ b/keys.h @@ -369,9 +369,9 @@ extern char *keybindings[MAX_BINDMAPS][MAX_KEYS]; extern int chat_mode; // 0 for say, 1 for say_team, -1 for command extern char chat_buffer[MAX_INPUTLINE]; -extern unsigned int chat_bufferlen; +extern int chat_bufferpos; -void Key_ClearEditLine(int edit_line); +int Key_ClearEditLine(qboolean is_console); void Key_WriteBindings(qfile_t *f); void Key_Init(void); void Key_Shutdown(void); @@ -381,6 +381,8 @@ void Key_ReleaseAll (void); void Key_ReleaseAll_f(cmd_state_t *cmd); void Key_EventQueue_Block(void); void Key_EventQueue_Unblock(void); +int Key_AddChar(int unicode, qboolean is_console); +int Key_Parse_CommonKeys(cmd_state_t *cmd, qboolean is_console, int key, int unicode); qboolean Key_SetBinding (int keynum, int bindmap, const char *binding); const char *Key_GetBind (int key, int bindmap);