-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/strings/formatter.h>
-#include "../gbase/display.h"
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <X11/Xlib.h>
+#endif
+#include <msp/gbase/display.h>
+#include <msp/strings/format.h>
#include "keyboard.h"
#include "keys.h"
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
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;