*/
// console.c
-#ifdef NeXT
-#include <libc.h>
+#if !defined(WIN32) || defined(__MINGW32__)
+# include <unistd.h>
#endif
-#ifndef _MSC_VER
-#ifndef __BORLANDC__
-#include <unistd.h>
-#endif
-#endif
-#ifdef WIN32
-#include <io.h>
-#endif
-#include <fcntl.h>
+#include <time.h>
#include "quakedef.h"
int con_linewidth;
//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 MAX_NOTIFYLINES 32
// cl.time time the line was generated for transparent notify lines
int con_vislines;
-qboolean con_debuglog;
-
#define MAXCMDLINE 256
extern char key_lines[32][MAXCMDLINE];
extern int edit_line;
mempool_t *console_mempool;
-extern void M_Menu_Main_f (void);
+
+/*
+==============================================================================
+
+LOGGING
+
+==============================================================================
+*/
+
+cvar_t log_file = {0, "log_file",""};
+cvar_t log_sync = {0, "log_sync","0"};
+char crt_log_file [MAX_OSPATH] = "";
+qfile_t* logfile = NULL;
+
+qbyte* logqueue = NULL;
+size_t logq_ind = 0;
+size_t logq_size = 0;
+
+void Log_ConPrint (const char *msg);
+
+/*
+====================
+Log_Timestamp
+====================
+*/
+const char* Log_Timestamp (const char *desc)
+{
+ static char timestamp [128];
+ time_t crt_time;
+ const struct tm *crt_tm;
+ char timestring [64];
+
+ // 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);
+
+ if (desc != NULL)
+ snprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
+ else
+ snprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring);
+
+ return timestamp;
+}
+
+
+/*
+====================
+Log_Init
+====================
+*/
+void Log_Init (void)
+{
+ Cvar_RegisterVariable (&log_file);
+ Cvar_RegisterVariable (&log_sync);
+
+ // support for the classic Quake option
+ 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;
+}
+
+
+/*
+====================
+Log_Open
+====================
+*/
+void Log_Open (void)
+{
+ if (logfile != NULL || log_file.string[0] == '\0')
+ return;
+
+ logfile = FS_Open (log_file.string, "at", false);
+ if (logfile != NULL)
+ {
+ strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file));
+ FS_Print (logfile, Log_Timestamp ("Log started"));
+ }
+}
+
+
+/*
+====================
+Log_Close
+====================
+*/
+void Log_Close (void)
+{
+ if (logfile == NULL)
+ return;
+
+ FS_Print (logfile, Log_Timestamp ("Log stopped"));
+ FS_Print (logfile, "\n");
+ FS_Close (logfile);
+
+ logfile = NULL;
+ crt_log_file[0] = '\0';
+}
+
+
+/*
+====================
+Log_Start
+====================
+*/
+void Log_Start (void)
+{
+ Log_Open ();
+
+ // Dump the contents of the log queue into the log file and free it
+ if (logqueue != NULL)
+ {
+ if (logfile != NULL && logq_ind != 0)
+ FS_Write (logfile, logqueue, logq_ind);
+ Mem_Free (logqueue);
+ logqueue = NULL;
+ logq_ind = 0;
+ logq_size = 0;
+ }
+}
+
+
+/*
+================
+Log_ConPrint
+================
+*/
+void Log_ConPrint (const char *msg)
+{
+ // 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)
+ {
+ size_t remain = logq_size - logq_ind;
+ size_t len = strlen (msg);
+
+ // If we need to enlarge the log queue
+ if (len > remain)
+ {
+ unsigned int factor = ((logq_ind + len) / logq_size) + 1;
+ qbyte* newqueue;
+
+ logq_size *= factor;
+ newqueue = Mem_Alloc (tempmempool, logq_size);
+ memcpy (newqueue, logqueue, logq_ind);
+ Mem_Free (logqueue);
+ logqueue = newqueue;
+ remain = logq_size - logq_ind;
+ }
+ memcpy (&logqueue[logq_ind], msg, len);
+ logq_ind += len;
+
+ return;
+ }
+
+ // Check if log_file has changed
+ if (strcmp (crt_log_file, log_file.string) != 0)
+ {
+ Log_Close ();
+ Log_Open ();
+ }
+
+ // If a log file is available
+ if (logfile != NULL)
+ {
+ FS_Print (logfile, msg);
+ if (log_sync.integer)
+ FS_Flush (logfile);
+ }
+}
+
+
+/*
+================
+Log_Print
+================
+*/
+void Log_Print (const char *logfilename, const char *msg)
+{
+ qfile_t *file;
+ file = FS_Open(logfilename, "at", true);
+ if (file)
+ {
+ FS_Print(file, msg);
+ FS_Close(file);
+ }
+}
+
+/*
+================
+Log_Printf
+================
+*/
+void Log_Printf (const char *logfilename, const char *fmt, ...)
+{
+ qfile_t *file;
+
+ file = FS_Open (logfilename, "at", true);
+ if (file != NULL)
+ {
+ va_list argptr;
+
+ va_start (argptr, fmt);
+ FS_VPrintf (file, fmt, argptr);
+ va_end (argptr);
+
+ FS_Close (file);
+ }
+}
+
+
+/*
+==============================================================================
+
+CONSOLE
+
+==============================================================================
+*/
/*
================
con_current = con_totallines - 1;
}
-
-void Con_InitLogging (void)
-{
-#define MAXGAMEDIRLEN 1000
- char temp[MAXGAMEDIRLEN+1];
- char *t2 = "/qconsole.log";
-
- con_debuglog = COM_CheckParm("-condebug");
- if (con_debuglog)
- {
- if (strlen (fs_gamedir) < (MAXGAMEDIRLEN - strlen (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);
memset (con_text, ' ', CON_TEXTSIZE);
Con_Print("Console initialized.\n");
-//
-// register our commands
-//
+ // register our cvars
Cvar_RegisterVariable (&con_notifytime);
Cvar_RegisterVariable (&con_notify);
+ // register our commands
Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f);
Cmd_AddCommand ("messagemode", Con_MessageMode_f);
Cmd_AddCommand ("messagemode2", Con_MessageMode2_f);
*/
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
}
}
-// LordHavoc: increased from 4096 to 16384
-#define MAXPRINTMSG 16384
-
-/*
-================
-Con_LogPrint
-================
-*/
-void Con_LogPrint(const char *logfilename, const char *msg)
-{
- qfile_t *file;
- file = FS_Open(logfilename, "at", true);
- if (file)
- {
- FS_Print(file, msg);
- FS_Close(file);
- }
-}
-
-/*
-================
-Con_LogPrintf
-================
-*/
-void Con_LogPrintf(const char *logfilename, const char *fmt, ...)
-{
- va_list argptr;
- char msg[MAXPRINTMSG];
-
- va_start(argptr,fmt);
- vsprintf(msg,fmt,argptr);
- va_end(argptr);
-
- Con_LogPrint(logfilename, msg);
-}
-
/*
================
Con_Print
Sys_Print(msg);
// log all messages to file
- if (con_debuglog)
- Con_LogPrint("qconsole.log", msg);
+ Log_ConPrint (msg);
if (!con_initialized)
return;
Con_PrintToHistory(msg);
}
+
+// LordHavoc: increased from 4096 to 16384
+#define MAXPRINTMSG 16384
+
/*
================
Con_Printf
*/
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;
}
Cvar_SetValueQuick(&con_notify, 0);
if (con_notify.integer > MAX_NOTIFYLINES)
Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
- v = 0;
+ if (gamemode == GAME_TRANSFUSION)
+ v = 8;
+ else
+ v = 0;
for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
{
if (i < 0)