diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-07 01:52:58 -0500 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-02-07 09:41:58 +0100 |
| commit | ec5da0ca5bad6a433f727499d68ac1352397f5aa (patch) | |
| tree | 0b7ebd3a56a08f44e6a88533a00e99db2501e755 | |
| parent | 5a32a74b2d0e4685527bd78d5052aafe2df4b8f2 (diff) | |
seat_configure_tablet_tool: configure xcursor
Since a tablet tool provides the WL_SEAT_CAPABILITY_POINTER capability,
sway will attempt to use the xcursor manager to set a cursor image. If
the tablet tool was the first (and possibly only) device to provide the
capability for the seat, the xcursor manager was not being configured
before attempting to set a cursor image. This was due to
`seat_configure_xcursor` only being called in `seat_configure_pointer`.
Since the xcursor manager was NULL in this case, it would cause a
segfault when attempting to set a cursor image. This adds a call to
`seat_configure_xcursor` in `seat_configure_tablet_tool` to ensure that
the seat has a xcursor manager.
| -rw-r--r-- | sway/input/seat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index d159da22..18664d7c 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -525,6 +525,7 @@ static void seat_configure_touch(struct sway_seat *seat, static void seat_configure_tablet_tool(struct sway_seat *seat, struct sway_seat_device *sway_device) { + seat_configure_xcursor(seat); wlr_cursor_attach_input_device(seat->cursor->cursor, sway_device->input_device->wlr_device); seat_apply_input_config(seat, sway_device); |