platform/upstream/weston.git
8 years agotoytoolkit: Return NULL when no outputs are present
Armin Krezović [Thu, 23 Jun 2016 09:59:31 +0000 (11:59 +0200)]
toytoolkit: Return NULL when no outputs are present

Currently, display_get_output returns a first member
of the linked list, which can never be NULL.

This is problematic, as the function would return a
dangling pointer and NULL pointer checks wouldn't
work where needed and some of the invalid members
would get accessed that way, resulting in a crash.

Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
8 years agodesktop-shell: Return NULL when no outputs are present
Armin Krezović [Thu, 23 Jun 2016 09:59:30 +0000 (11:59 +0200)]
desktop-shell: Return NULL when no outputs are present

Currently, get_default_output returns a first member
of the linked list, which can never be NULL.

This is problematic, as the function would return a
dangling pointer and NULL pointer checks wouldn't
work where needed and some of the invalid members
would get accessed that way, resulting in a crash.

Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
8 years agocompositor-headless: Support starting with zero outputs
Armin Krezović [Thu, 23 Jun 2016 09:59:29 +0000 (11:59 +0200)]
compositor-headless: Support starting with zero outputs

This patch adds a new command line option which can be
used to tell headless backend not to create any
virtual outputs.

This will be used for output hotplug emulation, where
weston will start with no outputs available, and the
virtual output will be created at runtime.

v2:

- Use bool instead of int for the indicator flag
- Move final newspace to a separate line in command
  line options

Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
8 years agocompositor-x11: fix title overflow in x11_backend_create_output
Benoit Gschwind [Sun, 5 Jun 2016 17:01:11 +0000 (19:01 +0200)]
compositor-x11: fix title overflow in x11_backend_create_output

sprintf can overflow the fixed length title which is char[32]. This
patch change title to dynamically allocated char array using asprintf or
strdup. If one of them fail we leave returning NULL to indicate the
failure.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
8 years agotests: print the command line to log
Pekka Paalanen [Fri, 13 May 2016 13:29:30 +0000 (16:29 +0300)]
tests: print the command line to log

weston-tests-env is a beast to handle, when you would like to start
weston manually for a test you wan to start inside gdb. This patch
causes the full command line to be printed to the automake test logs, so
you can copy it from there and run it by hand.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agomain: log the command line
Pekka Paalanen [Thu, 11 Feb 2016 12:42:21 +0000 (14:42 +0200)]
main: log the command line

Write the command line to the log to aid debugging. It needs to be
copied before parsing, because parsing mutates argv.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agotests: fix the cursor race in internal-screenshot
Pekka Paalanen [Fri, 10 Jun 2016 07:50:04 +0000 (10:50 +0300)]
tests: fix the cursor race in internal-screenshot

This fix also depends on "compositor-headless: do not create a seat".

If we lose the race against weston-desktop-shell setting cursors, which
is very rare, we get a cursor image in the screenshot, causing the test
to fail. This is now fixed by moving the (remaining) cursor out of the
way.

Arguably we should have better solutions for this, but that is another
story. This is a stop-gap measure we can copy also in new
screenshooting tests.

v2: Remove the example code for how to trigger the race, and rewrite the
big comment.

Cc: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoRename src/ to libweston/
Pekka Paalanen [Fri, 3 Jun 2016 14:12:10 +0000 (17:12 +0300)]
Rename src/ to libweston/

This clarifies what is supposed to be the libweston code.

v2: screen-share.c is already in compositor/ instead.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]

8 years agoMove weston source to compositor/
Pekka Paalanen [Fri, 3 Jun 2016 13:45:21 +0000 (16:45 +0300)]
Move weston source to compositor/

This is the start of separating weston-the-compositor source files from
libweston source files.

This is moving all the files related to the 'weston' binary. Also the
CMS and systemd plugins are moved.

xwayland plugin is not moved, because it will be turned into a
libweston feature.

To avoid breaking the build, #includes for weston.h are fixed to use
compositor/weston.h. This serves as a reminder that such files may need
further attention: moving to the right directory, or maybe using the
proper -I flags instead.

v2: Move also screen-share.c, and add a note about weston-launch.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]

8 years agocompositor-headless: do not create a seat
Pekka Paalanen [Thu, 16 Jun 2016 09:07:12 +0000 (12:07 +0300)]
compositor-headless: do not create a seat

The headless backend was creating a seat, but nothing would ever happen
on that seat, except the pointer cursor would show up.

Tests do not seem to use this seat either. weston-test.so plugin creates
its own seat to be controlled by the tests.

This is part of the series to get rid of cursors for screenshot-based
tests where they are not wanted.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agotests: check kbd init in the plugin
Pekka Paalanen [Thu, 16 Jun 2016 09:04:53 +0000 (12:04 +0300)]
tests: check kbd init in the plugin

Check that the keyboard init in weston-test.so plugin succeeds.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agocompositor-drm: support RGB565 with pixman renderer
Tomi Valkeinen [Mon, 20 Jun 2016 11:18:45 +0000 (14:18 +0300)]
compositor-drm: support RGB565 with pixman renderer

