#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
-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;
+// 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;
-cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"}; //seconds
-cvar_t logfile = {0, "logfile","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"};
-#define NUM_CON_TIMES 4
-float con_times[NUM_CON_TIMES]; // realtime time the line was generated
- // for transparent notify lines
+#define MAX_NOTIFYLINES 32
+// realtime time the line was generated for transparent notify lines
+float con_times[MAX_NOTIFYLINES];
-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;
-mempool_t *console_mempool;
+mempool_t *console_mempool;
-int con_notifylines; // scan lines to clear for notify lines
+// scan lines to clear for notify lines
+int con_notifylines;
extern void M_Menu_Main_f (void);
*/
void Con_ToggleConsole_f (void)
{
- key_consoleactive = !key_consoleactive;
+ // toggle the 'user wants console' bit
+ key_consoleactive ^= KEY_CONSOLEACTIVE_USER;
memset (con_times, 0, sizeof(con_times));
}
*/
void Con_ClearNotify (void)
{
- int i;
+ int i;
- for (i=0 ; i<NUM_CON_TIMES ; 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;
}
void Con_MessageMode2_f (void)
{
key_dest = key_message;
- team_message = true;
+ chat_team = true;
}
*/
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.conwidth >> 3);
}
-/*
-================
-Con_Init
-================
-*/
-void Con_Init (void)
+void Con_InitLogging (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");
-
if (con_debuglog)
{
- if (strlen (com_gamedir) < (MAXGAMEDIRLEN - strlen (t2)))
+ if (strlen (fs_gamedir) < (MAXGAMEDIRLEN - strlen (t2)))
{
- sprintf (temp, "%s%s", com_gamedir, t2);
+ sprintf (temp, "%s%s", fs_gamedir, t2);
unlink (temp);
}
logfile.integer = 1;
}
+}
+
+/*
+================
+Con_Init
+================
+*/
+void Con_Init (void)
+{
+ Cvar_RegisterVariable(&logfile);
console_mempool = Mem_AllocPool("console");
con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
// register our commands
//
Cvar_RegisterVariable (&con_notifytime);
+ Cvar_RegisterVariable (&con_notify);
Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f);
Cmd_AddCommand ("messagemode", Con_MessageMode_f);
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;
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_DebugLog
================
*/
-void Con_DebugLog(char *file, char *fmt, ...)
+void Con_DebugLog (const char *msg)
{
- va_list argptr;
- FILE* fd;
-
- fd = fopen(file, "at");
- va_start(argptr, fmt);
- vfprintf (fd, fmt, argptr);
- va_end(argptr);
- fclose(fd);
+ qfile_t* file;
+
+ file = FS_Open ("qconsole.log", "at", true);
+ if (file)
+ {
+ FS_Printf (file, "%s", msg);
+ FS_Close (file);
+ }
}
// 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];
+ va_list argptr;
+ char msg[MAXPRINTMSG];
va_start (argptr,fmt);
vsprintf (msg,fmt,argptr);
va_end (argptr);
-// also echo to debugging console
+ // also echo to debugging console
Sys_Printf ("%s", msg);
-// log all messages to file
+ // log all messages to file
if (con_debuglog)
- {
- // 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);
- }
+ Con_DebugLog (msg);
if (!con_initialized)
return;
if (cls.state == ca_dedicated)
return; // no graphics mode
-// write it to the scrollable buffer
+ // write it to the scrollable buffer
Con_Print (msg);
}
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];
+ va_list argptr;
+ char msg[MAXPRINTMSG];
if (!developer.integer)
return; // don't confuse non-developers with techie stuff...
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];
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;
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)
{
DrawQ_String (0, v, temptext, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
strcpy(temptext, &temptext[con_linewidth]);
}
}
- 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
================
*/
-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
- DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, 1, 1, 1, scr_conalpha.value * lines / vid.conheight, 0);
+ if (scr_conbrightness.value >= 0.01f)
+ DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
+ else
+ DrawQ_Fill(0, lines - vid.conheight, vid.conwidth, vid.conheight, 0, 0, 0, scr_conalpha.value, 0);
DrawQ_String(vid.conwidth - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
// draw the text
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
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++;
}
for (i = 0; i < 3; i++)
if (list[i])
- Mem_Free(list[i]);
+ Mem_Free((void *)list[i]);
}
projects / xonotic / darkplaces.git / blobdiff