platform/upstream/wayland.git
9 years agotests: fix event_loop_timer_updates
Marek Chalupa [Tue, 19 Aug 2014 10:03:48 +0000 (12:03 +0200)]
tests: fix event_loop_timer_updates

It may happen that there's some time between the first and the other timer expire.
If epoll_wait is called after the first timer expired and
the other not, it returns only one source to dispatch and therefore
the test fails. To fix that, sleep a while before
wl_event_loop_dispatch() to make sure both timers expired.

To be 100% sure, we could use poll() before calling
wl_event_loop_dispatch(), but that would need modification in libwayland
(need to get the source's fd somehow)

https://bugs.freedesktop.org/show_bug.cgi?id=80594

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agotests: event_loop_timer_updates - add asserts and fix indentation
Marek Chalupa [Tue, 19 Aug 2014 08:34:52 +0000 (10:34 +0200)]
tests: event_loop_timer_updates - add asserts and fix indentation

Make sure the wl_event_source_timer_update suceeded. Also, fix weird
indentation.

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agotests: add one more test for event-loop signal source
Marek Chalupa [Tue, 12 Aug 2014 09:35:07 +0000 (11:35 +0200)]
tests: add one more test for event-loop signal source

Test if when we get a signal, all signal sources for that signal
get dispatched.

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoevent-loop: make signalfd non-blocking
Marek Chalupa [Tue, 12 Aug 2014 09:35:06 +0000 (11:35 +0200)]
event-loop: make signalfd non-blocking

When we add more that one source to a signal, then wayland will
block in wl_event_loop_dispatch. This is due to the attampt to read
from signal's fd each time the source is dispatched.

  wl_event_loop_add_signal(loop, SIGINT, ...);
  wl_event_loop_add_signal(loop, SIGINT, ...);

  /* raise signal .. */

  /* we got two fd's ready, both for the one SIGINT */
  epoll_wait(...) = 2

  [ for (i == 0) ]
      source1->dispatch() --> read(fd1);
  [ for (i == 1) ]
      source2->dispatch() --> read(fd2); /* blocking! */

Reading from fd2 will block, because we got only one signal,
and it was read from fd1.

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agotests: make event-loop-test more explicit
Marek Chalupa [Tue, 12 Aug 2014 09:35:05 +0000 (11:35 +0200)]
tests: make event-loop-test more explicit

Check value set in handler against an explicit value instead of:
  assert(value);

also add one assert() for non-NULL value.

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoscanner: Make emit_structs more explicit
Jasper St. Pierre [Fri, 8 Aug 2014 22:22:48 +0000 (18:22 -0400)]
scanner: Make emit_structs more explicit

"is_interface" is a really terrible name for the client or server
variants, and instead of checking whether we were passed the requests or
the events, just pass an argument through.

Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoscanner: Use an enum to determine the type of thing we're writing out
Jasper St. Pierre [Fri, 8 Aug 2014 22:22:47 +0000 (18:22 -0400)]
scanner: Use an enum to determine the type of thing we're writing out

Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoserver: fix conditions for fds in wl_socket_destroy
Pekka Paalanen [Thu, 7 Aug 2014 13:46:52 +0000 (16:46 +0300)]
server: fix conditions for fds in wl_socket_destroy

0 is also a valid fd, and needs to be closed.

On error we set fd to -1. We need to also initialize fds to -1, so we do
not accidentally close stdout on error.

While fixing this, also remove one use-before-NULL-check.

Based on the patch by Marek.

Cc: Marek Chalupa <mchqwerty@gmail.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
9 years agoserver: fix error handling when adding socket
Marek Chalupa [Wed, 6 Aug 2014 09:21:59 +0000 (11:21 +0200)]
server: fix error handling when adding socket

When some function during adding socket fails, it must clean
everything it set or we can get funky errors.

This patch fixes:
http://lists.freedesktop.org/archives/wayland-devel/2014-August/016331.html

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agotests: add tests for bug in adding socket
Marek Chalupa [Wed, 6 Aug 2014 08:33:04 +0000 (10:33 +0200)]
tests: add tests for bug in adding socket

Last set of commits introduced a bug. When adding of socket with
a particular name fails, then the socket and its lockfile are deleted
regardless who created the socket.

/* OK */
wl_display_add_socket(display, "wayland-0");

/* this call fails and will delete the original socket */
wl_display_add_socket(display, "wayland-0");

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoserver: move memset after check
Marek Chalupa [Wed, 6 Aug 2014 09:28:34 +0000 (11:28 +0200)]
server: move memset after check

If the malloc fails, memset would touch invalid memory.

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years agoserver: Add a simple API to find a good default display
Jasper St. Pierre [Thu, 8 May 2014 15:01:24 +0000 (11:01 -0400)]
server: Add a simple API to find a good default display

This allows compositors to easily select a good display to listen on.

9 years agoserver: Save the display name in the wl_socket
Jasper St. Pierre [Thu, 8 May 2014 15:25:34 +0000 (11:25 -0400)]
server: Save the display name in the wl_socket

This allows us to return the display name to the client in a new API.

9 years agoserver: Make get_socket_lock operate directly on the socket's lock_fd
Jasper St. Pierre [Thu, 8 May 2014 14:57:16 +0000 (10:57 -0400)]
server: Make get_socket_lock operate directly on the socket's lock_fd

9 years agoserver: Split out code to initialize the socket address for a display name
Jasper St. Pierre [Thu, 8 May 2014 14:25:13 +0000 (10:25 -0400)]
server: Split out code to initialize the socket address for a display name

We'll use this to autodetect a good socket to open on.

9 years agoserver: Create the socket FD after taking the lock
Jasper St. Pierre [Thu, 8 May 2014 14:24:06 +0000 (10:24 -0400)]
server: Create the socket FD after taking the lock

We're going to split out the lock-taking to another function so we
can repetitively try locks.

9 years agoserver: Clean up socket destruction
Jasper St. Pierre [Thu, 8 May 2014 14:22:25 +0000 (10:22 -0400)]
server: Clean up socket destruction

The code here is wrong, leaky, and inconsistent. We don't free,
unlink or clean up things when we should in every error path.

Centralize the data destruction so it's easier to keep track of
and easier to bug fix.

9 years agowayland-client: Fix indentation
Jasper St. Pierre [Tue, 5 Aug 2014 19:21:36 +0000 (15:21 -0400)]
wayland-client: Fix indentation

10 years agogitignore: Add another test-suite file
Bryce W. Harrington [Mon, 21 Jul 2014 17:51:14 +0000 (17:51 +0000)]
gitignore: Add another test-suite file

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
10 years agoprotocol: add repeat_info event to wl_keyboard
Jonny Lamb [Tue, 22 Jul 2014 16:39:18 +0000 (17:39 +0100)]
protocol: add repeat_info event to wl_keyboard

In the process wl_keyboard's version has been incremented. Given
clients get the wl_keyboard from wl_seat without a version, wl_seat's
version has also been incremented (wl_seat version 4 implies
wl_keyboard version 4).

earlier Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com>
10 years agodoc: Fix link to wl_list_remove()
Bryce W. Harrington [Fri, 25 Jul 2014 00:35:40 +0000 (00:35 +0000)]
doc: Fix link to wl_list_remove()

Use function linking syntax instead of variable linking, to resolve two
warnings:

    wayland-server.h:167: warning: explicit link request to 'wl_list_remove' could not be resolved
    wayland-server.h:188: warning: explicit link request to 'wl_list_remove' could not be resolved

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
10 years agoclient: extend error handling
Marek Chalupa [Fri, 20 Jun 2014 07:29:52 +0000 (09:29 +0200)]
client: extend error handling

When an error occurs, wl_display_get_error() does not
provide any way of getting know if it was a local error or if it was
an error event, respectively what object caused the error and what
the error was.

This patch introduces a new function wl_display_get_protocol_error()
which will return error code, interface and id of the object that
generated the error.
wl_display_get_error() will work the same way as before.

wl_display_get_protocol_error() DOES NOT indicate that a non-protocol
error happened. It returns valid information only in that case that
(protocol) error occurred, so it should be used after calling
wl_display_get_error() with positive result.

[Pekka Paalanen] Applied another hunk of Bryce's comments to docs,
added libtool version bump.

Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com>
Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
10 years agoconfigure: fix publican version detection
Peter Hutterer [Wed, 2 Jul 2014 07:23:46 +0000 (17:23 +1000)]
configure: fix publican version detection

Publican now adds a spurious "v" to the version output.

10 years agodoc: force publican to use fop
Peter Hutterer [Wed, 2 Jul 2014 07:23:45 +0000 (17:23 +1000)]
doc: force publican to use fop

Because wkhtmltopdf requires a $DISPLAY, and a patched Qt.

https://bugzilla.redhat.com/show_bug.cgi?id=997682

10 years agodoc: reduce chunk_section_depth to 0
Peter Hutterer [Wed, 2 Jul 2014 07:23:44 +0000 (17:23 +1000)]
doc: reduce chunk_section_depth to 0

One html page per chapter.

10 years agoconnection: remove unreached code
Boyan Ding [Wed, 4 Jun 2014 03:39:08 +0000 (11:39 +0800)]
connection: remove unreached code

10 years agoprotocol: remove redundant 'the' in description
Silvan Jegen [Fri, 23 May 2014 05:26:56 +0000 (07:26 +0200)]
protocol: remove redundant 'the' in description

Signed-off-by: Silvan Jegen <s.jegen@gmail.com>
10 years agoprotocol: add wl_surface errors enum for bad scale and transform values
Jonny Lamb [Fri, 30 May 2014 10:08:16 +0000 (12:08 +0200)]
protocol: add wl_surface errors enum for bad scale and transform values

10 years agoconfigure.ac: Bump configure.ac version to 1.5.90 on master
Kristian Høgsberg [Wed, 28 May 2014 17:11:55 +0000 (10:11 -0700)]
configure.ac: Bump configure.ac version to 1.5.90 on master

10 years agoconfigure.ac: Bump version to 1.5.0 1.5.0
Kristian Høgsberg [Mon, 19 May 2014 23:24:00 +0000 (16:24 -0700)]
configure.ac: Bump version to 1.5.0

10 years agoscanner: Downgrade non-increasing version error to warning 1.4.93
Kristian Høgsberg [Mon, 12 May 2014 22:17:52 +0000 (15:17 -0700)]
scanner: Downgrade non-increasing version error to warning

Commit 99a72777f96f63e4e25dc528bb37115424adac59 introduced a new error
for when the 'since' version decreases.  It also reset the version for
messages without a version to 1.  Versioning semantics in the spec files
was a little under-specified and we don't want to break projects caught in
this grey zone.

This commits replaces previous configure.ac as the 1.4.93 tag and the
final 1.5 RC.

10 years agoconfigure.ac: Bump version 1.4.93
Kristian Høgsberg [Mon, 12 May 2014 19:54:13 +0000 (12:54 -0700)]
configure.ac: Bump version 1.4.93

This is the last RC before 1.5.

10 years agoDo not distribute generated headers
Thierry Reding [Wed, 7 May 2014 12:09:35 +0000 (14:09 +0200)]
Do not distribute generated headers

The wayland-server-protocol.h and wayland-client-protocol.h headers are
currently being shipped in tarballs created using make dist. This causes
out-of-tree builds to fail since make will detect that the headers exist
by looking at the source directory (via VPATH) and not regenerate them.
But as opposed to ${top_builddir}/protocol, ${top_srcdir}/protocol is
not part of the include path and therefore the shipped files can't be
found during compilation.

Two solutions exist to this problem: 1) add ${top_srcdir}/protocol to
the include path to allow shipped files to be used if available or 2)
don't ship these generated files in release tarballs. The latter seems
the most appropriate. wayland-scanner is already a prerequisite in order
to generate wayland-protocol.c, so it is either built as part of the
package or provided externally. Generating all files from the protocol
definition at build time also ensures that they don't get out of sync.