At the moment only XRGB8888 is supported when using pixman renderer.
This patch adds support also for RGB565.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
8 years agoBuild: Silence shift-negative-value warning
Daniel Stone [Sat, 18 Jun 2016 06:04:30 +0000 (16:04 +1000)]
Build: Silence shift-negative-value warning

Pixman's headers include a representation of -1 in fixed-point, which is
-1 << 16. This trips a GCC warning about shifting negative values. As we
can't do much about it, just silence the warning.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoscreen-share: Use wet_get_config()
Daniel Stone [Sat, 18 Jun 2016 06:02:38 +0000 (16:02 +1000)]
screen-share: Use wet_get_config()

compositor->config was removed a while ago.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agoclients/dmabuf-intel: use three buffers
Pekka Paalanen [Fri, 10 Jun 2016 10:13:01 +0000 (13:13 +0300)]
clients/dmabuf-intel: use three buffers

Use three buffers like simple-dmabuf-v4l instead of just two.

This is required, because when a frame callback arrives, the just
committed buffer is only on its way to the screen, while the previous
buffer is still being scanned out. It will take for the page flip to
complete, before the previous buffer is release. However, we want to be
able to repaint already at the frame callback, so three buffers can be
necessary.

This patch fixes weston-simple-dmabuf-intel to not abort with "Both
buffers busy at redraw()." when hardware overlays are used and the
surface gets directly scanned out.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
8 years agomain: report presentation clock resolution
Pekka Paalanen [Mon, 18 Apr 2016 12:53:38 +0000 (15:53 +0300)]
main: report presentation clock resolution

For debugging weird timing issues. If your clock resolution is
unexpectedly e.g. 10 ms, you can be sure you will have strange timing
issues. This is almost certainly caused by kernel misconfiguration.

We rely on clock_getres() being available by the same thing that gets us
clock_gettime(), so that no new configure.ac check is needed.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-By: David Fort <contact@hardening-consulting.com>
8 years agocompositor-fbdev: drop EGL support
Pekka Paalanen [Wed, 8 Jun 2016 14:39:37 +0000 (17:39 +0300)]
compositor-fbdev: drop EGL support

EGL code was added to the fbdev backend in
4aa756dc7a8d3cf3b4c6f018c3e2a053fff424b0 in 2013, apparently for running
Weston on libhybris with Android hardware drivers.

This actually had nothing to do with the fbdev backend, really. Fbdev
was just a convenient platform to plug in the EGL init code and load
GL-renderer. Fbdev itself was not used at all in this case.

Fbdev should be forgotten and die, as we have better interfaces for
accelerated rendering and for controlling displays. It may be a bit too
harsh to remove the whole fbdev backend just yet, but let us at least
simplify it this much.

Fbdev+EGL has been the unholy union used by proprietary driver stacks of
hardware vendors in the non-PC world as a quick and dirty way to get
something out on the screen. In these cases it is actually the EGL
implementation that does everything internally, fbdev is not needed.
Fbdev was never meant for the sort anyway.

If anyone still needs this use case, I recommend sticking with a
outdated Weston to match your outdated platform. Or if you really
insist, write a new backend that does not pretend to use fbdev and just
initializes EGL and GL-renderer.

Cc: Adrian Negreanu <groleo@gmail.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoterminal: Document console codes less cryptically
Bryce Harrington [Thu, 16 Jun 2016 01:36:03 +0000 (18:36 -0700)]
terminal: Document console codes less cryptically

C.f. http://man7.org/linux/man-pages/man4/console_codes.4.html

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoMake config.h inclusion consistent
Bryce Harrington [Thu, 16 Jun 2016 01:13:07 +0000 (18:13 -0700)]
Make config.h inclusion consistent

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoweston-simple-im: Make capitalization consistent in error messages
Bryce Harrington [Thu, 16 Jun 2016 00:59:17 +0000 (17:59 -0700)]
weston-simple-im: Make capitalization consistent in error messages

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
8 years agoconfigure: remove the result line for BCM headers
Pekka Paalanen [Wed, 15 Jun 2016 07:28:05 +0000 (10:28 +0300)]
configure: remove the result line for BCM headers

This was a left-over from ca52b31d3f867d9a14b2a3b9fcd4f21aa5fb0a3d.

Reported-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoivi-shell: remove ivi_layout_get_weston_view
Ucan, Emre (ADITG/SW1) [Tue, 7 Jun 2016 09:40:17 +0000 (09:40 +0000)]
ivi-shell: remove ivi_layout_get_weston_view

A surface could have more than one views.
Therefore, it is not possible to map a surface to
a specific view. The implementation of the API
iterates the list of views of the surface, and
returns the first found view.

It is not necessary to have this API to found
a view of the surface. Therefore, I removed the API.

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: Correct output base make name
Yong Bakos [Sun, 5 Jun 2016 16:01:17 +0000 (11:01 -0500)]
compositor-wayland: Correct output base make name

Change the output make value from "waywayland" to "wayland".

References: 90bc88c710b34f46ef89e1c5765e5f63f8e02847

Signed-off-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agodesktop-shell: resize background and panel surfaces on output resize v4
David Fort [Thu, 9 Jun 2016 15:55:52 +0000 (17:55 +0200)]
desktop-shell: resize background and panel surfaces on output resize v4

