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

Merge pull request #243 from Elv13/fix_lua53 

Lua: use pushinteger for int type
This commit is contained in:
Daniel Hahler 2015-06-01 23:38:08 +02:00
parent 9c443adc61 e8fb93d2b6
commit e30a8c198a
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mouse.c
View File

@ -113,14 +113,14 @@ luaA_mouse_index(lua_State *L)
* having lots of lua errors in this case.
*/
if (globalconf.focus.client)
lua_pushnumber(L, screen_get_index(globalconf.focus.client->screen));
lua_pushinteger(L, screen_get_index(globalconf.focus.client->screen));
else
lua_pushnumber(L, 1);
lua_pushinteger(L, 1);
return 1;
}
screen = screen_getbycoord(mouse_x, mouse_y);
lua_pushnumber(L, screen_get_index(screen));
lua_pushinteger(L, screen_get_index(screen));
return 1;
}
@ -152,9 +152,9 @@ int
luaA_mouse_pushstatus(lua_State *L, int x, int y, uint16_t mask)
{
lua_createtable(L, 0, 2);
lua_pushnumber(L, x);
lua_pushinteger(L, x);
lua_setfield(L, -2, "x");
lua_pushnumber(L, y);
lua_pushinteger(L, y);
lua_setfield(L, -2, "y");
lua_createtable(L, 5, 0);

46
objects/client.c
View File

@ -1758,7 +1758,7 @@ luaA_client_titlebar_ ## name(lua_State *L) \
} \
\
luaA_object_push_item(L, 1, titlebar_get_drawable(L, c, 1, index)); \
lua_pushnumber(L, c->titlebar[index].size); \
lua_pushinteger(L, c->titlebar[index].size); \
return 2; \
}
HANDLE_TITLEBAR(top, CLIENT_TITLEBAR_TOP)
@ -1825,8 +1825,8 @@ luaA_client_apply_size_hints(lua_State *L)
if (c->size_hints_honor)
geometry = client_apply_size_hints(c, geometry);
lua_pushnumber(L, geometry.width);
lua_pushnumber(L, geometry.height);
lua_pushinteger(L, geometry.width);
lua_pushinteger(L, geometry.height);
return 2;
}
@ -1989,9 +1989,9 @@ LUA_OBJECT_EXPORT_PROPERTY(client, client_t, machine, lua_pushstring)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, role, lua_pushstring)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, transient_for, luaA_object_push)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, skip_taskbar, lua_pushboolean)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, leader_window, lua_pushnumber)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, group_window, lua_pushnumber)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, pid, lua_pushnumber)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, leader_window, lua_pushinteger)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, group_window, lua_pushinteger)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, pid, lua_pushinteger)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, hidden, lua_pushboolean)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, minimized, lua_pushboolean)
LUA_OBJECT_EXPORT_PROPERTY(client, client_t, fullscreen, lua_pushboolean)
@ -2037,7 +2037,7 @@ luaA_client_get_screen(lua_State *L, client_t *c)
{
if(!c->screen)
return 0;
lua_pushnumber(L, screen_get_index(c->screen));
lua_pushinteger(L, screen_get_index(c->screen));
return 1;
}
@ -2085,9 +2085,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
if(u_or_p)
{
lua_createtable(L, 0, 2);
lua_pushnumber(L, c->size_hints.x);
lua_pushinteger(L, c->size_hints.x);
lua_setfield(L, -2, "x");
lua_pushnumber(L, c->size_hints.y);
lua_pushinteger(L, c->size_hints.y);
lua_setfield(L, -2, "y");
lua_setfield(L, -2, u_or_p);
u_or_p = NULL;
@ -2101,54 +2101,54 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
if(u_or_p)
{
lua_createtable(L, 0, 2);
lua_pushnumber(L, c->size_hints.width);
lua_pushinteger(L, c->size_hints.width);
lua_setfield(L, -2, "width");
lua_pushnumber(L, c->size_hints.height);
lua_pushinteger(L, c->size_hints.height);
lua_setfield(L, -2, "height");
lua_setfield(L, -2, u_or_p);
}
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
{
lua_pushnumber(L, c->size_hints.min_width);
lua_pushinteger(L, c->size_hints.min_width);
lua_setfield(L, -2, "min_width");
lua_pushnumber(L, c->size_hints.min_height);
lua_pushinteger(L, c->size_hints.min_height);
lua_setfield(L, -2, "min_height");
}
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
{
lua_pushnumber(L, c->size_hints.max_width);
lua_pushinteger(L, c->size_hints.max_width);
lua_setfield(L, -2, "max_width");
lua_pushnumber(L, c->size_hints.max_height);
lua_pushinteger(L, c->size_hints.max_height);
lua_setfield(L, -2, "max_height");
}
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
{
lua_pushnumber(L, c->size_hints.width_inc);
lua_pushinteger(L, c->size_hints.width_inc);
lua_setfield(L, -2, "width_inc");
lua_pushnumber(L, c->size_hints.height_inc);
lua_pushinteger(L, c->size_hints.height_inc);
lua_setfield(L, -2, "height_inc");
}
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT)
{
lua_pushnumber(L, c->size_hints.min_aspect_num);
lua_pushinteger(L, c->size_hints.min_aspect_num);
lua_setfield(L, -2, "min_aspect_num");
lua_pushnumber(L, c->size_hints.min_aspect_den);
lua_pushinteger(L, c->size_hints.min_aspect_den);
lua_setfield(L, -2, "min_aspect_den");
lua_pushnumber(L, c->size_hints.max_aspect_num);
lua_pushinteger(L, c->size_hints.max_aspect_num);
lua_setfield(L, -2, "max_aspect_num");
lua_pushnumber(L, c->size_hints.max_aspect_den);
lua_pushinteger(L, c->size_hints.max_aspect_den);
lua_setfield(L, -2, "max_aspect_den");
}
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
{
lua_pushnumber(L, c->size_hints.base_width);
lua_pushinteger(L, c->size_hints.base_width);
lua_setfield(L, -2, "base_width");
lua_pushnumber(L, c->size_hints.base_height);
lua_pushinteger(L, c->size_hints.base_height);
lua_setfield(L, -2, "base_height");
}