Both of the generated headers are already listed in Makefile.am as
nodist_*_SOURCES, but at the same time they appear in include_HEADERS,
which will cause them to be added to the list of distributable files
after all. To prevent that, split them off into nodist_include_HEADERS.

Note that this problem will be hidden if a previous version of wayland
has been installed, since these files will exist in /usr/include and be
included from there. So this build error will only show for out-of-tree
builds on systems that don't have wayland installed yet.

Signed-off-by: Thierry Reding <treding@nvidia.com>
10 years agodoc: Remove obsolete doxygen tags
Boyan Ding [Mon, 12 May 2014 12:40:03 +0000 (20:40 +0800)]
doc: Remove obsolete doxygen tags

10 years agoscanner: Generate macros for getting the 'since' version of an event
Jonas Ådahl [Thu, 8 May 2014 21:39:49 +0000 (23:39 +0200)]
scanner: Generate macros for getting the 'since' version of an event

This could be useful for compositors who need to be able to not send
events if the client bound a version lower than the newest provided.

Event version numbers are exposed as
[INTERFACE_NAME]_[EVENT_NAME]_SINCE_VERSION for example wl_output.scale
will have the version macro WL_OUTPUT_SCALE_SINCE_VERSION.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agotests: Add message version sanity test
Jonas Ådahl [Thu, 8 May 2014 21:39:48 +0000 (23:39 +0200)]
tests: Add message version sanity test

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agoscanner: Also fail when an implicitly versioned message is out of order
Jonas Ådahl [Thu, 8 May 2014 21:39:47 +0000 (23:39 +0200)]
scanner: Also fail when an implicitly versioned message is out of order

