brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Rename xwayland init/shutdown functions

Browse Source 
The start/stop verbs will be reused later when we can start and
stop the X server. Rename these functions to init/shutdown, and
init_xserver() to start_xserver().

https://gitlab.gnome.org/GNOME/mutter/merge_requests/709
This commit is contained in:
Carlos Garnacho 2019-05-24 20:52:17 +02:00 committed by Carlos Garnacho
parent 500a692e3b
commit 8b62f4884d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland.c
View File

@ -420,7 +420,7 @@ meta_wayland_init (void)
if (meta_should_autostart_x11_display ()) if (meta_should_autostart_x11_display ())
{ {
if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display)) if (!meta_xwayland_init (&compositor->xwayland_manager, compositor->wayland_display))
g_error ("Failed to start X Wayland"); g_error ("Failed to start X Wayland");
} }
@ -471,7 +471,7 @@ meta_wayland_finalize (void)
compositor = meta_wayland_compositor_get_default (); compositor = meta_wayland_compositor_get_default ();
meta_xwayland_stop (&compositor->xwayland_manager); meta_xwayland_shutdown (&compositor->xwayland_manager);
g_clear_pointer (&compositor->display_name, g_free); g_clear_pointer (&compositor->display_name, g_free);
} }

6
src/wayland/meta-xwayland-private.h
View File

@ -25,14 +25,14 @@
#include "wayland/meta-wayland-private.h" #include "wayland/meta-wayland-private.h"
gboolean gboolean
meta_xwayland_start (MetaXWaylandManager *manager, meta_xwayland_init (MetaXWaylandManager *manager,
struct wl_display *display); struct wl_display *display);
void void
meta_xwayland_complete_init (MetaDisplay *display); meta_xwayland_complete_init (MetaDisplay *display);
void void
meta_xwayland_stop (MetaXWaylandManager *manager); meta_xwayland_shutdown (MetaXWaylandManager *manager);
/* wl_data_device/X11 selection interoperation */ /* wl_data_device/X11 selection interoperation */
void meta_xwayland_init_dnd (void); void meta_xwayland_init_dnd (void);

10
src/wayland/meta-xwayland.c
View File

@ -547,7 +547,7 @@ on_displayfd_ready (int fd,
} }
static gboolean static gboolean
meta_xwayland_init_xserver (MetaXWaylandManager *manager) meta_xwayland_start_xserver (MetaXWaylandManager *manager)
{ {
int xwayland_client_fd[2]; int xwayland_client_fd[2];
int displayfd[2]; int displayfd[2];
@ -621,8 +621,8 @@ meta_xwayland_init_xserver (MetaXWaylandManager *manager)
} }
gboolean gboolean
meta_xwayland_start (MetaXWaylandManager *manager, meta_xwayland_init (MetaXWaylandManager *manager,
struct wl_display *wl_display) struct wl_display *wl_display)
{ {
if (!choose_xdisplay (manager)) if (!choose_xdisplay (manager))
return FALSE; return FALSE;
@ -631,7 +631,7 @@ meta_xwayland_start (MetaXWaylandManager *manager,
return FALSE; return FALSE;
manager->wayland_display = wl_display; manager->wayland_display = wl_display;
return meta_xwayland_init_xserver (manager); return meta_xwayland_start_xserver (manager);
} }
static void static void
@ -657,7 +657,7 @@ meta_xwayland_complete_init (MetaDisplay *display)
} }
void void
meta_xwayland_stop (MetaXWaylandManager *manager) meta_xwayland_shutdown (MetaXWaylandManager *manager)
{ {
char path[256]; char path[256];