util: add wlr_ prefix to log symbols

14 files changed, 61 insertions, 61 deletions

diff --git a/rootston/config.c b/rootston/config.c
index 7ef5e629..0c0ad055 100644
--- a/rootston/config.c
+++ b/rootston/config.c
@@ -35,7 +35,7 @@ static void usage(const char *name, int ret) {
 static struct wlr_box *parse_geometry(const char *str) {
 	// format: {width}x{height}+{x}+{y}
 	if (strlen(str) > 255) {
-		wlr_log(L_ERROR, "cannot parse geometry string, too long");
+		wlr_log(WLR_ERROR, "cannot parse geometry string, too long");
 		return NULL;
 	}
 
@@ -88,7 +88,7 @@ static struct wlr_box *parse_geometry(const char *str) {
 	return box;
 
 invalid_input:
-	wlr_log(L_ERROR, "could not parse geometry string: %s", str);
+	wlr_log(WLR_ERROR, "could not parse geometry string: %s", str);
 	free(buf);
 	free(box);
 	return NULL;
@@ -177,7 +177,7 @@ void add_binding_config(struct wl_list *bindings, const char* combination,
 			xkb_keysym_t sym = xkb_keysym_from_name(symname,
 				XKB_KEYSYM_NO_FLAGS);
 			if (sym == XKB_KEY_NoSymbol) {
-				wlr_log(L_ERROR, "got unknown key binding symbol: %s",
+				wlr_log(WLR_ERROR, "got unknown key binding symbol: %s",
 					symname);
 				free(bc);
 				bc = NULL;
@@ -228,7 +228,7 @@ static void config_handle_cursor(struct roots_config *config,
 		free(cc->default_image);
 		cc->default_image = strdup(value);
 	} else {
-		wlr_log(L_ERROR, "got unknown cursor config: %s", name);
+		wlr_log(WLR_ERROR, "got unknown cursor config: %s", name);
 	}
 }
 
@@ -252,7 +252,7 @@ static void config_handle_keyboard(struct roots_config *config,
 	if (strcmp(name, "meta-key") == 0) {
 		kc->meta_key = parse_modifier(value);
 		if (kc->meta_key == 0) {
-			wlr_log(L_ERROR, "got unknown meta key: %s", name);
+			wlr_log(WLR_ERROR, "got unknown meta key: %s", name);
 		}
 	} else if (strcmp(name, "rules") == 0) {
 		kc->rules = strdup(value);
@@ -269,7 +269,7 @@ static void config_handle_keyboard(struct roots_config *config,
 	} else if (strcmp(name, "repeat-delay") == 0) {
 		kc->repeat_delay = strtol(value, NULL, 10);
 	} else {
-		wlr_log(L_ERROR, "got unknown keyboard config: %s", name);
+		wlr_log(WLR_ERROR, "got unknown keyboard config: %s", name);
 	}
 }
 
@@ -291,10 +291,10 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 			} else if (strcasecmp(value, "false") == 0) {
 				config->xwayland = false;
 			} else {
-				wlr_log(L_ERROR, "got unknown xwayland value: %s", value);
+				wlr_log(WLR_ERROR, "got unknown xwayland value: %s", value);
 			}
 		} else {
-			wlr_log(L_ERROR, "got unknown core config: %s", name);
+			wlr_log(WLR_ERROR, "got unknown core config: %s", name);
 		}
 	} else if (strncmp(output_prefix, section, strlen(output_prefix)) == 0) {
 		const char *output_name = section + strlen(output_prefix);
@@ -324,7 +324,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 			} else if (strcasecmp(value, "false") == 0) {
 				oc->enable = false;
 			} else {
-				wlr_log(L_ERROR, "got invalid output enable value: %s", value);
+				wlr_log(WLR_ERROR, "got invalid output enable value: %s", value);
 			}
 		} else if (strcmp(name, "x") == 0) {
 			oc->x = strtol(value, NULL, 10);
@@ -351,7 +351,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 			} else if (strcmp(value, "flipped-270") == 0) {
 				oc->transform = WL_OUTPUT_TRANSFORM_FLIPPED_270;
 			} else {
-				wlr_log(L_ERROR, "got unknown transform value: %s", value);
+				wlr_log(WLR_ERROR, "got unknown transform value: %s", value);
 			}
 		} else if (strcmp(name, "mode") == 0) {
 			char *end;
@@ -365,7 +365,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 				oc->mode.refresh_rate = strtof(end, &end);
 				assert(strcmp("Hz", end) == 0);
 			}
-			wlr_log(L_DEBUG, "Configured output %s with mode %dx%d@%f",
+			wlr_log(WLR_DEBUG, "Configured output %s with mode %dx%d@%f",
 					oc->name, oc->mode.width, oc->mode.height,
 					oc->mode.refresh_rate);
 		} else if (strcmp(name, "modeline") == 0) {
@@ -375,7 +375,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 				wl_list_insert(&oc->modes, &mode->link);
 			} else {
 				free(mode);
-				wlr_log(L_ERROR, "Invalid modeline: %s", value);
+				wlr_log(WLR_ERROR, "Invalid modeline: %s", value);
 			}
 		}
 	} else if (strncmp(cursor_prefix, section, strlen(cursor_prefix)) == 0) {
@@ -418,12 +418,12 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 			} else if (strcasecmp(value, "false") == 0) {
 				dc->tap_enabled = false;
 			} else {
-				wlr_log(L_ERROR,
+				wlr_log(WLR_ERROR,
 					"got unknown tap_enabled value: %s",
 					value);
 			}
 		} else {
-			wlr_log(L_ERROR, "got unknown device config: %s", name);
+			wlr_log(WLR_ERROR, "got unknown device config: %s", name);
 		}
 	} else if (strcmp(section, "keyboard") == 0) {
 		config_handle_keyboard(config, "", name, value);
@@ -434,7 +434,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
 	} else if (strcmp(section, "bindings") == 0) {
 		add_binding_config(&config->bindings, name, value);
 	} else {
-		wlr_log(L_ERROR, "got unknown config section: %s", section);
+		wlr_log(WLR_ERROR, "got unknown config section: %s", section);
 	}
 
 	return 1;