Fail if a message with version implicitly set to 1 (i.e. not specified)
comes after a message with since-version > 1.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agoprotocol: Fix order of wl_pointer, wl_keyboard and wl_touch messages
Jonas Ådahl [Fri, 9 May 2014 16:10:32 +0000 (18:10 +0200)]
protocol: Fix order of wl_pointer, wl_keyboard and wl_touch messages

The "release" message of wl_pointer, wl_keyboard and wl_touch introduced
in version 3 was placed first in the respective interface XML element,
causing wayland-scanner to misbehave and set the version number of the
"release" message to all subsequent messages with no explicitly specified
"since" version.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agodoc: Remove deprecated doxygen tag
Jonas Ådahl [Thu, 8 May 2014 21:39:45 +0000 (23:39 +0200)]
doc: Remove deprecated doxygen tag

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agoevent-loop-test: Remove unused variable
Jonas Ådahl [Thu, 8 May 2014 21:39:44 +0000 (23:39 +0200)]
event-loop-test: Remove unused variable

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years agodoc: Added API documentation for wl_display_create function.
Srivardhan Hebbar [Wed, 7 May 2014 04:07:45 +0000 (09:37 +0530)]
doc: Added API documentation for wl_display_create function.

Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com>
10 years agoserver: fix potential memleak and NULL deref
U. Artie Eoff [Mon, 5 May 2014 23:28:26 +0000 (16:28 -0700)]
server: fix potential memleak and NULL deref

