X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd921f3560b3e52547d288dcfd9f3fddcb2996bd..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/display.cpp diff --git a/src/msw/display.cpp b/src/msw/display.cpp index c6403d8ed4..e5d3247e08 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -27,22 +27,27 @@ #if wxUSE_DISPLAY +#include "wx/display.h" + #ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/dynarray.h" - #include "wx/frame.h" + #include "wx/dynarray.h" + #include "wx/app.h" + #include "wx/frame.h" #endif #include "wx/dynload.h" +#include "wx/sysopt.h" -#include "wx/display.h" +#include "wx/display_impl.h" +#include "wx/msw/wrapwin.h" +#include "wx/msw/missing.h" + +// define this to use DirectDraw for display mode switching: this is disabled +// by default because ddraw.h is now always available and also it's not really +// clear what are the benefits of using DirectDraw compared to the standard API -// Mingw's w32api headers don't include ddraw.h, though the user may have -// installed it. If using configure, we actually probe for ddraw.h there -// and set HAVE_DDRAW_H. Otherwise, assume we don't have it if using -// the w32api headers, and that we do otherwise. -#if !defined HAVE_W32API_H && !defined HAVE_DDRAW_H -#define HAVE_DDRAW_H 1 +#if !defined(wxUSE_DIRECTDRAW) + #define wxUSE_DIRECTDRAW 0 #endif #ifndef __WXWINCE__ @@ -52,18 +57,34 @@ // is only defined in winuser.h if WINVER >= 0x0500 #if !defined(HMONITOR_DECLARED) && !defined(MNS_NOCHECK) DECLARE_HANDLE(HMONITOR); + typedef BOOL(CALLBACK * MONITORENUMPROC )(HMONITOR, HDC, LPRECT, LPARAM); + typedef struct tagMONITORINFO + { + DWORD cbSize; + RECT rcMonitor; + RECT rcWork; + DWORD dwFlags; + } MONITORINFO, *LPMONITORINFO; + typedef struct tagMONITORINFOEX : public tagMONITORINFO + { + TCHAR szDevice[CCHDEVICENAME]; + } MONITORINFOEX, *LPMONITORINFOEX; + #define MONITOR_DEFAULTTONULL 0x00000000 + #define MONITOR_DEFAULTTOPRIMARY 0x00000001 + #define MONITOR_DEFAULTTONEAREST 0x00000002 + #define MONITORINFOF_PRIMARY 0x00000001 #define HMONITOR_DECLARED #endif #endif // !__WXWINCE__ -#ifdef HAVE_DDRAW_H -#include +#if wxUSE_DIRECTDRAW + #include -// we don't want to link with ddraw.lib which contains the real -// IID_IDirectDraw2 definition -const GUID wxIID_IDirectDraw2 = - { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } }; -#endif + // we don't want to link with ddraw.lib which contains the real + // IID_IDirectDraw2 definition + const GUID wxIID_IDirectDraw2 = + { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } }; +#endif // wxUSE_DIRECTDRAW // ---------------------------------------------------------------------------- // typedefs for dynamically loaded Windows functions @@ -75,7 +96,7 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName, DWORD dwFlags, LPVOID lParam); -#ifdef HAVE_DDRAW_H +#if wxUSE_DIRECTDRAW typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid, LPTSTR driverDescription, LPTSTR driverName, @@ -89,615 +110,548 @@ typedef HRESULT (WINAPI *DirectDrawEnumerateEx_t)(DDEnumExCallback_t lpCallback, typedef HRESULT (WINAPI *DirectDrawCreate_t)(GUID *lpGUID, LPDIRECTDRAW *lplpDD, IUnknown *pUnkOuter); -#endif +#endif // wxUSE_DIRECTDRAW typedef BOOL (WINAPI *EnumDisplayMonitors_t)(HDC,LPCRECT,MONITORENUMPROC,LPARAM); typedef HMONITOR (WINAPI *MonitorFromPoint_t)(POINT,DWORD); typedef HMONITOR (WINAPI *MonitorFromWindow_t)(HWND,DWORD); typedef BOOL (WINAPI *GetMonitorInfo_t)(HMONITOR,LPMONITORINFO); -static EnumDisplayMonitors_t gs_EnumDisplayMonitors = NULL; -static MonitorFromPoint_t gs_MonitorFromPoint = NULL; -static MonitorFromWindow_t gs_MonitorFromWindow = NULL; -static GetMonitorInfo_t gs_GetMonitorInfo = NULL; +#ifndef __WXWINCE__ +// emulation of ChangeDisplaySettingsEx() for Win95 +LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName), + LPDEVMODE lpDevMode, + HWND WXUNUSED(hwnd), + DWORD dwFlags, + LPVOID WXUNUSED(lParam)) +{ + return ::ChangeDisplaySettings(lpDevMode, dwFlags); +} +#endif // !__WXWINCE__ // ---------------------------------------------------------------------------- -// private classes +// display information classes // ---------------------------------------------------------------------------- -class wxDisplayInfo +struct wxDisplayInfo { -public: - // handle of this monitor used by MonitorXXX() functions, never NULL - HMONITOR m_hmon; + wxDisplayInfo(HMONITOR hmon = NULL) + { + m_hmon = hmon; + m_flags = (DWORD)-1; + } - // IDirectDraw object used to control this display, may be NULL -#ifdef HAVE_DDRAW_H - IDirectDraw2 *m_pDD2; -#else - void *m_pDD2; -#endif + virtual ~wxDisplayInfo() { } - // DirectDraw GUID for this display, only valid when using DirectDraw - GUID m_guid; + + // use GetMonitorInfo() to fill in all of our fields if needed (i.e. if it + // hadn't been done before) + void Initialize(); + + + // handle of this monitor used by MonitorXXX() functions, never NULL + HMONITOR m_hmon; // the entire area of this monitor in virtual screen coordinates wxRect m_rect; + // the work or client area, i.e. the area available for the normal windows + wxRect m_rectClient; + // the display device name for this monitor, empty initially and retrieved // on demand by DoGetName() wxString m_devName; - wxDisplayInfo() { m_hmon = NULL; m_pDD2 = NULL; } - ~wxDisplayInfo() { -#ifdef HAVE_DDRAW_H - if ( m_pDD2 ) m_pDD2->Release(); -#endif - } -}; - -WX_DECLARE_OBJARRAY(wxDisplayInfo, wxDisplayInfoArray); -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxDisplayInfoArray); - -// this module is used to cleanup gs_displays array -class wxDisplayModule : public wxModule -{ -public: - virtual bool OnInit() { return true; } - virtual void OnExit(); - - DECLARE_DYNAMIC_CLASS(wxDisplayModule) + // the flags of this monitor, also used as initialization marker: if this + // is -1, GetMonitorInfo() hadn't been called yet + DWORD m_flags; }; -IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule) +WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray); // ---------------------------------------------------------------------------- -// globals +// common base class for all Win32 wxDisplayImpl versions // ---------------------------------------------------------------------------- -#ifdef HAVE_DDRAW_H -// do we use DirectX? -static bool gs_useDirectX = false; -#endif - -// Try to look up the functions needed for supporting multiple monitors. If -// they aren't available (probably because we're running on Win95 or NT4 which -// predate this API), set a flag which makes wxDisplay return results for a -// single screen. -static bool OsSupportsMultipleMonitors() +class wxDisplayImplWin32Base : public wxDisplayImpl { - static int isNewEnough = -1; - if ( isNewEnough == -1 ) +public: + wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info) + : wxDisplayImpl(n), + m_info(info) { - isNewEnough = 0; - wxDynamicLibrary dllUser32(_T("user32.dll")); - // Check for one of the symbols to avoid logging errors just because - // we happen to be running on Win95 or NT4. - if ( dllUser32.IsLoaded() && - dllUser32.HasSymbol(wxT("EnumDisplayMonitors")) ) - { - // GetMonitorInfo has Unicode/ANSI variants, the others don't. - gs_EnumDisplayMonitors = (EnumDisplayMonitors_t) - dllUser32.GetSymbol(wxT("EnumDisplayMonitors")); - gs_MonitorFromPoint = (MonitorFromPoint_t) - dllUser32.GetSymbol(wxT("MonitorFromPoint")); - gs_MonitorFromWindow = (MonitorFromWindow_t) - dllUser32.GetSymbol(wxT("MonitorFromWindow")); - gs_GetMonitorInfo = (GetMonitorInfo_t) - dllUser32.GetSymbolAorW(wxT("GetMonitorInfo")); - if ( gs_EnumDisplayMonitors != NULL && - gs_MonitorFromPoint != NULL && - gs_MonitorFromWindow != NULL && - gs_GetMonitorInfo != NULL ) - { - isNewEnough = 1; - } - } } - return (isNewEnough != 0); -} -#ifdef HAVE_DDRAW_H -// dynamically resolved DirectDrawCreate() -static DirectDrawCreate_t gs_DirectDrawCreate = NULL; -#endif + virtual wxRect GetGeometry() const; + virtual wxRect GetClientArea() const; + virtual wxString GetName() const; + virtual bool IsPrimary() const; -// this is not really MT-unsafe as wxDisplay is only going to be used from the -// main thread, i.e. we consider that it's a GUI class and so don't protect it -static wxDisplayInfoArray *gs_displays = NULL; + virtual wxVideoMode GetCurrentMode() const; -// =========================================================================== -// implementation -// =========================================================================== +protected: + // convert a DEVMODE to our wxVideoMode + static wxVideoMode ConvertToVideoMode(const DEVMODE& dm) + { + // note that dmDisplayFrequency may be 0 or 1 meaning "standard one" + // and although 0 is ok for us we don't want to return modes with 1hz + // refresh + return wxVideoMode(dm.dmPelsWidth, + dm.dmPelsHeight, + dm.dmBitsPerPel, + dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0); + } + + wxDisplayInfo& m_info; +}; // ---------------------------------------------------------------------------- -// callbacks for monitor/modes enumeration stuff +// common base class for all Win32 wxDisplayFactory versions // ---------------------------------------------------------------------------- -static BOOL CALLBACK wxmswMonitorEnumProc ( - HMONITOR hMonitor, // handle to display monitor - HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context - LPRECT lprcMonitor, // pointer to monitor intersection rectangle - LPARAM WXUNUSED(dwData) // data passed from EnumDisplayMonitors (unused) -) +// functions dynamically bound by wxDisplayFactoryWin32Base::Initialize() +static MonitorFromPoint_t gs_MonitorFromPoint = NULL; +static MonitorFromWindow_t gs_MonitorFromWindow = NULL; +static GetMonitorInfo_t gs_GetMonitorInfo = NULL; + +class wxDisplayFactoryWin32Base : public wxDisplayFactory { - wxDisplayInfo *info = new wxDisplayInfo(); +public: + virtual ~wxDisplayFactoryWin32Base(); - // we need hMonitor to be able to map display id to it which is needed for - // MonitorXXX() functions, in particular MonitorFromPoint() - info->m_hmon = hMonitor; + bool IsOk() const { return !m_displays.empty(); } - // we also store the display geometry - info->m_rect.SetX ( lprcMonitor->left ); - info->m_rect.SetY ( lprcMonitor->top ); - info->m_rect.SetWidth ( lprcMonitor->right - lprcMonitor->left ); - info->m_rect.SetHeight ( lprcMonitor->bottom - lprcMonitor->top ); + virtual unsigned GetCount() { return unsigned(m_displays.size()); } + virtual int GetFromPoint(const wxPoint& pt); + virtual int GetFromWindow(const wxWindow *window); - // now add this monitor to the array - gs_displays->Add(info); +protected: + // ctor checks if the current system supports multimon API and dynamically + // bind the functions we need if this is the case and sets + // ms_supportsMultimon if they're available + wxDisplayFactoryWin32Base(); - // continue the enumeration - return true; -} + // delete all m_displays elements: can be called from the derived class + // dtor if it is important to do this before destroying it (as in + // wxDisplayFactoryDirectDraw case), otherwise will be done by our dtor + void Clear(); -#ifdef HAVE_DDRAW_H -BOOL PASCAL -wxDDEnumExCallback(GUID *pGuid, - LPTSTR WXUNUSED(driverDescription), - LPTSTR driverName, - LPVOID WXUNUSED(lpContext), - HMONITOR hmon) -{ - if ( pGuid ) - { - wxDisplayInfo *info = new wxDisplayInfo(); + // find the monitor corresponding to the given handle, return wxNOT_FOUND + // if not found + int FindDisplayFromHMONITOR(HMONITOR hmon) const; - info->m_hmon = hmon; - info->m_guid = *pGuid; - info->m_devName = driverName; - gs_displays->Add(info); - } - //else: we're called for the primary monitor, skip it + // flag indicating whether gs_MonitorXXX functions are available + static int ms_supportsMultimon; - // continue the enumeration - return true; -} + // the array containing information about all available displays, should be + // filled by the derived class ctors + wxDisplayInfoArray m_displays; -HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc, - LPVOID lpContext) -{ - // we need at least the mode size - static const DWORD FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH; - if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED ) - { - wxArrayVideoModes * const modes = (wxArrayVideoModes *)lpContext; - - modes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth, - lpDDSurfaceDesc->dwHeight, - lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount, - lpDDSurfaceDesc->dwRefreshRate)); - } - // continue the enumeration - return DDENUMRET_OK; -} -#endif + DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base) +}; // ---------------------------------------------------------------------------- -// local functions +// wxDisplay implementation using Windows multi-monitor support functions // ---------------------------------------------------------------------------- -#ifdef HAVE_DDRAW_H -// initialize gs_displays using DirectX functions -static bool DoInitDirectX() +class wxDisplayImplMultimon : public wxDisplayImplWin32Base { -#if wxUSE_LOG - // suppress the errors if ddraw.dll is not found - wxLog::EnableLogging(false); -#endif +public: + wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info) + : wxDisplayImplWin32Base(n, info) + { + } - wxDynamicLibrary dllDX(_T("ddraw.dll")); + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual bool ChangeMode(const wxVideoMode& mode); -#if wxUSE_LOG - wxLog::EnableLogging(); -#endif +private: + DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon) +}; - if ( !dllDX.IsLoaded() ) - return false; +class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base +{ +public: + wxDisplayFactoryMultimon(); - DirectDrawEnumerateEx_t pDDEnumEx = (DirectDrawEnumerateEx_t) - dllDX.GetSymbolAorW(_T("DirectDrawEnumerateEx")); - if ( !pDDEnumEx ) - return false; + virtual wxDisplayImpl *CreateDisplay(unsigned n); - // we'll also need DirectDrawCreate() later, resolve it right now - gs_DirectDrawCreate = (DirectDrawCreate_t) - dllDX.GetSymbol(_T("DirectDrawCreate")); - if ( !gs_DirectDrawCreate ) - return false; +private: + // EnumDisplayMonitors() callback + static BOOL CALLBACK MultimonEnumProc(HMONITOR hMonitor, + HDC hdcMonitor, + LPRECT lprcMonitor, + LPARAM dwData); - if ( (*pDDEnumEx)(wxDDEnumExCallback, - NULL, - DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK ) - { - return false; - } - // ok, it seems like we're going to use DirectDraw and so we're going to - // need ddraw.dll all the time, don't unload it - dllDX.Detach(); + // add a monitor description to m_displays array + void AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor); +}; - return true; -} -#endif +// ---------------------------------------------------------------------------- +// wxDisplay implementation using DirectDraw +// ---------------------------------------------------------------------------- + +#if wxUSE_DIRECTDRAW -// initialize gs_displays using the standard Windows functions -static void DoInitStdWindows() +struct wxDisplayInfoDirectDraw : wxDisplayInfo { - // enumerate all displays - if ( !gs_EnumDisplayMonitors(NULL, NULL, wxmswMonitorEnumProc, 0) ) + wxDisplayInfoDirectDraw(const GUID& guid, HMONITOR hmon, LPTSTR name) + : wxDisplayInfo(hmon), + m_guid(guid) { - wxLogLastError(wxT("EnumDisplayMonitors")); + m_pDD2 = NULL; + m_devName = name; + } - // TODO: still create at least one (valid) entry in gs_displays for the - // primary display! + virtual ~wxDisplayInfoDirectDraw() + { + if ( m_pDD2 ) + m_pDD2->Release(); } -} -// this function must be called before accessing gs_displays array as it -// creates and initializes it -static void InitDisplays() -{ - if ( gs_displays ) - return; - gs_displays = new wxDisplayInfoArray(); + // IDirectDraw object used to control this display, may be NULL + IDirectDraw2 *m_pDD2; + + // DirectDraw GUID for this display, only valid when using DirectDraw + const GUID m_guid; + + + DECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw) +}; -#ifdef HAVE_DDRAW_H - if ( !gs_useDirectX || !DoInitDirectX() ) +class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base +{ +public: + wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2) + : wxDisplayImplWin32Base(n, info), + m_pDD2(pDD2) { - // either we were told not to try to use DirectX or fall back to std - // functions if DirectX method failed - gs_useDirectX = false; + m_pDD2->AddRef(); + } - DoInitStdWindows(); + virtual ~wxDisplayImplDirectDraw() + { + m_pDD2->Release(); } -#else - DoInitStdWindows(); -#endif -} -// convert a DEVMODE to our wxVideoMode -wxVideoMode ConvertToVideoMode(const DEVMODE& dm) -{ - // note that dmDisplayFrequency may be 0 or 1 meaning "standard one" and - // although 0 is ok for us we don't want to return modes with 1hz refresh - return wxVideoMode(dm.dmPelsWidth, - dm.dmPelsHeight, - dm.dmBitsPerPel, - dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0); -} + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual bool ChangeMode(const wxVideoMode& mode); -#ifndef __WXWINCE__ -// emulation of ChangeDisplaySettingsEx() for Win95 -LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName), - LPDEVMODE lpDevMode, - HWND WXUNUSED(hwnd), - DWORD dwFlags, - LPVOID WXUNUSED(lParam)) -{ - return ::ChangeDisplaySettings(lpDevMode, dwFlags); -} -#endif // !__WXWINCE__ +private: + IDirectDraw2 *m_pDD2; -// ---------------------------------------------------------------------------- -// wxDisplayModule -// ---------------------------------------------------------------------------- + DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw) +}; -void wxDisplayModule::OnExit() +class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base { - delete gs_displays; -} +public: + wxDisplayFactoryDirectDraw(); + virtual ~wxDisplayFactoryDirectDraw(); -// --------------------------------------------------------------------------- -// wxDisplay -// --------------------------------------------------------------------------- + virtual wxDisplayImpl *CreateDisplay(unsigned n); -/* static */ -void wxDisplay::UseDirectX(bool useDX) -{ - wxCHECK_RET( !gs_displays, _T("it is too late to call UseDirectX") ); +private: + // callback used with DirectDrawEnumerateEx() + static BOOL WINAPI DDEnumExCallback(GUID *pGuid, + LPTSTR driverDescription, + LPTSTR driverName, + LPVOID lpContext, + HMONITOR hmon); -#ifdef HAVE_DDRAW_H - // DirectDrawEnumerateEx requires Win98 or Win2k anyway. - if ( OsSupportsMultipleMonitors() ) gs_useDirectX = useDX; -#else - wxUnusedVar(useDX); -#endif -} + // add a monitor description to m_displays array + void AddDisplay(const GUID& guid, HMONITOR hmon, LPTSTR name); -// helper for GetFromPoint() and GetFromWindow() -static int DisplayFromHMONITOR(HMONITOR hmon) -{ - if ( hmon ) - { - const size_t count = wxDisplay::GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - if ( hmon == (*gs_displays)[n].m_hmon ) - return n; - } - } + // ddraw.dll + wxDynamicLibrary m_dllDDraw; - return wxNOT_FOUND; -} + // dynamically resolved DirectDrawCreate() + DirectDrawCreate_t m_pfnDirectDrawCreate; -/* static */ -size_t wxDisplayBase::GetCount() -{ - if ( !OsSupportsMultipleMonitors() ) return 1; + DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw) +}; - InitDisplays(); +#endif // wxUSE_DIRECTDRAW - //RN: FIXME: This is wrong - the display info array should reload after every call - //to GetCount() - otherwise it will not be accurate. - //The user can change the number of displays in display properties/settings - //after GetCount or similar is called and really mess this up... - //wxASSERT_MSG( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS), - // _T("So how many displays does this system have?") ); - return gs_displays->GetCount(); -} +// ============================================================================ +// common classes implementation +// ============================================================================ -/* static */ -int wxDisplayBase::GetFromPoint ( const wxPoint& pt ) +// ---------------------------------------------------------------------------- +// wxDisplay +// ---------------------------------------------------------------------------- + +/* static */ wxDisplayFactory *wxDisplay::CreateFactory() { - if ( !OsSupportsMultipleMonitors() ) + // we have 2 implementations for modern Windows: one using standard Win32 + // and another using DirectDraw, the choice between them is done using a + // system option + +#if wxUSE_DIRECTDRAW + if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) ) { - const wxSize size = wxGetDisplaySize(); - if (pt.x >= 0 && pt.x < size.GetWidth() && - pt.y >= 0 && pt.y < size.GetHeight()) - { - return 0; - } - return wxNOT_FOUND; + wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw; + if ( factoryDD->IsOk() ) + return factoryDD; + + delete factoryDD; } +#endif // wxUSE_DIRECTDRAW - POINT pt2; - pt2.x = pt.x; - pt2.y = pt.y; + wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon; + if ( factoryMM->IsOk() ) + return factoryMM; - return DisplayFromHMONITOR(gs_MonitorFromPoint(pt2, MONITOR_DEFAULTTONULL)); + delete factoryMM; + + + // finally fall back to a stub implementation if all else failed (Win95?) + return new wxDisplayFactorySingle; } -/* static */ -int wxDisplayBase::GetFromWindow(wxWindow *window) +// ---------------------------------------------------------------------------- +// wxDisplayInfo +// ---------------------------------------------------------------------------- + +void wxDisplayInfo::Initialize() { - if ( !OsSupportsMultipleMonitors() ) + if ( m_flags == (DWORD)-1 ) { - const wxRect r(window->GetRect()); - const wxSize size = wxGetDisplaySize(); - if (r.x < size.GetWidth() && r.x + r.width >= 0 && - r.y < size.GetHeight() && r.y + r.height >= 0) + WinStruct monInfo; + if ( !gs_GetMonitorInfo(m_hmon, (LPMONITORINFO)&monInfo) ) { - return 0; + wxLogLastError(_T("GetMonitorInfo")); + m_flags = 0; + return; } - return wxNOT_FOUND; - } - return DisplayFromHMONITOR - ( - gs_MonitorFromWindow(GetHwndOf(window), MONITOR_DEFAULTTONULL) - ); + wxCopyRECTToRect(monInfo.rcMonitor, m_rect); + wxCopyRECTToRect(monInfo.rcWork, m_rectClient); + m_devName = monInfo.szDevice; + m_flags = monInfo.dwFlags; + } } // ---------------------------------------------------------------------------- -// wxDisplay ctor/dtor +// wxDisplayImplWin32Base // ---------------------------------------------------------------------------- -wxDisplay::wxDisplay ( size_t n ) - : wxDisplayBase ( n ) +wxRect wxDisplayImplWin32Base::GetGeometry() const { - if ( !OsSupportsMultipleMonitors() ) return; + if ( m_info.m_rect.IsEmpty() ) + m_info.Initialize(); - // if we do this in ctor we won't have to call it from all the member - // functions - InitDisplays(); + return m_info.m_rect; +} -#ifdef HAVE_DDRAW_H - if ( gs_useDirectX ) - { - wxDisplayInfo& dpyInfo = (*gs_displays)[n]; +wxRect wxDisplayImplWin32Base::GetClientArea() const +{ + if ( m_info.m_rectClient.IsEmpty() ) + m_info.Initialize(); - LPDIRECTDRAW2& pDD2 = dpyInfo.m_pDD2; - if ( !pDD2 ) - { - if ( !gs_DirectDrawCreate ) - { - // what to do?? - return; - } + return m_info.m_rectClient; +} - IDirectDraw *pDD; - HRESULT hr = (*gs_DirectDrawCreate)(&dpyInfo.m_guid, &pDD, NULL); +wxString wxDisplayImplWin32Base::GetName() const +{ + if ( m_info.m_devName.empty() ) + m_info.Initialize(); - if ( FAILED(hr) || !pDD ) - { - // what to do?? - wxLogApiError(_T("DirectDrawCreate"), hr); - } - else // got IDirectDraw, we want IDirectDraw2 - { - hr = pDD->QueryInterface(wxIID_IDirectDraw2, (void **)&pDD2); - if ( FAILED(hr) || !pDD2 ) - { - wxLogApiError(_T("IDirectDraw::QueryInterface(IDD2)"), hr); - } + return m_info.m_devName; +} - pDD->Release(); - } - } - //else: DirectDraw object corresponding to our display already exists - - // increment its ref count to account for Release() in dtor - // - // NB: pDD2 will be only really Release()d when gs_displays is - // destroyed which is ok as we don't want to recreate DD objects - // all the time - pDD2->AddRef(); - } -#endif +bool wxDisplayImplWin32Base::IsPrimary() const +{ + if ( m_info.m_flags == (DWORD)-1 ) + m_info.Initialize(); + + return (m_info.m_flags & MONITORINFOF_PRIMARY) != 0; } -wxDisplay::~wxDisplay() +wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const { -#ifdef HAVE_DDRAW_H - if ( !OsSupportsMultipleMonitors() ) return; + wxVideoMode mode; - wxDisplayInfo& dpyInfo = (*gs_displays)[m_index]; + // The first parameter of EnumDisplaySettings() must be NULL under Win95 + // according to MSDN. The version of GetName() we implement for Win95 + // returns an empty string. + const wxString name = GetName(); + const wxChar * const deviceName = name.empty() + ? (const wxChar*)NULL + : (const wxChar*)name.c_str(); - LPDIRECTDRAW2& pDD2 = dpyInfo.m_pDD2; - if ( pDD2 ) + DEVMODE dm; + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; + if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) ) { - pDD2->Release(); + wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)")); } -#endif + else + { + mode = ConvertToVideoMode(dm); + } + + return mode; } // ---------------------------------------------------------------------------- -// wxDisplay simple accessors +// wxDisplayFactoryWin32Base // ---------------------------------------------------------------------------- -bool wxDisplay::IsOk() const -{ -#ifdef HAVE_DDRAW_H - return m_index < GetCount() && - (!gs_useDirectX || (*gs_displays)[m_index].m_pDD2); -#else - return m_index < GetCount(); -#endif -} +int wxDisplayFactoryWin32Base::ms_supportsMultimon = -1; -wxRect wxDisplay::GetGeometry() const +wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base() { - if ( !OsSupportsMultipleMonitors() ) + if ( ms_supportsMultimon == -1 ) { - wxSize size = wxGetDisplaySize(); - return wxRect(0, 0, size.GetWidth(), size.GetHeight()); - } + ms_supportsMultimon = 0; - wxDisplayInfo& dpyInfo = (*gs_displays)[m_index]; - wxRect& rect = dpyInfo.m_rect; - if ( !rect.width ) - { - MONITORINFO monInfo; - wxZeroMemory(monInfo); - monInfo.cbSize = sizeof(monInfo); + wxDynamicLibrary dllUser32(_T("user32.dll")); - if ( !gs_GetMonitorInfo(dpyInfo.m_hmon, &monInfo) ) - { - wxLogLastError(_T("GetMonitorInfo")); - } - else - { - wxCopyRECTToRect(monInfo.rcMonitor, rect); - } + wxLogNull noLog; + + if ( (wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllUser32)) == NULL || + (wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllUser32)) == NULL || + (wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllUser32)) == NULL ) + return; + + ms_supportsMultimon = 1; + + // we can safely let dllUser32 go out of scope, the DLL itself will + // still remain loaded as all Win32 programs use it } +} - return rect; +void wxDisplayFactoryWin32Base::Clear() +{ + WX_CLEAR_ARRAY(m_displays); } -wxString wxDisplay::GetName() const +wxDisplayFactoryWin32Base::~wxDisplayFactoryWin32Base() { - if ( !OsSupportsMultipleMonitors() ) return wxT(""); + Clear(); +} - wxDisplayInfo& dpyInfo = (*gs_displays)[m_index]; - if ( dpyInfo.m_devName.empty() ) +// helper for GetFromPoint() and GetFromWindow() +int wxDisplayFactoryWin32Base::FindDisplayFromHMONITOR(HMONITOR hmon) const +{ + if ( hmon ) { - MONITORINFOEX monInfo; - wxZeroMemory(monInfo); - monInfo.cbSize = sizeof(monInfo); - - // NB: Cast from MONITORINFOEX* to MONITORINFO* is done because - // Mingw headers - unlike the ones from Microsoft's Platform SDK - - // don't derive the former from the latter in C++ mode and so - // the pointer's type is not converted implicitly. - if ( !gs_GetMonitorInfo(dpyInfo.m_hmon, (LPMONITORINFO)&monInfo) ) - { - wxLogLastError(_T("GetMonitorInfo")); - } - else + const size_t count = m_displays.size(); + for ( size_t n = 0; n < count; n++ ) { - dpyInfo.m_devName = monInfo.szDevice; + if ( hmon == m_displays[n]->m_hmon ) + return n; } } - return dpyInfo.m_devName; + return wxNOT_FOUND; } +int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt) +{ + POINT pt2; + pt2.x = pt.x; + pt2.y = pt.y; + + return FindDisplayFromHMONITOR(gs_MonitorFromPoint(pt2, + MONITOR_DEFAULTTONULL)); +} + +int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window) +{ + return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window), + MONITOR_DEFAULTTONULL)); +} + +// ============================================================================ +// wxDisplay implementation using Win32 multimon API +// ============================================================================ + // ---------------------------------------------------------------------------- -// determine if this is the primary display +// wxDisplayFactoryMultimon initialization // ---------------------------------------------------------------------------- -bool wxDisplay::IsPrimary() const +wxDisplayFactoryMultimon::wxDisplayFactoryMultimon() { - if ( !OsSupportsMultipleMonitors() ) return true; + if ( !ms_supportsMultimon ) + return; - wxDisplayInfo& dpyInfo = (*gs_displays)[m_index]; + // look up EnumDisplayMonitors() which we don't need with DirectDraw + // implementation + EnumDisplayMonitors_t pfnEnumDisplayMonitors; + { + wxLogNull noLog; - MONITORINFOEX monInfo; - wxZeroMemory(monInfo); - monInfo.cbSize = sizeof(monInfo); + wxDynamicLibrary dllUser32(_T("user32.dll")); + if ( (wxDL_INIT_FUNC(pfn, EnumDisplayMonitors, dllUser32)) == NULL ) + return; + } - // NB: Cast from MONITORINFOEX* to MONITORINFO* is done because - // Mingw headers - unlike the ones from Microsoft's Platform SDK - - // don't derive the former from the latter in C++ mode and so - // the pointer's type is not converted implicitly. - if ( !gs_GetMonitorInfo(dpyInfo.m_hmon, (LPMONITORINFO)&monInfo) ) + // enumerate all displays + if ( !pfnEnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) ) { - wxLogLastError(_T("GetMonitorInfo")); + wxLogLastError(wxT("EnumDisplayMonitors")); } +} + +/* static */ +BOOL CALLBACK +wxDisplayFactoryMultimon::MultimonEnumProc( + HMONITOR hMonitor, // handle to display monitor + HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context + LPRECT lprcMonitor, // pointer to monitor intersection rectangle + LPARAM dwData // data passed from EnumDisplayMonitors (this) +) +{ + wxDisplayFactoryMultimon *const self = (wxDisplayFactoryMultimon *)dwData; + self->AddDisplay(hMonitor, lprcMonitor); - return (monInfo.dwFlags & MONITORINFOF_PRIMARY) == MONITORINFOF_PRIMARY; + // continue the enumeration + return TRUE; } // ---------------------------------------------------------------------------- -// video modes enumeration +// wxDisplayFactoryMultimon helper functions // ---------------------------------------------------------------------------- -#ifdef HAVE_DDRAW_H -wxArrayVideoModes -wxDisplay::DoGetModesDirectX(const wxVideoMode& WXUNUSED(modeMatch)) const +void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor) { - wxArrayVideoModes modes; + wxDisplayInfo *info = new wxDisplayInfo(hMonitor); - IDirectDraw2 *pDD = (*gs_displays)[m_index].m_pDD2; + // we also store the display geometry + info->m_rect = wxRect(lprcMonitor->left, lprcMonitor->top, + lprcMonitor->right - lprcMonitor->left, + lprcMonitor->bottom - lprcMonitor->top); - if ( pDD ) - { - HRESULT hr = pDD->EnumDisplayModes - ( - DDEDM_REFRESHRATES, - NULL, // all modes (TODO: use modeMatch!) - &modes, // callback parameter - wxDDEnumModesCallback - ); + // now add this monitor to the array + m_displays.Add(info); +} - if ( FAILED(hr) ) - { - wxLogApiError(_T("IDirectDraw::EnumDisplayModes"), hr); - } - } +// ---------------------------------------------------------------------------- +// wxDisplayFactoryMultimon inherited pure virtuals implementation +// ---------------------------------------------------------------------------- - return modes; +wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n) +{ + wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") ); + + return new wxDisplayImplMultimon(n, *(m_displays[n])); } -#endif + +// ---------------------------------------------------------------------------- +// wxDisplayImplMultimon implementation +// ---------------------------------------------------------------------------- wxArrayVideoModes -wxDisplay::DoGetModesWindows(const wxVideoMode& modeMatch) const +wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const { wxArrayVideoModes modes; @@ -705,7 +659,9 @@ wxDisplay::DoGetModesWindows(const wxVideoMode& modeMatch) const // according to MSDN. The version of GetName() we implement for Win95 // returns an empty string. const wxString name = GetName(); - const wxChar * const deviceName = name.empty() ? NULL : name.c_str(); + const wxChar * const deviceName = name.empty() + ? (const wxChar*)NULL + : (const wxChar*)name.c_str(); DEVMODE dm; dm.dmSize = sizeof(dm); @@ -724,81 +680,7 @@ wxDisplay::DoGetModesWindows(const wxVideoMode& modeMatch) const return modes; } -wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& modeMatch) const -{ -#ifdef HAVE_DDRAW_H - return gs_useDirectX ? DoGetModesDirectX(modeMatch) - : DoGetModesWindows(modeMatch); -#else - return DoGetModesWindows(modeMatch); -#endif -} - -wxVideoMode wxDisplay::GetCurrentMode() const -{ - wxVideoMode mode; - - // The first parameter of EnumDisplaySettings() must be NULL under Win95 - // according to MSDN. The version of GetName() we implement for Win95 - // returns an empty string. - const wxString name = GetName(); - const wxChar * const deviceName = name.empty() ? NULL : name.c_str(); - - DEVMODE dm; - dm.dmSize = sizeof(dm); - dm.dmDriverExtra = 0; - if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) ) - { - wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)")); - } - else - { - mode = ConvertToVideoMode(dm); - } - - return mode; -} - -// ---------------------------------------------------------------------------- -// video mode switching -// ---------------------------------------------------------------------------- - -#ifdef HAVE_DDRAW_H -bool wxDisplay::DoChangeModeDirectX(const wxVideoMode& mode) -{ - IDirectDraw2 *pDD = (*gs_displays)[m_index].m_pDD2; - if ( !pDD ) - return false; - - wxWindow *winTop = wxTheApp->GetTopWindow(); - wxCHECK_MSG( winTop, false, _T("top level window required for DirectX") ); - - HRESULT hr = pDD->SetCooperativeLevel - ( - GetHwndOf(winTop), - DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN - ); - if ( FAILED(hr) ) - { - wxLogApiError(_T("IDirectDraw::SetCooperativeLevel"), hr); - - return false; - } - - hr = pDD->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0); - if ( FAILED(hr) ) - { - wxLogApiError(_T("IDirectDraw::SetDisplayMode"), hr); - - return false; - } - - - return true; -} -#endif - -bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode) +bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) { // prepare ChangeDisplaySettingsEx() parameters DEVMODE dm; @@ -856,8 +738,7 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode) wxDynamicLibrary dllUser32(_T("user32.dll")); if ( dllUser32.IsLoaded() ) { - pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t) - dllUser32.GetSymbolAorW(_T("ChangeDisplaySettingsEx")); + wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllUser32); } //else: huh, no user32.dll?? @@ -874,11 +755,11 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode) // do change the mode switch ( pfnChangeDisplaySettingsEx ( - GetName(), // display name - pDevMode, // dev mode or NULL to reset - NULL, // reserved + GetName().wx_str(), // display name + pDevMode, // dev mode or NULL to reset + NULL, // reserved flags, - NULL // pointer to video parameters (not used) + NULL // pointer to video parameters (not used) ) ) { case DISP_CHANGE_SUCCESSFUL: @@ -908,14 +789,241 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode) return false; } -bool wxDisplay::ChangeMode(const wxVideoMode& mode) + +// ============================================================================ +// DirectDraw-based wxDisplay implementation +// ============================================================================ + +#if wxUSE_DIRECTDRAW + +// ---------------------------------------------------------------------------- +// wxDisplayFactoryDirectDraw initialization +// ---------------------------------------------------------------------------- + +wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw() { -#ifdef HAVE_DDRAW_H - return gs_useDirectX ? DoChangeModeDirectX(mode) - : DoChangeModeWindows(mode); -#else - return DoChangeModeWindows(mode); + if ( !ms_supportsMultimon ) + return; + +#if wxUSE_LOG + // suppress the errors if ddraw.dll is not found, we're prepared to handle + // this + wxLogNull noLog; #endif + + m_dllDDraw.Load(_T("ddraw.dll")); + + if ( !m_dllDDraw.IsLoaded() ) + return; + + DirectDrawEnumerateEx_t + wxDL_INIT_FUNC_AW(pfn, DirectDrawEnumerateEx, m_dllDDraw); + if ( !pfnDirectDrawEnumerateEx ) + return; + + // we can't continue without DirectDrawCreate() later, so resolve it right + // now and fail the initialization if it's not available + if ( !wxDL_INIT_FUNC(m_pfn, DirectDrawCreate, m_dllDDraw) ) + return; + + if ( (*pfnDirectDrawEnumerateEx)(DDEnumExCallback, + this, + DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK ) + { + wxLogLastError(_T("DirectDrawEnumerateEx")); + } +} + +wxDisplayFactoryDirectDraw::~wxDisplayFactoryDirectDraw() +{ + // we must clear m_displays now, before m_dllDDraw is unloaded as otherwise + // calling m_pDD2->Release() later would crash + Clear(); +} + +// ---------------------------------------------------------------------------- +// callbacks for monitor/modes enumeration stuff +// ---------------------------------------------------------------------------- + +BOOL WINAPI +wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid, + LPTSTR WXUNUSED(driverDescription), + LPTSTR driverName, + LPVOID lpContext, + HMONITOR hmon) +{ + if ( pGuid ) + { + wxDisplayFactoryDirectDraw * self = + wx_static_cast(wxDisplayFactoryDirectDraw *, lpContext); + self->AddDisplay(*pGuid, hmon, driverName); + } + //else: we're called for the primary monitor, skip it + + // continue the enumeration + return TRUE; +} + +// ---------------------------------------------------------------------------- +// wxDisplayFactoryDirectDraw helpers +// ---------------------------------------------------------------------------- + +void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid, + HMONITOR hmon, + LPTSTR name) +{ + m_displays.Add(new wxDisplayInfoDirectDraw(guid, hmon, name)); } +// ---------------------------------------------------------------------------- +// wxDisplayFactoryDirectDraw inherited pure virtuals implementation +// ---------------------------------------------------------------------------- + +wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n) +{ + wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") ); + + wxDisplayInfoDirectDraw * + info = wx_static_cast(wxDisplayInfoDirectDraw *, m_displays[n]); + + if ( !info->m_pDD2 ) + { + IDirectDraw *pDD; + GUID guid(info->m_guid); + HRESULT hr = (*m_pfnDirectDrawCreate)(&guid, &pDD, NULL); + + if ( FAILED(hr) || !pDD ) + { + // what to do?? + wxLogApiError(_T("DirectDrawCreate"), hr); + return NULL; + } + + // we got IDirectDraw, but we need IDirectDraw2 + hr = pDD->QueryInterface(wxIID_IDirectDraw2, (void **)&info->m_pDD2); + pDD->Release(); + + if ( FAILED(hr) || !info->m_pDD2 ) + { + wxLogApiError(_T("IDirectDraw::QueryInterface(IDD2)"), hr); + return NULL; + } + + // NB: m_pDD2 will now be only destroyed when m_displays is destroyed + // which is ok as we don't want to recreate DD objects all the time + } + //else: DirectDraw object corresponding to our display already exists + + return new wxDisplayImplDirectDraw(n, *info, info->m_pDD2); +} + +// ============================================================================ +// wxDisplayImplDirectDraw +// ============================================================================ + +// ---------------------------------------------------------------------------- +// video modes enumeration +// ---------------------------------------------------------------------------- + +// tiny helper class used to pass information from GetModes() to +// wxDDEnumModesCallback +class wxDDVideoModesAdder +{ +public: + // our Add() method will add modes matching modeMatch to modes array + wxDDVideoModesAdder(wxArrayVideoModes& modes, const wxVideoMode& modeMatch) + : m_modes(modes), + m_modeMatch(modeMatch) + { + } + + void Add(const wxVideoMode& mode) + { + if ( mode.Matches(m_modeMatch) ) + m_modes.Add(mode); + } + +private: + wxArrayVideoModes& m_modes; + const wxVideoMode& m_modeMatch; + + DECLARE_NO_COPY_CLASS(wxDDVideoModesAdder) +}; + +HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc, + LPVOID lpContext) +{ + // we need at least the mode size + static const DWORD FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH; + if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED ) + { + wxDDVideoModesAdder * const vmodes = + wx_static_cast(wxDDVideoModesAdder *, lpContext); + + vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth, + lpDDSurfaceDesc->dwHeight, + lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount, + lpDDSurfaceDesc->dwRefreshRate)); + } + + // continue the enumeration + return DDENUMRET_OK; +} + +wxArrayVideoModes +wxDisplayImplDirectDraw::GetModes(const wxVideoMode& modeMatch) const +{ + wxArrayVideoModes modes; + wxDDVideoModesAdder modesAdder(modes, modeMatch); + + HRESULT hr = m_pDD2->EnumDisplayModes + ( + DDEDM_REFRESHRATES, + NULL, // all modes + &modesAdder, // callback parameter + wxDDEnumModesCallback + ); + + if ( FAILED(hr) ) + { + wxLogApiError(_T("IDirectDraw::EnumDisplayModes"), hr); + } + + return modes; +} + +// ---------------------------------------------------------------------------- +// video mode switching +// ---------------------------------------------------------------------------- + +bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode) +{ + wxWindow *winTop = wxTheApp->GetTopWindow(); + wxCHECK_MSG( winTop, false, _T("top level window required for DirectX") ); + + HRESULT hr = m_pDD2->SetCooperativeLevel + ( + GetHwndOf(winTop), + DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN + ); + if ( FAILED(hr) ) + { + wxLogApiError(_T("IDirectDraw2::SetCooperativeLevel"), hr); + + return false; + } + + hr = m_pDD2->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0); + if ( FAILED(hr) ) + { + wxLogApiError(_T("IDirectDraw2::SetDisplayMode"), hr); + + return false; + } + + return true; +} + +#endif // wxUSE_DIRECTDRAW + #endif // wxUSE_DISPLAY