X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fdisplay.h;h=5f84848d16781cb7a2ec76fa42e5f8d833674c6b;hb=d7686e3867e3c68cec0d3767a21f9d2408383085;hp=370bf0dea81013c03d2212ae77e2cfabd9cb7981;hpb=e09c2211539f417474b1d3226f56f021938329bf;p=libs%2Fgui.git

diff --git a/source/graphics/display.h b/source/graphics/display.h
index 370bf0d..5f84848 100644
--- a/source/graphics/display.h
+++ b/source/graphics/display.h
@@ -1,9 +1,13 @@
 #ifndef MSP_GRAPHICS_DISPLAY_H_
 #define MSP_GRAPHICS_DISPLAY_H_
 
-#include <list>
 #include <stdexcept>
 #include <string>
+#include <vector>
+#include <sigc++/signal.h>
+#include "errordialog.h"
+#include "monitor.h"
+#include "mspgui_api.h"
 #include "videomode.h"
 
 namespace Msp {
@@ -11,15 +15,21 @@ namespace Graphics {
 
 class Window;
 
-class Display
+class MSPGUI_API Display
 {
 public:
 	struct Private;
 
+	sigc::signal<void> signal_got_focus;
+	sigc::signal<void> signal_lost_focus;
+
 private:
-	std::list<VideoMode> modes;
-	VideoMode orig_mode;
-	Private *priv;
+	std::vector<Monitor> monitors;
+	Monitor *primary_monitor = nullptr;
+	std::vector<VideoMode> modes;
+	Private *priv = nullptr;
+	ErrorDialog *err_dialog = nullptr;
+	Window *focus_window = nullptr;
 
 public:
 	Display(const std::string &disp_name = std::string());
@@ -30,11 +40,21 @@ public:
 	void add_window(Window &);
 	void remove_window(Window &);
 
-	const std::list<VideoMode> &get_modes() const { return modes; }
-	const VideoMode &get_desktop_mode() const { return orig_mode; }
-	void set_mode(const VideoMode &);
-	void restore_mode() { set_mode(orig_mode); }
+	const std::vector<Monitor> &get_monitors() const { return monitors; }
+	const std::vector<VideoMode> &get_modes() const { return modes; }
+	const VideoMode &get_desktop_mode() const;
+	void set_mode(const VideoMode &, bool = false);
+	void restore_mode();
+	const VideoMode *find_mode(const VideoMode &, float = 0.5f) const;
+	const VideoMode *find_mode(unsigned, unsigned) const;
 
+private:
+	void window_got_focus(Window &);
+	void window_lost_focus();
+public:
+	Window *get_focus_window() const { return focus_window; }
+
+public:
 	void tick();
 private:
 	bool process_events();