X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=examples%2Fev.cpp;h=e164879993a9db3190ac63d747d63df89a6a5efb;hb=5d8a8dbe07aaf8d9bd2c4c2982b34a877aee432f;hp=9ded9c7bb47e07867d59f00ee12143594450b81a;hpb=e8ebbdbe8dbaec58f9e661efa3124118705fcd13;p=libs%2Fgui.git

diff --git a/examples/ev.cpp b/examples/ev.cpp
index 9ded9c7..e164879 100644
--- a/examples/ev.cpp
+++ b/examples/ev.cpp
@@ -3,6 +3,8 @@
 #include <msp/input/keyboard.h>
 #include <msp/input/mouse.h>
 #include <msp/io/print.h>
+#include <msp/stringcodec/codec.h>
+#include <msp/stringcodec/utf8.h>
 
 using namespace Msp;
 
@@ -21,6 +23,7 @@ private:
 
 	void key_press(unsigned);
 	void key_release(unsigned);
+	void character(StringCodec::unichar);
 	void button_press(unsigned);
 	void button_release(unsigned);
 	void axis_motion(unsigned, float, float);
@@ -32,11 +35,13 @@ Ev::Ev(int, char **):
 	mouse(window)
 {
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Ev::exit), 0));
-	keyboard.signal_button_press.connect(sigc::mem_fun(this, &Ev::key_press));
-	keyboard.signal_button_release.connect(sigc::mem_fun(this, &Ev::key_release));
-	mouse.signal_button_press.connect(sigc::mem_fun(this, &Ev::button_press));
-	mouse.signal_button_release.connect(sigc::mem_fun(this, &Ev::button_release));
-	mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Ev::axis_motion));
+	keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::key_press), false));
+	keyboard.signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::key_release), false));
+	keyboard.signal_character.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::character), false));
+	mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::button_press), false));
+	mouse.signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::button_release), false));
+	mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Ev::axis_motion), false));
+	window.set_title("Event tester");
 	window.show();
 }
 
@@ -55,6 +60,11 @@ void Ev::key_release(unsigned key)
 	IO::print("key_release: %s\n", keyboard.get_button_name(key));
 }
 
+void Ev::character(StringCodec::unichar ch)
+{
+	IO::print("character: %s\n", StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
+}
+
 void Ev::button_press(unsigned btn)
 {
 	IO::print("button_press: %s\n", mouse.get_button_name(btn));