mirror of
https://github.com/swaywm/sway.git
synced 2025-02-07 00:20:44 +00:00
Merge branch 'master' into sensitivity
This commit is contained in:
commit
fecd2cb323
|
@ -803,9 +803,7 @@ static void seat_apply_input_mapping(struct sway_seat *seat,
|
|||
|
||||
static void seat_configure_pointer(struct sway_seat *seat,
|
||||
struct sway_seat_device *sway_device) {
|
||||
if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
|
||||
seat_configure_xcursor(seat);
|
||||
}
|
||||
wlr_cursor_attach_input_device(seat->cursor->cursor,
|
||||
sway_device->input_device->wlr_device);
|
||||
wl_event_source_timer_update(
|
||||
|
@ -1069,7 +1067,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
|
|||
sway_log(SWAY_ERROR,
|
||||
"Cannot create XCursor manager for theme '%s'", cursor_theme);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (int i = 0; i < root->outputs->length; ++i) {
|
||||
struct sway_output *sway_output = root->outputs->items[i];
|
||||
|
@ -1090,6 +1088,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
|
|||
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
|
||||
seat->cursor->cursor->y);
|
||||
}
|
||||
}
|
||||
|
||||
bool seat_is_input_allowed(struct sway_seat *seat,
|
||||
struct wlr_surface *surface) {
|
||||
|
|
|
@ -58,9 +58,7 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
|
|||
tablet->seat_device->input_device->wlr_device;
|
||||
struct sway_seat *seat = tablet->seat_device->sway_seat;
|
||||
|
||||
if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
|
||||
seat_configure_xcursor(seat);
|
||||
}
|
||||
|
||||
if (!tablet->tablet_v2) {
|
||||
tablet->tablet_v2 =
|
||||
|
|
Loading…
Reference in a new issue