platform/upstream/wayland.git
15 months agoadd EGL_PACAKGE to disable an egl library temporarily
Boram Park [Wed, 11 Apr 2018 02:25:19 +0000 (11:25 +0900)]
add EGL_PACAKGE to disable an egl library temporarily

when ready, we have to remove this patch

Change-Id: I317e78a60fb2228dd102caa16dcd8d5913eb7c41

15 months agopackaging: upgrade to 1.15.0
Sangjin.Lee [Fri, 2 Mar 2018 04:32:22 +0000 (13:32 +0900)]
packaging: upgrade to 1.15.0

Change-Id: I179a88016e0e9e1c98960fa26cedaff1159602ef

15 months agopackaging: add libwayland-egl package
Sangjin.Lee [Fri, 2 Mar 2018 04:32:22 +0000 (13:32 +0900)]
packaging: add libwayland-egl package

Change-Id: I179a88016e0e9e1c98960fa26cedaff1159602ef

15 months agolog: add debugging logs
Amarnath [Thu, 5 Jan 2017 11:10:42 +0000 (16:40 +0530)]
log: add debugging logs

commit 72b8e3b37c109aebeab15e9692fc9e98131eabd6
Author: Dipen Somani <dipen.somani@samsung.com>
Debug logs added to identify the failure cause of wl_display_connect()

commit 83cf12e7ca426c69571d952716625707009d2ac6
Author: Bhavi Dhingra <b.dhingra@samsung.com>
Adding debug information about pending requests from client, before it is aborted, if sendmsg() fails due to EAGAIN error

commit 4f1f607365c017c864aef54713dbd11a02d514e1
Author: Dipen Somani <dipen.somani@samsung.com>
wayland-server: Added debug logs for client disconnection

commit 2ee9534c137a0d3a7b5f81422eedd0f2ccded5c7
Author: Dipen Somani <dipen.somani@samsung.com>
Wayland-server: Added warning logs if application binds with a lower version of the interface than that of the event.

commit f6c29ea10a9f09be82c195608d485287bb12006b
Author: ritesh.u <ritesh.u@samsung.com>
wayland-server: Error log for client disconnection on hangup/error flag set

Change-Id: Ie255b6637226c5e3ad3593d22aa9ec4905fb947f

15 months agoprotocol: add destructor to the registry
Sangjin Lee [Wed, 9 Aug 2017 07:20:46 +0000 (16:20 +0900)]
protocol: add destructor to the registry

In some user side library, it create wl_registry for check global resource to many times.
it also destory the wl_registry when finished but in wayland server, the registry resource remained
untill client is destroy. So memory in server side is increase.
This is the reason why add destructor to wl_registry.

Change-Id: I473e70eb3ef60e6604be4cc0314f3ef95f1f59c4

15 months agowayland-egl: Added APIs for setting buffer transform and frontbuffer rendering.
joonbum.ko [Thu, 15 Jun 2017 10:03:43 +0000 (19:03 +0900)]
wayland-egl: Added APIs for setting buffer transform and frontbuffer rendering.

 - Added APIs
  wl_egl_window_set_buffer_transform(struct wl_egl_window *egl_window, int wl_output_transform)
  wl_egl_window_set_frontbuffer_mode(struct wl_egl_window *egl_window, int set)
  wl_egl_window_set_window_transform(struct wl_egl_window *egl_window, int window_transform)

Change-Id: Ife7ea6e6982fe223b4369c15c9b425dd00832122
Signed-off-by: joonbum.ko <joonbum.ko@samsung.com>
15 months agowayland-cursor: fix cursor image broken problem
Sung-Jin Park [Wed, 17 May 2017 05:29:50 +0000 (14:29 +0900)]
wayland-cursor: fix cursor image broken problem

This fixes a bug related to recreate/use a new shm pool for cursor(s).
When recreating a shm pool, we usually need to copy the existing contents
in the old shm pool to the new shm pool. Otherwise, cursor images in the
old shm pool will be lost and they will be displayed abnormaly.

Change-Id: Id7515f9d15d8406c3dfb1ad52072a2442ce0c1aa
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
15 months agowayland-cursor: fix a dereference about theme->pool
JengHyun Kang [Wed, 19 Apr 2017 08:27:06 +0000 (17:27 +0900)]
wayland-cursor: fix a dereference about theme->pool

Change-Id: If998c79832ccb68bb5ba650e6564bca139638f1e

15 months agowayland-cursor: fix to recreate to shm pool when it's not enough to contain a new...
Sung-Jin Park [Wed, 5 Apr 2017 08:02:22 +0000 (17:02 +0900)]
wayland-cursor: fix to recreate to shm pool when it's not enough to contain a new cursor

Change-Id: I9028c891ecbcabdb815c070ca414124f2206e392
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
15 months agoserver: checking if the process has the super-user right to read /proc/cmdline
Boram Park [Thu, 2 Mar 2017 08:44:09 +0000 (17:44 +0900)]
server: checking if the process has the super-user right to read /proc/cmdline

