pepper: Renamed pepper_xxx_interface_t to pepper_xxx_backend_t

Functions that are used by pepper modules should be hidden from users so that
only those modules can call the functions. We need some structures to pass to
the modules for those functions. As "interface" is more natural name for that,
previous "interface" is now renamed to "backend".

Change-Id: I02d6ec5e13a98532a88746790df36248818cb185

diff --git a/drm/src/drm-output.c b/drm/src/drm-output.c
index 7483d2ed0327582c806d5e9c3361fd0433957a64..c4ea2678165d9fe697affeded32c97232c74999e 100644 (file)
--- a/drm/src/drm-output.c
+++ b/drm/src/drm-output.c
@@ -294,7 +294,7 @@ drm_output_add_frame_listener(void *o, struct wl_listener *listener)
     wl_signal_add(&output->frame_signal, listener);
 }
 
-struct pepper_output_interface drm_output_interface =
+struct pepper_output_backend drm_output_backend =
 {
     drm_output_destroy,
     drm_output_add_destroy_listener,
@@ -770,10 +770,10 @@ add_outputs(pepper_drm_t *drm, struct udev_device *device)
         /*
          * PEPPER_API pepper_output_t *
          * pepper_compositor_add_output(pepper_compositor_t *compositor,
-         *                              const pepper_output_interface_t *interface, void *data)
+         *                              const pepper_output_backend_t *backend, void *data)
          */
         output->base = pepper_compositor_add_output(output->drm->compositor,
-                                                    &drm_output_interface, output);
+                                                    &drm_output_backend, output);
         if (!output->base)
         {
             PEPPER_ERROR("Failed to add output to compositor in %s\n", __FUNCTION__);
@@ -887,7 +887,7 @@ update_outputs(pepper_drm_t *drm, struct udev_device *device)
             }
 
             output->base = pepper_compositor_add_output(output->drm->compositor,
-                                                        &drm_output_interface, output);
+                                                        &drm_output_backend, output);
             if (!output->base)
             {
                 PEPPER_ERROR("Failed to add output to compositor in %s\n", __FUNCTION__);

diff --git a/fbdev/src/fbdev-output.c b/fbdev/src/fbdev-output.c
index 4114de94b17ec737878859a6e2399089cb4c2e0d..cd88fcfa27360ed3243ff6e602e416bee0b19c6b 100644 (file)
--- a/fbdev/src/fbdev-output.c
+++ b/fbdev/src/fbdev-output.c
@@ -191,7 +191,7 @@ fbdev_output_add_frame_listener(void *o, struct wl_listener *listener)
     wl_signal_add(&output->frame_signal, listener);
 }
 
-struct pepper_output_interface fbdev_output_interface =
+struct pepper_output_backend fbdev_output_backend =
 {
     fbdev_output_destroy,
     fbdev_output_add_destroy_listener,
@@ -339,7 +339,7 @@ pepper_fbdev_output_create(pepper_fbdev_t *fbdev, const char *renderer)
     }
 
     output->base = pepper_compositor_add_output(output->fbdev->compositor,
-                                                &fbdev_output_interface, output);
+                                                &fbdev_output_backend, output);
     if (!output->base)
     {
         PEPPER_ERROR("Failed to add output to compositor in %s\n", __FUNCTION__);

diff --git a/libinput/src/libinput.c b/libinput/src/libinput.c
index 82c163e8f3e1bbe7dfeff6688e999784b86f2d70..c616efec92bd0efd7a0b44b8961abc9b75c079b5 100644 (file)
--- a/libinput/src/libinput.c
+++ b/libinput/src/libinput.c
@@ -49,7 +49,7 @@ libinput_seat_get_name(void *data)
     return seat->name;
 }
 
