diff options
author | Simon Ser <contact@emersion.fr> | 2023-11-16 14:50:52 +0100 |
---|---|---|
committer | Kenny Levinsen <kl@kl.wtf> | 2023-11-16 16:29:07 +0100 |
commit | caa92ddee81b4af121773abc048ab79ea6df0a98 (patch) | |
tree | f2fc773713f53e939d4b6709ce381781b1f95fa9 | |
parent | input/seat: don't configure mappings for switches (diff) | |
download | sway-caa92ddee81b4af121773abc048ab79ea6df0a98.tar.gz sway-caa92ddee81b4af121773abc048ab79ea6df0a98.tar.zst sway-caa92ddee81b4af121773abc048ab79ea6df0a98.zip |
input/seat: rename seat_apply_input_config
seat_apply_input_mapping is a lot more descriptive.
-rw-r--r-- | sway/input/seat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 6c0e85bd..bafdbcf3 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -705,12 +705,12 @@ static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) { | |||
705 | } | 705 | } |
706 | } | 706 | } |
707 | 707 | ||
708 | static void seat_apply_input_config(struct sway_seat *seat, | 708 | static void seat_apply_input_mapping(struct sway_seat *seat, |
709 | struct sway_seat_device *sway_device) { | 709 | struct sway_seat_device *sway_device) { |
710 | struct input_config *ic = | 710 | struct input_config *ic = |
711 | input_device_get_config(sway_device->input_device); | 711 | input_device_get_config(sway_device->input_device); |
712 | 712 | ||
713 | sway_log(SWAY_DEBUG, "Applying input config to %s", | 713 | sway_log(SWAY_DEBUG, "Applying input mapping to %s", |
714 | sway_device->input_device->identifier); | 714 | sway_device->input_device->identifier); |
715 | 715 | ||
716 | const char *mapped_to_output = ic == NULL ? NULL : ic->mapped_to_output; | 716 | 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, | |||
799 | } | 799 | } |
800 | wlr_cursor_attach_input_device(seat->cursor->cursor, | 800 | wlr_cursor_attach_input_device(seat->cursor->cursor, |
801 | sway_device->input_device->wlr_device); | 801 | sway_device->input_device->wlr_device); |
802 | seat_apply_input_config(seat, sway_device); | 802 | seat_apply_input_mapping(seat, sway_device); |
803 | wl_event_source_timer_update( | 803 | wl_event_source_timer_update( |
804 | seat->cursor->hide_source, cursor_get_timeout(seat->cursor)); | 804 | seat->cursor->hide_source, cursor_get_timeout(seat->cursor)); |
805 | } | 805 | } |
@@ -841,7 +841,7 @@ static void seat_configure_touch(struct sway_seat *seat, | |||
841 | struct sway_seat_device *sway_device) { | 841 | struct sway_seat_device *sway_device) { |
842 | wlr_cursor_attach_input_device(seat->cursor->cursor, | 842 | wlr_cursor_attach_input_device(seat->cursor->cursor, |
843 | sway_device->input_device->wlr_device); | 843 | sway_device->input_device->wlr_device); |
844 | seat_apply_input_config(seat, sway_device); | 844 | seat_apply_input_mapping(seat, sway_device); |
845 | } | 845 | } |
846 | 846 | ||
847 | static void seat_configure_tablet_tool(struct sway_seat *seat, | 847 | static void seat_configure_tablet_tool(struct sway_seat *seat, |
@@ -852,7 +852,7 @@ static void seat_configure_tablet_tool(struct sway_seat *seat, | |||
852 | sway_configure_tablet(sway_device->tablet); | 852 | sway_configure_tablet(sway_device->tablet); |
853 | wlr_cursor_attach_input_device(seat->cursor->cursor, | 853 | wlr_cursor_attach_input_device(seat->cursor->cursor, |
854 | sway_device->input_device->wlr_device); | 854 | sway_device->input_device->wlr_device); |
855 | seat_apply_input_config(seat, sway_device); | 855 | seat_apply_input_mapping(seat, sway_device); |
856 | } | 856 | } |
857 | 857 | ||
858 | static void seat_configure_tablet_pad(struct sway_seat *seat, | 858 | static void seat_configure_tablet_pad(struct sway_seat *seat, |