If for some reason that errno is neither value (ENOMEM or
EINVAL), then prior to this patch, there would be a NULL
deref in wl_closure_lookup(...) at the "else if" conditional
when closure == NULL. Also, closure might not be NULL but still
fall into the block due to the wl_closure_lookup < 0 condition...
in that case, we need to destroy the closure to avoid a memory
leak.

Currently, wl_connection_demarshal only sets errno to ENOMEM
or EINVAL... we've already checked for ENOMEM so remove check
for EINVAL (just assume it).  Also, call wl_closure_destroy(...)
unconditionally in the "else if" block (assume it can handle
NULL closure, too, which it does right now).

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoconnection-test: check malloc result
U. Artie Eoff [Mon, 5 May 2014 21:45:20 +0000 (14:45 -0700)]
connection-test: check malloc result

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoscanner: check wl_array_add result
U. Artie Eoff [Mon, 5 May 2014 21:45:19 +0000 (14:45 -0700)]
scanner: check wl_array_add result

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoconfigure.ac: Bump version to 1.4.92 1.4.92
Kristian Høgsberg [Thu, 1 May 2014 20:44:09 +0000 (13:44 -0700)]
configure.ac: Bump version to 1.4.92

10 years agoAvoid printing to stderr
Kristian Høgsberg [Wed, 30 Apr 2014 19:18:52 +0000 (12:18 -0700)]
Avoid printing to stderr

Use wl_log in the last few places where we print to stderr.  Remove
logging in a couple of places where we properly return an error code.

https://bugs.freedesktop.org/show_bug.cgi?id=73339

10 years agoUse non-blocking timerfd to prevent blocking when updating timer event sources
Andrew Wedgbury [Fri, 25 Apr 2014 14:00:54 +0000 (15:00 +0100)]
Use non-blocking timerfd to prevent blocking when updating timer event sources

This implements a simple fix for the blocking problem that occurs when
updating a timer event source after the timer expires, but before its
callback is dispatched. This can happen when another event happens during the
same epoll wakeup as the timer event, and causes the read() call in
wl_event_source_timer_dispatch() to block for the updated duration of the
timer.

We never want this read() call to block, so I believe it makes sense for the
timerfd to be non-blocking, and we simply ignore the case where the read fails
with EAGAIN. We still report all other errors as before, and still ignore the
actual value read from the socket.

With this change, the event_loop_timer_updates unit test case I submitted
previously now passes, and weston appears to work as before.

10 years agotest: Add test showing blocking problem when updating timers
Andrew Wedgbury [Fri, 25 Apr 2014 10:36:57 +0000 (11:36 +0100)]
test: Add test showing blocking problem when updating timers

I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.

When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).

This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!

The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.

As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.

A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.

10 years agoconnection: fix a format string typo in error message
Giulio Camuffo [Tue, 22 Apr 2014 13:03:12 +0000 (16:03 +0300)]
connection: fix a format string typo in error message

10 years agoconnection: Don't write past the end of the connection buffer
Ander Conselvan de Oliveira [Thu, 17 Apr 2014 15:20:37 +0000 (18:20 +0300)]
connection: Don't write past the end of the connection buffer

