This patch splits screensooter.c so that the code implementing the private screenshooter protocol and launching the client is moved to a weston specific file, leaving only the code that can be shared between compositors in screenshooter.c. Two exported functions are added in screenshooter.c to start and stop the recorder. Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>dev
Giulio Camuffo
9 years ago
committed by
Pekka Paalanen
parent
0358af419b
commit
26f62d4247
@ -0,0 +1,191 @@ |
|||||||
|
/*
|
||||||
|
* Copyright © 2008-2011 Kristian Høgsberg |
||||||
|
* |
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining |
||||||
|
* a copy of this software and associated documentation files (the |
||||||
|
* "Software"), to deal in the Software without restriction, including |
||||||
|
* without limitation the rights to use, copy, modify, merge, publish, |
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to |
||||||
|
* permit persons to whom the Software is furnished to do so, subject to |
||||||
|
* the following conditions: |
||||||
|
* |
||||||
|
* The above copyright notice and this permission notice (including the |
||||||
|
* next paragraph) shall be included in all copies or substantial |
||||||
|
* portions of the Software. |
||||||
|
* |
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
* SOFTWARE. |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "config.h" |
||||||
|
|
||||||
|
#include <linux/input.h> |
||||||
|
|
||||||
|
#include "compositor.h" |
||||||
|
#include "weston.h" |
||||||
|
#include "weston-screenshooter-server-protocol.h" |
||||||
|
#include "shared/helpers.h" |
||||||
|
|
||||||
|
struct screenshooter { |
||||||
|
struct weston_compositor *ec; |
||||||
|
struct wl_global *global; |
||||||
|
struct wl_client *client; |
||||||
|
struct weston_process process; |
||||||
|
struct wl_listener destroy_listener; |
||||||
|
struct weston_recorder *recorder; |
||||||
|
}; |
||||||
|
|
||||||
|
static void |
||||||
|
screenshooter_done(void *data, enum weston_screenshooter_outcome outcome) |
||||||
|
{ |
||||||
|
struct wl_resource *resource = data; |
||||||
|
|
||||||
|
switch (outcome) { |
||||||
|
case WESTON_SCREENSHOOTER_SUCCESS: |
||||||
|
weston_screenshooter_send_done(resource); |
||||||
|
break; |
||||||
|
case WESTON_SCREENSHOOTER_NO_MEMORY: |
||||||
|
wl_resource_post_no_memory(resource); |
||||||
|
break; |
||||||
|
default: |
||||||
|
break; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
screenshooter_shoot(struct wl_client *client, |
||||||
|
struct wl_resource *resource, |
||||||
|
struct wl_resource *output_resource, |
||||||
|
struct wl_resource *buffer_resource) |
||||||
|
{ |
||||||
|
struct weston_output *output = |
||||||
|
wl_resource_get_user_data(output_resource); |
||||||
|
struct weston_buffer *buffer = |
||||||
|
weston_buffer_from_resource(buffer_resource); |
||||||
|
|
||||||
|
if (buffer == NULL) { |
||||||
|
wl_resource_post_no_memory(resource); |
||||||
|
return; |
||||||
|
} |
||||||
|
|
||||||
|
weston_screenshooter_shoot(output, buffer, screenshooter_done, resource); |
||||||
|
} |
||||||
|
|
||||||
|
struct weston_screenshooter_interface screenshooter_implementation = { |
||||||
|
screenshooter_shoot |
||||||
|
}; |
||||||
|
|
||||||
|
static void |
||||||
|
bind_shooter(struct wl_client *client, |
||||||
|
void *data, uint32_t version, uint32_t id) |
||||||
|
{ |
||||||
|
struct screenshooter *shooter = data; |
||||||
|
struct wl_resource *resource; |
||||||
|
|
||||||
|
resource = wl_resource_create(client, |
||||||
|
&weston_screenshooter_interface, 1, id); |
||||||
|
|
||||||
|
if (client != shooter->client) { |
||||||
|
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT, |
||||||
|
"screenshooter failed: permission denied"); |
||||||
|
return; |
||||||
|
} |
||||||
|
|
||||||
|
wl_resource_set_implementation(resource, &screenshooter_implementation, |
||||||
|
data, NULL); |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
screenshooter_sigchld(struct weston_process *process, int status) |
||||||
|
{ |
||||||
|
struct screenshooter *shooter = |
||||||
|
container_of(process, struct screenshooter, process); |
||||||
|
|
||||||
|
shooter->client = NULL; |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
screenshooter_binding(struct weston_keyboard *keyboard, uint32_t time, |
||||||
|
uint32_t key, void *data) |
||||||
|
{ |
||||||
|
struct screenshooter *shooter = data; |
||||||
|
char *screenshooter_exe; |
||||||
|
int ret; |
||||||
|
|
||||||
|
ret = asprintf(&screenshooter_exe, "%s/%s", |
||||||
|
weston_config_get_libexec_dir(), |
||||||
|
"/weston-screenshooter"); |
||||||
|
if (ret < 0) { |
||||||
|
weston_log("Could not construct screenshooter path.\n"); |
||||||
|
return; |
||||||
|
} |
||||||
|
|
||||||
|
if (!shooter->client) |
||||||
|
shooter->client = weston_client_launch(shooter->ec, |
||||||
|
&shooter->process, |
||||||
|
screenshooter_exe, screenshooter_sigchld); |
||||||
|
free(screenshooter_exe); |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
recorder_binding(struct weston_keyboard *keyboard, uint32_t time, |
||||||
|
uint32_t key, void *data) |
||||||
|
{ |
||||||
|
struct weston_compositor *ec = keyboard->seat->compositor; |
||||||
|
struct weston_output *output; |
||||||
|
struct screenshooter *shooter = data; |
||||||
|
struct weston_recorder *recorder = shooter->recorder;; |
||||||
|
static const char filename[] = "capture.wcap"; |
||||||
|
|
||||||
|
if (recorder) { |
||||||
|
weston_recorder_stop(recorder); |
||||||
|
shooter->recorder = NULL; |
||||||
|
} else { |
||||||
|
if (keyboard->focus && keyboard->focus->output) |
||||||
|
output = keyboard->focus->output; |
||||||
|
else |
||||||
|
output = container_of(ec->output_list.next, |
||||||
|
struct weston_output, link); |
||||||
|
|
||||||
|
shooter->recorder = weston_recorder_start(output, filename); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
screenshooter_destroy(struct wl_listener *listener, void *data) |
||||||
|
{ |
||||||
|
struct screenshooter *shooter = |
||||||
|
container_of(listener, struct screenshooter, destroy_listener); |
||||||
|
|
||||||
|
wl_global_destroy(shooter->global); |
||||||
|
free(shooter); |
||||||
|
} |
||||||
|
|
||||||
|
WL_EXPORT void |
||||||
|
screenshooter_create(struct weston_compositor *ec) |
||||||
|
{ |
||||||
|
struct screenshooter *shooter; |
||||||
|
|
||||||
|
shooter = zalloc(sizeof *shooter); |
||||||
|
if (shooter == NULL) |
||||||
|
return; |
||||||
|
|
||||||
|
shooter->ec = ec; |
||||||
|
|
||||||
|
shooter->global = wl_global_create(ec->wl_display, |
||||||
|
&weston_screenshooter_interface, 1, |
||||||
|
shooter, bind_shooter); |
||||||
|
weston_compositor_add_key_binding(ec, KEY_S, MODIFIER_SUPER, |
||||||
|
screenshooter_binding, shooter); |
||||||
|
weston_compositor_add_key_binding(ec, KEY_R, MODIFIER_SUPER, |
||||||
|
recorder_binding, shooter); |
||||||
|
|
||||||
|
shooter->destroy_listener.notify = screenshooter_destroy; |
||||||
|
wl_signal_add(&ec->destroy_signal, &shooter->destroy_listener); |
||||||
|
} |
||||||
@ -0,0 +1,42 @@ |
|||||||
|
/*
|
||||||
|
* Copyright © 2016 Giulio Camuffo |
||||||
|
* |
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining |
||||||
|
* a copy of this software and associated documentation files (the |
||||||
|
* "Software"), to deal in the Software without restriction, including |
||||||
|
* without limitation the rights to use, copy, modify, merge, publish, |
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to |
||||||
|
* permit persons to whom the Software is furnished to do so, subject to |
||||||
|
* the following conditions: |
||||||
|
* |
||||||
|
* The above copyright notice and this permission notice (including the |
||||||
|
* next paragraph) shall be included in all copies or substantial |
||||||
|
* portions of the Software. |
||||||
|
* |
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
* SOFTWARE. |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef WESTON_H |
||||||
|
#define WESTON_H |
||||||
|
|
||||||
|
#ifdef __cplusplus |
||||||
|
extern "C" { |
||||||
|
#endif |
||||||
|
|
||||||
|
#include "compositor.h" |
||||||
|
|
||||||
|
void |
||||||
|
screenshooter_create(struct weston_compositor *ec); |
||||||
|
|
||||||
|
#ifdef __cplusplus |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#endif |
||||||
Loading…
Reference in new issue