Separated lua bindings from mouse.c

src/modules/l_mouse.c

@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2016 rxi
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT license. See LICENSE for details.
+ */
+
+ #include "mouse.h"
+ #include "luaobj.h"
+
+
+int l_mouse_getPosition(lua_State *L) {
+  mouse_State *state = mouse_getState();
+  lua_pushinteger(L, state->x);
+  lua_pushinteger(L, state->y);
+  return 2;
+}
+
+
+int l_mouse_getX(lua_State *L) {
+  mouse_State *state = mouse_getState();
+  lua_pushinteger(L, state->x);
+  return 1;
+}
+
+
+int l_mouse_getY(lua_State *L) {
+  mouse_State *state = mouse_getState();
+  lua_pushinteger(L, state->y);
+  return 1;
+}
+
+
+int l_mouse_isDown(lua_State *L) {
+  int n = lua_gettop(L);
+  int res = 0;
+  int i;
+  mouse_State *state = mouse_getState();
+  for (i = 1; i <= n; i++) {
+    int idx = luaL_checknumber(L, i) - 1;
+    if (idx >= 0 && idx < MOUSE_BUTTON_MAX) {
+      res |= state->buttonsDown[idx];
+    }
+  }
+  lua_pushboolean(L, res);
+  return 1;
+}
+
+
+int l_mouse_poll(lua_State *L) {
+  mouse_update();
+  mouse_State *state = mouse_getState();
+
+  int i;
+  int n = 1;
+  lua_newtable(L);
+
+  /* Add motion event if mouse moved */
+  if ( state->x != state->lastX || state->y != state->lastY ) {
+    lua_newtable(L);
+    lua_pushstring(L, "motion");
+    lua_setfield(L, -2, "type");
+    lua_pushinteger(L, state->x);
+    lua_setfield(L, -2, "x");
+    lua_pushinteger(L, state->y);
+    lua_setfield(L, -2, "y");
+    lua_pushinteger(L, state->x - state->lastX);
+    lua_setfield(L, -2, "dx");
+    lua_pushinteger(L, state->y - state->lastY);
+    lua_setfield(L, -2, "dy");
+    lua_rawseti(L, -2, n++);
+  }
+
+  /* Add `pressed` and `released` events */
+  for (i = 0; i < MOUSE_BUTTON_MAX; i++) {
+    if ( state->buttonsPressed[i] || state->buttonsReleased[i] ) {
+      lua_newtable(L);
+      lua_pushstring(L, state->buttonsPressed[i] ? "pressed" : "released");
+      lua_setfield(L, -2, "type");
+      lua_pushinteger(L, i + 1);
+      lua_setfield(L, -2, "button");
+      lua_pushinteger(L, state->x);
+      lua_setfield(L, -2, "x");
+      lua_pushinteger(L, state->y);
+      lua_setfield(L, -2, "y");
+      lua_rawseti(L, -2, n++);
+    }
+  }
+
+  return 1;
+}
+
+
+int luaopen_mouse(lua_State *L) {
+  luaL_Reg reg[] = {
+    { "poll",         l_mouse_poll          },
+    { "getPosition",  l_mouse_getPosition   },
+    { "getX",         l_mouse_getX          },
+    { "getY",         l_mouse_getY          },
+    { "isDown",       l_mouse_isDown        },
+    { 0, 0 },
+  };
+  luaL_newlib(L, reg);
+  return 1;
+}

src/mouse.c

@@ -11,51 +11,46 @@
 #include "luaobj.h"
 #include "mouse.h"
 