When an output is resized (permanent mode switch), we should also notify the
shell client so that the panel and background fits to the new screen dimensions.

Signed-off-by: David Fort <contact@hardening-consulting.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agotests: add wp_viewporter tests
Pekka Paalanen [Tue, 19 Apr 2016 14:20:42 +0000 (17:20 +0300)]
tests: add wp_viewporter tests

These tests poke the viewporter interface to ensure proper behaviour
from client perspective, without testing the rendering result.

These cases are covered:
- create viewport twice
- source rectangle invalid value errors, and unset
- destination size invalid value errors, and unset
- source causing non-integer destination size
- source inside/outside of buffer with transform, scale
- source outside NULL buffer, then getting real buffer
- source outside NULL buffer with inherited NULL
- set_source, set_destination, and destroy after the wl_surface is
  destroyed

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: fix wp_viewport.set_source errors
Pekka Paalanen [Tue, 26 Apr 2016 11:42:11 +0000 (14:42 +0300)]
compositor: fix wp_viewport.set_source errors

The revised wp_viewport spec requires that unset has to have all of x, y,
width and height -1 to be recognized.

Check for negative x and y and raise the required error. The error event
now mentions the wl_surface, too.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: check viewport dst size validity
Pekka Paalanen [Tue, 26 Apr 2016 11:28:28 +0000 (14:28 +0300)]
compositor: check viewport dst size validity

wp_viewporter requires the destination size to be always in integers,
even when it is implicit from source rectangle. Emit appropriate
protocol errors.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: check viewport source rect validity
Pekka Paalanen [Tue, 26 Apr 2016 10:46:38 +0000 (13:46 +0300)]
compositor: check viewport source rect validity

wp_viewporter spec requires protocol errors when the viewport is outside
the buffer area.

The viewport is checked in wl_surface.commit handler as the error needs
to be delivered as a reply to the commit, not at state apply time later
(e.g. with synchronized sub-surfaces, or at render time).

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: fix wp_viewport use after free
Pekka Paalanen [Fri, 22 Apr 2016 11:14:38 +0000 (14:14 +0300)]
compositor: fix wp_viewport use after free

If a client destroyed the wl_surface before the wp_viewport, Weston core
would access freed memory, because the weston_surface pointer stored in
the wp_viewport wl_resource's user data was stale.

Fix this by setting the user data to NULL on wl_surface destruction. It
is specifically about wl_surface and not weston_surface destruction,
because this is about client-visible behaviour. Something internal might
keep weston_surface alive past the wl_surface.

Add checks to all wp_viewport request handlers.

At the same time, implement the new error conditions in wp_viewport:
calling any request except destroy must result in a protocol error.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoprotocol: remove scaler.xml
Pekka Paalanen [Fri, 15 Apr 2016 14:02:39 +0000 (17:02 +0300)]
protocol: remove scaler.xml

The stable version of the scaling and cropping extension is found in
wayland-protocols as viewporter.xml.

Remove scaler.xml as nothing uses it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoclients/simple-damage: migrate to wp_viewporter
Pekka Paalanen [Fri, 15 Apr 2016 14:00:21 +0000 (17:00 +0300)]
clients/simple-damage: migrate to wp_viewporter

Use wp_viewporter instead of wl_scaler and rename things as appropriate.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoclients/scaler: migrate to wp_viewporter
Pekka Paalanen [Fri, 15 Apr 2016 13:53:41 +0000 (16:53 +0300)]
clients/scaler: migrate to wp_viewporter

Use wp_viewporter instead of wl_scaler and rename things accordingly.

Since interface versions were reset, there is no need to check the
interface version anymore, and the wl_scaler.set request disappeared.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: rename scaler to viewport(er)
Pekka Paalanen [Fri, 15 Apr 2016 13:42:49 +0000 (16:42 +0300)]
compositor: rename scaler to viewport(er)

Since the interface is now called wp_viewport, rename functions from
"scaler" to "viewporter" as well.

scaler_surface_to_buffer() is renamed to viewport_surface_to_buffer()
because it is more about viewport than viewporter.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: migrate to stable viewporter.xml
Pekka Paalanen [Fri, 15 Apr 2016 11:47:08 +0000 (14:47 +0300)]
compositor: migrate to stable viewporter.xml

Migrate from wl_scaler to wp_viewporter extension. The viewporter.xml
file is provided by wayland-protocols.

This stops Weston from advertising wl_scaler, and advertises
wp_viewporter instead.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
[Pekka: fix wayland-protocols requirement]

8 years agocompositor: recompute output position on mode switch
David Fort [Fri, 27 May 2016 21:22:57 +0000 (23:22 +0200)]
compositor: recompute output position on mode switch

When an output permanently changes its resolution, the output on the right
should be moved accordingly. We also add an event for output resizing so that
plugins can react when an output is resized.

Signed-off-by: David Fort <contact@hardening-consulting.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agordp: don't release the seat until it is safe v2
David Fort [Fri, 27 May 2016 21:22:56 +0000 (23:22 +0200)]
rdp: don't release the seat until it is safe v2

