.gitignore
| 61
Makefile.am
| 1014 ++++++++
README
| 5
autogen.sh
| 9
clients/.gitignore
| 49
clients/Makefile.am
| 257 --
clients/calibrator.c
| 2
clients/clickdot.c
| 2
clients/cliptest.c
| 2
clients/desktop-shell.c
| 9
clients/dnd.c
| 2
clients/editor.c
| 136 -
clients/eventdemo.c
| 2
clients/flower.c
| 2
clients/fullscreen.c
| 271 ++
clients/image.c
| 2
clients/keyboard.c
| 282 +-
clients/nested-client.c
| 2
clients/nested.c
| 4
clients/resizor.c
| 2
clients/scaler.c
| 145 +
clients/simple-egl.c
| 159 -
clients/simple-shm.c
| 100
clients/simple-touch.c
| 48
clients/smoke.c
| 2
clients/stacking.c
| 12
clients/subsurfaces.c
| 2
clients/terminal.c
| 24
clients/transformed.c
| 23
clients/view.c
| 314 --
clients/weston-info.c
| 2
clients/window.c
| 719 +++---
clients/window.h
| 26
clients/wscreensaver.h
| 2
configure.ac
| 79
data/.gitignore
| 1
data/Makefile.am
| 19
data/wayland.png
|binary
debian/changelog
| 20
debian/clean
| 2
debian/control
| 2
debian/patches/0001-animation-fix-move-scale-animation.patch
| 107
debian/patches/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
| 34
debian/patches/series
| 2
debian/source/format
| 1
debian/weston.install
| 53
desktop-shell/.gitignore
| 4
desktop-shell/Makefile.am
| 39
desktop-shell/exposay.c
| 150 -
desktop-shell/input-panel.c
| 63
desktop-shell/shell.c
| 1189 +++++++---
desktop-shell/shell.h
| 91
fullscreen-shell/fullscreen-shell.c
| 830 ++++++
man/Makefile.am
| 26
man/weston.ini.man
| 19
man/weston.man
| 10
notes.txt
| 77
protocol/Makefile.am
| 26
protocol/desktop-shell.xml
| 25
protocol/fullscreen-shell.xml
| 206 +
protocol/scaler.xml
| 86
protocol/xdg-shell.xml
| 288 +-
protocol/xserver.xml
| 18
shared/Makefile.am
| 34
shared/cairo-util.c
| 15
shared/cairo-util.h
| 3
shared/frame.c
| 8
shared/os-compatibility.h
| 4
src/.gitignore
| 17
src/Makefile.am
| 333 --
src/animation.c
| 66
src/compositor-drm.c
| 141 -
src/compositor-fbdev.c
| 8
src/compositor-headless.c
| 30
src/compositor-rdp.c
| 201 -
src/compositor-rpi.c
| 26
src/compositor-wayland.c
| 555 ++++
src/compositor-x11.c
| 26
src/compositor.c
| 468 ++-
src/compositor.h
| 86
src/data-device.c
| 6
src/evdev.c
| 26
src/gl-renderer.c
| 468 ++-
src/gl-renderer.h
| 9
src/input.c
| 113
src/launcher-util.c
| 5
src/libinput-device.c
| 388 +++
src/libinput-device.h
| 75
src/libinput-seat.c
| 379 +++
src/libinput-seat.h
| 62
src/logind-util.c
| 1
src/noop-renderer.c
| 33
src/pixman-renderer.c
| 86
src/rpi-renderer.c
| 4
src/screen-share.c
| 1093 +++++++++
src/screenshooter.c
| 115
src/udev-input.h
| 34
src/udev-seat.c
| 34
src/udev-seat.h
| 5
src/vaapi-recorder.c
| 44
src/vaapi-recorder.h
| 2
src/version.h.in
| 12
src/zoom.c
| 47
tests/.gitignore
| 5
tests/Makefile.am
| 166 -
tests/bad-buffer-test.c
| 32
tests/buffer-count-test.c
| 31
tests/button-test.c
| 2
tests/config-parser-test.c
| 2
tests/matrix-test.c
| 2
tests/setbacklight.c
| 2
tests/subsurface-test.c
| 2
tests/surface-global-test.c
| 2
tests/text-test.c
| 2
tests/vertex-clip-test.c
| 3
tests/weston-test-client-helper.c
| 8
tests/weston-test-client-helper.h
| 2
tests/weston-test-runner.c
| 41
tests/weston-test-runner.h
| 2
tests/weston-test.c
| 6
tests/weston-tests-env
| 23
wayland-scanner.mk
| 8
wcap/Makefile.am
| 9
wcap/main.c
| 4
wcap/wcap-decode.c
| 9
weston.ini.in
| 2
xwayland/.gitignore
| 2
xwayland/Makefile.am
| 42
xwayland/dnd.c
| 1
xwayland/launcher.c
| 114
xwayland/window-manager.c
| 238 +-
xwayland/xwayland.h
| 9
132 files changed, 9253 insertions(+), 3740 deletions(-)
New commits:
commit 79c8b54910c3b50a1a9dd9010a07aad54115510b
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat May 24 02:53:52 2014 +0200
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 613cfc1..0d44909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-weston (1.5.0-1) UNRELEASED; urgency=medium
+weston (1.5.0-1) unstable; urgency=medium
* Add myself to Uploaders.
* New upstream release.
@@ -16,7 +16,7 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
* d/p/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch:
+ New patch, fix a crash in exposay.
- -- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
+ -- Emilio Pozuelo Monfort <po...@debian.org> Sat, 24 May 2014 02:53:44 +0200
weston (1.4.0-1) unstable; urgency=medium
commit 248a5a4e168e15498f636cfe49de39551320d687
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat May 24 02:53:33 2014 +0200
Add myself to Uploaders
diff --git a/debian/changelog b/debian/changelog
index 7d44dc7..613cfc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
weston (1.5.0-1) UNRELEASED; urgency=medium
+ * Add myself to Uploaders.
* New upstream release.
* Switch back to source format 1.0 for now.
* debian/control:
diff --git a/debian/control b/debian/control
index be80ca2..2712b33 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders:
Cyril Brulebois <k...@debian.org>,
Mike Gabriel <sunwea...@debian.org>,
Héctor Orón Martínez <zu...@debian.org>,
+ Emilio Pozuelo Monfort <po...@debian.org>,
Build-Depends:
debhelper (>= 9),
quilt,
commit 5774e231544e69f13661fc381213be80ebb419b1
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat May 24 02:44:44 2014 +0200
Fix a crash in exposay
diff --git a/debian/changelog b/debian/changelog
index c1876c3..7d44dc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
* debian/patches/0001-animation-fix-move-scale-animation.patch:
+ Patch from Jonny Lamb, taken from wayland-devel@, that fixes
move animations, as triggered e.g. by exposay.
+ * d/p/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch:
+ + New patch, fix a crash in exposay.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git
a/debian/patches/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
b/debian/patches/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
new file mode 100644
index 0000000..9ffa9a2
--- /dev/null
+++
b/debian/patches/0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
@@ -0,0 +1,34 @@
+From e608cd67218fdaa0405df306f84883ed114f86db Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <emilio.pozu...@collabora.co.uk>
+Date: Sat, 24 May 2014 02:38:56 +0200
+Subject: [PATCH weston] exposay: fix crash when navigating with the keyboard
+
+Commit a7592019 introduced an optimization that caused some
+exposay struct members to not be properly initialized, particularly
+cur_output, leading to crashes in some circumstances (e.g. pressing
+the down arrow key after going to exposay).
+
+Signed-off-by: Emilio Pozuelo Monfort <emilio.pozu...@collabora.co.uk>
+---
+ desktop-shell/exposay.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
+index 1d8b40e..104b9d9 100644
+--- a/desktop-shell/exposay.c
++++ b/desktop-shell/exposay.c
+@@ -323,8 +323,10 @@ exposay_layout(struct desktop_shell *shell, struct
shell_output *shell_output)
+ i++;
+ }
+
+- if (highlight)
++ if (highlight) {
++ shell->exposay.focus_current = NULL;
+ exposay_highlight_surface(shell, highlight);
++ }
+
+ weston_compositor_schedule_repaint(shell->compositor);
+
+--
+2.0.0.rc2
+
diff --git a/debian/patches/series b/debian/patches/series
index 64b58d8..685d402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-animation-fix-move-scale-animation.patch
+0001-exposay-fix-crash-when-navigating-with-the-keyboard.patch
commit e01ba8d791245eb0573d03d4b37def47b2269414
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat May 24 02:05:22 2014 +0200
Add patch to fix move animations
diff --git a/debian/changelog b/debian/changelog
index 70ae2cd..c1876c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
* debian/weston.install:
+ Fix path for demo clients.
+ Install the fullscreen shell.
+ * debian/patches/0001-animation-fix-move-scale-animation.patch:
+ + Patch from Jonny Lamb, taken from wayland-devel@, that fixes
+ move animations, as triggered e.g. by exposay.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/patches/0001-animation-fix-move-scale-animation.patch
b/debian/patches/0001-animation-fix-move-scale-animation.patch
new file mode 100644
index 0000000..b80cd6a
--- /dev/null
+++ b/debian/patches/0001-animation-fix-move-scale-animation.patch
@@ -0,0 +1,107 @@
+X-Account-Key: account4
+X-UIDL: GmailId14625b19ac69bf2a
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00000000
+X-Mozilla-Keys:
+Delivered-To: poch...@gmail.com
+Received: by 10.60.170.229 with SMTP id ap5csp204557oec;
+ Thu, 22 May 2014 13:48:55 -0700 (PDT)
+X-Received: by 10.66.121.197 with SMTP id lm5mr241537pab.118.1400791735070;
+ Thu, 22 May 2014 13:48:55 -0700 (PDT)
+Return-Path: <wayland-devel-boun...@lists.freedesktop.org>
+Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177])
+ by mx.google.com with ESMTP id db3si1084263pbb.85.2014.05.22.13.48.54
+ for <multiple recipients>;
+ Thu, 22 May 2014 13:48:55 -0700 (PDT)
+Received-SPF: none (google.com: wayland-devel-boun...@lists.freedesktop.org
does not designate permitted sender hosts) client-ip=131.252.210.177;
+Authentication-Results: mx.google.com;
+ spf=neutral (google.com: wayland-devel-boun...@lists.freedesktop.org
does not designate permitted sender hosts)
smtp.mail=wayland-devel-boun...@lists.freedesktop.org;
+ dkim=neutral (body hash did not verify) header.i=@
+Received: from gabe.freedesktop.org (localhost [127.0.0.1])
+ by gabe.freedesktop.org (Postfix) with ESMTP id 316386ECFF;
+ Thu, 22 May 2014 13:48:51 -0700 (PDT)
+X-Original-To: wayland-de...@lists.freedesktop.org
+Delivered-To: wayland-de...@lists.freedesktop.org
+Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com
+ [66.111.4.27])
+ by gabe.freedesktop.org (Postfix) with ESMTP id 2BA236E4A3
+ for <wayland-de...@lists.freedesktop.org>;
+ Thu, 22 May 2014 13:48:49 -0700 (PDT)
+Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42])
+ by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 64F902146D;
+ Thu, 22 May 2014 16:41:48 -0400 (EDT)
+Received: from frontend2 ([10.202.2.161])
+ by compute2.internal (MEProxy); Thu, 22 May 2014 16:41:48 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
+ messagingengine.com; h=from:to:cc:subject:date:message-id
+ :in-reply-to:references; s=smtpout; bh=xZJ7s9hNabCm1ID+8F4d8krGs
+ TY=; b=drH3dbtPBvoT4yYkFzVo4TiQuEuQBc8bydv20xxsLDlg0fkFtMaz269TV
+ xsaAMu6uGPwCKup2xwOtKVUFtPwv/hqoLrgqmQ+Qas6qSVl/LMma5fOzN+BDbzjX
+ v00ES7HaFZ+nsM1X4ZUPf9Ls9daw3aYqtULp7QbZ657x7QeVQY=
+X-Sasl-enc: B8P/k2jTwz7A//gn0Vb9pYsonoiwfFBl9LPBBjIF7NSy 1400791307
+Received: from localhost.localdomain (unknown [151.27.142.237])
+ by mail.messagingengine.com (Postfix) with ESMTPA id B00B1680118;
+ Thu, 22 May 2014 16:41:47 -0400 (EDT)
+From: Jonny Lamb <jonny.l...@collabora.co.uk>
+To: wayland-de...@lists.freedesktop.org
+Subject: [PATCH weston 1/5] animation: fix move scale animation
+Date: Thu, 22 May 2014 22:41:30 +0200
+Message-Id: <1400791294-31869-2-git-send-email-jonny.l...@collabora.co.uk>
+X-Mailer: git-send-email 2.0.0.rc2
+In-Reply-To: <1400791294-31869-1-git-send-email-jonny.l...@collabora.co.uk>
+References: <1400791294-31869-1-git-send-email-jonny.l...@collabora.co.uk>
+Cc: Jonny Lamb <jonny.l...@collabora.co.uk>
+X-BeenThere: wayland-de...@lists.freedesktop.org
+X-Mailman-Version: 2.1.15
+Precedence: list
+List-Id: Discussion about the wayland display server
+ <wayland-devel.lists.freedesktop.org>
+List-Unsubscribe:
<http://lists.freedesktop.org/mailman/options/wayland-devel>,
+ <mailto:wayland-devel-requ...@lists.freedesktop.org?subject=unsubscribe>
+List-Archive: <http://lists.freedesktop.org/archives/wayland-devel>
+List-Post: <mailto:wayland-de...@lists.freedesktop.org>
+List-Help: <mailto:wayland-devel-requ...@lists.freedesktop.org?subject=help>
+List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/wayland-devel>,
+ <mailto:wayland-devel-requ...@lists.freedesktop.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Errors-To: wayland-devel-boun...@lists.freedesktop.org
+Sender: "wayland-devel" <wayland-devel-boun...@lists.freedesktop.org>
+
+Both weston_move_scale_run() and weston_slide_run() were broken in
+commit 3a869019. Commit a4a6f161 fixed and explained the problem for
+weston_slide_run() but weston_move_scale_run() remained broken.
+
+To fix weston_move_scale_run(), weston_view_animation_run() is also
+required. It was removed when _run() was split into two functions
+_create() and _run() in commit f5cc2b56, but _run() was not added in
+this commit.
+---
+ src/animation.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/animation.c b/src/animation.c
+index a29b34a..392e32d 100644
+--- a/src/animation.c
++++ b/src/animation.c
+@@ -458,8 +458,10 @@ weston_move_scale_run(struct weston_view *view, int dx,
int dy,
+ if (animation == NULL)
+ return NULL;
+
+- weston_spring_init(&animation->spring, 400.0, start, end);
++ weston_spring_init(&animation->spring, 400.0, 0.0, 1.0);
+ animation->spring.friction = 1150;
+
++ weston_view_animation_run(animation);
++
+ return animation;
+ }
+--
+2.0.0.rc2
+
+_______________________________________________
+wayland-devel mailing list
+wayland-de...@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/wayland-devel
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..64b58d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-animation-fix-move-scale-animation.patch
commit 312e5948dd58aaa2791157949bb95eecab13a54e
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:55:48 2014 +0200
Install the fullscreen shell
diff --git a/debian/changelog b/debian/changelog
index fb5558e..70ae2cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
+ Dropped, no longer needed.
* debian/weston.install:
+ Fix path for demo clients.
+ + Install the fullscreen shell.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/weston.install b/debian/weston.install
index 92008b1..921d228 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -15,6 +15,7 @@ usr/lib/*/weston/cms-static.so
usr/lib/*/weston/desktop-shell.so
usr/lib/*/weston/drm-backend.so
usr/lib/*/weston/fbdev-backend.so
+usr/lib/*/weston/fullscreen-shell.so
usr/lib/*/weston/gl-renderer.so
usr/lib/*/weston/headless-backend.so
usr/lib/*/weston/wayland-backend.so
commit 2bb576b702034815cdc0dbbc96dbdaf875e8a8e6
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:35:06 2014 +0200
Fix path for demo clients
diff --git a/debian/changelog b/debian/changelog
index ee7b787..fb5558e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
+ Drop librsvg2-bin build dependency, no longer needed.
* debian/clean:
+ Dropped, no longer needed.
+ * debian/weston.install:
+ + Fix path for demo clients.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/weston.install b/debian/weston.install
index 493adfb..92008b1 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -26,29 +26,29 @@ usr/share/man/man7/weston-drm.7
usr/share/weston
# Clients
-clients/weston-calibrator usr/lib/weston/
-clients/weston-clickdot usr/lib/weston/
-clients/weston-cliptest usr/lib/weston/
-clients/weston-desktop-shell usr/lib/weston/
-clients/weston-dnd usr/lib/weston/
-clients/weston-editor usr/lib/weston/
-clients/weston-eventdemo usr/lib/weston/
-clients/weston-flower usr/lib/weston/
-clients/weston-fullscreen usr/lib/weston/
-clients/weston-gears usr/lib/weston/
-clients/weston-image usr/lib/weston/
-clients/weston-info usr/lib/weston/
-clients/weston-keyboard usr/lib/weston/
-clients/weston-multi-resource usr/lib/weston/
-clients/weston-resizor usr/lib/weston/
-clients/weston-scaler usr/lib/weston/
-clients/weston-screensaver usr/lib/weston/
-clients/weston-screenshooter usr/lib/weston/
-clients/weston-simple-egl usr/lib/weston/
-clients/weston-simple-im usr/lib/weston/
-clients/weston-simple-shm usr/lib/weston/
-clients/weston-simple-touch usr/lib/weston/
-clients/weston-smoke usr/lib/weston/
-clients/weston-stacking usr/lib/weston/
-clients/weston-terminal usr/lib/weston/
-clients/weston-transformed usr/lib/weston/
+weston-calibrator usr/lib/weston/
+weston-clickdot usr/lib/weston/
+weston-cliptest usr/lib/weston/
+weston-desktop-shell usr/lib/weston/
+weston-dnd usr/lib/weston/
+weston-editor usr/lib/weston/
+weston-eventdemo usr/lib/weston/
+weston-flower usr/lib/weston/
+weston-fullscreen usr/lib/weston/
+weston-gears usr/lib/weston/
+weston-image usr/lib/weston/
+weston-info usr/lib/weston/
+weston-keyboard usr/lib/weston/
+weston-multi-resource usr/lib/weston/
+weston-resizor usr/lib/weston/
+weston-scaler usr/lib/weston/
+weston-screensaver usr/lib/weston/
+weston-screenshooter usr/lib/weston/
+weston-simple-egl usr/lib/weston/
+weston-simple-im usr/lib/weston/
+weston-simple-shm usr/lib/weston/
+weston-simple-touch usr/lib/weston/
+weston-smoke usr/lib/weston/
+weston-stacking usr/lib/weston/
+weston-terminal usr/lib/weston/
+weston-transformed usr/lib/weston/
commit cee0d87c355925109c1ef45064fde4a6210e6024
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:24:55 2014 +0200
Drop debian/clean
diff --git a/debian/changelog b/debian/changelog
index 283f235..ee7b787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
* Switch back to source format 1.0 for now.
* debian/control:
+ Drop librsvg2-bin build dependency, no longer needed.
+ * debian/clean:
+ + Dropped, no longer needed.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index a61892f..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-data/wayland.png
-wayland-screenshot.png
commit b4cb10fe3cc92fb98835a293a97cc65dc71bb212
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:24:31 2014 +0200
Drop librsvg2-bin build dependency, no longer needed
diff --git a/debian/changelog b/debian/changelog
index bb72e0d..283f235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ weston (1.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Switch back to source format 1.0 for now.
+ * debian/control:
+ + Drop librsvg2-bin build dependency, no longer needed.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/control b/debian/control
index 1120cd7..be80ca2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
quilt,
dh-autoreconf,
pkg-config,
- librsvg2-bin,
libpixman-1-dev,
libpng-dev,
libjpeg-dev,
commit f6f26722d0a1eb2b5bcbc54caea07736183acd43
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:15:24 2014 +0200
Switch back to source format 1.0 for now
diff --git a/debian/changelog b/debian/changelog
index 9e5331c..bb72e0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
weston (1.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Switch back to source format 1.0 for now.
-- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
commit d995dc5d78cf2ea203750d50132f6217e74c20e0
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Fri May 23 23:13:22 2014 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 8775309..9e5331c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+weston (1.5.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Fri, 23 May 2014 23:12:59 +0200
+
weston (1.4.0-1) unstable; urgency=medium
* New upstream release 1.4.0:
commit 880193622024d7dc2b36421251d97b08da324570
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Mon May 19 16:22:28 2014 -0700
configure.ac: Bump version to 1.5.0
diff --git a/configure.ac b/configure.ac
index 031a26f..f55cea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [4])
-m4_define([weston_micro_version], [93])
+m4_define([weston_minor_version], [5])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 7098948463836104c28f6adc0b41cd08462873a7
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Mon May 12 12:51:52 2014 -0700
configure.ac: Bump version 1.4.93
This is the last RC before 1.5.
diff --git a/configure.ac b/configure.ac
index c07cb7c..031a26f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
m4_define([weston_minor_version], [4])
-m4_define([weston_micro_version], [92])
+m4_define([weston_micro_version], [93])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit a57c9f1b90a14bbbd5de217f1e44bd443cd3783f
Author: Ander Conselvan de Oliveira <ander.conselvan.de.olive...@intel.com>
Date: Tue May 6 15:25:40 2014 +0300
window: Ignore input events from subsurfaces
Toytoolkit was not designed to handle input from subsurfaces and
instead it expects subsurfaces to have an empty input region. That way
input events for subsurfaces are generated on the main surface and
there is no need to convert coordinates before reporting the event to
the user.
However it is possible that a subsurface has a non-empty input region,
but in that case those events aren't properly processed. The function
window_find_widget() assumes the coordinates are in the main surface
coordinate space, and ends up chosing the wrong widget.
This patch changes the input code to completely ignore input events from
subsurfaces. This option was chosen instead of ensuring that the input
region on those surfaces is always empty since there's no enforcement
that a subsurface should completely overlap with the main surface. If
an event happens in the area of the surface that doesn't overlap, the
event could cause a completely unrelated surface to be picked.
https://bugs.freedesktop.org/show_bug.cgi?id=78207
diff --git a/clients/window.c b/clients/window.c
index f12ce39..4592ef9 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2605,10 +2605,15 @@ pointer_handle_enter(void *data, struct wl_pointer
*pointer,
return;
}
+ window = wl_surface_get_user_data(surface);
+ if (surface != window->main_surface->surface) {
+ DBG("Ignoring input event from subsurface %p\n", surface);
+ return;
+ }
+
input->display->serial = serial;
input->pointer_enter_serial = serial;
- input->pointer_focus = wl_surface_get_user_data(surface);
- window = input->pointer_focus;
+ input->pointer_focus = window;
if (window->resizing) {
window->resizing = 0;
@@ -2644,12 +2649,12 @@ pointer_handle_motion(void *data, struct wl_pointer
*pointer,
float sx = wl_fixed_to_double(sx_w);
float sy = wl_fixed_to_double(sy_w);
- input->sx = sx;
- input->sy = sy;
-
if (!window)
return;
+ input->sx = sx;
+ input->sy = sy;
+
/* when making the window smaller - e.g. after a unmaximise we might
* still have a pending motion event that the compositor has picked
* based on the old surface dimensions
@@ -2979,6 +2984,12 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
return;
}
+ if (surface != input->touch_focus->main_surface->surface) {
+ DBG("Ignoring input event from subsurface %p\n", surface);
+ input->touch_focus = NULL;
+ return;
+ }
+
if (input->grab)
widget = input->grab;
else
commit 15f8563524943c4e2cddc4560663b6cc8fa5f881
Author: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Date: Mon May 12 10:08:57 2014 +0300
build: let 'make clean' remove logs/ again
Before in the recursive automake setting, we had tests/logs/ for
explicitly created test log files. There is a Makefile rule to
remove the logs directory on 'make clean'. The rule broke on moving to
non-recursive make, since now we have logs/, not tests/logs/.
Fix the rule to remove the intended directory.
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/Makefile.am b/Makefile.am
index 177ce2e..343adc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -828,7 +828,7 @@ LA_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
WESTON_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
clean-local:
- -rm -rf tests/logs
+ -rm -rf logs
# To remove when automake 1.11 support is dropped
export abs_builddir
commit 2f88f0be308355b110ac66c6159846ccd7d29835
Author: Bryce W. Harrington <b.harring...@samsung.com>
Date: Mon May 12 10:08:56 2014 +0300
gitignore log files, now in root directory
[paalanen: added also *.trs to ignore]
Signed-off-by: Bryce Harrington <b.harring...@samsung.com>
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
diff --git a/.gitignore b/.gitignore
index e0a73c0..f9a6a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@
*.jpg
*.la
*.lo
+*.log
*.o
*.pc
*.so
*.swp
+*.trs
*~
ctags
cscope.out
@@ -21,6 +23,7 @@ cscope.out
/config.status
/configure
/libtool
+/logs
/stamp-h1
/test-driver
/weston.ini
commit 9b059099542253c916c032d5df642c7691ff4cab
Author: Jonas Ådahl <jad...@gmail.com>
Date: Sat May 10 10:43:34 2014 +0200
desktop-shell: Fix order of desktop_shell messages
There was a bug in wayland-scanner that failed to detect when an
message with implicitly set version (i.e. version 1) came after a
message with a newer version. This patch fixes the weston desktop shell
protocol to pass again.
Signed-off-by: Jonas Ådahl <jad...@gmail.com>
diff --git a/protocol/desktop-shell.xml b/protocol/desktop-shell.xml
index 65e44a7..fdcb17b 100644
--- a/protocol/desktop-shell.xml
+++ b/protocol/desktop-shell.xml
@@ -33,17 +33,6 @@
<arg name="surface" type="object" interface="wl_surface"/>
</request>
- <request name="desktop_ready" since="2">
- <description summary="desktop is ready to be shown">
- Tell the server, that enough desktop elements have been drawn
- to make the desktop look ready for use. During start-up, the
- server can wait for this request with a black screen before
- starting to fade in the desktop, for instance. If the client
- parts of a desktop take a long time to initialize, we avoid
- showing temporary garbage.
- </description>
- </request>
-
<!-- We'll fold most of wl_shell into this interface and then
they'll share the configure event. -->
<event name="configure">
@@ -91,6 +80,20 @@
<entry name="busy" value="11"/>
</enum>
+
+ <!-- Version 2 additions -->
+
+ <request name="desktop_ready" since="2">
+ <description summary="desktop is ready to be shown">
+ Tell the server, that enough desktop elements have been drawn
+ to make the desktop look ready for use. During start-up, the
+ server can wait for this request with a black screen before
+ starting to fade in the desktop, for instance. If the client
+ parts of a desktop take a long time to initialize, we avoid
+ showing temporary garbage.
+ </description>
+ </request>
+
</interface>
<interface name="screensaver" version="1">
commit c991513483ec448408be47dbf806c5b300de2b07
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Fri May 9 16:24:07 2014 -0700
desktop-shell: Damage the black view when we remove it
We should be using weston_view_unmap() here, or maybe just destroying the
black view, but let's do a minimal, safe fix for the 1.5 release.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=78501
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index db55ea9..84f5c83 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4499,6 +4499,8 @@ lower_fullscreen_layer(struct desktop_shell *shell)
/* Hide the black view */
wl_list_remove(&shsurf->fullscreen.black_view->layer_link);
wl_list_init(&shsurf->fullscreen.black_view->layer_link);
+ weston_view_damage_below(shsurf->fullscreen.black_view);
+
}
/* Lower the view to the workspace layer */
commit d33cc73075532a63a6bf6adf37c404febf64dc79
Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Fri May 9 15:32:02 2014 -0700
configure.ac: Fix indent for screen-share option
diff --git a/configure.ac b/configure.ac
index 0252fae..c07cb7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ if test x$enable_rdp_compositor = xyes; then
CPPFLAGS="$SAVED_CPPFLAGS"
fi
-AC_ARG_ENABLE([screen-sharing], [--enable-screen-sharing],,
+AC_ARG_ENABLE([screen-sharing], [ --enable-screen-sharing],,
enable_screen_sharing=no)
AM_CONDITIONAL([ENABLE_SCREEN_SHARING],
[test x$enable_screen_sharing = xyes])
commit 8e37d96bf70f59e062f7b703c328a00f663021b0
Author: Ander Conselvan de Oliveira <ander.conselvan.de.olive...@intel.com>
Date: Thu May 8 14:55:50 2014 +0300
editor: Fix cursor positioning with pointer and touch
The calculation off the vertical offset between the widget coordinates
and where the text was rendered was wrong. It was using the constant for
horizontal offset for that too.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=78411
diff --git a/clients/editor.c b/clients/editor.c
index 3b00833..f3f6141 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -1011,7 +1011,17 @@ text_entry_draw_cursor(struct text_entry *entry, cairo_t
*cr)
cairo_stroke(cr);
}
-static const int text_offset_left = 10;
+static int
+text_offset_left(struct rectangle *allocation)
+{
+ return 10;
+}
+
+static int
+text_offset_top(struct rectangle *allocation)
+{
+ return allocation->height / 2;
+}
static void
text_entry_redraw_handler(struct widget *widget, void *data)
@@ -1048,7 +1058,9 @@ text_entry_redraw_handler(struct widget *widget, void
*data)
cairo_set_source_rgba(cr, 0, 0, 0, 1);
- cairo_translate(cr, text_offset_left, allocation.height / 2);
+ cairo_translate(cr,
+ text_offset_left(&allocation),
+ text_offset_top(&allocation));
if (!entry->layout)
entry->layout = pango_cairo_create_layout(cr);
@@ -1075,6 +1087,7 @@ text_entry_motion_handler(struct widget *widget,
{
struct text_entry *entry = data;
struct rectangle allocation;
+ int tx, ty;
if (!entry->button_pressed) {
return CURSOR_IBEAM;
@@ -1082,10 +1095,10 @@ text_entry_motion_handler(struct widget *widget,
widget_get_allocation(entry->widget, &allocation);
- text_entry_set_cursor_position(entry,
- x - allocation.x - text_offset_left,
- y - allocation.y - text_offset_left,
- false);
+ tx = x - allocation.x - text_offset_left(&allocation);
+ ty = y - allocation.y - text_offset_top(&allocation);
+
+ text_entry_set_cursor_position(entry, tx, ty, false);
return CURSOR_IBEAM;
}
@@ -1105,8 +1118,8 @@ text_entry_button_handler(struct widget *widget,
widget_get_allocation(entry->widget, &allocation);
input_get_position(input, &x, &y);
- x -= allocation.x + text_offset_left;
- y -= allocation.y + text_offset_left;
+ x -= allocation.x + text_offset_left(&allocation);
+ y -= allocation.y + text_offset_top(&allocation);
editor = window_get_user_data(entry->window);
@@ -1149,8 +1162,8 @@ text_entry_touch_handler(struct widget *widget, struct
input *input,
widget_get_allocation(entry->widget, &allocation);
- x = tx - (allocation.x + text_offset_left);
- y = ty - (allocation.y + text_offset_left);
+ x = tx - (allocation.x + text_offset_left(&allocation));
+ y = ty - (allocation.y + text_offset_top(&allocation));
editor = window_get_user_data(entry->window);
text_entry_activate(entry, seat);
commit f9a2626cb1be298b297ed0e07b56e1a12335c2b5
Author: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Date: Wed May 7 16:26:29 2014 +0300
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wo0n9-0007fs...@moszumanska.debian.org
