From a791ca6f0df5cfb9e65e61ce7ea06210b5789a8b Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 13 Aug 2021 13:26:30 +0900 Subject: [PATCH] temporary: add the name argument at pepper_compositor_create_fd This patch is a temporary one. This patch will be reverted later. Change-Id: I50ae1145465ffbdf8b5a347531811651076d0dcf --- samples/drm-backend.c | 2 +- samples/fbdev-backend.c | 2 +- samples/sample-server.c | 2 +- samples/tdm-backend.c | 2 +- samples/wayland-backend.c | 2 +- samples/x11-backend.c | 2 +- src/bin/doctor/doctor.c | 2 +- src/lib/pepper/compositor.c | 6 +++--- src/lib/pepper/pepper.h | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/drm-backend.c b/samples/drm-backend.c index 8484103..7b232a2 100644 --- a/samples/drm-backend.c +++ b/samples/drm-backend.c @@ -94,7 +94,7 @@ main(int argc, char **argv) if (!pepper_virtual_terminal_setup(tty)) goto cleanup; - compositor = pepper_compositor_create("wayland-0"); + compositor = pepper_compositor_create("wayland-0", NULL); if (!compositor) goto cleanup; diff --git a/samples/fbdev-backend.c b/samples/fbdev-backend.c index 63a6930..db534c6 100644 --- a/samples/fbdev-backend.c +++ b/samples/fbdev-backend.c @@ -103,7 +103,7 @@ main(int argc, char **argv) if (!pepper_virtual_terminal_setup(tty)) goto cleanup; - compositor = pepper_compositor_create("wayland-0"); + compositor = pepper_compositor_create("wayland-0", NULL); if (!compositor) goto cleanup; diff --git a/samples/sample-server.c b/samples/sample-server.c index 4dde94e..4836b41 100644 --- a/samples/sample-server.c +++ b/samples/sample-server.c @@ -203,7 +203,7 @@ main(int argc, char **argv) if (!socket_name) socket_name = "wayland-0"; - compositor = pepper_compositor_create(socket_name); + compositor = pepper_compositor_create(socket_name, NULL); if (!compositor) return -1; diff --git a/samples/tdm-backend.c b/samples/tdm-backend.c index 32ec8cd..45010f6 100644 --- a/samples/tdm-backend.c +++ b/samples/tdm-backend.c @@ -81,7 +81,7 @@ main(int argc, char **argv) init_signals(); - compositor = pepper_compositor_create("wayland-0"); + compositor = pepper_compositor_create("wayland-0", NULL); if (!compositor) goto cleanup; diff --git a/samples/wayland-backend.c b/samples/wayland-backend.c index 86df933..59e459c 100644 --- a/samples/wayland-backend.c +++ b/samples/wayland-backend.c @@ -37,7 +37,7 @@ main(int argc, char **argv) pepper_output_t *output; struct wl_display *display; - compositor = pepper_compositor_create("wayland-1"); + compositor = pepper_compositor_create("wayland-1", NULL); PEPPER_ASSERT(compositor); conn = pepper_wayland_connect(compositor, "wayland-0"); diff --git a/samples/x11-backend.c b/samples/x11-backend.c index 8698c5b..cf796d7 100644 --- a/samples/x11-backend.c +++ b/samples/x11-backend.c @@ -59,7 +59,7 @@ main(int argc, char **argv) if (argc > 2) renderer = argv[2]; - compositor = pepper_compositor_create(socket); + compositor = pepper_compositor_create(socket, NULL); PEPPER_ASSERT(compositor); conn = pepper_x11_connect(compositor, NULL); diff --git a/src/bin/doctor/doctor.c b/src/bin/doctor/doctor.c index bcf029e..e949af3 100644 --- a/src/bin/doctor/doctor.c +++ b/src/bin/doctor/doctor.c @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) setenv("XDG_RUNTIME_DIR", "/run", 1); /* create pepper compositor */ - compositor = pepper_compositor_create(socket_name); + compositor = pepper_compositor_create(socket_name, NULL); PEPPER_CHECK(compositor, return EXIT_FAILURE, "Failed to create compositor !\n"); /* init tbm buffer manager */ diff --git a/src/lib/pepper/compositor.c b/src/lib/pepper/compositor.c index 9d92826..b573a0f 100644 --- a/src/lib/pepper/compositor.c +++ b/src/lib/pepper/compositor.c @@ -207,7 +207,7 @@ pepper_compositor_schedule_repaint(pepper_compositor_t *compositor) * @see pepper_compositor_create() */ PEPPER_API pepper_compositor_t * -pepper_compositor_create_fd(const char *socket_name, int fd) +pepper_compositor_create_fd(const char *socket_name, int fd, char *name) { int ret; pepper_compositor_t *compositor; @@ -294,9 +294,9 @@ error: * @see pepper_compositor_destroy() */ PEPPER_API pepper_compositor_t * -pepper_compositor_create(const char *socket_name) +pepper_compositor_create(const char *socket_name, char *name) { - return pepper_compositor_create_fd(socket_name, -1); + return pepper_compositor_create_fd(socket_name, -1, name); } /** diff --git a/src/lib/pepper/pepper.h b/src/lib/pepper/pepper.h index b293386..b23af84 100644 --- a/src/lib/pepper/pepper.h +++ b/src/lib/pepper/pepper.h @@ -838,10 +838,10 @@ PEPPER_API pepper_object_t * pepper_object_from_id(uint32_t id); PEPPER_API pepper_compositor_t * -pepper_compositor_create(const char *socket_name); +pepper_compositor_create(const char *socket_name, char *name); PEPPER_API pepper_compositor_t * -pepper_compositor_create_fd(const char *socket_name, int fd); +pepper_compositor_create_fd(const char *socket_name, int fd, char *name); PEPPER_API void pepper_compositor_destroy(pepper_compositor_t *compositor); -- 2.7.4