If a message was too big to fit in the connection buffer, the code
in wl_buffer_put would just write past the end of it.

I haven't seen any real world use case that would trigger this bug, but
it was possible to trigger it by sending a long enough string to the
wl_data_source.offer request.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69267

10 years agoconfigure.ac: Bump version to 1.4.91 1.4.91
Kristian Høgsberg [Mon, 7 Apr 2014 23:08:42 +0000 (16:08 -0700)]
configure.ac: Bump version to 1.4.91

10 years agoshm: Disallow shrinking shm pools
Kristian Høgsberg [Mon, 7 Apr 2014 21:42:20 +0000 (14:42 -0700)]
shm: Disallow shrinking shm pools

Unused shm space will be automatically reclaimed if unused or can be
explicitly returned by using fallocate FALLOC_FL_PUNCH_HOLE.

https://bugs.freedesktop.org/show_bug.cgi?id=74632

10 years agoscanner: Only output each forward declaration once
Kristian Høgsberg [Thu, 3 Apr 2014 22:57:54 +0000 (15:57 -0700)]
scanner: Only output each forward declaration once

Just sort the types and only print unique type names.  We avoid using
the GCC pragma.

10 years agoAdd WL_PRINTF attribute and annotate wl_log_func_t
Kristian Høgsberg [Thu, 3 Apr 2014 21:18:45 +0000 (14:18 -0700)]
Add WL_PRINTF attribute and annotate wl_log_func_t

10 years agoprotocol: Document how clients are supposed to get the xkb keycode
Rui Matos [Tue, 25 Mar 2014 15:35:39 +0000 (16:35 +0100)]
protocol: Document how clients are supposed to get the xkb keycode

This encodes what everyone is doing and avoids other implementers
having to guess.

10 years agoAdd error handling for wl_cursors
Hardening [Tue, 18 Mar 2014 10:29:00 +0000 (11:29 +0100)]
Add error handling for wl_cursors

This patch adds some error management in wayland cursors

Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
10 years agoclient: Delay EPIPE handling so we get a chance to handle error events
Kristian Høgsberg [Wed, 26 Mar 2014 20:28:27 +0000 (13:28 -0700)]
client: Delay EPIPE handling so we get a chance to handle error events

10 years agoserver: Kill some unnecessary logs
Jasper St. Pierre [Sun, 23 Feb 2014 23:51:31 +0000 (18:51 -0500)]
server: Kill some unnecessary logs

In order to set a logging function all the time, the output we get
needs to be useful. Logging about trivial things like the socket
we're using and when clients disconnect doesn't realy help anyone.

10 years agotests: Fix build of noinst fixed-benchmark test
Bryce W. Harrington [Tue, 11 Mar 2014 00:01:47 +0000 (00:01 +0000)]
tests: Fix build of noinst fixed-benchmark test

