X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.c;h=6eac13e19b66d2f157e5e5e0875e4d9b73a87f5f;hp=71a5f86928ccea41619a75c690db6287bb0eea85;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=f47d3bbd69de3aab3a8b4f80e5080189e5e380c6 diff --git a/console.c b/console.c index 71a5f869..6eac13e1 100644 --- a/console.c +++ b/console.c @@ -19,19 +19,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // console.c -#include "quakedef.h" - #if !defined(WIN32) || defined(__MINGW32__) # include #endif #include +#include "quakedef.h" +#include "thread.h" + +// for u8_encodech +#include "ft2.h" + float con_cursorspeed = 4; // lines up from bottom to display int con_backscroll; conbuffer_t con; +void *con_mutex = NULL; #define CON_LINES(i) CONBUFFER_LINES(&con, i) #define CON_LINES_LAST CONBUFFER_LINES_LAST(&con) @@ -44,6 +49,9 @@ cvar_t con_notifyalign = {CVAR_SAVE, "con_notifyalign", "", "how to align notify cvar_t con_chattime = {CVAR_SAVE, "con_chattime","30", "how long chat lines last, in seconds"}; cvar_t con_chat = {CVAR_SAVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"}; cvar_t con_chatpos = {CVAR_SAVE, "con_chatpos","0", "where to put chat (negative: lines from bottom of screen, positive: lines below notify, 0: at top)"}; +cvar_t con_chatrect = {CVAR_SAVE, "con_chatrect","0", "use con_chatrect_x and _y to position con_notify and con_chat freely instead of con_chatpos"}; +cvar_t con_chatrect_x = {CVAR_SAVE, "con_chatrect_x","", "where to put chat, relative x coordinate of left edge on screen (use con_chatwidth for width)"}; +cvar_t con_chatrect_y = {CVAR_SAVE, "con_chatrect_y","", "where to put chat, relative y coordinate of top edge on screen (use con_chat for line count)"}; cvar_t con_chatwidth = {CVAR_SAVE, "con_chatwidth","1.0", "relative chat window width"}; cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"}; cvar_t con_notifysize = {CVAR_SAVE, "con_notifysize","8", "notify text size in virtual 2D pixels"}; @@ -77,6 +85,8 @@ cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem", cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"}; cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg", "completion pattern for the exec command"}; +cvar_t condump_stripcolors = {CVAR_SAVE, "condump_stripcolors", "0", "strip color codes from console dumps"}; + int con_linewidth; int con_vislines; @@ -87,6 +97,7 @@ lhnetsocket_t *rcon_redirect_sock = NULL; lhnetaddress_t *rcon_redirect_dest = NULL; int rcon_redirect_bufferpos = 0; char rcon_redirect_buffer[1400]; +qboolean rcon_redirect_proquakeprotocol = false; // generic functions for console buffers @@ -101,6 +112,94 @@ void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mem buf->lines_count = 0; } +/*! 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', '{', '|', '}', '~', '<' +}; + +/* + SanitizeString strips color tags from the string in + and writes the result on string out +*/ +static void SanitizeString(char *in, char *out) +{ + while(*in) + { + if(*in == STRING_COLOR_TAG) + { + ++in; + if(!*in) + { + out[0] = STRING_COLOR_TAG; + out[1] = 0; + return; + } + else if (*in >= '0' && *in <= '9') // ^[0-9] found + { + ++in; + if(!*in) + { + *out = 0; + return; + } else if (*in == STRING_COLOR_TAG) // ^[0-9]^ found, don't print ^[0-9] + continue; + } + else if (*in == STRING_COLOR_RGB_TAG_CHAR) // ^x found + { + if ( isxdigit(in[1]) && isxdigit(in[2]) && isxdigit(in[3]) ) + { + in+=4; + if (!*in) + { + *out = 0; + return; + } else if (*in == STRING_COLOR_TAG) // ^xrgb^ found, don't print ^xrgb + continue; + } + else in--; + } + else if (*in != STRING_COLOR_TAG) + --in; + } + *out = qfont_table[*(unsigned char*)in]; + ++in; + ++out; + } + *out = 0; +} + /* ================ ConBuffer_Clear @@ -119,8 +218,10 @@ ConBuffer_Shutdown void ConBuffer_Shutdown(conbuffer_t *buf) { buf->active = false; - Mem_Free(buf->text); - Mem_Free(buf->lines); + if (buf->text) + Mem_Free(buf->text); + if (buf->lines) + Mem_Free(buf->lines); buf->text = NULL; buf->lines = NULL; } @@ -278,27 +379,9 @@ int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, in return -1; } -int Con_FindNextLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start) -{ - int i; - for(i = start + 1; i < buf->lines_count; ++i) - { - con_lineinfo_t *l = &CONBUFFER_LINES(buf, i); - - if((l->mask & mask_must) != mask_must) - continue; - if(l->mask & mask_mustnot) - continue; - - return i; - } - - return -1; -} - const char *ConBuffer_GetLine(conbuffer_t *buf, int i) { - static char copybuf[MAX_INPUTLINE]; + static char copybuf[MAX_INPUTLINE]; // client only con_lineinfo_t *l = &CONBUFFER_LINES(buf, i); size_t sz = l->len+1 > sizeof(copybuf) ? sizeof(copybuf) : l->len+1; strlcpy(copybuf, l->start, sz); @@ -315,8 +398,9 @@ LOGGING /// \name Logging //@{ -cvar_t log_file = {0, "log_file","", "filename to log messages to"}; -cvar_t log_dest_udp = {0, "log_dest_udp","", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"}; +cvar_t log_file = {0, "log_file", "", "filename to log messages to"}; +cvar_t log_file_stripcolors = {0, "log_file_stripcolors", "0", "strip color codes from log messages"}; +cvar_t log_dest_udp = {0, "log_dest_udp", "", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"}; char log_dest_buffer[1400]; // UDP packet size_t log_dest_buffer_pos; unsigned int log_dest_buffer_appending; @@ -329,23 +413,13 @@ size_t logq_size = 0; void Log_ConPrint (const char *msg); //@} -/* -==================== -Log_DestBuffer_Init -==================== -*/ static void Log_DestBuffer_Init(void) { memcpy(log_dest_buffer, "\377\377\377\377n", 5); // QW rcon print log_dest_buffer_pos = 5; } -/* -==================== -Log_DestBuffer_Flush -==================== -*/ -void Log_DestBuffer_Flush(void) +static void Log_DestBuffer_Flush_NoLock(void) { lhnetaddress_t log_dest_addr; lhnetsocket_t *log_dest_socket; @@ -381,12 +455,21 @@ void Log_DestBuffer_Flush(void) /* ==================== -Log_Timestamp +Log_DestBuffer_Flush ==================== */ -const char* Log_Timestamp (const char *desc) +void Log_DestBuffer_Flush(void) +{ + if (con_mutex) + Thread_LockMutex(con_mutex); + Log_DestBuffer_Flush_NoLock(); + if (con_mutex) + Thread_UnlockMutex(con_mutex); +} + +static const char* Log_Timestamp (const char *desc) { - static char timestamp [128]; + static char timestamp [128]; // init/shutdown only time_t crt_time; #if _MSC_VER >= 1400 struct tm crt_tm; @@ -413,13 +496,7 @@ const char* Log_Timestamp (const char *desc) return timestamp; } - -/* -==================== -Log_Open -==================== -*/ -void Log_Open (void) +static void Log_Open (void) { if (logfile != NULL || log_file.string[0] == '\0') return; @@ -432,7 +509,6 @@ void Log_Open (void) } } - /* ==================== Log_Close @@ -481,7 +557,7 @@ void Log_Start (void) n = min(sizeof(log_dest_buffer) - log_dest_buffer_pos - 1, logq_ind - pos); memcpy(log_dest_buffer + log_dest_buffer_pos, temp + pos, n); log_dest_buffer_pos += n; - Log_DestBuffer_Flush(); + Log_DestBuffer_Flush_NoLock(); pos += n; } } @@ -493,6 +569,7 @@ void Log_Start (void) } + /* ================ Log_ConPrint @@ -543,7 +620,22 @@ void Log_ConPrint (const char *msg) // If a log file is available if (logfile != NULL) - FS_Print (logfile, msg); + { + if (log_file_stripcolors.integer) + { + // sanitize msg + size_t len = strlen(msg); + char* sanitizedmsg = (char*)Mem_Alloc(tempmempool, len + 1); + memcpy (sanitizedmsg, msg, len); + SanitizeString(sanitizedmsg, sanitizedmsg); // SanitizeString's in pointer is always ahead of the out pointer, so this should work. + FS_Print (logfile, sanitizedmsg); + Mem_Free(sanitizedmsg); + } + else + { + FS_Print (logfile, msg); + } + } inprogress = false; } @@ -587,6 +679,10 @@ Con_ToggleConsole_f */ void Con_ToggleConsole_f (void) { + if (COM_CheckParm ("-noconsole")) + if (!(key_consoleactive & KEY_CONSOLEACTIVE_USER)) + return; // only allow the key bind to turn off console + // toggle the 'user wants console' bit key_consoleactive ^= KEY_CONSOLEACTIVE_USER; Con_ClearNotify(); @@ -601,7 +697,8 @@ void Con_ClearNotify (void) { int i; for(i = 0; i < CON_LINES_COUNT; ++i) - CON_LINES(i).mask |= CON_MASK_HIDENOTIFY; + if(!(CON_LINES(i).mask & CON_MASK_CHAT)) + CON_LINES(i).mask |= CON_MASK_HIDENOTIFY; } @@ -610,12 +707,15 @@ void Con_ClearNotify (void) Con_MessageMode_f ================ */ -void Con_MessageMode_f (void) +static void Con_MessageMode_f (void) { key_dest = key_message; chat_mode = 0; // "say" - chat_bufferlen = 0; - chat_buffer[0] = 0; + if(Cmd_Argc() > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); + chat_bufferlen = (unsigned int)strlen(chat_buffer); + } } @@ -624,12 +724,15 @@ void Con_MessageMode_f (void) Con_MessageMode2_f ================ */ -void Con_MessageMode2_f (void) +static void Con_MessageMode2_f (void) { key_dest = key_message; chat_mode = 1; // "say_team" - chat_bufferlen = 0; - chat_buffer[0] = 0; + if(Cmd_Argc() > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); + chat_bufferlen = (unsigned int)strlen(chat_buffer); + } } /* @@ -637,13 +740,13 @@ void Con_MessageMode2_f (void) Con_CommandMode_f ================ */ -void Con_CommandMode_f (void) +static void Con_CommandMode_f (void) { key_dest = key_message; if(Cmd_Argc() > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); - chat_bufferlen = strlen(chat_buffer); + chat_bufferlen = (unsigned int)strlen(chat_buffer); } chat_mode = -1; // command } @@ -692,7 +795,7 @@ static void Con_Maps_f (void) GetMapList("", NULL, 0); } -void Con_ConDump_f (void) +static void Con_ConDump_f (void) { int i; qfile_t *file; @@ -707,17 +810,34 @@ void Con_ConDump_f (void) Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1)); return; } + if (con_mutex) Thread_LockMutex(con_mutex); for(i = 0; i < CON_LINES_COUNT; ++i) { - FS_Write(file, CON_LINES(i).start, CON_LINES(i).len); + if (condump_stripcolors.integer) + { + // sanitize msg + size_t len = CON_LINES(i).len; + char* sanitizedmsg = (char*)Mem_Alloc(tempmempool, len + 1); + memcpy (sanitizedmsg, CON_LINES(i).start, len); + SanitizeString(sanitizedmsg, sanitizedmsg); // SanitizeString's in pointer is always ahead of the out pointer, so this should work. + FS_Write(file, sanitizedmsg, strlen(sanitizedmsg)); + Mem_Free(sanitizedmsg); + } + else + { + FS_Write(file, CON_LINES(i).start, CON_LINES(i).len); + } FS_Write(file, "\n", 1); } + if (con_mutex) Thread_UnlockMutex(con_mutex); FS_Close(file); } void Con_Clear_f (void) { + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_Clear(&con); + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -729,6 +849,8 @@ void Con_Init (void) { con_linewidth = 80; ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool); + if (Thread_HasThreads()) + con_mutex = Thread_CreateMutex(); // Allocate a log queue, this will be freed after configs are parsed logq_size = MAX_INPUTLINE; @@ -739,6 +861,7 @@ void Con_Init (void) Cvar_RegisterVariable (&sys_specialcharactertranslation); Cvar_RegisterVariable (&log_file); + Cvar_RegisterVariable (&log_file_stripcolors); Cvar_RegisterVariable (&log_dest_udp); // support for the classic Quake option @@ -749,6 +872,9 @@ void Con_Init (void) // register our cvars Cvar_RegisterVariable (&con_chat); Cvar_RegisterVariable (&con_chatpos); + Cvar_RegisterVariable (&con_chatrect_x); + Cvar_RegisterVariable (&con_chatrect_y); + Cvar_RegisterVariable (&con_chatrect); Cvar_RegisterVariable (&con_chatsize); Cvar_RegisterVariable (&con_chattime); Cvar_RegisterVariable (&con_chatwidth); @@ -767,6 +893,8 @@ void Con_Init (void) Cvar_RegisterVariable (&con_completion_timedemo); // *.dem Cvar_RegisterVariable (&con_completion_exec); // *.cfg + Cvar_RegisterVariable (&condump_stripcolors); + // register our commands Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "opens or closes the console"); Cmd_AddCommand ("messagemode", Con_MessageMode_f, "input a chat message to say to everyone"); @@ -782,7 +910,10 @@ void Con_Init (void) void Con_Shutdown (void) { + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_Shutdown(&con); + if (con_mutex) Thread_UnlockMutex(con_mutex); + if (con_mutex) Thread_DestroyMutex(con_mutex);con_mutex = NULL; } /* @@ -794,14 +925,14 @@ 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_PrintToHistory(const char *txt, int mask) +static void Con_PrintToHistory(const char *txt, int mask) { // process: // \n goes to next line // \r deletes current line and makes a new one static int cr_pending = 0; - static char buf[CON_TEXTSIZE]; + static char buf[CON_TEXTSIZE]; // con_mutex static int bufpos = 0; if(!con.text) // FIXME uses a non-abstracted property of con @@ -839,57 +970,41 @@ void Con_PrintToHistory(const char *txt, int mask) } } -/*! 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', '{', '|', '}', '~', '<' -}; - -void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest) +void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol) { rcon_redirect_sock = sock; rcon_redirect_dest = dest; - memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_proquakeprotocol = proquakeprotocol; + if (rcon_redirect_proquakeprotocol) + { + // reserve space for the packet header + rcon_redirect_buffer[0] = 0; + rcon_redirect_buffer[1] = 0; + rcon_redirect_buffer[2] = 0; + rcon_redirect_buffer[3] = 0; + // this is a reply to a CCREQ_RCON + rcon_redirect_buffer[4] = (unsigned char)CCREP_RCON; + } + else + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print rcon_redirect_bufferpos = 5; } -void Con_Rcon_Redirect_Flush(void) +static void Con_Rcon_Redirect_Flush(void) { - rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; - NetConn_WriteString(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_dest); + if(rcon_redirect_sock) + { + rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; + if (rcon_redirect_proquakeprotocol) + { + // update the length in the packet header + StoreBigLong((unsigned char *)rcon_redirect_buffer, NETFLAG_CTL | (rcon_redirect_bufferpos & NETFLAG_LENGTH_MASK)); + } + NetConn_Write(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_bufferpos, rcon_redirect_dest); + } memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print rcon_redirect_bufferpos = 5; + rcon_redirect_proquakeprotocol = false; } void Con_Rcon_Redirect_End(void) @@ -911,7 +1026,7 @@ Con_Rcon_AddChar ================ */ /// Adds a character to the rcon buffer. -void Con_Rcon_AddChar(int c) +static void Con_Rcon_AddChar(int c) { if(log_dest_buffer_appending) return; @@ -932,7 +1047,7 @@ void Con_Rcon_AddChar(int c) Log_DestBuffer_Init(); log_dest_buffer[log_dest_buffer_pos++] = c; if(log_dest_buffer_pos >= sizeof(log_dest_buffer) - 1) // minus one, to allow for terminating zero - Log_DestBuffer_Flush(); + Log_DestBuffer_Flush_NoLock(); } else log_dest_buffer_pos = 0; @@ -1005,18 +1120,21 @@ static char Sys_Con_NearestColor(const unsigned char _r, const unsigned char _g, /* ================ -Con_Print +Con_MaskPrint ================ */ extern cvar_t timestamps; extern cvar_t timeformat; extern qboolean sys_nostdout; -void Con_Print(const char *msg) +void Con_MaskPrint(int additionalmask, const char *msg) { static int mask = 0; static int index = 0; static char line[MAX_INPUTLINE]; + if (con_mutex) + Thread_LockMutex(con_mutex); + for (;*msg;msg++) { Con_Rcon_AddChar(*msg); @@ -1031,14 +1149,14 @@ void Con_Print(const char *msg) line[index++] = STRING_COLOR_DEFAULT + '0'; // special color codes for chat messages must always come first // for Con_PrintToHistory to work properly - if (*msg == 1 || *msg == 2) + if (*msg == 1 || *msg == 2 || *msg == 3) { // play talk wav if (*msg == 1) { if (con_chatsound.value) { - if(gamemode == GAME_NEXUIZ) + if(IS_NEXUIZ_DERIVED(gamemode)) { if(msg[1] == '\r' && cl.foundtalk2wav) S_LocalSound ("sound/misc/talk2.wav"); @@ -1053,8 +1171,13 @@ void Con_Print(const char *msg) S_LocalSound ("sound/misc/talk.wav"); } } - mask = CON_MASK_CHAT; } + + // Send to chatbox for say/tell (1) and messages (3) + // 3 is just so that a message can be sent to the chatbox without a sound. + if (*msg == 1 || *msg == 3) + mask = CON_MASK_CHAT; + line[index++] = STRING_COLOR_TAG; line[index++] = '3'; msg++; @@ -1064,6 +1187,8 @@ void Con_Print(const char *msg) for (;*timestamp;index++, timestamp++) if (index < (int)sizeof(line) - 2) line[index] = *timestamp; + // add the mask + mask |= additionalmask; } // append the character line[index++] = *msg; @@ -1078,16 +1203,29 @@ void Con_Print(const char *msg) if (con_initialized && cls.state != ca_dedicated) { Con_PrintToHistory(line, mask); - mask = 0; } // send to terminal or dedicated server window if (!sys_nostdout) + if (developer.integer || !(mask & CON_MASK_DEVELOPER)) { - unsigned char *p; if(sys_specialcharactertranslation.integer) { - for (p = (unsigned char *) line;*p; p++) - *p = qfont_table[*p]; + char *p; + const char *q; + p = line; + while(*p) + { + int ch = u8_getchar(p, &q); + if(ch >= 0xE000 && ch <= 0xE0FF && ((unsigned char) qfont_table[ch - 0xE000]) >= 0x20) + { + *p = qfont_table[ch - 0xE000]; + if(q > p+1) + memmove(p+1, q, strlen(q)+1); + p = p + 1; + } + else + p = p + (q - p); + } } if(sys_colortranslation.integer == 1) // ANSI @@ -1265,10 +1403,40 @@ void Con_Print(const char *msg) } // empty the line buffer index = 0; + mask = 0; } } + + if (con_mutex) + Thread_UnlockMutex(con_mutex); } +/* +================ +Con_MaskPrintf +================ +*/ +void Con_MaskPrintf(int mask, const char *fmt, ...) +{ + va_list argptr; + char msg[MAX_INPUTLINE]; + + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); + + Con_MaskPrint(mask, msg); +} + +/* +================ +Con_Print +================ +*/ +void Con_Print(const char *msg) +{ + Con_MaskPrint(CON_MASK_PRINT, msg); +} /* ================ @@ -1284,7 +1452,7 @@ void Con_Printf(const char *fmt, ...) dpvsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); - Con_Print(msg); + Con_MaskPrint(CON_MASK_PRINT, msg); } /* @@ -1294,9 +1462,10 @@ Con_DPrint */ void Con_DPrint(const char *msg) { - if (!developer.integer) - return; // don't confuse non-developers with techie stuff... - Con_Print(msg); + if(developer.integer < 0) // at 0, we still add to the buffer but hide + return; + + Con_MaskPrint(CON_MASK_DEVELOPER, msg); } /* @@ -1309,14 +1478,14 @@ void Con_DPrintf(const char *fmt, ...) va_list argptr; char msg[MAX_INPUTLINE]; - if (!developer.integer) - return; // don't confuse non-developers with techie stuff... + if(developer.integer < 0) // at 0, we still add to the buffer but hide + return; va_start(argptr,fmt); dpvsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); - Con_Print(msg); + Con_MaskPrint(CON_MASK_DEVELOPER, msg); } @@ -1337,45 +1506,87 @@ The input line scrolls horizontally if typing goes beyond the right edge Modified by EvilTypeGuy eviltypeguy@qeradiant.com ================ */ -void Con_DrawInput (void) +static void Con_DrawInput (void) { int y; int i; - char editlinecopy[MAX_INPUTLINE+1], *text; - float x; + char text[sizeof(key_line)+5+1]; // space for ^^xRGB too + float x, xo; + size_t len_out; + int col_out; if (!key_consoleactive) return; // don't draw anything - strlcpy(editlinecopy, key_line, sizeof(editlinecopy)); - text = editlinecopy; + strlcpy(text, key_line, sizeof(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 - // of early characters w/o erasing y = (int)strlen(text); -// fill out remainder with spaces - for (i = y; i < (int)sizeof(editlinecopy)-1; 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; + // make the color code visible when the cursor is inside it + if(text[key_linepos] != 0) + { + for(i=1; i < 5 && key_linepos - i > 0; ++i) + if(text[key_linepos-i] == STRING_COLOR_TAG) + { + int caret_pos, ofs = 0; + caret_pos = key_linepos - i; + if(i == 1 && text[caret_pos+1] == STRING_COLOR_TAG) + ofs = 1; + else if(i == 1 && isdigit(text[caret_pos+1])) + ofs = 2; + else if(text[caret_pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(text[caret_pos+2]) && isxdigit(text[caret_pos+3]) && isxdigit(text[caret_pos+4])) + ofs = 5; + if(ofs && (size_t)(y + ofs + 1) < sizeof(text)) + { + int carets = 1; + while(caret_pos - carets >= 1 && text[caret_pos - carets] == STRING_COLOR_TAG) + ++carets; + if(carets & 1) + { + // str^2ing (displayed as string) --> str^2^^2ing (displayed as str^2ing) + // str^^ing (displayed as str^ing) --> str^^^^ing (displayed as str^^ing) + memmove(&text[caret_pos + ofs + 1], &text[caret_pos], y - caret_pos); + text[caret_pos + ofs] = STRING_COLOR_TAG; + y += ofs + 1; + text[y] = 0; + } + } + break; + } + } - x = vid_conwidth.value * 0.95 - DrawQ_TextWidth_Font(text, key_linepos, false, FONT_CONSOLE) * con_textsize.value; + len_out = key_linepos; + col_out = -1; + xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, con_textsize.value, con_textsize.value, &col_out, false, FONT_CONSOLE, 1000000000); + x = vid_conwidth.value * 0.95 - xo; // scroll if(x >= 0) x = 0; // draw it - DrawQ_String_Font(x, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE ); + DrawQ_String(x, con_vislines - con_textsize.value*2, text, y + 3, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE ); - // remove cursor -// key_line[key_linepos] = 0; + // draw a cursor on top of this + if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible + { + if (!utf8_enable.integer) + { + text[0] = 11 + 130 * key_insert; // either solid or triangle facing right + text[1] = 0; + } + else + { + size_t len; + const char *curbuf; + char charbuf16[16]; + curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16); + memcpy(text, curbuf, len); + text[len] = 0; + } + DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE); + } } typedef struct @@ -1394,7 +1605,7 @@ typedef struct } con_text_info_t; -float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) +static float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) { con_text_info_t *ti = (con_text_info_t *) passthrough; if(w == NULL) @@ -1403,18 +1614,18 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float return ti->fontsize * ti->font->maxwidth; } if(maxWidth >= 0) - return DrawQ_TextWidth_Font_UntilWidth(w, length, false, ti->font, maxWidth / ti->fontsize) * ti->fontsize; + return DrawQ_TextWidth_UntilWidth(w, length, ti->fontsize, ti->fontsize, false, ti->font, -maxWidth); // -maxWidth: we want at least one char else if(maxWidth == -1) - return DrawQ_TextWidth_Font(w, *length, false, ti->font) * ti->fontsize; + return DrawQ_TextWidth(w, *length, ti->fontsize, ti->fontsize, false, ti->font); else { - printf("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth); + Sys_PrintfToTerminal("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth); // Note: this is NOT a Con_Printf, as it could print recursively return 0; } } -int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) +static int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) { (void) passthrough; (void) line; @@ -1424,7 +1635,7 @@ int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float return 1; } -int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) +static int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) { con_text_info_t *ti = (con_text_info_t *) passthrough; @@ -1436,16 +1647,16 @@ int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, floa { int x = (int) (ti->x + (ti->width - width) * ti->alignment); if(isContinuation && *ti->continuationString) - x += (int) DrawQ_String_Font(x, ti->y, ti->continuationString, strlen(ti->continuationString), ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, ti->font); + x = (int) DrawQ_String(x, ti->y, ti->continuationString, strlen(ti->continuationString), ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, ti->font); if(length > 0) - DrawQ_String_Font(x, ti->y, line, length, ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, &(ti->colorindex), false, ti->font); + DrawQ_String(x, ti->y, line, length, ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, &(ti->colorindex), false, ti->font); } ti->y += ti->fontsize; return 1; } -int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, float y, float width, float height, float fontsize, float alignment_x, float alignment_y, const char *continuationString) +static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, float y, float width, float height, float fontsize, float alignment_x, float alignment_y, const char *continuationString) { int i; int lines = 0; @@ -1453,7 +1664,7 @@ int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, f int startidx; int nskip = 0; int continuationWidth = 0; - size_t l; + size_t len; double t = cl.time; // saved so it won't change con_text_info_t ti; @@ -1465,10 +1676,10 @@ int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, f ti.ymax = y + height; ti.continuationString = continuationString; - l = 0; - Con_WordWidthFunc(&ti, NULL, &l, -1); - l = strlen(continuationString); - continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &l, -1); + len = 0; + Con_WordWidthFunc(&ti, NULL, &len, -1); + len = strlen(continuationString); + continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &len, -1); // first find the first line to draw by backwards iterating and word wrapping to find their length... startidx = CON_LINES_COUNT; @@ -1529,16 +1740,18 @@ Draws the last few lines of output transparently over the game top */ void Con_DrawNotify (void) { - float x, v; - float chatstart, notifystart, inputsize; + float x, v, xr; + float chatstart, notifystart, inputsize, height; float align; char temptext[MAX_INPUTLINE]; int numChatlines; int chatpos; + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_FixTimes(&con); numChatlines = con_chat.integer; + chatpos = con_chatpos.integer; if (con_notify.integer < 0) @@ -1552,11 +1765,11 @@ void Con_DrawNotify (void) align = con_notifyalign.value; if(!*con_notifyalign.string) // empty string, evaluated to 0 above { - if(gamemode == GAME_NEXUIZ) + if(IS_OLDNEXUIZ_DERIVED(gamemode)) align = 0.5; } - if(numChatlines) + if(numChatlines || !con_chatrect.integer) { if(chatpos == 0) { @@ -1584,56 +1797,49 @@ void Con_DrawNotify (void) chatstart = 0; // shut off gcc warning } - v = notifystart + con_notifysize.value * Con_DrawNotifyRect(0, CON_MASK_INPUT | CON_MASK_HIDENOTIFY | (numChatlines ? CON_MASK_CHAT : 0), con_notifytime.value, 0, notifystart, vid_conwidth.value, con_notify.value * con_notifysize.value, con_notifysize.value, align, 0.0, ""); + v = notifystart + con_notifysize.value * Con_DrawNotifyRect(0, CON_MASK_INPUT | CON_MASK_HIDENOTIFY | (numChatlines ? CON_MASK_CHAT : 0) | CON_MASK_DEVELOPER, con_notifytime.value, 0, notifystart, vid_conwidth.value, con_notify.value * con_notifysize.value, con_notifysize.value, align, 0.0, ""); - // chat? - if(numChatlines) + if(con_chatrect.integer) { - v = chatstart + numChatlines * con_chatsize.value; - Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, 0, chatstart, vid_conwidth.value * con_chatwidth.value, v - chatstart, con_chatsize.value, 0.0, 1.0, "^3\014\014\014 "); // 015 is ·> character in conchars.tga + x = con_chatrect_x.value * vid_conwidth.value; + v = con_chatrect_y.value * vid_conheight.value; } + else + { + x = 0; + if(numChatlines) // only do this if chat area is enabled, or this would move the input line wrong + v = chatstart; + } + height = numChatlines * con_chatsize.value; + if(numChatlines) + { + Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, x, v, vid_conwidth.value * con_chatwidth.value, height, con_chatsize.value, 0.0, 1.0, "^3 ... "); + v += height; + } if (key_dest == key_message) { + //static char *cursor[2] = { "\xee\x80\x8a", "\xee\x80\x8b" }; // { off, on } int colorindex = -1; + const char *cursor; + char charbuf16[16]; + cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL, charbuf16); // LordHavoc: speedup, and other improvements if (chat_mode < 0) - dpsnprintf(temptext, sizeof(temptext), "]%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + dpsnprintf(temptext, sizeof(temptext), "]%s%s", chat_buffer, cursor); else if(chat_mode) - dpsnprintf(temptext, sizeof(temptext), "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + dpsnprintf(temptext, sizeof(temptext), "say_team:%s%s", chat_buffer, cursor); else - dpsnprintf(temptext, sizeof(temptext), "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + dpsnprintf(temptext, sizeof(temptext), "say:%s%s", chat_buffer, cursor); // FIXME word wrap inputsize = (numChatlines ? con_chatsize : con_notifysize).value; - x = vid_conwidth.value - DrawQ_TextWidth_Font(temptext, 0, false, FONT_CHAT) * inputsize; - if(x > 0) - x = 0; - DrawQ_String_Font(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT); + xr = vid_conwidth.value - DrawQ_TextWidth(temptext, 0, inputsize, inputsize, false, FONT_CHAT); + x = min(xr, x); + DrawQ_String(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT); } -} - -/* -================ -Con_MeasureConsoleLine - -Counts the number of lines for a line on the console. -================ -*/ -int Con_MeasureConsoleLine(int lineno) -{ - float width = vid_conwidth.value; - con_text_info_t ti; - con_lineinfo_t *li = &CON_LINES(lineno); - - //if(con.lines[lineno].mask & CON_MASK_LOADEDHISTORY) - // return 0; - - ti.fontsize = con_textsize.value; - ti.font = FONT_CONSOLE; - - return COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL); + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -1643,13 +1849,18 @@ Con_LineHeight Returns the height of a given console line; calculates it if necessary. ================ */ -int Con_LineHeight(int i) +static int Con_LineHeight(int lineno) { - con_lineinfo_t *li = &CON_LINES(i); - int h = li->height; - if(h != -1) - return h; - return li->height = Con_MeasureConsoleLine(i); + con_lineinfo_t *li = &CON_LINES(lineno); + if(li->height == -1) + { + float width = vid_conwidth.value; + con_text_info_t ti; + ti.fontsize = con_textsize.value; + ti.font = FONT_CONSOLE; + li->height = COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL); + } + return li->height; } /* @@ -1661,14 +1872,16 @@ If alpha is 0, the line is not drawn, but still wrapped and its height returned. ================ */ -int Con_DrawConsoleLine(float y, int lineno, float ymin, float ymax) +static int Con_DrawConsoleLine(int mask_must, int mask_mustnot, float y, int lineno, float ymin, float ymax) { float width = vid_conwidth.value; con_text_info_t ti; con_lineinfo_t *li = &CON_LINES(lineno); - //if(con.lines[lineno].mask & CON_MASK_LOADEDHISTORY) - // return 0; + if((li->mask & mask_must) != mask_must) + return 0; + if((li->mask & mask_mustnot) != 0) + return 0; ti.continuationString = ""; ti.alignment = 0; @@ -1691,7 +1904,7 @@ Calculates the last visible line index and how much to show of it based on con_backscroll. ================ */ -void Con_LastVisibleLine(int *last, int *limitlast) +static void Con_LastVisibleLine(int mask_must, int mask_mustnot, int *last, int *limitlast) { int lines_seen = 0; int i; @@ -1699,15 +1912,19 @@ void Con_LastVisibleLine(int *last, int *limitlast) if(con_backscroll < 0) con_backscroll = 0; + *last = 0; + // now count until we saw con_backscroll actual lines for(i = CON_LINES_COUNT - 1; i >= 0; --i) + if((CON_LINES(i).mask & mask_must) == mask_must) + if((CON_LINES(i).mask & mask_mustnot) == 0) { int h = Con_LineHeight(i); // line is the last visible line? + *last = i; if(lines_seen + h > con_backscroll && lines_seen <= con_backscroll) { - *last = i; *limitlast = lines_seen + h - con_backscroll; return; } @@ -1718,8 +1935,6 @@ void Con_LastVisibleLine(int *last, int *limitlast) // if we get here, no line was on screen - scroll so that one line is // visible then. con_backscroll = lines_seen - 1; - *last = con.lines_first; - // FIXME uses con in a non abstracted way *limitlast = 1; } @@ -1733,33 +1948,109 @@ The typing input line at the bottom should only be drawn if typing is allowed */ void Con_DrawConsole (int lines) { - int i, last, limitlast; - float y; + float alpha, alpha0; + double sx, sy; + int mask_must = 0; + int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER; + cachepic_t *conbackpic; if (lines <= 0) return; + if (con_mutex) Thread_LockMutex(con_mutex); + + if (con_backscroll < 0) + con_backscroll = 0; + con_vislines = lines; + r_draw2d_force = true; + // draw the background - DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic ("gfx/conback") : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game - DrawQ_String_Font(vid_conwidth.integer - DrawQ_TextWidth_Font(engineversion, 0, false, FONT_CONSOLE) * con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE); + alpha0 = cls.signon == SIGNONS ? scr_conalpha.value : 1.0f; // always full alpha when not in game + if((alpha = alpha0 * scr_conalphafactor.value) > 0) + { + sx = scr_conscroll_x.value; + sy = scr_conscroll_y.value; + conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0) : NULL; + sx *= realtime; sy *= realtime; + sx -= floor(sx); sy -= floor(sy); + if (Draw_IsPicLoaded(conbackpic)) + DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, + 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0); + else + DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0.0f, 0.0f, 0.0f, alpha, 0); + } + if((alpha = alpha0 * scr_conalpha2factor.value) > 0) + { + sx = scr_conscroll2_x.value; + sy = scr_conscroll2_y.value; + conbackpic = Draw_CachePic_Flags("gfx/conback2", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); + sx *= realtime; sy *= realtime; + sx -= floor(sx); sy -= floor(sy); + if(Draw_IsPicLoaded(conbackpic)) + DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, + 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0); + } + if((alpha = alpha0 * scr_conalpha3factor.value) > 0) + { + sx = scr_conscroll3_x.value; + sy = scr_conscroll3_y.value; + conbackpic = Draw_CachePic_Flags("gfx/conback3", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); + sx *= realtime; sy *= realtime; + sx -= floor(sx); sy -= floor(sy); + if(Draw_IsPicLoaded(conbackpic)) + DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, + 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, + 0); + } + DrawQ_String(vid_conwidth.integer - DrawQ_TextWidth(engineversion, 0, con_textsize.value, con_textsize.value, false, FONT_CONSOLE), lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE); // draw the text +#if 0 + { + int i; + int count = CON_LINES_COUNT; + float ymax = con_vislines - 2 * con_textsize.value; + float y = ymax + con_textsize.value * con_backscroll; + for (i = 0;i < count && y >= 0;i++) + y -= Con_DrawConsoleLine(mask_must, mask_mustnot, y - con_textsize.value, CON_LINES_COUNT - 1 - i, 0, ymax) * con_textsize.value; + // fix any excessive scrollback for the next frame + if (i >= count && y >= 0) + { + con_backscroll -= (int)(y / con_textsize.value); + if (con_backscroll < 0) + con_backscroll = 0; + } + } +#else if(CON_LINES_COUNT > 0) { + int i, last, limitlast; + float y; float ymax = con_vislines - 2 * con_textsize.value; - Con_LastVisibleLine(&last, &limitlast); + Con_LastVisibleLine(mask_must, mask_mustnot, &last, &limitlast); + //Con_LastVisibleLine(mask_must, mask_mustnot, &last, &limitlast); y = ymax - con_textsize.value; if(limitlast) y += (CON_LINES(last).height - limitlast) * con_textsize.value; - // FIXME uses con in a non abstracted way i = last; for(;;) { - y -= Con_DrawConsoleLine(y, i, 0, ymax) * con_textsize.value; + y -= Con_DrawConsoleLine(mask_must, mask_mustnot, y, i, 0, ymax) * con_textsize.value; if(i == 0) break; // top of console buffer if(y < 0) @@ -1768,9 +2059,13 @@ void Con_DrawConsole (int lines) --i; } } +#endif // draw the input prompt, user text, and cursor if desired Con_DrawInput (); + + r_draw2d_force = false; + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -1820,11 +2115,14 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer const char *data = NULL; char keyname[64]; char entfilename[MAX_QPATH]; - strlcpy(message, "^1**ERROR**^7", sizeof(message)); + char desc[64]; + desc[0] = 0; + strlcpy(message, "^1ERROR: open failed^7", sizeof(message)); p = 0; f = FS_OpenVirtualFile(t->filenames[i], true); if(f) { + strlcpy(message, "^1ERROR: not a known map format^7", sizeof(message)); memset(buf, 0, 1024); FS_Read(f, buf, 1024); if (!memcmp(buf, "IBSP", 4)) @@ -1835,22 +2133,46 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer q3dheader_t *header = (q3dheader_t *)buf; lumpofs = LittleLong(header->lumps[Q3LUMP_ENTITIES].fileofs); lumplen = LittleLong(header->lumps[Q3LUMP_ENTITIES].filelen); + dpsnprintf(desc, sizeof(desc), "Q3BSP%i", p); } else if (p == Q2BSPVERSION) { q2dheader_t *header = (q2dheader_t *)buf; lumpofs = LittleLong(header->lumps[Q2LUMP_ENTITIES].fileofs); lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen); + dpsnprintf(desc, sizeof(desc), "Q2BSP%i", p); } + else + dpsnprintf(desc, sizeof(desc), "IBSP%i", p); + } + else if (BuffLittleLong(buf) == BSPVERSION) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP29"); + } + else if (BuffLittleLong(buf) == 30) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSPHL"); + } + else if (!memcmp(buf, "BSP2", 4)) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP2"); } - else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30) + else if (!memcmp(buf, "2PSB", 4)) { - dheader_t *header = (dheader_t *)buf; - lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs); - lumplen = LittleLong(header->lumps[LUMP_ENTITIES].filelen); + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP2RMQe"); } else - p = 0; + { + dpsnprintf(desc, sizeof(desc), "unknown%i", BuffLittleLong(buf)); + } strlcpy(entfilename, t->filenames[i], sizeof(entfilename)); memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5); entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL); @@ -1869,7 +2191,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer for (;;) { int l; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; if (com_token[0] == '{') continue; @@ -1880,10 +2202,10 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && !ISWHITESPACE(com_token[k+l]);l++) keyname[l] = com_token[k+l]; keyname[l] = 0; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; - if (developer.integer >= 100) - Con_Printf("key: %s %s\n", keyname, com_token); + if (developer_extra.integer) + Con_DPrintf("key: %s %s\n", keyname, com_token); if (!strcmp(keyname, "message")) { // get the message contents @@ -1898,15 +2220,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer if(f) FS_Close(f); *(t->filenames[i]+len[i]+5) = 0; - switch(p) - { - case Q3BSPVERSION: strlcpy((char *)buf, "Q3", sizeof(buf));break; - case Q2BSPVERSION: strlcpy((char *)buf, "Q2", sizeof(buf));break; - case BSPVERSION: strlcpy((char *)buf, "Q1", sizeof(buf));break; - case 30: strlcpy((char *)buf, "HL", sizeof(buf));break; - default: strlcpy((char *)buf, "??", sizeof(buf));break; - } - Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message); + Con_Printf("%16s (%-8s) %s\n", t->filenames[i]+5, desc, message); } Con_Print("\n"); for(p=o;p= '0' && *in <= '9') // ^[0-9] found - { - ++in; - if(!*in) - { - *out = 0; - return; - } else if (*in == STRING_COLOR_TAG) // ^[0-9]^ found, don't print ^[0-9] - continue; - } - else if (*in == STRING_COLOR_RGB_TAG_CHAR) // ^x found - { - if ( isxdigit(in[1]) && isxdigit(in[2]) && isxdigit(in[3]) ) - { - in+=4; - if (!*in) - { - *out = 0; - return; - } else if (*in == STRING_COLOR_TAG) // ^xrgb^ found, don't print ^xrgb - continue; - } - else in--; - } - else if (*in != STRING_COLOR_TAG) - --in; - } - *out = qfont_table[*(unsigned char*)in]; - ++in; - ++out; - } - *out = 0; -} // Now it becomes TRICKY :D --blub static char Nicks_list[MAX_SCOREBOARD][MAX_SCOREBOARDNAME]; // contains the nicks with colors and all that @@ -2028,7 +2292,7 @@ static int Nicks_offset[MAX_SCOREBOARD]; // when nicks use a space, we need this static int Nicks_matchpos; // co against <<:BLASTER:>> is true!? -int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) +static int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) { while(a_len) { @@ -2054,7 +2318,7 @@ int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) } return 0; } -int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) +static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) { char space_char; if(!(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY)) @@ -2105,11 +2369,10 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) Count the number of possible nicks to complete */ -int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) +static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) { char name[128]; int i, p; - int length; int match; int spos; int count = 0; @@ -2133,7 +2396,6 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) if(!name[0]) continue; - length = strlen(name); match = -1; spos = pos - 1; // no need for a minimum of characters :) @@ -2174,22 +2436,22 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) return count; } -void Cmd_CompleteNicksPrint(int count) +static void Cmd_CompleteNicksPrint(int count) { int i; for(i = 0; i < count; ++i) Con_Printf("%s\n", Nicks_list[i]); } -void Nicks_CutMatchesNormal(int count) +static void Nicks_CutMatchesNormal(int count) { // cut match 0 down to the longest possible completion int i; unsigned int c, l; - c = strlen(Nicks_sanlist[0]) - 1; + c = (unsigned int)strlen(Nicks_sanlist[0]) - 1; for(i = 1; i < count; ++i) { - l = strlen(Nicks_sanlist[i]) - 1; + l = (unsigned int)strlen(Nicks_sanlist[i]) - 1; if(l < c) c = l; @@ -2204,7 +2466,7 @@ void Nicks_CutMatchesNormal(int count) //Con_Printf("List0: %s\n", Nicks_sanlist[0]); } -unsigned int Nicks_strcleanlen(const char *s) +static unsigned int Nicks_strcleanlen(const char *s) { unsigned int l = 0; while(*s) @@ -2219,7 +2481,7 @@ unsigned int Nicks_strcleanlen(const char *s) return l; } -void Nicks_CutMatchesAlphaNumeric(int count) +static void Nicks_CutMatchesAlphaNumeric(int count) { // cut match 0 down to the longest possible completion int i; @@ -2228,7 +2490,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) char *a, *b; char space_char = (con_nickcompletion_flags.integer & NICKS_NO_SPACES) ? 'a' : ' '; // yes this is correct, we want NO spaces when no spaces - c = strlen(Nicks_sanlist[0]); + c = (unsigned int)strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { if( (Nicks_sanlist[0][i] >= 'a' && Nicks_sanlist[0][i] <= 'z') || @@ -2274,11 +2536,11 @@ void Nicks_CutMatchesAlphaNumeric(int count) if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr)) { // if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there - strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr)); + strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0])); } } -void Nicks_CutMatchesNoSpaces(int count) +static void Nicks_CutMatchesNoSpaces(int count) { // cut match 0 down to the longest possible completion int i; @@ -2286,7 +2548,7 @@ void Nicks_CutMatchesNoSpaces(int count) char tempstr[sizeof(Nicks_sanlist[0])]; char *a, *b; - c = strlen(Nicks_sanlist[0]); + c = (unsigned int)strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { if(Nicks_sanlist[0][i] != ' ') // here it's what's NOT copied @@ -2330,11 +2592,11 @@ void Nicks_CutMatchesNoSpaces(int count) if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr)) { // if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there - strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr)); + strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0])); } } -void Nicks_CutMatches(int count) +static void Nicks_CutMatches(int count) { if(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY) Nicks_CutMatchesAlphaNumeric(count); @@ -2344,7 +2606,7 @@ void Nicks_CutMatches(int count) Nicks_CutMatchesNormal(count); } -const char **Nicks_CompleteBuildList(int count) +static const char **Nicks_CompleteBuildList(int count) { const char **buf; int bpos = 0; @@ -2364,7 +2626,7 @@ const char **Nicks_CompleteBuildList(int count) Nicks_AddLastColor Restores the previous used color, after the autocompleted name. */ -int Nicks_AddLastColor(char *buffer, int pos) +static int Nicks_AddLastColor(char *buffer, int pos) { qboolean quote_added = false; int match; @@ -2441,10 +2703,10 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) len = min(size - Nicks_matchpos - 3, strlen(msg)); memcpy(&buffer[Nicks_matchpos], msg, len); if( len < (size - 7) ) // space for color (^[0-9] or ^xrgb) and space and \0 - len = Nicks_AddLastColor(buffer, Nicks_matchpos+len); + len = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len); buffer[len++] = ' '; buffer[len] = 0; - return len; + return (int)len; } else if(n > 1) { int len; @@ -2455,7 +2717,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) Nicks_CutMatches(n); msg = Nicks_sanlist[0]; - len = min(size - Nicks_matchpos, strlen(msg)); + len = (int)min(size - Nicks_matchpos, strlen(msg)); memcpy(&buffer[Nicks_matchpos], msg, len); buffer[Nicks_matchpos + len] = 0; //pos += len; @@ -2485,6 +2747,7 @@ void Con_CompleteCommandLine (void) int c, v, a, i, cmd_len, pos, k; int n; // nicks --blub const char *space, *patterns; + char vabuf[1024]; //find what we want to complete pos = key_linepos; @@ -2505,7 +2768,7 @@ void Con_CompleteCommandLine (void) { strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line))); - patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this? + patterns = Cvar_VariableString(va(vabuf, sizeof(vabuf), "con_completion_%s", command)); // TODO maybe use a better place for this? if(patterns && !*patterns) patterns = NULL; // get rid of the empty string @@ -2557,7 +2820,7 @@ void Con_CompleteCommandLine (void) stringlistinit(&resultbuf); stringlistinit(&dirbuf); - while(COM_ParseToken_Simple(&patterns, false, false)) + while(COM_ParseToken_Simple(&patterns, false, false, true)) { fssearch_t *search; if(strchr(com_token, '/')) @@ -2623,11 +2886,11 @@ void Con_CompleteCommandLine (void) } else { - stringlistsort(&resultbuf); // dirbuf is already sorted + stringlistsort(&resultbuf, true); // dirbuf is already sorted Con_Printf("\n%i possible filenames\n", resultbuf.numstrings + dirbuf.numstrings); for(i = 0; i < dirbuf.numstrings; ++i) { - Con_Printf("%s/\n", dirbuf.strings[i]); + Con_Printf("^4%s^7/\n", dirbuf.strings[i]); } for(i = 0; i < resultbuf.numstrings; ++i) { @@ -2691,7 +2954,7 @@ void Con_CompleteCommandLine (void) a = Cmd_CompleteAliasCountPossible(s); if (a) { - Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":"); + Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":"); Cmd_CompleteAliasPrint(s); } n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true); @@ -2748,7 +3011,7 @@ done: if(n) { // was a nick, might have an offset, and needs colors ;) --blub key_linepos = pos - Nicks_offset[0]; - cmd_len = strlen(Nicks_list[0]); + cmd_len = (int)strlen(Nicks_list[0]); cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos); memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);