Releasing a seat is not safe, so let's just announce it without keyboard
and mouse until this is fixed. Without this patch we just can't reconnect on
the RDP compositor as it crashes.

v2: fixed the leak of the xkb_keymap

Signed-off-by: David Fort <contact@hardening-consulting.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Sam Spilsbury <smspillaz@gmail.com>
8 years agomain: remove unused argument from backend loaders
Pekka Paalanen [Fri, 3 Jun 2016 12:28:40 +0000 (15:28 +0300)]
main: remove unused argument from backend loaders

There is no need to pass the backend name string to these functions
anymore.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
8 years agolibweston: use enum to choose the backend
Pekka Paalanen [Fri, 3 Jun 2016 12:23:46 +0000 (15:23 +0300)]
libweston: use enum to choose the backend

Change weston_compositor_load_backend() to use an enum to choose the
backend.

The caller no longer needs to know what the backend DSO is called in the
file system. Custom backends cannot be laoded anymore, as the loading
path is now always either LIBWESTON_MODULEDIR, or formed from
$WESTON_BUILD_DIR.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
8 years agolibweston: remove unused backend_init() arguments
Pekka Paalanen [Fri, 3 Jun 2016 11:56:18 +0000 (14:56 +0300)]
libweston: remove unused backend_init() arguments

Backends do not have access to command line elements nor weston_config
anymore. They use the backend-specific config APIs now.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
8 years agocompositor,main: use weston_compositor_load_backend()
Pekka Paalanen [Fri, 3 Jun 2016 11:49:54 +0000 (14:49 +0300)]
compositor,main: use weston_compositor_load_backend()

Move load_backend_new() from main.c to weston_compositor_load_backend()
in compositor.c.

This makes libweston load its own backends without leaking the details
to the user.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
8 years agomain: remove load_backend_old()
Pekka Paalanen [Fri, 3 Jun 2016 10:56:17 +0000 (13:56 +0300)]
main: remove load_backend_old()

Not used anymore, all backends are loaded through the new method.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
8 years agoCreate a libweston-0.so
Giulio Camuffo [Thu, 2 Jun 2016 18:48:15 +0000 (21:48 +0300)]
Create a libweston-0.so

This commit also adds a libweston-0.pc file. The -0 is the abi version
introduced in the previous patch.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoSplit the modules and include files between weston and libweston
Giulio Camuffo [Thu, 2 Jun 2016 18:48:14 +0000 (21:48 +0300)]
Split the modules and include files between weston and libweston

The backends are now installed in lib/libweston-0, and the include
files that will be used by libweston in include/libweston-0. The other
modules and weston-specific include files are kept in the old paths.
A new wet_load_module() is added to load plugins in the old path,
which is not part of libweston, but weston only and defined in main.c.
To allow that to be used by out of tree weston plugins, the function
is declared in a new weston.h, installed in include/weston.

The -0 in the paths is the abi version of libweston, and it will also
be used by the libweston .so. If the abi changes the number will need
to be increased.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoallow compositors to define the logging behavior
Giulio Camuffo [Thu, 2 Jun 2016 18:48:13 +0000 (21:48 +0300)]
allow compositors to define the logging behavior

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agolibinput: don't use weston_config when configuring input devices
Giulio Camuffo [Thu, 2 Jun 2016 18:48:12 +0000 (21:48 +0300)]
libinput: don't use weston_config when configuring input devices

Instead add callbacks to the drm and fbdev backends and pass that to
the input backens so that when a new device needs to be configured
that is called and the compositor can configure it.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor: remove the weston_config field in weston_compositor
Giulio Camuffo [Thu, 2 Jun 2016 18:48:11 +0000 (21:48 +0300)]
compositor: remove the weston_config field in weston_compositor

The config can now be retrieved with a new function defined in weston.h,
wet_get_config(weston_compositor*).

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agoMove the functions launching clients to main.c
Giulio Camuffo [Thu, 2 Jun 2016 18:48:10 +0000 (21:48 +0300)]
Move the functions launching clients to main.c

They belong in the compositor rather than libweston since they
set signals handlers, and a library should not do that behind its
user's back. Besides, they were using functions in main.c already
so they were not usable by other compositors.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoMove part of screenshooter.c to weston-screenshooter.c
Giulio Camuffo [Thu, 2 Jun 2016 18:48:09 +0000 (21:48 +0300)]
Move part of screenshooter.c to weston-screenshooter.c

This patch splits screensooter.c so that the code implementing
the private screenshooter protocol and launching the client is
moved to a weston specific file, leaving only the code that can
be shared between compositors in screenshooter.c.
Two exported functions are added in screenshooter.c to start and
stop the recorder.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoRename weston_compositor_xkb_init to weston_compositor_set_xkb_rule_names
Giulio Camuffo [Thu, 2 Jun 2016 18:48:08 +0000 (21:48 +0300)]
Rename weston_compositor_xkb_init to weston_compositor_set_xkb_rule_names

weston_compositor_xkb_destroy() is called automatically so having only
weston_compositor_xkb_init() to be called by the user was a bit weird.
So rename it so that it makes more sense.
Also export it, since libweston compositors need to call it.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoRemove Raspberry Pi backend and renderer
Pekka Paalanen [Wed, 1 Jun 2016 08:22:51 +0000 (11:22 +0300)]
Remove Raspberry Pi backend and renderer

