okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Move command argument completion from being hard coded to being associated

Browse source 
with the individual commands to be completed
This commit is contained in:
Tim Angus 2008-09-16 21:05:22 +00:00
parent 47ee177430
commit 130c0c6575
8 changed files with 195 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
code/client/cl_console.c
View file

@ -302,6 +302,17 @@ void Con_CheckResize (void)
con.display = con.current;
}
/*
==================
Cmd_CompleteTxtName
==================
*/
void Cmd_CompleteTxtName( char *args, int argNum ) {
if( argNum == 2 ) {
Field_CompleteFilename( "", "txt", qfalse );
}
}
/*
================
@ -329,6 +340,7 @@ void Con_Init (void) {
Cmd_AddCommand ("messagemode4", Con_MessageMode4_f);
Cmd_AddCommand ("clear", Con_Clear_f);
Cmd_AddCommand ("condump", Con_Dump_f);
Cmd_SetCommandCompletionFunc( "condump", Cmd_CompleteTxtName );
}

46
code/client/cl_keys.c
View file

@ -1057,6 +1057,50 @@ void Key_KeynameCompletion( void(*callback)(const char *s) ) {
callback( keynames[ i ].name );
}
/*
====================
Key_CompleteUnbind
====================
*/
static void Key_CompleteUnbind( char *args, int argNum )
{
if( argNum == 2 )
{
// Skip "unbind "
char *p = Com_SkipTokens( args, 1, " " );
if( p > args )
Field_CompleteKeyname( );
}
}
/*
====================
Key_CompleteBind
====================
*/
static void Key_CompleteBind( char *args, int argNum )
{
char *p;
if( argNum == 2 )
{
// Skip "bind "
p = Com_SkipTokens( args, 1, " " );
if( p > args )
Field_CompleteKeyname( );
}
else if( argNum >= 3 )
{
// Skip "bind <key> "
p = Com_SkipTokens( args, 2, " " );
if( p > args )
Field_CompleteCommand( p, qtrue, qtrue );
}
}
/*
===================
CL_InitKeyCommands
@ -1065,7 +1109,9 @@ CL_InitKeyCommands
void CL_InitKeyCommands( void ) {
// register our functions
Cmd_AddCommand ("bind",Key_Bind_f);
Cmd_SetCommandCompletionFunc( "bind", Key_CompleteBind );
Cmd_AddCommand ("unbind",Key_Unbind_f);
Cmd_SetCommandCompletionFunc( "unbind", Key_CompleteUnbind );
Cmd_AddCommand ("unbindall",Key_Unbindall_f);
Cmd_AddCommand ("bindlist",Key_Bindlist_f);
}

35
code/client/cl_main.c
View file

@ -870,6 +870,22 @@ static void CL_WalkDemoExt(char *arg, char *name, int *demofile)
}
}
/*
====================
CL_CompleteDemoName
====================
*/
static void CL_CompleteDemoName( char *args, int argNum )
{
if( argNum == 2 )
{
char demoExt[ 16 ];
Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d", PROTOCOL_VERSION );
Field_CompleteFilename( "demos", demoExt, qtrue );
}
}
/*
====================
CL_PlayDemo_f
@ -1565,6 +1581,23 @@ void CL_Connect_f( void ) {
#define MAX_RCON_MESSAGE 1024
/*
==================
CL_CompleteRcon
==================
*/
static void CL_CompleteRcon( char *args, int argNum )
{
if( argNum == 2 )
{
// Skip "rcon "
char *p = Com_SkipTokens( args, 1, " " );
if( p > args )
Field_CompleteCommand( p, qtrue, qtrue );
}
}
/*
=====================
CL_Rcon_f
@ -3150,6 +3183,7 @@ void CL_Init( void ) {
Cmd_AddCommand ("disconnect", CL_Disconnect_f);
Cmd_AddCommand ("record", CL_Record_f);
Cmd_AddCommand ("demo", CL_PlayDemo_f);
Cmd_SetCommandCompletionFunc( "demo", CL_CompleteDemoName );
Cmd_AddCommand ("cinematic", CL_PlayCinematic_f);
Cmd_AddCommand ("stoprecord", CL_StopRecord_f);
Cmd_AddCommand ("connect", CL_Connect_f);
@ -3157,6 +3191,7 @@ void CL_Init( void ) {
Cmd_AddCommand ("localservers", CL_LocalServers_f);
Cmd_AddCommand ("globalservers", CL_GlobalServers_f);
Cmd_AddCommand ("rcon", CL_Rcon_f);
Cmd_SetCommandCompletionFunc( "rcon", CL_CompleteRcon );
Cmd_AddCommand ("setenv", CL_Setenv_f );
Cmd_AddCommand ("ping", CL_Ping_f );
Cmd_AddCommand ("serverstatus", CL_ServerStatus_f );