#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"};
int history_line;
char history_savedline[MAX_INPUTLINE];
conbuffer_t history;
-#define HIST_TEXTSIZE 262144
-#define HIST_MAXLINES 4096
extern cvar_t con_textsize;
{"KP_ENTER", K_KP_ENTER},
{"KP_EQUALS", K_KP_EQUALS},
+ {"PRINTSCREEN", K_PRINTSCREEN},
+
{"MOUSE1", K_MOUSE1},
====================
*/
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, key_linepos);
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, key_linepos);
+ }
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, key_linepos);
+ 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;
}
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;
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;
}
//============================================================================
p = keybindings[j][i];
if (p)
{
- Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\"); // 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
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;