Change-Id: Ib1b3564c98e1cd398e9b764dfb82402a6a53eec4

15 months agoAdd null check to prevent crash in case connection is deleted.
Debi Prasanna Mohanty [Mon, 27 Feb 2017 17:06:57 +0000 (22:36 +0530)]
Add null check to prevent crash in case connection is deleted.

Change-Id: Ib4b2f80620b0e5fd08899c62e4df27f7afc10a05
Signed-off-by: Debi Prasanna Mohanty <debi.m@samsung.com>
15 months agolog: add debugging logs
Boram Park [Sun, 19 Feb 2017 12:16:22 +0000 (21:16 +0900)]
log: add debugging logs

b50bff1a3e2376c4512af8295d6f6f45fda46170 log: add more logs for debugging
e00cbc1c23df2164f5e9bc4a6c0201c9b6424c5d log: add logs for tracing events in multi thread
06580d8ddac98f06f54d06bc4f1fe6bdc90f222f log: add error logs for debugging
bbb9077f93887bed9357ba9253f51e73720d1ed1 print protocol error logs

Change-Id: Ibde99add3590e032c8fada839f74b5a5c417f80d

15 months agoclient: add mutex lock/unlock for proxy
Boram Park [Sun, 19 Feb 2017 11:57:10 +0000 (20:57 +0900)]
client: add mutex lock/unlock for proxy

Actually this is not the perfect solution to protect wayland client resources in
multi-threads. They SHOULD be protected by applications. For example, during polling
the display fd, if a thread calls wl_display_disconnect, it will make issues. However,
adding mutex lock/unlock looks worth to protect wayland client resources inside of
wayland library at least.

Change-Id: I26b5f9598ccaaf5620a64a84af49f8637a360acb

15 months agoconnection: add some sanity-check
Boram Park [Sun, 19 Feb 2017 10:47:31 +0000 (19:47 +0900)]
connection: add some sanity-check

Change-Id: Iafcb073744cc95d44a6ac2a89980596da3b5ceee

15 months agowayland-cursor.c: Load cursors only on demand to save application load time and fix...
ritesh.u [Wed, 28 Dec 2016 14:46:33 +0000 (20:16 +0530)]
wayland-cursor.c: Load cursors only on demand to save application load time and fix for theme inheritance functionality

Change-Id: I73aa858e36b97a71d438365980e4ee49aea9b9bd
Signed-off-by: ritesh.u <ritesh.u@samsung.com>
15 months agowayland-cursor: added wl_cursor_theme_get_name for get cursor theme name
Junseok Kim [Fri, 11 Feb 2022 03:45:07 +0000 (12:45 +0900)]
wayland-cursor: added wl_cursor_theme_get_name for get cursor theme name

Change-Id: Ib0ac1d2d767512fc400b52afa1d1c2291d648051

15 months agowayland-egl: Add wl_egl_window_set_rotation / wl_egl_window_get_capabilities apis...
Mun, Gwan-gyeong [Wed, 9 Nov 2016 08:19:56 +0000 (17:19 +0900)]
wayland-egl: Add wl_egl_window_set_rotation / wl_egl_window_get_capabilities apis for prerotation of egl_window.

Change-Id: Id8b0bce697347efa7f5256bda217cc2e3eef045f

15 months agoflush forcely if closure has fds
Boram Park [Wed, 11 Apr 2018 01:20:01 +0000 (10:20 +0900)]
flush forcely if closure has fds

This patch is quite different with the original patch. The original patch did
two things. One is flushing forcely if closure has fds. Another is closing fds
remained in connection fds_in array.

Now closing fds is patched in wayland 1.15.0. So, we just remain the force flushing
patch.

Below is the original patch message

[original patch message]

commit d83694a742291e283f88b4db43ad5d9a9acf75bc
Author: Sangjin Lee <lsj119@samsung.com>

wayland-client: fix invalid fd about destroyed proxy

If server sends fds but the proxy was destroyed,
then that fds remain in connetion fds_in array.
so they can be misused by other proxy.

The simple solution is to separate the message including fds from the other messages
and In queueing process in clients, if received message of proxy is invaild,
just consume the fds_in array.

Change-Id: I07dd9cf87f2b8cf6265bdbdb046ed0593faaa89c

15 months agoscanner: Ensuring XMLCALL macro is only defined once to avoid build error on i586.
Gwanglim Lee [Wed, 1 Jun 2016 02:46:45 +0000 (11:46 +0900)]
scanner: Ensuring XMLCALL macro is only defined once to avoid build error on i586.

XMLCALL exportable macro is defined in two header files on i586.
(expat_external.h and xmlexports.h)
In order to avoid redefined error, we should put undef that macro.

Change-Id: I9270d4038443978548d197a8196b40eb5db7e065

15 months agotests: fix warnings
Gwanglim Lee [Fri, 27 May 2016 04:47:37 +0000 (13:47 +0900)]
tests: fix warnings