This patch completely removes the Raspberry Pi backend and the renderer.

The backend and the renderer were written to use the proprietary
DispmanX API available only on the Raspberry Pi, to demonstrate what the
tiny computer is capable of graphics wise. They were also used to
demonstrate how Wayland and Weston in particular could leverage hardware
compositing capabilities that are not OpenGL. The backend was first
added in e8de35c922871bc5b15fbf0436efa233a6db8e41, in 2012.

Since then, the major point has been proven. Over time, support for the
rpi-backend diminished, it started to deteriorate and hinder Weston
development. On May 11, I tried to ask if anyone actually cared about
the rpi-backend, but did not get any votes for keeping it:
https://lists.freedesktop.org/archives/wayland-devel/2016-May/028764.html

The rpi-backend is a good example of how using an API that is only
available for specific hardware, even more so as it is only available
with a proprietary driver stack, is not maintainable in the long run.
Most developers working on Weston either just cannot, or cannot bother
to test things also on the RPi. Breakage creeps in without anyone
noticing. If someone actually notices it, fixing it will require a very
specific environment to be able to test. Also the quality of the
proprietary implementation fluctuated. There are reports that RPi
firmware updates randomly broke Weston, and that nowadays it is very
hard to find a RPi firmware version that you could expect to work with
Weston if Weston itself was not broken. We are not even sure what is
broken nowadays.

This removal does not leave Raspberry Pi users cold (for long), though.
There is serious work going on in implementing a FOSS driver stack for
Raspberry Pi, including modern kernel DRM drivers and Mesa drivers. It
might not be fully there yet, but the plan is to be able to use the
standard DRM-backend of Weston on the RPis. See:
http://dri.freedesktop.org/wiki/VC4/

The rpi-backend had its moments. Now, it needs to go. Good riddance!

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Bryce Harrington <bryce@osg.samsung.com>
Acked-by: Jonas Ådahl <jadahl@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
8 years agoweston-launch: Handle invalid command line options
Tom Hochstein [Sat, 7 May 2016 11:57:40 +0000 (08:57 -0300)]
weston-launch: Handle invalid command line options

Exit the program if an unrecognized command line option is found.

Signed-off-by; Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoreleasing: Copyedit post-release branching directions
Bryce Harrington [Thu, 2 Jun 2016 00:17:57 +0000 (17:17 -0700)]
releasing: Copyedit post-release branching directions

8 years agoivi-shell: add API for weston_surface -> ivi_layout_surface
Pekka Paalanen [Tue, 12 Apr 2016 13:06:58 +0000 (16:06 +0300)]
ivi-shell: add API for weston_surface -> ivi_layout_surface

Add ivi-layout API for getting an ivi_layout_surface from a
weston_surface if it exists. This can be used by controllers that hook
up to core Weston callbacks and get handed a weston_surface, but need to
use ivi-layout API to manipulate it.

The only ways ivi-layout itself would be able to go from weston_surface
to ivi_layout_surface are either searching through the list of all
ivi_layout_surfaces or adding a dummy destroy listener to the
weston_surface. Therefore the implementation is delegated to
ivi-shell.c.

Ivi-shell.c can easily look up the ivi_shell_surface for a
weston_surface, and that will map 1:1 to an ivi_layout_surface.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
8 years agoconfigure.ac: bump version to 1.11.90 for open development
Pekka Paalanen [Wed, 1 Jun 2016 08:05:46 +0000 (11:05 +0300)]
configure.ac: bump version to 1.11.90 for open development

As announced in 1.11.0 release notes, master is open again.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agoconfigure.ac: bump to version 1.11.0 for the official release
Bryce Harrington [Wed, 1 Jun 2016 00:10:40 +0000 (17:10 -0700)]
configure.ac: bump to version 1.11.0 for the official release

8 years agoreleasing: Update script name
Bryce Harrington [Tue, 31 May 2016 22:52:33 +0000 (15:52 -0700)]
releasing: Update script name

8 years agoconfigure.ac: bump to version 1.10.93 for the RC1 release
Bryce Harrington [Tue, 24 May 2016 19:35:48 +0000 (12:35 -0700)]
configure.ac: bump to version 1.10.93 for the RC1 release

8 years agoreleasing: Update release docs in regards to the wayland versioned dependency
Bryce Harrington [Tue, 24 May 2016 19:34:44 +0000 (12:34 -0700)]
releasing: Update release docs in regards to the wayland versioned dependency

8 years agobuild: Define wayland prereq version
Bryce Harrington [Wed, 11 May 2016 20:18:59 +0000 (13:18 -0700)]
build: Define wayland prereq version

Establishes a single variable for defining the libwayland version
requirements, where we have versioned checks.  Enforces the same version
dependency between libwayland-client and libwayland-server.  Developers
typically only test the greater version of the two, so if they're
different it masks cases that don't get tested adequately.  So this sets
wayland-client's required version to 1.10, same as for the server.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agodesktop-shell: Don’t reconfigure an already fullscreen surface
Emmanuel Gil Peyrot [Tue, 10 May 2016 01:22:43 +0000 (03:22 +0200)]
desktop-shell: Don’t reconfigure an already fullscreen surface

