Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mouse: simplify button push 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-08-25 17:19:53 +02:00
parent 7cf2b6615f
commit 8b5fe6f30f
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mouse.c
View File

@ -1250,8 +1250,8 @@ luaA_mouse_newindex(lua_State *L)
static int static int
luaA_mouse_coords(lua_State *L) luaA_mouse_coords(lua_State *L)
{ {
uint16_t mask; uint16_t mask, maski;
int screen, x, y, mouse_x, mouse_y, i = 0; int screen, x, y, mouse_x, mouse_y, i = 1;
if(lua_gettop(L) == 1) if(lua_gettop(L) == 1)
{ {
@ -1279,30 +1279,11 @@ luaA_mouse_coords(lua_State *L)
lua_pushnumber(L, mouse_y); lua_pushnumber(L, mouse_y);
lua_setfield(L, -2, "y"); lua_setfield(L, -2, "y");
lua_newtable(L); lua_newtable(L);
if (mask & XCB_BUTTON_MASK_1) for(maski = XCB_BUTTON_MASK_1; i <= XCB_BUTTON_MASK_5; maski <<= 1, i++)
if(mask & maski)
{ {
lua_pushnumber(L, 1); lua_pushboolean(L, true);
lua_rawseti(L, -2, ++i); lua_rawseti(L, -2, i);
}
if (mask & XCB_BUTTON_MASK_2)
{
lua_pushnumber(L, 2);
lua_rawseti(L, -2, ++i);
}
if (mask & XCB_BUTTON_MASK_3)
{
lua_pushnumber(L, 3);
lua_rawseti(L, -2, ++i);
}
if (mask & XCB_BUTTON_MASK_4)
{
lua_pushnumber(L, 4);
lua_rawseti(L, -2, ++i);
}
if (mask & XCB_BUTTON_MASK_5)
{
lua_pushnumber(L, 5);
lua_rawseti(L, -2, ++i);
} }
lua_setfield(L, -2, "buttons"); lua_setfield(L, -2, "buttons");