From 8846998b75a74383e637550eb1217b457975eb9e Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Fri, 4 Sep 2020 20:32:41 +0100 Subject: [PATCH] mv xwl.c xwayland.c --- include/labwc.h | 2 +- src/meson.build | 2 +- src/server.c | 2 +- src/{xwl.c => xwayland.c} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/{xwl.c => xwayland.c} (98%) diff --git a/include/labwc.h b/include/labwc.h index 8c2b5fc4..0ace4d23 100644 --- a/include/labwc.h +++ b/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); diff --git a/src/meson.build b/src/meson.build index 26cd31ec..fd4635bb 100644 --- a/src/meson.build +++ b/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') diff --git a/src/server.c b/src/server.c index b144e1c4..a4878cac 100644 --- a/src/server.c +++ b/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); diff --git a/src/xwl.c b/src/xwayland.c similarity index 98% rename from src/xwl.c rename to src/xwayland.c index bd426047..f96c86eb 100644 --- a/src/xwl.c +++ b/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);