mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend: Rename weston_process to wet_process 

It's not a libweston thing, it's a part of the frontend.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-04-18 13:29:44 +01:00
parent d8114aa888
commit 4326d3c768
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compositor/main.c
View File

@ -337,7 +337,7 @@ to_wet_compositor(struct weston_compositor *compositor)
static int
sigchld_handler(int signal_number, void *data)
{
struct weston_process *p;
struct wet_process *p;
struct wet_compositor *wet = data;
int status;
pid_t pid;
@ -390,11 +390,11 @@ cleanup_for_child_process() {
WL_EXPORT bool
weston_client_launch(struct weston_compositor *compositor,
struct weston_process *proc,
struct wet_process *proc,
struct custom_env *child_env,
int *no_cloexec_fds,
size_t num_no_cloexec_fds,
weston_process_cleanup_func_t cleanup)
wet_process_cleanup_func_t cleanup)
{
const char *fail_cloexec = "Couldn't unset CLOEXEC on child FDs";
const char *fail_seteuid = "Couldn't call seteuid";
@ -464,14 +464,14 @@ weston_client_launch(struct weston_compositor *compositor,
WL_EXPORT void
wet_watch_process(struct weston_compositor *compositor,
struct weston_process *process)
struct wet_process *process)
{
struct wet_compositor *wet = to_wet_compositor(compositor);
wl_list_insert(&wet->child_process_list, &process->link);
}
static void
process_handle_sigchld(struct weston_process *process, int status)
process_handle_sigchld(struct wet_process *process, int status)
{
/*
* There are no guarantees whether this runs before or after
@ -494,7 +494,7 @@ process_handle_sigchld(struct weston_process *process, int status)
WL_EXPORT struct wl_client *
weston_client_start(struct weston_compositor *compositor, const char *path)
{
struct weston_process *proc;
struct wet_process *proc;
struct wl_client *client;
struct custom_env child_env;
struct fdstr wayland_socket = FDSTR_INIT;

16
compositor/weston.h
View File

@ -36,14 +36,14 @@ extern "C" {
void
screenshooter_create(struct weston_compositor *ec);
struct weston_process;
typedef void (*weston_process_cleanup_func_t)(struct weston_process *process,
int status);
struct wet_process;
typedef void (*wet_process_cleanup_func_t)(struct wet_process *process,
int status);
struct weston_process {
struct wet_process {
pid_t pid;
char *path;
weston_process_cleanup_func_t cleanup;
wet_process_cleanup_func_t cleanup;
struct wl_list link;
};
@ -51,18 +51,18 @@ struct custom_env;
bool
weston_client_launch(struct weston_compositor *compositor,
struct weston_process *proc,
struct wet_process *proc,
struct custom_env *custom_env,
int *fds_no_cloexec,
size_t num_fds_no_cloexec,
weston_process_cleanup_func_t cleanup);
wet_process_cleanup_func_t cleanup);
struct wl_client *
weston_client_start(struct weston_compositor *compositor, const char *path);
void
wet_watch_process(struct weston_compositor *compositor,
struct weston_process *process);
struct wet_process *process);
struct weston_config *
wet_get_config(struct weston_compositor *compositor);

4
compositor/xwayland.c
View File

@ -54,7 +54,7 @@ struct wet_xwayland {
struct wl_event_source *display_fd_source;
struct wl_client *client;
int wm_fd;
struct weston_process process;
struct wet_process process;
};
static int
@ -92,7 +92,7 @@ out:
}
static void
xserver_cleanup(struct weston_process *process, int status)
xserver_cleanup(struct wet_process *process, int status)
{
struct wet_xwayland *wxw =
container_of(process, struct wet_xwayland, process);