When we receive an wl_shell_surface::set_fullscreen request for a
surface that was already fullscreen, don’t do anything if the
parameters are the same as the initial request.

This prevents bogus or malicious clients from being able to always stay
on front by flooding the compositor with set_fullscreen requests after
the user has put them in the background with a mod+tab.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoivi: Fix spellings in comments
Bryce Harrington [Fri, 20 May 2016 00:35:02 +0000 (17:35 -0700)]
ivi: Fix spellings in comments

8 years agozunitc: use platform-independent macros for integer formatting
Emmanuel Gil Peyrot [Wed, 18 May 2016 16:18:18 +0000 (17:18 +0100)]
zunitc: use platform-independent macros for integer formatting

Fixes warnings and potential issues on 32-bit platforms, tested only on
ARM but I’d expect the same issue on i686.

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: use generated constant instead of hardcoded value
FORT David [Tue, 26 Apr 2016 21:34:06 +0000 (23:34 +0200)]
compositor: use generated constant instead of hardcoded value

Use SINCE macros instead of the hardcoded version value.

Signed-off-by: David Fort <contact@hardening-consulting.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agordp: Fix the ContextNew callback with recent FreeRDP versions
FORT David [Tue, 26 Apr 2016 21:34:05 +0000 (23:34 +0200)]
rdp: Fix the ContextNew callback with recent FreeRDP versions

Since a quite long time FreeRDP expect the ContextNew callback to return TRUE
when it succeeds. Without this we have some arbitrary failures (most probably
when eax is 0 at the end of the function).

Signed-off-by: David Fort <contact@hardening-consulting.com>
8 years agordp: allow to compile against FreeRDP 2.0
FORT David [Sun, 1 May 2016 21:32:07 +0000 (23:32 +0200)]
rdp: allow to compile against FreeRDP 2.0

FreeRDP 2.0 is about to be released, this allows to compile against this version.
The detection is adjusted to prefer FreeRDP 2 against version 1.x.

Signed-off-by: David Fort <contact@hardening-consulting.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoconfigure.ac: bump to version 1.10.92 for the beta release
Bryce Harrington [Wed, 18 May 2016 05:10:30 +0000 (22:10 -0700)]
configure.ac: bump to version 1.10.92 for the beta release

8 years agocompositor-drm: Prevent a crash in the pixman renderer
Emmanuel Gil Peyrot [Mon, 2 May 2016 21:40:13 +0000 (22:40 +0100)]
compositor-drm: Prevent a crash in the pixman renderer

When pixman is used and no connector could be found (or any other
error), drm_backend_create() tried to destroy a gbm_device that would
only be created in init_egl(), resulting in a segfault.

Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-drm: Write a name in the mode generated from a modeline
Emmanuel Gil Peyrot [Mon, 2 May 2016 21:40:11 +0000 (22:40 +0100)]
compositor-drm: Write a name in the mode generated from a modeline

The current behaviour leaves the name empty, making it somewhat harder
to determine the characteristics of this mode from a debugger.

Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: wrap long line (ybakos)]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-drm: Remove unused output reference in drm_fb
Emmanuel Gil Peyrot [Mon, 2 May 2016 21:40:10 +0000 (22:40 +0100)]
compositor-drm: Remove unused output reference in drm_fb

Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor: surface and view output comment fixes
Pekka Paalanen [Wed, 30 Mar 2016 11:33:33 +0000 (14:33 +0300)]
compositor: surface and view output comment fixes

weston_surface::output and weston_view::output as used for different
purposes. Only the surface output is used for frame callbacks.

The uses of the view output are much more vague and hard to describe.

Also fix a comment mistake in weston_surface_assign_output().

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
[Pekka: more verbose on the compositor.h comments]

8 years agocompositor: fix comments about weston_compositor::surface_list
Pekka Paalanen [Wed, 30 Mar 2016 11:08:24 +0000 (14:08 +0300)]
compositor: fix comments about weston_compositor::surface_list

a7af70436b7dccfacd736626d6719b3e751fd985 converted the surface list into
a view list. There is no weston_compositor::surface_list anymore.

It looks like weston_surface::output's comment about surface list does
not apply to view list. Still, many places assume weston_surface::output
is not NULL when processing "visible" surfaces, e.g. those reachable via
the view list.

The comment on weston_view::output is updated. It seems there is no
longer any requirement for it to be NULL if the view is not in
view_list.

weston_view::link is documented to be in weston_compositor::view_list,
and weston_compositor::view_list is documented to contain weston_views.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
[Pekka: removed also the other "Must be NULL" comment.]

8 years agoeventdemo: use %u for uint32_t printing
Pekka Paalanen [Fri, 13 May 2016 11:07:20 +0000 (14:07 +0300)]
eventdemo: use %u for uint32_t printing

