From f1692e7d753e2ae0b2222425ba51f185928c2988 Mon Sep 17 00:00:00 2001 From: tjw Date: Sat, 15 Sep 2007 02:22:58 +0000 Subject: * rewrite of the win32 dedicated console: 1) NET_Sleep() no longer watches for input, Sys_Sleep() added for waiting on input. 2) Added "CtrlHandler" for trapping Ctrl-C and other quit methods not handled by signals on windows 3) Added history support 4) Added tab completion 5) Removed automatic cursor/scroll adjustment (too problematic) 6) Enable mousewheel scrolling 7) Stop using the InputBuffer for editing This seems to work pretty well now, but I jumped the gun on a previous commit message by saying you can scroll now without locking up your server. That was only true up until the point that a server tried to print to the console, at that point it will hang until you release the scroll bar :( It may be possible to get around this by using a seperate thread for console output, but that's a whole new can of worms. git-svn-id: svn://svn.icculus.org/quake3/trunk@1182 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/qcommon/net_ip.c | 36 ++++++++++-------------------------- code/qcommon/qcommon.h | 1 + 2 files changed, 11 insertions(+), 26 deletions(-) (limited to 'code/qcommon') diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c index dadfbd3..8b56b30 100644 --- a/code/qcommon/net_ip.c +++ b/code/qcommon/net_ip.c @@ -1026,43 +1026,27 @@ void NET_Shutdown( void ) { ==================== NET_Sleep -Sleeps msec or until something happens on the network or stdin +Sleeps msec or until something happens on the network ==================== */ void NET_Sleep( int msec ) { struct timeval timeout; fd_set fdset; - int highestfd = 0; if (!com_dedicated->integer) return; // we're not a server, just run full speed - FD_ZERO(&fdset); - - FD_SET(fileno(stdin), &fdset); - highestfd = fileno(stdin) + 1; + if (!ip_socket) + return; - if(ip_socket) - { - FD_SET(ip_socket, &fdset); // network socket - if(ip_socket >= highestfd) - highestfd = ip_socket + 1; - } + if (msec < 0 ) + return; - if(highestfd) - { - if(msec >= 0) - { - timeout.tv_sec = msec/1000; - timeout.tv_usec = (msec%1000)*1000; - select(highestfd, &fdset, NULL, NULL, &timeout); - } - else - { - // Block indefinitely - select(highestfd, &fdset, NULL, NULL, NULL); - } - } + FD_ZERO(&fdset); + FD_SET(ip_socket, &fdset); + timeout.tv_sec = msec/1000; + timeout.tv_usec = (msec%1000)*1000; + select(ip_socket+1, &fdset, NULL, NULL, &timeout); } diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index a563ef9..5fd3cd5 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -1030,6 +1030,7 @@ char *Sys_ConsoleInput(void); char **Sys_ListFiles( const char *directory, const char *extension, char *filter, int *numfiles, qboolean wantsubs ); void Sys_FreeFileList( char **list ); +void Sys_Sleep(int msec); qboolean Sys_LowPhysicalMemory( void ); -- cgit v1.2.3