This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
#define MAXCMDLINE 256
char key_lines[32][MAXCMDLINE];
int key_linepos;
-int shift_down=false;
+int shift_down = false;
int key_lastpress;
+int key_insert; // insert key toggle (for editing)
-int edit_line=0;
-int history_line=0;
+int edit_line = 0;
+int history_line = 0;
keydest_t key_dest;
{"ALT", K_ALT},
{"CTRL", K_CTRL},
{"SHIFT", K_SHIFT},
-
+
{"F1", K_F1},
{"F2", K_F2},
{"F3", K_F3},
*/
void Key_Console (int key)
{
- char *cmd;
-
if (key == K_ENTER)
{
- Cbuf_AddText (key_lines[edit_line]+1); // skip the >
+ Cbuf_AddText (key_lines[edit_line]+1); // skip the ]
Cbuf_AddText ("\n");
Con_Printf ("%s\n",key_lines[edit_line]);
edit_line = (edit_line + 1) & 31;
history_line = edit_line;
key_lines[edit_line][0] = ']';
+ key_lines[edit_line][1] = 0; // EvilTypeGuy: null terminate
key_linepos = 1;
+ // force an update, because the command may take some time
if (cls.state == ca_disconnected)
- SCR_UpdateScreen (); // force an update, because the command
- // may take some time
+ {
+ CL_UpdateScreen ();
+ CL_UpdateScreen ();
+ }
return;
}
if (key == K_TAB)
- { // command completion
- cmd = Cmd_CompleteCommand (key_lines[edit_line]+1);
- if (!cmd)
- cmd = Cvar_CompleteVariable (key_lines[edit_line]+1);
- if (cmd)
+ {
+ // Enhanced command completion
+ // by EvilTypeGuy eviltypeguy@qeradiant.com
+ // Thanks to Fett, Taniwha
+ Con_CompleteCommandLine();
+ }
+
+ // Advanced Console Editing by Radix radix@planetquake.com
+ // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+
+ // left arrow will just move left one without erasing, backspace will
+ // actually erase charcter
+ if (key == K_LEFTARROW)
+ {
+ if (key_linepos > 1)
+ key_linepos--;
+ return;
+ }
+
+ if (key == K_BACKSPACE) // delete char before cursor
+ {
+ if (key_linepos > 1)
{
- strcpy (key_lines[edit_line]+1, cmd);
- key_linepos = strlen(cmd)+1;
- key_lines[edit_line][key_linepos] = ' ';
+ strcpy(key_lines[edit_line] + key_linepos - 1, key_lines[edit_line] + key_linepos);
+ key_linepos--;
+ }
+ return;
+ }
+
+ if (key == K_DEL) // delete char on cursor
+ {
+ if (key_linepos < strlen(key_lines[edit_line]))
+ strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
+ return;
+ }
+
+
+ // if we're at the end, get one character from previous line,
+ // otherwise just go right one
+ if (key == K_RIGHTARROW)
+ {
+ if (strlen(key_lines[edit_line]) == key_linepos)
+ {
+ if (strlen(key_lines[(edit_line + 31) & 31]) <= key_linepos)
+ return; // no character to get
+
+ key_lines[edit_line][key_linepos] = key_lines[(edit_line + 31) & 31][key_linepos];
key_linepos++;
key_lines[edit_line][key_linepos] = 0;
- return;
}
+ else
+ key_linepos++;
+
+ return;
}
-
- if (key == K_BACKSPACE || key == K_LEFTARROW)
+
+ if (key == K_INS) // toggle insert mode
{
- if (key_linepos > 1)
- key_linepos--;
+ key_insert ^= 1;
return;
}
+ // End Advanced Console Editing
+
if (key == K_UPARROW)
{
do
if (key == K_PGUP || key==K_MWHEELUP)
{
con_backscroll += 2;
- if (con_backscroll > con_totallines - (vid.height>>3) - 1)
- con_backscroll = con_totallines - (vid.height>>3) - 1;
+ if (con_backscroll > con_totallines - (vid.conheight>>3) - 1)
+ con_backscroll = con_totallines - (vid.conheight>>3) - 1;
return;
}
if (key == K_HOME)
{
- con_backscroll = con_totallines - (vid.height>>3) - 1;
+ con_backscroll = con_totallines - (vid.conheight>>3) - 1;
return;
}
if (key < 32 || key > 127)
return; // non printable
+
+
if (key_linepos < MAXCMDLINE-1)
{
+ int i;
+
+ if (key_insert) // check insert mode
+ {
+ // can't do strcpy to move string to right
+ i = strlen(key_lines[edit_line]) - 1;
+
+ if (i == 254)
+ i--;
+
+ for (; i >= key_linepos; i--)
+ key_lines[edit_line][i + 1] = key_lines[edit_line][i];
+ }
+
+ // only null terminate if at the end
+ i = key_lines[edit_line][key_linepos];
key_lines[edit_line][key_linepos] = key;
key_linepos++;
- key_lines[edit_line][key_linepos] = 0;
- }
+ if (!i)
+ key_lines[edit_line][key_linepos] = 0;
+ }
}
//============================================================================
int Key_StringToKeynum (char *str)
{
keyname_t *kn;
-
+
if (!str || !str[0])
return -1;
if (!str[1])
*/
char *Key_KeynumToString (int keynum)
{
- keyname_t *kn;
+ keyname_t *kn;
static char tinystr[2];
-
+
if (keynum == -1)
return "<KEY NOT FOUND>";
if (keynum > 32 && keynum < 127)
Con_Printf ("unbind <key> : remove commands from a key\n");
return;
}
-
+
b = Key_StringToKeynum (Cmd_Argv(1));
if (b==-1)
{
void Key_Unbindall_f (void)
{
int i;
-
+
for (i=0 ; i<256 ; i++)
if (keybindings[i])
Key_SetBinding (i, "");
{
int i, c, b;
char cmd[1024];
-
+
c = Cmd_Argc();
if (c != 2 && c != 3)
Con_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
return;
}
-
+
// copy the rest of the command line
cmd[0] = 0; // start out with a null string
for (i=2 ; i< c ; i++)
Writes lines containing "bind key value"
============
*/
-void Key_WriteBindings (FILE *f)
+void Key_WriteBindings (QFile *f)
{
int i;
for (i=0 ; i<256 ; i++)
if (keybindings[i])
if (*keybindings[i])
- fprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString(i), keybindings[i]);
+ Qprintf (f, "bind \"%s\" \"%s\"\n", Key_KeynumToString(i), keybindings[i]);
}
{
int i;
+ // LordHavoc: clear keybindings array so bounds checking won't freak
+ for (i = 0;i < 256;i++)
+ keybindings[i] = NULL;
+
for (i=0 ; i<32 ; i++)
{
key_lines[i][0] = ']';
key_lines[i][1] = 0;
}
key_linepos = 1;
-
+
//
// init ascii characters in console mode
//
consolekeys[K_UPARROW] = true;
consolekeys[K_DOWNARROW] = true;
consolekeys[K_BACKSPACE] = true;
+ consolekeys[K_DEL] = true;
+ consolekeys[K_INS] = true;
consolekeys[K_PGUP] = true;
consolekeys[K_PGDN] = true;
consolekeys[K_SHIFT] = true;
Cmd_AddCommand ("bind",Key_Bind_f);
Cmd_AddCommand ("unbind",Key_Unbind_f);
Cmd_AddCommand ("unbindall",Key_Unbindall_f);
-
-
}
/*
projects / xonotic / darkplaces.git / blobdiff