From f9158592e1478b2013afc7041d9ed041cf2d2f4a Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 13 Jan 2014 19:47:58 +1000 Subject: Update Irrlicht to 1.8.1. Include actual change markers this time. lol --- .../irrlicht-1.8/source/Irrlicht/COSOperator.cpp | 212 --------------------- 1 file changed, 212 deletions(-) delete mode 100644 libraries/irrlicht-1.8/source/Irrlicht/COSOperator.cpp (limited to 'libraries/irrlicht-1.8/source/Irrlicht/COSOperator.cpp') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/COSOperator.cpp b/libraries/irrlicht-1.8/source/Irrlicht/COSOperator.cpp deleted file mode 100644 index 90e644d..0000000 --- a/libraries/irrlicht-1.8/source/Irrlicht/COSOperator.cpp +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#include "COSOperator.h" - -#ifdef _IRR_WINDOWS_API_ -#ifndef _IRR_XBOX_PLATFORM_ -#include -#endif -#else -#include -#include -#ifndef _IRR_SOLARIS_PLATFORM_ -#include -#include -#endif -#endif - -#if defined(_IRR_COMPILE_WITH_X11_DEVICE_) -#include "CIrrDeviceLinux.h" -#endif -#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_ -#include "MacOSX/OSXClipboard.h" -#endif - -namespace irr -{ - -#if defined(_IRR_COMPILE_WITH_X11_DEVICE_) -// constructor linux - COSOperator::COSOperator(const core::stringc& osVersion, CIrrDeviceLinux* device) -: OperatingSystem(osVersion), IrrDeviceLinux(device) -{ -} -#endif - -// constructor -COSOperator::COSOperator(const core::stringc& osVersion) : OperatingSystem(osVersion) -{ - #ifdef _DEBUG - setDebugName("COSOperator"); - #endif -} - - -//! returns the current operating system version as string. -const core::stringc& COSOperator::getOperatingSystemVersion() const -{ - return OperatingSystem; -} - - -//! copies text to the clipboard -void COSOperator::copyToClipboard(const c8* text) const -{ - if (strlen(text)==0) - return; - -// Windows version -#if defined(_IRR_XBOX_PLATFORM_) -#elif defined(_IRR_WINDOWS_API_) - if (!OpenClipboard(NULL) || text == 0) - return; - - EmptyClipboard(); - - HGLOBAL clipbuffer; - char * buffer; - - clipbuffer = GlobalAlloc(GMEM_DDESHARE, strlen(text)+1); - buffer = (char*)GlobalLock(clipbuffer); - - strcpy(buffer, text); - - GlobalUnlock(clipbuffer); - SetClipboardData(CF_TEXT, clipbuffer); - CloseClipboard(); - -// MacOSX version -#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_) - - OSXCopyToClipboard(text); - -#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) - if ( IrrDeviceLinux ) - IrrDeviceLinux->copyToClipboard(text); -#else - -#endif -} - - -//! gets text from the clipboard -//! \return Returns 0 if no string is in there. -const c8* COSOperator::getTextFromClipboard() const -{ -#if defined(_IRR_XBOX_PLATFORM_) - return 0; -#elif defined(_IRR_WINDOWS_API_) - if (!OpenClipboard(NULL)) - return 0; - - char * buffer = 0; - - HANDLE hData = GetClipboardData( CF_TEXT ); - buffer = (char*)GlobalLock( hData ); - GlobalUnlock( hData ); - CloseClipboard(); - return buffer; - -#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_) - return (OSXCopyFromClipboard()); - -#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) - if ( IrrDeviceLinux ) - return IrrDeviceLinux->getTextFromClipboard(); - return 0; - -#else - - return 0; -#endif -} - - -bool COSOperator::getProcessorSpeedMHz(u32* MHz) const -{ -#if defined(_IRR_WINDOWS_API_) && !defined(_WIN32_WCE ) && !defined (_IRR_XBOX_PLATFORM_) - LONG Error; - - HKEY Key; - Error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - __TEXT("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"), - 0, KEY_READ, &Key); - - if(Error != ERROR_SUCCESS) - return false; - - DWORD Speed = 0; - DWORD Size = sizeof(Speed); - Error = RegQueryValueEx(Key, __TEXT("~MHz"), NULL, NULL, (LPBYTE)&Speed, &Size); - - RegCloseKey(Key); - - if (Error != ERROR_SUCCESS) - return false; - else if (MHz) - *MHz = Speed; - _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; - return true; - -#elif defined(_IRR_OSX_PLATFORM_) - struct clockinfo CpuClock; - size_t Size = sizeof(clockinfo); - - if (!sysctlbyname("kern.clockrate", &CpuClock, &Size, NULL, 0)) - return false; - else if (MHz) - *MHz = CpuClock.hz; - return true; -#else - // could probably be read from "/proc/cpuinfo" or "/proc/cpufreq" - - return false; -#endif -} - -bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const -{ -#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_) - MEMORYSTATUS MemoryStatus; - MemoryStatus.dwLength = sizeof(MEMORYSTATUS); - - // cannot fail - GlobalMemoryStatus(&MemoryStatus); - - if (Total) - *Total = (u32)(MemoryStatus.dwTotalPhys>>10); - if (Avail) - *Avail = (u32)(MemoryStatus.dwAvailPhys>>10); - - _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; - return true; - -#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__) -#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES) - long ps = sysconf(_SC_PAGESIZE); - long pp = sysconf(_SC_PHYS_PAGES); - long ap = sysconf(_SC_AVPHYS_PAGES); - - if ((ps==-1)||(pp==-1)||(ap==-1)) - return false; - - if (Total) - *Total = (u32)((ps*(long long)pp)>>10); - if (Avail) - *Avail = (u32)((ps*(long long)ap)>>10); - return true; -#else - // TODO: implement for non-availablity of symbols/features - return false; -#endif -#else - // TODO: implement for OSX - return false; -#endif -} - - -} // end namespace - -- cgit v1.1