2 files changed, 16 insertions, 7 deletions

diff --git a/include/client/buffer.h b/include/client/buffer.h
new file mode 100644
index 00000000..aa8d68a1
--- /dev/null
+++ b/include/client/buffer.h
@@ -0,0 +1,8 @@
+#ifndef _BUFFER_H
+#define _BUFFER_H
+
+#include "client/client.h"
+
+struct buffer *get_next_buffer(struct client_state *state);
+
+#endif
diff --git a/include/client.h b/include/client/client.h
index f10e6b1a..bac2c1a6 100644
--- a/include/client.h
+++ b/include/client/client.h
@@ -10,13 +10,16 @@
 struct output_state {
     struct wl_output *output;
     uint32_t flags;
-    int width, height;
+    uint32_t width, height;
 };
 
 struct buffer {
     struct wl_buffer *buffer;
-    struct wl_shm_pool *pool;
+    cairo_surface_t *surface;
+    cairo_t *cairo;
+    PangoContext *pango;
     uint32_t width, height;
+    bool busy;
 };
 
 struct client_state {
@@ -26,20 +29,18 @@ struct client_state {
     struct wl_seat *seat;
     struct wl_shell *shell;
     struct wl_shm *shm;
+    struct buffer buffers[2];
     struct buffer *buffer;
     struct wl_surface *surface;
     struct wl_shell_surface *shell_surface;
     struct wl_callback *frame_cb;
-    bool busy;
+    uint32_t width, height;
     cairo_t *cairo;
-    cairo_surface_t *cairo_surface;
-    PangoContext *pango;
     list_t *outputs;
 };
 
-struct client_state *client_setup(void);
+struct client_state *client_setup(uint32_t width, uint32_t height);
 void client_teardown(struct client_state *state);
-struct buffer *create_memory_pool(struct client_state *state, int32_t width, int32_t height, uint32_t format);
 int client_prerender(struct client_state *state);
 int client_render(struct client_state *state);