add checking values for read and write.
correct order of declaration for struct wl_closure.

Change-Id: I99e40210e387562ed2dbd050b7219e35d303c668

15 months agouse a environment "TIZEN_WAYLAND_SHM_DIR" as a path of shared memory.
Seunghun Lee [Tue, 15 Mar 2016 08:52:11 +0000 (17:52 +0900)]
use a environment "TIZEN_WAYLAND_SHM_DIR" as a path of shared memory.

allow to locate the shm file in the Tizen specific directory.

Change-Id: If11af6064b6a94fe1d7940cc76d7c59e7ba1bf48

15 months agoserver: Add new api to get wayland clients' resource
Ju Yeon Lee [Mon, 21 Dec 2015 11:11:22 +0000 (20:11 +0900)]
server: Add new api to get wayland clients' resource

allows us to get connected clients and their resources
could be utilized more efficient sever resource usage and debug resource leakage
added tests 'clients-resource-test' for presenting howto.

Change-Id: I53647d3095b51d8f435eaaad0fedb6e13dedfb3b

15 months agoadd apis to enable/disable wayland debug at runtime both for server/client
Sung-Jin Park [Fri, 13 Nov 2015 09:55:17 +0000 (18:55 +0900)]
add apis to enable/disable wayland debug at runtime both for server/client

Change-Id: Ibcb9da8db2185d0d2a9f225e0f6d80e5a30e9cd4

15 months agopackaging: add packaging directory
Boram Park [Wed, 11 Apr 2018 01:33:29 +0000 (10:33 +0900)]
packaging: add packaging directory

Change-Id: I3703dd75576b486c7982f0d1e8ef0b63b18162fe

23 months agobuild: bump to version 1.21.0 for the official release upstream_work_20230216 1.21.0 upstream/1.21.0
Simon Ser [Thu, 30 Jun 2022 21:59:11 +0000 (23:59 +0200)]
build: bump to version 1.21.0 for the official release

23 months agoprotocol: minor clarification for axis_discrete events
Peter Hutterer [Fri, 24 Jun 2022 03:45:58 +0000 (13:45 +1000)]
protocol: minor clarification for axis_discrete events

Explicitly spell out that multiple axis_discrete events *for the same axis*
within the same wl_pointer.frame are not permitted.

References: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/911#note_1438099

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
23 months agoutil: set errno when hitting WL_MAP_MAX_OBJECTS
Simon Ser [Tue, 28 Jun 2022 09:59:26 +0000 (11:59 +0200)]
util: set errno when hitting WL_MAP_MAX_OBJECTS

Callers may check errno when wl_map_insert_* functions return an
error (since [1]). Make sure it's always set to a meaningful value
when returning an error, otherwise callers might end up checking an
errno coming from a completely different function.

[1]: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/205

Signed-off-by: Simon Ser <contact@emersion.fr>
Fixes: b19488c7154b ("util: Limit size of wl_map")

23 months agobuild: bump to version 1.20.93 for the RC1 release 1.20.93
Simon Ser [Thu, 23 Jun 2022 19:59:18 +0000 (21:59 +0200)]
build: bump to version 1.20.93 for the RC1 release

23 months agoserver: warn about global filtering consistency
Simon Ser [Wed, 15 Jun 2022 08:37:18 +0000 (10:37 +0200)]
server: warn about global filtering consistency

The filtering needs to be static given a client and a global,
otherwise libwayland will misbehave.

Signed-off-by: Simon Ser <contact@emersion.fr>
References: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/241#note_1421888

23 months agoserver: add PID race condition disclaimer to wl_client_get_credentials
Simon Ser [Tue, 31 May 2022 17:23:38 +0000 (19:23 +0200)]
server: add PID race condition disclaimer to wl_client_get_credentials

PIDs are re-used and cannot be used to reliably check the identity of
a Wayland client.

Signed-off-by: Simon Ser <contact@emersion.fr>
23 months agotests: add a test for dynamic filtered globals
Simon Ser [Thu, 12 May 2022 17:30:38 +0000 (19:30 +0200)]
tests: add a test for dynamic filtered globals

Ensure dynamically created and destroyed globals which are filtered
don't trigger any global/global_remove event.

Signed-off-by: Simon Ser <contact@emersion.fr>
23 months agoserver: check visibility before sending global/global_remove
Simon Ser [Thu, 12 May 2022 17:29:11 +0000 (19:29 +0200)]
server: check visibility before sending global/global_remove

See the previous discussion at [1]: libwayland incorrectly skips
the visibility checks when sending global/global_remove events.
The check is only performed when a client performs a
wl_display.get_registry request.

[1]: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/148

Signed-off-by: Simon Ser <contact@emersion.fr>
23 months agocursor/os-compatibility: handle EINTR gracefully
Olivier Fourdan [Mon, 30 May 2022 07:14:04 +0000 (09:14 +0200)]
cursor/os-compatibility: handle EINTR gracefully

