X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=90545065c24c41580170089e0123b64ad659e03d;hp=1327b35d728b6f1886cf9c00c7c4bf12add168ac;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hpb=7d0ec7ce187f7333a7ada2884108757a4fec6449 diff --git a/sys_win.c b/sys_win.c index 1327b35d..90545065 100644 --- a/sys_win.c +++ b/sys_win.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,188 +19,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // sys_win.c -- Win32 system interface code -#define WIN32_USETIMEGETTIME 0 - #include "quakedef.h" -#include "winquake.h" +#include +#include #include "errno.h" #include "resource.h" #include "conproc.h" #include "direct.h" -#define CONSOLE_ERROR_TIMEOUT 60.0 // # of seconds to wait on Sys_Error running - // dedicated before exiting -#define PAUSE_SLEEP 50 // sleep time on pause or minimization -#define NOT_FOCUS_SLEEP 20 // sleep time when not focus +extern void S_BlockSound (void); -int starttime; -qboolean ActiveApp, Minimized; +cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; -qboolean isDedicated; -static qboolean sc_return_on_enter = false; HANDLE hinput, houtput; -static char *tracking_tag = "Clams & Mooses"; - static HANDLE tevent; static HANDLE hFile; static HANDLE heventParent; static HANDLE heventChild; -volatile int sys_checksum; - - -/* -================ -Sys_PageIn -================ -*/ -/* -void Sys_PageIn (void *ptr, int size) -{ - byte *x; - int m, n; - -// touch all the memory to make sure it's there. The 16-page skip is to -// keep Win 95 from thinking we're trying to page ourselves in (we are -// doing that, of course, but there's no reason we shouldn't) - x = (byte *)ptr; - - for (n=0 ; n<4 ; n++) - { - for (m=0 ; m<(size - 16 * 0x1000) ; m += 4) - { - sys_checksum += *(int *)&x[m]; - sys_checksum += *(int *)&x[m + 16 * 0x1000]; - } - } -} -*/ - - -/* -=============================================================================== - -QFile IO - -=============================================================================== -*/ - -// LordHavoc: 256 pak files (was 10) -#define MAX_HANDLES 256 -QFile *sys_handles[MAX_HANDLES]; - -int findhandle (void) -{ - int i; - - for (i=1 ; i= ' ') { - WriteFile(houtput, &ch, 1, &dummy, NULL); + WriteFile(houtput, &ch, 1, &dummy, NULL); text[len] = ch; len = (len + 1) & 0xff; } @@ -496,151 +261,52 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep (void) +void Sys_Sleep(int milliseconds) { - Sleep (1); + if (milliseconds < 1) + milliseconds = 1; + Sleep(milliseconds); } - -void Sys_SendKeyEvents (void) +char *Sys_GetClipboardData (void) { - MSG msg; + char *data = NULL; + char *cliptext; - while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) + if (OpenClipboard (NULL) != 0) { - // we always update if there are any event, even if we're paused - scr_skipupdate = 0; - - if (!GetMessage (&msg, NULL, 0, 0)) - Sys_Quit (); - - TranslateMessage (&msg); - DispatchMessage (&msg); - } -} - - -/* -============================================================================== - - WINDOWS CRAP - -============================================================================== -*/ - - -/* -================== -WinMain -================== -*/ -void SleepUntilInput (int time) -{ - - MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT); -} - + HANDLE hClipboardData; -/* -================== -WinMain -================== -*/ -HINSTANCE global_hInstance; -int global_nCmdShow; -char *argv[MAX_NUM_ARGVS]; -static char *empty_string = ""; - -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) -{ - double time, oldtime, newtime/*, timediff*/; - MEMORYSTATUS lpBuffer; - static char cwd[1024]; - int t; - - /* previous instances do not exist in Win32 */ - if (hPrevInstance) - return 0; - - global_hInstance = hInstance; - global_nCmdShow = nCmdShow; - - lpBuffer.dwLength = sizeof(MEMORYSTATUS); - GlobalMemoryStatus (&lpBuffer); - - if (!GetCurrentDirectory (sizeof(cwd), cwd)) - Sys_Error ("Couldn't determine current directory"); - - if (cwd[strlen(cwd)-1] == '/') - cwd[strlen(cwd)-1] = 0; - - memset(&host_parms, 0, sizeof(host_parms)); - - host_parms.basedir = cwd; - - host_parms.argc = 1; - argv[0] = empty_string; - - while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS)) - { - while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126))) - lpCmdLine++; - - if (*lpCmdLine) + if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) { - argv[host_parms.argc] = lpCmdLine; - host_parms.argc++; - - while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126))) - lpCmdLine++; - - if (*lpCmdLine) + if ((cliptext = GlobalLock (hClipboardData)) != 0) { - *lpCmdLine = 0; - lpCmdLine++; + data = malloc (GlobalSize(hClipboardData)+1); + strcpy (data, cliptext); + GlobalUnlock (hClipboardData); } - } + CloseClipboard (); } + return data; +} - host_parms.argv = argv; - - COM_InitArgv (host_parms.argc, host_parms.argv); - - host_parms.argc = com_argc; - host_parms.argv = com_argv; - - isDedicated = (COM_CheckParm ("-dedicated") != 0); - -// take the greater of all the available memory or half the total memory, -// but at least 8 Mb and no more than 16 Mb, unless they explicitly -// request otherwise - /* - host_parms.memsize = lpBuffer.dwAvailPhys; - - if (host_parms.memsize < MINIMUM_WIN_MEMORY) - host_parms.memsize = MINIMUM_WIN_MEMORY; - - if (host_parms.memsize < (lpBuffer.dwTotalPhys >> 1)) - host_parms.memsize = lpBuffer.dwTotalPhys >> 1; - - if (host_parms.memsize > MAXIMUM_WIN_MEMORY) - host_parms.memsize = MAXIMUM_WIN_MEMORY; - */ - -// Sys_PageIn (parms.membase, parms.memsize); +void Sys_InitConsole (void) +{ + int t; + // initialize the windows dedicated server console if needed tevent = CreateEvent(NULL, false, false, NULL); if (!tevent) Sys_Error ("Couldn't create event"); - if (isDedicated) + // LordHavoc: can't check cls.state because it hasn't been initialized yet + // if (cls.state == ca_dedicated) + if (COM_CheckParm("-dedicated")) { if (!AllocConsole ()) - { Sys_Error ("Couldn't create dedicated server console"); - } hinput = GetStdHandle (STD_INPUT_HANDLE); houtput = GetStdHandle (STD_OUTPUT_HANDLE); @@ -651,13 +317,13 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin if (t < com_argc) hFile = (HANDLE)atoi (com_argv[t+1]); } - + if ((t = COM_CheckParm ("-HPARENT")) > 0) { if (t < com_argc) heventParent = (HANDLE)atoi (com_argv[t+1]); } - + if ((t = COM_CheckParm ("-HCHILD")) > 0) { if (t < com_argc) @@ -669,46 +335,98 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin // because sound is off until we become active S_BlockSound (); +} -#if WIN32_USETIMEGETTIME - // make sure the timer is high precision, otherwise NT gets 18ms resolution - // LordHavoc: - // Windows 2000 Advanced Server (and possibly other versions) - // apparently have a broken timer, because it runs at more like 10x speed - // if this isn't used, heh - timeBeginPeriod (1); -#endif +void Sys_Init_Commands (void) +{ + Cvar_RegisterVariable(&sys_usetimegettime); +} - Sys_Printf ("Host_Init\n"); - Host_Init (); +/* +============================================================================== - oldtime = Sys_DoubleTime (); +WINDOWS CRAP - /* main window message loop */ - while (1) +============================================================================== +*/ + + +/* +================== +WinMain +================== +*/ +HINSTANCE global_hInstance; +const char *argv[MAX_NUM_ARGVS]; +char program_name[MAX_OSPATH]; + +int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + double frameoldtime, framenewtime; + MEMORYSTATUS lpBuffer; + + /* previous instances do not exist in Win32 */ + if (hPrevInstance) + return 0; + + global_hInstance = hInstance; + + lpBuffer.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus (&lpBuffer); + + program_name[sizeof(program_name)-1] = 0; + GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); + + com_argc = 1; + com_argv = argv; + argv[0] = program_name; + + // FIXME: this tokenizer is rather redundent, call a more general one + while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS)) { - if (!isDedicated) + while (*lpCmdLine && *lpCmdLine <= ' ') + lpCmdLine++; + + if (!*lpCmdLine) + break; + + if (*lpCmdLine == '\"') { - // yield the CPU for a little while when paused, minimized, or not the focus - if ((cl.paused && (!ActiveApp && !DDActive)) || Minimized) - { - SleepUntilInput (PAUSE_SLEEP); - scr_skipupdate = 1; // no point in bothering to draw - } - else if (!ActiveApp && !DDActive) - { - SleepUntilInput (NOT_FOCUS_SLEEP); - } + // quoted string + lpCmdLine++; + argv[com_argc] = lpCmdLine; + com_argc++; + while (*lpCmdLine && (*lpCmdLine != '\"')) + lpCmdLine++; + } + else + { + // unquoted word + argv[com_argc] = lpCmdLine; + com_argc++; + while (*lpCmdLine && *lpCmdLine > ' ') + lpCmdLine++; + } - newtime = Sys_DoubleTime (); - time = newtime - oldtime; + if (*lpCmdLine) + { + *lpCmdLine = 0; + lpCmdLine++; } + } - Host_Frame (time); - oldtime = newtime; + Host_Init (); + + frameoldtime = Sys_DoubleTime (); + + /* main window message loop */ + while (1) + { + framenewtime = Sys_DoubleTime (); + Host_Frame (framenewtime - frameoldtime); + frameoldtime = framenewtime; } - /* return success of application */ - return true; + /* return success of application */ + return true; } -