Browse Source

Persistent console history

pull/2/head
mittorn 6 years ago
parent
commit
b0c077ccf8
  1. 1
      engine/client/cl_main.c
  2. 1
      engine/client/client.h
  3. 62
      engine/client/console.c

1
engine/client/cl_main.c

@ -2836,6 +2836,7 @@ void CL_Init( void )
MSG_Init( &cls.datagram, "cls.datagram", cls.datagram_buf, sizeof( cls.datagram_buf )); MSG_Init( &cls.datagram, "cls.datagram", cls.datagram_buf, sizeof( cls.datagram_buf ));
IN_TouchInit(); IN_TouchInit();
Con_LoadHistory();
if( !CL_LoadProgs( va( "%s/%s", GI->dll_path, SI.clientlib))) if( !CL_LoadProgs( va( "%s/%s", GI->dll_path, SI.clientlib)))
Host_Error( "can't initialize %s: %s\n", SI.clientlib, COM_GetLibraryError() ); Host_Error( "can't initialize %s: %s\n", SI.clientlib, COM_GetLibraryError() );

1
engine/client/client.h

@ -1051,6 +1051,7 @@ void Con_Bottom( void );
void Con_Top( void ); void Con_Top( void );
void Con_PageDown( int lines ); void Con_PageDown( int lines );
void Con_PageUp( int lines ); void Con_PageUp( int lines );
void Con_LoadHistory( void );
// //
// s_main.c // s_main.c

62
engine/client/console.c

@ -1068,6 +1068,61 @@ int Con_DrawString( int x, int y, const char *string, rgba_t setColor )
return Con_DrawGenericString( x, y, string, setColor, false, -1 ); return Con_DrawGenericString( x, y, string, setColor, false, -1 );
} }
void Con_LoadHistory( void )
{
const char *aFile = FS_LoadFile( "console_history.txt", NULL, true );
const char *pLine = aFile, *pFile = aFile;
int i;
if( !aFile )
return;
while( true )
{
if( !*pFile )
break;
if( *pFile == '\n')
{
int len = pFile - pLine + 1;
if( len > 255 ) len = 255;
Con_ClearField( &con.historyLines[con.nextHistoryLine] );
field_t *f = &con.historyLines[con.nextHistoryLine % CON_HISTORY];
f->widthInChars = con.linewidth;
f->cursor = len - 1;
Q_strncpy( f->buffer, pLine, len);
con.nextHistoryLine++;
pLine = pFile + 1;
}
pFile++;
}
for( i = con.nextHistoryLine; i < CON_HISTORY; i++ )
{
Con_ClearField( &con.historyLines[i] );
con.historyLines[i].widthInChars = con.linewidth;
}
con.historyLine = con.nextHistoryLine;
}
void Con_SaveHistory( void )
{
int historyStart = con.nextHistoryLine - CON_HISTORY;
int i;
file_t *f;
if( historyStart < 0 )
historyStart = 0;
f = FS_Open("console_history.txt", "w", true );
for( i = historyStart; i < con.nextHistoryLine; i++ )
FS_Printf( f, "%s\n", con.historyLines[i % CON_HISTORY].buffer );
FS_Close(f);
}
/* /*
================ ================
Con_Init Con_Init
@ -1104,12 +1159,6 @@ void Con_Init( void )
Con_ClearField( &con.chat ); Con_ClearField( &con.chat );
con.chat.widthInChars = con.linewidth; con.chat.widthInChars = con.linewidth;
for( i = 0; i < CON_HISTORY; i++ )
{
Con_ClearField( &con.historyLines[i] );
con.historyLines[i].widthInChars = con.linewidth;
}
Cmd_AddCommand( "toggleconsole", Con_ToggleConsole_f, "opens or closes the console" ); Cmd_AddCommand( "toggleconsole", Con_ToggleConsole_f, "opens or closes the console" );
Cmd_AddCommand( "con_color", Con_SetColor_f, "set a custom console color" ); Cmd_AddCommand( "con_color", Con_SetColor_f, "set a custom console color" );
Cmd_AddCommand( "clear", Con_Clear_f, "clear console history" ); Cmd_AddCommand( "clear", Con_Clear_f, "clear console history" );
@ -1138,6 +1187,7 @@ void Con_Shutdown( void )
con.buffer = NULL; con.buffer = NULL;
con.lines = NULL; con.lines = NULL;
Con_SaveHistory();
} }
/* /*

Loading…
Cancel
Save