-#ifdef WIN32
-#include <windows.h>
-#else
-#include <X11/Xlib.h>
-#endif
-#include <msp/graphics/display.h>
-#include <msp/strings/format.h>
+#include <msp/graphics/window.h>
#include "keyboard.h"
#include "keys.h"
-#define MAPVK_VK_TO_VSC 0
-
namespace Msp {
namespace Input {
-Keyboard::Keyboard(Graphics::EventSource &s):
- source(s)
+Keyboard::Keyboard(Graphics::Window &w):
+ window(w)
{
name = "Keyboard";
buttons.resize(N_KEYS_, false);
- source.signal_key_press.connect(sigc::mem_fun(this, &Keyboard::key_press));
- source.signal_key_release.connect(sigc::mem_fun(this, &Keyboard::key_release));
+ window.signal_input_event.connect(sigc::mem_fun(this, &Keyboard::input_event));
}
-std::string Keyboard::get_button_name(unsigned btn) const
-{
- if(btn==0)
- return "None";
-#ifndef WIN32
- 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);
- if(!GetKeyNameText(scan<<16, buf, sizeof(buf)))
- return format("Key %d", btn);
- return buf;
-#endif
-}
-
-void Keyboard::key_press(unsigned key, unsigned, unsigned)
-{
- set_button_state(key_from_sys(key), true, true);
-}
-
-void Keyboard::key_release(unsigned key, unsigned)
-{
- set_button_state(key_from_sys(key), false, true);
-}
+Keyboard::~Keyboard()
+{ }
} // namespace Input
} // namespace Msp