#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
-
-#if !defined(wxUSE_DIRECTDRAW)
- #define wxUSE_DIRECTDRAW 0
-#endif
+#include "wx/msw/private.h"
#ifndef __WXWINCE__
// Older versions of windef.h don't define HMONITOR. Unfortunately, we
#endif
#endif // !__WXWINCE__
-#if wxUSE_DIRECTDRAW
- #include <ddraw.h>
-
- // 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
+// display functions are found in different DLLs under WinCE and normal Win32
+#ifdef __WXWINCE__
+static const wxChar displayDllName[] = wxT("coredll.dll");
+#else
+static const wxChar displayDllName[] = wxT("user32.dll");
+#endif
// ----------------------------------------------------------------------------
// typedefs for dynamically loaded Windows functions
DWORD dwFlags,
LPVOID lParam);
-#if wxUSE_DIRECTDRAW
-typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
- LPTSTR driverDescription,
- LPTSTR driverName,
- LPVOID lpContext,
- HMONITOR hmon);
-
-typedef HRESULT (WINAPI *DirectDrawEnumerateEx_t)(DDEnumExCallback_t lpCallback,
- LPVOID lpContext,
- DWORD dwFlags);
-
-typedef HRESULT (WINAPI *DirectDrawCreate_t)(GUID *lpGUID,
- LPDIRECTDRAW *lplpDD,
- IUnknown *pUnkOuter);
-#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);
virtual unsigned GetCount() { return unsigned(m_displays.size()); }
virtual int GetFromPoint(const wxPoint& pt);
- virtual int GetFromWindow(wxWindow *window);
+ virtual int GetFromWindow(const wxWindow *window);
protected:
// ctor checks if the current system supports multimon API and dynamically
wxDisplayFactoryWin32Base();
// 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
+ // dtor if it is important to do this before destroying it,
+ // otherwise will be done by our dtor
void Clear();
// find the monitor corresponding to the given handle, return wxNOT_FOUND
wxDisplayInfoArray m_displays;
- DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base)
+ wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base);
};
// ----------------------------------------------------------------------------
virtual bool ChangeMode(const wxVideoMode& mode);
private:
- DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
+ wxDECLARE_NO_COPY_CLASS(wxDisplayImplMultimon);
};
class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
LPRECT lprcMonitor,
LPARAM dwData);
-
// add a monitor description to m_displays array
void AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor);
};
-// ----------------------------------------------------------------------------
-// wxDisplay implementation using DirectDraw
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DIRECTDRAW
-
-struct wxDisplayInfoDirectDraw : wxDisplayInfo
-{
- wxDisplayInfoDirectDraw(const GUID& guid, HMONITOR hmon, LPTSTR name)
- : wxDisplayInfo(hmon),
- m_guid(guid)
- {
- m_pDD2 = NULL;
- m_devName = name;
- }
-
- virtual ~wxDisplayInfoDirectDraw()
- {
- if ( m_pDD2 )
- m_pDD2->Release();
- }
-
-
- // 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)
-};
-
-class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
-{
-public:
- wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2)
- : wxDisplayImplWin32Base(n, info),
- m_pDD2(pDD2)
- {
- m_pDD2->AddRef();
- }
-
- virtual ~wxDisplayImplDirectDraw()
- {
- m_pDD2->Release();
- }
-
- virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
- virtual bool ChangeMode(const wxVideoMode& mode);
-
-private:
- IDirectDraw2 *m_pDD2;
-
- DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
-};
-
-class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
-{
-public:
- wxDisplayFactoryDirectDraw();
- virtual ~wxDisplayFactoryDirectDraw();
-
- virtual wxDisplayImpl *CreateDisplay(unsigned n);
-
-private:
- // callback used with DirectDrawEnumerateEx()
- static BOOL WINAPI DDEnumExCallback(GUID *pGuid,
- LPTSTR driverDescription,
- LPTSTR driverName,
- LPVOID lpContext,
- HMONITOR hmon);
-
- // add a monitor description to m_displays array
- void AddDisplay(const GUID& guid, HMONITOR hmon, LPTSTR name);
-
-
- // ddraw.dll
- wxDynamicLibrary m_dllDDraw;
-
- // dynamically resolved DirectDrawCreate()
- DirectDrawCreate_t m_pfnDirectDrawCreate;
-
- DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw)
-};
-
-#endif // wxUSE_DIRECTDRAW
-
// ============================================================================
// common classes implementation
/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{
- // 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")) )
- {
- wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;
- if ( factoryDD->IsOk() )
- return factoryDD;
-
- delete factoryDD;
- }
-#endif // wxUSE_DIRECTDRAW
-
wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;
+
if ( factoryMM->IsOk() )
return factoryMM;
delete factoryMM;
-
// finally fall back to a stub implementation if all else failed (Win95?)
return new wxDisplayFactorySingle;
}
+
// ----------------------------------------------------------------------------
// wxDisplayInfo
// ----------------------------------------------------------------------------
WinStruct<MONITORINFOEX> monInfo;
if ( !gs_GetMonitorInfo(m_hmon, (LPMONITORINFO)&monInfo) )
{
- wxLogLastError(_T("GetMonitorInfo"));
+ wxLogLastError(wxT("GetMonitorInfo"));
m_flags = 0;
return;
}
// 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);
dm.dmDriverExtra = 0;
if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) )
{
- wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
+ wxLogLastError(wxT("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
}
else
{
{
ms_supportsMultimon = 0;
- wxDynamicLibrary dllUser32(_T("user32.dll"));
+ wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
- wxLogNull noLog;
-
- gs_MonitorFromPoint = (MonitorFromPoint_t)
- dllUser32.GetSymbol(wxT("MonitorFromPoint"));
- if ( !gs_MonitorFromPoint )
- return;
-
- gs_MonitorFromWindow = (MonitorFromWindow_t)
- dllUser32.GetSymbol(wxT("MonitorFromWindow"));
- if ( !gs_MonitorFromWindow )
- return;
-
- gs_GetMonitorInfo = (GetMonitorInfo_t)
- dllUser32.GetSymbolAorW(wxT("GetMonitorInfo"));
- if ( !gs_GetMonitorInfo )
+ if ( (wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllDisplay)) == NULL ||
+ (wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllDisplay)) == NULL ||
+ (wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllDisplay)) == 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
+ // we can safely let dllDisplay go out of scope, the DLL itself will
+ // still remain loaded as all programs link to it statically anyhow
}
}
MONITOR_DEFAULTTONULL));
}
-int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window)
+int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window)
{
return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
MONITOR_DEFAULTTONULL));
if ( !ms_supportsMultimon )
return;
- // look up EnumDisplayMonitors() which we don't need with DirectDraw
- // implementation
+ // look up EnumDisplayMonitors()
EnumDisplayMonitors_t pfnEnumDisplayMonitors;
{
- wxLogNull noLog;
-
- wxDynamicLibrary dllUser32(_T("user32.dll"));
- pfnEnumDisplayMonitors = (EnumDisplayMonitors_t)
- dllUser32.GetSymbol(wxT("EnumDisplayMonitors"));
- if ( !pfnEnumDisplayMonitors )
+ wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+ if ( (wxDL_INIT_FUNC(pfn, EnumDisplayMonitors, dllDisplay)) == NULL )
return;
}
wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n)
{
- wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
+ wxCHECK_MSG( n < m_displays.size(), NULL, wxT("invalid display index") );
return new wxDisplayImplMultimon(n, *(m_displays[n]));
}
// 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);
}
else // change to the given mode
{
- wxCHECK_MSG( mode.w && mode.h, false,
- _T("at least the width and height must be specified") );
+ wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false,
+ wxT("at least the width and height must be specified") );
wxZeroMemory(dm);
dm.dmSize = sizeof(dm);
dm.dmDriverExtra = 0;
dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
- dm.dmPelsWidth = mode.w;
- dm.dmPelsHeight = mode.h;
+ dm.dmPelsWidth = mode.GetWidth();
+ dm.dmPelsHeight = mode.GetHeight();
- if ( mode.bpp )
+ if ( mode.GetDepth() )
{
dm.dmFields |= DM_BITSPERPEL;
- dm.dmBitsPerPel = mode.bpp;
+ dm.dmBitsPerPel = mode.GetDepth();
}
- if ( mode.refresh )
+ if ( mode.GetRefresh() )
{
dm.dmFields |= DM_DISPLAYFREQUENCY;
- dm.dmDisplayFrequency = mode.refresh;
+ dm.dmDisplayFrequency = mode.GetRefresh();
}
pDevMode = &dm;
static ChangeDisplaySettingsEx_t pfnChangeDisplaySettingsEx = NULL;
if ( !pfnChangeDisplaySettingsEx )
{
- wxDynamicLibrary dllUser32(_T("user32.dll"));
- if ( dllUser32.IsLoaded() )
+ wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+ if ( dllDisplay.IsLoaded() )
{
- pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t)
- dllUser32.GetSymbolAorW(_T("ChangeDisplaySettingsEx"));
+ wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllDisplay);
}
- //else: huh, no user32.dll??
+ //else: huh, no this DLL must always be present, what's going on??
#ifndef __WXWINCE__
if ( !pfnChangeDisplaySettingsEx )
// 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:
if (frameTop && frameTop->IsFullScreen())
{
wxVideoMode current = GetCurrentMode();
- frameTop->SetClientSize(current.w, current.h);
+ frameTop->SetClientSize(current.GetWidth(), current.GetHeight());
}
}
return true;
break;
default:
- wxFAIL_MSG( _T("unexpected ChangeDisplaySettingsEx() return value") );
+ wxFAIL_MSG( wxT("unexpected ChangeDisplaySettingsEx() return value") );
}
return false;
}
-
-// ============================================================================
-// DirectDraw-based wxDisplay implementation
-// ============================================================================
-
-#if wxUSE_DIRECTDRAW
-
-// ----------------------------------------------------------------------------
-// wxDisplayFactoryDirectDraw initialization
-// ----------------------------------------------------------------------------
-
-wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw()
-{
- 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 pDDEnumEx = (DirectDrawEnumerateEx_t)
- m_dllDDraw.GetSymbolAorW(_T("DirectDrawEnumerateEx"));
- if ( !pDDEnumEx )
- return;
-
- // we can't continue without DirectDrawCreate() later, so resolve it right
- // now and fail the initialization if it's not available
- m_pfnDirectDrawCreate = (DirectDrawCreate_t)
- m_dllDDraw.GetSymbol(_T("DirectDrawCreate"));
- if ( !m_pfnDirectDrawCreate )
- return;
-
- if ( (*pDDEnumEx)(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
projects / wxWidgets.git / blobdiff