commit 48a50df

buffer_socket: Drop wld_ prefix

 1@@ -40,7 +40,7 @@ struct buffered_surface
 2     struct buffer_entry * entries, * back;
 3     unsigned entries_size, entries_capacity;
 4 
 5-    struct wld_buffer_socket * buffer_socket;
 6+    struct buffer_socket * buffer_socket;
 7 
 8     uint32_t width, height;
 9     enum wld_format format;
10@@ -49,7 +49,7 @@ struct buffered_surface
11 
12 struct wld_surface * buffered_surface_create
13     (struct wld_context * context, uint32_t width, uint32_t height,
14-     uint32_t format, uint32_t flags, struct wld_buffer_socket * buffer_socket)
15+     uint32_t format, uint32_t flags, struct buffer_socket * buffer_socket)
16 {
17     struct buffered_surface * surface;
18 

 1@@ -36,7 +36,7 @@ struct wayland_exporter
 2 
 3 struct wayland_buffer_socket
 4 {
 5-    struct wld_buffer_socket base;
 6+    struct buffer_socket base;
 7     struct wl_buffer_listener listener;
 8     struct wld_surface * surface;
 9     struct wl_surface * wl;
10@@ -47,18 +47,18 @@ struct wayland_buffer_socket
11 #include "interface/exporter.h"
12 IMPL(wayland_exporter, wld_exporter)
13 
14-static bool buffer_socket_attach(struct wld_buffer_socket * socket,
15+static bool buffer_socket_attach(struct buffer_socket * socket,
16                                  struct buffer * buffer);
17-static void buffer_socket_process(struct wld_buffer_socket * socket);
18-static void buffer_socket_destroy(struct wld_buffer_socket * socket);
19+static void buffer_socket_process(struct buffer_socket * socket);
20+static void buffer_socket_destroy(struct buffer_socket * socket);
21 
22-static const struct wld_buffer_socket_impl wld_buffer_socket_impl = {
23+static const struct buffer_socket_impl buffer_socket_impl = {
24     .attach = &buffer_socket_attach,
25     .process = &buffer_socket_process,
26     .destroy = &buffer_socket_destroy
27 };
28 
29-IMPL(wayland_buffer_socket, wld_buffer_socket)
30+IMPL(wayland_buffer_socket, buffer_socket)
31 
32 static void sync_done(void * data, struct wl_callback * callback,
33                       uint32_t msecs);
34@@ -166,7 +166,7 @@ struct wld_surface * wld_wayland_create_surface(struct wld_context * context,
35     if (!(socket = malloc(sizeof *socket)))
36         goto error0;
37 
38-    socket->base.impl = &wld_buffer_socket_impl;
39+    socket->base.impl = &buffer_socket_impl;
40     socket->listener.release = &buffer_release;
41     socket->wl = wl;
42     socket->queue = ((struct wayland_context *) context)->queue;
43@@ -240,8 +240,7 @@ void exporter_destroy(struct wld_exporter * base)
44     free(exporter);
45 }
46 
47-bool buffer_socket_attach(struct wld_buffer_socket * base,
48-                          struct buffer * buffer)
49+bool buffer_socket_attach(struct buffer_socket * base, struct buffer * buffer)
50 {
51     struct wayland_buffer_socket * socket = wayland_buffer_socket(base);
52     struct wl_buffer * wl;
53@@ -276,7 +275,7 @@ bool buffer_socket_attach(struct wld_buffer_socket * base,
54     return true;
55 }
56 
57-void buffer_socket_process(struct wld_buffer_socket * base)
58+void buffer_socket_process(struct buffer_socket * base)
59 {
60     struct wayland_buffer_socket * socket = wayland_buffer_socket(base);
61 
62@@ -286,7 +285,7 @@ void buffer_socket_process(struct wld_buffer_socket * base)
63     wl_display_dispatch_queue_pending(socket->display, socket->queue);
64 }
65 
66-void buffer_socket_destroy(struct wld_buffer_socket * socket)
67+void buffer_socket_destroy(struct buffer_socket * socket)
68 {
69     free(socket);
70 }

 1@@ -147,16 +147,16 @@ struct wld_surface_impl
 2     void (* destroy)(struct wld_surface * surface);
 3 };
 4 
 5-struct wld_buffer_socket
 6+struct buffer_socket
 7 {
 8-    const struct wld_buffer_socket_impl * impl;
 9+    const struct buffer_socket_impl * impl;
10 };
11 
12-struct wld_buffer_socket_impl
13+struct buffer_socket_impl
14 {
15-    bool (* attach)(struct wld_buffer_socket * socket, struct buffer * buffer);
16-    void (* process)(struct wld_buffer_socket * socket);
17-    void (* destroy)(struct wld_buffer_socket * socket);
18+    bool (* attach)(struct buffer_socket * socket, struct buffer * buffer);
19+    void (* process)(struct buffer_socket * socket);
20+    void (* destroy)(struct buffer_socket * socket);
21 };
22 
23 bool font_ensure_glyph(struct font * font, FT_UInt glyph_index);
24@@ -222,7 +222,7 @@ struct wld_surface * default_create_surface(struct wld_context * context,
25 struct wld_surface * buffered_surface_create(struct wld_context * context,
26                                              uint32_t width, uint32_t height,
27                                              uint32_t format, uint32_t flags,
28-                                             struct wld_buffer_socket * socket);
29+                                             struct buffer_socket * socket);
30 
31 void context_initialize(struct wld_context * context,
32                         const struct wld_context_impl * impl);