X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.c;h=fa4a58dcb5125dd642ae6add4c1300b46a082e52;hp=e99181e93e3f826ce27a8018852223efca509667;hb=0eff768f14f0b42c30c36c48090a77c7b1679793;hpb=b91033966317d4d6a2a6bdf2952291fc88e3f7c4 diff --git a/console.c b/console.c index e99181e9..fa4a58dc 100644 --- a/console.c +++ b/console.c @@ -33,43 +33,45 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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 +// 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; - -mempool_t *console_mempool; - -int con_notifylines; // scan lines to clear for notify lines +mempool_t *console_mempool; extern void M_Menu_Main_f (void); @@ -80,21 +82,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)); } @@ -109,7 +98,7 @@ void Con_Clear_f (void) memset (con_text, ' ', CON_TEXTSIZE); } - + /* ================ Con_ClearNotify @@ -117,27 +106,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); @@ -186,7 +173,7 @@ void Con_CheckResize (void) numlines = con_totallines; numchars = oldwidth; - + if (con_linewidth < numchars) numchars = con_linewidth; @@ -211,42 +198,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.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_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); @@ -265,8 +256,7 @@ 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); } /* @@ -274,16 +264,14 @@ void Con_Linefeed (void) Con_Print 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_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; @@ -322,13 +310,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] = realtime; + } } switch (c) @@ -350,7 +345,7 @@ void Con_Print (char *txt) con_x = 0; break; } - + } } @@ -360,18 +355,16 @@ void Con_Print (char *txt) Con_DebugLog ================ */ -void Con_DebugLog(char *file, char *fmt, ...) +void Con_DebugLog (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 ("qconsole.log", "at", true); + if (file) + { + FS_Printf (file, "%s", msg); + FS_Close (file); + } } @@ -385,49 +378,30 @@ Handles cursor positioning, line wrapping, etc // 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 + + // also echo to debugging console Sys_Printf ("%s", msg); -// log all messages to file + // log all messages to file if (con_debuglog) - Con_DebugLog(va("%s/qconsole.log",com_gamedir), "%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); - -// 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; - } - } - */ } /* @@ -437,10 +411,10 @@ 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]; + va_list argptr; + char msg[MAXPRINTMSG]; if (!developer.integer) return; // don't confuse non-developers with techie stuff... @@ -448,7 +422,7 @@ void Con_DPrintf (char *fmt, ...) va_start (argptr,fmt); vsprintf (msg,fmt,argptr); va_end (argptr); - + Con_Printf ("%s", msg); } @@ -460,20 +434,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; } @@ -497,9 +467,9 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { - char editlinecopy[256], *text; + 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]); @@ -520,7 +490,7 @@ void Con_DrawInput (void) text += 1 + key_linepos - con_linewidth; // draw it - DrawQ_String(8, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + 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; @@ -543,12 +513,16 @@ void Con_DrawNotify (void) extern char chat_buffer[]; char temptext[256]; + if (con_notify.integer < 0) + Cvar_SetValueQuick(&con_notify, 0); + if (con_notify.integer > 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; @@ -558,7 +532,7 @@ void Con_DrawNotify (void) clearnotify = 0; - DrawQ_String(8, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); v += 8; } @@ -571,25 +545,22 @@ void Con_DrawNotify (void) 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 (8, v, temptext, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + 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) { - DrawQ_String (8, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String (0, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0); v += 8; } } - - if (v > con_notifylines) - con_notifylines = v; } /* @@ -600,20 +571,20 @@ Draws the console with the solid background 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 @@ -627,7 +598,7 @@ void Con_DrawConsole (int lines) j = max(i - con_backscroll, 0); text = con_text + (j % con_totallines)*con_linewidth; - DrawQ_String(8, y, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + DrawQ_String(0, y, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); } // draw the input prompt, user text, and cursor if desired @@ -642,15 +613,10 @@ void Con_DrawConsole (int lines) 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); @@ -688,24 +654,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); @@ -727,7 +690,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++; @@ -749,18 +712,18 @@ Con_CompleteCommandLine (void) 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; @@ -772,6 +735,6 @@ Con_CompleteCommandLine (void) } for (i = 0; i < 3; i++) if (list[i]) - Mem_Free(list[i]); + Mem_Free((void *)list[i]); }