wayland: Changes to 'upstream-unstable'
configure.ac | 2 +-
doc/Contributing | 13 +++++++++++++
doc/doxygen/dot/wayland-architecture.gv | 13 +++++--------
doc/doxygen/dot/x-architecture.gv | 17 ++++++++---------
src/scanner.c | 4 +---
src/wayland-server.c | 2 --
src/wayland-util.c | 18 +++++++++---------
tests/connection-test.c | 10 +++++-----
8 files changed, 42 insertions(+), 37 deletions(-)
New commits:
commit 989cf03d1ce05d2b2481758e746f7299a1086880
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Tue Aug 8 11:20:35 2017 -0700
configure.ac: bump to version 1.14.0 for the official release
diff --git a/configure.ac b/configure.ac
index 6739742..8ac54e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
-m4_define([wayland_minor_version], [13])
-m4_define([wayland_micro_version], [93])
+m4_define([wayland_minor_version], [14])
+m4_define([wayland_micro_version], [0])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit 269c1434b4f5442a5625b662dd4bef10d2d22910
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Tue Aug 1 11:12:43 2017 -0700
configure.ac: bump to version 1.13.93 for the RC1 release
diff --git a/configure.ac b/configure.ac
index d638b07..6739742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [13])
-m4_define([wayland_micro_version], [92])
+m4_define([wayland_micro_version], [93])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit 042e7eadd8e852ef466592f0f0be0dab84736187
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Thu Jun 1 22:48:29 2017 -0400
Switch graphviz files to use HTML-style labels
With recent versions of graphviz, generation of the diagrams in the documentation
fails with:
/usr/bin/dot -Tpng -oxml/x-architecture.png dot/x-architecture.gv
Warning: flat edge between adjacent nodes one of which has a record shape - replace records with HTML-like labels
Edge xserver -> comp
Error: getsplinepoints: no spline points available for edge (xserver,comp)
Error: lost xserver comp edge
Error: lost xserver comp edge
Error: lost comp xserver edge
Error: lost comp xserver edge
http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226 indicates
that the error message basically means that the authors of graphviz consider record-style
labels to be deprecated and are no longer fixing errors with them. This patch changes
the labels to be in the HTML style, which seems to require duplicating style between all
the nodes, but it's not like these files are often edited.
The result is not exactly the same but is quite similar.
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
Tested-by: Armin Krezović <krezovic.armin@gmail.com>
diff --git a/doc/doxygen/dot/wayland-architecture.gv b/doc/doxygen/dot/wayland-architecture.gv
index 2d5db84..f2c3507 100644
--- a/doc/doxygen/dot/wayland-architecture.gv
+++ b/doc/doxygen/dot/wayland-architecture.gv
@@ -9,21 +9,18 @@ digraph arch_wayland {
]
node[
- shape="Mrecord",
color=none,
- fillcolor="#ffbc00",
- style="filled",
+ margin=0,
fontname="DejaVu Sans",
fontsize="18",
]
- c1 [label="Wayland Client", URL="#c1"]
- c2 [label="Wayland Client", URL="#c2"]
+ c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c1"]
+ c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c2"]
- comp [tooltip="Wayland Compositor", label="|{|Wayland\nCompositor|}|", URL="#comp"]
-
- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
+ comp [tooltip="Wayland Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Wayland<BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
+ impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
c1 -> comp [taillabel="③", labeldistance=2.5, URL="#step_3"];
c2 -> comp;
diff --git a/doc/doxygen/dot/x-architecture.gv b/doc/doxygen/dot/x-architecture.gv
index 4ea49bf..b223d1d 100644
--- a/doc/doxygen/dot/x-architecture.gv
+++ b/doc/doxygen/dot/x-architecture.gv
@@ -9,28 +9,27 @@ digraph arch_x {
]
node[
- shape="Mrecord",
+ shape="none",
color=none,
- fillcolor="#ffbc00",
- style="filled",
+ margin=0,
fontname="DejaVu Sans",
fontsize="18",
]
{
rank=same;
- c1 [label="X Client", URL="#c1"]
- c3 [label="X Client", URL="#c3"]
+ c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c1"]
+ c3 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c3"]
}
- c2 [label="X Client", URL="#c2"]
+ c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c2"]
{
rank=same;
- xserver [tooltip="X Server", label="|{|X Server|}|", URL="#xserver"]
- comp [tooltip="Compositor", label="|{|Compositor|}|", URL="#comp"]
+ xserver [tooltip="X Server", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>X Server<BR/><BR/></TD></TR></TABLE>>, URL="#xserver"]
+ comp [tooltip="Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
}
- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
+ impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"];
c2 -> xserver;
commit 897256d4190caf276363b8ce11de8846094ea553
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Tue Jul 25 16:25:01 2017 -0700
configure.ac: bump to version 1.13.92 for the beta release
diff --git a/configure.ac b/configure.ac
index 7ea23ea..d638b07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [13])
-m4_define([wayland_micro_version], [91])
+m4_define([wayland_micro_version], [92])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit f52c50baad90f9c44d1a7ae21802204b4f9702d9
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Tue Jul 11 19:07:55 2017 -0700
configure.ac: bump to version 1.13.91 for the alpha release
diff --git a/configure.ac b/configure.ac
index b583bef..7ea23ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [13])
-m4_define([wayland_micro_version], [90])
+m4_define([wayland_micro_version], [91])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit 0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
Author: Daniel Stone <daniels@collabora.com>
Date: Thu Apr 6 15:09:37 2017 +0100
docs: Reference Contributor Covenant
All fd.o projects are now covered by the Contributor Covenant. Include a
reference to this in the Contributing doc, making it clear that we are
all expected to behave like human beings.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Jonas Ådahl <jadahl@gmail.com>
diff --git a/doc/Contributing b/doc/Contributing
index c790a07..9475271 100644
--- a/doc/Contributing
+++ b/doc/Contributing
@@ -159,6 +159,19 @@ my_function(void)
x = function_with_a_really_long_name(parameter1, parameter2,
parameter3, parameter4);
+
+== Conduct ==
+
+As a freedesktop.org project, Wayland follows the Contributor Covenant,
+found at:
+https://www.freedesktop.org/wiki/CodeOfConduct
+
+Please conduct yourself in a respectful and civilised manner when
+interacting with community members on mailing lists, IRC, or bug
+trackers. The community represents the project as a whole, and abusive
+or bullying behaviour is not tolerated by the project.
+
+
== Licensing ==
Wayland is licensed with the intention to be usable anywhere X.org is.
commit 3f2c19469734a712ced0a1b17559d7e3bd744d50
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Mar 17 17:35:38 2017 +0000
scanner: Reword fallthrough comment to quiet GCC
GCC 7 now requires an explicit comment noting that case statements
without a break fall through. We already had one of those in the
scanner, but GCC wasn't smart enough to pick it up.
Quiet the warning by making the comment less elaborate.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
diff --git a/src/scanner.c b/src/scanner.c
index a6c334f..517068c 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -740,9 +740,7 @@ start_element(void *data, const char *element_name, const char **atts)
switch (arg->type) {
case NEW_ID:
ctx->message->new_id_count++;
-
- /* Fall through to OBJECT case. */
-
+ /* fallthrough */
case OBJECT:
if (interface_name)
arg->interface_name = xstrdup(interface_name);
commit 9452cc53da5bef65a38e4d5a66a838c61e49f6cd
Author: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Thu Mar 16 11:46:06 2017 +0000
connection-test: fix assert
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 8be6c38..157e1bc 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -603,8 +603,8 @@ suu_handler(void *data, struct wl_object *object,
int *done = data;
assert(strcmp(s, "foo") == 0);
- assert(u1 = 500);
- assert(u2 = 404040);
+ assert(u1 == 500);
+ assert(u2 == 404040);
*done = 1;
}
commit 654dee85c65e554b3f0d82350d6740520e4e7d56
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Tue Feb 21 16:14:26 2017 +0000
wayland-util: do not export the wl_map_* API
Used only internally and explicitly marked as such with commit
cf04b0a18f2 ("Move private definitions and prototypes to new
zwayland-private.h")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/src/wayland-util.c b/src/wayland-util.c
index 077fec7..cab7fc5 100644
--- a/src/wayland-util.c
+++ b/src/wayland-util.c
@@ -177,21 +177,21 @@ union map_entry {
#define map_entry_get_data(entry) ((void *)((entry).next & ~(uintptr_t)0x3))
#define map_entry_get_flags(entry) (((entry).next >> 1) & 0x1)
-WL_EXPORT void
+void
wl_map_init(struct wl_map *map, uint32_t side)
{
memset(map, 0, sizeof *map);
map->side = side;
}
-WL_EXPORT void
+void
wl_map_release(struct wl_map *map)
{
wl_array_release(&map->client_entries);
wl_array_release(&map->server_entries);
}
-WL_EXPORT uint32_t
+uint32_t
wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data)
{
union map_entry *start, *entry;
@@ -223,7 +223,7 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data)
return (entry - start) + base;
}
-WL_EXPORT int
+int
wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data)
{
union map_entry *start;
@@ -251,7 +251,7 @@ wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data)
return 0;
}
-WL_EXPORT int
+int
wl_map_reserve_new(struct wl_map *map, uint32_t i)
{
union map_entry *start;
@@ -290,7 +290,7 @@ wl_map_reserve_new(struct wl_map *map, uint32_t i)
return 0;
}
-WL_EXPORT void
+void
wl_map_remove(struct wl_map *map, uint32_t i)
{
union map_entry *start;
@@ -314,7 +314,7 @@ wl_map_remove(struct wl_map *map, uint32_t i)
map->free_list = (i << 1) | 1;
}
-WL_EXPORT void *
+void *
wl_map_lookup(struct wl_map *map, uint32_t i)
{
union map_entry *start;
@@ -337,7 +337,7 @@ wl_map_lookup(struct wl_map *map, uint32_t i)
return NULL;
}
-WL_EXPORT uint32_t
+uint32_t
wl_map_lookup_flags(struct wl_map *map, uint32_t i)
{
union map_entry *start;
@@ -379,7 +379,7 @@ for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data)
return ret;
}
-WL_EXPORT void
+void
wl_map_for_each(struct wl_map *map, wl_iterator_func_t func, void *data)
{
enum wl_iterator_result ret;
commit 9b78be6bb0df43b7fe197946fe764e8a758006a8
Author: Sergi Granell <xerpi.g.12@gmail.com>
Date: Sun Feb 26 22:55:53 2017 +0100
wayland-server: Remove unused members from struct wl_client
Those struct members are no longer used so we can remove them.
Signed-off-by: Sergi Granell <xerpi.g.12@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/src/wayland-server.c b/src/wayland-server.c
index 6a8b3e4..82a3b01 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -74,8 +74,6 @@ struct wl_client {
struct wl_event_source *source;
struct wl_display *display;
struct wl_resource *display_resource;
- uint32_t id_count;
- uint32_t mask;
struct wl_list link;
struct wl_map objects;
struct wl_priv_signal destroy_signal;
commit 680a6b32de49896dc290968f83a1e4cce315888e
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Thu Feb 23 13:47:41 2017 +0100
tests: Fix "new ID" type handling in argument_from_va_list test
New IDs are internally dealt with as objects, however this test
expected to deal with 'n' as the uint32_t type that's just seen
through the wire. We should give it an object instead, and
expect an object from it.
https://bugs.freedesktop.org/show_bug.cgi?id=99899
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Kalev Lember <kalevlember@gmail.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 1c688f1..8be6c38 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -142,7 +142,7 @@ va_list_wrapper(const char *signature, union wl_argument *args, int count, ...)
TEST(argument_from_va_list)
{
union wl_argument args[WL_CLOSURE_MAX_ARGS];
- struct wl_object fake_object;
+ struct wl_object fake_object, fake_new_object;
struct wl_array fake_array;
va_list_wrapper("i", args, 1, 100);
@@ -154,13 +154,13 @@ TEST(argument_from_va_list)
va_list_wrapper("?iuf?sonah", args, 8,
102, 103, wl_fixed_from_int(104), "value",
- &fake_object, 105, &fake_array, 106);
+ &fake_object, &fake_new_object, &fake_array, 106);
assert(args[0].i == 102);
assert(args[1].u == 103);
assert(args[2].f == wl_fixed_from_int(104));
assert(strcmp(args[3].s, "value") == 0);
assert(args[4].o == &fake_object);
- assert(args[5].n == 105);
+ assert(args[5].o == &fake_new_object);
assert(args[6].a == &fake_array);
assert(args[7].h == 106);
}
commit f8c93078f8ec4f754dfd7dc5de1c9833a3b0f453
Author: Bryce Harrington <bryce@osg.samsung.com>
Date: Tue Feb 21 14:25:03 2017 -0800
configure.ac: bump version to 1.13.90 for open development
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
diff --git a/configure.ac b/configure.ac
index fcce4ce..b583bef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [13])
-m4_define([wayland_micro_version], [0])
+m4_define([wayland_micro_version], [90])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
Reply to: