diff options
| -rw-r--r-- | backend/wayland/output.c | 6 | ||||
| -rw-r--r-- | types/wlr_output.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 109834c9..42b41508 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -284,8 +284,12 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) { goto error; } + char title[32]; + if (snprintf(title, sizeof(title), "wlroots - %s", wlr_output->name)) { + zxdg_toplevel_v6_set_title(output->xdg_toplevel, title); + } + zxdg_toplevel_v6_set_app_id(output->xdg_toplevel, "wlroots"); - zxdg_toplevel_v6_set_title(output->xdg_toplevel, "wlroots"); zxdg_surface_v6_add_listener(output->xdg_surface, &xdg_surface_listener, output); zxdg_toplevel_v6_add_listener(output->xdg_toplevel, diff --git a/types/wlr_output.c b/types/wlr_output.c index 350538a7..a0f27e51 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -706,11 +706,11 @@ static bool output_cursor_attempt_hardware(struct wlr_output_cursor *cursor) { struct wlr_output_cursor *hwcur = cursor->output->hardware_cursor; if (cursor->output->impl->set_cursor && (hwcur == NULL || hwcur == cursor)) { - if (hwcur != cursor) { - assert(cursor->output->impl->move_cursor); - cursor->output->impl->move_cursor(cursor->output, - (int)cursor->x, (int)cursor->y); - } + // If the cursor was hidden or was a software cursor, the hardware + // cursor position is outdated + assert(cursor->output->impl->move_cursor); + cursor->output->impl->move_cursor(cursor->output, + (int)cursor->x, (int)cursor->y); if (cursor->output->impl->set_cursor(cursor->output, texture, scale, transform, cursor->hotspot_x, cursor->hotspot_y, true)) { cursor->output->hardware_cursor = cursor; |