aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2018-04-02 08:45:37 -0400
committerLibravatar Tony Crisci <tony@dubstepdish.com>2018-04-02 08:45:37 -0400
commite677c5b204971af00d71f9a50a89206d01b46a36 (patch)
treefa94a13e95119bdd3083fb7839889f2ce3a0fca0 /sway/desktop
parentMerge pull request #1684 from swaywm/follow-warp (diff)
downloadsway-e677c5b204971af00d71f9a50a89206d01b46a36.tar.gz
sway-e677c5b204971af00d71f9a50a89206d01b46a36.tar.zst
sway-e677c5b204971af00d71f9a50a89206d01b46a36.zip
rename seat functions
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/desktop/wl_shell.c2
-rw-r--r--sway/desktop/xdg_shell_v6.c2
-rw-r--r--sway/desktop/xwayland.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 0d706c52..86b023cb 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -228,7 +228,7 @@ static void render_output(struct sway_output *output, struct timespec *when,
228 228
229 struct sway_seat *seat = input_manager_current_seat(input_manager); 229 struct sway_seat *seat = input_manager_current_seat(input_manager);
230 struct sway_container *focus = 230 struct sway_container *focus =
231 sway_seat_get_focus_inactive(seat, output->swayc); 231 seat_get_focus_inactive(seat, output->swayc);
232 struct sway_container *workspace = (focus->type == C_WORKSPACE ? 232 struct sway_container *workspace = (focus->type == C_WORKSPACE ?
233 focus : 233 focus :
234 container_parent(focus, C_WORKSPACE)); 234 container_parent(focus, C_WORKSPACE));
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index 4fcc6317..3e275f2b 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -133,7 +133,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
133 wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); 133 wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
134 134
135 struct sway_seat *seat = input_manager_current_seat(input_manager); 135 struct sway_seat *seat = input_manager_current_seat(input_manager);
136 struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); 136 struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
137 struct sway_container *cont = container_view_create(focus, sway_view); 137 struct sway_container *cont = container_view_create(focus, sway_view);
138 sway_view->swayc = cont; 138 sway_view->swayc = cont;
139 139
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 713437f2..286d52cc 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -98,7 +98,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
98 container_view_destroy(view->swayc); 98 container_view_destroy(view->swayc);
99 99
100 struct sway_seat *seat = input_manager_current_seat(input_manager); 100 struct sway_seat *seat = input_manager_current_seat(input_manager);
101 struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); 101 struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
102 struct sway_container *cont = container_view_create(focus, view); 102 struct sway_container *cont = container_view_create(focus, view);
103 view->swayc = cont; 103 view->swayc = cont;
104 arrange_windows(cont->parent, -1, -1); 104 arrange_windows(cont->parent, -1, -1);
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 273ca2bf..8fb6cb52 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -143,7 +143,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
143 wlr_xwayland_surface_set_maximized(xsurface, true); 143 wlr_xwayland_surface_set_maximized(xsurface, true);
144 144
145 struct sway_seat *seat = input_manager_current_seat(input_manager); 145 struct sway_seat *seat = input_manager_current_seat(input_manager);
146 struct sway_container *focus = sway_seat_get_focus_inactive(seat, 146 struct sway_container *focus = seat_get_focus_inactive(seat,
147 &root_container); 147 &root_container);
148 struct sway_container *cont = container_view_create(focus, view); 148 struct sway_container *cont = container_view_create(focus, view);
149 view->swayc = cont; 149 view->swayc = cont;