From 13db84cd0c47f07850585a4f8bf7d3379f497473 Mon Sep 17 00:00:00 2001 From: Taekyun Kim Date: Wed, 1 Apr 2015 13:30:03 +0900 Subject: [PATCH] Build: Build backend modules by default & some bug fix Change-Id: I0768a51d072863b0da4e630ffed1ee891a42d47d --- configure.ac | 4 ++-- src/modules/wayland/wayland-common.c | 6 +++--- src/modules/wayland/wayland-internal.h | 2 +- src/modules/wayland/wayland-output.c | 10 +++++----- src/output.c | 4 ++-- src/pepper.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 05d203c..7c4de97 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ PKG_CHECK_MODULES(LIB_PEPPER, [$LIB_PEPPER_MODULES]) # wayland backend AC_ARG_ENABLE(wayland-backend, AC_HELP_STRING([--enable-wayland-backend], [enable wayland backend]), - [enable_wayland_backend=$enableval], [enable_wayland_backend=no]) + [enable_wayland_backend=$enableval], [enable_wayland_backend=yes]) AM_CONDITIONAL(ENABLE_WAYLAND_BACKEND, test $enable_wayland_backend = yes) @@ -41,7 +41,7 @@ fi # drm backend AC_ARG_ENABLE(drm-backend, AC_HELP_STRING([--enable-drm-backend], [enable drm backend]), - [enable_drm_backend=$enableval], [enable_drm_backend=no]) + [enable_drm_backend=$enableval], [enable_drm_backend=yes]) AM_CONDITIONAL(ENABLE_DRM_BACKEND, test $enable_drm_backend = yes) diff --git a/src/modules/wayland/wayland-common.c b/src/modules/wayland/wayland-common.c index 571b40b..4ed1873 100644 --- a/src/modules/wayland/wayland-common.c +++ b/src/modules/wayland/wayland-common.c @@ -57,7 +57,7 @@ handle_wayland_event(int fd, uint32_t mask, void *data) } PEPPER_API pepper_wayland_t * -pepper_wayland_connect(const char *socket_name, pepper_compositor_t *compositor) +pepper_wayland_connect(pepper_compositor_t *compositor, const char *socket_name) { pepper_wayland_t *conn; struct wl_display *compositor_display; @@ -67,7 +67,7 @@ pepper_wayland_connect(const char *socket_name, pepper_compositor_t *compositor) if (!conn) return NULL; - conn->compositor = compositor; + conn->pepper = compositor; conn->socket_name = pepper_string_copy(socket_name); conn->display = wl_display_connect(socket_name); @@ -90,7 +90,7 @@ pepper_wayland_connect(const char *socket_name, pepper_compositor_t *compositor) PEPPER_API void pepper_wayland_destroy(pepper_wayland_t *conn) { - wl_signal_emit(&conn->destroy_signal); + wl_signal_emit(&conn->destroy_signal, conn); if (conn->socket_name) pepper_string_free(conn->socket_name); diff --git a/src/modules/wayland/wayland-internal.h b/src/modules/wayland/wayland-internal.h index 8a9be6c..fe9b891 100644 --- a/src/modules/wayland/wayland-internal.h +++ b/src/modules/wayland/wayland-internal.h @@ -6,7 +6,7 @@ typedef struct wayland_output wayland_output_t; struct pepper_wayland { - pepper_compositor_t *compositor; + pepper_compositor_t *pepper; char *socket_name; struct wl_display *display; diff --git a/src/modules/wayland/wayland-output.c b/src/modules/wayland/wayland-output.c index 0b42caa..dacfdef 100644 --- a/src/modules/wayland/wayland-output.c +++ b/src/modules/wayland/wayland-output.c @@ -43,7 +43,7 @@ wayland_output_destroy(void *o) wl_signal_emit(&output->destroy_signal, output); - wl_list_remove(&conn_destroy_listener.link); + wl_list_remove(&output->conn_destroy_listener.link); wl_surface_destroy(output->surface); wl_shell_surface_destroy(output->shell_surface); @@ -120,10 +120,10 @@ wayland_output_set_mode(void *o, const pepper_output_mode_t *mode) if (mode->refresh != 60000) return PEPPER_FALSE; - if (output->w != w || output->h != h) + if (output->w != mode->w || output->h != mode->h) { - output->w = w; - output->h = h; + output->w = mode->w; + output->h = mode->h; /* TODO: Handle resize here. */ @@ -171,7 +171,7 @@ pepper_wayland_output_create(pepper_wayland_t *conn, int32_t w, int32_t h) wl_shell_surface_add_listener(output->shell_surface, &shell_surface_listener, output); /* Add compositor base class output object for this output. */ - if (!pepper_compositor_add_output(conn->compositor, &wayland_output_interface, output)) + if (!pepper_compositor_add_output(conn->pepper, &wayland_output_interface, output)) { wayland_output_destroy(output); return PEPPER_FALSE; diff --git a/src/output.c b/src/output.c index 44ffbfa..7804515 100644 --- a/src/output.c +++ b/src/output.c @@ -120,7 +120,7 @@ handle_mode_change(struct wl_listener *listener, void *data) PEPPER_API pepper_bool_t pepper_compositor_add_output(pepper_compositor_t *compositor, - pepper_output_interface_t *interface, void *data) + const pepper_output_interface_t *interface, void *data) { pepper_output_t *output; @@ -142,7 +142,7 @@ pepper_compositor_add_output(pepper_compositor_t *compositor, } /* Create backend-side object. */ - output->interface = interface; + output->interface = (pepper_output_interface_t *)interface; output->data = data; /* Initialize output modes. */ diff --git a/src/pepper.h b/src/pepper.h index 6ddbecc..7816566 100644 --- a/src/pepper.h +++ b/src/pepper.h @@ -79,7 +79,7 @@ pepper_compositor_get_display(pepper_compositor_t *compositor); PEPPER_API pepper_bool_t pepper_compositor_add_output(pepper_compositor_t *compositor, - pepper_output_interface_t *interface, + const pepper_output_interface_t *interface, void *data); PEPPER_API pepper_compositor_t * -- 2.7.4