X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fkeyboard.h;h=15fe4f95cd814f7ef6c7034659c265f29ede18d9;hb=b45ba2f7ceb60c1a6abc1a951a97b40c03671264;hp=1b70fecfbde1211b07c48c1fb78e78ae32c21aa9;hpb=7a4a508629d370c4a79791c7e62fd6f59e8564e9;p=libs%2Fgui.git

diff --git a/source/input/keyboard.h b/source/input/keyboard.h
index 1b70fec..15fe4f9 100644
--- a/source/input/keyboard.h
+++ b/source/input/keyboard.h
@@ -1,15 +1,10 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_KEYBOARD_H_
-#define MSP_GBASE_KEYBOARD_H_
+#ifndef MSP_INPUT_KEYBOARD_H_
+#define MSP_INPUT_KEYBOARD_H_
 
+#include <sigc++/trackable.h>
+#include <msp/graphics/window.h>
+#include <msp/stringcodec/ustring.h>
 #include "device.h"
-#include "../gbase/window.h"
 
 namespace Msp {
 namespace Input {
@@ -18,18 +13,21 @@ namespace Input {
 Adapts key events from a window to the abstracted input framework.  Key codes
 are translated to platform-independent values.  See keys.h for a list.
 */
-class Keyboard: public Device
+class Keyboard: public Device, public sigc::trackable
 {
+public:
+	sigc::signal<bool, StringCodec::unichar>::accumulated<EventAccumulator> signal_character;
+
 private:
 	Graphics::Window &window;
 
 public:
 	Keyboard(Graphics::Window &);
+	virtual ~Keyboard();
 
 	virtual std::string get_button_name(unsigned) const;
 private:
-	void key_press(unsigned, unsigned, unsigned);
-	void key_release(unsigned, unsigned);
+	void input_event(const Graphics::Window::Event &);
 };
 
 } // namespace Input