diff options
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 6c5abcd8..5dadb31d 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -75,7 +75,7 @@ static void seat_send_activate(struct sway_container *con, | |||
75 | struct sway_seat *seat) { | 75 | struct sway_seat *seat) { |
76 | if (con->type == C_VIEW) { | 76 | if (con->type == C_VIEW) { |
77 | if (!seat_is_input_allowed(seat, con->sway_view->surface)) { | 77 | if (!seat_is_input_allowed(seat, con->sway_view->surface)) { |
78 | wlr_log(L_DEBUG, "Refusing to set focus, input is inhibited"); | 78 | wlr_log(WLR_DEBUG, "Refusing to set focus, input is inhibited"); |
79 | return; | 79 | return; |
80 | } | 80 | } |
81 | view_set_activated(con->sway_view, true); | 81 | view_set_activated(con->sway_view, true); |
@@ -219,7 +219,7 @@ static struct sway_seat_container *seat_container_from_container( | |||
219 | 219 | ||
220 | seat_con = calloc(1, sizeof(struct sway_seat_container)); | 220 | seat_con = calloc(1, sizeof(struct sway_seat_container)); |
221 | if (seat_con == NULL) { | 221 | if (seat_con == NULL) { |
222 | wlr_log(L_ERROR, "could not allocate seat container"); | 222 | wlr_log(WLR_ERROR, "could not allocate seat container"); |
223 | return NULL; | 223 | return NULL; |
224 | } | 224 | } |
225 | 225 | ||
@@ -301,7 +301,7 @@ static void handle_new_drag_icon(struct wl_listener *listener, void *data) { | |||
301 | 301 | ||
302 | struct sway_drag_icon *icon = calloc(1, sizeof(struct sway_drag_icon)); | 302 | struct sway_drag_icon *icon = calloc(1, sizeof(struct sway_drag_icon)); |
303 | if (icon == NULL) { | 303 | if (icon == NULL) { |
304 | wlr_log(L_ERROR, "Allocation failed"); | 304 | wlr_log(WLR_ERROR, "Allocation failed"); |
305 | return; | 305 | return; |
306 | } | 306 | } |
307 | icon->seat = seat; | 307 | icon->seat = seat; |
@@ -391,7 +391,7 @@ static void seat_apply_input_config(struct sway_seat *seat, | |||
391 | struct input_config *ic = input_device_get_config( | 391 | struct input_config *ic = input_device_get_config( |
392 | sway_device->input_device); | 392 | sway_device->input_device); |
393 | if (ic != NULL) { | 393 | if (ic != NULL) { |
394 | wlr_log(L_DEBUG, "Applying input config to %s", | 394 | wlr_log(WLR_DEBUG, "Applying input config to %s", |
395 | sway_device->input_device->identifier); | 395 | sway_device->input_device->identifier); |
396 | 396 | ||
397 | mapped_to_output = ic->mapped_to_output; | 397 | mapped_to_output = ic->mapped_to_output; |
@@ -401,7 +401,7 @@ static void seat_apply_input_config(struct sway_seat *seat, | |||
401 | mapped_to_output = sway_device->input_device->wlr_device->output_name; | 401 | mapped_to_output = sway_device->input_device->wlr_device->output_name; |
402 | } | 402 | } |
403 | if (mapped_to_output != NULL) { | 403 | if (mapped_to_output != NULL) { |
404 | wlr_log(L_DEBUG, "Mapping input device %s to output %s", | 404 | wlr_log(WLR_DEBUG, "Mapping input device %s to output %s", |
405 | sway_device->input_device->identifier, mapped_to_output); | 405 | sway_device->input_device->identifier, mapped_to_output); |
406 | struct sway_container *output = NULL; | 406 | struct sway_container *output = NULL; |
407 | for (int i = 0; i < root_container.children->length; ++i) { | 407 | for (int i = 0; i < root_container.children->length; ++i) { |
@@ -415,7 +415,7 @@ static void seat_apply_input_config(struct sway_seat *seat, | |||
415 | wlr_cursor_map_input_to_output(seat->cursor->cursor, | 415 | wlr_cursor_map_input_to_output(seat->cursor->cursor, |
416 | sway_device->input_device->wlr_device, | 416 | sway_device->input_device->wlr_device, |
417 | output->sway_output->wlr_output); | 417 | output->sway_output->wlr_output); |
418 | wlr_log(L_DEBUG, "Mapped to output %s", output->name); | 418 | wlr_log(WLR_DEBUG, "Mapped to output %s", output->name); |
419 | } | 419 | } |
420 | } | 420 | } |
421 | } | 421 | } |
@@ -495,7 +495,7 @@ void seat_configure_device(struct sway_seat *seat, | |||
495 | seat_configure_tablet_tool(seat, seat_device); | 495 | seat_configure_tablet_tool(seat, seat_device); |
496 | break; | 496 | break; |
497 | case WLR_INPUT_DEVICE_TABLET_PAD: | 497 | case WLR_INPUT_DEVICE_TABLET_PAD: |
498 | wlr_log(L_DEBUG, "TODO: configure tablet pad"); | 498 | wlr_log(WLR_DEBUG, "TODO: configure tablet pad"); |
499 | break; | 499 | break; |
500 | } | 500 | } |
501 | } | 501 | } |
@@ -510,11 +510,11 @@ void seat_add_device(struct sway_seat *seat, | |||
510 | struct sway_seat_device *seat_device = | 510 | struct sway_seat_device *seat_device = |
511 | calloc(1, sizeof(struct sway_seat_device)); | 511 | calloc(1, sizeof(struct sway_seat_device)); |
512 | if (!seat_device) { | 512 | if (!seat_device) { |
513 | wlr_log(L_DEBUG, "could not allocate seat device"); | 513 | wlr_log(WLR_DEBUG, "could not allocate seat device"); |
514 | return; | 514 | return; |
515 | } | 515 | } |
516 | 516 | ||
517 | wlr_log(L_DEBUG, "adding device %s to seat %s", | 517 | wlr_log(WLR_DEBUG, "adding device %s to seat %s", |
518 | input_device->identifier, seat->wlr_seat->name); | 518 | input_device->identifier, seat->wlr_seat->name); |
519 | 519 | ||
520 | seat_device->sway_seat = seat; | 520 | seat_device->sway_seat = seat; |
@@ -533,7 +533,7 @@ void seat_remove_device(struct sway_seat *seat, | |||
533 | return; | 533 | return; |
534 | } | 534 | } |
535 | 535 | ||
536 | wlr_log(L_DEBUG, "removing device %s from seat %s", | 536 | wlr_log(WLR_DEBUG, "removing device %s from seat %s", |
537 | input_device->identifier, seat->wlr_seat->name); | 537 | input_device->identifier, seat->wlr_seat->name); |
538 | 538 | ||
539 | seat_device_destroy(seat_device); | 539 | seat_device_destroy(seat_device); |
@@ -752,7 +752,7 @@ void seat_set_focus_layer(struct sway_seat *seat, | |||
752 | struct sway_container *previous = | 752 | struct sway_container *previous = |
753 | seat_get_focus_inactive(seat, &root_container); | 753 | seat_get_focus_inactive(seat, &root_container); |
754 | if (previous) { | 754 | if (previous) { |
755 | wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous, | 755 | wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous, |
756 | container_type_to_str(previous->type), previous->name); | 756 | container_type_to_str(previous->type), previous->name); |
757 | // Hack to get seat to re-focus the return value of get_focus | 757 | // Hack to get seat to re-focus the return value of get_focus |
758 | seat_set_focus(seat, previous->parent); | 758 | seat_set_focus(seat, previous->parent); |