====================
*/
static void
-Key_Console (int key, char ascii)
+Key_Console (int key, int ascii)
{
// LordHavoc: copied most of this from Q2 to improve keyboard handling
switch (key)
#endif
i = (int)strlen(cbd);
if (i + key_linepos >= MAX_INPUTLINE)
- i= MAX_INPUTLINE - key_linepos;
+ i= MAX_INPUTLINE - key_linepos - 1;
if (i > 0)
{
+ // terencehill: insert the clipboard text between the characters of the line
+ char *temp = Z_Malloc(MAX_INPUTLINE);
cbd[i]=0;
+ temp[0]=0;
+ if ( key_linepos < (int)strlen(key_lines[edit_line]) )
+ strlcpy(temp, key_lines[edit_line] + key_linepos, (int)strlen(key_lines[edit_line]) - key_linepos +1);
+ key_lines[edit_line][key_linepos] = 0;
strlcat(key_lines[edit_line], cbd, sizeof(key_lines[edit_line]));
+ if (temp[0])
+ strlcat(key_lines[edit_line], temp, sizeof(key_lines[edit_line]));
+ Z_Free(temp);
key_linepos += i;
}
Z_Free(cbd);
// Advanced Console Editing by Radix radix@planetquake.com
// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
// Enhanced by [515]
+ // Enhanced by terencehill
- // left arrow will just move left one without erasing, backspace will
- // actually erase character
+ // move cursor to the previous character
if (key == K_LEFTARROW || key == K_KP_LEFTARROW)
{
if (key_linepos < 2)
return;
- if(keydown[K_CTRL])
+ if(keydown[K_CTRL]) // move cursor to the previous word
{
int pos;
char k;
}
key_linepos = pos + 1;
}
+ else if(keydown[K_SHIFT]) // move cursor to the previous character ignoring colors
+ {
+ int pos;
+ pos = key_linepos-1;
+ while (pos)
+ if(pos-1 > 0 && key_lines[edit_line][pos-1] == STRING_COLOR_TAG && isdigit(key_lines[edit_line][pos]))
+ pos-=2;
+ else if(pos-4 > 0 && key_lines[edit_line][pos-4] == STRING_COLOR_TAG && key_lines[edit_line][pos-3] == STRING_COLOR_RGB_TAG_CHAR
+ && isxdigit(key_lines[edit_line][pos-2]) && isxdigit(key_lines[edit_line][pos-1]) && isxdigit(key_lines[edit_line][pos]))
+ pos-=5;
+ else
+ {
+ pos--;
+ break;
+ }
+ key_linepos = pos + 1;
+ }
else
key_linepos--;
return;
}
- // if we're at the end, get one character from previous line,
- // otherwise just go right one
+ // move cursor to the next character
if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
{
if (key_linepos >= (int)strlen(key_lines[edit_line]))
return;
- if(keydown[K_CTRL])
+ if(keydown[K_CTRL]) // move cursor to the next word
{
int pos, len;
char k;
}
key_linepos = pos;
}
+ else if(keydown[K_SHIFT]) // move cursor to the next character ignoring colors
+ {
+ int pos, len;
+ len = (int)strlen(key_lines[edit_line]);
+ pos = key_linepos;
+ // check if there is a color tag right after the cursor
+ if (key_lines[edit_line][pos] == STRING_COLOR_TAG)
+ {
+ if(isdigit(key_lines[edit_line][pos+1]))
+ pos+=1;
+ else if(key_lines[edit_line][pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_lines[edit_line][pos+2]) && isxdigit(key_lines[edit_line][pos+3]) && isxdigit(key_lines[edit_line][pos+4]))
+ pos+=4;
+ }
+ pos++;
+
+ // now go beyond all next consecutive color tags, if any
+ if(pos < len)
+ while (key_lines[edit_line][pos] == STRING_COLOR_TAG)
+ {
+ if(isdigit(key_lines[edit_line][pos+1]))
+ pos+=2;
+ else if(key_lines[edit_line][pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(key_lines[edit_line][pos+2]) && isxdigit(key_lines[edit_line][pos+3]) && isxdigit(key_lines[edit_line][pos+4]))
+ pos+=5;
+ else
+ break;
+ }
+ key_linepos = pos;
+ }
else
key_linepos++;
return;
if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
{
- con_backscroll += ((int) vid_conheight.integer >> 5);
+ if(keydown[K_CTRL])
+ {
+ con_backscroll += 3;
+ }
+ else
+ con_backscroll += ((int) vid_conheight.integer >> 5);
return;
}
if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
{
- con_backscroll -= ((int) vid_conheight.integer >> 5);
+ if(keydown[K_CTRL])
+ {
+ con_backscroll -= 3;
+ }
+ else
+ con_backscroll -= ((int) vid_conheight.integer >> 5);
return;
}
//============================================================================
-qboolean chat_team;
+int chat_mode;
char chat_buffer[MAX_INPUTLINE];
unsigned int chat_bufferlen = 0;
extern int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
static void
-Key_Message (int key, char ascii)
+Key_Message (int key, int ascii)
{
if (key == K_ENTER || ascii == 10 || ascii == 13)
{
- Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer));
+ if(chat_mode < 0)
+ Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+ else
+ Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
key_dest = key_game;
chat_bufferlen = 0;
return;
}
+ // TODO add support for arrow keys and simple editing
+
if (key == K_ESCAPE) {
key_dest = key_game;
chat_bufferlen = 0;
Key_In_Unbind_f (void)
{
int b, m;
+ char *errchar = NULL;
if (Cmd_Argc () != 3) {
Con_Print("in_unbind <bindmap> <key> : remove commands from a key\n");
return;
}
- m = strtol(Cmd_Argv (1), NULL, 0);
- if ((m < 0) || (m >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m);
+ m = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
{
int i, c, b, m;
char cmd[MAX_INPUTLINE];
+ char *errchar = NULL;
c = Cmd_Argc ();
return;
}
- m = strtol(Cmd_Argv (1), NULL, 0);
- if ((m < 0) || (m >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m);
+ m = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
Key_In_Bindmap_f (void)
{
int m1, m2, c;
+ char *errchar = NULL;
c = Cmd_Argc ();
return;
}
- m1 = strtol(Cmd_Argv (1), NULL, 0);
- if ((m1 < 0) || (m1 >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m1);
+ m1 = strtol(Cmd_Argv (1), &errchar, 0);
+ if ((m1 < 0) || (m1 >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
return;
}
- m2 = strtol(Cmd_Argv (2), NULL, 0);
- if ((m2 < 0) || (m2 >= 8)) {
- Con_Printf("%d isn't a valid bindmap\n", m2);
+ m2 = strtol(Cmd_Argv (2), &errchar, 0);
+ if ((m2 < 0) || (m2 >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(2));
return;
}
Key_SetBinding (i, j, "");
}
+static void
+Key_PrintBindList(int j)
+{
+ char bindbuf[MAX_INPUTLINE];
+ const char *p;
+ int i;
+
+ for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
+ {
+ p = keybindings[j][i];
+ if (p)
+ {
+ Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+ if (j == 0)
+ Con_Printf("^2%s ^7= \"%s\"\n", Key_KeynumToString (i), bindbuf);
+ else
+ Con_Printf("^3bindmap %d: ^2%s ^7= \"%s\"\n", j, Key_KeynumToString (i), bindbuf);
+ }
+ }
+}
+
+static void
+Key_In_BindList_f (void)
+{
+ int m;
+ char *errchar = NULL;
+
+ if(Cmd_Argc() >= 2)
+ {
+ m = strtol(Cmd_Argv(1), &errchar, 0);
+ if ((m < 0) || (m >= 8) || (errchar && *errchar)) {
+ Con_Printf("%s isn't a valid bindmap\n", Cmd_Argv(1));
+ return;
+ }
+ Key_PrintBindList(m);
+ }
+ else
+ {
+ for (m = 0; m < MAX_BINDMAPS; m++)
+ Key_PrintBindList(m);
+ }
+}
+
+static void
+Key_BindList_f (void)
+{
+ Key_PrintBindList(0);
+}
static void
Key_Bind_f (void)
//
Cmd_AddCommand ("in_bind", Key_In_Bind_f, "binds a command to the specified key in the selected bindmap");
Cmd_AddCommand ("in_unbind", Key_In_Unbind_f, "removes command on the specified key in the selected bindmap");
+ Cmd_AddCommand ("in_bindlist", Key_In_BindList_f, "bindlist: displays bound keys for all bindmaps, or the given bindmap");
Cmd_AddCommand ("in_bindmap", Key_In_Bindmap_f, "selects active foreground and background (used only if a key is not bound in the foreground) bindmaps for typing");
Cmd_AddCommand ("bind", Key_Bind_f, "binds a command to the specified key in bindmap 0");
Cmd_AddCommand ("unbind", Key_Unbind_f, "removes a command on the specified key in bindmap 0");
+ 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)");
Cvar_RegisterVariable (&con_closeontoggleconsole);
static keydest_t tbl_keydest[MAX_KEYS];
void
-Key_Event (int key, char ascii, qboolean down)
+Key_Event (int key, int ascii, qboolean down)
{
const char *bind;
qboolean q;
return;
}
+ // handle toggleconsole in menu too
+ if (keydest == key_menu)
+ {
+ if (down && con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && ascii != STRING_COLOR_TAG)
+ {
+ Con_ToggleConsole_f ();
+ tbl_keydest[key] = key_void; // key release should go nowhere (especially not to key_menu or key_game)
+ return;
+ }
+ }
// ignore binds while a video is played, let the video system handle the key event
if (cl_videoplaying)
projects / xonotic / darkplaces.git / blobdiff