If os_resize_anonymous_file() called from os_create_anonymous_file()
fails with EINTR (Interrupted system call), then the buffer allocation
fails.

To avoid that, retry posix_fallocate() on EINTR.

However, in the presence of an alarm, the interrupt may trigger
repeatedly and prevent a large posix_fallocate() to ever complete
successfully, so we need to first block SIGALRM to prevent this.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
23 months agobuild: bump to version 1.20.92 for the beta release 1.20.92
Simon Ser [Thu, 9 Jun 2022 18:52:32 +0000 (20:52 +0200)]
build: bump to version 1.20.92 for the beta release

Signed-off-by: Simon Ser <contact@emersion.fr>
23 months agoclient: Lock display when setting a proxy event queue
Alexandros Frantzis [Thu, 26 May 2022 09:18:28 +0000 (12:18 +0300)]
client: Lock display when setting a proxy event queue

Assignments to a wl_proxy's queue member are currently not synchronized
with potential reads of that member during event reading/queuing.
Assuming atomic pointer value reads and writes (which is a reasonable
assumption), and using the documented best practices to handle event
queue changes, a queue change should still be safe to perform.

That being said, such implicitly atomic accesses are difficult to assess
for correctness, especially since they do not introduce memory barriers.

To make the code more obviously correct, and handle any potential races
we are not currently aware of, this commit updates wl_proxy_set_queue()
to set the proxy's event queue under the display lock (all other
proxy queue accesses are already done under the display lock).

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Suggested-by: Pekka Paalanen <pekka.paalanen@collabora.com>
23 months agoclient: Document best practices for event queue changes
Alexandros Frantzis [Thu, 26 May 2022 09:05:15 +0000 (12:05 +0300)]
client: Document best practices for event queue changes

Document the proper way to deal with event queue changes, in order to
guarantee proper handing of all events which were queued before the
queue change takes effect, especially in multi-threaded setups.

Make a special note about queue changes of newly created proxies,
which require the use of a proxy wrapper for thread safety.

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Suggested-by: Pekka Paalanen <pekka.paalanen@collabora.com>
23 months agoCheck that XDG base directories paths are absolute
Antonin Décimo [Fri, 11 Mar 2022 13:08:49 +0000 (14:08 +0100)]
Check that XDG base directories paths are absolute

The [spec][1] reads:

> All paths set in these environment variables must be absolute. If an
> implementation encounters a relative path in any of these variables it should
> consider the path invalid and ignore it.

and

> If $XDG_DATA_HOME is either not set or empty, a default equal to
> $HOME/.local/share should be used.

Testing that the path is absolute also entails that is is non-empty.

[1]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

Signed-off-by: Antonin Décimo <antonin.decimo@gmail.com>
2 years agocursor/os-compatibility: fix trailing space
Simon Ser [Sat, 4 Jun 2022 20:58:50 +0000 (22:58 +0200)]
cursor/os-compatibility: fix trailing space

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor/os-compatibility: remove strcpy/strcat usage
Simon Ser [Sat, 4 Jun 2022 20:56:36 +0000 (22:56 +0200)]
cursor/os-compatibility: remove strcpy/strcat usage

These functions don't perform bounds checking, so they are easy to
misuse and complicate audits.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: move xcursor_theme_inherits declarations at the top
Simon Ser [Fri, 27 May 2022 15:52:35 +0000 (17:52 +0200)]
cursor: move xcursor_theme_inherits declarations at the top

Per code style, declarations need to be at the start of the block.

And make l const while at it.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop xcursor_add_path_elt
Simon Ser [Fri, 27 May 2022 15:49:10 +0000 (17:49 +0200)]
cursor: drop xcursor_add_path_elt

Just use snprintf instead. It doesn't really matter if we have
some duplicate slashes in filenames.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop unused XCursor comment declarations
Simon Ser [Fri, 27 May 2022 15:17:42 +0000 (17:17 +0200)]
cursor: drop unused XCursor comment declarations

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix indentation of xcursor_load_theme declaration
Simon Ser [Fri, 27 May 2022 15:16:17 +0000 (17:16 +0200)]
cursor: fix indentation of xcursor_load_theme declaration

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: simplify xcursor_library_path
Simon Ser [Fri, 27 May 2022 15:14:24 +0000 (17:14 +0200)]
cursor: simplify xcursor_library_path

- Use early returns
- De-duplicate XDG_DATA_HOME code-paths
- Don't crash on allocation failure
- Use size_t when appropriate
- Fix indentation

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove unnecessary ifs in xcursor_load_theme
Simon Ser [Fri, 27 May 2022 15:09:48 +0000 (17:09 +0200)]
cursor: remove unnecessary ifs in xcursor_load_theme

load_all_cursors_from_dir and xcursor_theme_inherits already have
the NULL checks we want.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop xcursor_images_set_name
Simon Ser [Fri, 27 May 2022 15:07:08 +0000 (17:07 +0200)]
cursor: drop xcursor_images_set_name