-static const pepper_seat_interface_t libinput_seat_interface =
+static const pepper_seat_backend_t libinput_seat_backend =
 {
     libinput_seat_destroy,
     libinput_seat_add_capabilities_listener,
@@ -75,7 +75,7 @@ libinput_seat_create(pepper_libinput_t *input)
 
     seat->input = input;
     seat->base = pepper_compositor_add_seat(input->compositor,
-                                            &libinput_seat_interface, seat);
+                                            &libinput_seat_backend, seat);
     if (!seat->base)
     {
         PEPPER_ERROR("Failed to create pepper_seat in %s\n", __FUNCTION__);

diff --git a/pepper/src/input.c b/pepper/src/input.c
index 0dbfea01b34db054624b1f56686c950d37a4697a..d75613e24493f7478e935d6276c5bf47d3f03916 100644 (file)
--- a/pepper/src/input.c
+++ b/pepper/src/input.c
@@ -286,7 +286,7 @@ handle_seat_set_capabilities(struct wl_listener *listener, void *data)
     pepper_seat_t  *seat = pepper_container_of(listener, pepper_seat_t, capabilities_listener);
     uint32_t        caps;
 
-    caps = seat->interface->get_capabilities(data);
+    caps = seat->backend->get_capabilities(data);
     seat_set_capabilities(seat, caps);
 }
 
@@ -306,13 +306,13 @@ handle_seat_set_name(struct wl_listener *listener, void *data)
     pepper_seat_t   *seat = pepper_container_of(listener, pepper_seat_t, name_listener);
     const char      *name;
 
