mouse: user mouse_*_pointer wrappers
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
aa33631263
commit
c80ff672ca
24
mouse.c
24
mouse.c
|
@ -738,11 +738,14 @@ static int
|
||||||
luaA_mouse_coords_set(lua_State *L)
|
luaA_mouse_coords_set(lua_State *L)
|
||||||
{
|
{
|
||||||
int x, y;
|
int x, y;
|
||||||
|
xcb_window_t root;
|
||||||
|
|
||||||
x = luaL_checknumber(L, 1);
|
x = luaL_checknumber(L, 1);
|
||||||
y = luaL_checknumber(L, 2);
|
y = luaL_checknumber(L, 2);
|
||||||
xcb_warp_pointer(globalconf.connection, XCB_NONE,
|
|
||||||
xcb_aux_get_screen(globalconf.connection, globalconf.default_screen)->root,
|
root = xcb_aux_get_screen(globalconf.connection, globalconf.default_screen)->root;
|
||||||
0, 0, 0, 0, x, y);
|
mouse_warp_pointer(root, x, y);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -812,21 +815,18 @@ luaA_client_mouse_move(lua_State *L)
|
||||||
static int
|
static int
|
||||||
luaA_mouse_screen_get(lua_State *L)
|
luaA_mouse_screen_get(lua_State *L)
|
||||||
{
|
{
|
||||||
int screen;
|
int screen, mouse_x, mouse_y;
|
||||||
xcb_query_pointer_cookie_t qc;
|
xcb_window_t root;
|
||||||
xcb_query_pointer_reply_t *qr;
|
|
||||||
|
|
||||||
qc = xcb_query_pointer(globalconf.connection,
|
root = xcb_aux_get_screen(globalconf.connection, globalconf.default_screen)->root;
|
||||||
xcb_aux_get_screen(globalconf.connection,
|
|
||||||
globalconf.default_screen)->root);
|
|
||||||
|
|
||||||
if(!(qr = xcb_query_pointer_reply(globalconf.connection, qc, NULL)))
|
if(!mouse_query_pointer(root, &mouse_x, &mouse_y))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
screen = screen_get_bycoord(globalconf.screens_info,
|
screen = screen_get_bycoord(globalconf.screens_info,
|
||||||
globalconf.default_screen,
|
globalconf.default_screen,
|
||||||
qr->root_x, qr->root_y);
|
mouse_x, mouse_y);
|
||||||
p_delete(&qr);
|
|
||||||
lua_pushnumber(L, screen + 1);
|
lua_pushnumber(L, screen + 1);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue