X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=36ab6e59efef73a816815bf92803ee93bc75e97e;hb=e440cc14e7e83d07f12c13279e565591655229d7;hp=ae3f7cd4aad5357772cff78e670515f44e38ea8e;hpb=51d67386b0e66fcab982ee52fb0efd67b4699f98;p=xonotic%2Fdarkplaces.git diff --git a/sys_win.c b/sys_win.c index ae3f7cd4..36ab6e59 100644 --- a/sys_win.c +++ b/sys_win.c @@ -20,24 +20,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sys_win.c -- Win32 system interface code #include "quakedef.h" -#include "winquake.h" +#include +#include #include "errno.h" #include "resource.h" #include "conproc.h" #include "direct.h" -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 +extern void S_BlockSound (void); -int starttime; +cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; -static qboolean sc_return_on_enter = false; HANDLE hinput, houtput; static HANDLE tevent; @@ -46,30 +39,6 @@ static HANDLE heventParent; static HANDLE heventChild; -/* -=============================================================================== - -DLL MANAGEMENT - -=============================================================================== -*/ - -dllhandle_t Sys_LoadLibrary (const char* name) -{ - return LoadLibrary (name); -} - -void Sys_UnloadLibrary (dllhandle_t handle) -{ - FreeLibrary (handle); -} - -void* Sys_GetProcAddress (dllhandle_t handle, const char* name) -{ - return (void *)GetProcAddress (handle, name); -} - - /* =============================================================================== @@ -78,8 +47,6 @@ SYSTEM IO =============================================================================== */ -void SleepUntilInput (int time); - void Sys_Error (const char *error, ...) { va_list argptr; @@ -87,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); - vsprintf (text, error, argptr); + vsnprintf (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) { @@ -110,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); @@ -128,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; @@ -261,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; @@ -297,30 +261,36 @@ 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; + HANDLE hClipboardData; - if (!GetMessage (&msg, NULL, 0, 0)) - Sys_Quit (); - - TranslateMessage (&msg); - DispatchMessage (&msg); + if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) + { + if ((cliptext = GlobalLock (hClipboardData)) != 0) + { + data = malloc (GlobalSize(hClipboardData)+1); + strcpy (data, cliptext); + GlobalUnlock (hClipboardData); + } + } + CloseClipboard (); } + return data; } - /* ============================================================================== @@ -330,19 +300,12 @@ WINDOWS CRAP */ -void SleepUntilInput (int time) -{ - MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT); -} - - /* ================== WinMain ================== */ HINSTANCE global_hInstance; -int global_nCmdShow; const char *argv[MAX_NUM_ARGVS]; char program_name[MAX_OSPATH]; @@ -357,37 +320,50 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin return 0; global_hInstance = hInstance; - global_nCmdShow = nCmdShow; 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; + } + else + { + // unquoted word + argv[com_argc] = lpCmdLine; + com_argc++; + while (*lpCmdLine && *lpCmdLine > ' ') lpCmdLine++; - } + } + + if (*lpCmdLine) + { + *lpCmdLine = 0; + lpCmdLine++; } } - com_argv = argv; Sys_Shared_EarlyInit(); @@ -438,22 +414,10 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin 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; @@ -462,4 +426,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin /* return success of application */ return true; } -