#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_notifyalign = {CVAR_SAVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"};
-
-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)"};
+cvar_t con_notifytime = {CVAR_CLIENT | CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
+cvar_t con_notify = {CVAR_CLIENT | CVAR_SAVE, "con_notify","4", "how many notify lines to show"};
+cvar_t con_notifyalign = {CVAR_CLIENT | CVAR_SAVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"};
+
+cvar_t con_chattime = {CVAR_CLIENT | CVAR_SAVE, "con_chattime","30", "how long chat lines last, in seconds"};
+cvar_t con_chat = {CVAR_CLIENT | CVAR_SAVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"};
+cvar_t con_chatpos = {CVAR_CLIENT | 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_CLIENT | 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_CLIENT | 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_CLIENT | 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_CLIENT | CVAR_SAVE, "con_chatwidth","1.0", "relative chat window width"};
+cvar_t con_textsize = {CVAR_CLIENT | CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};
+cvar_t con_notifysize = {CVAR_CLIENT | CVAR_SAVE, "con_notifysize","8", "notify text size in virtual 2D pixels"};
+cvar_t con_chatsize = {CVAR_CLIENT | CVAR_SAVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"};
+cvar_t con_chatsound = {CVAR_CLIENT | CVAR_SAVE, "con_chatsound","1", "enables chat sound to play on message"};
+cvar_t con_chatsound_file = {CVAR_CLIENT, "con_chatsound_file","sound/misc/talk.wav", "The sound to play for chat messages"};
+cvar_t con_chatsound_team_file = {CVAR_CLIENT, "con_chatsound_team_file","sound/misc/talk2.wav", "The sound to play for team chat messages"};
+cvar_t con_chatsound_team_mask = {CVAR_CLIENT, "con_chatsound_team_mask","40","Magic ASCII code that denotes a team chat message"};
+
+cvar_t sys_specialcharactertranslation = {CVAR_CLIENT | CVAR_SERVER, "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)"};
#ifdef WIN32
-cvar_t sys_colortranslation = {0, "sys_colortranslation", "0", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+cvar_t sys_colortranslation = {CVAR_CLIENT | CVAR_SERVER, "sys_colortranslation", "0", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
#else
-cvar_t sys_colortranslation = {0, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+cvar_t sys_colortranslation = {CVAR_CLIENT | CVAR_SERVER, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
#endif
-cvar_t con_nickcompletion = {CVAR_SAVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"};
-cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11", "Bitfield: "
+cvar_t con_nickcompletion = {CVAR_CLIENT | CVAR_SAVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"};
+cvar_t con_nickcompletion_flags = {CVAR_CLIENT | CVAR_SAVE, "con_nickcompletion_flags", "11", "Bitfield: "
"0: add nothing after completion. "
"1: add the last color after completion. "
"2: add a quote when starting a quote instead of the color. "
#define NICKS_ALPHANUMERICS_ONLY 8
#define NICKS_NO_SPACES 16
-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 con_completion_playdemo = {CVAR_CLIENT | CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"};
+cvar_t con_completion_timedemo = {CVAR_CLIENT | CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"};
+cvar_t con_completion_exec = {CVAR_CLIENT | 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"};
+cvar_t condump_stripcolors = {CVAR_CLIENT | CVAR_SERVER| CVAR_SAVE, "condump_stripcolors", "0", "strip color codes from console dumps"};
int con_linewidth;
int con_vislines;
/// \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"};
+cvar_t log_file = {CVAR_CLIENT | CVAR_SERVER, "log_file", "", "filename to log messages to"};
+cvar_t log_file_stripcolors = {CVAR_CLIENT | CVAR_SERVER, "log_file_stripcolors", "0", "strip color codes from log messages"};
+cvar_t log_dest_udp = {CVAR_CLIENT | CVAR_SERVER, "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;
Con_ToggleConsole_f
================
*/
-void Con_ToggleConsole_f (void)
+void Con_ToggleConsole_f(cmd_state_t *cmd)
{
if (COM_CheckParm ("-noconsole"))
if (!(key_consoleactive & KEY_CONSOLEACTIVE_USER))
Con_MessageMode_f
================
*/
-static void Con_MessageMode_f (void)
+static void Con_MessageMode_f(cmd_state_t *cmd)
{
key_dest = key_message;
chat_mode = 0; // "say"
- if(Cmd_Argc() > 1)
+ if(Cmd_Argc(cmd) > 1)
{
- dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+ dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd));
chat_bufferlen = (unsigned int)strlen(chat_buffer);
}
}
Con_MessageMode2_f
================
*/
-static void Con_MessageMode2_f (void)
+static void Con_MessageMode2_f(cmd_state_t *cmd)
{
key_dest = key_message;
chat_mode = 1; // "say_team"
- if(Cmd_Argc() > 1)
+ if(Cmd_Argc(cmd) > 1)
{
- dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+ dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd));
chat_bufferlen = (unsigned int)strlen(chat_buffer);
}
}
Con_CommandMode_f
================
*/
-static void Con_CommandMode_f (void)
+static void Con_CommandMode_f(cmd_state_t *cmd)
{
key_dest = key_message;
- if(Cmd_Argc() > 1)
+ if(Cmd_Argc(cmd) > 1)
{
- dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+ dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd));
chat_bufferlen = (unsigned int)strlen(chat_buffer);
}
chat_mode = -1; // command
}
//[515]: the simplest command ever
-//LordHavoc: not so simple after I made it print usage...
-static void Con_Maps_f (void)
+//LadyHavoc: not so simple after I made it print usage...
+static void Con_Maps_f(cmd_state_t *cmd)
{
- if (Cmd_Argc() > 2)
+ if (Cmd_Argc(cmd) > 2)
{
Con_Printf("usage: maps [mapnameprefix]\n");
return;
}
- else if (Cmd_Argc() == 2)
- GetMapList(Cmd_Argv(1), NULL, 0);
+ else if (Cmd_Argc(cmd) == 2)
+ GetMapList(Cmd_Argv(cmd, 1), NULL, 0);
else
GetMapList("", NULL, 0);
}
-static void Con_ConDump_f (void)
+static void Con_ConDump_f(cmd_state_t *cmd)
{
int i;
qfile_t *file;
- if (Cmd_Argc() != 2)
+ if (Cmd_Argc(cmd) != 2)
{
Con_Printf("usage: condump <filename>\n");
return;
}
- file = FS_OpenRealFile(Cmd_Argv(1), "w", false);
+ file = FS_OpenRealFile(Cmd_Argv(cmd, 1), "w", false);
if (!file)
{
- Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1));
+ Con_Errorf("condump: unable to write file \"%s\"\n", Cmd_Argv(cmd, 1));
return;
}
if (con_mutex) Thread_LockMutex(con_mutex);
FS_Close(file);
}
-void Con_Clear_f (void)
+void Con_Clear_f(cmd_state_t *cmd)
{
if (con_mutex) Thread_LockMutex(con_mutex);
ConBuffer_Clear(&con);
Cvar_RegisterVariable (&con_notifytime);
Cvar_RegisterVariable (&con_textsize);
Cvar_RegisterVariable (&con_chatsound);
+ Cvar_RegisterVariable (&con_chatsound_file);
+ Cvar_RegisterVariable (&con_chatsound_team_file);
+ Cvar_RegisterVariable (&con_chatsound_team_mask);
// --blub
Cvar_RegisterVariable (&con_nickcompletion);
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");
- Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team");
- Cmd_AddCommand ("commandmode", Con_CommandMode_f, "input a console command");
- Cmd_AddCommand ("clear", Con_Clear_f, "clear console history");
- Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps");
- Cmd_AddCommand ("condump", Con_ConDump_f, "output console history to a file (see also log_file)");
+ Cmd_AddCommand(CMD_CLIENT, "toggleconsole", Con_ToggleConsole_f, "opens or closes the console");
+ Cmd_AddCommand(CMD_CLIENT, "messagemode", Con_MessageMode_f, "input a chat message to say to everyone");
+ Cmd_AddCommand(CMD_CLIENT, "messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team");
+ Cmd_AddCommand(CMD_CLIENT, "commandmode", Con_CommandMode_f, "input a console command");
+ Cmd_AddCommand(CMD_SHARED, "clear", Con_Clear_f, "clear console history");
+ Cmd_AddCommand(CMD_SHARED, "maps", Con_Maps_f, "list information about available maps");
+ Cmd_AddCommand(CMD_SHARED, "condump", Con_ConDump_f, "output console history to a file (see also log_file)");
con_initialized = true;
+ // initialize console window (only used by sys_win.c)
+ Sys_InitConsole();
+
Con_DPrint("Console initialized.\n");
}
{
if (con_chatsound.value)
{
- if(IS_NEXUIZ_DERIVED(gamemode))
- {
- if(msg[1] == '\r' && cl.foundtalk2wav)
- S_LocalSound ("sound/misc/talk2.wav");
- else
- S_LocalSound ("sound/misc/talk.wav");
- }
+ if(msg[1] == con_chatsound_team_mask.integer && cl.foundteamchatsound)
+ S_LocalSound (con_chatsound_team_file.string);
else
- {
- if (msg[1] == '(' && cl.foundtalk2wav)
- S_LocalSound ("sound/misc/talk2.wav");
- else
- S_LocalSound ("sound/misc/talk.wav");
- }
+ S_LocalSound (con_chatsound_file.string);
}
}
-
// 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++;
Con_MaskPrint(CON_MASK_PRINT, msg);
}
+/*
+================
+Con_Warn
+================
+*/
+void Con_Warn(const char *msg)
+{
+ Con_Printf("^3%s",msg);
+}
+
+/*
+================
+Con_Warnf
+================
+*/
+void Con_Warnf(const char *fmt, ...)
+{
+ va_list argptr;
+ char msg[MAX_INPUTLINE];
+
+ va_start(argptr,fmt);
+ dpvsnprintf(msg,sizeof(msg),fmt,argptr);
+ va_end(argptr);
+
+ Con_Printf("^3%s",msg);
+}
+
+/*
+================
+Con_Error
+================
+*/
+void Con_Error(const char *msg)
+{
+ Con_Printf("^1%s",msg);
+}
+
+/*
+================
+Con_Errorf
+================
+*/
+void Con_Errorf(const char *fmt, ...)
+{
+ va_list argptr;
+ char msg[MAX_INPUTLINE];
+
+ va_start(argptr,fmt);
+ dpvsnprintf(msg,sizeof(msg),fmt,argptr);
+ va_end(argptr);
+
+ Con_Printf("^1%s",msg);
+
+}
+
/*
================
Con_DPrint
Modified by EvilTypeGuy eviltypeguy@qeradiant.com
================
*/
-extern cvar_t r_font_disable_freetype;
static void Con_DrawInput (void)
{
int y;
int i;
- char editlinecopy[MAX_INPUTLINE+1], *text;
+ 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);
- // append enoug nul-bytes to cover the utf8-versions of the cursor too
- for (i = y; i < y + 4 && i < (int)sizeof(editlinecopy); ++i)
- text[i] = 0;
-
- // add the cursor frame
- if (r_font_disable_freetype.integer)
+ // make the color code visible when the cursor is inside it
+ if(text[key_linepos] != 0)
{
- // this code is freetype incompatible!
- if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible
- {
- if (!utf8_enable.integer)
- text[key_linepos] = 11 + 130 * key_insert; // either solid or triangle facing right
- else if (y + 3 < (int)sizeof(editlinecopy)-1)
+ for(i=1; i < 5 && key_linepos - i > 0; ++i)
+ if(text[key_linepos-i] == STRING_COLOR_TAG)
{
- int ofs = (int)u8_bytelen(text + key_linepos, 1);
- size_t len;
- const char *curbuf;
- char charbuf16[16];
- curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16);
-
- if (curbuf)
+ 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))
{
- memmove(text + key_linepos + len, text + key_linepos + ofs, sizeof(editlinecopy) - key_linepos - len);
- memcpy(text + key_linepos, curbuf, len);
+ 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;
+ }
}
- } else
- text[key_linepos] = '-' + ('+' - '-') * key_insert;
- }
+ break;
+ }
}
-// text[key_linepos + 1] = 0;
-
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);
// draw it
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 );
- // add a cursor on top of this (when using freetype)
- if (!r_font_disable_freetype.integer)
+ // draw a cursor on top of this
+ if ((int)(host.realtime*con_cursorspeed) & 1) // cursor is visible
{
- if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible
+ if (!utf8_enable.integer)
{
- 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);
+ 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);
}
-
- // remove cursor
-// key_line[key_linepos] = 0;
}
typedef struct
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 = (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;
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, (utf8_enable.integer ? "^3\xee\x80\x8c\xee\x80\x8c\xee\x80\x8c " : "^3\014\014\014 ")); // 015 is ยท> character in conchars.tga
+ 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)
int colorindex = -1;
const char *cursor;
char charbuf16[16];
- cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL, charbuf16);
+ cursor = u8_encodech(0xE00A + ((int)(host.realtime * con_cursorspeed)&1), NULL, charbuf16);
- // LordHavoc: speedup, and other improvements
+ // LadyHavoc: speedup, and other improvements
if (chat_mode < 0)
dpsnprintf(temptext, sizeof(temptext), "]%s%s", chat_buffer, cursor);
else if(chat_mode)
{
float width = vid_conwidth.value;
con_text_info_t ti;
- con_lineinfo_t *li = &CON_LINES(lineno);
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);
int mask_must = 0;
int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER;
cachepic_t *conbackpic;
+ unsigned int conbackflags;
if (lines <= 0)
return;
{
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;
+ conbackflags = CACHEPICFLAG_FAILONMISSING; // So console is readable when game content is missing
+ if (sx != 0 || sy != 0)
+ conbackflags &= CACHEPICFLAG_NOCLAMP;
+ conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", conbackflags) : NULL;
+ sx *= host.realtime; sy *= host.realtime;
sx -= floor(sx); sy -= floor(sy);
- if (conbackpic && conbackpic->tex != r_texture_notexture)
+ 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,
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 *= host.realtime; sy *= host.realtime;
sx -= floor(sx); sy -= floor(sy);
- if(conbackpic && conbackpic->tex != r_texture_notexture)
+ 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,
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 *= host.realtime; sy *= host.realtime;
sx -= floor(sx); sy -= floor(sy);
- if(conbackpic && conbackpic->tex != r_texture_notexture)
+ 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,
its format (q1/q2/q3/hl) and even its message
*/
//[515]: here is an ugly hack.. two gotos... oh my... *but it works*
-//LordHavoc: rewrote bsp type detection, rewrote message extraction to do proper worldspawn parsing
-//LordHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto
-//LordHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups...
+//LadyHavoc: rewrote bsp type detection, rewrote message extraction to do proper worldspawn parsing
+//LadyHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto
+//LadyHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups...
qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength)
{
fssearch_t *t;
*/
static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
{
- char name[128];
+ char name[MAX_SCOREBOARDNAME];
int i, p;
int match;
int spos;
msg = Nicks_list[0];
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
+ if(len < size - 7) // space for color code (^[0-9] or ^xrgb), space and \0
len = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len);
buffer[len++] = ' ';
buffer[len] = 0;
Enhanced to tab-complete map names by [515]
*/
-void Con_CompleteCommandLine (void)
+void Con_CompleteCommandLine (cmd_state_t *cmd)
{
- const char *cmd = "";
+ const char *text = "";
char *s;
const char **list[4] = {0, 0, 0, 0};
char s2[512];
{
strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line)));
- patterns = Cvar_VariableString(va(vabuf, sizeof(vabuf), "con_completion_%s", command)); // TODO maybe use a better place for this?
+ patterns = Cvar_VariableString(cmd->cvars, va(vabuf, sizeof(vabuf), "con_completion_%s", command), CVAR_CLIENT | CVAR_SERVER); // TODO maybe use a better place for this?
if(patterns && !*patterns)
patterns = NULL; // get rid of the empty string
}
// Count number of possible matches and print them
- c = Cmd_CompleteCountPossible(s);
+ c = Cmd_CompleteCountPossible(cmd, s);
if (c)
{
Con_Printf("\n%i possible command%s\n", c, (c > 1) ? "s: " : ":");
- Cmd_CompleteCommandPrint(s);
+ Cmd_CompleteCommandPrint(cmd, s);
}
- v = Cvar_CompleteCountPossible(s);
+ v = Cvar_CompleteCountPossible(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER);
if (v)
{
Con_Printf("\n%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
- Cvar_CompleteCvarPrint(s);
+ Cvar_CompleteCvarPrint(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER);
}
- a = Cmd_CompleteAliasCountPossible(s);
+ a = Cmd_CompleteAliasCountPossible(cmd, s);
if (a)
{
Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":");
- Cmd_CompleteAliasPrint(s);
+ Cmd_CompleteAliasPrint(cmd, s);
}
n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true);
if (n)
}
if (c)
- cmd = *(list[0] = Cmd_CompleteBuildList(s));
+ text = *(list[0] = Cmd_CompleteBuildList(cmd, s));
if (v)
- cmd = *(list[1] = Cvar_CompleteBuildList(s));
+ text = *(list[1] = Cvar_CompleteBuildList(cmd->cvars, s, cmd->cvars_flagsmask));
if (a)
- cmd = *(list[2] = Cmd_CompleteAliasBuildList(s));
+ text = *(list[2] = Cmd_CompleteAliasBuildList(cmd, s));
if (n)
- cmd = *(list[3] = Nicks_CompleteBuildList(n));
+ text = *(list[3] = Nicks_CompleteBuildList(n));
for (cmd_len = (int)strlen(s);;cmd_len++)
{
for (i = 0; i < 3; i++)
if (list[i])
for (l = list[i];*l;l++)
- if ((*l)[cmd_len] != cmd[cmd_len])
+ if ((*l)[cmd_len] != text[cmd_len])
goto done;
// all possible matches share this character, so we continue...
- if (!cmd[cmd_len])
+ if (!text[cmd_len])
{
// if all matches ended at the same position, stop
// (this means there is only one match)
// prevent a buffer overrun by limiting cmd_len according to remaining space
cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos);
- if (cmd)
+ if (text)
{
key_linepos = pos;
- memcpy(&key_line[key_linepos], cmd, cmd_len);
+ memcpy(&key_line[key_linepos], text, 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_line) - 1)
memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);
key_linepos += cmd_len;
- if(key_linepos < (int)(sizeof(key_line)-4)) // space for ^, X and space and \0
+ if(key_linepos < (int)(sizeof(key_line) - 7)) // space for color code (^[0-9] or ^xrgb), space and \0
key_linepos = Nicks_AddLastColor(key_line, key_linepos);
}
key_line[key_linepos++] = ' ';
projects / xonotic / darkplaces.git / blobdiff