*/
// console.c
-#include "quakedef.h"
-
#if !defined(WIN32) || defined(__MINGW32__)
# include <unistd.h>
#endif
#include <time.h>
-float con_cursorspeed = 4;
+#include "quakedef.h"
+#include "thread.h"
+
+// for u8_encodech
+#include "ft2.h"
-#define CON_TEXTSIZE 131072
-#define CON_MAXLINES 4096
+float con_cursorspeed = 4;
// lines up from bottom to display
int con_backscroll;
-// console buffer
-char con_text[CON_TEXTSIZE];
-
-#define CON_MASK_HIDENOTIFY 128
-#define CON_MASK_CHAT 1
-
-typedef struct
-{
- char *start;
- int len;
-
- double addtime;
- int mask;
-
- int height; // recalculated line height when needed (-1 to unset)
-}
-con_lineinfo;
-con_lineinfo con_lines[CON_MAXLINES];
+conbuffer_t con;
+void *con_mutex = NULL;
-int con_lines_first; // cyclic buffer
-int con_lines_count;
-#define CON_LINES_IDX(i) ((con_lines_first + (i)) % CON_MAXLINES)
-#define CON_LINES_LAST CON_LINES_IDX(con_lines_count - 1)
-#define CON_LINES(i) con_lines[CON_LINES_IDX(i)]
-#define CON_LINES_PRED(i) (((i) + CON_MAXLINES - 1) % CON_MAXLINES)
-#define CON_LINES_SUCC(i) (((i) + 1) % CON_MAXLINES)
+#define CON_LINES(i) CONBUFFER_LINES(&con, i)
+#define CON_LINES_LAST CONBUFFER_LINES_LAST(&con)
+#define CON_LINES_COUNT CONBUFFER_LINES_COUNT(&con)
cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show"};
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"};
cvar_t con_chatsize = {CVAR_SAVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"};
+cvar_t con_chatsound = {CVAR_SAVE, "con_chatsound","1", "enables chat sound to play on message"};
cvar_t sys_specialcharactertranslation = {0, "sys_specialcharactertranslation", "1", "terminal console conchars to ASCII translation (set to 0 if your conchars.tga is for an 8bit character set or if you want raw output)"};
#define NICKS_ALPHANUMERICS_ONLY 8
#define NICKS_NO_SPACES 16
-cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem"};
-cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem"};
-cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg"};
+cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"};
+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;
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
+
+void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mempool)
+{
+ buf->active = true;
+ buf->textsize = textsize;
+ buf->text = (char *) Mem_Alloc(mempool, textsize);
+ buf->maxlines = maxlines;
+ buf->lines = (con_lineinfo_t *) Mem_Alloc(mempool, maxlines * sizeof(*buf->lines));
+ buf->lines_first = 0;
+ 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
+================
+*/
+void ConBuffer_Clear (conbuffer_t *buf)
+{
+ buf->lines_count = 0;
+}
+
+/*
+================
+ConBuffer_Shutdown
+================
+*/
+void ConBuffer_Shutdown(conbuffer_t *buf)
+{
+ buf->active = false;
+ if (buf->text)
+ Mem_Free(buf->text);
+ if (buf->lines)
+ Mem_Free(buf->lines);
+ buf->text = NULL;
+ buf->lines = NULL;
+}
+
+/*
+================
+ConBuffer_FixTimes
+
+Notifies the console code about the current time
+(and shifts back times of other entries when the time
+went backwards)
+================
+*/
+void ConBuffer_FixTimes(conbuffer_t *buf)
+{
+ int i;
+ if(buf->lines_count >= 1)
+ {
+ double diff = cl.time - CONBUFFER_LINES_LAST(buf).addtime;
+ if(diff < 0)
+ {
+ for(i = 0; i < buf->lines_count; ++i)
+ CONBUFFER_LINES(buf, i).addtime += diff;
+ }
+ }
+}
+
+/*
+================
+ConBuffer_DeleteLine
+
+Deletes the first line from the console history.
+================
+*/
+void ConBuffer_DeleteLine(conbuffer_t *buf)
+{
+ if(buf->lines_count == 0)
+ return;
+ --buf->lines_count;
+ buf->lines_first = (buf->lines_first + 1) % buf->maxlines;
+}
+
+/*
+================
+ConBuffer_DeleteLastLine
+
+Deletes the last line from the console history.
+================
+*/
+void ConBuffer_DeleteLastLine(conbuffer_t *buf)
+{
+ if(buf->lines_count == 0)
+ return;
+ --buf->lines_count;
+}
+
+/*
+================
+ConBuffer_BytesLeft
+
+Checks if there is space for a line of the given length, and if yes, returns a
+pointer to the start of such a space, and NULL otherwise.
+================
+*/
+static char *ConBuffer_BytesLeft(conbuffer_t *buf, int len)
+{
+ if(len > buf->textsize)
+ return NULL;
+ if(buf->lines_count == 0)
+ return buf->text;
+ else
+ {
+ char *firstline_start = buf->lines[buf->lines_first].start;
+ char *lastline_onepastend = CONBUFFER_LINES_LAST(buf).start + CONBUFFER_LINES_LAST(buf).len;
+ // the buffer is cyclic, so we first have two cases...
+ if(firstline_start < lastline_onepastend) // buffer is contiguous
+ {
+ // put at end?
+ if(len <= buf->text + buf->textsize - lastline_onepastend)
+ return lastline_onepastend;
+ // put at beginning?
+ else if(len <= firstline_start - buf->text)
+ return buf->text;
+ else
+ return NULL;
+ }
+ else // buffer has a contiguous hole
+ {
+ if(len <= firstline_start - lastline_onepastend)
+ return lastline_onepastend;
+ else
+ return NULL;
+ }
+ }
+}
+
+/*
+================
+ConBuffer_AddLine
+Appends a given string as a new line to the console.
+================
+*/
+void ConBuffer_AddLine(conbuffer_t *buf, const char *line, int len, int mask)
+{
+ char *putpos;
+ con_lineinfo_t *p;
+
+ // developer_memory 1 during shutdown prints while conbuffer_t is being freed
+ if (!buf->active)
+ return;
+
+ ConBuffer_FixTimes(buf);
+
+ if(len >= buf->textsize)
+ {
+ // line too large?
+ // only display end of line.
+ line += len - buf->textsize + 1;
+ len = buf->textsize - 1;
+ }
+ while(!(putpos = ConBuffer_BytesLeft(buf, len + 1)) || buf->lines_count >= buf->maxlines)
+ ConBuffer_DeleteLine(buf);
+ memcpy(putpos, line, len);
+ putpos[len] = 0;
+ ++buf->lines_count;
+
+ //fprintf(stderr, "Now have %d lines (%d -> %d).\n", buf->lines_count, buf->lines_first, CON_LINES_LAST);
+
+ p = &CONBUFFER_LINES_LAST(buf);
+ p->start = putpos;
+ p->len = len;
+ p->addtime = cl.time;
+ p->mask = mask;
+ p->height = -1; // calculate when needed
+}
+
+int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start)
+{
+ int i;
+ if(start == -1)
+ start = buf->lines_count;
+ for(i = start - 1; i >= 0; --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]; // 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);
+ return copybuf;
+}
/*
==============================================================================
==============================================================================
*/
-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"};
+/// \name Logging
+//@{
+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;
-qboolean log_dest_buffer_appending;
+unsigned int log_dest_buffer_appending;
char crt_log_file [MAX_OSPATH] = "";
qfile_t* logfile = NULL;
size_t logq_size = 0;
void Log_ConPrint (const char *msg);
-
-/*
-====================
-Log_DestBuffer_Init
-====================
-*/
-static void 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()
+static void Log_DestBuffer_Flush_NoLock(void)
{
lhnetaddress_t log_dest_addr;
lhnetsocket_t *log_dest_socket;
/*
====================
-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;
return timestamp;
}
-
-/*
-====================
-Log_Open
-====================
-*/
-void Log_Open (void)
+static void Log_Open (void)
{
if (logfile != NULL || log_file.string[0] == '\0')
return;
}
}
-
/*
====================
Log_Close
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;
}
}
}
+
/*
================
Log_ConPrint
// 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;
}
*/
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();
}
-/*
-================
-Con_Clear_f
-================
-*/
-void Con_Clear_f (void)
-{
- con_lines_count = 0;
-}
-
-
/*
================
Con_ClearNotify
-
-Clear all notify lines.
================
*/
void Con_ClearNotify (void)
{
int i;
- for(i = 0; i < con_lines_count; ++i)
- CON_LINES(i).mask |= CON_MASK_HIDENOTIFY;
+ for(i = 0; i < CON_LINES_COUNT; ++i)
+ if(!(CON_LINES(i).mask & CON_MASK_CHAT))
+ CON_LINES(i).mask |= CON_MASK_HIDENOTIFY;
}
Con_MessageMode_f
================
*/
-void Con_MessageMode_f (void)
+static void Con_MessageMode_f (void)
{
key_dest = key_message;
chat_mode = 0; // "say"
+ if(Cmd_Argc() > 1)
+ {
+ dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+ chat_bufferlen = (unsigned int)strlen(chat_buffer);
+ }
}
Con_MessageMode2_f
================
*/
-void Con_MessageMode2_f (void)
+static void Con_MessageMode2_f (void)
{
key_dest = key_message;
chat_mode = 1; // "say_team"
+ if(Cmd_Argc() > 1)
+ {
+ dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+ chat_bufferlen = (unsigned int)strlen(chat_buffer);
+ }
}
/*
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
}
/*
================
Con_CheckResize
-
-If the line width has changed, reformat the buffer.
================
*/
void Con_CheckResize (void)
if(f != con_textsize.value)
Cvar_SetValueQuick(&con_textsize, f);
width = (int)floor(vid_conwidth.value / con_textsize.value);
- width = bound(1, width, CON_TEXTSIZE/4);
+ width = bound(1, width, con.textsize/4);
+ // FIXME uses con in a non abstracted way
if (width == con_linewidth)
return;
con_linewidth = width;
- for(i = 0; i < con_lines_count; ++i)
+ for(i = 0; i < CON_LINES_COUNT; ++i)
CON_LINES(i).height = -1; // recalculate when next needed
Con_ClearNotify();
GetMapList("", NULL, 0);
}
-void Con_ConDump_f (void)
+static void Con_ConDump_f (void)
{
int i;
qfile_t *file;
Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1));
return;
}
- for(i = 0; i < con_lines_count; ++i)
+ 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);
+}
+
/*
================
Con_Init
void Con_Init (void)
{
con_linewidth = 80;
- con_lines_first = 0;
- con_lines_count = 0;
+ 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;
Cvar_RegisterVariable (&sys_specialcharactertranslation);
Cvar_RegisterVariable (&log_file);
+ Cvar_RegisterVariable (&log_file_stripcolors);
Cvar_RegisterVariable (&log_dest_udp);
// support for the classic Quake option
// 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);
Cvar_RegisterVariable (&con_notifysize);
Cvar_RegisterVariable (&con_notifytime);
Cvar_RegisterVariable (&con_textsize);
+ Cvar_RegisterVariable (&con_chatsound);
// --blub
Cvar_RegisterVariable (&con_nickcompletion);
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");
con_initialized = true;
Con_DPrint("Console initialized.\n");
}
-
-
-/*
-================
-Con_DeleteLine
-
-Deletes the first line from the console history.
-================
-*/
-void Con_DeleteLine()
-{
- if(con_lines_count == 0)
- return;
- --con_lines_count;
- con_lines_first = CON_LINES_IDX(1);
-}
-
-/*
-================
-Con_DeleteLastLine
-
-Deletes the last line from the console history.
-================
-*/
-void Con_DeleteLastLine()
-{
- if(con_lines_count == 0)
- return;
- --con_lines_count;
-}
-
-/*
-================
-Con_BytesLeft
-
-Checks if there is space for a line of the given length, and if yes, returns a
-pointer to the start of such a space, and NULL otherwise.
-================
-*/
-char *Con_BytesLeft(int len)
-{
- if(len > CON_TEXTSIZE)
- return NULL;
- if(con_lines_count == 0)
- return con_text;
- else
- {
- char *firstline_start = con_lines[con_lines_first].start;
- char *lastline_onepastend = con_lines[CON_LINES_LAST].start + con_lines[CON_LINES_LAST].len;
- // the buffer is cyclic, so we first have two cases...
- if(firstline_start < lastline_onepastend) // buffer is contiguous
- {
- // put at end?
- if(len <= con_text + CON_TEXTSIZE - lastline_onepastend)
- return lastline_onepastend;
- // put at beginning?
- else if(len <= firstline_start - con_text)
- return con_text;
- else
- return NULL;
- }
- else // buffer has a contiguous hole
- {
- if(len <= firstline_start - lastline_onepastend)
- return lastline_onepastend;
- else
- return NULL;
- }
- }
-}
-
-/*
-================
-Con_FixTimes
-
-Notifies the console code about the current time
-(and shifts back times of other entries when the time
-went backwards)
-================
-*/
-void Con_FixTimes()
-{
- int i;
- if(con_lines_count >= 1)
- {
- double diff = cl.time - (con_lines + CON_LINES_LAST)->addtime;
- if(diff < 0)
- {
- for(i = 0; i < con_lines_count; ++i)
- CON_LINES(i).addtime += diff;
- }
- }
-}
-
-/*
-================
-Con_AddLine
-
-Appends a given string as a new line to the console.
-================
-*/
-void Con_AddLine(const char *line, int len, int mask)
-{
- char *putpos;
- con_lineinfo *p;
-
- Con_FixTimes();
-
- if(len >= CON_TEXTSIZE)
- {
- // line too large?
- // only display end of line.
- line += len - CON_TEXTSIZE + 1;
- len = CON_TEXTSIZE - 1;
- }
- while(!(putpos = Con_BytesLeft(len + 1)) || con_lines_count >= CON_MAXLINES)
- Con_DeleteLine();
- memcpy(putpos, line, len);
- putpos[len] = 0;
- ++con_lines_count;
-
- //fprintf(stderr, "Now have %d lines (%d -> %d).\n", con_lines_count, con_lines_first, CON_LINES_LAST);
-
- p = con_lines + CON_LINES_LAST;
- p->start = putpos;
- p->len = len;
- p->addtime = cl.time;
- p->mask = mask;
- p->height = -1; // calculate when needed
+
+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;
}
/*
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
+ return;
+
for(; *txt; ++txt)
{
if(cr_pending)
{
- Con_DeleteLastLine();
+ ConBuffer_DeleteLastLine(&con);
cr_pending = 0;
}
switch(*txt)
case 0:
break;
case '\r':
- Con_AddLine(buf, bufpos, mask);
+ ConBuffer_AddLine(&con, buf, bufpos, mask);
bufpos = 0;
cr_pending = 1;
break;
case '\n':
- Con_AddLine(buf, bufpos, mask);
+ ConBuffer_AddLine(&con, buf, bufpos, mask);
bufpos = 0;
break;
default:
buf[bufpos++] = *txt;
- if(bufpos >= CON_TEXTSIZE - 1)
+ if(bufpos >= con.textsize - 1) // FIXME uses a non-abstracted property of con
{
- Con_AddLine(buf, bufpos, mask);
+ ConBuffer_AddLine(&con, buf, bufpos, mask);
bufpos = 0;
}
break;
}
}
-/* 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()
+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 Con_Rcon_Redirect_End(void)
{
Con_Rcon_Redirect_Flush();
rcon_redirect_dest = NULL;
rcon_redirect_sock = NULL;
}
-void Con_Rcon_Redirect_Abort()
+void Con_Rcon_Redirect_Abort(void)
{
rcon_redirect_dest = NULL;
rcon_redirect_sock = NULL;
/*
================
Con_Rcon_AddChar
-
-Adds a character to the rcon buffer
================
*/
-void Con_Rcon_AddChar(char c)
+/// Adds a character to the rcon buffer.
+static void Con_Rcon_AddChar(int c)
{
if(log_dest_buffer_appending)
return;
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;
/*
================
-Con_Print
-
-Prints to all appropriate console targets, and adds timestamps
+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);
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(gamemode == GAME_NEXUIZ)
- {
- if(msg[1] == '\r' && cl.foundtalk2wav)
- S_LocalSound ("sound/misc/talk2.wav");
- else
- S_LocalSound ("sound/misc/talk.wav");
- }
- else
+ if (con_chatsound.value)
{
- if (msg[1] == '(' && cl.foundtalk2wav)
- S_LocalSound ("sound/misc/talk2.wav");
+ if(IS_NEXUIZ_DERIVED(gamemode))
+ {
+ if(msg[1] == '\r' && cl.foundtalk2wav)
+ S_LocalSound ("sound/misc/talk2.wav");
+ else
+ S_LocalSound ("sound/misc/talk.wav");
+ }
else
- S_LocalSound ("sound/misc/talk.wav");
+ {
+ if (msg[1] == '(' && cl.foundtalk2wav)
+ S_LocalSound ("sound/misc/talk2.wav");
+ else
+ 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++;
for (;*timestamp;index++, timestamp++)
if (index < (int)sizeof(line) - 2)
line[index] = *timestamp;
+ // add the mask
+ mask |= additionalmask;
}
// append the character
line[index++] = *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
int lastcolor = 0;
const char *in;
char *out;
- char color;
+ int color;
for(in = line, out = printline; *in; ++in)
{
switch(*in)
{
case STRING_COLOR_TAG:
- if( in[1] == STRING_COLOR_RGB_DEFAULT && isxdigit(in[2]) && isxdigit(in[3]) && isxdigit(in[4]) )
+ if( in[1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(in[2]) && isxdigit(in[3]) && isxdigit(in[4]) )
{
char r = tolower(in[2]);
char g = tolower(in[3]);
switch(color)
{
- /*case 'a':
- if ( isxdigit(in[2]) || in[2] == '+' || in[2] == '-' )
- {
- in+=2;
- break;
- }*/
case STRING_COLOR_TAG:
++in;
*out++ = STRING_COLOR_TAG;
case STRING_COLOR_TAG:
switch(in[1])
{
- case STRING_COLOR_RGB_DEFAULT:
+ case STRING_COLOR_RGB_TAG_CHAR:
if ( isxdigit(in[2]) && isxdigit(in[3]) && isxdigit(in[4]) )
{
in+=4;
break;
}
- /*case 'a':
- if ( isxdigit(in[2]) || in[2] == '+' || in[2] == '-' )
- {
- in+=2;
- break;
- }*/
+ *out++ = STRING_COLOR_TAG;
+ *out++ = STRING_COLOR_RGB_TAG_CHAR;
+ ++in;
+ break;
case STRING_COLOR_TAG:
++in;
*out++ = STRING_COLOR_TAG;
}
// 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_Printf
+Con_Print
+================
+*/
+void Con_Print(const char *msg)
+{
+ Con_MaskPrint(CON_MASK_PRINT, msg);
+}
-Prints to all appropriate console targets
+/*
+================
+Con_Printf
================
*/
void Con_Printf(const char *fmt, ...)
dpvsnprintf(msg,sizeof(msg),fmt,argptr);
va_end(argptr);
- Con_Print(msg);
+ Con_MaskPrint(CON_MASK_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);
+ if(developer.integer < 0) // at 0, we still add to the buffer but hide
+ return;
+
+ Con_MaskPrint(CON_MASK_DEVELOPER, msg);
}
/*
================
Con_DPrintf
-
-A Con_Printf that only shows up if the "developer" cvar is set
================
*/
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);
}
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_lines[edit_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_lines[edit_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
}
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)
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;
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;
(void) 0;
else
{
- int x = ti->x + (ti->width - width) * ti->alignment;
+ int x = (int) (ti->x + (ti->width - width) * ti->alignment);
if(isContinuation && *ti->continuationString)
- x += 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;
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;
ti.ymax = y + height;
ti.continuationString = continuationString;
- l = 0;
- Con_WordWidthFunc(&ti, NULL, &l, -1);
- l = strlen(continuationString);
- continuationWidth = 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;
- for(i = con_lines_count - 1; i >= 0; --i)
+ startidx = CON_LINES_COUNT;
+ for(i = CON_LINES_COUNT - 1; i >= 0; --i)
{
- con_lineinfo *l = &CON_LINES(i);
+ con_lineinfo_t *l = &CON_LINES(i);
int mylines;
if((l->mask & mask_must) != mask_must)
ti.y = y + alignment_y * (height - lines * fontsize) - nskip * fontsize;
// then actually draw
- for(i = startidx; i < con_lines_count; ++i)
+ for(i = startidx; i < CON_LINES_COUNT; ++i)
{
- con_lineinfo *l = &CON_LINES(i);
+ con_lineinfo_t *l = &CON_LINES(i);
if((l->mask & mask_must) != mask_must)
continue;
*/
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;
- Con_FixTimes();
+ if (con_mutex) Thread_LockMutex(con_mutex);
+ ConBuffer_FixTimes(&con);
numChatlines = con_chat.integer;
+
chatpos = con_chatpos.integer;
if (con_notify.integer < 0)
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)
{
chatstart = 0; // shut off gcc warning
}
- v = notifystart + con_notifysize.value * Con_DrawNotifyRect(0, 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)
+ {
+ x = con_chatrect_x.value * vid_conwidth.value;
+ v = con_chatrect_y.value * vid_conheight.value;
+ }
+ else
{
- v = chatstart + numChatlines * con_chatsize.value;
- Con_DrawNotifyRect(CON_MASK_CHAT, 0, 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 = 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;
- ti.fontsize = con_textsize.value;
- ti.font = FONT_CONSOLE;
-
- return COM_Wordwrap(con_lines[lineno].start, con_lines[lineno].len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL);
+ if (con_mutex) Thread_UnlockMutex(con_mutex);
}
/*
Returns the height of a given console line; calculates it if necessary.
================
*/
-int Con_LineHeight(int i)
+static int Con_LineHeight(int lineno)
{
- int h = con_lines[i].height;
- if(h != -1)
- return h;
- return con_lines[i].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;
}
/*
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((li->mask & mask_must) != mask_must)
+ return 0;
+ if((li->mask & mask_mustnot) != 0)
+ return 0;
+
ti.continuationString = "";
ti.alignment = 0;
ti.fontsize = con_textsize.value;
ti.ymax = ymax;
ti.width = width;
- return COM_Wordwrap(con_lines[lineno].start, con_lines[lineno].len, 0, width, Con_WordWidthFunc, &ti, Con_DisplayLineFunc, &ti);
+ return COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_DisplayLineFunc, &ti);
}
/*
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 ic;
+ int i;
if(con_backscroll < 0)
con_backscroll = 0;
+ *last = 0;
+
// now count until we saw con_backscroll actual lines
- for(ic = 0; ic < con_lines_count; ++ic)
+ 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 i = CON_LINES_IDX(con_lines_count - 1 - ic);
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;
}
// 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;
*limitlast = 1;
}
*/
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(con_lines_count > 0)
+#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;
+ y += (CON_LINES(last).height - limitlast) * con_textsize.value;
i = last;
for(;;)
{
- y -= Con_DrawConsoleLine(y, i, 0, ymax) * con_textsize.value;
- if(i == con_lines_first)
+ 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)
break; // top of console window
limitlast = 0;
- i = CON_LINES_PRED(i);
+ --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);
}
/*
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))
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);
for (;;)
{
int l;
- if (!COM_ParseToken_Simple(&data, false, false))
+ if (!COM_ParseToken_Simple(&data, false, false, true))
break;
if (com_token[0] == '{')
continue;
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
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<min;p++)
Con_Print("\n\n");
}
-/*
- SanitizeString strips color tags from the string in
- and writes the result on string out
-*/
-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_DEFAULT) // ^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 == 'a') // ^a found
- {
- if ( isxdigit(in[1]) || isxdigit(in[1]) == '+' || isxdigit(in[1]) == '-')
- {
- in+=2;
- if (!*in)
- {
- *out = 0;
- return;
- } else if (*in == STRING_COLOR_TAG) // ^ax^ found, don't print ^ax
- continue;
- }
- else in = 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
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)
{
}
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))
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;
if(!name[0])
continue;
- length = strlen(name);
match = -1;
spos = pos - 1; // no need for a minimum of characters :)
- while(spos >= 0 && (spos - pos) < length) // search-string-length < name length
+ while(spos >= 0)
{
if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'')
{
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;
//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)
return l;
}
-void Nicks_CutMatchesAlphaNumeric(int count)
+static void Nicks_CutMatchesAlphaNumeric(int count)
{
// cut match 0 down to the longest possible completion
int i;
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') ||
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;
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
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);
Nicks_CutMatchesNormal(count);
}
-const char **Nicks_CompleteBuildList(int count)
+static const char **Nicks_CompleteBuildList(int count)
{
const char **buf;
int bpos = 0;
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;
- char color = STRING_COLOR_DEFAULT + '0';
+ int color = STRING_COLOR_DEFAULT + '0';
char r = 0, g = 0, b = 0;
if(con_nickcompletion_flags.integer & NICKS_ADD_QUOTE && buffer[Nicks_matchpos-1] == '\"')
color = buffer[match+1];
break;
}
- else if(buffer[match+1] == STRING_COLOR_RGB_DEFAULT)
+ else if(buffer[match+1] == STRING_COLOR_RGB_TAG_CHAR)
{
if ( isxdigit(buffer[match+2]) && isxdigit(buffer[match+3]) && isxdigit(buffer[match+4]) )
+ {
r = buffer[match+2];
g = buffer[match+3];
b = buffer[match+4];
color = -1;
break;
+ }
}
}
}
if(!quote_added)
{
- if( buffer[pos-2] == STRING_COLOR_TAG && isdigit(buffer[pos-1]) ) // when thes use &4
- {
+ if( pos >= 2 && buffer[pos-2] == STRING_COLOR_TAG && isdigit(buffer[pos-1]) ) // when thes use &4
pos -= 2;
- }
- else if( pos >= 5 && buffer[pos-5] == STRING_COLOR_TAG && buffer[pos-4] == STRING_COLOR_RGB_DEFAULT)
- {
- if ( isxdigit(buffer[pos-3]) && isxdigit(buffer[pos-2]) && isxdigit(buffer[pos-1]) )
- {
- pos -= 5;
- color = -1;
- }
- }
+ else if( pos >= 5 && buffer[pos-5] == STRING_COLOR_TAG && buffer[pos-4] == STRING_COLOR_RGB_TAG_CHAR
+ && isxdigit(buffer[pos-3]) && isxdigit(buffer[pos-2]) && isxdigit(buffer[pos-1]) )
+ pos -= 5;
}
+ buffer[pos++] = STRING_COLOR_TAG;
if (color == -1)
{
- buffer[pos++] = STRING_COLOR_TAG;
- buffer[pos++] = STRING_COLOR_RGB_DEFAULT;
+ buffer[pos++] = STRING_COLOR_RGB_TAG_CHAR;
buffer[pos++] = r;
buffer[pos++] = g;
buffer[pos++] = b;
}
- /*else if (color == -2)
- {
- buffer[pos++] = STRING_COLOR_TAG;
- buffer[pos++] = 'a';
- buffer[pos++] = a;
- }*/
else
- {
- buffer[pos++] = STRING_COLOR_TAG;
buffer[pos++] = color;
- }
}
return 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;
char *msg;
- Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
+ Con_Printf("\n%i possible nicks:\n", n);
Cmd_CompleteNicksPrint(n);
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;
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;
while(--pos)
{
- k = key_lines[edit_line][pos];
+ k = key_line[pos];
if(k == '\"' || k == ';' || k == ' ' || k == '\'')
break;
}
pos++;
- s = key_lines[edit_line] + pos;
- strlcpy(s2, key_lines[edit_line] + key_linepos, sizeof(s2)); //save chars after cursor
- key_lines[edit_line][key_linepos] = 0; //hide them
+ s = key_line + pos;
+ strlcpy(s2, key_line + key_linepos, sizeof(s2)); //save chars after cursor
+ key_line[key_linepos] = 0; //hide them
- space = strchr(key_lines[edit_line] + 1, ' ');
- if(space && pos == (space - key_lines[edit_line]) + 1)
+ space = strchr(key_line + 1, ' ');
+ if(space && pos == (space - key_line) + 1)
{
- strlcpy(command, key_lines[edit_line] + 1, min(sizeof(command), (unsigned int)(space - key_lines[edit_line])));
+ 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
// and now do the actual work
*s = 0;
- strlcat(key_lines[edit_line], t, MAX_INPUTLINE);
- strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor
+ strlcat(key_line, t, MAX_INPUTLINE);
+ strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor
// and fix the cursor
- if(key_linepos > (int) strlen(key_lines[edit_line]))
- key_linepos = (int) strlen(key_lines[edit_line]);
+ if(key_linepos > (int) strlen(key_line))
+ key_linepos = (int) strlen(key_line);
}
return;
}
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, '/'))
}
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)
{
// and now do the actual work
*s = 0;
- strlcat(key_lines[edit_line], t, MAX_INPUTLINE);
- strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor
+ strlcat(key_line, t, MAX_INPUTLINE);
+ strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor
// and fix the cursor
- if(key_linepos > (int) strlen(key_lines[edit_line]))
- key_linepos = (int) strlen(key_lines[edit_line]);
+ if(key_linepos > (int) strlen(key_line))
+ key_linepos = (int) strlen(key_line);
}
stringlistfreecontents(&resultbuf);
stringlistfreecontents(&dirbuf);
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_lines[edit_line], key_linepos, s, true);
+ n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true);
if (n)
{
Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
if (!(c + v + a + n)) // No possible matches
{
if(s2[0])
- strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos);
+ strlcpy(&key_line[key_linepos], s2, sizeof(key_line) - key_linepos);
return;
}
done:
// prevent a buffer overrun by limiting cmd_len according to remaining space
- cmd_len = min(cmd_len, (int)sizeof(key_lines[edit_line]) - 1 - pos);
+ cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos);
if (cmd)
{
key_linepos = pos;
- memcpy(&key_lines[edit_line][key_linepos], cmd, cmd_len);
+ memcpy(&key_line[key_linepos], cmd, cmd_len);
key_linepos += cmd_len;
// if there is only one match, add a space after it
- if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_lines[edit_line]) - 1)
+ if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_line) - 1)
{
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 = min(cmd_len, (int)sizeof(key_lines[edit_line]) - 3 - pos);
+ cmd_len = (int)strlen(Nicks_list[0]);
+ cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos);
- memcpy(&key_lines[edit_line][key_linepos] , Nicks_list[0], cmd_len);
+ memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);
key_linepos += cmd_len;
- if(key_linepos < (int)(sizeof(key_lines[edit_line])-4)) // space for ^, X and space and \0
- key_linepos = Nicks_AddLastColor(key_lines[edit_line], key_linepos);
+ if(key_linepos < (int)(sizeof(key_line)-4)) // space for ^, X and space and \0
+ key_linepos = Nicks_AddLastColor(key_line, key_linepos);
}
- key_lines[edit_line][key_linepos++] = ' ';
+ key_line[key_linepos++] = ' ';
}
}
// use strlcat to avoid a buffer overrun
- key_lines[edit_line][key_linepos] = 0;
- strlcat(key_lines[edit_line], s2, sizeof(key_lines[edit_line]));
+ key_line[key_linepos] = 0;
+ strlcat(key_line, s2, sizeof(key_line));
// free the command, cvar, and alias lists
for (i = 0; i < 4; i++)
projects / xonotic / darkplaces.git / blobdiff