Let platform header determine (part of) the contents of Display::Private

This simplifies things a bit as there's no need to declare dummy typedefs
for MonitorHandle and ModeHandle if they are not used.  It also makes the
upcoming Android support a lot easier to accomplish.

diff --git a/source/graphics/cocoa/display_platform.h b/source/graphics/cocoa/display_platform.h
index 2c59e066b222a33bd348c9ab49974c6f243c624c..09258673c8959dabaff7a5a3f1442ba8cb5d06c7 100644 (file)
--- a/source/graphics/cocoa/display_platform.h
+++ b/source/graphics/cocoa/display_platform.h
@@ -7,8 +7,10 @@ namespace Msp {
 namespace Graphics {
 
 typedef CocoaDisplay *DisplayHandle;
-typedef int MonitorHandle;
-typedef int ModeHandle;
+
+struct PlatformDisplayPrivate
+{
+};
 
 } // namespace Graphics
 } // namespace Msp

diff --git a/source/graphics/display_private.h b/source/graphics/display_private.h
index 4a88cedb1aeb0164669fa1a6592966ef54e360a4..d5f0bf014bdfe9431957c3c5286e147cb5c52cdf 100644 (file)
--- a/source/graphics/display_private.h
+++ b/source/graphics/display_private.h
@@ -10,12 +10,10 @@
 namespace Msp {
 namespace Graphics {
 
-struct Display::Private
+struct Display::Private: PlatformDisplayPrivate
 {
        DisplayHandle display;
        std::map<WindowHandle, Window *> windows;
-       std::vector<MonitorHandle> monitors;
-       std::vector<ModeHandle> modes;
 };
 
 } // namespace Graphics

diff --git a/source/graphics/windows/display_platform.h b/source/graphics/windows/display_platform.h
index 4abaee7b5cdff3ec5322da63645daa04e7f49f1a..99329ae72defea8f5c04b4d472a6309371d9bad2 100644 (file)
--- a/source/graphics/windows/display_platform.h
+++ b/source/graphics/windows/display_platform.h
@@ -5,8 +5,11 @@ namespace Msp {
 namespace Graphics {
 
 typedef void *DisplayHandle;
-typedef std::string MonitorHandle;
-typedef int ModeHandle;
+
+struct PlatformDisplayPrivate
+{
+       std::vector<std::string> monitors;
+};
 
 } // namespace Graphics
 } // namespace Msp

diff --git a/source/graphics/x11/display_platform.h b/source/graphics/x11/display_platform.h
index 3a213c009eaa7004cf98e24286b4fe5d63621e15..4335f1cac3a5de89c52386f5e3e26baaa7b90e3f 100644 (file)
--- a/source/graphics/x11/display_platform.h
+++ b/source/graphics/x11/display_platform.h
@@ -10,13 +10,14 @@ namespace Msp {
 namespace Graphics {
 
 typedef ::Display *DisplayHandle;
+
+struct PlatformDisplayPrivate
+{
 #ifdef WITH_XRANDR
-typedef RROutput MonitorHandle;
-typedef RRMode ModeHandle;
-#else
-typedef int MonitorHandle;
-typedef int ModeHandle;
+       std::vector<RROutput> monitors;
+       std::vector<RRMode> modes;
 #endif
+};
 
 } // namespace Graphics
 } // namespace Msp