Minor bugfixes

This commit is contained in:
Drew DeVault 2018-03-30 18:28:21 -04:00
parent e3eb487dc2
commit 168f65fb7a
2 changed files with 3 additions and 1 deletions

View file

@ -157,6 +157,7 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface) { uint32_t serial, struct wl_surface *surface) {
cur_x = cur_y = -1; cur_x = cur_y = -1;
buttons = 0;
} }
static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,

View file

@ -694,6 +694,8 @@ struct wlr_surface *desktop_surface_at(struct roots_desktop *desktop,
wlr_output_layout_output_at(desktop->layout, lx, ly); wlr_output_layout_output_at(desktop->layout, lx, ly);
struct roots_output *roots_output; struct roots_output *roots_output;
double ox = lx, oy = ly; double ox = lx, oy = ly;
*view = NULL;
if (wlr_output) { if (wlr_output) {
roots_output = wlr_output->data; roots_output = wlr_output->data;
wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy); wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy);
@ -710,7 +712,6 @@ struct wlr_surface *desktop_surface_at(struct roots_desktop *desktop,
} }
} }
*view = NULL;
struct roots_view *_view; struct roots_view *_view;
if ((_view = desktop_view_at(desktop, lx, ly, &surface, sx, sy))) { if ((_view = desktop_view_at(desktop, lx, ly, &surface, sx, sy))) {
if (view) { if (view) {