[mutter: 892/892] Merge branch 'wayland'
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter: 892/892] Merge branch 'wayland'
- Date: Wed, 9 Apr 2014 22:07:48 +0000 (UTC)
commit 912cf8ee5f13eac66c361581919a4ffea9dd06cf
Merge: 85eab49 954677d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Apr 9 13:05:02 2014 -0700
Merge branch 'wayland'
This has one regression: the basic touch support added by
Carlos Garnacho in 991c85f is now partially reverted, since
we ported to Clutter events for this. We'll need to either
port his changes to Clutter, or restructure event handling
in mutter directly.
.gitignore | 27 +-
AUTHORS | 1 -
COMPLIANCE | 159 -
ChangeLog |15414 --------------------
Doxyfile | 1297 --
HACKING | 298 -
MAINTAINERS | 8 -
METACITY_MAINTAINERS | 43 -
Makefile.am | 2 -
NEWS | 164 +-
README | 416 -
configure.ac | 51 +-
doc/Makefile.am | 2 +-
rationales.txt => doc/rationales.txt | 0
doc/reference/Makefile.am | 2 +-
po/POTFILES.in | 10 +-
src/Makefile.am | 232 +-
src/{core => backends}/edid-parse.c | 0
src/{core => backends}/edid.h | 0
src/backends/meta-backend.c | 157 +
.../meta-backend.h} | 26 +-
src/backends/meta-cursor-private.h | 50 +
src/backends/meta-cursor-tracker-private.h | 98 +
src/backends/meta-cursor-tracker.c | 738 +
src/backends/meta-cursor.c | 412 +
src/backends/meta-cursor.h | 42 +
.../meta-display-config-shared.h} | 8 +-
src/backends/meta-idle-monitor-dbus.c | 286 +
.../meta-idle-monitor-dbus.h} | 14 +-
src/backends/meta-idle-monitor-private.h | 65 +
src/backends/meta-idle-monitor.c | 367 +
.../meta-monitor-config.c} | 3 +-
src/backends/meta-monitor-config.h | 55 +
src/backends/meta-monitor-manager-dummy.c | 227 +
src/backends/meta-monitor-manager-dummy.h | 40 +
.../monitor.c => backends/meta-monitor-manager.c} | 421 +-
.../meta-monitor-manager.h} | 72 +-
src/backends/native/meta-idle-monitor-native.c | 219 +
src/backends/native/meta-idle-monitor-native.h | 43 +
src/backends/native/meta-monitor-manager-kms.c | 939 ++
src/backends/native/meta-monitor-manager-kms.h | 40 +
src/backends/native/meta-weston-launch.c | 411 +
.../native/meta-weston-launch.h} | 26 +-
src/backends/native/weston-launch.c | 711 +
src/backends/native/weston-launch.h | 68 +
src/backends/x11/meta-idle-monitor-xsync.c | 366 +
src/backends/x11/meta-idle-monitor-xsync.h | 49 +
.../x11/meta-monitor-manager-xrandr.c} | 10 +-
src/backends/x11/meta-monitor-manager-xrandr.h | 40 +
src/compositor/compositor-private.h | 24 +-
src/compositor/compositor.c | 920 +-
src/compositor/meta-background.c | 84 -
src/compositor/meta-plugin-manager.c | 31 +-
src/compositor/meta-plugin-manager.h | 2 +-
src/compositor/meta-plugin.c | 174 +-
src/compositor/meta-shaped-texture.c | 201 +-
src/compositor/meta-surface-actor-wayland.c | 195 +
src/compositor/meta-surface-actor-wayland.h | 66 +
src/compositor/meta-surface-actor-x11.c | 459 +
src/compositor/meta-surface-actor-x11.h | 69 +
src/compositor/meta-surface-actor.c | 338 +
src/compositor/meta-surface-actor.h | 85 +
src/compositor/meta-window-actor-private.h | 8 +-
src/compositor/meta-window-actor.c | 868 +-
src/compositor/meta-window-group.c | 10 -
src/compositor/plugins/default.c | 35 +-
src/core/above-tab-keycode.c | 241 -
src/core/barrier.c | 18 +-
src/core/bell.c | 110 +-
src/core/constraints.c | 1 +
src/core/constraints.h | 9 -
src/core/core.c | 35 +-
src/core/core.h | 6 -
src/core/delete.c | 65 +-
src/core/display-private.h | 75 +-
src/core/display.c | 3033 +----
src/core/edge-resistance.c | 13 +-
src/core/errors.c | 6 -
src/core/events.c | 2224 +++
.../{meta-cursor-tracker-private.h => events.h} | 20 +-
src/core/frame.c | 16 +-
src/core/keybindings-private.h | 10 +-
src/core/keybindings.c | 1124 +-
src/core/main.c | 182 +-
src/core/meta-accel-parse.c | 355 +
src/core/meta-accel-parse.h | 43 +
src/core/meta-cursor-tracker.c | 412 -
src/core/meta-idle-monitor.c | 889 --
src/core/place.c | 21 +-
src/core/prefs.c | 25 +-
src/core/screen-private.h | 15 +-
src/core/screen.c | 195 +-
src/core/stack-tracker.c | 884 +-
src/core/stack-tracker.h | 67 +-
src/core/stack.c | 589 +-
src/core/stack.h | 4 +-
src/core/util-private.h | 1 +
src/core/util.c | 27 +-
src/core/window-private.h | 199 +-
src/core/window.c | 3779 ++----
src/core/workspace.c | 2 +-
src/libmutter-wayland.pc.in | 18 +
src/libmutter.pc.in | 18 -
src/meta/atomnames.h | 4 +-
src/meta/common.h | 13 +-
src/meta/compositor.h | 16 +-
src/meta/display.h | 13 -
src/meta/errors.h | 1 -
src/meta/main.h | 1 +
src/meta/meta-background.h | 1 -
src/meta/meta-plugin.h | 6 +-
src/meta/meta-shaped-texture.h | 3 -
src/meta/prefs.h | 14 +-
src/meta/screen.h | 6 -
src/meta/util.h | 1 +
src/meta/window.h | 14 +-
src/mutter-plugins.pc.in | 17 -
...mutter.desktop.in => mutter-wayland.desktop.in} | 7 +-
src/mutter-wm.desktop.in | 20 -
...andr.xml => org.gnome.Mutter.DisplayConfig.xml} | 0
...onitor.xml => org.gnome.Mutter.IdleMonitor.xml} | 0
src/org.gnome.mutter.wayland.gschema.xml.in | 33 +
src/run-mutter.sh | 109 -
src/ui/ui.c | 282 +-
src/ui/ui.h | 26 -
src/wayland/meta-wayland-data-device.c | 548 +
src/wayland/meta-wayland-data-device.h | 36 +
src/wayland/meta-wayland-keyboard.c | 534 +
src/wayland/meta-wayland-keyboard.h | 143 +
src/wayland/meta-wayland-pointer.c | 598 +
src/wayland/meta-wayland-pointer.h | 101 +
src/wayland/meta-wayland-private.h | 94 +
src/wayland/meta-wayland-seat.c | 503 +
src/wayland/meta-wayland-seat.h | 91 +
src/wayland/meta-wayland-stage.c | 68 +
src/wayland/meta-wayland-stage.h | 56 +
.../meta-wayland-surface-private.h} | 24 +-
src/wayland/meta-wayland-surface.c | 1836 +++
src/wayland/meta-wayland-surface.h | 135 +
src/wayland/meta-wayland-types.h | 40 +
src/wayland/meta-wayland-versions.h | 66 +
src/wayland/meta-wayland.c | 683 +
src/wayland/meta-wayland.h | 47 +
.../meta-xwayland-private.h} | 35 +-
src/wayland/meta-xwayland.c | 477 +
.../meta-xwayland.h} | 27 +-
src/wayland/protocol/gtk-shell.xml | 30 +
src/wayland/protocol/xdg-shell.xml | 444 +
src/wayland/window-wayland.c | 220 +
src/wayland/window-wayland.h | 44 +
src/{core => x11}/async-getprop.c | 0
src/{core => x11}/async-getprop.h | 0
src/{core => x11}/group-private.h | 0
src/{core => x11}/group-props.c | 0
src/{core => x11}/group-props.h | 0
src/{core => x11}/group.c | 0
src/{core => x11}/iconcache.c | 4 +-
src/{core => x11}/iconcache.h | 0
src/{core => x11}/mutter-Xatomtype.h | 0
src/{core => x11}/session.c | 37 +-
src/{core => x11}/session.h | 0
src/{core => x11}/testasyncgetprop.c | 0
src/{core => x11}/window-props.c | 261 +-
src/{core => x11}/window-props.h | 0
src/x11/window-x11-private.h | 57 +
src/x11/window-x11.c | 2528 ++++
src/x11/window-x11.h | 64 +
src/{core => x11}/xprops.c | 111 +-
src/{core => x11}/xprops.h | 5 +
test/tokentest/Makefile | 7 -
test/tokentest/README | 19 -
test/tokentest/get-tokens.py | 89 -
test/tokentest/tokentest.c | 304 -
test/tokentest/tokentest.ini | 1873 ---
tools/xlib.py | 43 -
175 files changed, 23535 insertions(+), 31763 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
