mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-02-07 08:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sensitivity

Browse source
This commit is contained in:
jlo62 2023-11-21 14:31:13 +01:00 committed by GitHub
parent 92df8b03df c3ec141b34
commit fecd2cb323
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/input/seat.c
View file

@ -803,9 +803,7 @@ static void seat_apply_input_mapping(struct sway_seat *seat,
static void seat_configure_pointer(struct sway_seat *seat, static void seat_configure_pointer(struct sway_seat *seat,
struct sway_seat_device *sway_device) { struct sway_seat_device *sway_device) {
if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
seat_configure_xcursor(seat); seat_configure_xcursor(seat);
}
wlr_cursor_attach_input_device(seat->cursor->cursor, wlr_cursor_attach_input_device(seat->cursor->cursor,
sway_device->input_device->wlr_device); sway_device->input_device->wlr_device);
wl_event_source_timer_update( wl_event_source_timer_update(
@ -1069,7 +1067,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
sway_log(SWAY_ERROR, sway_log(SWAY_ERROR,
"Cannot create XCursor manager for theme '%s'", cursor_theme); "Cannot create XCursor manager for theme '%s'", cursor_theme);
} }
}
for (int i = 0; i < root->outputs->length; ++i) { for (int i = 0; i < root->outputs->length; ++i) {
struct sway_output *sway_output = root->outputs->items[i]; struct sway_output *sway_output = root->outputs->items[i];
@ -1089,6 +1087,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
cursor_set_image(seat->cursor, "default", NULL); cursor_set_image(seat->cursor, "default", NULL);
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
seat->cursor->cursor->y); seat->cursor->cursor->y);
}
} }
bool seat_is_input_allowed(struct sway_seat *seat, bool seat_is_input_allowed(struct sway_seat *seat,

2
sway/input/tablet.c
View file

@ -58,9 +58,7 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
tablet->seat_device->input_device->wlr_device; tablet->seat_device->input_device->wlr_device;
struct sway_seat *seat = tablet->seat_device->sway_seat; struct sway_seat *seat = tablet->seat_device->sway_seat;
if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
seat_configure_xcursor(seat); seat_configure_xcursor(seat);
}
if (!tablet->tablet_v2) { if (!tablet->tablet_v2) {
tablet->tablet_v2 = tablet->tablet_v2 =