I was confused why timestamp was printed negative. This fixes it, and
others while at it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Benoit Gschwind <gschwind@gnu-log.net>
8 years agoeventdemo: do not print axis events if not requested
Pekka Paalanen [Tue, 12 Apr 2016 10:53:55 +0000 (13:53 +0300)]
eventdemo: do not print axis events if not requested

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Benoit Gschwind <gschwind@gnu-log.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
8 years agoeventdemo: use zalloc
Pekka Paalanen [Tue, 12 Apr 2016 10:49:53 +0000 (13:49 +0300)]
eventdemo: use zalloc

Zero-initialize the struct, just in case.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Benoit Gschwind <gschwind@gnu-log.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
8 years agoeventdemo: do not print pointer frames alone
Pekka Paalanen [Tue, 12 Apr 2016 10:33:09 +0000 (13:33 +0300)]
eventdemo: do not print pointer frames alone

Print pointer frames only if any pointer related events are printed
first.

This avoids flooding the output with "pointer frame" just because of
motion. You can test this with e.g.
  $ ./weston-eventdemo --log-button

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: Benoit Gschwind <gschwind@gnu-log.net>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
8 years agodata: Some client icons
Bryce Harrington [Fri, 25 Mar 2016 00:57:39 +0000 (17:57 -0700)]
data: Some client icons

This adds an alternate weston terminal icon and icons for the flower and
editor clients.  The original Inkscape SVG file is included.

Example screenshot:
  http://www.bryceharrington.org/Files/weston-icons.png

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
8 years agoivi-layout: clarify get_layers_under_surface doc
Pekka Paalanen [Tue, 12 Apr 2016 14:16:26 +0000 (17:16 +0300)]
ivi-layout: clarify get_layers_under_surface doc

This is derived from the implementation. I was not sure whether "under"
referred to object relationships or region intersections.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
8 years agoivi-shell-user-interface: ignore all but first seat
Pekka Paalanen [Mon, 9 May 2016 14:13:50 +0000 (17:13 +0300)]
ivi-shell-user-interface: ignore all but first seat

This client should support binding to multiple seats, but as it does
not, make a quick and dirty fix to ignore all seats beyond the first
one.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
8 years agomain: let load_wayland_backend() clean up on error
Benoit Gschwind [Tue, 10 May 2016 20:47:57 +0000 (22:47 +0200)]
main: let load_wayland_backend() clean up on error

weston_wayland_backend_config_release() does not bother reinitializing
the structure, it simply frees what is there. This leads to a structure
containing garbage, which might be a surprise.

Require, that if load_wayland_backend_config() fails, the caller must
call weston_wayland_backend_config_release() regardless.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: rewrote commit message]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: rename new_config arg of weston_wayland_backend_config_add_new_output
Benoit Gschwind [Tue, 10 May 2016 20:47:56 +0000 (22:47 +0200)]
main: rename new_config arg of weston_wayland_backend_config_add_new_output

Rename new_config to config to follow legacy naming scheme.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: rename new_config arg of weston_wayland_backend_config_release
Benoit Gschwind [Tue, 10 May 2016 20:47:55 +0000 (22:47 +0200)]
main: rename new_config arg of weston_wayland_backend_config_release

Rename new_config to config to follow legacy naming scheme.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: rename wayland_backend_config_release function
Benoit Gschwind [Tue, 10 May 2016 20:47:53 +0000 (22:47 +0200)]
main: rename wayland_backend_config_release function

Rename the wayland_backend_config_release function to
weston_wayland_backend_config_release to follow legacy naming scheme.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: rebased]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: rename wayland_backend_config_add_new_output function
Benoit Gschwind [Tue, 10 May 2016 20:47:52 +0000 (22:47 +0200)]
main: rename wayland_backend_config_add_new_output function

Rename wayland_backend_config_add_new_output to
weston_wayland_backend_config_add_new_output to follow the legacy naming
scheme.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: rebased]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: replace and remove new_config in load_wayland_backend_config
Benoit Gschwind [Tue, 10 May 2016 20:47:51 +0000 (22:47 +0200)]
main: replace and remove new_config in load_wayland_backend_config

Remove the unseless intermediate variable new_config in the function
load_wayland_backend_config, replacing it by the renamed parameter
'config'.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: Squashed in "compositor-wayland: rename out_config arg of load_wayland_backend_config".]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agomain: rename load_wayland_backend_config arg "config" to wc
Benoit Gschwind [Tue, 10 May 2016 20:47:50 +0000 (22:47 +0200)]
main: rename load_wayland_backend_config arg "config" to wc

Rename the load_wayland_backend_config arg "config" to use this name for
another variable in the following patch. It also follow the legacy
naming scheme.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: move configuration parsing to weston main.c
Benoit Gschwind [Tue, 10 May 2016 20:47:49 +0000 (22:47 +0200)]
compositor-wayland: move configuration parsing to weston main.c

Move function load_wayland_backend_config,
wayland_backend_config_add_new_output, wayland_backend_config_release,
weston_wayland_output_config_init from compositor-wayland.c to main.c.
Not a single character is changed in those functions.

Create a glue function load_wayland_backend to use moved functions and
following the new load_*_backend style.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Acked-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: removed left-over entry from load_backend().]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: add versionning to config structure
Benoit Gschwind [Tue, 10 May 2016 20:47:48 +0000 (22:47 +0200)]
compositor-wayland: add versionning to config structure

