wayland: Changes to 'debian-experimental'
configure.ac | 10
debian/changelog | 12
debian/libwayland-client0.symbols | 1
debian/libwayland-server0.symbols | 1
debian/rules | 4
dev/null |binary
doc/Makefile.am | 2
doc/Wayland/.gitignore | 3
doc/Wayland/Makefile.am | 102 --
doc/Wayland/doxygen-to-publican.xsl | 72 -
doc/Wayland/en_US/Architecture.xml | 330 -------
doc/Wayland/en_US/Author_Group.xml | 16
doc/Wayland/en_US/Book_Info.xml | 39
doc/Wayland/en_US/Compositors.xml | 138 ---
doc/Wayland/en_US/Library.xml | 9
doc/Wayland/en_US/Overview.xml | 129 --
doc/Wayland/en_US/Protocol.xml | 456 ----------
doc/Wayland/en_US/Wayland.ent | 4
doc/Wayland/en_US/Wayland.xml | 15
doc/Wayland/en_US/images/icon.svg | 19
doc/Wayland/protocol-interfaces-to-docbook.xsl | 56 -
doc/Wayland/protocol-to-docbook.xsl | 134 --
doc/Wayland/publican.cfg | 8
doc/doxygen/Makefile.am | 41
doc/doxygen/wayland.doxygen.in | 11
doc/man/wl_display_connect.xml | 8
doc/publican/.gitignore | 3
doc/publican/Makefile.am | 138 +++
doc/publican/doxygen-to-publican.xsl | 166 +++
doc/publican/protocol-interfaces-to-docbook.xsl | 56 +
doc/publican/protocol-to-docbook.xsl | 136 +++
doc/publican/publican.cfg | 8
doc/publican/sources/Architecture.xml | 330 +++++++
doc/publican/sources/Author_Group.xml | 16
doc/publican/sources/Book_Info.xml | 71 +
doc/publican/sources/Compositors.xml | 128 ++
doc/publican/sources/Foreword.xml | 29
doc/publican/sources/Introduction.xml | 116 ++
doc/publican/sources/Library.xml | 27
doc/publican/sources/Preface.xml | 20
doc/publican/sources/Protocol.xml | 462 ++++++++++
doc/publican/sources/Revision_History.xml | 7
doc/publican/sources/Wayland.ent | 4
doc/publican/sources/Wayland.xml | 17
doc/publican/sources/images/icon.svg | 19
doc/publican/sources/images/wayland-architecture.png |binary
doc/publican/sources/images/wayland.png |binary
doc/publican/sources/images/x-architecture.png |binary
protocol/wayland.xml | 850 ++++++++++++-------
src/connection.c | 693 ++++++++-------
src/data-device.c | 16
src/scanner.c | 18
src/wayland-client.c | 63 -
src/wayland-client.h | 1
src/wayland-private.h | 40
src/wayland-server.c | 64 -
src/wayland-server.h | 21
src/wayland-shm.c | 24
src/wayland-util.c | 4
src/wayland-util.h | 6
tests/connection-test.c | 13
tests/os-wrappers-test.c | 4
62 files changed, 2909 insertions(+), 2281 deletions(-)
New commits:
commit 269987c5c4221d376e7ec37bdada7fff6ee50c43
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Jun 3 08:44:22 2013 +0200
Release to experimental
diff --git a/debian/changelog b/debian/changelog
index 94162e4..d421545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-wayland (1.1.0-1) UNRELEASED; urgency=low
+wayland (1.1.0-1) experimental; urgency=low
+ * Team upload.
* New upstream release.
* debian/libwayland-client0.symbols
debian/libwayland-server0.symbols:
@@ -7,7 +8,7 @@ wayland (1.1.0-1) UNRELEASED; urgency=low
* debian/rules:
+ Bump SHVER accordingly.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 02 Jun 2013 17:20:51 +0200
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 03 Jun 2013 08:44:14 +0200
wayland (1.0.5-2) experimental; urgency=low
commit 3ee0c8270ecafb208d792930b8078a23175414b6
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon Jun 3 08:43:39 2013 +0200
Bump SHVER accordingly
diff --git a/debian/changelog b/debian/changelog
index 427443e..94162e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ wayland (1.1.0-1) UNRELEASED; urgency=low
* debian/libwayland-client0.symbols
debian/libwayland-server0.symbols:
+ Add a couple of new symbols.
+ * debian/rules:
+ + Bump SHVER accordingly.
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 02 Jun 2013 17:20:51 +0200
diff --git a/debian/rules b/debian/rules
index c51e675..0cc1bed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,11 @@ override_dh_install:
override_dh_makeshlibs:
dh_makeshlibs -plibwayland-client0 \
- -V 'libwayland-client0 (>= 1.0.4)' -- -c4
+ -V 'libwayland-client0 (>= 1.1.0)' -- -c4
dh_makeshlibs -plibwayland-cursor0 \
-V 'libwayland-cursor0 (>= 1.0.4)' -- -c4
dh_makeshlibs -plibwayland-server0 \
- -V 'libwayland-server0 (>= 1.0.4)' -- -c4
+ -V 'libwayland-server0 (>= 1.1.0)' -- -c4
# Debug package:
override_dh_strip:
commit 070efaa62d7032af4ebf12c08176b4bc70ca8f04
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Jun 2 17:31:21 2013 +0200
Add new symbols
diff --git a/debian/changelog b/debian/changelog
index 87a2399..427443e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
wayland (1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/libwayland-client0.symbols
+ debian/libwayland-server0.symbols:
+ + Add a couple of new symbols.
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 02 Jun 2013 17:20:51 +0200
diff --git a/debian/libwayland-client0.symbols b/debian/libwayland-client0.symbols
index ae76a80..e418551 100644
--- a/debian/libwayland-client0.symbols
+++ b/debian/libwayland-client0.symbols
@@ -46,6 +46,7 @@ libwayland-client.so.0 libwayland-client0 #MINVER#
wl_proxy_add_listener@Base 1.0.2
wl_proxy_create@Base 1.0.2
wl_proxy_destroy@Base 1.0.2
+ wl_proxy_get_class@Base 1.1.0
wl_proxy_get_id@Base 1.0.2
wl_proxy_get_user_data@Base 1.0.2
wl_proxy_marshal@Base 1.0.2
diff --git a/debian/libwayland-server0.symbols b/debian/libwayland-server0.symbols
index 46ece63..e1cdc34 100644
--- a/debian/libwayland-server0.symbols
+++ b/debian/libwayland-server0.symbols
@@ -81,6 +81,7 @@ libwayland-server.so.0 libwayland-server0 #MINVER#
wl_pointer_init@Base 1.0.2
wl_pointer_interface@Base 1.0.2
wl_pointer_release@Base 1.0.2
+ wl_pointer_set_current@Base 1.1.0
wl_pointer_set_focus@Base 1.0.2
wl_pointer_start_grab@Base 1.0.2
wl_region_interface@Base 1.0.2
commit fd4cbe542d3da54cf9c73bf36ad4b4263d010ea6
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sun Jun 2 17:30:30 2013 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 7285d96..87a2399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wayland (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 02 Jun 2013 17:20:51 +0200
+
wayland (1.0.5-2) experimental; urgency=low
* Team upload.
commit e5938320663b70842b0f10fe0fff39db06cad540
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Apr 15 20:55:33 2013 -0400
configure.ac: Bump version to 1.1.0
diff --git a/configure.ac b/configure.ac
index 4271c7a..716593b 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], [0])
-m4_define([wayland_micro_version], [90])
+m4_define([wayland_minor_version], [1])
+m4_define([wayland_micro_version], [0])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
commit 1daa6b3877d26e732a3ba53a033dd5c21c192d94
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Apr 15 20:50:52 2013 -0400
docs: Create html-pdf directories too
Fixes make dist here.
diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index 5579bd0..bf143c8 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -111,6 +111,9 @@ install-data-local:
test -z "$(pubdir)/html/Common_Content/css" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html/Common_Content/css"
test -z "$(pubdir)/html/Common_Content/images" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html/Common_Content/images"
test -z "$(pubdir)/html/images" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html/images"
+ test -z "$(pubdir)/html-pdf/Common_Content/css" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html-pdf/Common_Content/css"
+ test -z "$(pubdir)/html-pdf/Common_Content/images" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html-pdf/Common_Content/images"
+ test -z "$(pubdir)/html-pdf/images" || $(mkdir_p) "$(DESTDIR)$(pubdir)/html-pdf/images"
test -z "$(pubdir)/pdf" || $(mkdir_p) "$(DESTDIR)$(pubdir)/pdf"
test -z "$(pubdir)/xml/Common_Content/css" || $(mkdir_p) "$(DESTDIR)$(pubdir)/xml/Common_Content/css"
test -z "$(pubdir)/xml/Common_Content/images" || $(mkdir_p) "$(DESTDIR)$(pubdir)/xml/Common_Content/images"
commit 509d1d802abda4cec5a22fab5848787f92f69f02
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 4 11:29:01 2013 +1000
doc: use a dynamic list of man pages
This requires that doxygen is run before the man target so find can actually
find the man pages.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index e41c790..ec43519 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -10,56 +10,10 @@ scanned_src_files_server = \
$(top_srcdir)/src/wayland-server.c \
$(top_srcdir)/src/wayland-server.h
-client_MANPAGES = \
- man/man3/wl_display.3 \
- man/man3/wl_display_connect.3 \
- man/man3/wl_display_connect_to_fd.3 \
- man/man3/wl_display_create_queue.3 \
- man/man3/wl_display_disconnect.3 \
- man/man3/wl_display_dispatch.3 \
- man/man3/wl_display_dispatch_pending.3 \
- man/man3/wl_display_dispatch_queue.3 \
- man/man3/wl_display_dispatch_queue_pending.3 \
- man/man3/wl_display_flush.3 \
- man/man3/wl_display_get_error.3 \
- man/man3/wl_display_get_fd.3 \
- man/man3/wl_display_roundtrip.3 \
- man/man3/wl_event_queue.3 \
- man/man3/wl_event_queue_destroy.3 \
- man/man3/wl_proxy.3 \
- man/man3/wl_proxy_add_listener.3 \
- man/man3/wl_proxy_create.3 \
- man/man3/wl_proxy_destroy.3 \
- man/man3/wl_proxy_get_class.3 \
- man/man3/wl_proxy_get_id.3 \
- man/man3/wl_proxy_get_user_data.3 \
- man/man3/wl_proxy_marshal.3 \
- man/man3/wl_proxy_set_queue.3 \
- man/man3/wl_proxy_set_user_data.3
-
-server_MANPAGES = \
- man/man3/wl_buffer.3 \
- man/man3/wl_client.3 \
- man/man3/wl_data_offer.3 \
- man/man3/wl_data_source.3 \
- man/man3/wl_global.3 \
- man/man3/wl_keyboard.3 \
- man/man3/wl_keyboard_grab.3 \
- man/man3/wl_keyboard_grab_interface.3 \
- man/man3/wl_listener.3 \
- man/man3/wl_pointer.3 \
- man/man3/wl_pointer_grab.3 \
- man/man3/wl_pointer_grab_interface.3 \
- man/man3/wl_resource.3 \
- man/man3/wl_seat.3 \
- man/man3/wl_signal.3 \
- man/man3/wl_socket.3 \
- man/man3/wl_surface.3 \
- man/man3/wl_touch.3 \
- man/man3/wl_touch_grab.3 \
- man/man3/wl_touch_grab_interface.3
-
-man3_MANS= $(client_MANPAGES) $(server_MANPAGES)
+# find all man/man3/wl_foo.3 pages
+# for this to work, we need to create them before the man target (hence
+# all-local below)
+dist_man3_MANS= $(shell find man/man3/ -name "wl_*.3" -printf "man/man3/%P\n")
xml/client/index.xml: $(scanned_src_files_client) wayland.doxygen
$(AM_V_GEN)$(MKDIR_P) xml/client
@@ -84,7 +38,8 @@ doxygen.man: $(scanned_src_files_client) $(scanned_src_files_server)
echo "INPUT= $^"; \
) | doxygen -
-$(client_MANPAGES) $(server_MANPAGES): doxygen.man
+# there is no man-local
+all-local: doxygen.man
clean-local:
rm -rf xml/
commit 3ddedc053ff48fc6311be2d533aea84c2e8b756d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 4 11:29:00 2013 +1000
doc: Improve "Library" and "Compositors" chapter
Originally written Tiago Vignatti <tiago.vignatti@intel.com>
Some modifications to adjust for previously merged conflicting patches and link
to the sections (instead of <emphasis>).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/doc/publican/sources/Compositors.xml b/doc/publican/sources/Compositors.xml
index 725c35a..eea627c 100644
--- a/doc/publican/sources/Compositors.xml
+++ b/doc/publican/sources/Compositors.xml
@@ -9,6 +9,17 @@
<para>
Compositors come in different types, depending on which
role they play in the overall architecture of the OS.
+ For instance, a
+ <link linkend="sect-Compositors-System-Compositor">system compositor</link>
+ can be used for booting the system, handling multiple user switching, a
+ possible console terminal emulator and so forth. A different compositor, a
+ <link linkend="sect-Compositors-Session-Compositor">session compositor</link>
+ would provide the actual desktop environment. There are many ways for
+ different types of compositors to co-exist.
+ </para>
+ <para>
+ In this section, we introduce three types of Wayland compositors relying
+ on <link linkend="sect-Library-Server">libwayland-server</link>.
</para>
<section id="sect-Compositors-System-Compositor">
@@ -45,7 +56,7 @@
</para>
<para>
X applications can continue working under a session compositor
- by means of a root less X server that is activated on demand.
+ by means of a root-less X server that is activated on demand.
</para>
<para>
Possible examples for session compositors include
@@ -77,6 +88,12 @@
</listitem>
<listitem>
<para>
+ Weston with X11 or Wayland backend is a session compositor nested
+ in another session compositor.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
fullscreen X session under Wayland
</para>
</listitem>
diff --git a/doc/publican/sources/Library.xml b/doc/publican/sources/Library.xml
index 77408cc..bc8c89e 100644
--- a/doc/publican/sources/Library.xml
+++ b/doc/publican/sources/Library.xml
@@ -5,6 +5,23 @@
]>
<chapter id="chap-Library">
<title>Wayland Library</title>
+
+ <para>
+ The open-source reference implementation of Wayland protocol is split in two
+ C libraries, <link linkend="sect-Library-Server">libwayland-server</link> and
+ <link linkend="sect-Library-Client">libwayland-client</link>. Their main
+ responsibility is to handle the Inter-process communication
+ (<emphasis>IPC</emphasis>) with each other, therefore guaranteeing the
+ protocol objects marshaling and messages synchronization.
+ </para>
+
+ <para>
+ This Chapter describes in detail each library's methods and their helpers,
+ aiming implementors who can use for building Wayland clients and servers;
+ respectively at <xref linkend="sect-Library-Client"/> and
+ <xref linkend="sect-Library-Server"/>.
+ </para>
+
<xi:include href="WaylandClientAPI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="WaylandServerAPI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
commit 5cf14f4b57bbe63f996610a71779bbf15c06ce9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 4 11:28:59 2013 +1000
doc: create a fake make target to de-duplicate the xml merging process
The only difference between the server and client xml files is the
directories and files being named *server* and *client*, respectively. Add a
new make target to get that process done to avoid duplication
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index 202633e..5579bd0 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -55,34 +55,29 @@ en-US/ProtocolInterfaces.xml: $(top_srcdir)/protocol/wayland.xml $(srcdir)/proto
$(AM_V_GEN)$(XSLTPROC) $(srcdir)/protocol-interfaces-to-docbook.xsl \
$(top_srcdir)/protocol/wayland.xml > en-US/ProtocolInterfaces.xml
-# WaylandClientAPI.xml:
-# * we don't want wayland-client_8h.xml to avoid duplicating output methods,
+combine_xml: server client
+
+# * we don't want wayland-{server|client}_8h.xml to avoid duplicating output methods,
# move it out of the way first.
# * use doxygen's combine.xslt to merge the xml files into one single file
-# * move wayland-client_8h.xml back to its original location
-# * transform the combined XML file into docbook format
-en-US/WaylandClientAPI.xml: $(top_builddir)/doc/doxygen/xml/client/index.xml $(srcdir)/doxygen-to-publican.xsl
- $(AM_V_GEN)$(MKDIR_P) en-US/images
- $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/client/wayland-client_8h.xml \
+# * move wayland-<foo>_8h.xml back to its original location
+server client:
+ $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/$@/wayland-$@_8h.xml \
$(top_builddir)/doc/doxygen/xml/
- $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/client/combine.xslt \
- $(top_builddir)/doc/doxygen/xml/client/index.xml > \
- $(top_builddir)/doc/doxygen/xml/client/clientAPI.xml
- $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-client_8h.xml \
- $(top_builddir)/doc/doxygen/xml/client
+ $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/$@/combine.xslt \
+ $(top_builddir)/doc/doxygen/xml/$@/index.xml > \
+ $(top_builddir)/doc/doxygen/xml/$@/$@API.xml
+ $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-$@_8h.xml \
+ $(top_builddir)/doc/doxygen/xml/$@
+
+# WaylandClientAPI.xml:
+# merge doxygen xml files into one single file (see combine_xml), then transform the combined XML file into docbook format
+en-US/WaylandClientAPI.xml: combine_xml $(top_builddir)/doc/doxygen/xml/client/index.xml $(srcdir)/doxygen-to-publican.xsl
$(AM_V_GEN)$(XSLTPROC) --stringparam which Client $(srcdir)/doxygen-to-publican.xsl \
$(top_builddir)/doc/doxygen/xml/client/clientAPI.xml > en-US/WaylandClientAPI.xml
# WaylandServerAPI.xml: see WaylandClientAPI.xml
-en-US/WaylandServerAPI.xml: $(top_builddir)/doc/doxygen/xml/server/index.xml $(srcdir)/doxygen-to-publican.xsl
- $(AM_V_GEN)$(MKDIR_P) en-US/images
- $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/server/wayland-server_8h.xml \
- $(top_builddir)/doc/doxygen/xml
- $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/server/combine.xslt \
- $(top_builddir)/doc/doxygen/xml/server/index.xml > \
- $(top_builddir)/doc/doxygen/xml/server/serverAPI.xml
- $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-server_8h.xml \
- $(top_builddir)/doc/doxygen/xml/server
+en-US/WaylandServerAPI.xml: combine_xml $(top_builddir)/doc/doxygen/xml/client/index.xml $(srcdir)/doxygen-to-publican.xsl
$(AM_V_GEN)$(XSLTPROC) --stringparam which Server $(srcdir)/doxygen-to-publican.xsl \
$(top_builddir)/doc/doxygen/xml/server/serverAPI.xml > en-US/WaylandServerAPI.xml
commit b1d7131c36a853ff688377fc077a0999cfc3a1b9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 4 11:28:58 2013 +1000
doc: generate server documentation from XML too
Same as WaylandClientAPI.xml we now also generate WaylandServerAPI.xml for
publication. Most of this hunk is just adding a client/ or server/ into the
xml path to keep the two separate.
The change in wayland.doxygen now causes a standard doxygen call to not
generate anything - what is generated is specified through the options
passed by make.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 40dcecb..e41c790 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -1,5 +1,5 @@
-noinst_DATA = xml/index.xml
+noinst_DATA = xml/client/index.xml xml/server/index.xml
dist_noinst_DATA = wayland.doxygen.in
scanned_src_files_client = \
@@ -61,12 +61,23 @@ server_MANPAGES = \
man3_MANS= $(client_MANPAGES) $(server_MANPAGES)
-xml/index.xml: $(scanned_src_files_client) wayland.doxygen
- doxygen wayland.doxygen
+xml/client/index.xml: $(scanned_src_files_client) wayland.doxygen
+ $(AM_V_GEN)$(MKDIR_P) xml/client
+ (cat wayland.doxygen; \
+ echo "GENERATE_XML=YES"; \
+ echo "XML_OUTPUT=xml/client"; \
+ echo "INPUT= $(scanned_src_files_client)"; \
+ ) | doxygen -
+xml/server/index.xml: $(scanned_src_files_server) wayland.doxygen
+ $(AM_V_GEN)$(MKDIR_P) xml/server
+ (cat wayland.doxygen; \
+ echo "GENERATE_XML=YES"; \
+ echo "XML_OUTPUT=xml/server"; \
+ echo "INPUT= $(scanned_src_files_server)"; \
+ ) | doxygen -
doxygen.man: $(scanned_src_files_client) $(scanned_src_files_server)
(cat wayland.doxygen; \
- echo "GENERATE_XML=NO"; \
echo "GENERATE_MAN=YES"; \
echo "MAN_OUTPUT=man"; \
echo "JAVADOC_AUTOBRIEF=NO"; \
diff --git a/doc/doxygen/wayland.doxygen.in b/doc/doxygen/wayland.doxygen.in
index e700e3d..7a2ac62 100644
--- a/doc/doxygen/wayland.doxygen.in
+++ b/doc/doxygen/wayland.doxygen.in
@@ -642,8 +642,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @top_srcdir@/src/wayland-client.c \
- @top_srcdir@/src/wayland-client.h
+INPUT =
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1364,7 +1363,7 @@ MAN_LINKS = YES
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = YES
+GENERATE_XML = NO
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index cba1655..202633e 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -14,6 +14,8 @@
# * ProtocolInterfaces.xml, same as above, uses a different XSLT
# * WaylandClientAPI.xml is generated from the doxygen output and saved in
# $(builddir)/en-US
+# * WaylandServerAPI.xml is generated from the doxygen output and saved in
+# $(builddir)/en-US
# * run Publican on en-US
publican_sources = \
$(srcdir)/sources/Wayland.ent \
@@ -40,7 +42,7 @@ pubdir = $(docdir)/Wayland/en-US
publican_targets = $(publican_sources:$(srcdir)/sources%=$(builddir)/en-US%) \
en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml \
- en-US/WaylandClientAPI.xml
+ en-US/WaylandClientAPI.xml en-US/WaylandServerAPI.xml
# The Protocol.xml is purely generated and required before running publican
en-US/ProtocolSpec.xml: $(top_srcdir)/protocol/wayland.xml $(srcdir)/protocol-to-docbook.xsl
@@ -59,17 +61,30 @@ en-US/ProtocolInterfaces.xml: $(top_srcdir)/protocol/wayland.xml $(srcdir)/proto
# * use doxygen's combine.xslt to merge the xml files into one single file
# * move wayland-client_8h.xml back to its original location
# * transform the combined XML file into docbook format
-en-US/WaylandClientAPI.xml: $(top_builddir)/doc/doxygen/xml/index.xml $(srcdir)/doxygen-to-publican.xsl
+en-US/WaylandClientAPI.xml: $(top_builddir)/doc/doxygen/xml/client/index.xml $(srcdir)/doxygen-to-publican.xsl
$(AM_V_GEN)$(MKDIR_P) en-US/images
+ $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/client/wayland-client_8h.xml \
+ $(top_builddir)/doc/doxygen/xml/
+ $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/client/combine.xslt \
+ $(top_builddir)/doc/doxygen/xml/client/index.xml > \
+ $(top_builddir)/doc/doxygen/xml/client/clientAPI.xml
$(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-client_8h.xml \
- $(top_builddir)/doc/doxygen/
- $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/combine.xslt \
- $(top_builddir)/doc/doxygen/xml/index.xml > \
- $(top_builddir)/doc/doxygen/xml/clientAPI.xml
- $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/wayland-client_8h.xml \
+ $(top_builddir)/doc/doxygen/xml/client
+ $(AM_V_GEN)$(XSLTPROC) --stringparam which Client $(srcdir)/doxygen-to-publican.xsl \
+ $(top_builddir)/doc/doxygen/xml/client/clientAPI.xml > en-US/WaylandClientAPI.xml
+
+# WaylandServerAPI.xml: see WaylandClientAPI.xml
+en-US/WaylandServerAPI.xml: $(top_builddir)/doc/doxygen/xml/server/index.xml $(srcdir)/doxygen-to-publican.xsl
+ $(AM_V_GEN)$(MKDIR_P) en-US/images
+ $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/server/wayland-server_8h.xml \
$(top_builddir)/doc/doxygen/xml
- $(AM_V_GEN)$(XSLTPROC) $(srcdir)/doxygen-to-publican.xsl \
- $(top_builddir)/doc/doxygen/xml/clientAPI.xml > en-US/WaylandClientAPI.xml
+ $(AM_V_GEN)$(XSLTPROC) $(top_builddir)/doc/doxygen/xml/server/combine.xslt \
+ $(top_builddir)/doc/doxygen/xml/server/index.xml > \
+ $(top_builddir)/doc/doxygen/xml/server/serverAPI.xml
+ $(AM_V_GEN)mv $(top_builddir)/doc/doxygen/xml/wayland-server_8h.xml \
+ $(top_builddir)/doc/doxygen/xml/server
+ $(AM_V_GEN)$(XSLTPROC) --stringparam which Server $(srcdir)/doxygen-to-publican.xsl \
+ $(top_builddir)/doc/doxygen/xml/server/serverAPI.xml > en-US/WaylandServerAPI.xml
# Copy the sources source files into en-US destination
# This is required for out-of-source-tree build as publican does not allow us
diff --git a/doc/publican/doxygen-to-publican.xsl b/doc/publican/doxygen-to-publican.xsl
index 160b124..2bd677e 100644
--- a/doc/publican/doxygen-to-publican.xsl
+++ b/doc/publican/doxygen-to-publican.xsl
@@ -1,6 +1,7 @@
<?xml version="1.0" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="xml" encoding="UTF-8" indent="yes" />
+<xsl:param name="which" />
<xsl:template match="/">
<!-- insert docbook's DOCTYPE blurb -->
@@ -11,12 +12,13 @@
]>
]]></xsl:text>
- <section id="sect-Library-Client">
- <title>Client API</title>
- <para>Following is the Wayland library classes for clients
- (<emphasis>libwayland-client</emphasis>). Note that most of the
- procedures are related with IPC, which is the main responsibility of
- the library.
+ <section id="sect-Library-$which">
+ <xsl:attribute name="id">sect-Library-<xsl:value-of select="$which"/></xsl:attribute>
+ <title><xsl:value-of select="$which"/> API</title>
+ <para>Following is the Wayland library classes for the <xsl:value-of select="$which"/>
+ (<emphasis>libwayland-<xsl:value-of select="translate($which, 'SC', 'sc')"/></emphasis>).
+ Note that most of the procedures are related with IPC, which is the main responsibility of
+ the library.
</para>
<xsl:if test="/doxygen/compounddef[@kind='class']">
diff --git a/doc/publican/sources/Library.xml b/doc/publican/sources/Library.xml
index ab325d6..77408cc 100644
--- a/doc/publican/sources/Library.xml
+++ b/doc/publican/sources/Library.xml
@@ -6,4 +6,5 @@
<chapter id="chap-Library">
<title>Wayland Library</title>
<xi:include href="WaylandClientAPI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="WaylandServerAPI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
commit 5e014c81ccf74ac7d44b2435f282f35b66f8d43f
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Thu Apr 4 11:28:57 2013 +1000
doc: Capitalize all Wayland occurrences
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
[re-run of search/replace after rebasing]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/doc/man/wl_display_connect.xml b/doc/man/wl_display_connect.xml
index b02abf0..7e6e05c 100644
--- a/doc/man/wl_display_connect.xml
+++ b/doc/man/wl_display_connect.xml
@@ -30,7 +30,7 @@
<refnamediv>
<refname>wl_display_connect</refname>
<refname>wl_display_connect_to_fd</refname>
- <refpurpose>Connect to a wayland socket</refpurpose>
+ <refpurpose>Connect to a Wayland socket</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -53,8 +53,8 @@
<refsect1>
<title>Description</title>
- <para><function>wl_display_connect</function> connects to a wayland socket
- that was previously opened by a wayland server. The server socket must
+ <para><function>wl_display_connect</function> connects to a Wayland socket
+ that was previously opened by a Wayland server. The server socket must
be placed in <envar>XDG_RUNTIME_DIR</envar> for this function to
find it. The <varname>name</varname> argument specifies the name of
the socket or <constant>NULL</constant> to use the default (which is
@@ -64,7 +64,7 @@
<function>wl_display_connect_to_fd</function> with the file-descriptor
number taken from the environment variable.</para>
- <para><function>wl_display_connect_to_fd</function> connects to a wayland
+ <para><function>wl_display_connect_to_fd</function> connects to a Wayland
socket with an explicit file-descriptor. The file-descriptor is passed
as argument <varname>fd</varname>.</para>
</refsect1>
diff --git a/doc/publican/sources/Architecture.xml b/doc/publican/sources/Architecture.xml
index 4af91ea..5b9300f 100644
--- a/doc/publican/sources/Architecture.xml
+++ b/doc/publican/sources/Architecture.xml
@@ -8,7 +8,7 @@
<section id="sect-Wayland-Architecture-wayland_architecture">
<title>X vs. Wayland Architecture</title>
<para>
- A good way to understand the wayland architecture
+ A good way to understand the Wayland architecture
and how it is different from X is to follow an event
from the input device to the point where the change
it affects appears on screen.
@@ -119,8 +119,8 @@
hardware.
</para>
<para>
- In wayland the compositor is the display server. We transfer
- the control of KMS and evdev to the compositor. The wayland
+ In Wayland the compositor is the display server. We transfer
+ the control of KMS and evdev to the compositor. The Wayland
protocol lets the compositor send the input events directly
to the clients and lets the client send the damage event
directly to the compositor:
@@ -172,7 +172,7 @@
<para>
As in the X case, when the client
receives the event, it updates the
- UI in response. But in the wayland
+ UI in response. But in the Wayland
case, the rendering happens in the
client, and the client just sends a
request to the compositor to
@@ -199,7 +199,7 @@
<title>Wayland Rendering</title>
<para>
One of the details I left out in the above overview
- is how clients actually render under wayland. By
+ is how clients actually render under Wayland. By
removing the X server from the picture we also
removed the mechanism by which X clients typically
render. But there's another mechanism that we're
diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml
index cb989a9..38e5bfc 100644
--- a/doc/publican/sources/Book_Info.xml
+++ b/doc/publican/sources/Book_Info.xml
@@ -17,7 +17,7 @@
that protocol. The compositor can be a standalone
display server running on Linux kernel modesetting
and evdev input devices, an X application, or a
- wayland client itself. The clients can be
+ Wayland client itself. The clients can be
traditional applications, X servers (rootless or
fullscreen) or other display servers.
</para>
diff --git a/doc/publican/sources/Compositors.xml b/doc/publican/sources/Compositors.xml
index f674776..725c35a 100644
--- a/doc/publican/sources/Compositors.xml
+++ b/doc/publican/sources/Compositors.xml
@@ -77,7 +77,7 @@
</listitem>
<listitem>
<para>
- fullscreen X session under wayland
+ fullscreen X session under Wayland
</para>
</listitem>
</itemizedlist>
@@ -92,13 +92,13 @@
Wayland doesn't directly allow this, but clients can communicate GEM
buffer names out-of-band, for example, using D-Bus, or command line
arguments when the panel launches the applet. Another option is to
- use a nested wayland instance. For this, the wayland server will have
+ use a nested Wayland instance. For this, the Wayland server will have
to be a library that the host application links to. The host
- application will then pass the wayland server socket name to the
- embedded application, and will need to implement the wayland
+ application will then pass the Wayland server socket name to the
+ embedded application, and will need to implement the Wayland
compositor interface. The host application composites the client
surfaces as part of it's window, that is, in the web page or in the
- panel. The benefit of nesting the wayland server is that it provides
+ panel. The benefit of nesting the Wayland server is that it provides
the requests the embedded client needs to inform the host about buffer
updates and a mechanism for forwarding input events from the host
application.
diff --git a/doc/publican/sources/Protocol.xml b/doc/publican/sources/Protocol.xml
index 7542890..f576542 100644
--- a/doc/publican/sources/Protocol.xml
+++ b/doc/publican/sources/Protocol.xml
@@ -8,7 +8,7 @@
<section id="sect-Protocol-Basic-Principles">
<title>Basic Principles</title>
<para>
- The wayland protocol is an asynchronous object oriented protocol. All
+ The Wayland protocol is an asynchronous object oriented protocol. All
requests are method invocations on some object. The requests include
an object ID that uniquely identifies an object on the server. Each
object implements an interface and the requests include an opcode that
@@ -271,12 +271,12 @@
</listitem>
<listitem>
<para>
- xkb on wayland
+ xkb on Wayland
</para>
</listitem>
<listitem>
<para>
- multi pointer wayland
+ multi pointer Wayland
</para>
</listitem>
</itemizedlist>
@@ -329,7 +329,7 @@
</listitem>
<listitem>
<para>
- basically xrandr over wayland
+ basically xrandr over Wayland
</para>
</listitem>
<listitem>
commit 4f7f09b4c873d92b6697edc6d0d15bc939ac1a0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 4 11:06:02 2013 +1000
protocol: input documentation fixes
Fix summary for wl_touch::motion, extend summary for wl_touch::down to match
up/motion a bit better.
Fix a typo in wl_touch, and claim that it's zero or more update events, not
one or more.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 45a3298..eda9441 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -1400,13 +1400,13 @@
Touch interactions can consist of one or more contacts.
For each contact, a series of events is generated, starting
- with a down event, followed by one or more motion events,
- and ended with an up event. Events relating to the same
+ with a down event, followed by zero or more motion events,
+ and ending with an up event. Events relating to the same
contact point can be identified by the ID of the sequence.
</description>
<event name="down">
- <description summary="touch down event">
+ <description summary="touch down event and beginning of a touch sequence">
A new touch point has appeared on the surface. This touch point is
assigned a unique @id. Future events from this touchpoint reference
this ID. The ID ceases to be valid after a touch up event and may be
@@ -1432,7 +1432,7 @@
</event>
<event name="motion">
- <description summary="end of a touch event sequence">
+ <description summary="update of touch point coordinates">
A touchpoint has changed coordinates.
</description>
<arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
commit 9fbcc7ae7dbbca215d0a1edcede4b7cc95ced7f2
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Apr 4 17:26:57 2013 +0100
wayland-client: Avoid null dereference when handling deletion
If an unknown id is deleted then the lookup in the map will return NULL and
so we should avoid dereferencing that.
As this is unexpected behaviour log a message about the problem too.
diff --git a/src/wayland-client.c b/src/wayland-client.c
index ada4d5e..7847370 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -415,7 +415,11 @@ display_handle_delete_id(void *data, struct wl_display *display, uint32_t id)
pthread_mutex_lock(&display->mutex);
proxy = wl_map_lookup(&display->objects, id);
- if (proxy != WL_ZOMBIE_OBJECT)
+
+ if (!proxy)
+ wl_log("error: received delete_id for unknown id (%u)\n", id);
+
+ if (proxy && proxy != WL_ZOMBIE_OBJECT)
proxy->flags |= WL_PROXY_FLAG_ID_DELETED;
else
wl_map_remove(&display->objects, id);
commit 477dcd84c7b350ebdc5da1e2243cbcd2abfbdc80
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Apr 3 16:26:14 2013 -0400
docs: Use MIT for documentation license
diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml
index 1f83c8c..cb989a9 100644
--- a/doc/publican/sources/Book_Info.xml
+++ b/doc/publican/sources/Book_Info.xml
@@ -34,6 +34,38 @@
</textobject>
</inlinemediaobject>
</corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
+
+ <legalnotice lang="en-US">
+ <para>
+ Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER;
+ </para>
+
+ <para>
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that copyright notice and this
+ permission notice appear in supporting documentation, and that
+ the name of the copyright holders not be used in advertising or
+ publicity pertaining to distribution of the software without
+ specific, written prior permission. The copyright holders make
+ no representations about the suitability of this software for
+ any purpose. It is provided "as is" without express or implied
+ warranty.
+ </para>
+
+ <para>
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+ USE OR PERFORMANCE OF THIS SOFTWARE.
+ </para>
+ </legalnotice>
+
+
<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
</bookinfo>
commit c42b09b4cb36d9d169483b934a7f4abe91f7b0ce
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Apr 3 16:22:44 2013 -0400
configure.ac: Fix publican version check
This sure is ugly - we feed output of publican -v into bc to compare
against minimum required version, 2.8. That's bad enough, but when
publican suddenly report 3.0.0, bc starts complaining...
Use sed to filter out 3.0 from the 'version=3.0.0' output from publican
instead. Seem a little more robust, but it's just a matter of time before
something else breaks this flaky setup.
Hey, publican, how about shipping .pc files?
diff --git a/configure.ac b/configure.ac
index db0855e..4271c7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ if test "x$enable_documentation" = "xyes"; then
AC_PATH_PROG(PUBLICAN, publican)
if test "x$PUBLICAN" != "x"; then
- PUBLICAN_VERSION=`$PUBLICAN -v | cut -d'=' -f2`
+ PUBLICAN_VERSION=[`$PUBLICAN -v | sed -e 's/version=\([0-9]*\.[0-9]*\).*/\1/'`]
if test [ 1 -eq `echo "${PUBLICAN_VERSION} < 2.8" | bc` ]; then
AC_MSG_ERROR([Publican version is not supported. Install publican >= 2.8 or disable the documentation using --disable-documentation])
commit 9d296fc73a81931b4c02b789b3c488861dbf3fda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 3 15:43:34 2013 -0400
doc: rename "Wayland" to "publican"
This directory was called Wayland during my early tries with publican where
the source layout was different and it needed to be set to the same name as
the publican output directory. This reason doesn't exist anymore, so re-name
it to publican to make it more obvious what's hiding in here.
Reply to: