mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 07:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up memory pool files better

Browse source
This commit is contained in:
Drew DeVault 2015-11-18 08:36:08 -05:00
parent 49388eb88b
commit 9a1e95b7da
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/client/client.h
View file

@ -15,6 +15,7 @@ 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;

5
swaybg/main.c
View file

@ -17,11 +17,14 @@ int main(int argc, char **argv) {
if (!(state = client_setup(100, 100))) { if (!(state = client_setup(100, 100))) {
return -1; return -1;
} }
struct output_state *output = state->outputs->items[0];
state->width = output->width;
state->height = output->height;
uint8_t r = 100, g = 100, b = 100; uint8_t r = 100, g = 100, b = 100;
do { do {
if (client_prerender(state)) { if (client_prerender(state) && state->cairo) {
cairo_set_source_rgb(state->cairo, r / 256.0, g / 256.0, b / 256.0); cairo_set_source_rgb(state->cairo, r / 256.0, g / 256.0, b / 256.0);
cairo_rectangle(state->cairo, 0, 0, state->width, state->height); cairo_rectangle(state->cairo, 0, 0, state->width, state->height);
cairo_fill(state->cairo); cairo_fill(state->cairo);

42
wayland/buffers.c
View file

@ -11,34 +11,33 @@
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
static int create_pool_file(size_t size) { static int create_pool_file(size_t size, char **name) {
static const char template[] = "/sway-client-XXXXXX"; static const char template[] = "/sway-client-XXXXXX";
const char *path = getenv("XDG_RUNTIME_DIR"); const char *path = getenv("XDG_RUNTIME_DIR");
if (!path) { if (!path) {
return -1; return -1;
} }
int ts = (path[strlen(path) - 1] == '/'); int ts = (path[strlen(path) - 1] == '/');
char *name = malloc( *name = malloc(
strlen(template) + strlen(template) +
strlen(path) + strlen(path) +
(ts ? 1 : 0) + 1); (ts ? 1 : 0) + 1);
sprintf(name, "%s%s%s", path, ts ? "" : "/", template); sprintf(*name, "%s%s%s", path, ts ? "" : "/", template);
int fd = mkstemp(name); int fd = mkstemp(*name);
free(name);
if (fd < 0) { if (fd < 0) {
return -1; return -1;
} }
if (ftruncate(fd, size) < 0) { if (ftruncate(fd, size) < 0) {
close(fd); close(fd);
return -1; return -1;
} }
return fd; return fd;
} }
static void buffer_release(void *data, struct wl_buffer *wl_buffer) { static void buffer_release(void *data, struct wl_buffer *wl_buffer) {
@ -56,12 +55,15 @@ static struct buffer *create_buffer(struct client_state *state, struct buffer *b
uint32_t stride = width * 4; uint32_t stride = width * 4;
uint32_t size = stride * height; uint32_t size = stride * height;
int fd = create_pool_file(size); char *name;
int fd = create_pool_file(size, &name);
void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
struct wl_shm_pool *pool = wl_shm_create_pool(state->shm, fd, size); struct wl_shm_pool *pool = wl_shm_create_pool(state->shm, fd, size);
buf->buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, format); buf->buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, format);
wl_shm_pool_destroy(pool); wl_shm_pool_destroy(pool);
close(fd); close(fd);
unlink(name);
free(name);
fd = -1; fd = -1;
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);