blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address review feedback

This commit is contained in:
Drew DeVault 2018-03-30 19:33:57 -04:00
parent 168f65fb7a
commit 746e3759b7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/layer-shell.c
View File

@ -162,8 +162,8 @@ static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
cur_x = (int)wl_fixed_to_double(surface_x); cur_x = wl_fixed_to_int(surface_x);
cur_y = (int)wl_fixed_to_double(surface_y); cur_y = wl_fixed_to_int(surface_y);
} }
static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,

11
rootston/cursor.c
View File

@ -101,18 +101,21 @@ static void seat_view_deco_button(struct roots_seat_view *view, double sx,
static void roots_passthrough_cursor(struct roots_cursor *cursor, static void roots_passthrough_cursor(struct roots_cursor *cursor,
uint32_t time) { uint32_t time) {
struct roots_view *view;
double sx, sy; double sx, sy;
struct roots_view *view = NULL;
struct roots_seat *seat = cursor->seat; struct roots_seat *seat = cursor->seat;
struct roots_desktop *desktop = seat->input->server->desktop; struct roots_desktop *desktop = seat->input->server->desktop;
struct wlr_surface *surface = desktop_surface_at(desktop, struct wlr_surface *surface = desktop_surface_at(desktop,
cursor->cursor->x, cursor->cursor->y, &sx, &sy, &view); cursor->cursor->x, cursor->cursor->y, &sx, &sy, &view);
struct wl_client *client = NULL;
if (surface) {
client = wl_resource_get_client(surface->resource);
}
if (!surface && cursor->cursor_client) { if (cursor->cursor_client != client) {
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
cursor->default_xcursor, cursor->cursor); cursor->default_xcursor, cursor->cursor);
cursor->cursor_client = NULL; cursor->cursor_client = client;
} }
if (view) { if (view) {