mirror of
https://github.com/swaywm/sway.git
synced 2024-11-10 20:44:01 +01:00
input/seat: rename seat_apply_input_config
seat_apply_input_mapping is a lot more descriptive.
This commit is contained in:
parent
01dcad80e1
commit
caa92ddee8
@ -705,12 +705,12 @@ static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void seat_apply_input_config(struct sway_seat *seat,
|
static void seat_apply_input_mapping(struct sway_seat *seat,
|
||||||
struct sway_seat_device *sway_device) {
|
struct sway_seat_device *sway_device) {
|
||||||
struct input_config *ic =
|
struct input_config *ic =
|
||||||
input_device_get_config(sway_device->input_device);
|
input_device_get_config(sway_device->input_device);
|
||||||
|
|
||||||
sway_log(SWAY_DEBUG, "Applying input config to %s",
|
sway_log(SWAY_DEBUG, "Applying input mapping to %s",
|
||||||
sway_device->input_device->identifier);
|
sway_device->input_device->identifier);
|
||||||
|
|
||||||
const char *mapped_to_output = ic == NULL ? NULL : ic->mapped_to_output;
|
const char *mapped_to_output = ic == NULL ? NULL : ic->mapped_to_output;
|
||||||
@ -799,7 +799,7 @@ static void seat_configure_pointer(struct sway_seat *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);
|
||||||
seat_apply_input_config(seat, sway_device);
|
seat_apply_input_mapping(seat, sway_device);
|
||||||
wl_event_source_timer_update(
|
wl_event_source_timer_update(
|
||||||
seat->cursor->hide_source, cursor_get_timeout(seat->cursor));
|
seat->cursor->hide_source, cursor_get_timeout(seat->cursor));
|
||||||
}
|
}
|
||||||
@ -841,7 +841,7 @@ static void seat_configure_touch(struct sway_seat *seat,
|
|||||||
struct sway_seat_device *sway_device) {
|
struct sway_seat_device *sway_device) {
|
||||||
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);
|
||||||
seat_apply_input_config(seat, sway_device);
|
seat_apply_input_mapping(seat, sway_device);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void seat_configure_tablet_tool(struct sway_seat *seat,
|
static void seat_configure_tablet_tool(struct sway_seat *seat,
|
||||||
@ -852,7 +852,7 @@ static void seat_configure_tablet_tool(struct sway_seat *seat,
|
|||||||
sway_configure_tablet(sway_device->tablet);
|
sway_configure_tablet(sway_device->tablet);
|
||||||
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);
|
||||||
seat_apply_input_config(seat, sway_device);
|
seat_apply_input_mapping(seat, sway_device);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void seat_configure_tablet_pad(struct sway_seat *seat,
|
static void seat_configure_tablet_pad(struct sway_seat *seat,
|
||||||
|
Loading…
Reference in New Issue
Block a user