*/
// console.c
-#ifndef WIN32
+#if !defined(WIN32) || defined(__MINGW32__)
# include <unistd.h>
#endif
#include <time.h>
// Build the time stamp (ex: "Wed Jun 30 21:49:08 1993");
time (&crt_time);
crt_tm = localtime (&crt_time);
- strftime (timestring, sizeof (timestring), "%a %b %d %T %Y", crt_tm);
+ strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm);
if (desc != NULL)
snprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
*/
void Log_Init (void)
{
+ // Allocate a log queue
+ logq_size = 512;
+ logqueue = Mem_Alloc (tempmempool, logq_size);
+ logq_ind = 0;
+
Cvar_RegisterVariable (&log_file);
Cvar_RegisterVariable (&log_sync);
// support for the classic Quake option
+// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log with sync on (so it keeps every message up to a crash), see also log_file and log_sync
if (COM_CheckParm ("-condebug") != 0)
{
Cvar_SetQuick (&log_file, "qconsole.log");
Cvar_SetValueQuick (&log_sync, 1);
unlink (va("%s/qconsole.log", fs_gamedir));
}
-
- // Allocate a log queue
- logq_size = 512;
- logqueue = Mem_Alloc (tempmempool, logq_size);
- logq_ind = 0;
}
*/
void Log_ConPrint (const char *msg)
{
+ static qboolean inprogress = false;
+ // don't allow feedback loops with memory error reports
+ if (inprogress)
+ return;
+ inprogress = true;
// Until the host is completely initialized, we maintain a log queue
// to store the messages, since the log can't be started before
if (logqueue != NULL)
memcpy (&logqueue[logq_ind], msg, len);
logq_ind += len;
+ inprogress = false;
return;
}
if (log_sync.integer)
FS_Flush (logfile);
}
+ inprogress = false;
}
*/
void Con_Init (void)
{
- console_mempool = Mem_AllocPool("console");
+ console_mempool = Mem_AllocPool("console", 0, NULL);
con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
memset (con_text, ' ', CON_TEXTSIZE);
con_linewidth = -1;
*/
void Con_Linefeed (void)
{
+ if (con_backscroll)
+ con_backscroll++;
+
con_x = 0;
con_current++;
memset (&con_text[(con_current%con_totallines)*con_linewidth], ' ', con_linewidth);
int y, c, l, mask;
static int cr;
- con_backscroll = 0;
-
if (txt[0] == 1)
{
mask = 128; // go to colored text
- S_LocalSound ("misc/talk.wav");
+ S_LocalSound ("sound/misc/talk.wav");
// play talk wav
txt++;
}
}
}
+/* The translation table between the graphical font and plain ASCII --KB */
+static char qfont_table[256] = {
+ '\0', '#', '#', '#', '#', '.', '#', '#',
+ '#', 9, 10, '#', ' ', 13, '.', '.',
+ '[', ']', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', '.', '<', '=', '>',
+ ' ', '!', '"', '#', '$', '%', '&', '\'',
+ '(', ')', '*', '+', ',', '-', '.', '/',
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', ':', ';', '<', '=', '>', '?',
+ '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+ '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+ 'x', 'y', 'z', '{', '|', '}', '~', '<',
+
+ '<', '=', '>', '#', '#', '.', '#', '#',
+ '#', '#', ' ', '#', ' ', '>', '.', '.',
+ '[', ']', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', '.', '<', '=', '>',
+ ' ', '!', '"', '#', '$', '%', '&', '\'',
+ '(', ')', '*', '+', ',', '-', '.', '/',
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', ':', ';', '<', '=', '>', '?',
+ '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+ '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+ 'x', 'y', 'z', '{', '|', '}', '~', '<'
+};
+
/*
================
Con_Print
-Prints to all appropriate console targets
+Prints to all appropriate console targets, and adds timestamps
================
*/
+extern cvar_t timestamps;
+extern cvar_t timeformat;
+extern qboolean sys_nostdout;
void Con_Print(const char *msg)
{
- // also echo to debugging console
- Sys_Print(msg);
-
- // log all messages to file
- Log_ConPrint (msg);
+ static int index = 0;
+ static char line[16384];
- if (!con_initialized)
- return;
-
- if (cls.state == ca_dedicated)
- return; // no graphics mode
-
- // write it to the scrollable buffer
- Con_PrintToHistory(msg);
+ for (;*msg;msg++)
+ {
+ if (index == 0)
+ {
+ // if this is the beginning of a new line, print timestamp
+ char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
+ // special color codes for chat messages must always come first
+ // for Con_PrintToHistory to work properly
+ if (*msg <= 2)
+ line[index++] = *msg++;
+ // store timestamp
+ for (;*timestamp;index++, timestamp++)
+ if (index < sizeof(line) - 2)
+ line[index] = *timestamp;
+ }
+ // append the character
+ line[index++] = *msg;
+ // if this is a newline character, we have a complete line to print
+ if (*msg == '\n' || index >= 16000)
+ {
+ // terminate the line
+ line[index] = 0;
+ // send to log file
+ Log_ConPrint(line);
+ // send to scrollable buffer
+ if (con_initialized && cls.state != ca_dedicated)
+ Con_PrintToHistory(line);
+ // send to terminal or dedicated server window
+ if (!sys_nostdout)
+ {
+ unsigned char *p;
+ for (p = (unsigned char *) line;*p; p++)
+ *p = qfont_table[*p];
+ Sys_PrintToTerminal(line);
+ }
+ // empty the line buffer
+ index = 0;
+ }
+ }
}
*/
void Con_DrawInput (void)
{
+ int y;
+ int i;
char editlinecopy[257], *text;
if (!key_consoleactive)
// use strlen of edit_line instead of key_linepos to allow editing
// of early characters w/o erasing
+ y = strlen(text);
+
+// fill out remainder with spaces
+ for (i = y; i < 256; i++)
+ text[i] = ' ';
+
// 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;
+// text[key_linepos + 1] = 0;
// prestep if horizontally scrolling
if (key_linepos >= con_linewidth)
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;
+// key_lines[edit_line][key_linepos] = 0;
}
continue;
text = con_text + (i % con_totallines)*con_linewidth;
- clearnotify = 0;
-
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
projects / xonotic / darkplaces.git / blobdiff