commit 8669757

Rename buffer.buffer -> buffer.wl and callback -> sync

 1@@ -46,7 +46,7 @@ struct wayland_drawable
 2     struct wl_surface * surface;
 3     struct
 4     {
 5-        struct wl_buffer * buffer;
 6+        struct wl_buffer * wl;
 7         struct wld_drawable * drawable;
 8     } buffers[2];
 9     uint8_t front_buffer;
10@@ -55,8 +55,8 @@ struct wayland_drawable
11 _Static_assert(offsetof(struct wayland_drawable, base) == 0,
12                "Non-zero offset of base field");
13 
14-static void callback_done(void * data, struct wl_callback * callback,
15-                          uint32_t msecs);
16+static void sync_done(void * data, struct wl_callback * callback,
17+                      uint32_t msecs);
18 
19 static void wayland_fill_rectangle(struct wld_drawable * drawable,
20                                    uint32_t color,
21@@ -72,8 +72,8 @@ static void wayland_draw_text_utf8(struct wld_drawable * drawable,
22 static void wayland_flush(struct wld_drawable * drawable);
23 static void wayland_destroy(struct wld_drawable * drawable);
24 
25-const struct wl_callback_listener callback_listener = {
26-    .done = &callback_done
27+const struct wl_callback_listener sync_listener = {
28+    .done = &sync_done
29 };
30 
31 const struct wld_draw_interface wayland_draw = {
32@@ -214,8 +214,8 @@ struct wld_drawable * wld_wayland_create_drawable_from_buffers
33         return NULL;
34 
35     wayland->context = NULL;
36-    wayland->buffers[0].buffer = buffers[0];
37-    wayland->buffers[1].buffer = buffers[1];
38+    wayland->buffers[0].wl = buffers[0];
39+    wayland->buffers[1].wl = buffers[1];
40     wayland->buffers[0].drawable = drawables[0];
41     wayland->buffers[1].drawable = drawables[1];
42     wayland->front_buffer = 0;
43@@ -236,7 +236,7 @@ int wayland_roundtrip(struct wl_display * display,
44     int ret = 0;
45 
46     callback = wl_display_sync(display);
47-    wl_callback_add_listener(callback, &callback_listener, &done);
48+    wl_callback_add_listener(callback, &sync_listener, &done);
49     wl_proxy_set_queue((struct wl_proxy *) callback, queue);
50 
51     while (!done && ret >= 0)
52@@ -248,7 +248,7 @@ int wayland_roundtrip(struct wl_display * display,
53     return ret;
54 }
55 
56-void callback_done(void * data, struct wl_callback * callback, uint32_t msecs)
57+void sync_done(void * data, struct wl_callback * callback, uint32_t msecs)
58 {
59     bool * done = data;
60 
61@@ -288,7 +288,7 @@ void wayland_flush(struct wld_drawable * drawable)
62     struct wayland_drawable * wayland = (void *) drawable;
63 
64     wld_flush(BACKBUF(wayland).drawable);
65-    wl_surface_attach(wayland->surface, BACKBUF(wayland).buffer, 0, 0);
66+    wl_surface_attach(wayland->surface, BACKBUF(wayland).wl, 0, 0);
67     wl_surface_commit(wayland->surface);
68     wayland->front_buffer ^= 1;
69 }
70@@ -297,8 +297,8 @@ void wayland_destroy(struct wld_drawable * drawable)
71 {
72     struct wayland_drawable * wayland = (void *) drawable;
73 
74-    wl_buffer_destroy(wayland->buffers[0].buffer);
75-    wl_buffer_destroy(wayland->buffers[1].buffer);
76+    wl_buffer_destroy(wayland->buffers[0].wl);
77+    wl_buffer_destroy(wayland->buffers[1].wl);
78     wld_destroy_drawable(wayland->buffers[0].drawable);
79     wld_destroy_drawable(wayland->buffers[1].drawable);
80 }