The patch use temporary code that prepare the patch:
"compositor-wayland: move configuration parsing to weston main.c"

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agocompositor-wayland: rename misleading output arg of weston_wayland_output_config_init
Benoit Gschwind [Tue, 10 May 2016 20:47:47 +0000 (22:47 +0200)]
compositor-wayland: rename misleading output arg of weston_wayland_output_config_init

Rename the misleading output argument to output_config in the
weston_wayland_output_config_init function.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agocompositor-wayland: rename wayland_output_init_from_config
Benoit Gschwind [Tue, 10 May 2016 20:47:46 +0000 (22:47 +0200)]
compositor-wayland: rename wayland_output_init_from_config

Rename wayland_output_init_from_config to weston_wayland_output_config_init
to prepare the following patch :
"compositor-wayland: move configuration parsing to weston"

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: drop a useless comment]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: fix spacing and lines wraping
Benoit Gschwind [Tue, 10 May 2016 20:47:44 +0000 (22:47 +0200)]
compositor-wayland: fix spacing and lines wraping

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: squashed with "compositor-wayland: fix too long lines".]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years agodrm: port the drm backend to the new init api
Giulio Camuffo [Fri, 29 Apr 2016 22:40:34 +0000 (15:40 -0700)]
drm: port the drm backend to the new init api

Preparing for libweston and for the separation of the code base into
libweston vs. weston the compositor, we must remove all uses
weston_config structures from the backends. We have decided that all
option and config input happens in the compositor (main.c), and
configuration is passed in for the backends as structs.

Most other backends have already converted, and this patch converts the
DRM-backend to the libweston-style init API.

The libweston-style init API includes a header for each backend (here
compositor-drm.h) defining the configuration interface. The compositor
(main.c) prepares a configuration struct to be passed through libweston
core to the backend during initialization.

A complication with the DRM-backend is that outputs can be hotplugged,
and their configuration needs to be fetched from the compositor
(main.c). For this, the config struct contains a callback member. The
output configuration API is subject to change later, this is just a
temporary API to get libweston forward.

As weston_compositor's user_data was not previously used for anything,
and the output configuration callback needs data, the user_data is set
to the 'config' pointer. This pointer is only used in
drm_configure_output() in main.c.

[Bryce: lots of stuff and rebasing]
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: write commit message]
[Pekka: squash in "drm: Don't hang onto the backend config object
post-backend_init" from Bryce Harrington]
[Pekka: drop the compositor.h hunk]
[Pekka: do not #include inside extern "C"]
[Pekka: remove incorrect comment about weston_drm_backend_config
ownership.]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor: refactor into convert_size_by_transform_scale()
Pekka Paalanen [Tue, 26 Apr 2016 12:50:59 +0000 (15:50 +0300)]
compositor: refactor into convert_size_by_transform_scale()

There were two copies of code applying transform and scale to size.
Refactor the code to use just one copy in a new function.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor: constify weston_surface_build_buffer_matrix()
Pekka Paalanen [Tue, 26 Apr 2016 12:50:58 +0000 (15:50 +0300)]
compositor: constify weston_surface_build_buffer_matrix()

Makes it easier to see that it does not change weston_surface state
implicitly.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agoreleasing: Correct documentation for script name
Bryce Harrington [Wed, 4 May 2016 21:58:24 +0000 (14:58 -0700)]
releasing: Correct documentation for script name

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
8 years agocompositor-wayland: put configuration structure in separate header
Benoit Gschwind [Thu, 28 Apr 2016 18:33:15 +0000 (20:33 +0200)]
compositor-wayland: put configuration structure in separate header

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: moved #include out of extern "C".]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: split backend_init
Benoit Gschwind [Thu, 28 Apr 2016 18:33:14 +0000 (20:33 +0200)]
compositor-wayland: split backend_init

Extract configuration parsing from init_backend function. The new
init_backend start by generating the configuration structure from
configuration file with separated function and then use this structure
to load the backend.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: rebased]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: split wayland_output_create_for_config
Benoit Gschwind [Thu, 28 Apr 2016 18:33:12 +0000 (20:33 +0200)]
compositor-wayland: split wayland_output_create_for_config

The splitting intend to separate configuration parsing from output
setup.

Introduces struct weston_wayland_backend_output_config.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: squashed "wayland-backend: define output configuration
structure" into this.]
[Pekka: fix fullscreen output scale back to 1.]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: move config parsing in create_cursor
Benoit Gschwind [Thu, 28 Apr 2016 18:33:11 +0000 (20:33 +0200)]
compositor-wayland: move config parsing in create_cursor

Move configuration parsing from create_cursor to backend_init. Use newer
configuration structure to initialize the cursor in create_cursor.

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: use new config struture to create backend
Benoit Gschwind [Thu, 28 Apr 2016 18:33:10 +0000 (20:33 +0200)]
compositor-wayland: use new config struture to create backend

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
8 years agocompositor-wayland: fix memory leak of display_name
Benoit Gschwind [Thu, 28 Apr 2016 18:33:09 +0000 (20:33 +0200)]
compositor-wayland: fix memory leak of display_name

Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>