aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/input-manager.c
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/input/input-manager.c
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/input/input-manager.c')
-rw-r--r--sway/input/input-manager.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index d421a03f..66ade685 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -40,7 +40,7 @@ struct sway_seat *input_manager_get_seat(
40 } 40 }
41 } 41 }
42 42
43 return sway_seat_create(input, seat_name); 43 return seat_create(input, seat_name);
44} 44}
45 45
46static char *get_device_identifier(struct wlr_input_device *device) { 46static char *get_device_identifier(struct wlr_input_device *device) {
@@ -175,7 +175,7 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
175 175
176 struct sway_seat *seat = NULL; 176 struct sway_seat *seat = NULL;
177 wl_list_for_each(seat, &input_manager->seats, link) { 177 wl_list_for_each(seat, &input_manager->seats, link) {
178 sway_seat_remove_device(seat, input_device); 178 seat_remove_device(seat, input_device);
179 } 179 }
180 180
181 wl_list_remove(&input_device->link); 181 wl_list_remove(&input_device->link);
@@ -221,7 +221,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
221 if (!input_has_seat_configuration(input)) { 221 if (!input_has_seat_configuration(input)) {
222 wlr_log(L_DEBUG, "no seat configuration, using default seat"); 222 wlr_log(L_DEBUG, "no seat configuration, using default seat");
223 seat = input_manager_get_seat(input, default_seat); 223 seat = input_manager_get_seat(input, default_seat);
224 sway_seat_add_device(seat, input_device); 224 seat_add_device(seat, input_device);
225 return; 225 return;
226 } 226 }
227 227
@@ -232,7 +232,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
232 seat_config_get_attachment(seat->config, "*")); 232 seat_config_get_attachment(seat->config, "*"));
233 233
234 if (has_attachment) { 234 if (has_attachment) {
235 sway_seat_add_device(seat, input_device); 235 seat_add_device(seat, input_device);
236 added = true; 236 added = true;
237 } 237 }
238 } 238 }
@@ -240,7 +240,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
240 if (!added) { 240 if (!added) {
241 wl_list_for_each(seat, &input->seats, link) { 241 wl_list_for_each(seat, &input->seats, link) {
242 if (seat->config && seat->config->fallback == 1) { 242 if (seat->config && seat->config->fallback == 1) {
243 sway_seat_add_device(seat, input_device); 243 seat_add_device(seat, input_device);
244 added = true; 244 added = true;
245 } 245 }
246 } 246 }
@@ -281,7 +281,7 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
281 struct sway_container *container) { 281 struct sway_container *container) {
282 struct sway_seat *seat = NULL; 282 struct sway_seat *seat = NULL;
283 wl_list_for_each(seat, &input->seats, link) { 283 wl_list_for_each(seat, &input->seats, link) {
284 if (sway_seat_get_focus(seat) == container) { 284 if (seat_get_focus(seat) == container) {
285 return true; 285 return true;
286 } 286 }
287 } 287 }
@@ -293,7 +293,7 @@ void sway_input_manager_set_focus(struct sway_input_manager *input,
293 struct sway_container *container) { 293 struct sway_container *container) {
294 struct sway_seat *seat ; 294 struct sway_seat *seat ;
295 wl_list_for_each(seat, &input->seats, link) { 295 wl_list_for_each(seat, &input->seats, link) {
296 sway_seat_set_focus(seat, container); 296 seat_set_focus(seat, container);
297 } 297 }
298} 298}
299 299
@@ -311,7 +311,7 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
311 311
312 struct sway_seat *seat = NULL; 312 struct sway_seat *seat = NULL;
313 wl_list_for_each(seat, &input->seats, link) { 313 wl_list_for_each(seat, &input->seats, link) {
314 sway_seat_configure_device(seat, input_device); 314 seat_configure_device(seat, input_device);
315 } 315 }
316 } 316 }
317 } 317 }
@@ -326,7 +326,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
326 return; 326 return;
327 } 327 }
328 328
329 sway_seat_set_config(seat, seat_config); 329 seat_set_config(seat, seat_config);
330 330
331 // for every device, try to add it to a seat and if no seat has it 331 // for every device, try to add it to a seat and if no seat has it
332 // attached, add it to the fallback seats. 332 // attached, add it to the fallback seats.
@@ -355,17 +355,17 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
355 } 355 }
356 } 356 }
357 if (attached) { 357 if (attached) {
358 sway_seat_add_device(seat, input_device); 358 seat_add_device(seat, input_device);
359 } else { 359 } else {
360 sway_seat_remove_device(seat, input_device); 360 seat_remove_device(seat, input_device);
361 } 361 }
362 } 362 }
363 } else { 363 } else {
364 wl_list_for_each(seat, &input->seats, link) { 364 wl_list_for_each(seat, &input->seats, link) {
365 if (seat->config && seat->config->fallback == 1) { 365 if (seat->config && seat->config->fallback == 1) {
366 sway_seat_add_device(seat, input_device); 366 seat_add_device(seat, input_device);
367 } else { 367 } else {
368 sway_seat_remove_device(seat, input_device); 368 seat_remove_device(seat, input_device);
369 } 369 }
370 } 370 }
371 } 371 }
@@ -376,7 +376,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
376void sway_input_manager_configure_xcursor(struct sway_input_manager *input) { 376void sway_input_manager_configure_xcursor(struct sway_input_manager *input) {
377 struct sway_seat *seat = NULL; 377 struct sway_seat *seat = NULL;
378 wl_list_for_each(seat, &input->seats, link) { 378 wl_list_for_each(seat, &input->seats, link) {
379 sway_seat_configure_xcursor(seat); 379 seat_configure_xcursor(seat);
380 } 380 }
381} 381}
382 382