X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=963ba2d7563510d2c05cd36b85c8447669eed89c;hb=b4b9ae3ea1a4d1252055e9a9969f4048ea3c3182;hp=69b093d9c6f8a20e8cba0d7c73b440f88162bf4c;hpb=018a70ec5e58fead3ddcbd1a4cf63ad2abc3d8f1;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 69b093d9..963ba2d7 100644 --- a/console.c +++ b/console.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. 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. @@ -19,55 +19,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // console.c -#ifdef NeXT -#include +#ifndef WIN32 +# include #endif -#ifndef _MSC_VER -#ifndef __BORLANDC__ -#include -#endif -#endif -#ifdef WIN32 -#include -#endif -#include #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 = {CVAR_SAVE, "con_notifytime","3"}; //seconds -cvar_t logfile = {0, "logfile","0"}; +#define MAX_NOTIFYLINES 32 +// cl.time 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; extern void M_Menu_Main_f (void); @@ -78,21 +73,8 @@ Con_ToggleConsole_f */ 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)); } @@ -107,7 +89,7 @@ void Con_Clear_f (void) memset (con_text, ' ', CON_TEXTSIZE); } - + /* ================ Con_ClearNotify @@ -115,27 +97,25 @@ Con_ClearNotify */ void Con_ClearNotify (void) { - int i; - - for (i=0 ; i> 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); @@ -184,7 +164,7 @@ void Con_CheckResize (void) numlines = con_totallines; numchars = oldwidth; - + if (con_linewidth < numchars) numchars = con_linewidth; @@ -209,41 +189,46 @@ void Con_CheckResize (void) } -/* -================ -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.value = 1; + logfile.integer = 1; } +} - con_text = Hunk_AllocName (CON_TEXTSIZE, "context"); +/* +================ +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_linewidth = -1; Con_CheckResize (); - - Con_Printf ("Console initialized.\n"); + + Con_Print("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); @@ -262,26 +247,23 @@ void Con_Linefeed (void) { 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); } /* ================ -Con_Print +Con_PrintToHistory Handles cursor positioning, line wrapping, etc -All console printing must go through this in order to be logged to disk +All console printing must go through this in order to be displayed If no console is visible, the notify window will pop up. ================ */ -void Con_Print (char *txt) +void Con_PrintToHistory(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) @@ -319,13 +301,20 @@ void Con_Print (char *txt) 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_notify.integer > MAX_NOTIFYLINES) + Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES); + if (con_notify.integer > 0) + con_times[con_current % con_notify.integer] = cl.time; + } } switch (c) @@ -347,84 +336,103 @@ void Con_Print (char *txt) con_x = 0; break; } - + } } +// LordHavoc: increased from 4096 to 16384 +#define MAXPRINTMSG 16384 /* ================ -Con_DebugLog +Con_LogPrint ================ */ -void Con_DebugLog(char *file, char *fmt, ...) +void Con_LogPrint(const char *logfilename, const char *msg) { - va_list argptr; - static char data[1024]; - int fd; - - va_start(argptr, fmt); - vsprintf(data, fmt, argptr); - va_end(argptr); - fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666); - write(fd, data, strlen(data)); - close(fd); + 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_Printf +Con_Print -Handles cursor positioning, line wrapping, etc +Prints to all appropriate console targets ================ */ -// LordHavoc: increased from 4096 to 16384 -#define MAXPRINTMSG 16384 -// FIXME: make a buffer size safe vsprintf? -void Con_Printf (char *fmt, ...) +void Con_Print(const char *msg) { - 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); - -// log all messages to file + // also echo to debugging console + Sys_Print(msg); + + // log all messages to file if (con_debuglog) - Con_DebugLog(va("%s/qconsole.log",com_gamedir), "%s", msg); + Con_LogPrint("qconsole.log", 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; - } - } - */ + // write it to the scrollable buffer + Con_PrintToHistory(msg); +} + +/* +================ +Con_Printf + +Prints to all appropriate console targets +================ +*/ +void Con_Printf(const char *fmt, ...) +{ + va_list argptr; + char msg[MAXPRINTMSG]; + + va_start(argptr,fmt); + vsprintf(msg,fmt,argptr); + va_end(argptr); + + Con_Print(msg); +} + +/* +================ +Con_DPrint + +A Con_Print that only shows up if the "developer" cvar is set +================ +*/ +void Con_DPrint(const char *msg) +{ + if (!developer.integer) + return; // don't confuse non-developers with techie stuff... + Con_Print(msg); } /* @@ -434,22 +442,34 @@ Con_DPrintf 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); + va_start(argptr,fmt); + vsprintf(msg,fmt,argptr); + va_end(argptr); + + Con_Print(msg); } +/* +================ +Con_SafePrint + +Okay to call even when the screen can't be updated +================== +*/ +void Con_SafePrint(const char *msg) +{ + Con_Print(msg); +} + /* ================== Con_SafePrintf @@ -457,20 +477,16 @@ Con_SafePrintf 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; + va_list argptr; + char msg[MAXPRINTMSG]; + + va_start(argptr,fmt); + vsprintf(msg,fmt,argptr); + va_end(argptr); + + Con_Print(msg); } @@ -494,16 +510,13 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { - int y; - char *text; - char editlinecopy[256]; + char editlinecopy[257], *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 @@ -512,27 +525,15 @@ void Con_DrawInput (void) // 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 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; + time = cl.time - 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; } @@ -582,37 +584,26 @@ void Con_DrawNotify (void) 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) - con_notifylines = v; } /* @@ -623,18 +614,21 @@ Draws the console with the solid background The typing input line at the bottom should only be drawn if typing is allowed ================ */ -void Con_DrawConsole (int lines, qboolean drawinput) +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); + 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 con_vislines = lines; @@ -642,22 +636,16 @@ void Con_DrawConsole (int lines, qboolean drawinput) 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= width) { - Con_Printf("\n"); + Con_Print("\n"); pos = 0; } - Con_Printf("%s", *list); + Con_Print(*list); for (i = 0; i < (maxlen - len); i++) - Con_Printf(" "); + Con_Print(" "); pos += maxlen; list++; } if (pos) - Con_Printf("\n\n"); + Con_Print("\n\n"); } /* @@ -714,24 +697,21 @@ Con_DisplayList(char **list) 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); @@ -753,7 +733,7 @@ Con_CompleteCommandLine (void) 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++; @@ -765,28 +745,28 @@ Con_CompleteCommandLine (void) cmd_len++; } while (i == 3); // 'quakebar' - Con_Printf("\n\35"); + Con_Print("\n\35"); for (i = 0; i < con_linewidth - 4; i++) - Con_Printf("\36"); - Con_Printf("\37\n"); + Con_Print("\36"); + Con_Print("\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; @@ -798,6 +778,6 @@ Con_CompleteCommandLine (void) } for (i = 0; i < 3; i++) if (list[i]) - qfree (list[i]); + Mem_Free((void *)list[i]); }