Derek Foreman [Tue, 16 Jun 2015 18:30:35 +0000 (13:30 -0500)]
ivi: Use build dir instead of libexec dir in generated test ini file
We don't want to use installed binaries when running tests.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Bryce Harrington [Wed, 27 May 2015 01:14:21 +0000 (18:14 -0700)]
compositor-x11: More verbose logging
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Murray Calavera [Tue, 9 Jun 2015 20:29:28 +0000 (20:29 +0000)]
text: cleanup text backend style
Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Derek Foreman [Thu, 11 Jun 2015 17:14:45 +0000 (12:14 -0500)]
gl-renderer: Don't print GL error for EGLGetDisplay()
EGLGetDisplay() doesn't generate a GL error, so we shouldn't print one.
I've also renamed the goto labels so it's a little clearer when to use them.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Jon Cruz [Mon, 15 Jun 2015 22:37:10 +0000 (15:37 -0700)]
Unified multiple definitions of container_of() macro.
Removed duplicate definitions of the container_of() macro and
refactored sources to use the single implementation.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Jon Cruz [Mon, 15 Jun 2015 22:37:09 +0000 (15:37 -0700)]
Moved the MIN() macro to the helper include.
Removed multiple definitions of the MIN() macro from existing
locations and unified with a single definition. Updated sources
to use the shared version.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Jon Cruz [Mon, 15 Jun 2015 22:37:08 +0000 (15:37 -0700)]
Moved helper macro to a discrete include file.
To help reduce code duplication and also 'kitchen-sink' includes
the ARRAY_LENGTH macro was moved to a stand-alone file and
referenced from the sources consuming it. Other macros will be
added in subsequent passes.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Jon Cruz [Mon, 15 Jun 2015 22:37:07 +0000 (15:37 -0700)]
Remove redundant #include path component.
Using the parent '../' path component in #include statements makes
the codebase more rigid and is redundant due to proper -I use.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Mon, 15 Jun 2015 22:21:47 +0000 (15:21 -0700)]
protocol/text: Update boilerplate from MIT X11 license to MIT Expat license
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Sat, 13 Jun 2015 00:22:19 +0000 (17:22 -0700)]
COPYING: Specify origin of the library
Bryce Harrington [Fri, 12 Jun 2015 17:17:39 +0000 (10:17 -0700)]
xwayland: Fix a couple whitespace errors
Bryce Harrington [Thu, 11 Jun 2015 23:22:34 +0000 (16:22 -0700)]
xwayland: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Thu, 11 Jun 2015 23:06:31 +0000 (16:06 -0700)]
wcap: Prefer quote form of include for config.h
Bryce Harrington [Thu, 11 Jun 2015 23:05:41 +0000 (16:05 -0700)]
wcap: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Thu, 11 Jun 2015 22:39:40 +0000 (15:39 -0700)]
tests: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Fri, 12 Jun 2015 20:53:35 +0000 (13:53 -0700)]
vaapi-recorder: Drop redundant license
This file was provided under both the Expat and X11 variants of the MIT
license. We don't need the latter, so remove it and leave just Expat.
And reformat the Expat license so it matches our standard boilerplate.
Bryce Harrington [Fri, 12 Jun 2015 20:52:15 +0000 (13:52 -0700)]
weston-egl-ext.h: Reformat license text
This file was already covered by the Expat variant of the MIT license.
Just reformat the text to match our standard boilerplate formatting.
Bryce Harrington [Fri, 12 Jun 2015 17:15:36 +0000 (10:15 -0700)]
libbacklight: Add missing boilerplate to header
Use identical license and copyright as the .c file.
Bryce Harrington [Thu, 11 Jun 2015 22:35:43 +0000 (15:35 -0700)]
src: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Thu, 11 Jun 2015 21:20:17 +0000 (14:20 -0700)]
shared: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Thu, 11 Jun 2015 20:24:24 +0000 (13:24 -0700)]
protocol: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Thu, 11 Jun 2015 20:24:08 +0000 (13:24 -0700)]
protocol: whitespace cleanup
Bryce Harrington [Thu, 11 Jun 2015 19:55:55 +0000 (12:55 -0700)]
*-shell: Update boilerplate from MIT X11 license to MIT Expat licenses
Bryce Harrington [Thu, 11 Jun 2015 05:48:59 +0000 (22:48 -0700)]
clients: Update boilerplate from MIT X11 license to MIT Expat licenses
Bryce Harrington [Wed, 10 Jun 2015 21:48:07 +0000 (14:48 -0700)]
data: Update boilerplate from MIT X11 license to MIT Expat license
Bryce Harrington [Wed, 10 Jun 2015 21:13:01 +0000 (14:13 -0700)]
COPYING: Drop special license callout for libbacklight.c
Weston's license is now identical to libbacklight.c, so just merge the
copyright statements.
Bryce Harrington [Wed, 10 Jun 2015 21:11:26 +0000 (14:11 -0700)]
COPYING: Update to MIT Expat License rather than MIT X License
MIT has released software under several slightly different licenses,
including the old 'X11 License' or 'MIT License'. Some code under this
license was in fact included in X.org's Xserver in the past. However,
X.org now prefers the MIT Expat License as the standard (which,
confusingly, is also referred to as the 'MIT License'). See
http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
When Wayland started, it was Kristian Høgsberg's intent to license it
compatibly with X.org. "I wanted Wayland to be usable (license-wise)
whereever X was usable." But, the text of the older X11 License was
taken for Wweston, rather than X11's current standard. This patch
corrects this by swapping in the intended text.
In practical terms, the most notable change is the dropping of the
no-advertising clause.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Giulio Camuffo [Thu, 11 Jun 2015 16:10:51 +0000 (19:10 +0300)]
compositor: remove the authenticate vfunc
It was introduced in
5fcd0aa58e243caf24f4deb080ac76e83d52213f and
then used in code that doesn't exist anymore.
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Murray Calavera [Tue, 9 Jun 2015 20:28:06 +0000 (20:28 +0000)]
don't attempt to start input method if path is empty
This allows a user to explicitly disable the input
method by setting path to blank;
Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Murray Calavera [Wed, 10 Jun 2015 21:16:02 +0000 (21:16 +0000)]
move text_backend initialization into the shell plugin
Whether a input method is used should be the responsibility
of the shell because some shells may not want to implement
an input method at all
Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Murray Calavera [Wed, 10 Jun 2015 21:15:30 +0000 (21:15 +0000)]
text: handle existing seats on init
a following patch will be moving text init call into shell
modules, which will be called much later than in current code
Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Murray Calavera [Sat, 6 Jun 2015 13:02:22 +0000 (13:02 +0000)]
Whitespace corrections
Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
Derek Foreman [Tue, 26 May 2015 17:00:49 +0000 (12:00 -0500)]
internal-screenshot-test: Fix endian problem
Use bit-shifts to properly generate pixel data.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Derek Foreman [Wed, 3 Jun 2015 20:53:29 +0000 (15:53 -0500)]
screenshooter: clean up recorder_binding a little
We already have a pointer to the compositor so change seat->compositor to ec
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Derek Foreman [Wed, 3 Jun 2015 20:53:27 +0000 (15:53 -0500)]
input: clean up update_keymap a little
We already have a pointer to the keyboard, so we can change all
seat->keyboard to keyboard.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Derek Foreman [Wed, 3 Jun 2015 20:53:23 +0000 (15:53 -0500)]
input: minor clean up in weston_seat_repick()
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Derek Foreman [Wed, 3 Jun 2015 20:53:26 +0000 (15:53 -0500)]
input: clean up notify_modifiers a little
We already have a pointer to the keyboard, so we can change all
seat->keyboard to keyboard.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Derek Foreman [Wed, 3 Jun 2015 20:53:28 +0000 (15:53 -0500)]
input: clean up seat_get_keyboard a little
We already have a pointer to the keyboard, so we can change all
seat->keyboard to keyboard
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Wed, 3 Jun 2015 07:11:24 +0000 (00:11 -0700)]
configure.ac: bump version to 1.8.90
Master is open for new features again
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Tue, 2 Jun 2015 23:23:53 +0000 (16:23 -0700)]
configure.ac: bump to version 1.8.0 for the official release
Derek Foreman [Thu, 28 May 2015 15:28:07 +0000 (10:28 -0500)]
internal-screenshot-test: ignore output image
In the future we should probably consider making all tests that output
images use an easily ignored template.
For now let's ignore this one individually.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 28 May 2015 06:55:08 +0000 (23:55 -0700)]
releasing: Convert tabs to spacing for better formatting
Bryce Harrington [Wed, 27 May 2015 22:33:27 +0000 (15:33 -0700)]
releasing: Document usage for the new public-doc script
Bryce Harrington [Wed, 27 May 2015 20:06:59 +0000 (13:06 -0700)]
releasing: Use version number variable
Bryce Harrington [Wed, 27 May 2015 20:03:42 +0000 (13:03 -0700)]
releasing: Add mention of the new register_release helper script
Bryce Harrington [Wed, 27 May 2015 06:22:19 +0000 (23:22 -0700)]
Revert "gitignore: Ignore generated header test files"
This reverts commit
8267056a6477e3517b974bc1d33d275365c43ec6.
Bryce Harrington [Wed, 27 May 2015 02:21:30 +0000 (19:21 -0700)]
configure.ac: bump to version 1.7.93 for the RC2 release
Bryce Harrington [Wed, 27 May 2015 02:20:37 +0000 (19:20 -0700)]
releasing: Add vars for release name and number
Bryce Harrington [Sat, 23 May 2015 01:28:27 +0000 (18:28 -0700)]
tests: Drop redundant debug output
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Derek Foreman [Tue, 26 May 2015 15:21:03 +0000 (10:21 -0500)]
internal-screenshot-test: Make distcheck pass
Add the output screenshot to CLEANFILES so it's properly removed on
distclean, and add the reference files and ini to EXTRA_DIST so
distcheck can find them.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Tested-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Wed, 27 May 2015 00:14:57 +0000 (17:14 -0700)]
gitignore: Ignore generated header test files
Pekka Paalanen [Tue, 26 May 2015 08:54:52 +0000 (11:54 +0300)]
desktop-shell: do not black out with startup "none"
Do not use a black blanket surface when the startup animation is
specified to be "none". This is the final fix needed to make the
screenshot test deterministic and independent of weston-desktop-shell.
Previously, the black surface would cover all outputs until
weston-desktop-shell signalled ready. Then, depending on the set
animation, either the black surface was immediately removed (none) or a
fade-in started (fade).
Now, when there is no black surface at all for "none", the compositor
will show garbage until weston-desktop-shell gets everything up. This
may be undesireable but works for tests. To have the old "none"
behaviour back, I would propose to add a new startup-animation value
"black" for it.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Derek Foreman [Tue, 14 Apr 2015 22:09:06 +0000 (17:09 -0500)]
desktop-shell: destroy surfaces in an idle handler after fade out
It's possible for more than one animation to be taking place on a view at
the same time. If one of those animations is the shell's fade out for
dying surfaces, its completion handler will trigger the surface destroy
signal, causing other animations on the animation list to remove themselves.
Since this removal occurs during the linked list walk, the compositor may
crash.
We move the actual surface destruction into an idle handler to avoid this.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Derek Foreman [Fri, 22 May 2015 16:47:20 +0000 (11:47 -0500)]
exposay: Don't crash if no pointer is present
If the compositor has never seen a mouse, exposay will crash because
the seat->pointer pointer is NULL.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Derek Foreman [Mon, 25 May 2015 20:19:38 +0000 (15:19 -0500)]
tests/internal-screenshot: Fix test so it doesn't expect shell surfaces
We no longer have a race with shell startup because we create our own
colored surface and check that it's properly drawn.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Derek Foreman [Fri, 22 May 2015 19:49:52 +0000 (14:49 -0500)]
tests: Set up the reference image environment variable
make check failed for out of tree builds because we didn't set up
WESTON_TEST_REFERENCE_PATH in weston-tests-env
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Tested-by: Bryce Harrington <bryce@osg.samsung.com>
Jonas Ådahl [Tue, 5 May 2015 07:35:17 +0000 (15:35 +0800)]
xdg-shell: Document the set_maximized and unsetmaximized requests
This patch changes the semantics (compared to the previous version of
this patch) of maximizing/unmaximizing an already maximized/unmaximized
surface to always result in a configure event. Doing it this way would
be more consistent with how the compositor works regarding other
configure events i.e. send many, letting the client ignore when needed
(for example during resize).
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Jonas Ådahl [Tue, 5 May 2015 07:35:16 +0000 (15:35 +0800)]
xdg-shell: Document responsibilities regarding ping events
Document that a compositor is free to ping in any way it wants, but a
client must always respond to any xdg_shell object it created.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Jonas Ådahl [Tue, 5 May 2015 07:35:15 +0000 (15:35 +0800)]
xdg-shell: Document error conditions when popup and surface getters
Document that a wl_surface can only be assigned either a xdg_popup or
xdg_surface once and that if the client still stries to do that an error
is raised.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Jonas Ådahl [Tue, 5 May 2015 07:35:14 +0000 (15:35 +0800)]
xdg-shell: Clarify the meaning of app ID and give example
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Derek Foreman [Wed, 20 May 2015 19:57:58 +0000 (14:57 -0500)]
gl-renderer: Make the error logging a little nicer
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 21 May 2015 22:03:50 +0000 (15:03 -0700)]
tests: cleanup whitespace
Bryce Harrington [Thu, 21 May 2015 18:53:54 +0000 (11:53 -0700)]
tests: Check that the PNG file's stride matches our internal assumption
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Tue, 19 May 2015 00:47:13 +0000 (17:47 -0700)]
tests: Fix code style on path/filename routines
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 14 May 2015 22:07:55 +0000 (15:07 -0700)]
tests: Add capture_screenshot_of_output()
Provides a convenience function for JFDI grabbing of a single
screenshot. Tests that are doing multiple screenshots or other
fanciness probably will bypass this routine and do things more manually,
but this'll provide a reference implementation. And hopefully there'll
be enough simple cases that this actually is useful.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 14 May 2015 21:36:18 +0000 (14:36 -0700)]
tests: Add check_surfaces_geometry()
Minor refactoring to simplify initial sanity checks of surfaces.
Conceivably useful for other basic checking.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 14 May 2015 21:18:56 +0000 (14:18 -0700)]
tests: Add load_surface_from_png()
Loads an image from disk via cairo, and copies data into a weston test
surface for internal use.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 14 May 2015 19:50:00 +0000 (12:50 -0700)]
tests: Add create_screenshot_surface()
Refactor out the screenshot shm buffer creation code.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 14 May 2015 19:21:13 +0000 (12:21 -0700)]
tests: Add write_surface_as_png() helper
And use the helper routine for generating the output filename.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Wed, 5 Nov 2014 00:39:38 +0000 (16:39 -0800)]
tests: Add internal test for the weston test screenshot capability
This also serves as a proof of concept of the screen capture
functionality and as a demo for snapshot-based rendering verification.
Implements screenshot saving clientside in the test itself.
This also demonstrates use of test-specific configuration files, in this
case to disable fadein animations and background images.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 23 Apr 2015 23:33:49 +0000 (16:33 -0700)]
tests: Handle screenshot done event in weston-test
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Tue, 5 May 2015 22:13:20 +0000 (15:13 -0700)]
tests: Add screenshot recording capability to weston-test
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=83981
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Tue, 16 Dec 2014 01:03:04 +0000 (17:03 -0800)]
protocol: Add test screenshot capability
This adds a capture_screenshot request which returns an image of the
screen in the client-supplied wl_buffer for the given display output.
A 'done' event is used to indicate when screenshotting has finished and
the wl_buffer is ready to be read.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Wed, 15 Apr 2015 22:31:11 +0000 (15:31 -0700)]
tests: Support --config to enable tests to override config defaults
Implements a simple mechanism to allow tests to customize the
configuration. For a given <name>-test.c just place a <name>.ini file
at the same location as the test itself. Alternately, you can generate
a <name>.ini in the same directory that the compiled test is placed
(i.e. the top builddir). If no configuration file is found, then no
configuration will be used (i.e. --no-config is specified.)
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Mon, 15 Dec 2014 23:51:25 +0000 (15:51 -0800)]
tests: Add surface checks
Introduce helper routines for testing surfaces against specific
conditions. These allow tests to validate screen captures as displaying
the correct rendering results.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Thu, 23 Apr 2015 01:23:01 +0000 (18:23 -0700)]
tests: Add an xmalloc helper function
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Tue, 9 Dec 2014 22:46:36 +0000 (14:46 -0800)]
tests: Add client helper routines for output and reference filenames
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Wed, 15 Apr 2015 22:10:31 +0000 (15:10 -0700)]
tests: Add error handling for system calls
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Daniel Stone [Thu, 21 May 2015 07:28:58 +0000 (08:28 +0100)]
compositor-drm: Clean trailing whitespace
Signed-off-by: Daniel Stone <daniels@collabora.com>
David FORT [Tue, 19 May 2015 07:57:37 +0000 (09:57 +0200)]
RDP compositor: enforce certificate and key
The RDP compositor is usable without certificates and key in a very limited
number of cases (local usage using xfreerdp), so let's force the presence of
keys and certificates.
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Dima Ryazanov [Wed, 20 May 2015 08:03:53 +0000 (01:03 -0700)]
compositor-wayland: Code cleanup
Don't do multi-assignments.
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Dima Ryazanov [Tue, 19 May 2015 06:14:16 +0000 (23:14 -0700)]
compositor-wayland: Handle window close events more gracefully
When a compositor window is closed, remove the output instead of just exiting.
(The "if (!input->output)" checks are kind of ugly - but I couldn't find
a better way to handle the output going away.)
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Bryce Harrington [Tue, 19 May 2015 22:32:09 +0000 (15:32 -0700)]
editor: warn when write fails
Fixes warning:
clients/editor.c: In function ‘data_source_send’:
clients/editor.c:573:7: warning: ignoring return value of ‘write’,
declared with attribute warn_unused_result [-Wunused-result]
write(fd, editor->selected_text, strlen(editor->selected_text) + 1);
^
Bryce Harrington [Tue, 19 May 2015 22:25:18 +0000 (15:25 -0700)]
compositor-drm: minor sp. fix
Bryce Harrington [Tue, 19 May 2015 20:24:37 +0000 (13:24 -0700)]
configure: Warn that cairo-gl and cairo-glesv2 are risky
Most distros do not ship with gl-enabled cairo, since doing so can
result in libgl being linked to each cairo-using client, even if they
don't actually use GL, and this can cause much larger per-client memory
footprint, and thus can become a resource issue.
Furthermore, while in theory this should work fine, we don't actively
test this configuration, and there could be random undiscovered bugs if
it's used. We keep the option available for people interested in
helping us chase down those issues, but warn everyone else away.
Pekka Paalanen [Tue, 19 May 2015 06:53:16 +0000 (09:53 +0300)]
compositor-drm: disable hardware cursors
With the recent universal plane and atomic modeset / nuclear pageflip
development in the kernel, cursor content updates on Intel are currently causing
an extra wait for vblank. This drops Weston's framerate to a fraction by
2 when cursor contents update. This combined with the damage tracking
bug in Weston which causes cursor content updates on every frame the
cursor moves makes using hw cursors really bad.
It is possible that the Intel DRM driver will get fixed and cursor
updates there revert to their old behaviour on the contemporary KMS API.
However, it is hardware dependant whether cursor updates can happen
immediately. Some other hardware, especially ARM-related, may not be
able to do immediate updates. Therefore it is better to just not even
try - we should rely only on the lowest common denominator behaviour
between hardware and drivers as there is no and will not be any way to
reliably detect it.
Note, that while having different drivers do different things (immediate
update vs. update that gets latched on the next vblank), we cannot
rearrange the contemporary KMS API calls such that it would always work
fine. Either some hardware would update the cursor too early, or other
hardware would update the cursor too late and perhaps cause the
framerate decimation.
Mark hardware cursors broken by default. This avoids using them, and
works around the immediate problem of framerate issues in Weston. This
follows the same reasoning why hardware overlay planes have been
disabled by default for a long time.
This disablement will be removed once the current code for hardware
planes and cursors is replaced with code using the atomic KMS API.
The Intel driver change that exposed this problem is
https://github.com/torvalds/linux/commit/
38f3ce3af5742eb5a3e9b01997f5ab85109c5762
which is first included in Linux 4.0-rc1.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Cc: nerdopolis <bluescreen_avenger@verizon.net>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-By: David FORT <contact@hardening-consulting.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Derek Foreman [Fri, 15 May 2015 17:12:40 +0000 (12:12 -0500)]
compositor-drm: pass ARGB fallback to gl create functions for XRGB formats
If the GL implementation doesn't provide an XRGB visual we may still be
able to proceed with an ARGB one. Since we're not changing the scanout
buffer format, and our current rendering loop always results in saturated
alpha in the frame buffer, it should be Just Fine(tm) - and probably better
than just exiting.
This is a workaround for https://bugs.freedesktop.org/show_bug.cgi?id=89689
Reviewed-By: Bryce Harrington <bryce@osg.samsung.com>
Tested-By: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-By: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Derek Foreman [Fri, 15 May 2015 17:12:39 +0000 (12:12 -0500)]
gl-renderer: Take a list of acceptable formats in create functions
Currently we pass either a single format or no formats to the gl renderer
create and output_create functions. We extend this to any number of
formats so we can allow fallback formats if we don't get our first pick.
Reviewed-By: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Bryce Harrington [Sat, 16 May 2015 01:51:19 +0000 (18:51 -0700)]
releasing: untabify
Bryce Harrington [Sat, 16 May 2015 01:50:04 +0000 (18:50 -0700)]
releasing: List some lib paths to set for local libinput
These always bite me, so while probably uncommon may as well document
them...
Bryce Harrington [Sat, 16 May 2015 01:03:45 +0000 (18:03 -0700)]
configure.ac: bump to version 1.7.92 for the RC1 release
Michael Vetter [Fri, 15 May 2015 15:17:47 +0000 (17:17 +0200)]
remove trailing whitespaces
Remove trailing whitespaces because they are not needed and jumping to
the end of al ine should do just that and not jump to the whitespace.
Derek Foreman [Fri, 1 May 2015 16:46:36 +0000 (11:46 -0500)]
launcher-util: Force all weston_launcher_open()s to use O_CLOEXEC
Really, there's pretty much no time we'd ever want O_CLOEXEC unset,
as it will likely result in leaking fds to processes that aren't
interested in them or shouldn't have them.
This also removes the (now unused) code from weston_logind_open() that
could drop O_CLOEXEC.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Derek Foreman [Thu, 30 Apr 2015 19:37:03 +0000 (14:37 -0500)]
logind: actually close fd in weston_launcher_close()
You had one job...
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: David Herrmann <dh.herrmann@gmail.com> [implicit from v1
comment]
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Dima Ryazanov [Mon, 4 May 2015 02:56:37 +0000 (19:56 -0700)]
xwm: Fix the window decoration hints.
Enable all hints by default. This fixes the "Maximize" button in apps that
don't set any hints - e.g., xclock or Firefox. (There's still a problem, though:
"decorate" is sometimes treated as a boolean, sometimes as a bitmask.)
Handle MWM_DECOR_ALL correctly. It looks like it's supposed to invert the values
of the rest of the flags.
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-By: Giulio Camuffo <giuliocamuffo@gmail.com>
Hardening [Mon, 11 May 2015 21:19:02 +0000 (22:19 +0100)]
RDP compositor: fixes for multiple connections, mstsc and FreeRDP master compilation
This patch fixes the problem reported on the mailing list
(http://lists.freedesktop.org/archives/wayland-devel/2015-January/019575.html).
All certificate and key paths were not copied when given to FreeRDP, so they
were freed when the peer was disconnecting. And so the next connection was failing.
All the initialization stuffs have been moved to the activate callback, as when it is
called the peer is ready for graphics.
We also differ the creation of the seat, so that a seat is initialized only the
peer really do the activation sequence. That helps when mstsc just connects to see
the certificate, ask if the certificate should be trusted, and then reconnects.
This patch also adds configuration settings for recent versions of FreeRDP that
comes with everything disabled. This makes remoteFx functionnal again.
The patch also handles the skipCompression flag for last FreeRDP versions, that
allows to skip bulk compression for surfaces that have been already compressed by
the remoteFx or NS codec.
This also fixes the compilation against FreeRDP master with callback that now return
BOOL.
Signed-off-by: Hardening <rdp.effort@gmail.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Jonas Ådahl [Wed, 17 Sep 2014 20:49:04 +0000 (22:49 +0200)]
protocol: Improve formatting of input method and text protocols
To make it more readable, add an empty line between each request and
event.
Also comes with a bonus indentation fix.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Giulio Camuffo [Sun, 10 May 2015 08:29:33 +0000 (11:29 +0300)]
man: use Xwayland instead of Xorg
Derek Foreman [Fri, 8 May 2015 22:08:41 +0000 (17:08 -0500)]
text-input: Replace model with input
commit
78d00e45cc renamed text_model to text_input
This cleans up remaining uses of the word "model"
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Derek Foreman [Fri, 8 May 2015 22:08:40 +0000 (17:08 -0500)]
text: Fix text-input for multi-seat
Multi-seat configurations currently break the text-backend, crashing
weston. This is an attempt to clean up any crashes and have somewhat
sensible input panel behavior with multi-seat.
Store a link to the manager that created a text_input, use this to
ensure that only a single panel gets popped up at a time, since there
is only one manager.
Replace deactivate_text_input with deactivate_input_method: multiple
input methods may focus the same text_input, so deactivating a text_input
is weird in multi-seat and confusing to perform.
In destroy_input_method_context set the context's input_method's context
pointer to NULL to prevent a dangling pointer.
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>