X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=9466571faf13b1243a62bc3045d69e78a2575a88;hb=31ad3dd6c6d2d35ef22a6e88205fe0926b1e0150;hp=1065d847febc4cddc0b1237b06a8813ad60f8383;hpb=0cfc51ea6f050adc04e2324db38175bf454e3c1b;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 1065d847..9466571f 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. @@ -47,8 +47,8 @@ int con_current; // where next message will be printed int con_x; // offset in current line for next print char *con_text = 0; -cvar_t con_notifytime = {"con_notifytime","3"}; //seconds -cvar_t logfile = {"logfile","0"}; +cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"}; //seconds +cvar_t logfile = {0, "logfile","0"}; #define NUM_CON_TIMES 4 float con_times[NUM_CON_TIMES]; // realtime time the line was generated @@ -63,10 +63,12 @@ extern char key_lines[32][MAXCMDLINE]; extern int edit_line; extern int key_linepos; extern int key_insert; - + qboolean con_initialized; +mempool_t *console_mempool; + int con_notifylines; // scan lines to clear for notify lines extern void M_Menu_Main_f (void); @@ -81,18 +83,13 @@ 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 (); + memset (con_times, 0, sizeof(con_times)); } @@ -107,7 +104,7 @@ void Con_Clear_f (void) memset (con_text, ' ', CON_TEXTSIZE); } - + /* ================ Con_ClearNotify @@ -116,12 +113,12 @@ 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 +181,7 @@ void Con_CheckResize (void) numlines = con_totallines; numchars = oldwidth; - + if (con_linewidth < numchars) numchars = con_linewidth; @@ -230,14 +227,15 @@ void Con_Init (void) sprintf (temp, "%s%s", com_gamedir, t2); unlink (temp); } - logfile.value = 1; + logfile.integer = 1; } - con_text = Hunk_AllocName (CON_TEXTSIZE, "context"); + 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"); // @@ -262,8 +260,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); } /* @@ -281,7 +278,7 @@ void Con_Print (char *txt) int c, l; static int cr; int mask; - + con_backscroll = 0; if (txt[0] == 1) @@ -319,7 +316,7 @@ void Con_Print (char *txt) cr = false; } - + if (!con_x) { Con_Linefeed (); @@ -347,7 +344,7 @@ void Con_Print (char *txt) con_x = 0; break; } - + } } @@ -359,16 +356,14 @@ Con_DebugLog */ void Con_DebugLog(char *file, char *fmt, ...) { - va_list argptr; - static char data[1024]; - int fd; - + va_list argptr; + FILE* fd; + + fd = fopen(file, "at"); va_start(argptr, fmt); - vsprintf(data, fmt, argptr); + vfprintf (fd, fmt, argptr); va_end(argptr); - fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666); - write(fd, data, strlen(data)); - close(fd); + fclose(fd); } @@ -386,45 +381,31 @@ void Con_Printf (char *fmt, ...) { 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); // also echo to debugging console + Sys_Printf ("%s", msg); // log all messages to file if (con_debuglog) - Con_DebugLog(va("%s/qconsole.log",com_gamedir), "%s", msg); + { + // 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); + } 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; - } - } - */ } /* @@ -438,14 +419,14 @@ void Con_DPrintf (char *fmt, ...) { va_list argptr; char msg[MAXPRINTMSG]; - - if (!developer.value) + + 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); } @@ -461,16 +442,12 @@ void Con_SafePrintf (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; } @@ -494,16 +471,13 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { - int y; - char *text; - char editlinecopy[256]; + char editlinecopy[256], *text; if (key_dest != key_console && !con_forcedup) 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 +486,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 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,9 +541,9 @@ void Con_DrawNotify (void) if (key_dest == key_message) { clearnotify = 0; - + x = 0; - + // LordHavoc: speedup, and other improvements if (team_message) sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); @@ -592,25 +551,17 @@ void Con_DrawNotify (void) sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); while (strlen(temptext) >= 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 +574,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 cvar_t scr_conalpha; +extern char engineversion[40]; +void Con_DrawConsole (int lines) { int i, y; int rows; char *text; int j; - + if (lines <= 0) return; // draw the background - Draw_ConsoleBackground (lines); + DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, 1, 1, 1, scr_conalpha.value * lines / vid.conheight, 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 +596,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 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]); } - return; } - + if (cmd) { strncpy(key_lines[edit_line] + 1, cmd, cmd_len); key_linepos = cmd_len + 1; @@ -799,6 +746,6 @@ Con_CompleteCommandLine (void) } for (i = 0; i < 3; i++) if (list[i]) - qfree (list[i]); + Mem_Free(list[i]); }