Fix setinfo.

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 228c0a49f627449efa432e3567cb996d9cfbb48a..e63c85ba817117224c0d5a232d6347a50f7beb58 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,9 +1,5 @@
 
 #ifdef WIN32
-#ifdef _MSC_VER
-#pragma comment(lib, "sdl.lib")
-#pragma comment(lib, "sdlmain.lib")
-#endif
 #include <io.h>
 #include "conio.h"
 #else
@@ -24,6 +20,13 @@
 
 #include <SDL.h>
 
+#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
+#endif
+
 #include "quakedef.h"
 
 // =======================================================================
@@ -59,6 +62,10 @@ void Sys_Error (const char *error, ...)
 
        Con_Printf ("Quake Error: %s\n", string);
 
+#ifdef WIN32
+       MessageBox(NULL, string, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+#endif
+
        Host_Shutdown ();
        exit (1);
 }
@@ -161,31 +168,19 @@ char *Sys_ConsoleInput(void)
 
 char *Sys_GetClipboardData (void)
 {
-#ifdef WIN32
        char *data = NULL;
        char *cliptext;
 
-       if (OpenClipboard (NULL) != 0)
-       {
-               HANDLE hClipboardData;
-
-               if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
-               {
-                       if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
-                       {
-                               size_t allocsize;
-                               allocsize = GlobalSize (hClipboardData) + 1;
-                               data = (char *)Z_Malloc (allocsize);
-                               strlcpy (data, cliptext, allocsize);
-                               GlobalUnlock (hClipboardData);
-                       }
-               }
-               CloseClipboard ();
+       cliptext = SDL_GetClipboardText();
+       if (cliptext != NULL) {
+               size_t allocsize;
+               allocsize = strlen(cliptext) + 1;
+               data = (char *)Z_Malloc (allocsize);
+               strlcpy (data, cliptext, allocsize);
+               SDL_free(cliptext);
        }
+
        return data;
-#else
-       return NULL;
-#endif
 }
 
 void Sys_InitConsole (void)