X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=90545065c24c41580170089e0123b64ad659e03d;hb=30acc756015b7cb8a31ccfee2ce00e11a16b6579;hp=391f9c5a5661abc7eec93249cdc98584c1e538c9;hpb=a40195d9f77dc041976c4a130f5bf8fb69dbc181;p=xonotic%2Fdarkplaces.git diff --git a/sys_win.c b/sys_win.c index 391f9c5a..90545065 100644 --- a/sys_win.c +++ b/sys_win.c @@ -31,14 +31,6 @@ extern void S_BlockSound (void); cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; -// # of seconds to wait on Sys_Error running dedicated before exiting -#define CONSOLE_ERROR_TIMEOUT 60.0 -// sleep time on pause or minimization -#define PAUSE_SLEEP 50 -// sleep time when not focus -#define NOT_FOCUS_SLEEP 20 - -static qboolean sc_return_on_enter = false; HANDLE hinput, houtput; static HANDLE tevent; @@ -55,8 +47,6 @@ SYSTEM IO =============================================================================== */ -void SleepUntilInput (int time); - void Sys_Error (const char *error, ...) { va_list argptr; @@ -64,18 +54,26 @@ void Sys_Error (const char *error, ...) static int in_sys_error0 = 0; static int in_sys_error1 = 0; static int in_sys_error2 = 0; + static int in_sys_error3 = 0; va_start (argptr, error); - vsnprintf (text, sizeof (text), error, argptr); + dpvsnprintf (text, sizeof (text), error, argptr); va_end (argptr); + Con_Printf ("Quake Error: %s\n", text); + // close video so the message box is visible, unless we already tried that if (!in_sys_error0 && cls.state != ca_dedicated) { in_sys_error0 = 1; VID_Shutdown(); } - MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP); + + if (!in_sys_error3 && cls.state != ca_dedicated) + { + in_sys_error3 = true; + MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP); + } if (!in_sys_error1) { @@ -87,16 +85,14 @@ void Sys_Error (const char *error, ...) if (!in_sys_error2) { in_sys_error2 = 1; - DeinitConProc (); + Sys_Shutdown (); } exit (1); } -void Sys_Quit (void) +void Sys_Shutdown (void) { - Host_Shutdown(); - if (tevent) CloseHandle (tevent); @@ -105,11 +101,9 @@ void Sys_Quit (void) // shut down QHOST hooks if necessary DeinitConProc (); - - exit (0); } -void Sys_Print(const char *text) +void Sys_PrintToTerminal(const char *text) { DWORD dummy; extern HANDLE houtput; @@ -238,13 +232,6 @@ char *Sys_ConsoleInput (void) len = 0; return text; } - else if (sc_return_on_enter) - { - // special case to allow exiting from the error handler on Enter - text[0] = '\r'; - len = 0; - return text; - } break; @@ -281,24 +268,79 @@ void Sys_Sleep(int milliseconds) Sleep(milliseconds); } +char *Sys_GetClipboardData (void) +{ + char *data = NULL; + char *cliptext; + + if (OpenClipboard (NULL) != 0) + { + HANDLE hClipboardData; -void Sys_SendKeyEvents (void) + if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) + { + if ((cliptext = GlobalLock (hClipboardData)) != 0) + { + data = malloc (GlobalSize(hClipboardData)+1); + strcpy (data, cliptext); + GlobalUnlock (hClipboardData); + } + } + CloseClipboard (); + } + return data; +} + +void Sys_InitConsole (void) { - MSG msg; + int t; + + // initialize the windows dedicated server console if needed + tevent = CreateEvent(NULL, false, false, NULL); + + if (!tevent) + Sys_Error ("Couldn't create event"); - while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) + // LordHavoc: can't check cls.state because it hasn't been initialized yet + // if (cls.state == ca_dedicated) + if (COM_CheckParm("-dedicated")) { - // we always update if there are any event, even if we're paused - scr_skipupdate = 0; + if (!AllocConsole ()) + Sys_Error ("Couldn't create dedicated server console"); - if (!GetMessage (&msg, NULL, 0, 0)) - Sys_Quit (); + hinput = GetStdHandle (STD_INPUT_HANDLE); + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + + // give QHOST a chance to hook into the console + if ((t = COM_CheckParm ("-HFILE")) > 0) + { + 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) + heventChild = (HANDLE)atoi (com_argv[t+1]); + } - TranslateMessage (&msg); - DispatchMessage (&msg); + InitConProc (hFile, heventParent, heventChild); } + +// because sound is off until we become active + S_BlockSound (); } +void Sys_Init_Commands (void) +{ + Cvar_RegisterVariable(&sys_usetimegettime); +} /* ============================================================================== @@ -309,12 +351,6 @@ WINDOWS CRAP */ -void SleepUntilInput (int time) -{ - MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT); -} - - /* ================== WinMain @@ -328,7 +364,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin { double frameoldtime, framenewtime; MEMORYSTATUS lpBuffer; - int t; /* previous instances do not exist in Win32 */ if (hPrevInstance) @@ -339,98 +374,54 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin lpBuffer.dwLength = sizeof(MEMORYSTATUS); GlobalMemoryStatus (&lpBuffer); - com_argc = 1; 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)) { - while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126))) + while (*lpCmdLine && *lpCmdLine <= ' ') lpCmdLine++; - if (*lpCmdLine) + if (!*lpCmdLine) + break; + + if (*lpCmdLine == '\"') { + // quoted string + lpCmdLine++; argv[com_argc] = lpCmdLine; com_argc++; - - while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126))) + while (*lpCmdLine && (*lpCmdLine != '\"')) lpCmdLine++; - - if (*lpCmdLine) - { - *lpCmdLine = 0; - lpCmdLine++; - } } - } - com_argv = argv; - - Sys_Shared_EarlyInit(); - - Cvar_RegisterVariable(&sys_usetimegettime); - - tevent = CreateEvent(NULL, false, false, NULL); - - if (!tevent) - Sys_Error ("Couldn't create event"); - - // 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); - - // give QHOST a chance to hook into the console - if ((t = COM_CheckParm ("-HFILE")) > 0) - { - if (t < com_argc) - hFile = (HANDLE)atoi (com_argv[t+1]); - } - - if ((t = COM_CheckParm ("-HPARENT")) > 0) + else { - if (t < com_argc) - heventParent = (HANDLE)atoi (com_argv[t+1]); + // unquoted word + argv[com_argc] = lpCmdLine; + com_argc++; + while (*lpCmdLine && *lpCmdLine > ' ') + lpCmdLine++; } - if ((t = COM_CheckParm ("-HCHILD")) > 0) + if (*lpCmdLine) { - if (t < com_argc) - heventChild = (HANDLE)atoi (com_argv[t+1]); + *lpCmdLine = 0; + lpCmdLine++; } - - InitConProc (hFile, heventParent, heventChild); } -// because sound is off until we become active - S_BlockSound (); - Host_Init (); - Sys_Shared_LateInit(); - frameoldtime = Sys_DoubleTime (); - + /* main window message loop */ while (1) { - if (cls.state != ca_dedicated) - { - // yield the CPU for a little while when paused, minimized, or not the focus - if ((cl.paused && !vid_activewindow) || vid_hidden) - { - SleepUntilInput (PAUSE_SLEEP); - scr_skipupdate = 1; // no point in bothering to draw - } - else if (!vid_activewindow) - SleepUntilInput (NOT_FOCUS_SLEEP); - } - framenewtime = Sys_DoubleTime (); Host_Frame (framenewtime - frameoldtime); frameoldtime = framenewtime; @@ -439,4 +430,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin /* return success of application */ return true; } -