-int mouse_inited;
+mouse_State mouse_state;
-int mouse_x, mouse_y;
-int mouse_lastX, mouse_lastY;
-int mouse_buttonsPressed[MOUSE_BUTTON_MAX];
-int mouse_buttonsReleased[MOUSE_BUTTON_MAX];
-int mouse_buttonsDown[MOUSE_BUTTON_MAX];
 
 
 void mouse_init(void) {
   union REGS regs = {};
   int86(0x33, &regs, &regs);
-  mouse_inited = regs.x.ax ? 1 : 0;
+  mouse_state.inited = regs.x.ax ? 1 : 0;
 }
 
 
 void mouse_update(void) {
-  if (!mouse_inited) {
+  if (!mouse_state.inited) {
     return;
   }
 
   /* Update last mouse position */
-  mouse_lastX = mouse_x;
+  mouse_state.lastX = mouse_state.x;
-  mouse_lastY = mouse_y;
+  mouse_state.lastY = mouse_state.y;
 
   /* Update mouse position */
   union REGS regs = {};
   regs.x.ax = 3;
   int86(0x33, &regs, &regs);
-  mouse_x = regs.x.cx >> 1;
+  mouse_state.x = regs.x.cx >> 1;
-  mouse_y = regs.x.dx;
+  mouse_state.y = regs.x.dx;
 
   /* Update button states */
   int i;
   for (i = 0; i < MOUSE_BUTTON_MAX; i++) {
     /* Reset pressed/released */
-    mouse_buttonsPressed[i] = 0;
+    mouse_state.buttonsPressed[i] = 0;
-    mouse_buttonsReleased[i] = 0;
+    mouse_state.buttonsReleased[i] = 0;
     /* Handle mouse pressed */
     memset(&regs, 0, sizeof(regs));
     regs.x.ax = 5;
     regs.x.bx = i;
     int86(0x33, &regs, &regs);
     if (regs.x.bx) {
-      mouse_buttonsPressed[i] = 1;
+      mouse_state.buttonsPressed[i] = 1;
-      mouse_buttonsDown[i] = 1;
+      mouse_state.buttonsDown[i] = 1;
     }
     /* Handle mouse released */
     memset(&regs, 0, sizeof(regs));
@@ -63,104 +58,13 @@ void mouse_update(void) {
     regs.x.bx = i;
     int86(0x33, &regs, &regs);
     if (regs.x.bx) {
-      mouse_buttonsReleased[i] = 1;
+      mouse_state.buttonsReleased[i] = 1;
-      mouse_buttonsDown[i] = 0;
+      mouse_state.buttonsDown[i] = 0;
     }
   }
 }
 
 
-/**
+mouse_State* mouse_getState(void) {
- * Lua binds
+  return &mouse_state;
- */
-
-
-int l_mouse_getPosition(lua_State *L) {
-  lua_pushinteger(L, mouse_x);
-  lua_pushinteger(L, mouse_y);
-  return 2;
-}
-
-
-int l_mouse_getX(lua_State *L) {
-  lua_pushinteger(L, mouse_x);
-  return 1;
-}
-
-
-int l_mouse_getY(lua_State *L) {
-  lua_pushinteger(L, mouse_y);
-  return 1;
-}
-
-
-int l_mouse_isDown(lua_State *L) {
-  int n = lua_gettop(L);
-  int res = 0;
-  int i;
-  for (i = 1; i <= n; i++) {
-    int idx = luaL_checknumber(L, i) - 1;
-    if (idx >= 0 && idx < MOUSE_BUTTON_MAX) {
-      res |= mouse_buttonsDown[idx];
-    }
-  }
-  lua_pushboolean(L, res);
-  return 1;
-}
-
-
-int l_mouse_poll(lua_State *L) {
-  mouse_update();
-
-  int i;
-  int n = 1;
-  lua_newtable(L);
-
-  /* Add motion event if mouse moved */
-  if ( mouse_x != mouse_lastX || mouse_y != mouse_lastY ) {
-    lua_newtable(L);
-    lua_pushstring(L, "motion");
-    lua_setfield(L, -2, "type");
-    lua_pushinteger(L, mouse_x);
-    lua_setfield(L, -2, "x");
-    lua_pushinteger(L, mouse_y);
-    lua_setfield(L, -2, "y");
-    lua_pushinteger(L, mouse_x - mouse_lastX);
-    lua_setfield(L, -2, "dx");
-    lua_pushinteger(L, mouse_y - mouse_lastY);
-    lua_setfield(L, -2, "dy");
-    lua_rawseti(L, -2, n++);
-  }
-
-  /* Add `pressed` and `released` events */
-  for (i = 0; i < MOUSE_BUTTON_MAX; i++) {
-    if ( mouse_buttonsPressed[i] || mouse_buttonsReleased[i] ) {
-      lua_newtable(L);
-      lua_pushstring(L, mouse_buttonsPressed[i] ? "pressed" : "released");
-      lua_setfield(L, -2, "type");
-      lua_pushinteger(L, i + 1);
-      lua_setfield(L, -2, "button");
-      lua_pushinteger(L, mouse_x);
-      lua_setfield(L, -2, "x");
-      lua_pushinteger(L, mouse_y);
-      lua_setfield(L, -2, "y");
-      lua_rawseti(L, -2, n++);
-    }
-  }
-
-  return 1;
-}
-
-
-int luaopen_mouse(lua_State *L) {
-  luaL_Reg reg[] = {
-    { "poll",         l_mouse_poll          },
-    { "getPosition",  l_mouse_getPosition   },
-    { "getX",         l_mouse_getX          },
-    { "getY",         l_mouse_getY          },
-    { "isDown",       l_mouse_isDown        },
-    { 0, 0 },
-  };
-  luaL_newlib(L, reg);
-  return 1;
 }

src/mouse.h

@@ -8,7 +8,17 @@ enum {
   MOUSE_BUTTON_MAX,
 };
 
+typedef struct {
+  int inited;
+  int x, y;
+  int lastX, lastY;
+  int buttonsPressed[MOUSE_BUTTON_MAX];
+  int buttonsReleased[MOUSE_BUTTON_MAX];
+  int buttonsDown[MOUSE_BUTTON_MAX];
+} mouse_State;
+
 void mouse_init(void);
 void mouse_update(void);
+mouse_State* mouse_getState(void);
 
 #endif