blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gamma-control-v1: set O_NONBLOCK, improve error handling style

This commit is contained in:
emersion 2018-07-22 20:17:51 +01:00
parent 73b7111846
commit 1705316fa7
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
types/wlr_gamma_control_v1.c
View File

@ -1,13 +1,14 @@
#include <assert.h> #include <assert.h>
#include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/types/wlr_gamma_control_v1.h> #include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "wlr-gamma-control-unstable-v1-protocol.h"
#include "util/signal.h" #include "util/signal.h"
#include "wlr-gamma-control-unstable-v1-protocol.h"
#define GAMMA_CONTROL_MANAGER_V1_VERSION 1 #define GAMMA_CONTROL_MANAGER_V1_VERSION 1
@ -27,6 +28,12 @@ static void gamma_control_destroy(struct wlr_gamma_control_v1 *gamma_control) {
free(gamma_control); free(gamma_control);
} }
static void gamma_control_send_failed(
struct wlr_gamma_control_v1 *gamma_control) {
zwlr_gamma_control_v1_send_failed(gamma_control->resource);
gamma_control_destroy(gamma_control);
}
static const struct zwlr_gamma_control_v1_interface gamma_control_impl; static const struct zwlr_gamma_control_v1_interface gamma_control_impl;
static struct wlr_gamma_control_v1 *gamma_control_from_resource( static struct wlr_gamma_control_v1 *gamma_control_from_resource(
@ -54,8 +61,7 @@ static void gamma_control_handle_set_gamma(struct wl_client *client,
struct wlr_gamma_control_v1 *gamma_control = struct wlr_gamma_control_v1 *gamma_control =
gamma_control_from_resource(gamma_control_resource); gamma_control_from_resource(gamma_control_resource);
if (gamma_control == NULL) { if (gamma_control == NULL) {
close(fd); goto error_fd;
return;
} }
uint32_t ramp_size = wlr_output_get_gamma_size(gamma_control->output); uint32_t ramp_size = wlr_output_get_gamma_size(gamma_control->output);
@ -64,29 +70,34 @@ static void gamma_control_handle_set_gamma(struct wl_client *client,
off_t fd_size = lseek(fd, 0, SEEK_END); off_t fd_size = lseek(fd, 0, SEEK_END);
// Skip checks if kernel does no support seek on buffer // Skip checks if kernel does no support seek on buffer
if (fd_size != -1 && (size_t)fd_size != table_size) { if (fd_size != -1 && (size_t)fd_size != table_size) {
close(fd);
wl_resource_post_error(gamma_control_resource, wl_resource_post_error(gamma_control_resource,
ZWLR_GAMMA_CONTROL_V1_ERROR_INVALID_GAMMA, ZWLR_GAMMA_CONTROL_V1_ERROR_INVALID_GAMMA,
"The gamma ramps don't have the correct size"); "The gamma ramps don't have the correct size");
return; goto error_fd;
} }
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
int fd_flags = fcntl(fd, F_GETFL, 0);
if (fd_flags == -1) {
gamma_control_send_failed(gamma_control);
goto error_fd;
}
if (fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK) == -1) {
gamma_control_send_failed(gamma_control);
goto error_fd;
}
// Use the heap since gamma tables can be large // Use the heap since gamma tables can be large
uint16_t *table = malloc(table_size); uint16_t *table = malloc(table_size);
if (table == NULL) { if (table == NULL) {
close(fd);
wl_resource_post_no_memory(gamma_control_resource); wl_resource_post_no_memory(gamma_control_resource);
return; goto error_fd;
} }
ssize_t n_read = read(fd, table, table_size); ssize_t n_read = read(fd, table, table_size);
close(fd);
if (n_read == -1 || (size_t)n_read != table_size) { if (n_read == -1 || (size_t)n_read != table_size) {
free(table); gamma_control_send_failed(gamma_control);
zwlr_gamma_control_v1_send_failed(gamma_control->resource); goto error_table;
gamma_control_destroy(gamma_control);
return;
} }
uint16_t *r = table; uint16_t *r = table;
@ -94,12 +105,18 @@ static void gamma_control_handle_set_gamma(struct wl_client *client,
uint16_t *b = table + 2 * ramp_size; uint16_t *b = table + 2 * ramp_size;
bool ok = wlr_output_set_gamma(gamma_control->output, ramp_size, r, g, b); bool ok = wlr_output_set_gamma(gamma_control->output, ramp_size, r, g, b);
free(table);
if (!ok) { if (!ok) {
zwlr_gamma_control_v1_send_failed(gamma_control->resource); gamma_control_send_failed(gamma_control);
gamma_control_destroy(gamma_control); goto error_table;
return;
} }
free(table);
return;
error_table:
free(table);
error_fd:
close(fd);
} }
static const struct zwlr_gamma_control_v1_interface gamma_control_impl = { static const struct zwlr_gamma_control_v1_interface gamma_control_impl = {