X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fkeyboard.cpp;h=02ff12eb2c0c2e7d02f739e776ddc6433bc9c815;hb=cc728fda1325c5358f3ec177d31621b5688371fe;hp=cef812c1344d3cdfa5f2c7ef181caf43d29c7f1c;hpb=fcd5f24311fcfe772825a75678e038749401a9be;p=libs%2Fgui.git

diff --git a/source/input/keyboard.cpp b/source/input/keyboard.cpp
index cef812c..02ff12e 100644
--- a/source/input/keyboard.cpp
+++ b/source/input/keyboard.cpp
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <X11/Xlib.h>
 #endif
-#include <msp/strings/formatter.h>
-#include "../gbase/display.h"
+#include <msp/graphics/display.h>
+#include <msp/strings/format.h>
 #include "keyboard.h"
 #include "keys.h"
 
@@ -20,15 +13,15 @@ Distributed under the LGPL
 namespace Msp {
 namespace Input {
 
-Keyboard::Keyboard(Graphics::Window &w):
-	window(w)
+Keyboard::Keyboard(Graphics::EventSource &s):
+	source(s)
 {
-	name="Keyboard";
+	name = "Keyboard";
 
 	buttons.resize(N_KEYS_, false);
 
-	window.signal_key_press.connect(sigc::mem_fun(this, &Keyboard::key_press));
-	window.signal_key_release.connect(sigc::mem_fun(this, &Keyboard::key_release));
+	source.signal_key_press.connect(sigc::mem_fun(this, &Keyboard::key_press));
+	source.signal_key_release.connect(sigc::mem_fun(this, &Keyboard::key_release));
 }
 
 std::string Keyboard::get_button_name(unsigned btn) const
@@ -36,13 +29,13 @@ std::string Keyboard::get_button_name(unsigned btn) const
 	if(btn==0)
 		return "None";
 #ifndef WIN32
-	const char *str=XKeysymToString(key_to_sys(btn));
+	const char *str = XKeysymToString(key_to_sys(btn));
 	if(!str)
 		return format("Key %d", btn);
 	return str;
 #else
 	char buf[128];
-	unsigned scan=MapVirtualKey(key_to_sys(btn), MAPVK_VK_TO_VSC);
+	unsigned scan = MapVirtualKey(key_to_sys(btn), MAPVK_VK_TO_VSC);
 	if(!GetKeyNameText(scan<<16, buf, sizeof(buf)))
 		return format("Key %d", btn);
 	return buf;