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.
#include <fcntl.h>
#include "quakedef.h"
-int con_linewidth;
+int con_linewidth;
-float con_cursorspeed = 4;
+float con_cursorspeed = 4;
-#define CON_TEXTSIZE 16384
+#define CON_TEXTSIZE 131072
-qboolean con_forcedup; // because no entities to refresh
+// total lines in console scrollback
+int con_totallines;
+// lines up from bottom to display
+int con_backscroll;
+// where next message will be printed
+int con_current;
+// offset in current line for next print
+int con_x;
+char *con_text = 0;
-int con_totallines; // total lines in console scrollback
-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;
+//seconds
+cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"};
+cvar_t con_notify = {CVAR_SAVE, "con_notify","4"};
+cvar_t logfile = {0, "logfile","0"};
-cvar_t con_notifytime = {"con_notifytime","3"}; //seconds
-cvar_t logfile = {"logfile","0"};
+#define MAX_NOTIFYLINES 32
+// realtime time the line was generated for transparent notify lines
+float con_times[MAX_NOTIFYLINES];
-#define NUM_CON_TIMES 4
-float con_times[NUM_CON_TIMES]; // realtime time the line was generated
- // for transparent notify lines
+int con_vislines;
-int con_vislines;
+qboolean con_debuglog;
-qboolean con_debuglog;
+#define MAXCMDLINE 256
+extern char key_lines[32][MAXCMDLINE];
+extern int edit_line;
+extern int key_linepos;
+extern int key_insert;
-#define MAXCMDLINE 256
-extern char key_lines[32][MAXCMDLINE];
-extern int edit_line;
-extern int key_linepos;
-extern int key_insert;
-
-qboolean con_initialized;
+qboolean con_initialized;
-int con_notifylines; // scan lines to clear for notify lines
+mempool_t *console_mempool;
+
+// scan lines to clear for notify lines
+int con_notifylines;
extern void M_Menu_Main_f (void);
*/
void Con_ToggleConsole_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 ();
+ // toggle the 'user wants console' bit
+ key_consoleactive ^= KEY_CONSOLEACTIVE_USER;
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++)
+ int i;
+
+ for (i=0 ; i<MAX_NOTIFYLINES ; i++)
con_times[i] = 0;
}
-
+
/*
================
Con_MessageMode_f
================
*/
-extern qboolean team_message;
-
void Con_MessageMode_f (void)
{
key_dest = key_message;
- team_message = false;
+ chat_team = false;
}
-
+
/*
================
Con_MessageMode2_f
void Con_MessageMode2_f (void)
{
key_dest = key_message;
- team_message = true;
+ chat_team = true;
}
-
+
/*
================
Con_CheckResize
*/
void Con_CheckResize (void)
{
- int i, j, width, oldwidth, oldtotallines, numlines, numchars;
- char tbuf[CON_TEXTSIZE];
+ int i, j, width, oldwidth, oldtotallines, numlines, numchars;
+ char tbuf[CON_TEXTSIZE];
- width = (vid.width >> 3) - 2;
+ width = (vid.conwidth >> 3);
if (width == con_linewidth)
return;
if (width < 1) // video hasn't been initialized yet
{
- width = 78; // LordHavoc: changed from 38 to 78 (320 -> 640 conversion)
+ width = 80;
con_linewidth = width;
con_totallines = CON_TEXTSIZE / con_linewidth;
memset (con_text, ' ', CON_TEXTSIZE);
numlines = con_totallines;
numchars = oldwidth;
-
+
if (con_linewidth < numchars)
numchars = con_linewidth;
*/
void Con_Init (void)
{
-#define MAXGAMEDIRLEN 1000
- char temp[MAXGAMEDIRLEN+1];
- char *t2 = "/qconsole.log";
+#define MAXGAMEDIRLEN 1000
+ char temp[MAXGAMEDIRLEN+1];
+ char *t2 = "/qconsole.log";
Cvar_RegisterVariable(&logfile);
con_debuglog = COM_CheckParm("-condebug");
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");
//
// register our commands
//
Cvar_RegisterVariable (&con_notifytime);
+ Cvar_RegisterVariable (&con_notify);
Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f);
Cmd_AddCommand ("messagemode", Con_MessageMode_f);
{
con_x = 0;
con_current++;
- memset (&con_text[(con_current%con_totallines)*con_linewidth]
- , ' ', con_linewidth);
+ memset (&con_text[(con_current%con_totallines)*con_linewidth], ' ', con_linewidth);
}
/*
If no console is visible, the notify window will pop up.
================
*/
-void Con_Print (char *txt)
+void Con_Print (const char *txt)
{
- int y;
- int c, l;
- static int cr;
- int mask;
-
+ int y, c, l, mask;
+ static int cr;
+
con_backscroll = 0;
if (txt[0] == 1)
cr = false;
}
-
+
if (!con_x)
{
Con_Linefeed ();
// mark time for transparent overlay
if (con_current >= 0)
- con_times[con_current % NUM_CON_TIMES] = realtime;
+ {
+ if (con_notify.integer < 0)
+ Cvar_SetValueQuick(&con_notify, 0);
+ if (con_notifylines > MAX_NOTIFYLINES)
+ Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
+ if (con_notify.integer > 0)
+ con_times[con_current % con_notify.integer] = realtime;
+ }
}
switch (c)
con_x = 0;
break;
}
-
+
}
}
Con_DebugLog
================
*/
-void Con_DebugLog(char *file, char *fmt, ...)
+void Con_DebugLog(const char *file, const char *fmt, ...)
{
- va_list argptr;
- static char data[1024];
- int fd;
-
+ va_list argptr;
+ FILE* fd;
+
+ fd = fopen(file, "at");
va_start(argptr, fmt);
- vsprintf(data, fmt, argptr);
+ vfprintf (fd, fmt, argptr);
va_end(argptr);
- fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666);
- write(fd, data, strlen(data));
- close(fd);
+ fclose(fd);
}
// LordHavoc: increased from 4096 to 16384
#define MAXPRINTMSG 16384
// FIXME: make a buffer size safe vsprintf?
-void Con_Printf (char *fmt, ...)
+void Con_Printf (const char *fmt, ...)
{
- va_list argptr;
- char msg[MAXPRINTMSG];
-// static qboolean inupdate;
-
+ va_list argptr;
+ char msg[MAXPRINTMSG];
+
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: I don't think there's a real need for this
- /*
- // 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;
- }
- }
- */
}
/*
A Con_Printf that only shows up if the "developer" cvar is set
================
*/
-void Con_DPrintf (char *fmt, ...)
+void Con_DPrintf (const char *fmt, ...)
{
- va_list argptr;
- char msg[MAXPRINTMSG];
-
- if (!developer.value)
+ va_list argptr;
+ char msg[MAXPRINTMSG];
+
+ 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);
}
Okay to call even when the screen can't be updated
==================
*/
-void Con_SafePrintf (char *fmt, ...)
+void Con_SafePrintf (const char *fmt, ...)
{
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;
}
*/
void Con_DrawInput (void)
{
- int y;
- char *text;
- char editlinecopy[256];
+ char editlinecopy[256], *text;
- if (key_dest != key_console && !con_forcedup)
+ if (!key_consoleactive)
return; // don't draw anything
text = strcpy(editlinecopy, key_lines[edit_line]);
- y = strlen(text);
-
+
// 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
// 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; // LordHavoc: null terminate, rather than padding with spaces
- // text[key_linepos] = 10 + ((int)(realtime*con_cursorspeed) & 1);
-
-
- // fill out remainder with spaces
- // for (i=key_linepos+1 ; i< con_linewidth ; i++)
- // text[i] = ' ';
-
- // prestep if horizontally scrolling
+
+ 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(0, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
// remove cursor
key_lines[edit_line][key_linepos] = 0;
extern char chat_buffer[];
char temptext[256];
+ if (con_notify.integer < 0)
+ Cvar_SetValueQuick(&con_notify, 0);
+ if (con_notifylines > MAX_NOTIFYLINES)
+ Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
v = 0;
- for (i= con_current-NUM_CON_TIMES+1 ; i<=con_current ; i++)
+ for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
{
if (i < 0)
continue;
- time = con_times[i % NUM_CON_TIMES];
+ time = con_times[i % con_notify.integer];
if (time == 0)
continue;
time = realtime - time;
if (time > con_notifytime.value)
continue;
text = con_text + (i % con_totallines)*con_linewidth;
-
+
clearnotify = 0;
-// 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(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
v += 8;
}
if (key_dest == key_message)
{
clearnotify = 0;
-
+
x = 0;
-
+
// LordHavoc: speedup, and other improvements
- if (team_message)
+ if (chat_team)
sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
else
sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
- while (strlen(temptext) >= con_linewidth)
+ while (strlen(temptext) >= (size_t) con_linewidth)
{
- Draw_String (8, v, temptext, con_linewidth);
+ DrawQ_String (0, 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 (0, 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)
+
+ if (con_notifylines < v)
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;
-
+ int i, y, rows, j;
+ char *text;
+
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(0, 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 ();
}
/*
MEGA Thanks to Taniwha
*/
-void
-Con_DisplayList(char **list)
+void Con_DisplayList(const char **list)
{
- int i = 0;
- int pos = 0;
- int len = 0;
- int maxlen = 0;
- int width = (con_linewidth - 4);
- char **walk = list;
+ int i = 0, pos = 0, len = 0, maxlen = 0, width = (con_linewidth - 4);
+ const char **walk = list;
while (*walk) {
len = strlen(*walk);
Thanks to taniwha
*/
-void
-Con_CompleteCommandLine (void)
+void Con_CompleteCommandLine (void)
{
- char *cmd = "";
- char *s;
- int c, v, a, i;
- int cmd_len;
- char **list[3] = {0, 0, 0};
+ const char *cmd = "", *s;
+ const char **list[3] = {0, 0, 0};
+ int c, v, a, i, cmd_len;
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);
do {
for (i = 0; i < 3; i++) {
char ch = cmd[cmd_len];
- char **l = list[i];
+ const char **l = list[i];
if (l) {
while (*l && (*l)[cmd_len] == ch)
l++;
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]);
}
- return;
}
-
+
if (cmd) {
- strncpy(key_lines[edit_line] + 2, cmd, cmd_len);
- key_linepos = cmd_len + 2;
+ 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++;
}
for (i = 0; i < 3; i++)
if (list[i])
- free (list[i]);
+ Mem_Free((void *)list[i]);
}
projects / xonotic / darkplaces.git / blobdiff