TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Scrub control codes from stdout/file, but not HUD/console

Browse source
This commit is contained in:
Kp 2013-12-22 17:18:44 +00:00
parent 6cb6faf5ce
commit 456c2d0bb0
3 changed files with 63 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/include/console.h
View file

@ -36,6 +36,7 @@ typedef struct console_buffer
} __pack__ console_buffer;
void con_init(void);
void con_puts(int level, char *str, size_t len) __attribute_nonnull();
void con_puts(int level, const char *str, size_t len) __attribute_nonnull();
template <size_t len>
static inline void con_puts_literal(int level, const char (&str)[len])

92
similar/main/console.cpp
View file

@ -50,29 +50,63 @@ void (con_printf)(int priority, const char *fmt, ...)
if (priority <= ((int)GameArg.DbgVerbose))
{
char *p1, *p2;
va_start (arglist, fmt);
vsnprintf (buffer, sizeof(buffer), fmt, arglist);
size_t len = vsnprintf (buffer, sizeof(buffer), fmt, arglist);
va_end (arglist);
con_puts(priority, buffer, len);
}
}
/* Produce a sanitised version and send it to the console */
p1 = p2 = buffer;
do
switch (*p1)
{
case CC_COLOR:
case CC_LSPACING:
p1++;
case CC_UNDERLINE:
p1++;
static void con_scrub_markup(char *buffer)
{
char *p1 = buffer, *p2 = p1;
do
switch (*p1)
{
case CC_COLOR:
case CC_LSPACING:
if (!*p1++)
break;
default:
*p2++ = *p1++;
}
while (*p1);
*p2 = 0;
con_puts(priority, buffer, p2 - buffer);
case CC_UNDERLINE:
p1++;
break;
default:
*p2++ = *p1++;
}
while (*p1);
*p2 = 0;
}
static void con_print_file(const char *buffer)
{
/* Print output to stdout */
puts(buffer);
/* Print output to gamelog.txt */
if (gamelog_fp)
{
struct tm *lt;
time_t t;
t=time(NULL);
lt=localtime(&t);
PHYSFSX_printf(gamelog_fp,"%02i:%02i:%02i ",lt->tm_hour,lt->tm_min,lt->tm_sec);
#ifdef _WIN32 // stupid hack to force DOS-style newlines
#define DXX_LF "\r\n"
#else
#define DXX_LF "\n"
#endif
PHYSFSX_printf(gamelog_fp,"%s" DXX_LF,buffer);
}
}
void con_puts(int priority, char *buffer, size_t len)
{
if (priority <= ((int)GameArg.DbgVerbose))
{
con_add_buffer_line(priority, buffer, len);
con_scrub_markup(buffer);
/* Produce a sanitised version and send it to the console */
con_print_file(buffer);
}
}
@ -82,25 +116,7 @@ void con_puts(int priority, const char *buffer, size_t len)
{
/* add given string to con_buffer */
con_add_buffer_line(priority, buffer, len);
/* Print output to stdout */
puts(buffer);
/* Print output to gamelog.txt */
if (gamelog_fp)
{
struct tm *lt;
time_t t;
t=time(NULL);
lt=localtime(&t);
PHYSFSX_printf(gamelog_fp,"%02i:%02i:%02i ",lt->tm_hour,lt->tm_min,lt->tm_sec);
#ifdef _WIN32 // stupid hack to force DOS-style newlines
#define DXX_LF "\r\n"
#else
#define DXX_LF "\n"
#endif
PHYSFSX_printf(gamelog_fp,"%s" DXX_LF,buffer);
}
con_print_file(buffer);
}
}

11
similar/main/hud.cpp
View file

@ -139,7 +139,10 @@ int HUD_init_message_va(int class_flag, const char * format, va_list args)
#else
vsprintf(message, format, args);
#endif
return HUD_init_message_literal_worth_showing(class_flag, message);
int r = HUD_init_message_literal_worth_showing(class_flag, message);
if (r)
con_puts(CON_HUD, message);
return r;
}
@ -192,7 +195,6 @@ static int HUD_init_message_literal_worth_showing(int class_flag, const char *me
if (HUD_color == -1)
HUD_color = BM_XRGB(0,28,0);
con_puts(CON_HUD, message);
if (Newdemo_state == ND_STATE_RECORDING )
newdemo_record_hud_message( message );
@ -216,7 +218,10 @@ int HUD_init_message_literal(int class_flag, const char *str)
{
if (!is_worth_showing(class_flag))
return 0;
return HUD_init_message_literal_worth_showing(class_flag, str);
int r = HUD_init_message_literal_worth_showing(class_flag, str);
if (r)
con_puts(CON_HUD, str);
return r;
}
void player_dead_message(void)