We don't ever need to set the name multiple times for a single
struct xcursor_images, so we can just set the field directly. Also
replace the hand-rolled logic with strdup.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: use getline instead of fgets
Simon Ser [Fri, 27 May 2022 14:54:49 +0000 (16:54 +0200)]
cursor: use getline instead of fgets

This avoids storing 8KiB on the stack, and removes the line length
limit.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove unnecessary parentheses in load_all_cursors_from_dir
Simon Ser [Fri, 27 May 2022 14:03:16 +0000 (16:03 +0200)]
cursor: remove unnecessary parentheses in load_all_cursors_from_dir

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove xcursor_file_load_images wrapper
Simon Ser [Fri, 27 May 2022 14:01:42 +0000 (16:01 +0200)]
cursor: remove xcursor_file_load_images wrapper

It's just calling xcursor_xc_file_load_images.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agobuild: bump to version 1.20.91 for the alpha release 1.20.91
Simon Ser [Thu, 26 May 2022 18:15:35 +0000 (20:15 +0200)]
build: bump to version 1.20.91 for the alpha release

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoMeson: Override wayland-scanner if it can be run
Xavier Claessens [Mon, 4 Apr 2022 13:34:33 +0000 (09:34 -0400)]
Meson: Override wayland-scanner if it can be run

This allows projects to use Wayland as a Meson subproject and get the
wayland-scanner executable when doing find_program('wayland-scanner').

Signed-off-by: Xavier Claessens <xavier.claessens@collabora.com>
2 years agoutil: fix code block language in docs
Simon Ser [Thu, 5 May 2022 10:18:16 +0000 (12:18 +0200)]
util: fix code block language in docs

Without {.xml}, Doxygen interprets the code as C. See [1] for
details.

[1]: https://www.doxygen.nl/manual/commands.html#cmdcode

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: rename local variables to snake case
Simon Ser [Thu, 21 Apr 2022 10:01:19 +0000 (12:01 +0200)]
cursor: rename local variables to snake case

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop xcursor_file abstraction
Simon Ser [Thu, 21 Apr 2022 09:57:31 +0000 (11:57 +0200)]
cursor: drop xcursor_file abstraction

Just use FILE * directly instead.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: refactor xcursor_theme_inherits
Simon Ser [Thu, 21 Apr 2022 09:53:24 +0000 (11:53 +0200)]
cursor: refactor xcursor_theme_inherits

Use early returns and breaks to avoid dealing with very long
indentation lines.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: convert macros to functions
Simon Ser [Thu, 21 Apr 2022 09:48:49 +0000 (11:48 +0200)]
cursor: convert macros to functions

Improves readability since there's no need for so many parentheses
anymore, adds type safety. The compiler will inline the function
automatically as necessary.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: rename functions to snake case
Simon Ser [Thu, 21 Apr 2022 09:45:20 +0000 (11:45 +0200)]
cursor: rename functions to snake case

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix whitespace in function args definitions
Simon Ser [Thu, 21 Apr 2022 09:31:45 +0000 (11:31 +0200)]
cursor: fix whitespace in function args definitions

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove struct typedefs, rename to snake case
Simon Ser [Thu, 21 Apr 2022 09:29:08 +0000 (11:29 +0200)]
cursor: remove struct typedefs, rename to snake case

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix spacing around conditions and loops
Simon Ser [Thu, 21 Apr 2022 09:17:12 +0000 (11:17 +0200)]
cursor: fix spacing around conditions and loops

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix indentation
Simon Ser [Sun, 17 Apr 2022 15:40:55 +0000 (17:40 +0200)]
cursor: fix indentation

Use tabs.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove unnecessary if before free
Simon Ser [Sun, 17 Apr 2022 15:30:05 +0000 (17:30 +0200)]
cursor: remove unnecessary if before free

free(NULL) is valid and is a no-op.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix variable declaration style
Simon Ser [Sun, 17 Apr 2022 15:28:44 +0000 (17:28 +0200)]
cursor: fix variable declaration style

Use a single space between type and variable name.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix struct declaration style
Simon Ser [Sun, 17 Apr 2022 15:20:33 +0000 (17:20 +0200)]
cursor: fix struct declaration style

Use tabs for indentation, don't use tabs to align field names.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: fix define style
Simon Ser [Sun, 17 Apr 2022 15:19:31 +0000 (17:19 +0200)]
cursor: fix define style

Don't use tabs, don't align.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop whitespace before parens in function calls
Simon Ser [Sun, 17 Apr 2022 15:10:53 +0000 (17:10 +0200)]
cursor: drop whitespace before parens in function calls

This is in line with the rest of the Wayland code style.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop XCURSOR_LIB_* defines
Simon Ser [Sun, 17 Apr 2022 15:02:49 +0000 (17:02 +0200)]
cursor: drop XCURSOR_LIB_* defines

