diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 10a9555a2..2d806b76f 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -700,6 +700,13 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
return surface;
}
+static void
+xdg_shell_destroy (struct wl_client *client,
+ struct wl_resource *resource)
+{
+ wl_resource_destroy (resource);
+}
+
static void
xdg_shell_use_unstable_version (struct wl_client *client,
struct wl_resource *resource,
@@ -1010,8 +1017,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
struct wl_resource *seat_resource,
uint32_t serial,
int32_t x,
- int32_t y,
- uint32_t flags)
+ int32_t y)
{
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandSurface *parent_surf = wl_resource_get_user_data (parent_resource);
@@ -1051,6 +1057,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
}
static const struct xdg_shell_interface meta_wayland_xdg_shell_interface = {
+ xdg_shell_destroy,
xdg_shell_use_unstable_version,
xdg_shell_get_xdg_surface,
xdg_shell_get_xdg_popup,
@@ -1801,12 +1808,8 @@ meta_wayland_surface_delete (MetaWaylandSurface *surface)
void
meta_wayland_surface_popup_done (MetaWaylandSurface *surface)
{
- struct wl_client *client = wl_resource_get_client (surface->resource);
- struct wl_display *display = wl_client_get_display (client);
- uint32_t serial = wl_display_next_serial (display);
-
if (surface->xdg_popup)
- xdg_popup_send_popup_done (surface->xdg_popup, serial);
+ xdg_popup_send_popup_done (surface->xdg_popup);
else if (surface->wl_shell_surface)
wl_shell_surface_send_popup_done (surface->wl_shell_surface);
}
diff --git a/src/wayland/protocol/xdg-shell.xml b/src/wayland/protocol/xdg-shell.xml
index 275837f3d..ea8a05777 100644
--- a/src/wayland/protocol/xdg-shell.xml
+++ b/src/wayland/protocol/xdg-shell.xml
@@ -31,11 +31,10 @@
- This interface is implemented by servers that provide
- desktop-style user interfaces.
-
- It allows clients to associate a xdg_surface with
- a basic surface.
+ xdg_shell allows clients to turn a wl_surface into a "real window"
+ which can be dragged, resized, stacked, and moved around by the
+ user. Everything about this interface is suited towards traditional
+ desktop environments.
@@ -45,9 +44,23 @@
they implement using static_assert to ensure the protocol and
implementation versions match.
-
+
+
+
+
+
+
+
+ Destroy this xdg_shell object.
+
+ Destroying a bound xdg_shell object while there are surfaces
+ still alive with roles from this interface is illegal and will
+ result in a protocol error. Make sure to destroy all surfaces
+ before destroying this object.
+
+
@@ -62,30 +75,28 @@
- Create a shell surface for an existing surface.
-
- Only one shell or popup surface can be associated with a given
- surface.
+ This creates an xdg_surface for the given surface and gives it the
+ xdg_surface role. See the documentation of xdg_surface for more details.
-
- Create a popup surface for an existing surface.
+
+ This creates an xdg_popup for the given surface and gives it the
+ xdg_popup role. See the documentation of xdg_popup for more details.
- Only one shell or popup surface can be associated with a given
- surface.
+ This request must be used in response to some sort of user action
+ like a button press, key press, or touch down event.
-
-
+
+
-
@@ -99,7 +110,7 @@
respond to the ping request, or in what timeframe. Clients should
try to respond in a reasonable amount of time.
-
+
@@ -112,38 +123,34 @@
-
-
+
An interface that may be implemented by a wl_surface, for
implementations that provide a desktop-style user interface.
It provides requests to treat surfaces like windows, allowing to set
properties like maximized, fullscreen, minimized, and to move and resize
them, and associate metadata like title and app id.
-
- On the server side the object is automatically destroyed when
- the related wl_surface is destroyed. On client side,
- xdg_surface.destroy() must be called before destroying
- the wl_surface object.
-
- The xdg_surface interface is removed from the wl_surface object
- that was turned into a xdg_surface with
- xdg_shell.get_xdg_surface request. The xdg_surface properties,
- like maximized and fullscreen, are lost. The wl_surface loses
- its role as a xdg_surface. The wl_surface is unmapped.
+
+ Unmap and destroy the window. The window will be effectively
+ hidden from the user's point of view, and all state like
+ maximization, fullscreen, and so on, will be lost.
-
- Child surfaces are stacked above their parents, and will be
- unmapped if the parent is unmapped too. They should not appear
- on task bars and alt+tab.
+
+ Set the "parent" of this surface. This window should be stacked
+ above a parent. The parent surface must be mapped as long as this
+ surface is mapped.
+
+ Parent windows should be set on dialogs, toolboxes, or other
+ "auxilliary" surfaces, so that the parent is raised when the dialog
+ is raised.
-
+
@@ -160,14 +167,19 @@
-
- Set an id for the surface.
+
+ Set an application identifier for the surface.
- The app id identifies the general class of applications to which
- the surface belongs.
+ The app ID identifies the general class of applications to which
+ the surface belongs. The compositor can use this to group multiple
+ applications together, or to determine how to launch a new
+ application.
- It should be the ID that appears in the new desktop entry
- specification, the interface name.
+ See the desktop-entry specification [0] for more details on
+ application identifiers and how they relate to well-known DBus
+ names and .desktop files.
+
+ [0] http://standards.freedesktop.org/desktop-entry-spec/
@@ -179,29 +191,32 @@
user a menu that they can use to maximize or minimize the window.
This request asks the compositor to pop up such a window menu at
- the given position, relative to the parent surface. There are
- no guarantees as to what the window menu contains.
+ the given position, relative to the local surface coordinates of
+ the parent surface. There are no guarantees as to what menu items
+ the window menu contains.
- Your surface must have focus on the seat passed in to pop up the
- window menu.
+ This request must be used in response to some sort of user action
+ like a button press, key press, or touch down event.
-
-
+
+
- Start a pointer-driven move of the surface.
+ Start an interactive, user-driven move of the surface.
+
+ This request must be used in response to some sort of user action
+ like a button press, key press, or touch down event.
- This request must be used in response to a button press event.
The server may ignore move requests depending on the state of
the surface (e.g. fullscreen or maximized).
-
-
+
+
@@ -224,14 +239,16 @@
- Start a pointer-driven resizing of the surface.
+ Start a user-driven, interactive resize of the surface.
+
+ This request must be used in response to some sort of user action
+ like a button press, key press, or touch down event.
- This request must be used in response to a button press event.
The server may ignore resize requests depending on the state of
the surface (e.g. fullscreen or maximized).
-
-
+
+
@@ -279,16 +296,21 @@
- The configure event asks the client to resize its surface.
+ The configure event asks the client to resize its surface or to
+ change its state.
The width and height arguments specify a hint to the window
- about how its surface should be resized in window geometry
- coordinates. The states listed in the event specify how the
- width/height arguments should be interpreted.
+ about how its surface should be resized in window geometry
+ coordinates.
- A client should arrange a new surface, and then send a
- ack_configure request with the serial sent in this configure
- event before attaching a new surface.
+ The states listed in the event specify how the width/height
+ arguments should be interpreted, and possibly how it should be
+ drawn.
+
+ Clients should arrange their surface for the new size and
+ states, and then send a ack_configure request with the serial
+ sent in this configure event at some point before committing
+ the new surface.
If the client receives multiple configure events before it
can respond to one, it is free to discard all but the last
@@ -303,14 +325,19 @@
- When a configure event is received, a client should then ack it
- using the ack_configure request to ensure that the compositor
- knows the client has seen the event.
+ When a configure event is received, if a client commits the
+ surface in response to the configure event, then the client
+ must make a ack_configure request before the commit request,
+ passing along the serial of the configure event.
- By this point, the state is confirmed, and the next attach should
- contain the buffer drawn for the configure event you are acking.
+ The compositor might use this information to move a surface
+ to the top left only when the client has drawn itself for
+ the maximized or fullscreen state.
+
+ If the client receives multiple configure events before it
+ can respond to one, it only has to ack the last configure event.
-
+
@@ -320,15 +347,20 @@
portions like drop-shadows which should be ignored for the
purposes of aligning, placing and constraining windows.
- The default value is the full bounds of the surface, including any
- subsurfaces. Once the window geometry of the surface is set once,
- it is not possible to unset it, and it will remain the same until
+ Once the window geometry of the surface is set once, it is not
+ possible to unset it, and it will remain the same until
set_window_geometry is called again, even if a new subsurface or
buffer is attached.
+ If never set, the value is the full bounds of the surface,
+ including any subsurfaces. This updates dynamically on every
+ commit. This unset mode is meant for extremely simple clients.
+
If responding to a configure event, the window geometry in here
must respect the sizing negotiations specified by the states in
the configure event.
+
+ The width and height must be greater than zero.
@@ -351,7 +383,18 @@
-
+
+
+ Request that the compositor minimize your surface. There is no
+ way to know if the surface is currently minimized, nor is there
+ any way to unset minimization on this surface.
+
+ If you are looking to throttle redrawing when minimized, please
+ instead use the wl_surface.frame event for this, as this will
+ also work with live previews on windows in Alt-Tab, Expose or
+ similar compositor features.
+
+
@@ -368,45 +411,74 @@
-
- An interface that may be implemented by a wl_surface, for
- implementations that provide a desktop-style popups/menus. A popup
- surface is a transient surface with an added pointer grab.
+
+ A popup surface is a short-lived, temporary surface that can be
+ used to implement menus. It takes an explicit grab on the surface
+ that will be dismissed when the user dismisses the popup. This can
+ be done by the user clicking outside the surface, using the keyboard,
+ or even locking the screen through closing the lid or a timeout.
- An existing implicit grab will be changed to owner-events mode,
- and the popup grab will continue after the implicit grab ends
- (i.e. releasing the mouse button does not cause the popup to be
- unmapped).
+ When the popup is dismissed, a popup_done event will be sent out,
+ and at the same time the surface will be unmapped. The xdg_popup
+ object is now inert and cannot be reactivated, so clients should
+ destroy it. Explicitly destroying the xdg_popup object will also
+ dismiss the popup and unmap the surface.
- The popup grab continues until the window is destroyed or a mouse
- button is pressed in any other clients window. A click in any of
- the clients surfaces is reported as normal, however, clicks in
- other clients surfaces will be discarded and trigger the callback.
+ Clients will receive events for all their surfaces during this
+ grab (which is an "owner-events" grab in X11 parlance). This is
+ done so that users can navigate through submenus and other
+ "nested" popup windows without having to dismiss the topmost
+ popup.
- The x and y arguments specify the locations of the upper left
- corner of the surface relative to the upper left corner of the
- parent surface, in surface local coordinates.
+ Clients that want to dismiss the popup when another surface of
+ their own is clicked should dismiss the popup using the destroy
+ request.
- xdg_popup surfaces are always transient for another surface.
+ The parent surface must have either an xdg_surface or xdg_popup
+ role.
+
+ Specifying an xdg_popup for the parent means that the popups are
+ nested, with this popup now being the topmost popup. Nested
+ popups must be destroyed in the reverse order they were created
+ in, e.g. the only popup you are allowed to destroy at all times
+ is the topmost one.
+
+ If there is an existing popup when creating a new popup, the
+ parent must be the current topmost popup.
+
+ A parent surface must be mapped before the new popup is mapped.
+
+ When compositors choose to dismiss a popup, they will likely
+ dismiss every nested popup as well.
+
+ The x and y arguments specify where the top left of the popup
+ should be placed, relative to the local surface coordinates of the
+ parent surface.
+
+
+ These errors can be emitted in response to xdg_popup requests.
+
+
+
+
+
-
- The xdg_surface interface is removed from the wl_surface object
- that was turned into a xdg_surface with
- xdg_shell.get_xdg_surface request. The xdg_surface properties,
- like maximized and fullscreen, are lost. The wl_surface loses
- its role as a xdg_surface. The wl_surface is unmapped.
+
+ This destroys the popup. Explicitly destroying the xdg_popup
+ object will also dismiss the popup, and unmap the surface.
+
+ If this xdg_popup is not the "topmost" popup, a protocol error
+ will be sent.
- The popup_done event is sent out when a popup grab is broken,
- that is, when the users clicks a surface that doesn't belong
- to the client owning the popup surface.
+ The popup_done event is sent out when a popup is dismissed
+ by the compositor.
-