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.
int con_backscroll; // lines up from bottom to display
int con_current; // where next message will be printed
int con_x; // offset in current line for next print
-char *con_text=0;
+char *con_text = 0;
-cvar_t con_notifytime = {"con_notifytime","3"}; //seconds
-cvar_t logfile = {"logfile","0"};
+cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"}; //seconds
+cvar_t logfile = {0, "logfile","0"};
#define NUM_CON_TIMES 4
float con_times[NUM_CON_TIMES]; // realtime time the line was generated
- // for transparent notify lines
+ // for transparent notify lines
int con_vislines;
qboolean con_debuglog;
-#define MAXCMDLINE 256
+#define MAXCMDLINE 256
extern char key_lines[32][MAXCMDLINE];
extern int edit_line;
extern int key_linepos;
-
+extern int key_insert;
+
qboolean con_initialized;
-int con_notifylines; // scan lines to clear for notify lines
+mempool_t *console_mempool;
+
+int con_notifylines; // scan lines to clear for notify lines
extern void M_Menu_Main_f (void);
if (key_dest == key_console)
{
if (cls.state == ca_connected)
- {
key_dest = key_game;
- key_lines[edit_line][1] = 0; // clear any typing
- key_linepos = 1;
- }
else
- {
M_Menu_Main_f ();
- }
}
else
key_dest = key_console;
-
- SCR_EndLoadingPlaque ();
+
memset (con_times, 0, sizeof(con_times));
}
memset (con_text, ' ', CON_TEXTSIZE);
}
-
+
/*
================
Con_ClearNotify
void Con_ClearNotify (void)
{
int i;
-
+
for (i=0 ; i<NUM_CON_TIMES ; i++)
con_times[i] = 0;
}
-
+
/*
================
Con_MessageMode_f
team_message = false;
}
-
+
/*
================
Con_MessageMode2_f
team_message = true;
}
-
+
/*
================
Con_CheckResize
int i, j, width, oldwidth, oldtotallines, numlines, numchars;
char tbuf[CON_TEXTSIZE];
- width = (vid.width >> 3) - 2;
+ width = (vid.conwidth >> 3) - 2;
if (width == con_linewidth)
return;
numlines = con_totallines;
numchars = oldwidth;
-
+
if (con_linewidth < numchars)
numchars = con_linewidth;
sprintf (temp, "%s%s", com_gamedir, t2);
unlink (temp);
}
- logfile.value = 1;
+ logfile.integer = 1;
}
- con_text = Hunk_AllocName (CON_TEXTSIZE, "context");
+ console_mempool = Mem_AllocPool("console");
+ con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
memset (con_text, ' ', CON_TEXTSIZE);
con_linewidth = -1;
Con_CheckResize ();
-
+
Con_Printf ("Console initialized.\n");
//
int c, l;
static int cr;
int mask;
-
+
con_backscroll = 0;
if (txt[0] == 1)
cr = false;
}
-
+
if (!con_x)
{
Con_Linefeed ();
con_x = 0;
break;
}
-
+
}
}
*/
void Con_DebugLog(char *file, char *fmt, ...)
{
- va_list argptr;
+ va_list argptr;
static char data[1024];
int fd;
-
+
va_start(argptr, fmt);
vsprintf(data, fmt, argptr);
va_end(argptr);
{
va_list argptr;
char msg[MAXPRINTMSG];
- static qboolean inupdate;
-
+
va_start (argptr,fmt);
vsprintf (msg,fmt,argptr);
va_end (argptr);
-
+
// also echo to debugging console
- Sys_Printf ("%s", msg); // also echo to debugging console
+ Sys_Printf ("%s", msg);
// log all messages to file
if (con_debuglog)
- Con_DebugLog(va("%s/qconsole.log",com_gamedir), "%s", msg);
+ {
+ // can't use va() here because it might overwrite other important things
+ char logname[MAX_OSPATH];
+ sprintf(logname, "%s/qconsole.log", com_gamedir);
+ Con_DebugLog(logname, "%s", msg);
+ }
if (!con_initialized)
return;
-
+
if (cls.state == ca_dedicated)
return; // no graphics mode
// write it to the scrollable buffer
Con_Print (msg);
-
-// update the screen if the console is displayed
- // LordHavoc: don't print text while loading scripts
- if (cls.state != ca_disconnected)
- if (cls.signon != SIGNONS && !scr_disabled_for_loading )
- {
- // protect against infinite loop if something in SCR_UpdateScreen calls
- // Con_Printf
- if (!inupdate)
- {
- inupdate = true;
- SCR_UpdateScreen ();
- inupdate = false;
- }
- }
}
/*
{
va_list argptr;
char msg[MAXPRINTMSG];
-
- if (!developer.value)
+
+ if (!developer.integer)
return; // don't confuse non-developers with techie stuff...
va_start (argptr,fmt);
vsprintf (msg,fmt,argptr);
va_end (argptr);
-
+
Con_Printf ("%s", msg);
}
{
va_list argptr;
char msg[1024];
- int temp;
-
+
va_start (argptr,fmt);
vsprintf (msg,fmt,argptr);
va_end (argptr);
- temp = scr_disabled_for_loading;
- scr_disabled_for_loading = true;
Con_Printf ("%s", msg);
- scr_disabled_for_loading = temp;
}
Con_DrawInput
The input line scrolls horizontally if typing goes beyond the right edge
+
+Modified by EvilTypeGuy eviltypeguy@qeradiant.com
================
*/
void Con_DrawInput (void)
{
- int y;
- char *text;
+ char editlinecopy[256], *text;
if (key_dest != key_console && !con_forcedup)
return; // don't draw anything
- text = key_lines[edit_line];
-
-// add the cursor frame
- text[key_linepos] = 10+((int)(realtime*con_cursorspeed)&1);
-
- text[key_linepos+1] = 0; // LordHavoc: null terminate, rather than padding with spaces
-// fill out remainder with spaces
-// for (i=key_linepos+1 ; i< con_linewidth ; i++)
-// text[i] = ' ';
-
-// prestep if horizontally scrolling
+ text = strcpy(editlinecopy, key_lines[edit_line]);
+
+ // Advanced Console Editing by Radix radix@planetquake.com
+ // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+ // use strlen of edit_line instead of key_linepos to allow editing
+ // of early characters w/o erasing
+
+ // add the cursor frame
+ if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible
+ text[key_linepos] = 11 + 130 * key_insert; // either solid or triangle facing right
+
+ text[key_linepos + 1] = 0;
+
+ // prestep if horizontally scrolling
if (key_linepos >= con_linewidth)
text += 1 + key_linepos - con_linewidth;
-
-// draw it
- y = con_vislines-16;
-// for (i=0 ; i<con_linewidth ; i++)
-// Draw_Character ( (i+1)<<3, con_vislines - 16, text[i]);
- // LordHavoc: speedup
- Draw_String(8, con_vislines - 16, text, con_linewidth);
+ // draw it
+ DrawQ_String(8, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
-// remove cursor
+ // remove cursor
key_lines[edit_line][key_linepos] = 0;
}
if (time > con_notifytime.value)
continue;
text = con_text + (i % con_totallines)*con_linewidth;
-
+
clearnotify = 0;
- scr_copytop = 1;
-// for (x = 0 ; x < con_linewidth ; x++)
-// Draw_Character ( (x+1)<<3, v, text[x]);
- // LordHavoc: speedup
- Draw_String(8, v, text, con_linewidth);
+ DrawQ_String(8, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
v += 8;
}
if (key_dest == key_message)
{
clearnotify = 0;
- scr_copytop = 1;
-
+
x = 0;
-
+
// LordHavoc: speedup, and other improvements
if (team_message)
sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
while (strlen(temptext) >= con_linewidth)
{
- Draw_String (8, v, temptext, con_linewidth);
+ DrawQ_String (8, v, temptext, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
strcpy(temptext, &temptext[con_linewidth]);
v += 8;
}
if (strlen(temptext) > 0)
{
- Draw_String (8, v, temptext, 0);
+ DrawQ_String (8, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0);
v += 8;
}
-// Draw_String (8, v, "say:", 0);
-// while(chat_buffer[x])
-// {
-// Draw_Character ( (x+5)<<3, v, chat_buffer[x]);
-// x++;
-// }
-// Draw_Character ( (x+5)<<3, v, 10+((int)(realtime*con_cursorspeed)&1));
-// v += 8;
}
-
+
if (v > con_notifylines)
con_notifylines = v;
}
The typing input line at the bottom should only be drawn if typing is allowed
================
*/
-void Con_DrawConsole (int lines, qboolean drawinput)
+extern cvar_t scr_conalpha;
+extern char engineversion[40];
+void Con_DrawConsole (int lines)
{
int i, y;
int rows;
char *text;
int j;
-
+
if (lines <= 0)
return;
// draw the background
- Draw_ConsoleBackground (lines);
+ DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, 1, 1, 1, scr_conalpha.value * lines / vid.conheight, 0);
+ DrawQ_String(vid.conwidth - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
// draw the text
con_vislines = lines;
rows = (lines-16)>>3; // rows of text to draw
y = lines - 16 - (rows<<3); // may start slightly negative
- for (i= con_current - rows + 1 ; i<=con_current ; i++, y+=8 )
+ for (i = con_current - rows + 1;i <= con_current;i++, y += 8)
{
- j = i - con_backscroll;
- if (j<0)
- j = 0;
+ j = max(i - con_backscroll, 0);
text = con_text + (j % con_totallines)*con_linewidth;
-// for (x=0 ; x<con_linewidth ; x++)
-// Draw_Character ( (x+1)<<3, y, text[x]);
- // LordHavoc: speedup
- Draw_String(8, y, text, con_linewidth);
+ DrawQ_String(8, y, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
}
// draw the input prompt, user text, and cursor if desired
- if (drawinput)
- Con_DrawInput ();
+ Con_DrawInput ();
}
-
/*
-==================
-Con_NotifyBox
-==================
+ Con_DisplayList
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ MEGA Thanks to Taniwha
+
*/
-void Con_NotifyBox (char *text)
+void
+Con_DisplayList(char **list)
{
- double t1, t2;
+ int i = 0;
+ int pos = 0;
+ int len = 0;
+ int maxlen = 0;
+ int width = (con_linewidth - 4);
+ char **walk = list;
+
+ while (*walk) {
+ len = strlen(*walk);
+ if (len > maxlen)
+ maxlen = len;
+ walk++;
+ }
+ maxlen += 1;
-// during startup for sound / cd warnings
- Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n");
+ while (*list) {
+ len = strlen(*list);
+ if (pos + maxlen >= width) {
+ Con_Printf("\n");
+ pos = 0;
+ }
- Con_Printf (text);
+ Con_Printf("%s", *list);
+ for (i = 0; i < (maxlen - len); i++)
+ Con_Printf(" ");
- Con_Printf ("Press a key.\n");
- Con_Printf("\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n");
+ pos += maxlen;
+ list++;
+ }
- key_count = -2; // wait for a key down and up
- key_dest = key_console;
+ if (pos)
+ Con_Printf("\n\n");
+}
- do
- {
- t1 = Sys_FloatTime ();
- SCR_UpdateScreen ();
- Sys_SendKeyEvents ();
- t2 = Sys_FloatTime ();
- realtime += t2-t1; // make the cursor blink
- } while (key_count < 0);
-
- Con_Printf ("\n");
- key_dest = key_game;
- realtime = 0; // put the cursor back to invisible
+/*
+ Con_CompleteCommandLine
+
+ New function for tab-completion system
+ Added by EvilTypeGuy
+ Thanks to Fett erich@heintz.com
+ Thanks to taniwha
+
+*/
+void
+Con_CompleteCommandLine (void)
+{
+ char *cmd = "";
+ char *s;
+ int c, v, a, i;
+ int cmd_len;
+ char **list[3] = {0, 0, 0};
+
+ s = key_lines[edit_line] + 1;
+ // Count number of possible matches
+ c = Cmd_CompleteCountPossible(s);
+ v = Cvar_CompleteCountPossible(s);
+ a = Cmd_CompleteAliasCountPossible(s);
+
+ if (!(c + v + a)) // No possible matches
+ return;
+
+ if (c + v + a == 1) {
+ if (c)
+ list[0] = Cmd_CompleteBuildList(s);
+ else if (v)
+ list[0] = Cvar_CompleteBuildList(s);
+ else
+ list[0] = Cmd_CompleteAliasBuildList(s);
+ cmd = *list[0];
+ cmd_len = strlen (cmd);
+ } else {
+ if (c)
+ cmd = *(list[0] = Cmd_CompleteBuildList(s));
+ if (v)
+ cmd = *(list[1] = Cvar_CompleteBuildList(s));
+ if (a)
+ cmd = *(list[2] = Cmd_CompleteAliasBuildList(s));
+
+ cmd_len = strlen (s);
+ do {
+ for (i = 0; i < 3; i++) {
+ char ch = cmd[cmd_len];
+ char **l = list[i];
+ if (l) {
+ while (*l && (*l)[cmd_len] == ch)
+ l++;
+ if (*l)
+ break;
+ }
+ }
+ if (i == 3)
+ cmd_len++;
+ } while (i == 3);
+ // 'quakebar'
+ Con_Printf("\n\35");
+ for (i = 0; i < con_linewidth - 4; i++)
+ Con_Printf("\36");
+ Con_Printf("\37\n");
+
+ // Print Possible Commands
+ if (c) {
+ Con_Printf("%i possible command%s\n", c, (c > 1) ? "s: " : ":");
+ Con_DisplayList(list[0]);
+ }
+
+ if (v) {
+ Con_Printf("%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
+ Con_DisplayList(list[1]);
+ }
+
+ if (a) {
+ Con_Printf("%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
+ Con_DisplayList(list[2]);
+ }
+ }
+
+ if (cmd) {
+ strncpy(key_lines[edit_line] + 1, cmd, cmd_len);
+ key_linepos = cmd_len + 1;
+ if (c + v + a == 1) {
+ key_lines[edit_line][key_linepos] = ' ';
+ key_linepos++;
+ }
+ key_lines[edit_line][key_linepos] = 0;
+ }
+ for (i = 0; i < 3; i++)
+ if (list[i])
+ Mem_Free(list[i]);
}