X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fdisplay.cpp;h=ebf14ea489c9d1befa6c8efd192a12806d5833d6;hb=a8a9191481151f049781b670ea8883025a594a5f;hp=40112a35f9408760c5f6ab05ea286033403282b1;hpb=9ffb9f22faf7c540083e6df828500d54aabcbb56;p=libs%2Fgui.git

diff --git a/source/graphics/display.cpp b/source/graphics/display.cpp
index 40112a3..ebf14ea 100644
--- a/source/graphics/display.cpp
+++ b/source/graphics/display.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <sigc++/bind.h>
 #include "display.h"
 #include "display_private.h"
 #include "window.h"
@@ -11,25 +12,29 @@ namespace Graphics {
 void Display::add_window(Window &wnd)
 {
 	priv->windows[wnd.get_private().window] = &wnd;
+	wnd.signal_got_focus.connect(sigc::bind(sigc::mem_fun(this, &Display::window_got_focus), sigc::ref(wnd)));
+	wnd.signal_lost_focus.connect(sigc::mem_fun(this, &Display::window_lost_focus));
 }
 
 void Display::remove_window(Window &wnd)
 {
 	priv->windows.erase(wnd.get_private().window);
+	if(&wnd==focus_window)
+		focus_window = 0;
 }
 
 const VideoMode &Display::get_desktop_mode() const
 {
-	if(!primary_monitor || !primary_monitor->desktop_mode)
+	if(!primary_monitor || !primary_monitor->desktop_settings.mode)
 		throw logic_error("no desktop mode");
-	return *primary_monitor->desktop_mode;
+	return *primary_monitor->desktop_settings.mode;
 }
 
 void Display::restore_mode()
 {
 	for(list<Monitor>::const_iterator i=monitors.begin(); i!=monitors.end(); ++i)
-		if(i->desktop_mode)
-			set_mode(*i->desktop_mode, false);
+		if(i->desktop_settings.mode)
+			set_mode(*i->desktop_settings.mode, false);
 }
 
 const VideoMode *Display::find_mode(const VideoMode &mode, float rate_tolerance) const
@@ -66,11 +71,28 @@ const VideoMode *Display::find_mode(unsigned width, unsigned height) const
 	return find_mode(VideoMode(width, height));
 }
 
+void Display::window_got_focus(Window &w)
+{
+	focus_window = &w;
+}
+
+void Display::window_lost_focus()
+{
+	focus_window = 0;
+}
+
 void Display::tick()
 {
 	check_error();
 
+	Window *old_focus = focus_window;
+
 	while(process_events()) ;
+
+	if(old_focus && !focus_window)
+		signal_lost_focus.emit();
+	else if(!old_focus && focus_window)
+		signal_got_focus.emit();
 }
 
 } // namespace Graphics