8
objects/drawin.c
View File

@ -360,7 +360,7 @@ luaA_drawin_set_x(lua_State *L, drawin_t *drawin)
static int
luaA_drawin_get_x(lua_State *L, drawin_t *drawin)
{
lua_pushnumber(L, drawin->geometry.x);
lua_pushinteger(L, drawin->geometry.x);
return 1;
}
@ -377,7 +377,7 @@ luaA_drawin_set_y(lua_State *L, drawin_t *drawin)
static int
luaA_drawin_get_y(lua_State *L, drawin_t *drawin)
{
lua_pushnumber(L, drawin->geometry.y);
lua_pushinteger(L, drawin->geometry.y);
return 1;
}
@ -397,7 +397,7 @@ luaA_drawin_set_width(lua_State *L, drawin_t *drawin)
static int
luaA_drawin_get_width(lua_State *L, drawin_t *drawin)
{
lua_pushnumber(L, drawin->geometry.width);
lua_pushinteger(L, drawin->geometry.width);
return 1;
}
@ -417,7 +417,7 @@ luaA_drawin_set_height(lua_State *L, drawin_t *drawin)
static int
luaA_drawin_get_height(lua_State *L, drawin_t *drawin)
{
lua_pushnumber(L, drawin->geometry.height);
lua_pushinteger(L, drawin->geometry.height);
return 1;
}

2
objects/screen.c
View File

@ -512,7 +512,7 @@ luaA_screen_get_workarea(lua_State *L, screen_t *s)
static int
luaA_screen_count(lua_State *L)
{
lua_pushnumber(L, globalconf.screens.len);
lua_pushinteger(L, globalconf.screens.len);
return 1;
}

4
objects/window.c
View File

@ -455,9 +455,9 @@ luaA_window_set_border_width(lua_State *L, window_t *c)
return 0;
}
LUA_OBJECT_EXPORT_PROPERTY(window, window_t, window, lua_pushnumber)
LUA_OBJECT_EXPORT_PROPERTY(window, window_t, window, lua_pushinteger)
LUA_OBJECT_EXPORT_PROPERTY(window, window_t, border_color, luaA_pushcolor)
LUA_OBJECT_EXPORT_PROPERTY(window, window_t, border_width, lua_pushnumber)
LUA_OBJECT_EXPORT_PROPERTY(window, window_t, border_width, lua_pushinteger)
void
window_class_setup(lua_State *L)