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

* rewrite of the win32 dedicated console:

Browse source 
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.
This commit is contained in:
Tony J. White = 2007-09-15 02:22:58 +00:00
parent 2052b94adc
commit e46fe24426
8 changed files with 321 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

38
code/qcommon/net_ip.c
View file

@ -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
if (!ip_socket)
return;
if (msec < 0 )
return;
FD_ZERO(&fdset);
FD_SET(fileno(stdin), &fdset);
highestfd = fileno(stdin) + 1;
if(ip_socket)
{
FD_SET(ip_socket, &fdset); // network socket
if(ip_socket >= highestfd)
highestfd = ip_socket + 1;
}
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_SET(ip_socket, &fdset);
timeout.tv_sec = msec/1000;
timeout.tv_usec = (msec%1000)*1000;
select(ip_socket+1, &fdset, NULL, NULL, &timeout);
}