using namespace std;
-#include <iostream>
-
namespace Msp {
namespace Graphics {
char buf[16];
XLookupString(const_cast<XKeyEvent *>(&ev.xkey), buf, sizeof(buf), 0, 0);
// XXX Handle the result according to locale
- signal_key_press.emit(ev.xkey.keycode, ev.xkey.state, buf[0]);
+ signal_key_press.emit(XKeycodeToKeysym(display.get_display(), ev.xkey.keycode, 0), ev.xkey.state, buf[0]);
}
break;
case KeyRelease:
- signal_key_release.emit(ev.xkey.keycode, ev.xkey.state);
+ signal_key_release.emit(XKeycodeToKeysym(display.get_display(), ev.xkey.keycode, 0), ev.xkey.state);
break;
case ConfigureNotify:
options.width=ev.xconfigure.width;
switch(msg)
{
case WM_KEYDOWN:
- signal_key_press.emit((lp>>16)&0x1FF, 0, wp);
+ signal_key_press.emit(wp, 0, wp);
break;
case WM_KEYUP:
- signal_key_release.emit((lp>>16)&0x1FF, 0);
+ signal_key_release.emit(wp, 0);
break;
case WM_LBUTTONDOWN:
signal_button_press.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp), 1, 0);