diff options
| author | Robert Bragg <robert@linux.intel.com> | 2012-01-07 22:21:32 +0000 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-08-10 19:13:48 -0400 |
| commit | f9a11b3b18eb0637e9da20caa612b5671a04d3f8 (patch) | |
| tree | 03bb5858eea29125ac625ad45ea22d8b0486cc15 /src/meta/compositor.h | |
| parent | bd3c35721294a040b166b94395201c65f359b5e4 (diff) | |
| download | mutter-f9a11b3b18eb0637e9da20caa612b5671a04d3f8.tar.gz | |
wayland: Adds basic hybrid X + Wayland support
This adds support for running mutter as a hybrid X and Wayland
compositor. It runs a headless XWayland server for X applications
that presents wayland surfaces back to mutter which mutter can then
composite.
This aims to not break Mutter's existing support for the traditional X
compositing model which means a single build of Mutter can be
distributed supporting the traditional model and the new Wayland based
compositing model.
TODO: although building with --disable-wayland has at least been tested,
I still haven't actually verified that running as a traditional
compositor isn't broken currently.
Note: At this point no input is supported
Note: multiple authors have contributed to this patch:
Authored-by: Robert Bragg <robert@linux.intel.com>
Authored-by: Neil Roberts <neil@linux.intel.com>
Authored-by: Rico Tzschichholz.
Authored-by: Giovanni Campagna <gcampagna@src.gnome.org>
Diffstat (limited to 'src/meta/compositor.h')
| -rw-r--r-- | src/meta/compositor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/meta/compositor.h b/src/meta/compositor.h index 13143c992..de81c207a 100644 --- a/src/meta/compositor.h +++ b/src/meta/compositor.h @@ -64,8 +64,8 @@ void meta_compositor_manage_screen (MetaCompositor *compositor, void meta_compositor_unmanage_screen (MetaCompositor *compositor, MetaScreen *screen); -void meta_compositor_window_shape_changed (MetaCompositor *compositor, - MetaWindow *window); +void meta_compositor_window_x11_shape_changed (MetaCompositor *compositor, + MetaWindow *window); gboolean meta_compositor_process_event (MetaCompositor *compositor, XEvent *event, |