-    name = seat->interface->get_name(data);
+    name = seat->backend->get_name(data);
     seat_set_name(seat, name);
 }
 
 PEPPER_API pepper_object_t *
 pepper_compositor_add_seat(pepper_object_t *c,
-                           const pepper_seat_interface_t *interface,
+                           const pepper_seat_backend_t *backend,
                            void *data)
 {
     pepper_seat_t       *seat;
@@ -328,7 +328,7 @@ pepper_compositor_add_seat(pepper_object_t *c,
     }
 
     seat->compositor = compositor;
-    seat->interface = (pepper_seat_interface_t *)interface;
+    seat->backend = (pepper_seat_backend_t *)backend;
     seat->data = data;
 
     wl_list_init(&seat->resources);
@@ -336,9 +336,9 @@ pepper_compositor_add_seat(pepper_object_t *c,
     wl_list_insert(&compositor->seat_list, &seat->link);
 
     seat->capabilities_listener.notify = handle_seat_set_capabilities;
-    seat->interface->add_capabilities_listener(seat->data, &seat->capabilities_listener);
+    seat->backend->add_capabilities_listener(seat->data, &seat->capabilities_listener);
     seat->name_listener.notify = handle_seat_set_name;
-    seat->interface->add_name_listener(seat->data, &seat->name_listener);
+    seat->backend->add_name_listener(seat->data, &seat->name_listener);
 
     seat->global = wl_global_create(compositor->display, &wl_seat_interface, 4, seat,
                                     bind_seat);

diff --git a/pepper/src/output.c b/pepper/src/output.c
index 93cd9c2a604ebcc70a9b30077effa97fa5bbaf66..36bd6d56f4c58b0767f027bbe460a938af25261a 100644 (file)
--- a/pepper/src/output.c
+++ b/pepper/src/output.c
@@ -12,7 +12,7 @@ output_update_mode(pepper_output_t *output)
     if (output->modes)
         pepper_free(output->modes);
 
-    output->mode_count = output->interface->get_mode_count(output->data);
+    output->mode_count = output->backend->get_mode_count(output->data);
     PEPPER_ASSERT(output->mode_count > 0);
 
     output->modes = pepper_calloc(output->mode_count, sizeof(pepper_output_mode_t));
@@ -24,7 +24,7 @@ output_update_mode(pepper_output_t *output)
 
     for (i = 0; i < output->mode_count; i++)
     {
-        output->interface->get_mode(output->data, i, &output->modes[i]);
+        output->backend->get_mode(output->data, i, &output->modes[i]);
 
         if (output->modes[i].flags & WL_OUTPUT_MODE_CURRENT)
             output->current_mode = &output->modes[i];
@@ -113,7 +113,7 @@ handle_output_data_destroy(struct wl_listener *listener, void *data)
 {
     pepper_output_t *output = pepper_container_of(listener, pepper_output_t, data_destroy_listener);
     output->data = NULL;
-    output->interface = NULL;
+    output->backend = NULL;
     pepper_output_destroy(&output->base);
 }
 
@@ -169,7 +169,7 @@ pepper_output_repaint(pepper_output_t *output)
 
     pepper_compositor_update_views(output->compositor);
 
-    output->interface->repaint(output->data, &output->compositor->view_list, &output->damage_region);
+    output->backend->repaint(output->data, &output->compositor->view_list, &output->damage_region);
     output->frame.pending = PEPPER_TRUE;
     output->frame.scheduled = PEPPER_FALSE;
 
@@ -181,7 +181,7 @@ pepper_output_repaint(pepper_output_t *output)
 
 PEPPER_API pepper_object_t *
 pepper_compositor_add_output(pepper_object_t *cmp,
-                             const pepper_output_interface_t *interface, void *data)
+                             const pepper_output_backend_t *backend, void *data)
 {
     pepper_output_t        *output;
     pepper_compositor_t    *compositor = (pepper_compositor_t *)cmp;
@@ -206,7 +206,7 @@ pepper_compositor_add_output(pepper_object_t *cmp,
     }
 
     /* Create backend-side object. */
-    output->interface = (pepper_output_interface_t *)interface;
+    output->backend = (pepper_output_backend_t *)backend;
     output->data = data;
 
     /* Initialize output modes. */
@@ -217,9 +217,9 @@ pepper_compositor_add_output(pepper_object_t *cmp,
 
     /* Initialize geometry. TODO: Calculate position and size of the output. */
     output->geometry.transform = WL_OUTPUT_TRANSFORM_NORMAL;
-    output->geometry.subpixel = interface->get_subpixel_order(data);
-    output->geometry.maker = interface->get_maker_name(data);
-    output->geometry.model = interface->get_model_name(data);
+    output->geometry.subpixel = backend->get_subpixel_order(data);
+    output->geometry.maker = backend->get_maker_name(data);
+    output->geometry.model = backend->get_model_name(data);
     output->geometry.x = 0;
     output->geometry.y = 0;
     output->geometry.w = output->current_mode->w;
@@ -229,13 +229,13 @@ pepper_compositor_add_output(pepper_object_t *cmp,
 
     /* Install listeners. */
     output->data_destroy_listener.notify = handle_output_data_destroy;
-    interface->add_destroy_listener(data, &output->data_destroy_listener);
+    backend->add_destroy_listener(data, &output->data_destroy_listener);
 
     output->mode_change_listener.notify = handle_mode_change;
-    interface->add_mode_change_listener(data, &output->mode_change_listener);
+    backend->add_mode_change_listener(data, &output->mode_change_listener);
 
     output->frame.frame_listener.notify = handle_output_frame;
-    interface->add_frame_listener(data, &output->frame.frame_listener);
+    backend->add_frame_listener(data, &output->frame.frame_listener);
 
     pepper_output_add_damage_whole(&output->base);
     return &output->base;
@@ -258,8 +258,8 @@ pepper_output_destroy(pepper_object_t *out)
 
     wl_list_remove(&output->link);
 
-    if (output->interface && output->data)
-        output->interface->destroy(output->data);
+    if (output->backend && output->data)
+        output->backend->destroy(output->data);
 
     wl_global_destroy(output->global);
     wl_list_remove(&output->data_destroy_listener.link);
@@ -332,7 +332,7 @@ pepper_output_set_mode(pepper_object_t *out, const pepper_output_mode_t *mode)
     if (output->current_mode == mode)
         return PEPPER_TRUE;
 
-    if (output->interface->set_mode(output->data, mode))
+    if (output->backend->set_mode(output->data, mode))
     {
         pepper_output_add_damage_whole(out);
         return PEPPER_TRUE;

diff --git a/pepper/src/pepper-internal.h b/pepper/src/pepper-internal.h
index 02914f8cc65e51899e0873ce22e6483f33cc5eb2..6d9d86c91d2d2b52c480a47c0918759059bc498d 100644 (file)
--- a/pepper/src/pepper-internal.h
+++ b/pepper/src/pepper-internal.h
@@ -111,7 +111,7 @@ struct pepper_output
     pepper_output_mode_t       *current_mode;
 
     /* Backend-specific variables. */
-    pepper_output_interface_t  *interface;
+    pepper_output_backend_t    *backend;
     void                       *data;
 
     /* Listeners for backend-side events. */
@@ -250,7 +250,7 @@ struct pepper_seat
     uint32_t                    modifier;
 
     /* Backend-specific variables. */
-    pepper_seat_interface_t    *interface;
+    pepper_seat_backend_t      *backend;
     void                       *data;
 };
 

diff --git a/pepper/src/pepper.h b/pepper/src/pepper.h
index e8d1005688cfbffcb473bddf16b302aeffff5eea..27ff4ecb9a23f67acbd2f00bdc347c28568b6bf3 100644 (file)
--- a/pepper/src/pepper.h
+++ b/pepper/src/pepper.h
@@ -14,9 +14,9 @@ typedef struct pepper_object            pepper_object_t;
 
 typedef struct pepper_output_geometry   pepper_output_geometry_t;
 typedef struct pepper_output_mode       pepper_output_mode_t;
-typedef struct pepper_output_interface  pepper_output_interface_t;
+typedef struct pepper_output_backend    pepper_output_backend_t;
 
-typedef struct pepper_seat_interface    pepper_seat_interface_t;
+typedef struct pepper_seat_backend      pepper_seat_backend_t;
 
 typedef struct pepper_input_event       pepper_input_event_t;
 typedef struct pepper_event_hook        pepper_event_hook_t;
@@ -51,7 +51,7 @@ struct pepper_output_mode
     int32_t     refresh;
 };
 
-struct pepper_output_interface
+struct pepper_output_backend
 {
     void            (*destroy)(void *output);
 
@@ -96,12 +96,12 @@ pepper_compositor_get_display(pepper_object_t *compositor);
 
 PEPPER_API pepper_object_t *
 pepper_compositor_add_output(pepper_object_t *compositor,
-                             const pepper_output_interface_t *interface,
+                             const pepper_output_backend_t *backend,
                              void *data);
 
 PEPPER_API pepper_object_t *
 pepper_compositor_add_seat(pepper_object_t *compositor,
-                           const pepper_seat_interface_t *interface,
+                           const pepper_seat_backend_t *backend,
                            void *data);
 
 PEPPER_API pepper_object_t *
@@ -139,7 +139,7 @@ PEPPER_API void
 pepper_output_add_damage_whole(pepper_object_t *output);
 
 /* Input. */
-struct pepper_seat_interface
+struct pepper_seat_backend
 {
     void            (*destroy)(void *data);
     void            (*add_capabilities_listener)(void *data, struct wl_listener *listener);

diff --git a/pepper/src/surface.c b/pepper/src/surface.c
index fcc538229b357969c4457321c127e29482f355a5..72f95549dc9227580b8c15602ff36ea59317b33e 100644 (file)
--- a/pepper/src/surface.c
+++ b/pepper/src/surface.c
@@ -340,7 +340,7 @@ attach_surface_to_outputs(pepper_surface_t *surface)
 
     wl_list_for_each(output, &surface->compositor->output_list, link)
     {
-        output->interface->attach_surface(output->data, &surface->base, &w, &h);
+        output->backend->attach_surface(output->data, &surface->base, &w, &h);
 
         surface->buffer.buffer->w = w;
         surface->buffer.buffer->h = h;

diff --git a/wayland/src/wayland-input.c b/wayland/src/wayland-input.c
index a37d9f0f00306d9bd2510242888e11fee6621255..f82099eaf70a6df8da5e3fe99cbf508d8b78ae62 100644 (file)
--- a/wayland/src/wayland-input.c
+++ b/wayland/src/wayland-input.c
@@ -340,7 +340,7 @@ wayland_seat_get_name(void *data)
     return seat->name;
 }
 
-static const pepper_seat_interface_t wayland_seat_interface =
+static const pepper_seat_backend_t wayland_seat_backend =
 {
     wayland_seat_destroy,
     wayland_seat_add_capability_listener,
@@ -368,7 +368,7 @@ wayland_handle_global_seat(pepper_wayland_t *conn, struct wl_registry *registry,
     wl_signal_init(&seat->capabilities_signal);
     wl_signal_init(&seat->name_signal);
 
-    seat->base = pepper_compositor_add_seat(conn->pepper, &wayland_seat_interface, seat);
+    seat->base = pepper_compositor_add_seat(conn->pepper, &wayland_seat_backend, seat);
     seat->id = name;
 
     wl_list_init(&seat->link);

diff --git a/wayland/src/wayland-output.c b/wayland/src/wayland-output.c
index 3565975d479374fc09a626a8a64c79bf6f27031e..346c386aed3646f68b8d96d3558060d6d61d5984 100644 (file)
--- a/wayland/src/wayland-output.c
+++ b/wayland/src/wayland-output.c
@@ -196,7 +196,7 @@ wayland_output_add_frame_listener(void *o, struct wl_listener *listener)
     wl_signal_add(&output->frame_signal, listener);
 }
 
-static const pepper_output_interface_t wayland_output_interface =
+static const pepper_output_backend_t wayland_output_backend =
 {
     wayland_output_destroy,
     wayland_output_add_destroy_listener,
@@ -342,7 +342,7 @@ pepper_wayland_output_create(pepper_wayland_t *conn, int32_t w, int32_t h, const
     wl_shell_surface_set_toplevel(output->shell_surface);
 
     /* Add compositor base class output object for this output. */
-    output->base = pepper_compositor_add_output(conn->pepper, &wayland_output_interface, output);
+    output->base = pepper_compositor_add_output(conn->pepper, &wayland_output_backend, output);
     if (!output->base)
     {
         wayland_output_destroy(output);

diff --git a/x11/src/x11-input.c b/x11/src/x11-input.c
index a4a91ca0f3336287553b0e34f40f836f62f5d32c..272b8b92e4cf3d23a8754af86f3d5c01fe7309b2 100644 (file)
--- a/x11/src/x11-input.c
+++ b/x11/src/x11-input.c
@@ -151,7 +151,7 @@ x11_seat_get_name(void *data)
     return seat->name;
 }
 
-static const pepper_seat_interface_t x11_seat_interface =
+static const pepper_seat_backend_t x11_seat_backend =
 {
     x11_seat_destroy,
     x11_seat_add_capability_listener,
@@ -200,7 +200,7 @@ pepper_x11_seat_create(pepper_x11_connection_t* conn)
     seat->conn_destroy_listener.notify = handle_connection_destroy;
     wl_signal_add(&conn->destroy_signal, &seat->conn_destroy_listener);
 
-    seat->base = pepper_compositor_add_seat(conn->compositor, &x11_seat_interface, seat);
+    seat->base = pepper_compositor_add_seat(conn->compositor, &x11_seat_backend, seat);
     seat->id = X11_BACKEND_INPUT_ID;
 
     /* Hard-coded: */

diff --git a/x11/src/x11-output.c b/x11/src/x11-output.c
index 091605c979a64efcdf1565fb2249142cc3a213f7..9b800f6fada5e0ace2bb0229eae346c44ab125d1 100644 (file)
--- a/x11/src/x11-output.c
+++ b/x11/src/x11-output.c
@@ -498,8 +498,8 @@ x11_output_add_frame_listener(void *o, struct wl_listener *listener)
     wl_signal_add(&output->frame_signal, listener);
 }
 
-/* X11 output interface to export for PePPer core */
-static const pepper_output_interface_t x11_output_interface =
+/* X11 output backend to export for PePPer core */
+static const pepper_output_backend_t x11_output_backend =
 {
     x11_output_destroy,
     x11_output_add_destroy_listener,
@@ -647,7 +647,7 @@ pepper_x11_output_create(pepper_x11_connection_t *connection,
 
     /* Register output object */
     base = pepper_compositor_add_output(connection->compositor,
-                                        &x11_output_interface,
+                                        &x11_output_backend,
                                         output);
     if (!base)
     {