diff options
Diffstat (limited to 'wayland/buffers.c')
-rw-r--r-- | wayland/buffers.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wayland/buffers.c b/wayland/buffers.c index dfedfcf7..1e5e5693 100644 --- a/wayland/buffers.c +++ b/wayland/buffers.c | |||
@@ -49,7 +49,7 @@ static const struct wl_buffer_listener buffer_listener = { | |||
49 | .release = buffer_release | 49 | .release = buffer_release |
50 | }; | 50 | }; |
51 | 51 | ||
52 | static struct buffer *create_buffer(struct client_state *state, struct buffer *buf, | 52 | static struct buffer *create_buffer(struct window *window, struct buffer *buf, |
53 | int32_t width, int32_t height, uint32_t format) { | 53 | int32_t width, int32_t height, uint32_t format) { |
54 | 54 | ||
55 | uint32_t stride = width * 4; | 55 | uint32_t stride = width * 4; |
@@ -62,7 +62,7 @@ static struct buffer *create_buffer(struct client_state *state, struct buffer *b | |||
62 | return NULL; // never reached | 62 | return NULL; // never reached |
63 | } | 63 | } |
64 | void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); | 64 | void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); |
65 | struct wl_shm_pool *pool = wl_shm_create_pool(state->shm, fd, size); | 65 | struct wl_shm_pool *pool = wl_shm_create_pool(window->registry->shm, fd, size); |
66 | buf->buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, format); | 66 | buf->buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, format); |
67 | wl_shm_pool_destroy(pool); | 67 | wl_shm_pool_destroy(pool); |
68 | close(fd); | 68 | close(fd); |
@@ -76,7 +76,7 @@ static struct buffer *create_buffer(struct client_state *state, struct buffer *b | |||
76 | buf->cairo = cairo_create(buf->surface); | 76 | buf->cairo = cairo_create(buf->surface); |
77 | buf->pango = pango_cairo_create_context(buf->cairo); | 77 | buf->pango = pango_cairo_create_context(buf->cairo); |
78 | 78 | ||
79 | wl_buffer_add_listener(buf->buffer, &buffer_listener, state); | 79 | wl_buffer_add_listener(buf->buffer, &buffer_listener, buf); |
80 | return buf; | 80 | return buf; |
81 | } | 81 | } |
82 | 82 | ||
@@ -93,32 +93,32 @@ static void destroy_buffer(struct buffer *buffer) { | |||
93 | memset(buffer, 0, sizeof(struct buffer)); | 93 | memset(buffer, 0, sizeof(struct buffer)); |
94 | } | 94 | } |
95 | 95 | ||
96 | struct buffer *get_next_buffer(struct client_state *state) { | 96 | struct buffer *get_next_buffer(struct window *window) { |
97 | struct buffer *buffer = NULL; | 97 | struct buffer *buffer = NULL; |
98 | 98 | ||
99 | int i; | 99 | int i; |
100 | for (i = 0; i < 2; ++i) { | 100 | for (i = 0; i < 2; ++i) { |
101 | if (state->buffers[i].busy) { | 101 | if (window->buffers[i].busy) { |
102 | continue; | 102 | continue; |
103 | } | 103 | } |
104 | buffer = &state->buffers[i]; | 104 | buffer = &window->buffers[i]; |
105 | } | 105 | } |
106 | 106 | ||
107 | if (!buffer) { | 107 | if (!buffer) { |
108 | return NULL; | 108 | return NULL; |
109 | } | 109 | } |
110 | 110 | ||
111 | if (buffer->width != state->width || buffer->height != state->height) { | 111 | if (buffer->width != window->width || buffer->height != window->height) { |
112 | destroy_buffer(buffer); | 112 | destroy_buffer(buffer); |
113 | } | 113 | } |
114 | 114 | ||
115 | if (!buffer->buffer) { | 115 | if (!buffer->buffer) { |
116 | if (!create_buffer(state, buffer, state->width, state->height, WL_SHM_FORMAT_ARGB8888)) { | 116 | if (!create_buffer(window, buffer, window->width, window->height, WL_SHM_FORMAT_ARGB8888)) { |
117 | return NULL; | 117 | return NULL; |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | state->cairo = buffer->cairo; | 121 | window->cairo = buffer->cairo; |
122 | state->buffer = buffer; | 122 | window->buffer = buffer; |
123 | return buffer; | 123 | return buffer; |
124 | } | 124 | } |