Use swap_control from MESA and EXT before SGI (#151)

[irrlicht.git] / source / Irrlicht / COSOperator.cpp

diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
index 64f841f40aa548a41f588071d3529f11c4ebb7e9..25b04ad88821285830da66cfc563ab6597e61dc5 100644 (file)
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -5,9 +5,7 @@
 #include "COSOperator.h"\r
 \r
 #ifdef _IRR_WINDOWS_API_\r
-#ifndef _IRR_XBOX_PLATFORM_\r
 #include <windows.h>\r
-#endif\r
 #else\r
 #include <string.h>\r
 #include <unistd.h>\r
@@ -63,23 +61,26 @@ void COSOperator::copyToClipboard(const c8 *text) const
                return;\r
 \r
 // Windows version\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL) || text == 0)\r
                return;\r
 \r
        EmptyClipboard();\r
 \r
+       core::stringw tempbuffer;\r
+       core::multibyteToWString(tempbuffer, text);\r
+       const u32 size = (tempbuffer.size() + 1) * sizeof(wchar_t);\r
+\r
        HGLOBAL clipbuffer;\r
-       char * buffer;\r
+       void * buffer;\r
 \r
-       clipbuffer = GlobalAlloc(GMEM_DDESHARE, strlen(text)+1);\r
-       buffer = (char*)GlobalLock(clipbuffer);\r
+       clipbuffer = GlobalAlloc(GMEM_MOVEABLE, size);\r
+       buffer = GlobalLock(clipbuffer);\r
 \r
-       strcpy(buffer, text);\r
+       memcpy(buffer, tempbuffer.c_str(), size);\r
 \r
        GlobalUnlock(clipbuffer);\r
-       SetClipboardData(CF_TEXT, clipbuffer);\r
+       SetClipboardData(CF_UNICODETEXT, clipbuffer);\r
        CloseClipboard();\r
 \r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
@@ -88,7 +89,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
 \r
     if ((text != NULL) && (strlen(text) > 0))\r
     {\r
-        str = [NSString stringWithCString:text encoding:NSWindowsCP1252StringEncoding];\r
+        str = [NSString stringWithCString:text encoding:NSUTF8StringEncoding];\r
         board = [NSPasteboard generalPasteboard];\r
         [board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];\r
         [board setString:str forType:NSStringPboardType];\r
@@ -97,8 +98,6 @@ void COSOperator::copyToClipboard(const c8 *text) const
 #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
     if ( IrrDeviceLinux )\r
         IrrDeviceLinux->copyToClipboard(text);\r
-#else\r
-\r
 #endif\r
 }\r
 \r
@@ -107,19 +106,21 @@ void COSOperator::copyToClipboard(const c8 *text) const
 //! \return Returns 0 if no string is in there, otherwise an utf-8 string.\r
 const c8* COSOperator::getTextFromClipboard() const\r
 {\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-               return 0;\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL))\r
                return 0;\r
 \r
-       char * buffer = 0;\r
+       wchar_t * buffer = 0;\r
+\r
+       HANDLE hData = GetClipboardData( CF_UNICODETEXT );\r
+       buffer = (wchar_t*) GlobalLock( hData );\r
+\r
+       core::wStringToMultibyte(ClipboardBuf, buffer);\r
 \r
-       HANDLE hData = GetClipboardData( CF_TEXT );\r
-       buffer = (char*)GlobalLock( hData );\r
        GlobalUnlock( hData );\r
        CloseClipboard();\r
-       return buffer;\r
+\r
+       return ClipboardBuf.c_str();\r
 \r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
     NSString* str = nil;\r
@@ -130,7 +131,7 @@ const c8* COSOperator::getTextFromClipboard() const
     str = [board stringForType:NSStringPboardType];\r
 \r
     if (str != nil)\r
-        result = (char*)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];\r
+        result = (char*)[str cStringUsingEncoding:NSUTF8StringEncoding];\r
 \r
     return (result);\r
 \r
@@ -148,7 +149,7 @@ const c8* COSOperator::getTextFromClipboard() const
 \r
 bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const\r
 {\r
-#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_)\r
+#if defined(_IRR_WINDOWS_API_)\r
 \r
        MEMORYSTATUSEX MemoryStatusEx;\r
        MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX);\r
@@ -162,24 +163,19 @@ bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const
                *Avail = (u32)(MemoryStatusEx.ullAvailPhys>>10);\r
        return true;\r
 \r
-#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)\r
-#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)\r
+#elif defined(_IRR_POSIX_API_) && defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)\r
         long ps = sysconf(_SC_PAGESIZE);\r
         long pp = sysconf(_SC_PHYS_PAGES);\r
         long ap = sysconf(_SC_AVPHYS_PAGES);\r
 \r
-       if ((ps==-1)||(pp==-1)||(ap==-1))\r
+       if (ps == -1 || (Total && pp == -1) || (Avail && ap == -1))\r
                return false;\r
 \r
        if (Total)\r
-               *Total = (u32)((ps*(long long)pp)>>10);\r
+               *Total = (u32)((pp>>10)*ps);\r
        if (Avail)\r
-               *Avail = (u32)((ps*(long long)ap)>>10);\r
+               *Avail = (u32)((ap>>10)*ps);\r
        return true;\r
-#else\r
-       // TODO: implement for non-availability of symbols/features\r
-       return false;\r
-#endif\r
 #elif defined(_IRR_OSX_PLATFORM_)\r
        int mib[2];\r
        int64_t physical_memory;\r
@@ -190,6 +186,11 @@ bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const
        mib[1] = HW_MEMSIZE;\r
        length = sizeof(int64_t);\r
        sysctl(mib, 2, &physical_memory, &length, NULL, 0);\r
+\r
+       if (Total)\r
+               *Total = (u32)(physical_memory>>10);\r
+       if (Avail)\r
+               *Avail = (u32)(physical_memory>>10); // we don't know better\r
        return true;\r
 #else\r
        // TODO: implement for others\r