mv xwl.c xwayland.c

include/labwc.h

@@ -164,7 +164,7 @@ struct keyboard {
 void xdg_toplevel_decoration(struct wl_listener *listener, void *data);
 void xdg_surface_new(struct wl_listener *listener, void *data);
 
-void xwl_surface_new(struct wl_listener *listener, void *data);
+void xwayland_surface_new(struct wl_listener *listener, void *data);
 void xwayland_unmanaged_create(struct wlr_xwayland_surface *xsurface);
 
 void view_init_position(struct view *view);

src/meson.build

@@ -11,8 +11,8 @@ labwc_sources = files(
   'server.c',
   'view.c',
   'xdg.c',
+  'xwayland.c',
   'xwayland-unmanaged.c',
-  'xwl.c',
 )
 
 subdir('common')

src/server.c

@@ -233,7 +233,7 @@ void server_init(struct server *server)
 		wlr_log(WLR_ERROR, "cannot create xwayland server");
 		exit(EXIT_FAILURE);
 	}
-	server->new_xwayland_surface.notify = xwl_surface_new;
+	server->new_xwayland_surface.notify = xwayland_surface_new;
 	wl_signal_add(&server->xwayland->events.new_surface,
 		      &server->new_xwayland_surface);
 

src/xwayland.c

@@ -101,7 +101,7 @@ static const struct view_impl xwl_view_impl = {
 	.unmap = unmap,
 };
 
-void xwl_surface_new(struct wl_listener *listener, void *data)
+void xwayland_surface_new(struct wl_listener *listener, void *data)
 {
 	struct server *server =
 		wl_container_of(listener, server, new_xwayland_surface);