X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=d571dd2a4ba9173659d2f818ec8728140c561326;hb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;hp=82b5179be4510168be8ca50a0a9650105b4fc7c0;hpb=45982a9894c5bff60ff494a0f82865ec267d52f7;p=xonotic%2Fdarkplaces.git diff --git a/sys_win.c b/sys_win.c index 82b5179b..d571dd2a 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,186 +19,27 @@ 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 +#ifdef SUPPORTDIRECTX +#include +#endif #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 - -int starttime; -qboolean ActiveApp, Minimized; +cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"}; -static qboolean sc_return_on_enter = false; HANDLE hinput, houtput; -static char *tracking_tag = "Clams & Mooses"; - +#ifdef QHOST 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 oldtime + 1800) + { + Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime); + } + else + curtime += newtime - oldtime; oldtime = newtime; - return newtime; -#endif + return curtime; } char *Sys_ConsoleInput (void) { - static char text[256]; - static int len; - INPUT_RECORD recs[1024]; - int dummy; - int ch, numread, numevents; + static char text[MAX_INPUTLINE]; + static int len; + INPUT_RECORD recs[1024]; + int ch; + DWORD numread, numevents, dummy; if (cls.state != ca_dedicated) return NULL; - for ( ;; ) { if (!GetNumberOfConsoleInputEvents (hinput, &numevents)) - Sys_Error ("Error getting # of console events"); + { + cls.state = ca_disconnected; + Sys_Error ("Error getting # of console events (error code %x)", (unsigned int)GetLastError()); + } if (numevents <= 0) break; if (!ReadConsoleInput(hinput, recs, 1, &numread)) - Sys_Error ("Error reading console input"); + { + cls.state = ca_disconnected; + Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError()); + } if (numread != 1) - Sys_Error ("Couldn't read console input"); + { + cls.state = ca_disconnected; + Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError()); + } if (recs[0].EventType == KEY_EVENT) { @@ -432,7 +249,7 @@ char *Sys_ConsoleInput (void) switch (ch) { case '\r': - WriteFile(houtput, "\r\n", 2, &dummy, NULL); + WriteFile(houtput, "\r\n", 2, &dummy, NULL); if (len) { @@ -440,18 +257,11 @@ 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; case '\b': - WriteFile(houtput, "\b \b", 3, &dummy, NULL); + WriteFile(houtput, "\b \b", 3, &dummy, NULL); if (len) { len--; @@ -459,9 +269,9 @@ char *Sys_ConsoleInput (void) break; default: - if (ch >= ' ') + if (ch >= (int) (unsigned char) ' ') { - WriteFile(houtput, &ch, 1, &dummy, NULL); + WriteFile(houtput, &ch, 1, &dummy, NULL); text[len] = ch; len = (len + 1) & 0xff; } @@ -476,155 +286,70 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep (void) -{ - Sleep (1); -} - - -void Sys_SendKeyEvents (void) -{ - MSG msg; - - while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) - { - // 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) +void Sys_Sleep(int microseconds) { - - MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT); + Sleep(microseconds / 1000); } - -/* -================== -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) +char *Sys_GetClipboardData (void) { - double oldtime, newtime; - MEMORYSTATUS lpBuffer; - static char cwd[1024]; - int t; - - /* previous instances do not exist in Win32 */ - if (hPrevInstance) - return 0; + char *data = NULL; + char *cliptext; - 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)) + if (OpenClipboard (NULL) != 0) { - while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126))) - lpCmdLine++; + HANDLE hClipboardData; - 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 = (char *)GlobalLock (hClipboardData)) != 0) { - *lpCmdLine = 0; - lpCmdLine++; + size_t allocsize; + allocsize = GlobalSize (hClipboardData) + 1; + data = (char *)Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); + 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; - - Sys_Shared_EarlyInit(); - -// 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) +{ +#ifdef QHOST + int t; + // initialize the windows dedicated server console if needed tevent = CreateEvent(NULL, false, false, NULL); if (!tevent) Sys_Error ("Couldn't create event"); +#endif + + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + hinput = GetStdHandle (STD_INPUT_HANDLE); // LordHavoc: can't check cls.state because it hasn't been initialized yet // if (cls.state == ca_dedicated) if (COM_CheckParm("-dedicated")) { - if (!AllocConsole ()) + //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid + { + if (!AllocConsole ()) + Sys_Error ("Couldn't create dedicated server console (error code %x)", (unsigned int)GetLastError()); + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + hinput = GetStdHandle (STD_INPUT_HANDLE); + } + if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) Sys_Error ("Couldn't create dedicated server console"); - hinput = GetStdHandle (STD_INPUT_HANDLE); - houtput = GetStdHandle (STD_OUTPUT_HANDLE); +#ifdef QHOST +#ifdef _WIN64 +#define atoi _atoi64 +#endif // give QHOST a chance to hook into the console if ((t = COM_CheckParm ("-HFILE")) > 0) { @@ -645,47 +370,116 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin } InitConProc (hFile, heventParent, heventChild); +#endif } // 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); +} + +/* +============================================================================== + +WINDOWS CRAP + +============================================================================== +*/ + + +/* +================== +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) +{ + MEMORYSTATUS lpBuffer; + + /* previous instances do not exist in Win32 */ + if (hPrevInstance) + return 0; + + global_hInstance = hInstance; - Host_Init (); + lpBuffer.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus (&lpBuffer); - Sys_Shared_LateInit(); + program_name[sizeof(program_name)-1] = 0; + GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); - oldtime = Sys_DoubleTime (); + com_argc = 1; + com_argv = argv; + argv[0] = program_name; - /* main window message loop */ - while (1) + // FIXME: this tokenizer is rather redundent, call a more general one + while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS)) { - if (cls.state != ca_dedicated) + while (*lpCmdLine && ISWHITESPACE(*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) || Minimized) - { - SleepUntilInput (PAUSE_SLEEP); - scr_skipupdate = 1; // no point in bothering to draw - } - else if (!ActiveApp) - 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 && !ISWHITESPACE(*lpCmdLine)) + lpCmdLine++; } - newtime = Sys_DoubleTime (); - Host_Frame (newtime - oldtime); - oldtime = newtime; + if (*lpCmdLine) + { + *lpCmdLine = 0; + lpCmdLine++; + } } - /* return success of application */ - return true; + Host_Main(); + + /* return success of application */ + return true; } +#if 0 +// unused, this file is only used when building windows client and vid_wgl provides WinMain() instead +int main (int argc, const char* argv[]) +{ + MEMORYSTATUS lpBuffer; + + global_hInstance = GetModuleHandle (0); + + lpBuffer.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus (&lpBuffer); + + program_name[sizeof(program_name)-1] = 0; + GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); + + com_argc = argc; + com_argv = argv; + + Host_Main(); + + return true; +} +#endif +