X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fmonitor.h;h=8d86d4e0c9507673df77444195dc3e250574d2ad;hb=1ea8498c4c729f849095e2f4aa3d282de2000a35;hp=18586db50d4782f8871ca0c6e459b90df74b12bf;hpb=0913ba6fdd0e28740e0b521f275b9ce82c4a1b7a;p=libs%2Fgui.git

diff --git a/source/graphics/monitor.h b/source/graphics/monitor.h
index 18586db..8d86d4e 100644
--- a/source/graphics/monitor.h
+++ b/source/graphics/monitor.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GRAPHICS_MONITOR_H_
 #define MSP_GRAPHICS_MONITOR_H_
 
-#include <list>
 #include <string>
+#include <vector>
 #include "videomode.h"
 
 namespace Msp {
@@ -10,17 +10,21 @@ namespace Graphics {
 
 struct Monitor
 {
-	unsigned index;
-	std::list<const VideoMode *> video_modes;
-	const VideoMode *desktop_mode;
-	VideoRotation desktop_rotation;
-	const VideoMode *current_mode;
-	VideoRotation current_rotation;
-	int x, y;
-	const Monitor *next_left;
-	const Monitor *next_right;
+	struct Settings
+	{
+		const VideoMode *mode = nullptr;
+		VideoRotation rotation = ROTATE_NORMAL;
+		int x = 0;
+		int y = 0;
+	};
 
-	Monitor();
+	unsigned index = 0;
+	std::string name;
+	std::vector<const VideoMode *> video_modes;
+	Settings desktop_settings;
+	Settings current_settings;
+	const Monitor *next_left = nullptr;
+	const Monitor *next_right = nullptr;
 };
 
 } // namespace Graphics