mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-02 09:01:38 -05:00
Remove orbital screenshooter and gamma-control
These are undocumented, outdated protocols that have a better wlr-protocols equivalent.
This commit is contained in:
parent
abddd7b4db
commit
3dec88e455
13 changed files with 0 additions and 838 deletions
|
|
@ -32,7 +32,6 @@ lib_wlr_types = static_library(
|
|||
'wlr_foreign_toplevel_management_v1.c',
|
||||
'wlr_fullscreen_shell_v1.c',
|
||||
'wlr_gamma_control_v1.c',
|
||||
'wlr_gamma_control.c',
|
||||
'wlr_gtk_primary_selection.c',
|
||||
'wlr_idle_inhibit_v1.c',
|
||||
'wlr_idle.c',
|
||||
|
|
@ -57,7 +56,6 @@ lib_wlr_types = static_library(
|
|||
'wlr_region.c',
|
||||
'wlr_relative_pointer_v1.c',
|
||||
'wlr_screencopy_v1.c',
|
||||
'wlr_screenshooter.c',
|
||||
'wlr_server_decoration.c',
|
||||
'wlr_surface.c',
|
||||
'wlr_switch.c',
|
||||
|
|
|
|||
|
|
@ -1,197 +0,0 @@
|
|||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/types/wlr_gamma_control.h>
|
||||
#include <wlr/types/wlr_output.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "gamma-control-protocol.h"
|
||||
#include "util/signal.h"
|
||||
|
||||
static void resource_destroy(struct wl_client *client,
|
||||
struct wl_resource *resource) {
|
||||
wl_resource_destroy(resource);
|
||||
}
|
||||
|
||||
static void gamma_control_destroy(struct wlr_gamma_control *gamma_control) {
|
||||
if (gamma_control == NULL) {
|
||||
return;
|
||||
}
|
||||
wlr_signal_emit_safe(&gamma_control->events.destroy, gamma_control);
|
||||
wl_list_remove(&gamma_control->output_destroy_listener.link);
|
||||
wl_resource_set_user_data(gamma_control->resource, NULL);
|
||||
wl_list_remove(&gamma_control->link);
|
||||
free(gamma_control);
|
||||
}
|
||||
|
||||
static const struct gamma_control_interface gamma_control_impl;
|
||||
|
||||
static struct wlr_gamma_control *gamma_control_from_resource(
|
||||
struct wl_resource *resource) {
|
||||
assert(wl_resource_instance_of(resource, &gamma_control_interface,
|
||||
&gamma_control_impl));
|
||||
return wl_resource_get_user_data(resource);
|
||||
}
|
||||
|
||||
static void gamma_control_destroy_resource(struct wl_resource *resource) {
|
||||
struct wlr_gamma_control *gamma_control =
|
||||
gamma_control_from_resource(resource);
|
||||
gamma_control_destroy(gamma_control);
|
||||
}
|
||||
|
||||
static void gamma_control_handle_output_destroy(struct wl_listener *listener,
|
||||
void *data) {
|
||||
struct wlr_gamma_control *gamma_control =
|
||||
wl_container_of(listener, gamma_control, output_destroy_listener);
|
||||
gamma_control_destroy(gamma_control);
|
||||
}
|
||||
|
||||
static void gamma_control_set_gamma(struct wl_client *client,
|
||||
struct wl_resource *gamma_control_resource, struct wl_array *red,
|
||||
struct wl_array *green, struct wl_array *blue) {
|
||||
struct wlr_gamma_control *gamma_control =
|
||||
gamma_control_from_resource(gamma_control_resource);
|
||||
|
||||
if (gamma_control == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (red->size != green->size || red->size != blue->size) {
|
||||
wl_resource_post_error(gamma_control_resource,
|
||||
GAMMA_CONTROL_ERROR_INVALID_GAMMA,
|
||||
"The gamma ramps don't have the same size");
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t size = red->size / sizeof(uint16_t);
|
||||
uint16_t *r = (uint16_t *)red->data;
|
||||
uint16_t *g = (uint16_t *)green->data;
|
||||
uint16_t *b = (uint16_t *)blue->data;
|
||||
|
||||
wlr_output_set_gamma(gamma_control->output, size, r, g, b);
|
||||
}
|
||||
|
||||
static void gamma_control_reset_gamma(struct wl_client *client,
|
||||
struct wl_resource *gamma_control_resource) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static const struct gamma_control_interface gamma_control_impl = {
|
||||
.destroy = resource_destroy,
|
||||
.set_gamma = gamma_control_set_gamma,
|
||||
.reset_gamma = gamma_control_reset_gamma,
|
||||
};
|
||||
|
||||
static const struct gamma_control_manager_interface gamma_control_manager_impl;
|
||||
|
||||
static struct wlr_gamma_control_manager *gamma_control_manager_from_resource(
|
||||
struct wl_resource *resource) {
|
||||
assert(wl_resource_instance_of(resource, &gamma_control_manager_interface,
|
||||
&gamma_control_manager_impl));
|
||||
return wl_resource_get_user_data(resource);
|
||||
}
|
||||
|
||||
static void gamma_control_manager_get_gamma_control(struct wl_client *client,
|
||||
struct wl_resource *gamma_control_manager_resource, uint32_t id,
|
||||
struct wl_resource *output_resource) {
|
||||
struct wlr_gamma_control_manager *manager =
|
||||
gamma_control_manager_from_resource(gamma_control_manager_resource);
|
||||
struct wlr_output *output = wlr_output_from_resource(output_resource);
|
||||
|
||||
struct wlr_gamma_control *gamma_control =
|
||||
calloc(1, sizeof(struct wlr_gamma_control));
|
||||
if (gamma_control == NULL) {
|
||||
wl_client_post_no_memory(client);
|
||||
return;
|
||||
}
|
||||
gamma_control->output = output;
|
||||
|
||||
int version = wl_resource_get_version(gamma_control_manager_resource);
|
||||
gamma_control->resource = wl_resource_create(client,
|
||||
&gamma_control_interface, version, id);
|
||||
if (gamma_control->resource == NULL) {
|
||||
free(gamma_control);
|
||||
wl_client_post_no_memory(client);
|
||||
return;
|
||||
}
|
||||
wlr_log(WLR_DEBUG, "new gamma_control %p (res %p)", gamma_control,
|
||||
gamma_control->resource);
|
||||
wl_resource_set_implementation(gamma_control->resource,
|
||||
&gamma_control_impl, gamma_control, gamma_control_destroy_resource);
|
||||
|
||||
wl_signal_init(&gamma_control->events.destroy);
|
||||
|
||||
wl_signal_add(&output->events.destroy,
|
||||
&gamma_control->output_destroy_listener);
|
||||
gamma_control->output_destroy_listener.notify =
|
||||
gamma_control_handle_output_destroy;
|
||||
|
||||
wl_list_insert(&manager->controls, &gamma_control->link);
|
||||
|
||||
gamma_control_send_gamma_size(gamma_control->resource,
|
||||
wlr_output_get_gamma_size(output));
|
||||
}
|
||||
|
||||
static const struct gamma_control_manager_interface gamma_control_manager_impl = {
|
||||
.get_gamma_control = gamma_control_manager_get_gamma_control,
|
||||
};
|
||||
|
||||
static void gamma_control_manager_bind(struct wl_client *client, void *data,
|
||||
uint32_t version, uint32_t id) {
|
||||
struct wlr_gamma_control_manager *manager = data;
|
||||
assert(client && manager);
|
||||
|
||||
struct wl_resource *resource = wl_resource_create(client,
|
||||
&gamma_control_manager_interface, version, id);
|
||||
if (resource == NULL) {
|
||||
wl_client_post_no_memory(client);
|
||||
return;
|
||||
}
|
||||
wl_resource_set_implementation(resource, &gamma_control_manager_impl,
|
||||
manager, NULL);
|
||||
}
|
||||
|
||||
void wlr_gamma_control_manager_destroy(
|
||||
struct wlr_gamma_control_manager *manager) {
|
||||
if (!manager) {
|
||||
return;
|
||||
}
|
||||
struct wlr_gamma_control *gamma_control, *tmp;
|
||||
wl_list_for_each_safe(gamma_control, tmp, &manager->controls, link) {
|
||||
gamma_control_destroy(gamma_control);
|
||||
}
|
||||
wlr_signal_emit_safe(&manager->events.destroy, manager);
|
||||
wl_list_remove(&manager->display_destroy.link);
|
||||
wl_global_destroy(manager->global);
|
||||
free(manager);
|
||||
}
|
||||
|
||||
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
||||
struct wlr_gamma_control_manager *manager =
|
||||
wl_container_of(listener, manager, display_destroy);
|
||||
wlr_gamma_control_manager_destroy(manager);
|
||||
}
|
||||
|
||||
struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(
|
||||
struct wl_display *display) {
|
||||
struct wlr_gamma_control_manager *manager =
|
||||
calloc(1, sizeof(struct wlr_gamma_control_manager));
|
||||
if (!manager) {
|
||||
return NULL;
|
||||
}
|
||||
struct wl_global *global = wl_global_create(display,
|
||||
&gamma_control_manager_interface, 1, manager,
|
||||
gamma_control_manager_bind);
|
||||
if (!global) {
|
||||
free(manager);
|
||||
return NULL;
|
||||
}
|
||||
manager->global = global;
|
||||
|
||||
wl_signal_init(&manager->events.destroy);
|
||||
wl_list_init(&manager->controls);
|
||||
|
||||
manager->display_destroy.notify = handle_display_destroy;
|
||||
wl_display_add_destroy_listener(display, &manager->display_destroy);
|
||||
|
||||
return manager;
|
||||
}
|
||||
|
|
@ -1,217 +0,0 @@
|
|||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/backend.h>
|
||||
#include <wlr/render/wlr_renderer.h>
|
||||
#include <wlr/types/wlr_output.h>
|
||||
#include <wlr/types/wlr_screenshooter.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "screenshooter-protocol.h"
|
||||
#include "util/signal.h"
|
||||
|
||||
static struct wlr_screenshot *screenshot_from_resource(
|
||||
struct wl_resource *resource) {
|
||||
assert(wl_resource_instance_of(resource, &orbital_screenshot_interface,
|
||||
NULL));
|
||||
return wl_resource_get_user_data(resource);
|
||||
}
|
||||
|
||||
struct screenshot_state {
|
||||
struct wl_shm_buffer *shm_buffer;
|
||||
struct wlr_screenshot *screenshot;
|
||||
struct wl_listener frame_listener;
|
||||
};
|
||||
|
||||
static void screenshot_destroy(struct wlr_screenshot *screenshot) {
|
||||
wl_list_remove(&screenshot->link);
|
||||
wl_resource_set_user_data(screenshot->resource, NULL);
|
||||
free(screenshot);
|
||||
}
|
||||
|
||||
static void handle_screenshot_resource_destroy(
|
||||
struct wl_resource *screenshot_resource) {
|
||||
struct wlr_screenshot *screenshot =
|
||||
screenshot_from_resource(screenshot_resource);
|
||||
if (screenshot != NULL) {
|
||||
screenshot_destroy(screenshot);
|
||||
}
|
||||
}
|
||||
|
||||
static void output_handle_frame(struct wl_listener *listener, void *_data) {
|
||||
struct screenshot_state *state = wl_container_of(listener, state,
|
||||
frame_listener);
|
||||
struct wlr_output *output = state->screenshot->output;
|
||||
struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
|
||||
struct wl_shm_buffer *shm_buffer = state->shm_buffer;
|
||||
|
||||
if (!(output->pending.committed & WLR_OUTPUT_STATE_BUFFER)) {
|
||||
return;
|
||||
}
|
||||
|
||||
enum wl_shm_format format = wl_shm_buffer_get_format(shm_buffer);
|
||||
int32_t width = wl_shm_buffer_get_width(shm_buffer);
|
||||
int32_t height = wl_shm_buffer_get_height(shm_buffer);
|
||||
int32_t stride = wl_shm_buffer_get_stride(shm_buffer);
|
||||
wl_shm_buffer_begin_access(shm_buffer);
|
||||
void *data = wl_shm_buffer_get_data(shm_buffer);
|
||||
bool ok = wlr_renderer_read_pixels(renderer, format, NULL, stride,
|
||||
width, height, 0, 0, 0, 0, data);
|
||||
wl_shm_buffer_end_access(shm_buffer);
|
||||
|
||||
if (!ok) {
|
||||
wlr_log(WLR_ERROR, "Cannot read pixels");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
orbital_screenshot_send_done(state->screenshot->resource);
|
||||
|
||||
cleanup:
|
||||
wl_list_remove(&listener->link);
|
||||
free(state);
|
||||
}
|
||||
|
||||
static const struct orbital_screenshooter_interface screenshooter_impl;
|
||||
|
||||
static struct wlr_screenshooter *screenshooter_from_resource(
|
||||
struct wl_resource *resource) {
|
||||
assert(wl_resource_instance_of(resource, &orbital_screenshooter_interface,
|
||||
&screenshooter_impl));
|
||||
return wl_resource_get_user_data(resource);
|
||||
}
|
||||
|
||||
static void screenshooter_shoot(struct wl_client *client,
|
||||
struct wl_resource *screenshooter_resource, uint32_t id,
|
||||
struct wl_resource *output_resource,
|
||||
struct wl_resource *buffer_resource) {
|
||||
struct wlr_screenshooter *screenshooter =
|
||||
screenshooter_from_resource(screenshooter_resource);
|
||||
struct wlr_output *output = wlr_output_from_resource(output_resource);
|
||||
|
||||
struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
|
||||
if (renderer == NULL) {
|
||||
wlr_log(WLR_ERROR, "Backend doesn't have a renderer");
|
||||
return;
|
||||
}
|
||||
|
||||
struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get(buffer_resource);
|
||||
if (shm_buffer == NULL) {
|
||||
wlr_log(WLR_ERROR, "Invalid buffer: not a shared memory buffer");
|
||||
return;
|
||||
}
|
||||
|
||||
int32_t width = wl_shm_buffer_get_width(shm_buffer);
|
||||
int32_t height = wl_shm_buffer_get_height(shm_buffer);
|
||||
if (width < output->width || height < output->height) {
|
||||
wlr_log(WLR_ERROR, "Invalid buffer: too small");
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t format = wl_shm_buffer_get_format(shm_buffer);
|
||||
if (!wlr_renderer_format_supported(renderer, format)) {
|
||||
wlr_log(WLR_ERROR, "Invalid buffer: unsupported format");
|
||||
return;
|
||||
}
|
||||
|
||||
struct wlr_screenshot *screenshot =
|
||||
calloc(1, sizeof(struct wlr_screenshot));
|
||||
if (!screenshot) {
|
||||
wl_resource_post_no_memory(screenshooter_resource);
|
||||
return;
|
||||
}
|
||||
screenshot->output_resource = output_resource;
|
||||
screenshot->output = output;
|
||||
screenshot->screenshooter = screenshooter;
|
||||
screenshot->resource = wl_resource_create(client,
|
||||
&orbital_screenshot_interface,
|
||||
wl_resource_get_version(screenshooter_resource), id);
|
||||
if (screenshot->resource == NULL) {
|
||||
free(screenshot);
|
||||
wl_resource_post_no_memory(screenshooter_resource);
|
||||
return;
|
||||
}
|
||||
wl_resource_set_implementation(screenshot->resource, NULL, screenshot,
|
||||
handle_screenshot_resource_destroy);
|
||||
wl_list_insert(&screenshooter->screenshots, &screenshot->link);
|
||||
|
||||
wlr_log(WLR_DEBUG, "new screenshot %p (res %p)", screenshot,
|
||||
screenshot->resource);
|
||||
|
||||
struct screenshot_state *state = calloc(1, sizeof(struct screenshot_state));
|
||||
if (!state) {
|
||||
wl_resource_destroy(screenshot->resource);
|
||||
free(screenshot);
|
||||
wl_resource_post_no_memory(screenshooter_resource);
|
||||
return;
|
||||
}
|
||||
state->shm_buffer = shm_buffer;
|
||||
state->screenshot = screenshot;
|
||||
state->frame_listener.notify = output_handle_frame;
|
||||
wl_signal_add(&output->events.precommit, &state->frame_listener);
|
||||
|
||||
// Schedule a buffer commit
|
||||
output->needs_frame = true;
|
||||
wlr_output_schedule_frame(output);
|
||||
}
|
||||
|
||||
static const struct orbital_screenshooter_interface screenshooter_impl = {
|
||||
.shoot = screenshooter_shoot,
|
||||
};
|
||||
|
||||
static void screenshooter_bind(struct wl_client *wl_client, void *data,
|
||||
uint32_t version, uint32_t id) {
|
||||
struct wlr_screenshooter *screenshooter = data;
|
||||
assert(wl_client && screenshooter);
|
||||
|
||||
struct wl_resource *wl_resource = wl_resource_create(wl_client,
|
||||
&orbital_screenshooter_interface, version, id);
|
||||
if (wl_resource == NULL) {
|
||||
wl_client_post_no_memory(wl_client);
|
||||
return;
|
||||
}
|
||||
wl_resource_set_implementation(wl_resource, &screenshooter_impl,
|
||||
screenshooter, NULL);
|
||||
}
|
||||
|
||||
void wlr_screenshooter_destroy(struct wlr_screenshooter *screenshooter) {
|
||||
if (!screenshooter) {
|
||||
return;
|
||||
}
|
||||
wl_list_remove(&screenshooter->display_destroy.link);
|
||||
struct wlr_screenshot *screenshot, *tmp;
|
||||
wl_list_for_each_safe(screenshot, tmp, &screenshooter->screenshots, link) {
|
||||
screenshot_destroy(screenshot);
|
||||
}
|
||||
wlr_signal_emit_safe(&screenshooter->events.destroy, screenshooter);
|
||||
wl_global_destroy(screenshooter->global);
|
||||
free(screenshooter);
|
||||
}
|
||||
|
||||
static void handle_display_destroy(struct wl_listener *listener, void *data) {
|
||||
struct wlr_screenshooter *screenshooter =
|
||||
wl_container_of(listener, screenshooter, display_destroy);
|
||||
wlr_screenshooter_destroy(screenshooter);
|
||||
}
|
||||
|
||||
struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display) {
|
||||
struct wlr_screenshooter *screenshooter =
|
||||
calloc(1, sizeof(struct wlr_screenshooter));
|
||||
if (!screenshooter) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wl_list_init(&screenshooter->screenshots);
|
||||
wl_signal_init(&screenshooter->events.destroy);
|
||||
|
||||
screenshooter->display_destroy.notify = handle_display_destroy;
|
||||
wl_display_add_destroy_listener(display, &screenshooter->display_destroy);
|
||||
|
||||
screenshooter->global = wl_global_create(display,
|
||||
&orbital_screenshooter_interface, 1, screenshooter, screenshooter_bind);
|
||||
if (screenshooter->global == NULL) {
|
||||
free(screenshooter);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return screenshooter;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue