wayland-protocols: Changes to 'upstream-unstable'
Makefile.am |1 configure.ac |2 unstable/xdg-foreign/xdg-foreign-unstable-v2.xml | 182 +++ wayland-protocols.pc.in |2 4 files changed, 185 insertions(+), 2 deletions(-) New commits: commit fc3305c36298c48e708bfb1972f4b5e3331a88a8 Author: Jonas Ådahl Date: Wed Oct 11 16:20:05 2017 +0800 configure.ac: Bump version to 1.11 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index 4301bb2..39d54a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [10]) +m4_define([wayland_protocols_minor_version], [11]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit 70d85926c60996afe98ee244acad05d478618ceb Author: Marco Martin Date: Mon Sep 18 14:09:05 2017 +0200 xdg-foreign-v2: Rename export and import calls As export is a reserved keyword in C++, in order for the output generated by wayland_scanner to compile correctly rename export to export_toplevel and import to import_toplevel this needs a new protocol version as is an incompatible change [jadahl: Fix various documentation issues] Signed-off-by: Marco Martin Signed-off-by: Jonas Ådahl Reviewed-by: Jonas Ådahl diff --git a/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml b/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml index 062b090..bf46fa8 100644 --- a/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml +++ b/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml @@ -1,5 +1,5 @@ - + Copyright © 2015-2016 Red Hat Inc. @@ -32,12 +32,12 @@ some of its own surface above the other clients surface. In order for a client A to get a reference of a surface of client B, client -B must first export its surface using xdg_exporter.export. Upon doing this, -client B will receive a handle (a unique string) that it may share with -client A in some way (for example D-Bus). After client A has received the -handle from client B, it may use xdg_importer.import to create a reference -to the surface client B just exported. See the corresponding requests for -details. +B must first export its surface using xdg_exporter.export_toplevel. Upon +doing this, client B will receive a handle (a unique string) that it may +share with client A in some way (for example D-Bus). After client A has +received the handle from client B, it may use xdg_importer.import_toplevel +to create a reference to the surface client B just exported. See the +corresponding requests for details. A possible use case for this is out-of-process dialogs. For example when a sandboxed client without file system access needs the user to select a file @@ -56,7 +56,7 @@ reset. - + A global interface used for exporting surfaces that can later be imported using xdg_importer. @@ -69,25 +69,25 @@ - - - The export request exports the passed surface so that it can later be + + + The export_toplevel request exports the passed surface so that it can later be imported via xdg_importer. When called, a new xdg_exported object will be created and xdg_exported.handle will be sent immediately. See the corresponding interface and event for details. A surface may be exported multiple times, and each exported handle may - be used to create a xdg_imported multiple times. Only xdg_surface - surfaces may be exported. + be used to create a xdg_imported multiple times. Only xdg_toplevel + equivalent surfaces may be exported. - - + A global interface used for importing surfaces exported by xdg_exporter. With this interface, a client can create a reference to a surface of @@ -101,22 +101,22 @@ - - - The import request imports a surface from any client given a handle - retrieved by exporting said surface using xdg_exporter.export. When - called, a new xdg_imported object will be created. This new object + + + The import_toplevel request imports a surface from any client given a handle + retrieved by exporting said surface using xdg_exporter.export_toplevel. + When called, a new xdg_imported object will be created. This new object represents the imported surface, and the importing client can manipulate its relationship using it. See xdg_imported for details. - - + A xdg_exported object represents an exported reference to a surface. The exported surface may be referenced as long as the xdg_exported object n
wayland-protocols: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
wayland-protocols: Changes to 'upstream-unstable'
Makefile.am|1 configure.ac |4 unstable/xdg-output/README |4 unstable/xdg-output/xdg-output-unstable-v1.xml | 161 + 4 files changed, 168 insertions(+), 2 deletions(-) New commits: commit 9ee1d597a69b41e6a6223dcd25a92509a9baaa0a Author: Jonas Ådahl Date: Mon Jul 31 18:03:14 2017 +0800 configure.ac: Bump version to 1.10 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index 52da827..4301bb2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [9]) +m4_define([wayland_protocols_minor_version], [10]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit 6b62c3211d287b3515b0d0c76c4f0b4d09df0389 Author: Olivier Fourdan Date: Mon Jul 31 12:52:07 2017 +0200 configure.ac: force autotool to use star To circumvent the 99 character filename limit. Signed-off-by: Olivier Fourdan Reviewed-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index 472ee8f..52da827 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ if test x$wayland_scanner = x; then fi fi -AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) AM_SILENT_RULES([yes]) commit 794a96a80fe16885288a784adad6f9d12957439a Author: Olivier Fourdan Date: Wed Jul 26 10:03:00 2017 +0200 Add xdg-output protocol This protocol aims at describing outputs in way which is more in line with the concept of an output on desktop oriented systems. Some information are more specific to the concept of an output for a desktop oriented system and may not make sense in other applications, such as IVI systems for example. The goal is to gradually move the desktop specific concepts out of the core wl_output protocol. For now it just features the position and logical size which describe the output position and size in the global compositor space. Signed-off-by: Olivier Fourdan Reviewed-by: Jonas Ådahl Reviewed-by: Pekka Paalanen diff --git a/Makefile.am b/Makefile.am index d100c13..5b5ae96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ unstable_protocols = \ unstable/idle-inhibit/idle-inhibit-unstable-v1.xml \ unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml \ unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml \ + unstable/xdg-output/xdg-output-unstable-v1.xml \ $(NULL) stable_protocols = \ diff --git a/unstable/xdg-output/README b/unstable/xdg-output/README new file mode 100644 index 000..e42b711 --- /dev/null +++ b/unstable/xdg-output/README @@ -0,0 +1,4 @@ +xdg_output protocol + +Maintainers: +Olivier Fourdan diff --git a/unstable/xdg-output/xdg-output-unstable-v1.xml b/unstable/xdg-output/xdg-output-unstable-v1.xml new file mode 100644 index 000..0c0c481 --- /dev/null +++ b/unstable/xdg-output/xdg-output-unstable-v1.xml @@ -0,0 +1,161 @@ + + + + +Copyright © 2017 Red Hat Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + + +This protocol aims at describing outputs in a way which is more in line +with the concept of an output on desktop oriented systems. + +Some information are more specific to the concept of an output for +a desktop oriented system and may not make sense in other applications, +such as IVI systems for ex
wayland-protocols: Changes to 'upstream-unstable'
Makefile.am |2 configure.ac |3 stable/presentation-time/presentation-time.xml |5 stable/viewporter/viewporter.xml |3 unstable/idle-inhibit/idle-inhibit-unstable-v1.xml |4 unstable/input-method/input-method-unstable-v1.xml | 49 +-- unstable/keyboard-shortcuts-inhibit/README |4 unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml | 143 ++ unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml | 140 +++-- unstable/pointer-constraints/pointer-constraints-unstable-v1.xml |5 unstable/relative-pointer/relative-pointer-unstable-v1.xml |2 unstable/tablet/tablet-unstable-v1.xml |1 unstable/tablet/tablet-unstable-v2.xml |1 unstable/text-input/text-input-unstable-v1.xml | 80 ++--- unstable/xdg-foreign/xdg-foreign-unstable-v1.xml |4 unstable/xdg-shell/xdg-shell-unstable-v5.xml |2 unstable/xdg-shell/xdg-shell-unstable-v6.xml | 21 - unstable/xwayland-keyboard-grab/README |4 unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml | 121 wayland-protocols-uninstalled.pc.in |5 20 files changed, 463 insertions(+), 136 deletions(-) New commits: commit 7af21d83d3dbacb56126a946fb15b3e924c4c84f Author: Jonas Ådahl Date: Tue Jul 11 14:41:21 2017 +0800 configure.ac: Bump version to 1.9 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index e98bceb..472ee8f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [8]) +m4_define([wayland_protocols_minor_version], [9]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit e16986b3d2fb9adf07599fc5003eb927a15aeee9 Author: Olivier Fourdan Date: Fri Jun 30 18:13:52 2017 +0200 Add keyboard shortcuts inhibitor This adds a new protocol to let Wayland clients specify that they want all keyboard events to be sent to the client, regardless of the compositor own shortcuts. This protocol can be used for virtual machine and remote connection viewers which require to pass all keyboard shortcuts to the hosted or remote system instead of being caught up by the compositor locally. Signed-off-by: Olivier Fourdan Reviewed-by: Peter Hutterer Reviewed-by: Jonas Ådahl diff --git a/Makefile.am b/Makefile.am index 12465e6..d100c13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ unstable_protocols = \ unstable/xdg-foreign/xdg-foreign-unstable-v1.xml \ unstable/idle-inhibit/idle-inhibit-unstable-v1.xml \ unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml \ + unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml \ $(NULL) stable_protocols = \ diff --git a/unstable/keyboard-shortcuts-inhibit/README b/unstable/keyboard-shortcuts-inhibit/README new file mode 100644 index 000..63ff335 --- /dev/null +++ b/unstable/keyboard-shortcuts-inhibit/README @@ -0,0 +1,4 @@ +Compositor shortcuts inhibit protocol + +Maintainers: +Olivier Fourdan diff --git a/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml b/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml new file mode 100644 index 000..2774876 --- /dev/null +++ b/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml @@ -0,0 +1,143 @@ + + + + +Copyright © 2017 Red Hat Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (i
wayland-protocols: Changes to 'upstream-unstable'
Makefile.am|3 configure.ac |2 unstable/idle-inhibit/README |4 unstable/idle-inhibit/idle-inhibit-unstable-v1.xml | 83 + unstable/xdg-foreign/README|4 unstable/xdg-foreign/xdg-foreign-unstable-v1.xml | 186 +++ unstable/xdg-shell/xdg-shell-unstable-v6.xml | 1045 + 7 files changed, 1326 insertions(+), 1 deletion(-) New commits: commit 2e541a36deff5f2e16e25e27f7f93d26822eecc2 Author: Jonas Ådahl Date: Mon Aug 15 10:33:32 2016 +0800 configure.ac: Bump version to 1.7 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index f06d1d6..4c43daa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [6]) +m4_define([wayland_protocols_minor_version], [7]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit c09e89929bad8f19b6eb70018c1d984bbe650346 Author: Jonas Ådahl Date: Fri Jul 15 16:55:51 2016 +0800 xdg-shell: Add resize_x/y constraint adjustment to positioner In order to get feedback of available space where a client can create its popup, let it create requset that its popup rectangle being resized would it not fit the within the work area. This adds two new constraint adjustment values to the adjustment enum, and dimension parameters to the xdg_popup.configure event. The existing constraint adjustment actions take precedence, and resizing will only be triggered if all other adjustments requested didn't manage to make the popup rectangle fully visible. Signed-off-by: Jonas Ådahl Acked-by: Quentin Glidic diff --git a/unstable/xdg-shell/xdg-shell-unstable-v6.xml b/unstable/xdg-shell/xdg-shell-unstable-v6.xml index d6802be..565df8c 100644 --- a/unstable/xdg-shell/xdg-shell-unstable-v6.xml +++ b/unstable/xdg-shell/xdg-shell-unstable-v6.xml @@ -234,6 +234,20 @@ + + The constraint adjustment value define ways the compositor will adjust + the position of the surface, if the unadjusted position would result + in the surface being partly constrained. + + Whether a surface is considered 'constrained' is left to the compositor + to determine. For example, the surface may be partly outside the + compositor's defined 'work area', thus necessitating the child surface's + position be adjusted until it is entirely inside the work area. + + The adjustments can be combined, according to a defined precedence: 1) + Flip, 2) Slide, 3) Resize. + + Don't alter the surface position even if it is constrained on some @@ -253,8 +267,6 @@ x axis until either the edge in the direction of the gravity is unconstrained or the edge in the opposite direction of the gravity is constrained. - - If 'slide_x' is combined with 'flip_x', 'flip_x' takes precedence. @@ -270,8 +282,6 @@ y axis until either the edge in the direction of the gravity is unconstrained or the edge in the opposite direction of the gravity is constrained. - - If 'slide_y' is combined with 'flip_y', 'flip_y' takes precedence. @@ -282,9 +292,8 @@ 'left', change the gravity to 'right' and the anchor to 'right'. If the adjusted position also ends up being constrained, the resulting - position will be the one before the adjustment. If the resulting - position is still constrained, and 'flip_x' is combined with - 'slide_x', the position is adjusted according to 'slide_x'. + position of the flip_x adjustment will be the one before the + adjustment. @@ -295,9 +304,19 @@ 'bottom', change the gravity to 'top' and the anchor to 'top'. If the adjusted position also ends up being constrained, the resulting - position will be the one before the adjustment. If the resulting - position is still constrained, and 'flip_y' is combined with - 'slide_y', the position is adjusted according to 'slide_y'. + position of the flip_y adjustment will be the one before the + adjustment. + + + + + Resize the surface horizontally so that it is completely + unconstrained. + + + + + Resize the surface vertically so that it is completely unconstrained. @@ -1010,6 +1029,8 @@ summary="x position relative to parent surface window geometry"/> + + commit 7ba6a6ab15b719642d5eaf56f153270d88f0ee7c Author: Jonas Ådahl Date: Fri
wayland-protocols: Changes to 'upstream-unstable'
Makefile.am|1 configure.ac |2 unstable/input-method/input-method-unstable-v1.xml |2 unstable/tablet/tablet-unstable-v2.xml | 1179 + unstable/text-input/text-input-unstable-v1.xml |2 5 files changed, 1183 insertions(+), 3 deletions(-) New commits: commit f93680e4960244fd0a683089b7bbc0b9057513f4 Author: Jonas Ådahl Date: Fri Jul 22 11:43:54 2016 +0800 configure.ac: Bump version to 1.5 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index d3febaf..e70392c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [4]) +m4_define([wayland_protocols_minor_version], [5]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit 24eb6700e419d4a64b83d77efb7e843074465453 Author: Carlos Garnacho Date: Mon Jul 11 17:13:36 2016 +0200 tablet: Add pad support to the tablet protocol The pad's interface is similar to the tool interface, a client is notified of the pad after the tablet_added event. The pad has three functionalities: buttons, rings and strips. Buttons are fairly straightforward, rings and strips are separate interfaces with pointer-axis-like source/value/frame events. The two interfaces are effectively identical but for the actual value they send (degrees vs normalized position). Buttons are sequentially indexed starting with zero, unlike other protocols where a linux/input.h-style semantic event code is used. Since we expect all buttons to have client-specific functionality, an additional event tells the client when a given button index is not available, usually because the compositor assignes some function to it (e.g. mode switching, see below). Specific to the pad device is the set_feedback request which enables a client to set a user-defined string to display for an OSD on the current mappings. This request is available for buttons, rings and strips. Finally, the pad supports groups, effectively sets of button/ring/strip configurations. Those groups may have multiple modes each, so that users/clients may map several actions to a single element. Signed-off-by: Carlos Garnacho Signed-off-by: Peter Hutterer Reviewed-by: Jason Gerecke Reviewed-by: Bryce Harrington Reviewed-by: Jonas Ådahl diff --git a/unstable/tablet/tablet-unstable-v2.xml b/unstable/tablet/tablet-unstable-v2.xml index 77b185c..728a3df 100644 --- a/unstable/tablet/tablet-unstable-v2.xml +++ b/unstable/tablet/tablet-unstable-v2.xml @@ -172,6 +172,22 @@ + + + + This event is sent whenever a new pad is known to the system. Typically, + pads are physically attached to tablets and a pad_added event is + sent immediately after the wp_tablet_seat.tablet_added. + However, some standalone pad devices logically attach to tablets at + runtime, and the client must wait for wp_tablet_pad.enter to know + the tablet a pad is attached to. + + This event only provides the object id of the pad. All further + features (buttons, strips, rings) are sent through the wp_tablet_pad + interface. + + + @@ -636,4 +652,528 @@ + + + A circular interaction area, such as the touch ring on the Wacom Intuos + Pro series tablets. + + Events on a ring are logically grouped by the wl_tablet_pad_ring.frame + event. + + + + + Request that the compositor use the provided feedback string + associated with this ring. This request should be issued immediately + after a wp_tablet_pad_group.mode_switch event from the corresponding + group is received, or whenever the ring is mapped to a different + action. See wp_tablet_pad_group.mode_switch for more details. + + Clients are encouraged to provide context-aware descriptions for + the actions associated with the ring; compositors may use this + information to offer visual feedback about the button layout + (eg. on-screen displays). + + The provided string 'description' is a UTF-8 encoded string to be + associated with this ring, and is considered user-visible; general + internationalization rules apply. + + The serial argument will be that of the last + wp_tablet_pad_group.mode_switch event received for the group of this + ring. Requests providing other serials than the most recent one will be + ignored. + + + + + + + + This destroys the client's resource for this ring object. + + + + + + Describes the source types for
wayland-protocols: Changes to 'upstream-unstable'
Makefile.am |1 README | 14 configure.ac |7 stable/presentation-time/presentation-time.xml | 55 +- stable/viewporter/README |7 stable/viewporter/viewporter.xml | 189 ++ unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml | 19 - unstable/input-method/input-method-unstable-v1.xml | 40 +- unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml | 18 unstable/pointer-constraints/pointer-constraints-unstable-v1.xml | 16 unstable/pointer-gestures/pointer-gestures-unstable-v1.xml |9 unstable/relative-pointer/relative-pointer-unstable-v1.xml |8 unstable/tablet/tablet-unstable-v1.xml | 30 - 13 files changed, 308 insertions(+), 105 deletions(-) New commits: commit 65d09ef404fb26cb513f4f836e904f415c425a8f Author: Jonas Ådahl Date: Mon May 23 11:33:48 2016 +0800 configure.ac: Bump version to 1.4 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index 3d45a4b..d3febaf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [3]) +m4_define([wayland_protocols_minor_version], [4]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit 83bdaa5cff369cc631d0191eb75a6a798976c638 Author: Pekka Paalanen Date: Tue Apr 19 14:54:04 2016 +0300 stable/viewporter: add more error cases Rather than silenty doing things, make them explicit and error if anything is not quite right. Suggested by Daniel Stone. Signed-off-by: Pekka Paalanen Reviewed-by: Daniel Stone [Pekka: updated copyright years] Reviewed-by: Yong Bakos Reviewed-by: Derek Foreman Acked-by: Bryce Harrington diff --git a/stable/viewporter/viewporter.xml b/stable/viewporter/viewporter.xml index ef9b35c..5d006c0 100644 --- a/stable/viewporter/viewporter.xml +++ b/stable/viewporter/viewporter.xml @@ -2,7 +2,7 @@ -Copyright © 2013-2014 Collabora, Ltd. +Copyright © 2013-2016 Collabora, Ltd. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -88,11 +88,13 @@ has no content and therefore no size. Otherwise, the size is always at least 1x1 in surface local coordinates. - If the source rectangle is set, it defines what area of the - wl_buffer is taken as the source. If the source rectangle is set and - the destination size is not set, the surface size becomes the source - rectangle size rounded up to the nearest integer. If the source size - is already exactly integers, this results in cropping without scaling. + If the source rectangle is set, it defines what area of the wl_buffer is + taken as the source. If the source rectangle is set and the destination + size is not set, then src_width and src_height must be integers, and the + surface size becomes the source rectangle size. This results in cropping + without scaling. If src_width or src_height are not integers and + destination size is not set, the bad_size protocol error is raised when + the surface state is applied. The coordinate transformations from buffer pixel coordinates up to the surface-local coordinates happen in the following order: @@ -104,9 +106,11 @@ i.e. in the coordinates that would be the surface-local coordinates if the crop and scale was not applied. - If the source rectangle is partially or completely outside of the - wl_buffer, then the surface contents are undefined (not void), and - the surface size is still dst_width, dst_height. + If src_x or src_y are negative, the bad_value protocol error is raised. + Otherwise, if the source rectangle is partially or completely outside of + the non-NULL wl_buffer, then the out_of_buffer protocol error is raised + when the surface state is applied. A NULL wl_buffer does not raise the + out_of_buffer error. The x, y arguments of wl_surface.attach are applied as normal to the surface. They indicate how many pixels to remove from the @@ -115,7 +119,8 @@ and dst_height are. If the wl_surface associated with the wp_viewport is destroyed, - the wp_viewport object becomes inert. + all wp_viewport requests except 'destroy' raise the protocol error + no_surface. If the wp_viewport object is destroyed, the crop and scale state is removed from the wl_surface. The change will be
wayland-protocols: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 82bb922f5b497b06cab175d0281ef8d5e8009878 Author: Jonas Ådahl Date: Thu Mar 10 15:02:29 2016 +0800 configure.ac: Bump version to 1.3 Signed-off-by: Jonas Ådahl commit 418915eeba5679832d6a7b50ece02482347056a4 Author: Jonas Ådahl Date: Wed Mar 9 15:49:51 2016 +0800 Revert "xdg-shell: clarify xdg_surface creation semantics regarding buffers" This patch was intended to be part of the coming v6 version of the xdg_shell protocol. It is an semantically backward incompatible change, so it cannot be implemented in xdg_shell v5 without breaking compatibility with available clients. This reverts commit 275fd34023fabdcb487f2adf2fe80bda1e4bf0dc. commit ca86a592c2663871644cbde43bb1eb01bb2fa372 Author: Peter Hutterer Date: Wed Mar 9 16:10:48 2016 +1000 Add the tablet protocol Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone Reviewed-by: Jonas Ådahl commit 275fd34023fabdcb487f2adf2fe80bda1e4bf0dc Author: Mike Blumenkrantz Date: Wed Dec 2 20:06:46 2015 -0500 xdg-shell: clarify xdg_surface creation semantics regarding buffers this change ensures that the client will set its initial state before performing any drawing, ensuring that there is no mismatch when creating a surface with a non-default state (eg. maximize, fullscreen, ...) looking at the following event flows: 1) wl_surface.attach, wl_surface.commit, xdg_shell.get_xdg_surface 2) wl_surface.attach, xdg_shell.get_xdg_surface, wl_surface.commit 3) xdg_shell.get_xdg_surface, wl_surface.commit, xdg_surface.configure, wl_surface.attach, wl_surface.commit only 3) is now valid, while 1) and 2) will trigger errors as a result of handling buffers prior to creating the xdg surface Reviewed-by: Jasper St. Pierre Signed-off-by: Mike Blumenkrantz Signed-off-by: Jonas Ådahl Reviewed-by: Bryce Harrington commit 22a9cd8a254b31a19c75d4f2cc2806a74309b7b5 Author: Jonas Ådahl Date: Mon Mar 7 17:09:30 2016 +0800 configure.ac: Bump version to 1.2 Signed-off-by: Jonas Ådahl commit 62468ffc9aa43d0b2218853b80fca1a9cd3e60bc Author: Pekka Paalanen Date: Wed Feb 17 16:50:31 2016 +0200 Makefile: install and dist stable protocols Signed-off-by: Pekka Paalanen Reviewed-by: Bryce Harrington Reviewed-by: Jonas Ådahl commit f4e9da83634afaec50c2e8e27f4d2c6d4a0a9af2 Author: Pekka Paalanen Date: Mon Feb 22 15:11:14 2016 +0200 Makefile: add presentation-time to stable protocols Signed-off-by: Pekka Paalanen Reviewed-by: Bryce Harrington Reviewed-by: Jonas Ådahl commit 10ae82c41a58f0c53ea1cba4225006c1f003eb14 Author: Pekka Paalanen Date: Wed Feb 17 16:44:40 2016 +0200 presentation-time: finish stabilization Rename interfaces and the protocol to follow the policy. Signed-off-by: Pekka Paalanen Reviewed-by: Bryce Harrington Reviewed-by: Jonas Ådahl commit 95e7f445edbc8ea52b6f4d22ae1ee514b2323895 Author: Pekka Paalanen Date: Wed Feb 17 16:32:05 2016 +0200 stable: add presentation-time draft This XML file has been copied verbatim from Weston 1.10.0 release, protocol/presentation_timing.xml. The last behavioral change to that file was in December 2014, so the behaviour is considered stable. Interfaces still need to be renamed according wayland-protocols policy. That will be done in a follow-up patch to clearly show the changes. Signed-off-by: Pekka Paalanen Reviewed-by: Bryce Harrington Reviewed-by: Jonas Ådahl commit 2deda62a9e87e72cf85c9499249fe9074608de2c Author: Carlos Olmedo Escobar Date: Mon Feb 29 12:06:18 2016 +0100 Remove 'is'. Signed-off-by: Carlos Olmedo Escobar Reviewed-by: Bryce Harrington
wayland-protocols: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
wayland-protocols: Changes to 'upstream-unstable'
.gitignore |5 Makefile.am | 12 configure.ac | 18 m4/compat.m4 | 12 tests/scan.sh| 10 unstable/pointer-constraints/README |4 unstable/pointer-constraints/pointer-constraints-unstable-v1.xml | 344 ++ unstable/relative-pointer/README |4 unstable/relative-pointer/relative-pointer-unstable-v1.xml | 138 unstable/xdg-shell/xdg-shell-unstable-v5.xml |1 10 files changed, 547 insertions(+), 1 deletion(-) New commits: commit 596dfda882a51c05699bcb28a8459ce936a138db Author: Jonas Ådahl Date: Tue Feb 16 17:06:44 2016 +0800 configure.ac: Bump version to 1.1 Signed-off-by: Jonas Ådahl diff --git a/configure.ac b/configure.ac index 61693fb..90cce42 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [0]) +m4_define([wayland_protocols_minor_version], [1]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) commit 162619d605982600816edce712ec5229cfe4ea6f Author: Jonas Ådahl Date: Wed Oct 21 11:59:01 2015 +0800 Introduce pointer locking and confinement protocol This patch introduces a new protocol for locking and confining a pointer. It consists of a new global object with two requests; one for locking the surface to a position, one for confining the pointer to a given region. Signed-off-by: Jonas Ådahl Reviewed-by: Peter Hutterer Reviewed-by: Derek Foreman Reviewed-by: Reviewed-by: Daniel Stone diff --git a/Makefile.am b/Makefile.am index 0389637..57d0023 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ unstable_protocols = \ unstable/input-method/input-method-unstable-v1.xml \ unstable/xdg-shell/xdg-shell-unstable-v5.xml \ unstable/relative-pointer/relative-pointer-unstable-v1.xml \ + unstable/pointer-constraints/pointer-constraints-unstable-v1.xml \ $(NULL) stable_protocols = \ diff --git a/unstable/pointer-constraints/README b/unstable/pointer-constraints/README new file mode 100644 index 000..8a242f8 --- /dev/null +++ b/unstable/pointer-constraints/README @@ -0,0 +1,4 @@ +Pointer constraints protocol + +Maintainers: +Jonas Ådahl diff --git a/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml b/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml new file mode 100644 index 000..192622f --- /dev/null +++ b/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml @@ -0,0 +1,344 @@ + + + + +Copyright © 2014 Jonas Ådahl +Copyright © 2015 Red Hat Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + + +This protocol specifies a set of interfaces used for adding constraints to +the motion of a pointer. Possible constraints include confining pointer +motions to a given region, or locking it to its current position. + +In order to contrain the pointer, a client must first bind the global +interface "wp_pointer_constraints" which, if a compositor supports pointer +constraints, is exposed by the registry. Using the bound global object, the +client uses the request that corresponds to the type of constraint it wants +to make. See wp_pointer_constraints f
wayland-protocols: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits:
