Update for swaywm/wlroots#1126

4 files changed, 35 insertions, 35 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index a2f11557..307eedd4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -474,7 +474,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
         // TODO: check cursor mode
         if (focused_client == NULL ||
                         event->seat_client->client != focused_client) {
-                wlr_log(L_DEBUG, "denying request to set cursor from unfocused client");
+                wlr_log(WLR_DEBUG, "denying request to set cursor from unfocused client");
                 return;
         }
 
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 98f7d7cf..daaf1fb6 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -61,7 +61,7 @@ static char *get_device_identifier(struct wlr_input_device *device) {
         int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
         char *identifier = malloc(len);
         if (!identifier) {
-                wlr_log(L_ERROR, "Unable to allocate unique input device name");
+                wlr_log(WLR_ERROR, "Unable to allocate unique input device name");
                 return NULL;
         }
 
@@ -104,74 +104,74 @@ static void input_manager_libinput_config_pointer(
         }
 
         libinput_device = wlr_libinput_get_device_handle(wlr_device);
-        wlr_log(L_DEBUG, "input_manager_libinput_config_pointer(%s)",
+        wlr_log(WLR_DEBUG, "input_manager_libinput_config_pointer(%s)",
                 ic->identifier);
 
         if (ic->accel_profile != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
                         ic->identifier, ic->accel_profile);
                 libinput_device_config_accel_set_profile(libinput_device,
                         ic->accel_profile);
         }
         if (ic->click_method != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
                         ic->identifier, ic->click_method);
                 libinput_device_config_click_set_method(libinput_device,
                         ic->click_method);
         }
         if (ic->drag_lock != INT_MIN) {
-                wlr_log(L_DEBUG,
+                wlr_log(WLR_DEBUG,
                         "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
                         ic->identifier, ic->click_method);
                 libinput_device_config_tap_set_drag_lock_enabled(libinput_device,
                         ic->drag_lock);
         }
         if (ic->dwt != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
                         ic->identifier, ic->dwt);
                 libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
         }
         if (ic->left_handed != INT_MIN) {
-                wlr_log(L_DEBUG,
+                wlr_log(WLR_DEBUG,
                         "libinput_config_pointer(%s) left_handed_set_enabled(%d)",
                         ic->identifier, ic->left_handed);
                 libinput_device_config_left_handed_set(libinput_device,
                         ic->left_handed);
         }
         if (ic->middle_emulation != INT_MIN) {
-                wlr_log(L_DEBUG,
+                wlr_log(WLR_DEBUG,
                         "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
                         ic->identifier, ic->middle_emulation);
                 libinput_device_config_middle_emulation_set_enabled(libinput_device,
                         ic->middle_emulation);
         }
         if (ic->natural_scroll != INT_MIN) {
-                wlr_log(L_DEBUG,
+                wlr_log(WLR_DEBUG,
                         "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
                         ic->identifier, ic->natural_scroll);
                 libinput_device_config_scroll_set_natural_scroll_enabled(
                         libinput_device, ic->natural_scroll);
         }
         if (ic->pointer_accel != FLT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
                         ic->identifier, ic->pointer_accel);
                 libinput_device_config_accel_set_speed(libinput_device,
                         ic->pointer_accel);
         }
         if (ic->scroll_method != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
                         ic->identifier, ic->scroll_method);
                 libinput_device_config_scroll_set_method(libinput_device,
                         ic->scroll_method);
         }
         if (ic->send_events != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
                         ic->identifier, ic->send_events);
                 libinput_device_config_send_events_set_mode(libinput_device,
                         ic->send_events);
         }
         if (ic->tap != INT_MIN) {
-                wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
+                wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
                         ic->identifier, ic->tap);
                 libinput_device_config_tap_set_enabled(libinput_device, ic->tap);
         }