These are unused.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: drop XcursorTrue and XcursorFalse
Simon Ser [Sun, 17 Apr 2022 15:01:18 +0000 (17:01 +0200)]
cursor: drop XcursorTrue and XcursorFalse

Just use <stdbool.h> instead.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: remove private Xcursor int typedefs
Simon Ser [Sun, 17 Apr 2022 14:57:15 +0000 (16:57 +0200)]
cursor: remove private Xcursor int typedefs

Just use the types directly instead.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoserver: add wl_global_get_version
Simon Ser [Thu, 12 May 2022 17:01:26 +0000 (19:01 +0200)]
server: add wl_global_get_version

Add a helper to check the advertised version of a global. This can
be handy when checking whether a compositor feature is supported,
instead of having to store the version passed to wl_global_create
separately.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoutil: Limit size of wl_map
Derek Foreman [Fri, 28 Jan 2022 19:18:37 +0000 (13:18 -0600)]
util: Limit size of wl_map

Since server IDs are basically indistinguishable from really big client
IDs at many points in the source, it's theoretically possible to overflow
a map and either overflow server IDs into the client ID space, or grow
client IDs into the server ID space. This would currently take a massive
amount of RAM, but the definition of massive changes yearly.

Prevent this by placing a ridiculous but arbitrary upper bound on the
number of items we can put in a map: 0xF00000, somewhere over 15 million.
This should satisfy pathological clients without restriction, but stays
well clear of the 0xFF000000 transition point between server and client
IDs. It will still take an improbable amount of RAM to hit this, and a
client could still exhaust all RAM in this way, but our goal is to prevent
overflow and undefined behaviour.

Fixes #224

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
2 years agodocs/publican: ensure output encoding is UTF-8
Simon Ser [Tue, 10 May 2022 15:21:11 +0000 (17:21 +0200)]
docs/publican: ensure output encoding is UTF-8

Without this, DocBook picks the output encoding and on some setups
we end up with ISO-8859-1. Tested by booting a fresh Alpine VM,
verifying that the generated HTML is using the incorrect charset,
applying the patch, and verifying that the generated HTML is fixed.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agobuild: sanity check options
Simon Ser [Thu, 5 May 2022 09:14:00 +0000 (11:14 +0200)]
build: sanity check options

Fail when tests/documentation is enabled without libraries. Fail
when neither scanner nor libraries is enabled, because we don't
build anything in that case.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: use MAP_FAILED instead of hardcoded constant
Simon Ser [Fri, 6 May 2022 19:57:24 +0000 (21:57 +0200)]
cursor: use MAP_FAILED instead of hardcoded constant

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoRemove publish-doc
Simon Ser [Thu, 5 May 2022 09:24:11 +0000 (11:24 +0200)]
Remove publish-doc

We don't use this script anymore.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agowl_shell is not mandatory
Demi Marie Obenour [Tue, 5 Oct 2021 14:06:07 +0000 (10:06 -0400)]
wl_shell is not mandatory

Even though it is part of wayland.xml, wl_shell is not mandatory for
compositors to implement, and may be removed in a future version.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
2 years agoos: drop unnecessary memcpy in wl_os_mremap_maymove
Simon Ser [Tue, 29 Mar 2022 08:16:17 +0000 (10:16 +0200)]
os: drop unnecessary memcpy in wl_os_mremap_maymove

FreeBSD doesn't support mremap [1], so we have a fallback
implementation based on munmap+mmap. We memcpy from the old memory
region to the new one, however this is unnecessary because the new
mapping references the same file as the old one.

Use msync to make sure any pending write is flushed to the underlying
file before we map the new region.