@@ -478,12 +478,12 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
 		if (getcwd(cwd, sizeof(cwd)) != NULL) {
 			char buf[MAXPATHLEN];
 			if (snprintf(buf, MAXPATHLEN, "%s/%s", cwd, "rootston.ini") >= MAXPATHLEN) {
-				wlr_log(L_ERROR, "config path too long");
+				wlr_log(WLR_ERROR, "config path too long");
 				exit(1);
 			}
 			config->config_path = strdup(buf);
 		} else {
-			wlr_log(L_ERROR, "could not get cwd");
+			wlr_log(WLR_ERROR, "could not get cwd");
 			exit(1);
 		}
 	}
@@ -491,7 +491,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
 	int result = ini_parse(config->config_path, config_ini_handler, config);
 
 	if (result == -1) {
-		wlr_log(L_DEBUG, "No config file found. Using sensible defaults.");
+		wlr_log(WLR_DEBUG, "No config file found. Using sensible defaults.");
 		add_binding_config(&config->bindings, "Logo+Shift+E", "exit");
 		add_binding_config(&config->bindings, "Ctrl+q", "close");
 		add_binding_config(&config->bindings, "Alt+Tab", "next_window");
@@ -501,10 +501,10 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
 		kc->name = strdup("");
 		wl_list_insert(&config->keyboards, &kc->link);
 	} else if (result == -2) {
-		wlr_log(L_ERROR, "Could not allocate memory to parse config file");
+		wlr_log(WLR_ERROR, "Could not allocate memory to parse config file");
 		exit(1);
 	} else if (result != 0) {
-		wlr_log(L_ERROR, "Could not parse config file");
+		wlr_log(WLR_ERROR, "Could not parse config file");
 		exit(1);
 	}
 
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 904af67f..94f5520e 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -429,7 +429,7 @@ void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 	}
 	if (event->seat_client->client != focused_client ||
 			cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
-		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/rootston/desktop.c b/rootston/desktop.c
index 4b5a5c9a..563c5938 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -757,7 +757,7 @@ static void input_inhibit_deactivate(struct wl_listener *listener, void *data) {
 
 struct roots_desktop *desktop_create(struct roots_server *server,
 		struct roots_config *config) {
-	wlr_log(L_DEBUG, "Initializing roots desktop");
+	wlr_log(WLR_DEBUG, "Initializing roots desktop");
 
 	struct roots_desktop *desktop = calloc(1, sizeof(struct roots_desktop));
 	if (desktop == NULL) {
@@ -816,7 +816,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 	desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme,
 		ROOTS_XCURSOR_SIZE);
 	if (desktop->xcursor_manager == NULL) {
-		wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s",
+		wlr_log(WLR_ERROR, "Cannot create XCursor manager for theme %s",
 			cursor_theme);
 		free(desktop);
 		return NULL;
@@ -830,7 +830,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		desktop->xwayland_surface.notify = handle_xwayland_surface;
 
 		if (wlr_xcursor_manager_load(desktop->xcursor_manager, 1)) {
-			wlr_log(L_ERROR, "Cannot load XWayland XCursor theme");
+			wlr_log(WLR_ERROR, "Cannot load XWayland XCursor theme");
 		}
 		struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
 			desktop->xcursor_manager, cursor_default, 1);
diff --git a/rootston/input.c b/rootston/input.c
index 3e1b06fb..84b5acae 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -56,11 +56,11 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 
 	struct roots_seat *seat = input_get_seat(input, seat_name);
 	if (!seat) {
-		wlr_log(L_ERROR, "could not create roots seat");
+		wlr_log(WLR_ERROR, "could not create roots seat");
 		return;
 	}
 
-	wlr_log(L_DEBUG, "New input device: %s (%d:%d) %s seat:%s", device->name,
+	wlr_log(WLR_DEBUG, "New input device: %s (%d:%d) %s seat:%s", device->name,
 			device->vendor, device->product, device_type(device->type), seat_name);
 
 	roots_seat_add_device(seat, device);
@@ -69,7 +69,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 		struct libinput_device *libinput_dev =
 			wlr_libinput_get_device_handle(device);
 
-		wlr_log(L_DEBUG, "input has config, tap_enabled: %d\n", dc->tap_enabled);
+		wlr_log(WLR_DEBUG, "input has config, tap_enabled: %d\n", dc->tap_enabled);
 		if (dc->tap_enabled) {
 			libinput_device_config_tap_set_enabled(libinput_dev,
 					LIBINPUT_CONFIG_TAP_ENABLED);
@@ -79,7 +79,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 
 struct roots_input *input_create(struct roots_server *server,
 		struct roots_config *config) {
-	wlr_log(L_DEBUG, "Initializing roots input");
+	wlr_log(WLR_DEBUG, "Initializing roots input");
 	assert(server->desktop);
 
 	struct roots_input *input = calloc(1, sizeof(struct roots_input));
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index b5dac51c..6697ca83 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -115,7 +115,7 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 		const char *shell_cmd = command + strlen(exec_prefix);
 		pid_t pid = fork();
 		if (pid < 0) {
-			wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
+			wlr_log(WLR_ERROR, "cannot execute binding command: fork() failed");
 			return;
 		} else if (pid == 0) {
 			execl("/bin/sh", "/bin/sh", "-c", shell_cmd, (void *)NULL);
@@ -126,7 +126,7 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 			view_maximize(focus, !focus->maximized);
 		}
 	} else if (strcmp(command, "nop") == 0) {
-		wlr_log(L_DEBUG, "nop command");
+		wlr_log(WLR_DEBUG, "nop command");
 	} else if (strcmp(command, "toggle_outputs") == 0) {
 		outputs_enabled = !outputs_enabled;
 		struct roots_output *output;
@@ -134,7 +134,7 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 			wlr_output_enable(output->wlr_output, outputs_enabled);
 		}
 	} else {
-		wlr_log(L_ERROR, "unknown binding command: %s", command);
+		wlr_log(WLR_ERROR, "unknown binding command: %s", command);
 	}
 }
 
@@ -369,7 +369,7 @@ struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,
 	rules.options = config->options;
 	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 	if (context == NULL) {
-		wlr_log(L_ERROR, "Cannot create XKB context");
+		wlr_log(WLR_ERROR, "Cannot create XKB context");
 		return NULL;
 	}
 
@@ -377,7 +377,7 @@ struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,
 		XKB_KEYMAP_COMPILE_NO_FLAGS);
 	if (keymap == NULL) {
 		xkb_context_unref(context);
-		wlr_log(L_ERROR, "Cannot create XKB keymap");
+		wlr_log(WLR_ERROR, "Cannot create XKB keymap");
 		return NULL;
 	}
 
diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c
index 2adf11a5..ba69c3db 100644
--- a/rootston/layer_shell.c
+++ b/rootston/layer_shell.c
@@ -371,7 +371,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 	struct wlr_layer_surface *layer_surface = data;
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, layer_shell_surface);
-	wlr_log(L_DEBUG, "new layer surface: namespace %s layer %d anchor %d "
+	wlr_log(WLR_DEBUG, "new layer surface: namespace %s layer %d anchor %d "
 			"size %dx%d margin %d,%d,%d,%d",
 		layer_surface->namespace, layer_surface->layer, layer_surface->layer,
 		layer_surface->client_pending.desired_width,
@@ -390,7 +390,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 					seat->cursor->cursor->x,
 					seat->cursor->cursor->y);
 		if (!output) {
-			wlr_log(L_ERROR, "Couldn't find output at (%.0f,%.0f)",
+			wlr_log(WLR_ERROR, "Couldn't find output at (%.0f,%.0f)",
 				seat->cursor->cursor->x,
 				seat->cursor->cursor->y);
 			output = wlr_output_layout_get_center_output(desktop->layout);
diff --git a/rootston/main.c b/rootston/main.c
index 8a0205f2..cc3ffd3e 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -15,7 +15,7 @@
 struct roots_server server = { 0 };
 
 int main(int argc, char **argv) {
-	wlr_log_init(L_DEBUG, NULL);
+	wlr_log_init(WLR_DEBUG, NULL);
 	server.config = roots_config_create_from_args(argc, argv);
 	server.wl_display = wl_display_create();
 	server.wl_event_loop = wl_display_get_event_loop(server.wl_display);
@@ -23,7 +23,7 @@ int main(int argc, char **argv) {
 
 	server.backend = wlr_backend_autocreate(server.wl_display, NULL);
 	if (server.backend == NULL) {
-		wlr_log(L_ERROR, "could not start backend");
+		wlr_log(WLR_ERROR, "could not start backend");
 		return 1;
 	}
 
@@ -37,16 +37,16 @@ int main(int argc, char **argv) {
 
 	const char *socket = wl_display_add_socket_auto(server.wl_display);
 	if (!socket) {
-		wlr_log_errno(L_ERROR, "Unable to open wayland socket");
+		wlr_log_errno(WLR_ERROR, "Unable to open wayland socket");
 		wlr_backend_destroy(server.backend);
 		return 1;
 	}
 
-	wlr_log(L_INFO, "Running compositor on wayland display '%s'", socket);
+	wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", socket);
 	setenv("_WAYLAND_DISPLAY", socket, true);
 
 	if (!wlr_backend_start(server.backend)) {
-		wlr_log(L_ERROR, "Failed to start backend");
+		wlr_log(WLR_ERROR, "Failed to start backend");
 		wlr_backend_destroy(server.backend);
 		wl_display_destroy(server.wl_display);
 		return 1;
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
 		const char *cmd = server.config->startup_cmd;
 		pid_t pid = fork();
 		if (pid < 0) {
-			wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
+			wlr_log(WLR_ERROR, "cannot execute binding command: fork() failed");
 		} else if (pid == 0) {
 			execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
 		}
diff --git a/rootston/output.c b/rootston/output.c
index e3b03984..71ccf8bc 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -758,9 +758,9 @@ static void set_mode(struct wlr_output *output,
 		}
 	}
 	if (!best) {
-		wlr_log(L_ERROR, "Configured mode for %s not available", output->name);
+		wlr_log(WLR_ERROR, "Configured mode for %s not available", output->name);
 	} else {
-		wlr_log(L_DEBUG, "Assigning configured mode to %s", output->name);
+		wlr_log(WLR_DEBUG, "Assigning configured mode to %s", output->name);
 		wlr_output_set_mode(output, best);
 	}
 }
@@ -817,8 +817,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	struct roots_input *input = desktop->server->input;
 	struct roots_config *config = desktop->config;
 
-	wlr_log(L_DEBUG, "Output '%s' added", wlr_output->name);
-	wlr_log(L_DEBUG, "'%s %s %s' %"PRId32"mm x %"PRId32"mm", wlr_output->make,
+	wlr_log(WLR_DEBUG, "Output '%s' added", wlr_output->name);
+	wlr_log(WLR_DEBUG, "'%s %s %s' %"PRId32"mm x %"PRId32"mm", wlr_output->make,
 		wlr_output->model, wlr_output->serial, wlr_output->phys_width,
 		wlr_output->phys_height);
 
@@ -866,7 +866,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 				}
 			} else {
 				if (!wl_list_empty(&output_config->modes)) {
-					wlr_log(L_ERROR, "Can only add modes for DRM backend");
+					wlr_log(WLR_ERROR, "Can only add modes for DRM backend");
 				}
 			}
 			if (output_config->mode.width) {
diff --git a/rootston/seat.c b/rootston/seat.c
index d8910660..544cfb90 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -443,7 +443,7 @@ static void seat_add_keyboard(struct roots_seat *seat,
 	struct roots_keyboard *keyboard =
 		roots_keyboard_create(device, seat->input);
 	if (keyboard == NULL) {
-		wlr_log(L_ERROR, "could not allocate keyboard for seat");
+		wlr_log(WLR_ERROR, "could not allocate keyboard for seat");
 		return;
 	}
 
@@ -480,7 +480,7 @@ static void seat_add_pointer(struct roots_seat *seat,
 		struct wlr_input_device *device) {
 	struct roots_pointer *pointer = calloc(sizeof(struct roots_pointer), 1);
 	if (!pointer) {
-		wlr_log(L_ERROR, "could not allocate pointer for seat");
+		wlr_log(WLR_ERROR, "could not allocate pointer for seat");
 		return;
 	}
 
@@ -513,7 +513,7 @@ static void seat_add_touch(struct roots_seat *seat,
 		struct wlr_input_device *device) {
 	struct roots_touch *touch = calloc(sizeof(struct roots_touch), 1);
 	if (!touch) {
-		wlr_log(L_ERROR, "could not allocate touch for seat");
+		wlr_log(WLR_ERROR, "could not allocate touch for seat");
 		return;
 	}
 
@@ -553,7 +553,7 @@ static void seat_add_tablet_tool(struct roots_seat *seat,
 	struct roots_tablet_tool *tablet_tool =
 		calloc(sizeof(struct roots_tablet_tool), 1);
 	if (!tablet_tool) {
-		wlr_log(L_ERROR, "could not allocate tablet_tool for seat");
+		wlr_log(WLR_ERROR, "could not allocate tablet_tool for seat");
 		return;
 	}
 
@@ -608,7 +608,7 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
 		seat->cursor->xcursor_manager =
 			wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE);
 		if (seat->cursor->xcursor_manager == NULL) {
-			wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s",
+			wlr_log(WLR_ERROR, "Cannot create XCursor manager for theme %s",
 					cursor_theme);
 			return;
 		}
@@ -618,7 +618,7 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
 	wl_list_for_each(output, &seat->input->server->desktop->outputs, link) {
 		float scale = output->wlr_output->scale;
 		if (wlr_xcursor_manager_load(seat->cursor->xcursor_manager, scale)) {
-			wlr_log(L_ERROR, "Cannot load xcursor theme for output '%s' "
+			wlr_log(WLR_ERROR, "Cannot load xcursor theme for output '%s' "
 				"with scale %f", output->wlr_output->name, scale);
 		}
 	}
@@ -729,7 +729,7 @@ struct roots_seat_view *roots_seat_view_from_view(
 	if (!found) {
 		seat_view = seat_add_view(seat, view);
 		if (seat_view == NULL) {
-			wlr_log(L_ERROR, "Allocation failed");
+			wlr_log(WLR_ERROR, "Allocation failed");
 			return NULL;
 		}
 	}
diff --git a/rootston/virtual_keyboard.c b/rootston/virtual_keyboard.c
index db47efca..e862caf4 100644
--- a/rootston/virtual_keyboard.c
+++ b/rootston/virtual_keyboard.c
@@ -13,7 +13,7 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
 	struct roots_seat *seat = input_seat_from_wlr_seat(desktop->server->input,
 		keyboard->seat);
 	if (!seat) {
-		wlr_log(L_ERROR, "could not find roots seat");
+		wlr_log(WLR_ERROR, "could not find roots seat");
 		return;
 	}
 
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index 02160773..07ac9f58 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -196,11 +196,11 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	struct wlr_wl_shell_surface *surface = data;
 
 	if (surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
-		wlr_log(L_DEBUG, "new wl shell popup");
+		wlr_log(WLR_DEBUG, "new wl shell popup");
 		return;
 	}
 
-	wlr_log(L_DEBUG, "new wl shell surface: title=%s, class=%s",
+	wlr_log(WLR_DEBUG, "new wl shell surface: title=%s, class=%s",
 		surface->title, surface->class);
 	wlr_wl_shell_surface_ping(surface);
 
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c
index 805fb874..d04d37e1 100644
--- a/rootston/xdg_shell.c
+++ b/rootston/xdg_shell.c
@@ -398,14 +398,14 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
 	assert(surface->role != WLR_XDG_SURFACE_ROLE_NONE);
 
 	if (surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-		wlr_log(L_DEBUG, "new xdg popup");
+		wlr_log(WLR_DEBUG, "new xdg popup");
 		return;
 	}
 
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, xdg_shell_surface);
 
-	wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
+	wlr_log(WLR_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
 		surface->toplevel->title, surface->toplevel->app_id);
 	wlr_xdg_surface_ping(surface);
 
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 02ad867d..219be2b0 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -399,14 +399,14 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE);
 
 	if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
-		wlr_log(L_DEBUG, "new xdg popup");
+		wlr_log(WLR_DEBUG, "new xdg popup");
 		return;
 	}
 
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, xdg_shell_v6_surface);
 
-	wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
+	wlr_log(WLR_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
 		surface->toplevel->title, surface->toplevel->app_id);
 	wlr_xdg_surface_v6_ping(surface);
 
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index d0b80821..66ccce69 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -270,7 +270,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, desktop, xwayland_surface);
 
 	struct wlr_xwayland_surface *surface = data;
-	wlr_log(L_DEBUG, "new xwayland surface: title=%s, class=%s, instance=%s",
+	wlr_log(WLR_DEBUG, "new xwayland surface: title=%s, class=%s, instance=%s",
 		surface->title, surface->class, surface->instance);
 	wlr_xwayland_surface_ping(surface);