Merge branch 'superflous-enter-leave' of https://github.com/psychon/awesome

This commit is contained in:
Uli Schlachter 2016-05-09 18:42:04 +02:00
commit 208327bed0
2 changed files with 2 additions and 2 deletions

View File

@ -223,7 +223,7 @@ event_handle_button(xcb_button_press_event_t *ev)
XCB_ALLOW_ASYNC_POINTER, XCB_ALLOW_ASYNC_POINTER,
XCB_CURRENT_TIME); XCB_CURRENT_TIME);
} }
else if((c = client_getbyframewin(ev->event))) else if((c = client_getbywin(ev->event)))
{ {
luaA_object_push(L, c); luaA_object_push(L, c);
/* And handle the button raw button event */ /* And handle the button raw button event */

View File

@ -64,7 +64,7 @@ luaA_window_buttons(lua_State *L)
{ {
luaA_button_array_set(L, 1, 2, &window->buttons); luaA_button_array_set(L, 1, 2, &window->buttons);
luaA_object_emit_signal(L, 1, "property::buttons", 0); luaA_object_emit_signal(L, 1, "property::buttons", 0);
xwindow_buttons_grab(window_get(window), &window->buttons); xwindow_buttons_grab(window->window, &window->buttons);
} }
return luaA_button_array_get(L, 1, &window->buttons); return luaA_button_array_get(L, 1, &window->buttons);