[1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=59912

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoshm: Close file descriptors not needed
Olivier Fourdan [Mon, 10 Jan 2022 14:10:07 +0000 (15:10 +0100)]
shm: Close file descriptors not needed

Commit 5a981ee8 implemented a fallback path for platforms which do not
support mremap() such as FreeBSD.

To do so, the file descriptor for the mmap() is not closed immediately
but instead kept as long as the pool exists.

That induces more file descriptors kept open for longer, which in turn
may cause problems as wl_shm may be using a lot of file descriptors,
especially with Xwayland which can create a lot of pixmaps on behalf of
its X11 clients.

For platforms where mremap() is available, keeping those file
descriptors opened is a bit of a waste and may cause exhaustion of file
descriptors sooner that before commit 5a981ee8.

Only keep the mmap() file descriptor open on platforms which do not
implement mremap()  and close it immediately as before on others.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1283

2 years agoconnection: change clen type in build_cmsg to size_t
Sigrid Solveig Haflínudóttir [Tue, 29 Mar 2022 16:51:15 +0000 (18:51 +0200)]
connection: change clen type in build_cmsg to size_t

To avoid implicit conversion since msg_control's type is size_t.

Signed-off-by: Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>
2 years agoconnection: fix asan report on sendmsg call
Sigrid Solveig Haflínudóttir [Tue, 29 Mar 2022 15:59:15 +0000 (17:59 +0200)]
connection: fix asan report on sendmsg call

Initialiaze the entire msghdr struct to 0 before use.

Example of the report fixed with this change:

AddressSanitizer:DEADLYSIGNAL
=================================================================
==20035==ERROR: AddressSanitizer: SEGV on unknown address 0x2dad4dbffffa0d (pc 0x0055555c7488 bp 0x007fffffc760 sp 0x007fffffc760 T0)
==20035==The signal is caused by a READ memory access.
    #0 0x55555c7488 in read_msghdr(void*, __sanitizer::__sanitizer_msghdr*, long) (/home/ftrvx/w/_/uxn/bin/uxnemu+0x77488)
    #1 0x55555c810c in sendmsg (/home/ftrvx/w/_/uxn/bin/uxnemu+0x7810c)
    #2 0x7ff7f2db20 in wl_connection_flush /home/ftrvx/q/wayland/build/../src/connection.c:315:10
    #3 0x7ff7f2d014 in wl_display_flush /home/ftrvx/q/wayland/build/../src/wayland-client.c:2154:9
    #4 0x7ff7e80bc0  (/lib/libSDL2-2.0.so.0+0x104bc0)
    #5 0x7ff7e523b0  (/lib/libSDL2-2.0.so.0+0xd63b0)
    #6 0x7ff7e534e4  (/lib/libSDL2-2.0.so.0+0xd74e4)
    #7 0x7ff7e535e8  (/lib/libSDL2-2.0.so.0+0xd75e8)
    #8 0x7ff7daad54  (/lib/libSDL2-2.0.so.0+0x2ed54)
    #9 0x7ff7dab130  (/lib/libSDL2-2.0.so.0+0x2f130)
    #10 0x555565bb40 in main /home/ftrvx/w/_/uxn/src/uxnemu.c:519:2
    #11 0x7ff7f62484 in libc_start_main_stage2 /builddir/musl-1.1.24/src/env/__libc_start_main.c:94:2

AddressSanitizer can not provide additional info.
SUMMARY: AddressSanitizer: SEGV (/home/ftrvx/w/_/uxn/bin/uxnemu+0x77488) in read_msghdr(void*, __sanitizer::__sanitizer_msghdr*, long)
==20035==ABORTING

Signed-off-by: Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>
2 years agomeson: Use proper type for bools
illiliti [Sat, 2 Apr 2022 13:32:46 +0000 (16:32 +0300)]
meson: Use proper type for bools

Fix invalid usage of bools which violates official meson specification and thus
breaks muon, an implementation of meson written in C.

Signed-off-by: illiliti <illiliti@protonmail.com>
2 years agoserver: introduce wl_signal_emit_mutable
Simon Ser [Mon, 31 Jan 2022 22:09:26 +0000 (23:09 +0100)]
server: introduce wl_signal_emit_mutable

wl_signal_emit doesn't handle well situations where a listener removes
another listener. This can happen in practice: wlroots and Weston [1]
both have private helpers to workaround this defect.

wl_signal_emit can't be fixed without breaking the API. Instead,
introduce a new function. Callers need to make sure to always remove
listeners when they are free'd.

[1]: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/457

Signed-off-by: Simon Ser <contact@emersion.fr>
Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
2 years agoprotocol: add the wl_pointer.axis_value120 events
Peter Hutterer [Tue, 31 Mar 2020 03:47:04 +0000 (13:47 +1000)]
protocol: add the wl_pointer.axis_value120 events

These events are for high-resolution wheels. Each logical wheel click
represents an axis value120 value of 120, fractions of a wheel click an
integer fraction thereof. The new event replaces
wl_pointer.axis_discrete for wl_pointer versions 8 and above.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2 years agoclient, server: handle wl_map_insert_new() failures
Aleksandr Mezin [Wed, 9 Feb 2022 00:26:18 +0000 (06:26 +0600)]
client, server: handle wl_map_insert_new() failures

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2 years agoutil: set errno in wl_map_insert_at()
Aleksandr Mezin [Tue, 8 Feb 2022 23:36:11 +0000 (05:36 +0600)]
util: set errno in wl_map_insert_at()

And add errno checks in callers, where it seems to be necessary.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2 years agoutil: set errno in wl_map_reserve_new()
Aleksandr Mezin [Tue, 8 Feb 2022 22:10:42 +0000 (04:10 +0600)]
util: set errno in wl_map_reserve_new()

And also fix wl_connection_demarshal() to pass through that errno.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2 years agoutil: always check result of wl_array_add()
Aleksandr Mezin [Wed, 26 Jan 2022 13:16:55 +0000 (19:16 +0600)]
util: always check result of wl_array_add()

Not checking the result of wl_array_add() can cause writes past the end of the
allocated buffer if realloc fails.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2 years agobuild: use get_variable(pkgconfig) instead of get_pkgconfig_variable()
Simon Ser [Tue, 8 Mar 2022 12:58:17 +0000 (13:58 +0100)]
build: use get_variable(pkgconfig) instead of get_pkgconfig_variable()

We don't get a warning for it yet, but get_pkgconfig_variable() is
deprecated.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agobuild: specify native arg in add_languages()
Simon Ser [Tue, 8 Mar 2022 12:57:23 +0000 (13:57 +0100)]
build: specify native arg in add_languages()

Fixes the following warning:

    WARNING: add_languages is missing native:, assuming languages are wanted for
    both host and build.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agobuild: use full_path() instead of path()
Simon Ser [Tue, 8 Mar 2022 12:56:32 +0000 (13:56 +0100)]
build: use full_path() instead of path()

Fixes the following warning:

    WARNING: Project targeting '>= 0.56.0' but tried to use feature deprecated
    since '0.55.0': ExternalProgram.path. use ExternalProgram.full_path() instead

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoconnection: Make wl_closure_print output atomic
Alexander Irion [Mon, 7 Mar 2022 14:49:49 +0000 (15:49 +0100)]
connection: Make wl_closure_print output atomic

When multiple threads are used, output from different threads was intermixed in one line. That what breaking parsing of the log messages. Now, intermixing is prevented by using a memstream.

Signed-off-by: Alexander Irion <alexander_irion@mentor.com>
2 years agoprotocol: wl_shm.format events are actually sent after bind
Mikhail Gusarov [Sun, 20 Feb 2022 19:10:49 +0000 (20:10 +0100)]
protocol: wl_shm.format events are actually sent after bind

Protocol documentation mistakenly specified that wl_shm.format
events are sent at connection setup time, but that's impossible
(clients do not yet know ID of wl_shm object at the time) and
contradicts implementation in libwayland.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2 years agomeson: use absolute paths for doxygen stamp files
Simon Ser [Tue, 5 Jan 2021 11:07:13 +0000 (12:07 +0100)]
meson: use absolute paths for doxygen stamp files

The relative paths are incorrect when running as a subproject.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agomeson: use project build root for doxygen output
Simon Ser [Tue, 5 Jan 2021 11:05:11 +0000 (12:05 +0100)]
meson: use project build root for doxygen output

meson.build_root() returns the parent's build directory if Wayland is
a subproject. This fails with:

    error: tag OUTPUT_DIRECTORY: Output directory '<parent-build-dir>/doc/doxygen' does not exist and cannot be created

Instead, use meson.project_build_root(), which returns the subproject's
build directory.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agomeson: build requirement to 0.56.0
Simon Ser [Tue, 5 Jan 2021 11:10:58 +0000 (12:10 +0100)]
meson: build requirement to 0.56.0

meson.project_build_root() is only available with 0.56.0.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agocursor: Remove unused XcursorLibraryLoadImages() function
Vlad Zahorodnii [Thu, 27 Jan 2022 19:11:20 +0000 (21:11 +0200)]
cursor: Remove unused XcursorLibraryLoadImages() function

XcursorLibraryLoadImages() function is unused and not exported according to
objdump, so its removal should be an ABI compatible change.

Signed-off-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
2 years agodisplay-test: Fix a race condition in test suite
Fergus Dall [Tue, 14 Dec 2021 23:31:41 +0000 (10:31 +1100)]
display-test: Fix a race condition in test suite

Several tests in this suite use setting and checking client.display_stopped (in
test-compositor.h) to synchronise between threads. This is a data race because
display_stopped is a non-atomic int. Fix this by making it an atomic_bool
instead. We don't need to change the access code because reads and writes are
sequentially consistent by default.

This can be reproduced (with both clang and gcc) by running
```
meson -Db_sanitize=thread build
cd build
ninja
meson test
```

Signed-off-by: Fergus Dall <sidereal@google.com>
2 years agoUse zalloc for structs
Simon Ser [Mon, 31 Jan 2022 21:23:30 +0000 (22:23 +0100)]
Use zalloc for structs

When allocating memory for structs, use zalloc instead of malloc.
This ensures the memory is zero-initialized, and reduces the risk
of forgetting to initialize all struct fields.

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agobuild: explicitly set check arg in run_command()
Simon Ser [Wed, 2 Feb 2022 14:04:42 +0000 (15:04 +0100)]
build: explicitly set check arg in run_command()

Fixes the following warning:

    WARNING: You should add the boolean check kwarg to the run_command call.
             It currently defaults to false,
             but it will default to true in future releases of meson.
             See also: https://github.com/mesonbuild/meson/issues/9300

Signed-off-by: Simon Ser <contact@emersion.fr>
2 years agoprotocol: xkb_v1 is null-terminated
Julian Orth [Mon, 10 Jan 2022 16:31:07 +0000 (17:31 +0100)]
protocol: xkb_v1 is null-terminated

Closes #270

Signed-off-by: Julian Orth <ju.orth@gmail.com>