@@ -187,7 +187,7 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        wlr_log(L_DEBUG, "removing device: '%s'",
+        wlr_log(WLR_DEBUG, "removing device: '%s'",
                 input_device->identifier);
 
         struct sway_seat *seat = NULL;
@@ -217,7 +217,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
         input_device->identifier = get_device_identifier(device);
         wl_list_insert(&input->devices, &input_device->link);
 
-        wlr_log(L_DEBUG, "adding device: '%s'",
+        wlr_log(WLR_DEBUG, "adding device: '%s'",
                 input_device->identifier);
 
         if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
@@ -229,7 +229,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 
         struct sway_seat *seat = NULL;
         if (!input_has_seat_configuration(input)) {
-                wlr_log(L_DEBUG, "no seat configuration, using default seat");
+                wlr_log(WLR_DEBUG, "no seat configuration, using default seat");
                 seat = input_manager_get_seat(input, default_seat);
                 seat_add_device(seat, input_device);
                 return;
@@ -259,7 +259,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
         }
 
         if (!added) {
-                wlr_log(L_DEBUG,
+                wlr_log(WLR_DEBUG,
                         "device '%s' is not configured on any seats",
                         input_device->identifier);
         }
@@ -282,7 +282,7 @@ static void handle_inhibit_deactivate(struct wl_listener *listener, void *data)
                 seat_set_exclusive_client(seat, NULL);
                 struct sway_container *previous = seat_get_focus(seat);
                 if (previous) {
-                        wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
+                        wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous,
                                         container_type_to_str(previous->type), previous->name);
                         // Hack to get seat to re-focus the return value of get_focus
                         seat_set_focus(seat, previous->parent);
@@ -359,7 +359,7 @@ void input_manager_apply_input_config(struct sway_input_manager *input,
 
 void input_manager_apply_seat_config(struct sway_input_manager *input,
                 struct seat_config *seat_config) {
-        wlr_log(L_DEBUG, "applying new seat config for seat %s",
+        wlr_log(WLR_DEBUG, "applying new seat config for seat %s",
                 seat_config->name);
         struct sway_seat *seat = input_manager_get_seat(input, seat_config->name);
         if (!seat) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 182536de..580c0d4b 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -108,7 +108,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
                 }
 
                 if (*current_binding && *current_binding != binding) {
-                        wlr_log(L_DEBUG, "encountered duplicate bindings %d and %d",
+                        wlr_log(WLR_DEBUG, "encountered duplicate bindings %d and %d",
                                         (*current_binding)->order, binding->order);
                 } else {
                         *current_binding = binding;
@@ -122,12 +122,12 @@ static void get_active_binding(const struct sway_shortcut_state *state,
  */
 static void keyboard_execute_command(struct sway_keyboard *keyboard,
                 struct sway_binding *binding) {
-        wlr_log(L_DEBUG, "running command for binding: %s",
+        wlr_log(WLR_DEBUG, "running command for binding: %s",
                 binding->command);
         config->handler_context.seat = keyboard->seat_device->sway_seat;
         struct cmd_results *results = execute_command(binding->command, NULL);
         if (results->status != CMD_SUCCESS) {
-                wlr_log(L_DEBUG, "could not run command for binding: %s (%s)",
+                wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)",
                         binding->command, results->error);
         }
         free_cmd_results(results);
@@ -386,7 +386,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
                 xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
 
         if (!keymap) {
-                wlr_log(L_DEBUG, "cannot configure keyboard: keymap does not exist");
+                wlr_log(WLR_DEBUG, "cannot configure keyboard: keymap does not exist");
                 xkb_context_unref(context);
                 return;
         }
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,
                 struct sway_seat *seat) {
         if (con->type == C_VIEW) {
                 if (!seat_is_input_allowed(seat, con->sway_view->surface)) {
-                        wlr_log(L_DEBUG, "Refusing to set focus, input is inhibited");
+                        wlr_log(WLR_DEBUG, "Refusing to set focus, input is inhibited");
                         return;
                 }
                 view_set_activated(con->sway_view, true);
@@ -219,7 +219,7 @@ static struct sway_seat_container *seat_container_from_container(
 
         seat_con = calloc(1, sizeof(struct sway_seat_container));
         if (seat_con == NULL) {
-                wlr_log(L_ERROR, "could not allocate seat container");
+                wlr_log(WLR_ERROR, "could not allocate seat container");
                 return NULL;
         }
 
@@ -301,7 +301,7 @@ static void handle_new_drag_icon(struct wl_listener *listener, void *data) {
 
         struct sway_drag_icon *icon = calloc(1, sizeof(struct sway_drag_icon));
         if (icon == NULL) {
-                wlr_log(L_ERROR, "Allocation failed");
+                wlr_log(WLR_ERROR, "Allocation failed");
                 return;
         }
         icon->seat = seat;
@@ -391,7 +391,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
         struct input_config *ic = input_device_get_config(
                         sway_device->input_device);
         if (ic != NULL) {
-                wlr_log(L_DEBUG, "Applying input config to %s",
+                wlr_log(WLR_DEBUG, "Applying input config to %s",
                         sway_device->input_device->identifier);
 
                 mapped_to_output = ic->mapped_to_output;
@@ -401,7 +401,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
                 mapped_to_output = sway_device->input_device->wlr_device->output_name;
         }
         if (mapped_to_output != NULL) {
-                wlr_log(L_DEBUG, "Mapping input device %s to output %s",
+                wlr_log(WLR_DEBUG, "Mapping input device %s to output %s",
                         sway_device->input_device->identifier, mapped_to_output);
                 struct sway_container *output = NULL;
                 for (int i = 0; i < root_container.children->length; ++i) {
@@ -415,7 +415,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
                         wlr_cursor_map_input_to_output(seat->cursor->cursor,
                                 sway_device->input_device->wlr_device,
                                 output->sway_output->wlr_output);
-                        wlr_log(L_DEBUG, "Mapped to output %s", output->name);
+                        wlr_log(WLR_DEBUG, "Mapped to output %s", output->name);
                 }
         }
 }
@@ -495,7 +495,7 @@ void seat_configure_device(struct sway_seat *seat,
                         seat_configure_tablet_tool(seat, seat_device);
                         break;
                 case WLR_INPUT_DEVICE_TABLET_PAD:
-                        wlr_log(L_DEBUG, "TODO: configure tablet pad");
+                        wlr_log(WLR_DEBUG, "TODO: configure tablet pad");
                         break;
         }
 }
@@ -510,11 +510,11 @@ void seat_add_device(struct sway_seat *seat,
         struct sway_seat_device *seat_device =
                 calloc(1, sizeof(struct sway_seat_device));
         if (!seat_device) {
-                wlr_log(L_DEBUG, "could not allocate seat device");
+                wlr_log(WLR_DEBUG, "could not allocate seat device");
                 return;
         }
 
-        wlr_log(L_DEBUG, "adding device %s to seat %s",
+        wlr_log(WLR_DEBUG, "adding device %s to seat %s",
                 input_device->identifier, seat->wlr_seat->name);
 
         seat_device->sway_seat = seat;
@@ -533,7 +533,7 @@ void seat_remove_device(struct sway_seat *seat,
                 return;
         }
 
-        wlr_log(L_DEBUG, "removing device %s from seat %s",
+        wlr_log(WLR_DEBUG, "removing device %s from seat %s",
                 input_device->identifier, seat->wlr_seat->name);
 
         seat_device_destroy(seat_device);
@@ -752,7 +752,7 @@ void seat_set_focus_layer(struct sway_seat *seat,
                 struct sway_container *previous =
                         seat_get_focus_inactive(seat, &root_container);
                 if (previous) {
-                        wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
+                        wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous,
                                         container_type_to_str(previous->type), previous->name);
                         // Hack to get seat to re-focus the return value of get_focus
                         seat_set_focus(seat, previous->parent);