diff options
Diffstat (limited to 'src/lua/event')
| -rw-r--r-- | src/lua/event/luaopen_event.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/lua/event/luaopen_event.cpp b/src/lua/event/luaopen_event.cpp index 2d1e52f..a53863d 100644 --- a/src/lua/event/luaopen_event.cpp +++ b/src/lua/event/luaopen_event.cpp @@ -4,28 +4,12 @@ #include "lua/luax.h" #include "libjin/jin.h" -using namespace jin::input; - namespace jin { namespace lua { - static inline const char* buttonstr(int id) { - switch (id) { - case 1: return "left"; - case 2: return "middle"; - case 3: return "right"; - case 4: return "wheelup"; - case 5: return "wheeldown"; - default: return "?"; - } - } - - static inline const char* wheelstr(int dir) - { - - } + using namespace jin::input; /** * Load event poll, return a iterator(a table). @@ -49,12 +33,12 @@ namespace lua case EventType::KEYDOWN: luax_setfield_string(L, "type", "keydown"); - luax_setfield_string(L, "key", SDL_GetKeyName(e.key.keysym.sym)); + luax_setfield_string(L, "key", getKeyName(e.key.keysym.sym)); break; case EventType::KEYUP: luax_setfield_string(L, "type", "keyup"); - luax_setfield_string(L, "key", SDL_GetKeyName(e.key.keysym.sym)); + luax_setfield_string(L, "key", getKeyName(e.key.keysym.sym)); break; case EventType::MOUSEMOTION: @@ -65,14 +49,14 @@ namespace lua case EventType::MOUSEBUTTONDOWN: luax_setfield_string(L, "type", "mousebuttondown"); - luax_setfield_string(L, "button", buttonstr(e.button.button)); + luax_setfield_string(L, "button", getButtonName(e.button.button)); luax_setfield_number(L, "x", e.button.x); luax_setfield_number(L, "y", e.button.y); break; case EventType::MOUSEBUTTONUP: luax_setfield_string(L, "type", "mousebuttonup"); - luax_setfield_string(L, "button", buttonstr(e.button.button)); + luax_setfield_string(L, "button", getButtonName(e.button.button)); luax_setfield_number(L, "x", e.button.x); luax_setfield_number(L, "y", e.button.y); break; @@ -85,7 +69,6 @@ namespace lua luax_setfield_string(L, "x", "right"); else luax_setfield_string(L, "x", "none"); - if (e.wheel.y == -1) luax_setfield_string(L, "y", "near"); else if (e.wheel.y == 1) |