alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix SIGBUS from wayland clients

Browse source
This commit is contained in:
Drew DeVault 2015-11-18 09:55:55 -05:00
parent 665d4baaf1
commit 86372d00db
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/client/client.h
View file

@ -15,7 +15,6 @@ struct output_state {
struct buffer { struct buffer {
struct wl_buffer *buffer; struct wl_buffer *buffer;
int fd;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_t *cairo; cairo_t *cairo;
PangoContext *pango; PangoContext *pango;

4
swaybg/main.c
View file

@ -21,7 +21,7 @@ int main(int argc, char **argv) {
state->width = output->width; state->width = output->width;
state->height = output->height; state->height = output->height;
uint8_t r = 100, g = 100, b = 100; uint8_t r = 0, g = 0, b = 0;
do { do {
if (client_prerender(state) && state->cairo) { if (client_prerender(state) && state->cairo) {
@ -31,7 +31,7 @@ int main(int argc, char **argv) {
client_render(state); client_render(state);
r++; if (r == 0) { g++; if (g == 0) { b++; } } r++; g += 2; b += 4;
} }
} while (wl_display_dispatch(state->display) != -1); } while (wl_display_dispatch(state->display) != -1);

2
wayland/buffers.c
View file

@ -66,6 +66,8 @@ static struct buffer *create_buffer(struct client_state *state, struct buffer *b
free(name); free(name);
fd = -1; fd = -1;
buf->width = width;
buf->height = height;
buf->surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride); buf->surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride);
buf->cairo = cairo_create(buf->surface); buf->cairo = cairo_create(buf->surface);
buf->pango = pango_cairo_create_context(buf->cairo); buf->pango = pango_cairo_create_context(buf->cairo);