weston: Changes to 'upstream-unstable'
.gitignore|5 Makefile.am | 199 + clients/desktop-shell.c | 167 + clients/editor.c | 145 + clients/nested-client.c |4 clients/scaler.c | 10 clients/simple-dmabuf-drm-data.h | 3074 ++ clients/simple-dmabuf-drm.c | 907 clients/simple-dmabuf-intel.c | 621 -- clients/simple-dmabuf-v4l.c | 37 clients/simple-egl.c | 51 clients/simple-im.c | 524 + clients/stacking.c|7 clients/subsurfaces.c |3 clients/terminal.c| 41 clients/weston-info.c | 29 clients/weston-simple-im.c| 524 - clients/window.c | 117 - clients/window.h |5 compositor/cms-colord.c |5 compositor/cms-static.c |4 compositor/main.c | 876 +--- compositor/screen-share.c | 11 compositor/systemd-notify.c |7 compositor/text-backend.c |1 compositor/weston-screenshooter.c |2 compositor/weston.desktop |2 compositor/weston.h | 24 configure.ac | 120 - desktop-shell/input-panel.c |8 desktop-shell/shell.c | 359 ++- desktop-shell/shell.h | 14 fullscreen-shell/fullscreen-shell.c | 13 ivi-shell/hmi-controller.c|4 ivi-shell/input-panel-ivi.c |8 ivi-shell/ivi-layout-export.h | 36 ivi-shell/ivi-layout-private.h| 23 ivi-shell/ivi-layout-transition.c |4 ivi-shell/ivi-layout.c| 234 -- ivi-shell/ivi-shell.c |6 libweston-desktop/internal.h |5 libweston-desktop/libweston-desktop.c | 10 libweston-desktop/libweston-desktop.h | 33 libweston-desktop/surface.c |8 libweston-desktop/wl-shell.c | 28 libweston-desktop/xdg-shell-v5.c | 219 +- libweston-desktop/xdg-shell-v6.c | 295 ++ libweston-desktop/xwayland.c | 46 libweston/animation.c | 35 libweston/compositor-drm.c| 1708 ++-- libweston/compositor-drm.h| 58 libweston/compositor-fbdev.c | 99 libweston/compositor-fbdev.h |4 libweston/compositor-headless.c | 159 + libweston/compositor-headless.h |8 libweston/compositor-rdp.c| 159 + libweston/compositor-rdp.h| 26 libweston/compositor-wayland.c| 713 -- libweston/compositor-wayland.h| 18 libweston/compositor-x11.c| 349 +-- libweston/compositor-x11.h| 13 libweston/compositor.c| 859 ++-- libweston/compositor.h| 235 +- libweston/gl-renderer.c | 473 +++- libweston/gl-renderer.h | 25 libweston/input.c | 141 - libweston/launcher-direct.c | 64 libweston/launcher-impl.h | 45 libweston/launcher-logind.c | 24 libweston/launcher-util.c | 13 libweston/launcher-weston-launch.c| 66 libweston/libinput-device.c |2 libweston/libinput-seat.c | 11 libweston/linux-dmabuf.c | 138 + libweston/linux-dmabuf.h | 38 libweston/pixel-formats.c | 430 libweston/pixel-formats.h | 194 + libweston/weston-egl-ext.h| 156 - libweston/weston-launch.c |3 libweston/windowed-output-api.h | 92 man/weston.ini.man| 26 man/weston.man|7 notes.txt |2 protocol/ivi-hmi-controller.xml |2 protocol/weston-test.xml |7 releasing.txt | 26 shared/cairo-util.h | 10 shared/config-parser.c|1 shared/frame.c| 12 shared/helpers.h |2 shared/option-parser.c| 32 shared/os-compatibility.c | 10 shared/platform.h | 16 shared/string-helpers.h |1 shared/timespec-util.h| 72 shared/weston-egl-ext.h
weston: Changes to 'upstream-unstable'
.gitignore|1 Makefile.am | 472 +- README| 146 clients/cliptest.c|2 clients/confine.c | 531 +++ clients/desktop-shell.c |8 clients/editor.c |3 clients/eventdemo.c |1 clients/ivi-shell-user-interface.c|3 clients/keyboard.c| 43 clients/multi-resource.c | 10 clients/nested-client.c |1 clients/nested.c | 13 clients/presentation-shm.c|3 clients/resizor.c | 158 clients/scaler.c | 44 clients/simple-damage.c | 127 clients/simple-dmabuf-intel.c | 120 clients/simple-dmabuf-v4l.c | 123 clients/simple-egl.c | 122 clients/simple-shm.c | 96 clients/simple-touch.c|3 clients/stacking.c|1 clients/terminal.c| 74 clients/weston-info.c |1 clients/weston-simple-im.c| 15 clients/window.c | 641 +++ clients/window.h | 67 compositor/cms-colord.c | 567 +++ compositor/cms-helper.c | 136 compositor/cms-helper.h | 75 compositor/cms-static.c | 119 compositor/main.c | 1791 ++ compositor/screen-share.c | 1129 ++ compositor/systemd-notify.c | 165 compositor/text-backend.c | 1085 ++ compositor/weston-screenshooter.c | 192 + compositor/weston.desktop |5 compositor/weston.h | 73 compositor/weston.pc.in | 12 compositor/xwayland.c | 209 + configure.ac | 80 desktop-shell/exposay.c | 14 desktop-shell/input-panel.c | 19 desktop-shell/shell.c | 3264 --- desktop-shell/shell.h | 16 fullscreen-shell/fullscreen-shell.c | 115 ivi-shell/hmi-controller.c| 18 ivi-shell/input-panel-ivi.c | 19 ivi-shell/ivi-layout-export.h | 11 ivi-shell/ivi-layout-private.h| 25 ivi-shell/ivi-layout-shell.h |3 ivi-shell/ivi-layout-transition.c |3 ivi-shell/ivi-layout.c| 300 + ivi-shell/ivi-shell.c | 42 ivi-shell/ivi-shell.h |6 libweston-desktop/client.c| 212 + libweston-desktop/internal.h | 236 + libweston-desktop/libweston-desktop.c | 244 + libweston-desktop/libweston-desktop.h | 166 libweston-desktop/libweston-desktop.pc.in | 11 libweston-desktop/seat.c | 368 ++ libweston-desktop/surface.c | 810 libweston-desktop/wl-shell.c | 466 ++ libweston-desktop/xdg-shell-v5.c | 822 libweston-desktop/xdg-shell-v6.c | 1276 +++ libweston-desktop/xwayland.c | 375 ++ libweston/animation.c | 502 ++ libweston/bindings.c | 580 +++ libweston/clipboard.c | 307 + libweston/compositor-drm.c| 3285 +++ libweston/compositor-drm.h| 138 libweston/compositor-fbdev.c | 784 libweston/compositor-fbdev.h | 63 libweston/compositor-headless.c | 274 + libweston/compositor-headless.h | 56 libweston/compositor-rdp.c| 1346 +++ libweston/compositor-rdp.h| 54 libweston/compositor-wayland.c| 2361 + libweston/compositor-wayland.h| 63 libweston/compositor-x11.c| 1745 ++ libweston/compositor-x11.h| 64 libweston/compositor.c| 5119 ++ libweston/compositor.h| 1820 ++ libweston/data-device.c | 1343 +++ libweston/dbus.c | 408 ++ libweston/dbus.h | 110 libweston/gl-renderer.c | 3191 ++ libweston/gl-renderer.h | 117 libweston/input.c | 4558 ++ libweston/launcher-direct.c | 315 + libweston/launcher-impl.h | 45 libweston/launcher-logind.c | 840 libweston/launcher
weston: Changes to 'upstream-unstable'
Makefile.am | 70 +- clients/clickdot.c|1 clients/cliptest.c|1 clients/desktop-shell.c | 62 + clients/dnd.c |1 clients/editor.c |1 clients/eventdemo.c | 49 + clients/flower.c |2 clients/fullscreen.c |7 clients/ivi-shell-user-interface.c| 40 - clients/keyboard.c|1 clients/multi-resource.c | 16 clients/nested.c |1 clients/presentation-shm.c| 72 +- clients/resizor.c |1 clients/scaler.c |2 clients/screenshot.c | 16 clients/simple-damage.c |3 clients/simple-dmabuf-intel.c |3 clients/simple-dmabuf-v4l.c |3 clients/simple-egl.c |2 clients/simple-shm.c | 12 clients/smoke.c |2 clients/subsurfaces.c |4 clients/terminal.c|1 clients/weston-info.c | 54 - clients/window.c | 47 - clients/window.h | 11 configure.ac | 136 ++-- data/COPYING | 18 data/icon_editor.png |binary data/icon_flower.png |binary data/icon_terminal.png|binary data/icons.svg| 1012 +++ desktop-shell/shell.c | 44 + fullscreen-shell/fullscreen-shell.c |2 ivi-shell/hmi-controller.c| 209 ++ ivi-shell/input-panel-ivi.c |8 ivi-shell/ivi-layout-export.h | 365 ++- ivi-shell/ivi-layout-private.h| 49 - ivi-shell/ivi-layout-shell.h | 63 + ivi-shell/ivi-layout-transition.c | 42 - ivi-shell/ivi-layout.c| 1079 -- ivi-shell/ivi-shell.c | 75 +- ivi-shell/ivi-shell.h |9 m4/weston.m4 | 37 + man/weston.ini.man| 24 protocol/ivi-application.xml |2 protocol/presentation_timing.xml | 274 releasing.txt | 15 shared/config-parser.c| 22 shared/image-loader.c | 41 + shared/option-parser.c| 41 + shared/platform.h | 10 shared/xalloc.c | 54 + shared/xalloc.h | 50 + src/compositor-drm.c | 307 - src/compositor-drm.h | 127 src/compositor-fbdev.c| 79 +- src/compositor-fbdev.h| 51 + src/compositor-headless.c | 78 +- src/compositor-headless.h | 53 + src/compositor-rdp.c | 127 ++-- src/compositor-rdp.h | 54 + src/compositor-rpi.c |8 src/compositor-wayland.c | 241 ++- src/compositor-wayland.h | 61 + src/compositor-x11.c | 188 ++--- src/compositor-x11.h | 62 + src/compositor.c | 176 ++--- src/compositor.h | 67 +- src/data-device.c | 22 src/gl-renderer.c | 56 + src/input.c | 29 src/libinput-device.c | 32 - src/libinput-seat.c |3 src/linux-dmabuf.c|2 src/main.c| 617 +++ src/screen-share.c|5 src/systemd-notify.c | 45 + src/weston.pc.in |1 tests/ivi_layout-internal-test.c | 421 ++--- tests/ivi_layout-test-plugin.c| 219 ++ tests/ivi_layout-test.c |3 tests/presentation-test.c | 35 - tests/weston-test-client-helper.c | 29 tests/weston-test-client-helper.h | 15 tests/weston-tests-env| 20 tools/zunitc/inc/zunitc/zunitc.h |2 tools/zunitc/src/zuc_base_logger.c| 21 tools/zunitc/src/zuc_junit_reporter.c | 34 - tools/zunitc/src/zunitc_impl.c| 11 weston.ini.in |1 xwayland/selection.c |4 94 files changed, 4053 insertions(+), 3419 deletions(-) New commits: commit 2d825ed9eb0388d47e9fc14294f6f6d63d5c230c Author: Bryce Harrington Date: Tue May 31 17:10:40 2016 -0700 configure.ac: bump to version 1.11.0 for the official release diff --git a/configure.ac b/configure.ac index 00f20b7..97a7769 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m
weston: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit d45de283ce1f9edafc6f33632fc917513c620912 Author: Bryce Harrington Date: Tue Feb 16 12:37:43 2016 -0800 configure.ac: bump to version 1.10.0 for the official release commit 9d24f23e4d6ae23f272d9a828523db504aaaf989 Author: Bryce Harrington Date: Thu Feb 11 15:23:33 2016 -0800 releasing.txt: Script now figures out release name on its own commit 07d0d386daad6a4528b14521d86860e1f094a7ef Author: Bryce Harrington Date: Tue Feb 9 13:36:00 2016 -0800 configure.ac: bump to version 1.9.93 for the RC1 release commit 6c19b69fcc6921344fe8f552e26b70549a65 Author: Derek Foreman Date: Thu Dec 3 14:07:12 2015 -0600 compositor-drm: the cursor plane only supports ARGB Keep XRGB apps out of the cursor plane, only ARGB is supported. This prevents programs like weston-simple-shm from landing in the cursor plane and being misrendered. Signed-off-by: Derek Foreman Reviewed-by: Pekka Paalanen commit b0427569fd4a9ef40a4bd59c412f5ab9b17b944d Author: Derek Foreman Date: Fri Feb 5 15:55:20 2016 -0600 compositor-drm: update internal cursor plane location when disabling cursor When the cursor plane is disabled the kernel can lose its location. If we don't update our internal idea of where the plane is at that time, the next time we set a cursor it can show up at 0,0. This can show up when an application is put in the cursor plane, removed from the plane, then put back at the same location. It might show up at 0,0 when it's reinstated. We now use INT32_MIN as a location for disabled cursors so enabling the plane will always cause an update. Reviewed-by: Pekka Paalanen Signed-off-by: Derek Foreman commit 345b4f5b119d20ace14a6cb4a96a8b1d91c05659 Author: Marek Chalupa Date: Wed Feb 3 14:03:00 2016 +0100 compositor-x11: send pointer frame after axis event clients that implement pointer interface of version 5 wait for the frame event, so without it the scrolling does not work (GTK+ clients do not scroll now for example). Xcb axis events are discrete, so it's fine to send frame after every single axis event Signed-off-by: Marek Chalupa Reviewed-by: Peter Hutterer commit 4e18448286ff27942ed3ad8fda568008c14eeff7 Author: Derek Foreman Date: Mon Feb 1 14:36:57 2016 -0600 xwm: Don't clear the selection if it has no text type available weston maintains a copy of the most recently selected "thing" - it picks the first available type when it copies, and saves that one only. When an application quits weston will make the saved selection active. When xwm sees the selection set it will check if any of the offered types are text. If no text type is offered it will clear the selection. weston then interprets this in the same way as an application exiting and causing the selection to be unset, and we get caught in a live lock with both weston and xwayland consuming as much cpu as they can. The simple fix is to just remove the test for text presence. Signed-off-by: Derek Foreman Reviewed-by: Carlos Garnacho commit 22b1f93432c775b6ed077c15a19e9e734a2806a5 Author: Bryce Harrington Date: Wed Sep 23 17:30:43 2015 -0700 shell: Check more thoroughly for undefined surface resource The surface can have an undefined resource in certain situations (such as with xwayland). So, since NULL is a valid state for this parameter, and since the wl_resource_*, etc. calls require their parameters to be non-NULL, make a practice of always checking the surface resource before making wayland calls. update v2: * Fix some c/p errors for pointer names * Drop null ptr check in add_popup_grab; probably redundant now Signed-off-by: Bryce Harrington Reviewed-by: Daniel Stone commit 90c2789e8d83a5b090cf4b91a6770a93f08028a0 Author: Nobuhiko Tanibata Date: Sat Dec 26 23:52:51 2015 +0900 ivi-layout: apply opacity to weston_view correctly update_opacity is only called when a ivi-surface is visible. But the previous code also checks event masks redundantly. However if the event happens when ivi-surface is invisible, opacity is not calculated. This patch removes this redundant check to fix potential bug. Signed-off-by: Nobuhiko Tanibata Reviewed-by: Pekka Paalanen
weston: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
weston: Changes to 'upstream-unstable'
.gitignore| 10 COPYING | 44 Makefile.am | 338 +-- README| 149 +++ clients/calibrator.c | 38 clients/clickdot.c| 34 clients/cliptest.c| 33 clients/desktop-shell.c | 38 clients/dnd.c | 36 clients/editor.c | 37 clients/eventdemo.c | 42 clients/flower.c | 33 clients/fullscreen.c | 33 clients/gears.c | 33 clients/glmatrix.c| 1062 -- clients/image.c | 37 clients/ivi-shell-user-interface.c| 44 clients/keyboard.c| 33 clients/matrix3.xpm | 692 -- clients/multi-resource.c | 35 clients/nested-client.c | 33 clients/nested.c | 36 clients/presentation-shm.c| 86 + clients/resizor.c | 33 clients/scaler.c | 33 clients/screenshot.c | 35 clients/simple-damage.c | 35 clients/simple-dmabuf.c | 591 clients/simple-egl.c | 35 clients/simple-shm.c | 35 clients/simple-touch.c| 38 clients/smoke.c | 33 clients/stacking.c| 34 clients/subsurfaces.c | 40 clients/terminal.c| 90 - clients/transformed.c | 33 clients/weston-info.c | 40 clients/weston-simple-im.c| 33 clients/window.c | 210 ++-- clients/window.h | 49 - clients/wscreensaver-glue.c | 148 --- clients/wscreensaver-glue.h | 120 -- clients/wscreensaver.c| 348 --- clients/wscreensaver.h| 63 - configure.ac | 75 + data/wayland.svg | 36 desktop-shell/exposay.c | 85 + desktop-shell/input-panel.c | 41 desktop-shell/shell.c | 746 +++ desktop-shell/shell.h | 48 - doc/doxygen/devtools.dox | 51 + doc/doxygen/tooldev.doxygen.in| 11 doc/doxygen/tools.dox | 31 doc/doxygen/tools.doxygen.in | 10 doc/doxygen/tools_arch_new.gv | 85 + doc/doxygen/tools_arch_old.gv | 53 + fullscreen-shell/fullscreen-shell.c | 86 + ivi-shell/hmi-controller.c| 141 +-- ivi-shell/input-panel-ivi.c | 43 ivi-shell/ivi-layout-export.h | 58 - ivi-shell/ivi-layout-private.h| 47 - ivi-shell/ivi-layout-transition.c | 39 ivi-shell/ivi-layout.c| 984 ++--- ivi-shell/ivi-shell.c | 95 +- ivi-shell/ivi-shell.h | 37 man/weston.ini.man| 26 man/weston.man|4 protocol/desktop-shell.xml|4 protocol/input-method.xml | 38 protocol/ivi-application.xml | 35 protocol/ivi-hmi-controller.xml | 33 protocol/linux-dmabuf.xml | 274 + protocol/presentation_timing.xml | 38 protocol/scaler.xml | 38 protocol/text.xml | 48 - protocol/weston-test.xml | 38 protocol/xdg-shell.xml| 80 + releasing.txt |9 shared/cairo-util.c | 38 shared/cairo-util.h | 37 shared/config-parser.c| 40 shared/config-parser.h| 35 shared/file-util.c| 35 shared/file-util.h| 35 shared/frame.c| 35 shared/helpers.h | 96 ++ shared/image-loader.c | 38 shared/image-loader.h | 35 shared/matrix.c | 35 shared/matrix.h | 35 shared/option-parser.c| 35 shared/os-compatibility.c | 57 - shared/os-compatibility.h | 38 shared/platform.h | 35 shared/timespec-util.h| 75 + shared/zalloc.h | 35 src/animation.c | 36 src/bindings.c| 121 +- src/clipboard.c | 36 src/cms-colord.c | 90 + src/cms-helper.c | 35 src/cms-helper.h | 35 src/cms-static.c | 41 src/compositor-
weston: Changes to 'upstream-unstable'
.gitignore | 14 Makefile.am | 163 + clients/dnd.c | 93 - clients/editor.c| 12 clients/ivi-shell-user-interface.c | 1310 +++ clients/presentation-shm.c | 870 ++ clients/simple-egl.c| 95 + clients/simple-shm.c| 82 clients/smoke.c | 32 clients/subsurfaces.c |3 clients/weston-info.c | 81 clients/window.c| 111 + configure.ac| 36 data/COPYING| 28 data/background.png |binary data/fullscreen.png |binary data/home.png |binary data/icon_ivi_clickdot.png |binary data/icon_ivi_flower.png|binary data/icon_ivi_simple-egl.png|binary data/icon_ivi_simple-shm.png|binary data/icon_ivi_smoke.png |binary data/panel.png |binary data/random.png |binary data/sidebyside.png |binary data/tiling.png |binary desktop-shell/input-panel.c | 10 desktop-shell/shell.c | 293 ++- fullscreen-shell/fullscreen-shell.c | 13 ivi-shell/.gitignore|1 ivi-shell/README| 79 ivi-shell/hmi-controller.c | 1737 + ivi-shell/input-panel-ivi.c | 391 ivi-shell/ivi-layout-export.h | 777 + ivi-shell/ivi-layout-private.h | 226 ++ ivi-shell/ivi-layout-transition.c | 859 ++ ivi-shell/ivi-layout.c | 2970 ivi-shell/ivi-shell.c | 429 + ivi-shell/ivi-shell.h | 62 ivi-shell/weston.ini.in | 96 + man/weston.ini.man | 27 protocol/fullscreen-shell.xml | 10 protocol/input-method.xml |8 protocol/ivi-application.xml| 99 + protocol/ivi-hmi-controller.xml | 97 + protocol/presentation_timing.xml| 276 +++ protocol/text.xml |2 protocol/xdg-shell.xml |9 releasing.txt | 66 shared/cairo-util.c | 141 + shared/cairo-util.h | 11 shared/frame.c | 49 src/bindings.c | 52 src/clipboard.c |6 src/cms-colord.c| 22 src/cms-helper.c|2 src/compositor-drm.c| 162 + src/compositor-fbdev.c | 36 src/compositor-headless.c | 91 - src/compositor-rdp.c| 19 src/compositor-rpi.c| 110 - src/compositor-wayland.c| 37 src/compositor-x11.c| 100 - src/compositor.c| 767 +++-- src/compositor.h| 95 - src/data-device.c | 48 src/evdev-touchpad.c| 800 - src/evdev.c | 755 - src/evdev.h | 137 - src/filter.c| 337 src/filter.h| 66 src/gl-renderer.c | 96 - src/input.c | 65 src/launcher-util.c | 22 src/launcher-util.h |2 src/libinput-device.c | 85 - src/logind-util.c | 94 - src/logind-util.h |4 src/pixman-renderer.c | 11 src/rpi-renderer.c | 20 src/screenshooter.c | 35 src/text-backend.c | 54 src/timeline-object.h | 52 src/timeline.c | 294 +++ src/timeline.h | 62 src/udev-input.h| 34 src/udev-seat.c | 417 - src/udev-seat.h | 57 src/vaapi-recorder.c|4 src/weston-egl-ext.h| 28 src/weston-launch.c | 11 src/weston.desktop |5 src/zoom.c |3 tests/bad-buffer-test.c |3 tests/buffer-count-test.c | 10 tests/button-test.c |1 tests/event-test.c |2 tests/keyboard-test.c |2 tests/presentation-test.c | 238 ++ tests/roles-test.c | 139 + tests/setbacklight.c|2 tests/subsurface-test.c |2 tests/surface-test.c|3 tests/text-test.c |2 tests/vertex-clip-test.c|3 tests/weston-test-client-helper.c | 17 tests/weston-test-client-helper.h | 13 tests/
weston: Changes to 'upstream-unstable'
clients/editor.c |5 +
clients/keyboard.c |5 +
clients/window.c | 12
configure.ac |4 ++--
src/compositor-x11.c |2 +-
5 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 53fd7d70dc34007f0dc86621ed94c6f71fa35bf9
Author: Pekka Paalanen
Date: Fri Sep 19 13:40:14 2014 +0300
configure.ac: bump version to 1.6.0
Signed-off-by: Pekka Paalanen
diff --git a/configure.ac b/configure.ac
index 4a889af..05e883d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [5])
-m4_define([weston_micro_version], [93])
+m4_define([weston_minor_version], [6])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 01448094768882a542ca4f3d3f32a66b8704bcc4
Author: Olivier Blin
Date: Tue Sep 16 19:13:17 2014 +0200
editor: do not crash when text input manager is not available
[Pekka Paalanen: whitespace fix]
Signed-off-by: Pekka Paalanen
diff --git a/clients/editor.c b/clients/editor.c
index 66cba0b..421f8fe 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -1359,6 +1359,11 @@ main(int argc, char *argv[])
display_set_user_data(editor.display, &editor);
display_set_global_handler(editor.display, global_handler);
+ if (editor.text_input_manager == NULL) {
+ fprintf(stderr, "No text input manager global\n");
+ return -1;
+ }
+
editor.window = window_create(editor.display);
editor.widget = window_frame_create(editor.window, &editor);
commit 997232d068fdbd48f9de55ca7cc6e422ee6404b0
Author: Olivier Blin
Date: Tue Sep 16 19:13:16 2014 +0200
keyboard: do not crash when input panel is not available
[Pekka Paalanen: whitespace fix]
Signed-off-by: Pekka Paalanen
diff --git a/clients/keyboard.c b/clients/keyboard.c
index 7c11cec..2579571 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -995,6 +995,11 @@ main(int argc, char *argv[])
display_set_user_data(virtual_keyboard.display, &virtual_keyboard);
display_set_global_handler(virtual_keyboard.display, global_handler);
+ if (virtual_keyboard.input_panel == NULL) {
+ fprintf(stderr, "No input panel global\n");
+ return -1;
+ }
+
output = display_get_output(virtual_keyboard.display);
keyboard_create(output, &virtual_keyboard);
commit 495339f7363b3aac040395419419c5dedb690b7b
Author: Jason Ekstrand
Date: Mon Sep 15 12:10:27 2014 -0700
compositor-x11: Rename the output make to "weston-X11"
Previously all outputs in the X11 backend had the make "xwayland" which is
confusing. Now they have something that makes a little more sense.
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 3494e34..b602bc9 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -869,7 +869,7 @@ x11_compositor_create_output(struct x11_compositor *c, int
x, int y,
output->base.set_dpms = NULL;
output->base.switch_mode = NULL;
output->base.current_mode = &output->mode;
- output->base.make = "xwayland";
+ output->base.make = "weston-X11";
output->base.model = "none";
if (configured_name)
commit a253fca28727101239cc2ea558864f686128b116
Author: Ondřej Majerech
Date: Sat Sep 13 16:35:45 2014 +0200
window: Don't needlessly sync parent and geometry
When a toytoolkit client redraws, the toolkit syncs the parent and
geometry. If a client redraws often (such as the terminal drawing a huge
amount of output), this can spam the compositor with requests and may
result in the client's eventual being killed.
We don't need to send requests for changing the geometry or parent if
these haven't changed. So remember the last geometry and parent, and
update them only if needed.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83297
Signed-off-by: Ondřej Majerech
Reviewed-by: Pekka Paalanen
diff --git a/clients/window.c b/clients/window.c
index 9c48155..e44d65c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -217,6 +217,7 @@ struct window {
struct rectangle saved_allocation;
struct rectangle min_allocation;
struct rectangle pending_allocation;
+ struct rectangle last_geometry;
int x, y;
int redraw_needed;
int redraw_task_scheduled;
@@ -246,6 +247,7 @@ struct window {
struct xdg_popup *xdg_popup;
struct window *parent;
+ struct wl_surface *last_parent_surface;
struct window_frame *frame;
@@ -3993,7 +3995,11 @@ window_sync_parent(struct window *window)
else
parent_surface = NULL;
+ if (parent_surface == window->last_parent_surface)
+ return;
+
xdg
weston: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1w91ce-0005ir...@moszumanska.debian.org
weston: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 181131253747500c4759a117ee312262fbb6ed19 Author: Kristian Høgsberg Date: Thu Jan 23 20:51:40 2014 -0800 configure.ac: Bump version to 1.4.0 commit b3955b095317466afd05b474666eef938b7f72d0 Author: Kristian Høgsberg Date: Thu Jan 23 16:25:06 2014 -0800 compositor-drm: Set cursor surface to NULL when pageflip fails If we VT switch away between picking a cursor surface and actually doing the pageflip in drm_output_repaint(), we never set output->cursor_view to NULL. Then we unplug all the input devices and as the last pointer device goes away we destroy the cursor surface. Then when we switch back, we call drm_output_set_cursor() with an invalid surface and crashes. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73566 commit d500bf1ac990d0d776c7a444a7478d2c9bb0e8fd Author: Kristian Høgsberg Date: Wed Jan 22 12:25:20 2014 -0800 shell: Properly track the focus state surface We have to move the surface destroy listener around as we track the currently focused surface. Introduce a helper function, focus_state_set_focus() for this and use throughout. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73768 commit 8259728a569e973a8895b919ba057740a813f52a Author: Kristian Høgsberg Date: Wed Jan 22 11:03:50 2014 -0800 evdev: Remove output destroy notifier on device destroy Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73895 commit 4fd9d2693db3777b593ad5190e4f63d8cefd66b8 Author: Kristian Høgsberg Date: Wed Jan 22 10:45:26 2014 -0800 configure.ac: Check for libsystemd-login >= 198 Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73870 commit f1c3bd8e81b1873ca4455835fd4eba4fad1ee1b9 Author: Ricardo Vieira Date: Sat Jan 18 16:30:50 2014 + shell: Don't move maximized window We'll want to ask the client to unmaximize once we get support for that in xdg-shell, but for now, just refuse moving a maximized window. commit 0837fa9626d452baf451ebbeed3d4b851914ff0f Author: Kristian Høgsberg Date: Mon Jan 20 10:35:26 2014 -0800 shell: Add mod+shift left-click as a resize binding This lets us use compositor-initiated resize on laptops with touchpads and no middle buttons. commit 7cccfcab1340aa976e615e40261af2261234ead7 Author: Kristian Høgsberg Date: Sun Jan 19 22:56:14 2014 -0800 configure.ac: Bump version to 1.3.93 This is the release candidate. commit d3ed6cb3b1ff2b7a2d2e864e6df6b35562426f82 Author: U. Artie Eoff Date: Fri Jan 10 10:15:17 2014 -0800 drm: prepend stamp space to output mode logging Use the STAMP_SPACE to make the output mode logging a little nicer looking. Signed-off-by: U. Artie Eoff Reviewed-by: Bryce Harrington commit 04633b69324ef1df086f1f2a2686441937575ccf Author: Hardening Date: Fri Jan 10 11:33:06 2014 +0100 Fix compilation with FreeRdp 1.1 and master v2 The API to use remoteFx encoding has changed between master and stable 1.1 branch. This patch should fix compilation for both. This new version adds checks for the freerdp/version.h file commit ac9f35a72b592426809c5698caf9f2c2b55b5ec8 Author: U. Artie Eoff Date: Fri Jan 17 16:28:15 2014 -0800 rpi: call eglTerminate if we're bailing Signed-off-by: U. Artie Eoff commit 5e854bcca29d73112edd3036c1fd0aa8a129ed2c Author: U. Artie Eoff Date: Fri Jan 17 13:56:41 2014 -0800 rpi-backend: ensure pixels is destroyed in resource_update Signed-off-by: U. Artie Eoff commit a62e0e0e02b83d10a2ba1f005ee5bac938f3ea03 Author: U. Artie Eoff Date: Fri Jan 17 15:08:51 2014 -0800 animation: don't NULL deref if _run() returns NULL Signed-off-by: U. Artie Eoff commit 6d71c3c05ab1acf013353d8496aae8e2a8bc44d3 Author: U. Artie Eoff Date: Fri Jan 17 14:44:05 2014 -0800 shared/frame: NULL check before attempting to deref Signed-off-by: U. Artie Eoff commit e067b30a1ef92bf2d4bca2618c663c7d3669e233 Author: U. Artie Eoff Date: Fri Jan 17 14:00:18 2014 -0800 rpi: free renderer if we bail early during create Signed-off-by: U. Artie Eoff commit 2e2384aac5c5811c62fc36c120e5dd9e868bcd5f Author: U. Artie Eoff Date: Fri Jan 17 13:19:01 2014 -0800 compositor: free memory from str config sections after done using it Signed-off-by: U. Artie Eoff commit ff7550087e8403c7c884a51a37ccedd79a1966d3 Author: U. Artie Eoff Date: Fri Jan 17 12:36:58 2014 -0800 compositor-wayland: free 'theme' config option value Signed-off-by: U. Artie Eoff commit 1a08d1196ac4e8adfb6c90967ebdfe19c19e9310 Author: U. Artie Eoff Date: Fri Jan 17 12:22:50 2014 -0800 compositor-wayland: don't free unallocated memory Assigning a string constant (i.e. memory that we didn't allocate) to a char* pointer and then freeing that pointer is bad news.
weston: Changes to 'upstream-unstable'
.gitignore|1 clients/.gitignore| 39 - clients/Makefile.am | 22 clients/clickdot.c|4 clients/cliptest.c|6 clients/desktop-shell.c | 55 +- clients/dnd.c | 52 + clients/editor.c |3 clients/gears.c |3 clients/image.c |3 clients/keyboard.c| 61 +- clients/multi-resource.c | 597 + clients/nested.c | 19 clients/resizor.c |6 clients/screenshot.c |2 clients/simple-shm.c |4 clients/simple-touch.c|6 clients/subsurfaces.c | 17 clients/tablet-shell.c| 88 +-- clients/terminal.c| 151 - clients/view.c|3 clients/weston-info.c | 25 clients/window.c | 207 --- clients/window.h | 20 configure.ac | 35 - shared/cairo-util.c | 31 + shared/cairo-util.h |3 shared/config-parser.c| 236 ++-- shared/config-parser.h| 17 shared/zalloc.h | 42 + src/Makefile.am | 22 src/animation.c | 24 src/bindings.c| 26 src/clipboard.c | 32 - src/cms-colord.c |3 src/cms-static.c |3 src/compositor-drm.c | 250 ++--- src/compositor-fbdev.c| 163 - src/compositor-headless.c | 10 src/compositor-rdp.c | 40 - src/compositor-rpi.c | 51 - src/compositor-wayland.c | 16 src/compositor-x11.c | 23 src/compositor.c | 204 +-- src/compositor.h | 71 +- src/data-device.c | 146 ++--- src/evdev-touchpad.c | 43 + src/evdev.c | 283 +- src/evdev.h | 21 src/gl-renderer.c | 379 ++--- src/input.c | 548 --- src/launcher-util.c | 315 +-- src/launcher-util.h | 17 src/log.c |1 src/pixman-renderer.c | 18 src/rpi-bcm-stubs.h |8 src/rpi-renderer.c| 279 +- src/screenshooter.c | 59 +- src/shell.c | 79 +- src/tablet-shell.c|3 src/text-backend.c|4 src/tty.c | 294 -- src/udev-seat.c |5 src/vaapi-recorder.c | 1155 ++ src/vaapi-recorder.h | 35 + src/version.h.in |6 src/vertex-clipping.c | 317 +++ src/vertex-clipping.h | 65 ++ src/weston-egl-ext.h | 10 src/weston-launch.c | 387 +++--- src/weston-launch.h | 12 src/xwayland/Makefile.am |1 src/xwayland/dnd.c| 274 + src/xwayland/launcher.c |4 src/xwayland/selection.c | 72 +- src/xwayland/window-manager.c | 337 ++-- src/xwayland/xwayland.h | 22 tests/Makefile.am | 55 +- tests/config-parser-test.c|2 tests/vertex-clip-test.c | 219 +++ tests/weston-test-runner.c| 139 +++-- tests/weston-test-runner.h| 52 + tests/weston-test.c |3 tests/weston-tests-env| 17 weston.ini| 10 85 files changed, 6055 insertions(+), 2337 deletions(-) New commits: commit 0333282f6bd27ce8cb639d34920515c9ca0182c9 Author: Héctor Orón Martínez Date: Fri Oct 11 14:35:01 2013 +0200 Merge 1.3.0 upstream tag Signed-off-by: Héctor Orón Martínez diff --git a/clients/Makefile.am b/clients/Makefile.am index 24ee9e4..4f9dc48 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -8,7 +8,6 @@ demo_clients = \ $(poppler_programs) \ $(simple_clients_programs) \ $(simple_egl_clients_programs) -endif if ENABLE_DEMO_CLIENTS bin_PROGRAMS += $(demo_clients) diff --git a/configure.ac b/configure.ac index a5ae749..5abf65f 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR], [test x$enable_fbdev_compositor = xyes]) AS_IF([test x$enable_fbdev_compositor = xyes], [ AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor]) - PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0 libdrm >= 2.4.30]) + PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0]) ]) AC_ARG_ENABLE([rdp-compositor], [ --enable-rdp-compositor],, diff --git a/src/evdev.c b/src/evdev.c index c01266a..48e5470 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -190,11 +190,6 @@ evdev_process_key(struct evdev_device *device, struct input_
weston: Changes to 'upstream-unstable'
Makefile.am |2
clients/Makefile.am | 152 +
clients/calibrator.c | 17 ++
clients/clickdot.c|4
clients/desktop-shell.c | 34 +++-
clients/flower.c | 12 +
clients/fullscreen.c | 12 +
clients/image.c |1
clients/nested.c | 12 -
clients/screenshot.c | 26 ++-
clients/simple-egl.c | 55 ++
clients/simple-shm.c |6
clients/simple-touch.c|7
clients/smoke.c | 24 ++
clients/tablet-shell.c|2
clients/terminal.c|4
clients/transformed.c | 12 +
clients/weston-simple-im.c|2
clients/window.c | 321 +++---
clients/window.h | 50 +
configure.ac | 98 ++-
man/weston.ini.man|7
src/Makefile.am |3
src/clipboard.c | 11 +
src/cms-colord.c |1
src/cms-helper.h |2
src/compositor-drm.c |6
src/compositor-fbdev.c|6
src/compositor-rdp.c |2
src/compositor-x11.c | 71 +---
src/compositor.c | 98 ++-
src/compositor.h |7
src/data-device.c | 29 ++-
src/evdev.c | 166 ---
src/evdev.h |2
src/filter.h |2
src/gl-renderer.c | 24 +-
src/input.c | 33 +++
src/launcher-util.h |2
src/pixman-renderer.h |4
src/shell.c | 137 ++--
src/spring-tool.c |2
src/text-backend.c|1
src/tty.c |2
src/udev-seat.c | 10 +
src/udev-seat.h |2
src/weston-egl-ext.h | 11 +
src/weston-launch.c | 11 +
src/xwayland/Makefile.am |3
src/xwayland/hash.c |2
src/xwayland/launcher.c | 10 -
src/xwayland/window-manager.c | 52 ++
src/xwayland/xwayland.h |1
tests/Makefile.am |3
tests/weston-test-client-helper.c |2
wayland-scanner.mk|8
wcap/main.c |2
wcap/wcap-decode.c|3
58 files changed, 1239 insertions(+), 352 deletions(-)
New commits:
commit 5824af080d2477580832da990610b54fecb0710b
Author: Kristian Høgsberg
Date: Thu Aug 29 15:18:49 2013 -0700
configure.ac: Bump version to 1.2.2
diff --git a/configure.ac b/configure.ac
index 9329755..f241ee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
m4_define([weston_minor_version], [2])
-m4_define([weston_micro_version], [1])
+m4_define([weston_micro_version], [2])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 237c1c82bb0e487609a2e3e03bf33f9713cd24e0
Author: Kristian Høgsberg
Date: Wed Aug 28 23:16:20 2013 -0700
shell: Make sure we have seat->pointer and seat->touch before dereferencing
Either of these may not be available when we handle wl_shell_surface.move,
and we need to not crash when that's the case.
https://bugs.freedesktop.org/show_bug.cgi?id=68649
diff --git a/src/shell.c b/src/shell.c
index c3dc347..0efdd1d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1227,13 +1227,15 @@ shell_surface_move(struct wl_client *client, struct
wl_resource *resource,
struct shell_surface *shsurf = wl_resource_get_user_data(resource);
struct weston_surface *surface;
- surface = weston_surface_get_main_surface(seat->pointer->focus);
- if (seat->pointer->button_count > 0 && seat->pointer->grab_serial ==
serial) {
+ if (seat->pointer &&
+ seat->pointer->button_count > 0 &&
+ seat->pointer->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->pointer->focus);
if ((surface == shsurf->surface) &&
(surface_move(shsurf, seat) < 0))
wl_resource_post_no_memory(resource);
- } else if (seat->touch->grab_serial == serial) {
+ } else if (seat->touch &&
+ seat->touch->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->touch->focus);
if ((surface == shsurf->surface) &&
(surface_touch_move(shsurf, seat) < 0))
commit 6048a357e2fb282a7460f01bd8d8ef90e2bbf7d9
Author: Kristian Høgsberg
Date: Wed Aug 28 23:05:29 2013 -0700
gl-rend
weston: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
commit a684b5a3d59d5ff42c30e03fe75a857073fb3fd2
Author: Kristian Høgsberg
Date: Sat Jul 13 01:30:00 2013 -0400
Bump version to 1.2.0
diff --git a/configure.ac b/configure.ac
index 63f36a9..5b110e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
-m4_define([weston_minor_version], [1])
-m4_define([weston_micro_version], [91])
+m4_define([weston_minor_version], [2])
+m4_define([weston_micro_version], [0])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 5f087746ee00573fb8e067d3c25ec2b608e1ffe1
Author: Rob Bradford
Date: Thu Jul 11 19:41:27 2013 +0100
window: Disregard motion events outside our current surface dimensions
It is possible to receive a motion event that was generated by the
compositor based on a pick of a surface of old dimensions. This was
triggerable on toytoolkit clients when minimising. The new window
dimensions were propagated through the widget hierarchy before the event
was dispatched.
This issue was triggering a segfault due to the focussed widget being
lost as the client code tried to identify which widget should have the
focus using co-ordinates outside the dimensions of the surface.
https://bugs.freedesktop.org/show_bug.cgi?id=66795
diff --git a/clients/window.c b/clients/window.c
index 457479d..cbfe12f 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2796,6 +2796,14 @@ 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);
+ /* 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
+*/
+ if (sx > window->main_surface->allocation.width ||
+ sy > window->main_surface->allocation.height)
+ return;
+
input->sx = sx;
input->sy = sy;
commit 7000283741394f7ccf01e9358e0d559a5007e4b7
Author: Rob Bradford
Date: Thu Jul 11 16:00:00 2013 +0100
editor: Support shift-left/right for selecting text
If the shift modifier is active then we don't make the cursor and the
anchor the same and as a result we develop a selection in the direction
that the arrow key gets pressed in.
https://bugs.freedesktop.org/show_bug.cgi?id=66802
diff --git a/clients/editor.c b/clients/editor.c
index 7e69403..1300ccf 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -1141,7 +1141,8 @@ key_handler(struct window *window,
new_char = utf8_prev_char(entry->text, entry->text +
entry->cursor);
if (new_char != NULL) {
entry->cursor = new_char - entry->text;
- entry->anchor = entry->cursor;
+ if (!(input_get_modifiers(input) &
MOD_SHIFT_MASK))
+ entry->anchor = entry->cursor;
widget_schedule_redraw(entry->widget);
}
break;
@@ -1151,7 +1152,8 @@ key_handler(struct window *window,
new_char = utf8_next_char(entry->text + entry->cursor);
if (new_char != NULL) {
entry->cursor = new_char - entry->text;
- entry->anchor = entry->cursor;
+ if (!(input_get_modifiers(input) &
MOD_SHIFT_MASK))
+ entry->anchor = entry->cursor;
widget_schedule_redraw(entry->widget);
}
break;
commit bdeb5d224db4147596c0526a482cbce6e3334fba
Author: Rob Bradford
Date: Thu Jul 11 13:20:53 2013 +0100
shell: Respect output transformation for input panel surface
Rather than using the dimensions in the mode we can use the recently
added output width and height members which are updated to reflect any
output rotation.
https://bugs.freedesktop.org/show_bug.cgi?id=66798
diff --git a/src/shell.c b/src/shell.c
index 69345b0..7e98831 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3732,7 +3732,6 @@ input_panel_configure(struct weston_surface *surface,
int32_t sx, int32_t sy, in
{
struct input_panel_surface *ip_surface = surface->configure_private;
struct desktop_shell *shell = ip_surface->shell;
- struct weston_mode *mode;
float x, y;
uint32_t show_surface = 0;
@@ -3752,10 +3751,8 @@ input_panel_configure(struct weston_surface *surface,
int32_t sx, int32_t sy, in
x = shell->text_input.surface->geometry.x +
shell->text_input.cursor_rectangle.x2;
y = shell->text_input.surface->geometry.y +
shel
weston: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
commit b22b21f13f379e3de7d82ea45a4a69d085dc8ede
Author: Kristian Høgsberg
Date: Fri Jun 7 01:52:08 2013 -0400
configure.ac: Bump version to 1.1.1
diff --git a/configure.ac b/configure.ac
index ed6d2ee..06d0b4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([weston_major_version], [1])
m4_define([weston_minor_version], [1])
-m4_define([weston_micro_version], [0])
+m4_define([weston_micro_version], [1])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
commit 747d4ee17e573766a0b46b60db9b2477b9286d27
Author: Sinclair Yeh
Date: Thu Jun 6 16:41:30 2013 -0700
Avoid unnecessarily re-allocating texture buffer when the size hasn't
changed.
v4:
Incorporated krh and anderco's comments. Now adding newly allocated
buffer's dimensions to texture_damage
v3:
* Removed unnecessary parentheses
* Added check for switching from EGL image to SHM buffer
* Moved shader assignment out of IF condition
v2:
Fixed the wrong comparison
v1:
Depending on specific DRI driver implementation, glTexImage2D() with data
set to NULL may or may not re-allocate the texture buffer each time it is
called. Unintended consequences happen if later glTexSubImage2D() is called
to only update a sub-region of the texture buffer.
I've explored moving glTexImage2D() from gl_renderer_attach() and simply
mark the texture dirty, but the current implemention seems cleaner because
I won't have to worry about calling ensure_textures() and re-assigning
gs->shader unnecessarily.
diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index ea6631f..f6c7194 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -66,6 +66,7 @@ struct gl_surface_state {
int num_images;
struct weston_buffer_reference buffer_ref;
+ int height;
int pitch; /* in pixels */
};
@@ -1192,14 +1193,28 @@ gl_renderer_attach(struct weston_surface *es, struct
wl_buffer *buffer)
}
if (wl_buffer_is_shm(buffer)) {
- gs->pitch = wl_shm_buffer_get_stride(buffer) / 4;
- gs->target = GL_TEXTURE_2D;
+ /* Only allocate a texture if it doesn't match existing one.
+* If gs->num_images is not 0, then a switch from DRM allocated
+* buffer to a SHM buffer is happening, and we need to allocate
+* a new texture buffer. */
+ if (wl_shm_buffer_get_stride(buffer) / 4 != gs->pitch ||
+ wl_shm_buffer_get_height(buffer) != gs->height ||
+ gs->num_images > 0) {
+ gs->pitch = wl_shm_buffer_get_stride(buffer) / 4;
+ gs->height = wl_shm_buffer_get_height(buffer);
+ gs->target = GL_TEXTURE_2D;
+
+ ensure_textures(gs, 1);
+ glBindTexture(GL_TEXTURE_2D, gs->textures[0]);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+gs->pitch, buffer->height, 0,
+GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
+ pixman_region32_union_rect(&gs->texture_damage,
+ &gs->texture_damage,
+ 0, 0,
+ gs->pitch, gs->height);
+ }
- ensure_textures(gs, 1);
- glBindTexture(GL_TEXTURE_2D, gs->textures[0]);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
-gs->pitch, buffer->height, 0,
-GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
if (wl_shm_buffer_get_format(buffer) == WL_SHM_FORMAT_XRGB)
gs->shader = &gr->texture_shader_rgbx;
else
@@ -1258,6 +1273,7 @@ gl_renderer_attach(struct weston_surface *es, struct
wl_buffer *buffer)
}
gs->pitch = buffer->width;
+ gs->height = wl_shm_buffer_get_height(buffer);
} else {
weston_log("unhandled buffer type!\n");
weston_buffer_reference(&gs->buffer_ref, NULL);
commit 7583aff275ccbe0c4d6bb37ec9343773d119e18a
Author: Ander Conselvan de Oliveira
Date: Tue Jun 4 16:24:05 2013 +0300
compositor-drm: Force DPMS state to ON after drmModeSetCrtc()
The kernel is supposed to set this when drmModeSetCrtc() is called but
at least the i915 driver wouldn't do that in all cases. A fix for this
should be released with kernel 3.10, but we work around the issue in
older kernels by always forcing DPMS to ON when doing a mode set.
https://bugs.freedesktop.org/show_bug.cgi?id=64873
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index bc68a6b..b3cf9a9 100644
weston: Changes to 'upstream-unstable'
clients/Makefile.am | 46 ++--
clients/screenshot.c|7 ++
clients/terminal.c |9
clients/window.c|8 +--
configure.ac|4 +--
man/weston.man |5 +++-
shared/Makefile.am |1
shared/cairo-util.c |3 +-
shared/cairo-util.h |4 ---
shared/image-loader.c |2 -
shared/image-loader.h | 31 +
src/compositor-wayland.c|2 -
src/compositor-x11.c|2 -
src/compositor.c| 10 -
src/launcher-util.c |2 -
src/shell.c |7 ++
src/weston-launch.c | 12 +--
tests/surface-global-test.c |2 -
18 files changed, 112 insertions(+), 45 deletions(-)
New commits:
commit 9ceb471a15f39b9a1619afb51f6c90c26819297d
Author: Kristian Høgsberg
Date: Thu Jan 24 20:32:30 2013 -0500
configure.ac: Bump version to 1.0.5
diff --git a/configure.ac b/configure.ac
index 1826531..8a9c291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ([2.64])
AC_INIT([weston],
-[1.0.4],
-
[https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=weston&version=1.0.4],
+[1.0.5],
+
[https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=weston&version=1.0.5],
[weston],
[http://wayland.freedesktop.org/])
commit 5f68322dd22de840fe7bdf29617cd1f9427f25ce
Author: Kristian Høgsberg
Date: Thu Feb 14 16:31:42 2013 -0500
window.c: Don't allow moving a maximized window
Ideally the shell would send an unmaximize event to the client when
we try to move a maximized window, but for now, let's just prevent
moving maximized windows.
https://bugs.freedesktop.org/show_bug.cgi?id=56296
diff --git a/clients/window.c b/clients/window.c
index 3d23b3a..5dbd992 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1721,6 +1721,9 @@ frame_get_pointer_image_for_location(struct frame *frame,
struct input *input)
struct window *window = frame->widget->window;
int location;
+ if (window->type != TYPE_TOPLEVEL)
+ return CURSOR_LEFT_PTR;
+
location = theme_get_location(t, input->sx, input->sy,
frame->widget->allocation.width,
frame->widget->allocation.height,
@@ -1836,6 +1839,9 @@ frame_button_handler(struct widget *widget,
struct display *display = window->display;
int location;
+ if (window->type != TYPE_TOPLEVEL)
+ return;
+
location = theme_get_location(display->theme, input->sx, input->sy,
frame->widget->allocation.width,
frame->widget->allocation.height,
commit fd5654baae575bb9dab60641b3d547368ab1c267
Author: Rob Bradford
Date: Tue Feb 12 11:53:47 2013 +
shell: Bypass fullscreen scaling if surface width and height match output
If our surface has width and height set to the same dimensions as the output
then we can bypassing the scale factor calculation and addition of the
transformation.
The use case that led to this optimisation is the playback of video using
gstreamer-vaapi with the "scale" method. The video is the same dimensions as
the output (1080p.)
diff --git a/src/shell.c b/src/shell.c
index f8cee0e..831b125 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1672,6 +1672,13 @@ shell_configure_fullscreen(struct shell_surface *shsurf)
center_on_output(surface, shsurf->fullscreen_output);
break;
case WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE:
+ /* 1:1 mapping between surface and output dimensions */
+ if (output->width == surface->geometry.width &&
+ output->height == surface->geometry.height) {
+ weston_surface_set_position(surface, output->x,
output->y);
+ break;
+ }
+
matrix = &shsurf->fullscreen.transform.matrix;
weston_matrix_init(matrix);
commit 9fc4c3c98b1cb49566365bdbd3c69d356b353b64
Author: Martin Andersson
Date: Wed Feb 13 00:11:12 2013 +0100
weston-launcher: Add missing newline in error message
diff --git a/src/launcher-util.c b/src/launcher-util.c
index b4b82f1..9196e4f 100644
--- a/src/launcher-util.c
+++ b/src/launcher-util.c
@@ -96,7 +96,7 @@ weston_launcher_open(struct weston_compositor *compositor,
data = (union cmsg_data *) CMSG_DATA(cmsg);
if (data->fd == -1) {
- fprintf(stderr, "missing drm fd in socket request");
+ fprintf(stderr, "missing drm fd in socket request\n");
return -1;
}
commit 13f65f167be90f8d21331bb5190d452693f1289e
Author: Kristian Høgsb
weston: Changes to 'upstream-unstable'
configure.ac |2
man/Makefile.am|9 -
man/weston.ini.man | 332 +
src/compositor-drm.c | 36
src/weston-launch.c|2
tests/weston-test-runner.c |6
6 files changed, 345 insertions(+), 42 deletions(-)
New commits:
commit e4cd90e6bd5ac72a40d87f7da2cd1fd9c8455513
Author: Kristian Høgsberg
Date: Thu Jan 24 20:32:30 2013 -0500
configure.ac: Bump version to 1.0.4
diff --git a/configure.ac b/configure.ac
index 490ae2a..120185b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([weston],
-[1.0.3],
+[1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=weston],
[weston],
[http://wayland.freedesktop.org/])
commit 6828711c4c281459e4a4bee33aed2911d608239d
Author: Scott Moreau
Date: Mon Jan 21 23:40:59 2013 -0700
weston-launch: Use "weston-launch" for --help instead of "weston".
The output of weston-launch --help was "Usage: weston [args...] ...".
This changes it to read "Usage: weston-launch [args...] ...".
diff --git a/src/weston-launch.c b/src/weston-launch.c
index 6d1f7c3..583e85a 100644
--- a/src/weston-launch.c
+++ b/src/weston-launch.c
@@ -541,7 +541,7 @@ main(int argc, char *argv[])
sleep_fork = 10;
break;
case 'h':
- help("weston");
+ help("weston-launch");
exit(1);
}
}
commit a533a85820cc78cc912cbe47b9cd88f26648c4ec
Author: Pekka Paalanen
Date: Tue Dec 18 17:30:16 2012 +0200
tests: make signal other than ABRT a hard failure
We handle FAIL_TEST tests by simply inverting the success flag. The
problem with this is, that if a FAIL_TEST fails by a SIGSEGV, it will be
interpreted as passed. However, no code should ever cause a SEGV, or any
other signal than ABRT. And even ABRT only in the case of an assert()
that is meant to fail. We would probably need more sophistication for the
FAIL_TEST cases.
For now, just interpret any other signal than ABRT as a hard failure,
regardless whether it is a TEST or FAIL_TEST. At least segfaults do not
cause false passes anymore.
Signed-off-by: Pekka Paalanen
diff --git a/tests/weston-test-runner.c b/tests/weston-test-runner.c
index e60d4d2..27ea9e4 100644
--- a/tests/weston-test-runner.c
+++ b/tests/weston-test-runner.c
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include "weston-test-runner.h"
extern const struct weston_test __start_test_section, __stop_test_section;
@@ -71,6 +72,7 @@ int main(int argc, char *argv[])
pass = 0;
for (t = &__start_test_section; t < &__stop_test_section; t++) {
int success = 0;
+ int hardfail = 0;
pid = fork();
assert(pid >= 0);
@@ -93,13 +95,15 @@ int main(int argc, char *argv[])
case CLD_KILLED:
case CLD_DUMPED:
fprintf(stderr, "signal %d", info.si_status);
+ if (info.si_status != SIGABRT)
+ hardfail = 1;
break;
}
if (t->must_fail)
success = !success;
- if (success) {
+ if (success && !hardfail) {
pass++;
fprintf(stderr, ", pass.\n");
} else
commit f03435717c6cf6627cb34eb16b21096b026f944b
Author: Martin Minarik
Date: Fri Jan 18 18:44:29 2013 +0100
Weston: weston.ini.man page
changes:
- launcher path, passing environment variables and parameter
- indent modeline example
diff --git a/man/Makefile.am b/man/Makefile.am
index 4d84db1..8243776 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-man_MANS = weston.1
+man_MANS = weston.1 weston.ini.5
if ENABLE_DRM_COMPOSITOR
man_MANS += weston-drm.7
@@ -8,14 +8,17 @@ MAN_SUBSTS = \
-e 's|__weston_modules_dir__|$(pkglibdir)|g' \
-e 's|__version__|$(PACKAGE_VERSION)|g'
-SUFFIXES = .1 .7 .man
+SUFFIXES = .1 .5 .7 .man
.man.1:
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+.man.5:
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
.man.7:
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST = weston.man weston-drm.man
+EXTRA_DIST = weston.man weston-drm.man weston.ini.man
CLEANFILES = $(man_MANS)
diff --git a/man/weston.ini.man b/man/weston.ini.man
new file mode 100644
index 000..7699e35
--- /dev/null
+++ b/man/weston.ini.man
@@ -0,0 +1,332 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH weston.ini 5 "2013-01-17" "Weston __version__"
+.SH NAME
+weston.ini \- configuration file for
+.B Weston
+\- the reference Wayland
+compositor
+.SH INTRODUCTION
+
weston: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ttcbs-7v...@vasks.debian.org
