388702c181
Currently Xwayland is cleaned up by a destroy listener. The problem with this is that this is true for both libweston's Xwayland support as well as the frontend's. Add an explicit destroy step to Xwayland frontend which will cleanly destroy the process as well as any other resources. Signed-off-by: Daniel Stone <daniels@collabora.com>
119 lines
3.1 KiB
C
119 lines
3.1 KiB
C
/*
|
|
* 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 <libweston/libweston.h>
|
|
#include <libweston/config-parser.h>
|
|
|
|
void
|
|
screenshooter_create(struct weston_compositor *ec);
|
|
|
|
struct wet_process;
|
|
typedef void (*wet_process_cleanup_func_t)(struct wet_process *process,
|
|
int status,
|
|
void *data);
|
|
|
|
struct wet_process {
|
|
pid_t pid;
|
|
char *path;
|
|
wet_process_cleanup_func_t cleanup;
|
|
void *cleanup_data;
|
|
struct wl_list link;
|
|
};
|
|
|
|
struct custom_env;
|
|
|
|
struct wet_process *
|
|
wet_client_launch(struct weston_compositor *compositor,
|
|
struct custom_env *custom_env,
|
|
int *fds_no_cloexec,
|
|
size_t num_fds_no_cloexec,
|
|
wet_process_cleanup_func_t cleanup,
|
|
void *cleanup_data);
|
|
|
|
struct wl_client *
|
|
wet_client_start(struct weston_compositor *compositor, const char *path);
|
|
|
|
void
|
|
wet_process_destroy(struct wet_process *process, int status, bool call_cleanup);
|
|
|
|
struct weston_config *
|
|
wet_get_config(struct weston_compositor *compositor);
|
|
|
|
int
|
|
wet_shell_init(struct weston_compositor *ec,
|
|
int *argc, char *argv[]);
|
|
int
|
|
wet_module_init(struct weston_compositor *ec,
|
|
int *argc, char *argv[]);
|
|
int
|
|
wet_load_module(struct weston_compositor *compositor,
|
|
const char *name, int *argc, char *argv[]);
|
|
|
|
int
|
|
module_init(struct weston_compositor *compositor,
|
|
int *argc, char *argv[]);
|
|
|
|
char *
|
|
wet_get_libexec_path(const char *name);
|
|
|
|
char *
|
|
wet_get_bindir_path(const char *name);
|
|
|
|
void *
|
|
wet_load_xwayland(struct weston_compositor *comp);
|
|
|
|
void
|
|
wet_xwayland_destroy(struct weston_compositor *comp, void *data);
|
|
|
|
struct text_backend;
|
|
|
|
struct text_backend *
|
|
text_backend_init(struct weston_compositor *ec);
|
|
|
|
void
|
|
text_backend_destroy(struct text_backend *text_backend);
|
|
|
|
/*
|
|
* Return value from wet_main() when
|
|
* weston_testsuite_quirks::required_capabilities are not met.
|
|
*/
|
|
#define WET_MAIN_RET_MISSING_CAPS 77
|
|
|
|
int
|
|
wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|