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

wayland: Remove a few unused fields from MetaWaylandCompositor

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-10 11:05:59 -04:00
parent 7c68aaea4c
commit 817c6986a0
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-private.h
View File

@ -75,10 +75,8 @@ struct _MetaWaylandCompositor
{ {
struct wl_display *wayland_display; struct wl_display *wayland_display;
char *display_name; char *display_name;
struct wl_event_loop *wayland_loop;
ClutterActor *stage; ClutterActor *stage;
GHashTable *outputs; GHashTable *outputs;
GSource *wayland_event_source;
struct wl_list frame_callbacks; struct wl_list frame_callbacks;
MetaXWaylandManager xwayland_manager; MetaXWaylandManager xwayland_manager;

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

@ -382,6 +382,7 @@ void
meta_wayland_init (void) meta_wayland_init (void)
{ {
MetaWaylandCompositor *compositor = &_meta_wayland_compositor; MetaWaylandCompositor *compositor = &_meta_wayland_compositor;
GSource *wayland_event_source;
memset (compositor, 0, sizeof (MetaWaylandCompositor)); memset (compositor, 0, sizeof (MetaWaylandCompositor));
@ -400,10 +401,7 @@ meta_wayland_init (void)
compositor, compositor_bind)) compositor, compositor_bind))
g_error ("Failed to register wayland compositor object"); g_error ("Failed to register wayland compositor object");
compositor->wayland_loop = wayland_event_source = wayland_event_source_new (compositor->wayland_display);
wl_display_get_event_loop (compositor->wayland_display);
compositor->wayland_event_source =
wayland_event_source_new (compositor->wayland_display);
/* XXX: Here we are setting the wayland event source to have a /* XXX: Here we are setting the wayland event source to have a
* slightly lower priority than the X event source, because we are * slightly lower priority than the X event source, because we are
@ -414,9 +412,8 @@ meta_wayland_init (void)
* At some point we could perhaps try and get the X protocol proxied * At some point we could perhaps try and get the X protocol proxied
* over the wayland protocol so that we don't have to worry about * over the wayland protocol so that we don't have to worry about
* synchronizing the two command streams. */ * synchronizing the two command streams. */
g_source_set_priority (compositor->wayland_event_source, g_source_set_priority (wayland_event_source, GDK_PRIORITY_EVENTS + 1);
GDK_PRIORITY_EVENTS + 1); g_source_attach (wayland_event_source, NULL);
g_source_attach (compositor->wayland_event_source, NULL);
clutter_wayland_set_compositor_display (compositor->wayland_display); clutter_wayland_set_compositor_display (compositor->wayland_display);
meta_clutter_init (); meta_clutter_init ();