Solves this build error:

  tests/fixed-benchmark.o: In function `benchmark':
  ./wayland/tests/fixed-benchmark.c:82: undefined reference to `clock_gettime'
  ./wayland/tests/fixed-benchmark.c:84: undefined reference to `clock_gettime'

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
10 years agoprotocol: try to clarify frame callback semantics
Pekka Paalanen [Mon, 24 Feb 2014 08:00:33 +0000 (10:00 +0200)]
protocol: try to clarify frame callback semantics

"the callback event will arrive after the next output refresh" is wrong,
if you interpret "output refresh" as framebuffer flip or the moment when
the new pixels turn into light the first time. Weston has probably never
worked this way.

Weston triggers the frame callbacks when it submits repainting commands
to the GPU, which is before the framebuffer flip.

Strike the incorrect claim, and the rest of the paragraph which no
longer offers useful information.

As a replacement, expand on the "throttling and driving animations"
characteristic. The main purpose is to let clients animate at the
display refresh rate, while avoiding drawing frames that will never be
presented.

The new claim is that the server should give some time between
triggering frame callbacks and repainting itself, for clients to draw
and commit. This is somewhat intimate with the repaint scheduling
algorithm a compositor uses, but hopefully the right intention.

Another point of this update is to imply, that frame callbacks should
not be used to count compositor repaint cycles nor monitor refresh
cycles. It has never been guaranteed to work. Removing the mention of
frame callback without an attach hopefully discourages such use.

v2: Don't just remove a paragraph, but add useful information about the
request's intent.

v3: Specify the order of posting frame callbacks.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Cc: Axel Davy <axel.davy@ens.fr>
Cc: Jason Ekstrand <jason@jlekstrand.net>
10 years agoupdate .gitignore
Pekka Paalanen [Mon, 10 Mar 2014 12:04:00 +0000 (14:04 +0200)]
update .gitignore

Makes 'git status' clean again after a successful 'make distcheck'.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years agobuild: hide doxygen commands with AM_V_GEN
Pekka Paalanen [Mon, 10 Mar 2014 12:03:59 +0000 (14:03 +0200)]
build: hide doxygen commands with AM_V_GEN

I suppose the purpose was to print just one GEN line for each doxygen
rule being executed, not print the doxygen command.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years agodoc: do not rebuild man pages if they are up to date
Pekka Paalanen [Mon, 10 Mar 2014 12:03:58 +0000 (14:03 +0200)]
doc: do not rebuild man pages if they are up to date

The doxygen.man make target was not a real file that was generated,
therefore the man page rule was ran on every make invocation. Replace it
with a real file that is produced by the man page rule.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years agobuild: depend on generated protocol headers
Pekka Paalanen [Mon, 10 Mar 2014 12:03:57 +0000 (14:03 +0200)]
build: depend on generated protocol headers

Fixes the build failure where the protocol headers were not generated at
all before compiling src/.libs/libwayland_server_la-wayland-server.o.

The failure was reproducable by starting fresh with 'git clean -dxf' and
not having any wayland headers installed system-wide.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years agobuild: Include protocol/ so we pick up generated headers
Kristian Høgsberg [Sat, 8 Mar 2014 00:02:19 +0000 (16:02 -0800)]
build: Include protocol/ so we pick up generated headers

10 years agobuild: Generated protocol files live in protocol/ now
Kristian Høgsberg [Fri, 7 Mar 2014 22:02:32 +0000 (14:02 -0800)]
build: Generated protocol files live in protocol/ now

Fix up the references in include_HEADERS.

10 years agobuild: Consolidate scanner build rules
Kristian Høgsberg [Fri, 7 Mar 2014 19:57:34 +0000 (11:57 -0800)]
build: Consolidate scanner build rules

10 years agobuild: Move tests/Makefile.am into toplevel Makefile.am
Kristian Høgsberg [Fri, 7 Mar 2014 08:00:18 +0000 (00:00 -0800)]
build: Move tests/Makefile.am into toplevel Makefile.am

10 years agobuild: Move src/Makefile.am into toplevel Makefile.am
Kristian Høgsberg [Fri, 7 Mar 2014 07:45:56 +0000 (23:45 -0800)]
build: Move src/Makefile.am into toplevel Makefile.am

10 years agobuild: Move cursor Makefile.am into toplevel Makefile.am
Kristian Høgsberg [Fri, 7 Mar 2014 07:15:02 +0000 (23:15 -0800)]
build: Move cursor Makefile.am into toplevel Makefile.am

10 years agobuild: Move protocol/ Makefile.am into toplevel Makefile.am
Kristian Høgsberg [Tue, 18 Feb 2014 22:55:09 +0000 (14:55 -0800)]
build: Move protocol/ Makefile.am into toplevel Makefile.am

A small step towards non-recursive build system for wayland too.

10 years agobuild: Stop using xmllint to validate protocol files
Kristian Høgsberg [Tue, 18 Feb 2014 22:52:00 +0000 (14:52 -0800)]
build: Stop using xmllint to validate protocol files

Same reason as commit cd31275f28b0a04d2ec5426dc81e875197b47e52 from weston:

    The scanner needs to be good enough.  If it crashes or fails to report
    invalid input, that needs to get fixed.

10 years agoconnection: Use wl_log to report errors
Jasper St. Pierre [Tue, 18 Feb 2014 00:04:28 +0000 (19:04 -0500)]
connection: Use wl_log to report errors

In some cases, like Xwayland, stdout and stderr are redirected to
/dev/null, losing us valuable information, while wl_log can be
overridden, allowing us to send it to a log file instead. This
can help debugging immensely.

10 years agoscanner: Add GCC pragmas to disable -Wredundant-decls
Jasper St. Pierre [Sat, 15 Feb 2014 18:29:16 +0000 (13:29 -0500)]
scanner: Add GCC pragmas to disable -Wredundant-decls

The code very intentionally emits a lot of redundant declarations
to simplify the scanner code. Somebody building with -Wredundant-decls
would have compile errors, so emit special pragmas to turn those
warnings off.

These pragmas should be ignored outside of gcc/clang.

10 years agowayland-client: Set a proper errno
Jasper St. Pierre [Mon, 17 Feb 2014 22:30:41 +0000 (17:30 -0500)]
wayland-client: Set a proper errno

errno is supposed to be positive, not negative. It seems that
everything else that calls display_fatal_error() calls it with
a positive error code, so do it here as well.

10 years agoprotocol: when buffer transform and scale change
Pekka Paalanen [Fri, 7 Feb 2014 09:13:01 +0000 (11:13 +0200)]
protocol: when buffer transform and scale change

Clarify when the pending and current buffer transform and scale values
change, and what exactly happens on commit.

This matches what Weston currently does.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years agoclient: Queue display events on private queue and always dispatch
Kristian Høgsberg [Sat, 8 Feb 2014 00:50:50 +0000 (16:50 -0800)]
client: Queue display events on private queue and always dispatch

The wl_display events (error and delete_id) need to be handled even
if the default queue doesn't get dispatched for a while.  For example,
a busy EGL rendering loop hits wl_display.sync every eglSwapBuffers()
and we need to process the delete_id events to maintain the object ID
data structure.

As it is, that doesn't happen, but with this change we special case
wl_display events.  We put them on a custom, private queue and when
dispatching events, we always dispatch display_queue events first.
The wl_display proxy should still be the default_queue, so that objects
created from wl_display requests get assigned to that.

10 years agoclient: Rename display->queue to default_queue
Kristian Høgsberg [Sat, 8 Feb 2014 00:00:21 +0000 (16:00 -0800)]
client: Rename display->queue to default_queue

We'll add a new queue next, so rename the default queue first.

10 years agoMake default log handler print to stderr
Kristian Høgsberg [Fri, 7 Feb 2014 23:57:07 +0000 (15:57 -0800)]
Make default log handler print to stderr

On the client side we log fatal errors before we exit.  If a client doesn't
set a log handler, it's hard to figure out what goes wrong.

10 years agoRename wl_debug to debug_server/client
Jason Ekstrand [Thu, 19 Dec 2013 02:56:18 +0000 (20:56 -0600)]
Rename wl_debug to debug_server/client

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
10 years agoDon't deref the sample pointer in the wl_container_of macro
Neil Roberts [Tue, 4 Feb 2014 14:21:48 +0000 (14:21 +0000)]
Don't deref the sample pointer in the wl_container_of macro

The previous implementation of the wl_container_of macro was
dereferencing the sample pointer in order to get an address of the
member to calculate the offset. Ideally this shouldn't cause any
problems because the dereference doesn't actually cause the address to
be read from so it shouldn't matter if the pointer is uninitialised.
However this is probably technically invalid and could cause undefined
behavior. Clang appears to take advantage of this undefined behavior
and doesn't bother doing the subtraction. It also gives a warning when
it does this.

The documentation for wl_container_of implies that it should only be
given an initialised pointer and if that is done then there is no
problem with clang. However this is quite easy to forget and doesn't
cause any problems or warnings with gcc so it's quite easy to
accidentally break clang.

To fix the problem this changes the macro to use pointer -
offsetof(__typeof__(sample), member) so that it doesn't need to deref
the sample pointer. This does however require that the __typeof__
operator is supported by the compiler. In practice we probably only
care about gcc and clang and both of these happily support the
operator.

The previous implementation was also using __typeof__ but it had a
fallback path avoiding it when the operator isn't available. The
fallback effectively has undefined behaviour and it is targetting
unknown compilers so it is probably not a good idea to leave it in.
Instead, this patch just removes it. If someone finds a compiler that
doesn't have __typeof__ but does work with the old implementation then
maybe they could add it back in as a special case.

This patch removes the initialisation anywhere where the sample
pointer was being unitialised before using wl_container_of. The
documentation for the macro has also been updated to specify that this
is OK.

10 years agoprotocol: Fix build
Jasper St. Pierre [Fri, 31 Jan 2014 21:29:37 +0000 (16:29 -0500)]
protocol: Fix build

"data" is the name of the void* argument in the implementation.
While we probably shouldn't use such an easily-collidable name,
just rename the callback's argument to callback_data for now.

10 years agoprotocol: Fix documentation for the parameter of wl_callback
Jasper St. Pierre [Fri, 31 Jan 2014 20:55:48 +0000 (15:55 -0500)]
protocol: Fix documentation for the parameter of wl_callback

The parameter here is an opaque integer, rather than the event serial.
The "frame" callback uses this to pass the current time of day in
milliseconds.

10 years agoprotocol: Fix the name of the registry argument
Jasper St. Pierre [Fri, 31 Jan 2014 20:38:07 +0000 (15:38 -0500)]
protocol: Fix the name of the registry argument

A simple copy-paste typo.

10 years agoconfigure.ac: Bump version to 1.4 sandbox/pcoval/upstream 1.4.0
Kristian Høgsberg [Fri, 24 Jan 2014 04:50:27 +0000 (20:50 -0800)]
configure.ac: Bump version to 1.4

10 years agoresources-test: Don't send invalid event
Kristian Høgsberg [Mon, 20 Jan 2014 23:07:55 +0000 (15:07 -0800)]
resources-test: Don't send invalid event

Even if nothing receives the even, the arguments still need to be valid.
The test is sending out event 0 from the wl_display interface, which is
the error event.  This requires arg 0 to be a valid object and arg 2 to
be a non-null string.  The test just leaves that undefined, causing
intermittent test failures.

As it is, the resource destroy test doesn't need to send an event to
validate the various resource destroy hooks, so we can just remove the
call to wl_resource_post_event() alltogether.

Thanks to Matt Turner <mattst88@gmail.com> for pointing out the failure.

10 years agoprotocol: Clarify semantics of wl_subsurface.set_position
Jonas Ådahl [Sun, 19 Jan 2014 09:32:11 +0000 (10:32 +0100)]
protocol: Clarify semantics of wl_subsurface.set_position

Make it clear that multiple requests before commit are allowed and how it
is handled.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
10 years agoprotocol: Clarify semantics of sub-surface placement requests
Jonas Ådahl [Sun, 19 Jan 2014 09:32:10 +0000 (10:32 +0100)]
protocol: Clarify semantics of sub-surface placement requests

Clarify some semantics of wl_subsurface.place_below and
wl_subsurface.place_below that were not specified.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
10 years agoconfigure.ac: Bump version to 1.3.93 1.3.93
Kristian Høgsberg [Mon, 20 Jan 2014 05:58:27 +0000 (21:58 -0800)]
configure.ac: Bump version to 1.3.93

This is the release candidate.

10 years agoRevert "xwayland: Add .gitignore"
Kristian Høgsberg [Sun, 19 Jan 2014 18:03:22 +0000 (10:03 -0800)]
Revert "xwayland: Add .gitignore"

I accidentally committed Jaspers xserver patch to wayland.

This reverts commit 8a781aef0ebf8d5be4116fa40d9155af4ba61257.

10 years agoclient: Include poll.h instead of sys/poll.h
Jonas 'Sortie' Termansen [Tue, 14 Jan 2014 17:38:59 +0000 (18:38 +0100)]
client: Include poll.h instead of sys/poll.h

POSIX mandates the poll.h header as the standard location of poll(2).

10 years agoadd_shm_format: check wl_array_add return value before deref
U. Artie Eoff [Tue, 14 Jan 2014 17:18:03 +0000 (09:18 -0800)]
add_shm_format: check wl_array_add return value before deref

In wl_display_add_shm_format(), check the return value from
wl_array_add() before dereferencing it and assigning it a value.
Return the resulting pointer back to the caller.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoxcursor: don't proceed if XcursorImageCreate failed
U. Artie Eoff [Fri, 10 Jan 2014 22:43:48 +0000 (14:43 -0800)]
xcursor: don't proceed if XcursorImageCreate failed

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agocursor: check for memory allocation errors
U. Artie Eoff [Fri, 10 Jan 2014 22:33:36 +0000 (14:33 -0800)]
cursor: check for memory allocation errors

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agocursor: free theme->name too
U. Artie Eoff [Fri, 10 Jan 2014 21:49:44 +0000 (13:49 -0800)]
cursor: free theme->name too

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoresources-test: assert non-NULL return values
U. Artie Eoff [Fri, 10 Jan 2014 21:21:04 +0000 (13:21 -0800)]
resources-test: assert non-NULL return values

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoqueue-test: assert non-NULL return values
U. Artie Eoff [Fri, 10 Jan 2014 21:18:42 +0000 (13:18 -0800)]
queue-test: assert non-NULL return values

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoos-wrappers-test: assert closure is not NULL before invoking it
U. Artie Eoff [Fri, 10 Jan 2014 21:04:34 +0000 (13:04 -0800)]
os-wrappers-test: assert closure is not NULL before invoking it

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoevent-loop-test: assert non-NULL results
U. Artie Eoff [Fri, 10 Jan 2014 20:55:25 +0000 (12:55 -0800)]
event-loop-test: assert non-NULL results

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
10 years agoconnection-test: assert closure is not NULL before invoking it
U. Artie Eoff [Fri, 10 Jan 2014 20:28:43 +0000 (12:28 -0800)]
connection-test: assert closure is not NULL before invoking it

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>