From 92dab582ccac31be7fa410e7f4fb3789e88a0629 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 28 Jul 2018 00:50:12 +0800
Subject: *update

---
 src/lua/event/luaopen_event.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/lua/event/luaopen_event.cpp')

diff --git a/src/lua/event/luaopen_event.cpp b/src/lua/event/luaopen_event.cpp
index 8a84c97..2d1e52f 100644
--- a/src/lua/event/luaopen_event.cpp
+++ b/src/lua/event/luaopen_event.cpp
@@ -1,8 +1,6 @@
 /**
 * Event module 
 */
-#include <SDl2/SDL.h>
-
 #include "lua/luax.h"
 #include "libjin/jin.h"
 
@@ -36,50 +34,50 @@ namespace lua
     {
         // table to store events
         luax_newtable(L);
-        SDL_Event e; 
+        static Event e; 
         int i = 1;
         poll:
-        while (SDL_PollEvent(&e))
+        while (pollEvent(&e))
         {
             // each event is a table 
             luax_newtable(L);
             switch (e.type)
             {
-            case SDL_QUIT: 
+            case EventType::QUIT: 
                 luax_setfield_string(L, "type", "quit");
             break;
 
-            case SDL_KEYDOWN: 
+            case EventType::KEYDOWN:
                 luax_setfield_string(L, "type", "keydown");
                 luax_setfield_string(L, "key", SDL_GetKeyName(e.key.keysym.sym));
             break;
             
-            case SDL_KEYUP: 
+            case EventType::KEYUP:
                 luax_setfield_string(L, "type", "keyup");
                 luax_setfield_string(L, "key", SDL_GetKeyName(e.key.keysym.sym));
             break; 
             
-            case SDL_MOUSEMOTION: 
+            case EventType::MOUSEMOTION:
                 luax_setfield_string(L, "type", "mousemotion");
                 luax_setfield_number(L, "x", e.motion.x);
                 luax_setfield_number(L, "y", e.motion.y);
             break; 
             
-            case SDL_MOUSEBUTTONDOWN: 
+            case EventType::MOUSEBUTTONDOWN:
                 luax_setfield_string(L, "type", "mousebuttondown");
                 luax_setfield_string(L, "button", buttonstr(e.button.button));
                 luax_setfield_number(L, "x", e.button.x);
                 luax_setfield_number(L, "y", e.button.y);
             break; 
             
-            case SDL_MOUSEBUTTONUP:
+            case EventType::MOUSEBUTTONUP:
                 luax_setfield_string(L, "type", "mousebuttonup");
                 luax_setfield_string(L, "button", buttonstr(e.button.button));
                 luax_setfield_number(L, "x", e.button.x);
                 luax_setfield_number(L, "y", e.button.y);
             break;
             
-            case SDL_MOUSEWHEEL: 
+            case EventType::MOUSEWHEEL:
                 luax_setfield_string(L, "type", "wheel");
                 if(e.wheel.x == -1)
                     luax_setfield_string(L, "x", "left");
@@ -106,7 +104,7 @@ namespace lua
         }
         return 1;
     }
-
+    
     static const luaL_Reg f[] = {
         {"poll", l_event_poll},
         {0 ,0 }
-- 
cgit v1.1-26-g67d0