devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=13df35050cdf5e500e9dbe1290ca3dd83580f252
commit 13df35050cdf5e500e9dbe1290ca3dd83580f252 Author: Chris Michael <cp.mich...@samsung.com> Date: Mon Jun 8 10:56:10 2015 -0400 ecore-wayland: Fix T2466: Update xdg shell protocol code Summary: This updates the xdg_shell protocol and code to support XDG_SHELL version 5. This allows EFL/Elm apps to function again in Weston. @fix Signed-off-by: Chris Michael <cp.mich...@samsung.com> --- src/lib/ecore_wayland/ecore_wl.c | 2 +- src/lib/ecore_wayland/ecore_wl_window.c | 9 +- src/lib/ecore_wayland/xdg-shell-client-protocol.h | 447 +++++++++++++--------- src/lib/ecore_wayland/xdg-shell-protocol.c | 121 +++--- 4 files changed, 322 insertions(+), 257 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index a04d2df..f5d13ed 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -17,7 +17,7 @@ #endif #include "xdg-shell-client-protocol.h" -#define XDG_VERSION 4 +#define XDG_VERSION 5 /* local function prototypes */ static int _ecore_wl_shutdown(Eina_Bool close); diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 8811ded..ab3f28d 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -15,7 +15,7 @@ static void _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, static char *_ecore_wl_window_id_str_get(unsigned int win_id); static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial); static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface); -static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial); +static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup); /* local variables */ static Eina_Hash *_windows = NULL; @@ -368,7 +368,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win) break; case ECORE_WL_WINDOW_TYPE_TRANSIENT: if (win->xdg_surface) - xdg_surface_set_parent(win->xdg_surface, win->parent->surface); + xdg_surface_set_parent(win->xdg_surface, win->parent->xdg_surface); else if (win->shell_surface) wl_shell_surface_set_transient(win->shell_surface, win->parent->surface, @@ -384,8 +384,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win) win->parent->surface, _ecore_wl_disp->input->seat, _ecore_wl_disp->serial, - win->allocation.x, - win->allocation.y, 0); + win->allocation.x, win->allocation.y); if (!win->xdg_popup) return; xdg_popup_set_user_data(win->xdg_popup, win); xdg_popup_add_listener(win->xdg_popup, @@ -1052,7 +1051,7 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac } static void -_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial EINA_UNUSED) +_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup) { Ecore_Wl_Window *win; diff --git a/src/lib/ecore_wayland/xdg-shell-client-protocol.h b/src/lib/ecore_wayland/xdg-shell-client-protocol.h index eabf8ee..24b92b0 100644 --- a/src/lib/ecore_wayland/xdg-shell-client-protocol.h +++ b/src/lib/ecore_wayland/xdg-shell-client-protocol.h @@ -1,9 +1,9 @@ -/* +/* * Copyright © 2008-2013 Kristian Høgsberg * Copyright © 2013 Rafael Antognolli * Copyright © 2013 Jasper St. Pierre * Copyright © 2010-2013 Intel Corporation - * + * * 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 @@ -15,7 +15,7 @@ * representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * 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 @@ -40,9 +40,12 @@ extern "C" { struct wl_client; struct wl_resource; +struct wl_output; +struct wl_seat; +struct wl_surface; +struct xdg_popup; struct xdg_shell; struct xdg_surface; -struct xdg_popup; extern const struct wl_interface xdg_shell_interface; extern const struct wl_interface xdg_surface_interface; @@ -59,103 +62,120 @@ extern const struct wl_interface xdg_popup_interface; * static_assert to ensure the protocol and implementation versions match. */ enum xdg_shell_version { - XDG_SHELL_VERSION_CURRENT = 4, + XDG_SHELL_VERSION_CURRENT = 5, }; #endif /* XDG_SHELL_VERSION_ENUM */ +#ifndef XDG_SHELL_ERROR_ENUM +#define XDG_SHELL_ERROR_ENUM +enum xdg_shell_error { + XDG_SHELL_ERROR_ROLE = 0, + XDG_SHELL_ERROR_DEFUNCT_SURFACES = 1, + XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP = 2, + XDG_SHELL_ERROR_INVALID_POPUP_PARENT = 3, +}; +#endif /* XDG_SHELL_ERROR_ENUM */ + /** * xdg_shell - create desktop-style surfaces * @ping: check if the client is alive * - * 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. */ struct xdg_shell_listener { - /** - * ping - check if the client is alive - * @serial: pass this to the callback - * - * The ping event asks the client if it's still alive. Pass the - * serial specified in the event back to the compositor by sending - * a "pong" request back with the specified serial. - * - * Compositors can use this to determine if the client is still - * alive. It's unspecified what will happen if the client doesn't - * respond to the ping request, or in what timeframe. Clients - * should try to respond in a reasonable amount of time. - */ - void (*ping)(void *data, - struct xdg_shell *xdg_shell, - uint32_t serial); + /** + * ping - check if the client is alive + * @serial: pass this to the pong request + * + * The ping event asks the client if it's still alive. Pass the + * serial specified in the event back to the compositor by sending + * a "pong" request back with the specified serial. + * + * Compositors can use this to determine if the client is still + * alive. It's unspecified what will happen if the client doesn't + * respond to the ping request, or in what timeframe. Clients + * should try to respond in a reasonable amount of time. + * + * A compositor is free to ping in any way it wants, but a client + * must always respond to any xdg_shell object it created. + */ + void (*ping)(void *data, + struct xdg_shell *xdg_shell, + uint32_t serial); }; static inline int xdg_shell_add_listener(struct xdg_shell *xdg_shell, - const struct xdg_shell_listener *listener, void *data) + const struct xdg_shell_listener *listener, void *data) { - return wl_proxy_add_listener((struct wl_proxy *) xdg_shell, - (void (**)(void)) listener, data); + return wl_proxy_add_listener((struct wl_proxy *) xdg_shell, + (void (**)(void)) listener, data); } -#define XDG_SHELL_USE_UNSTABLE_VERSION 0 -#define XDG_SHELL_GET_XDG_SURFACE 1 -#define XDG_SHELL_GET_XDG_POPUP 2 -#define XDG_SHELL_PONG 3 +#define XDG_SHELL_DESTROY 0 +#define XDG_SHELL_USE_UNSTABLE_VERSION 1 +#define XDG_SHELL_GET_XDG_SURFACE 2 +#define XDG_SHELL_GET_XDG_POPUP 3 +#define XDG_SHELL_PONG 4 static inline void xdg_shell_set_user_data(struct xdg_shell *xdg_shell, void *user_data) { - wl_proxy_set_user_data((struct wl_proxy *) xdg_shell, user_data); + wl_proxy_set_user_data((struct wl_proxy *) xdg_shell, user_data); } static inline void * xdg_shell_get_user_data(struct xdg_shell *xdg_shell) { - return wl_proxy_get_user_data((struct wl_proxy *) xdg_shell); + return wl_proxy_get_user_data((struct wl_proxy *) xdg_shell); } static inline void xdg_shell_destroy(struct xdg_shell *xdg_shell) { - wl_proxy_destroy((struct wl_proxy *) xdg_shell); + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + XDG_SHELL_DESTROY); + + wl_proxy_destroy((struct wl_proxy *) xdg_shell); } static inline void xdg_shell_use_unstable_version(struct xdg_shell *xdg_shell, int32_t version) { - wl_proxy_marshal((struct wl_proxy *) xdg_shell, - XDG_SHELL_USE_UNSTABLE_VERSION, version); + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + XDG_SHELL_USE_UNSTABLE_VERSION, version); } static inline struct xdg_surface * xdg_shell_get_xdg_surface(struct xdg_shell *xdg_shell, struct wl_surface *surface) { - struct wl_proxy *id; + struct wl_proxy *id; - id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, - XDG_SHELL_GET_XDG_SURFACE, &xdg_surface_interface, NULL, surface); + id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, + XDG_SHELL_GET_XDG_SURFACE, &xdg_surface_interface, NULL, surface); - return (struct xdg_surface *) id; + return (struct xdg_surface *) id; } static inline struct xdg_popup * -xdg_shell_get_xdg_popup(struct xdg_shell *xdg_shell, struct wl_surface *surface, struct wl_surface *parent, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y, uint32_t flags) +xdg_shell_get_xdg_popup(struct xdg_shell *xdg_shell, struct wl_surface *surface, struct wl_surface *parent, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y) { - struct wl_proxy *id; + struct wl_proxy *id; - id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, - XDG_SHELL_GET_XDG_POPUP, &xdg_popup_interface, NULL, surface, parent, seat, serial, x, y, flags); + id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, + XDG_SHELL_GET_XDG_POPUP, &xdg_popup_interface, NULL, surface, parent, seat, serial, x, y); - return (struct xdg_popup *) id; + return (struct xdg_popup *) id; } static inline void xdg_shell_pong(struct xdg_shell *xdg_shell, uint32_t serial) { - wl_proxy_marshal((struct wl_proxy *) xdg_shell, - XDG_SHELL_PONG, serial); + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + XDG_SHELL_PONG, serial); } #ifndef XDG_SURFACE_RESIZE_EDGE_ENUM @@ -177,15 +197,15 @@ xdg_shell_pong(struct xdg_shell *xdg_shell, uint32_t serial) * adapt its behavior, e.g. choose an appropriate cursor image. */ enum xdg_surface_resize_edge { - XDG_SURFACE_RESIZE_EDGE_NONE = 0, - XDG_SURFACE_RESIZE_EDGE_TOP = 1, - XDG_SURFACE_RESIZE_EDGE_BOTTOM = 2, - XDG_SURFACE_RESIZE_EDGE_LEFT = 4, - XDG_SURFACE_RESIZE_EDGE_TOP_LEFT = 5, - XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT = 6, - XDG_SURFACE_RESIZE_EDGE_RIGHT = 8, - XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT = 9, - XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT = 10, + XDG_SURFACE_RESIZE_EDGE_NONE = 0, + XDG_SURFACE_RESIZE_EDGE_TOP = 1, + XDG_SURFACE_RESIZE_EDGE_BOTTOM = 2, + XDG_SURFACE_RESIZE_EDGE_LEFT = 4, + XDG_SURFACE_RESIZE_EDGE_TOP_LEFT = 5, + XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT = 6, + XDG_SURFACE_RESIZE_EDGE_RIGHT = 8, + XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT = 9, + XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT = 10, }; #endif /* XDG_SURFACE_RESIZE_EDGE_ENUM */ @@ -218,15 +238,15 @@ enum xdg_surface_resize_edge { * 0x1FFF: GNOME */ enum xdg_surface_state { - XDG_SURFACE_STATE_MAXIMIZED = 1, - XDG_SURFACE_STATE_FULLSCREEN = 2, - XDG_SURFACE_STATE_RESIZING = 3, - XDG_SURFACE_STATE_ACTIVATED = 4, + XDG_SURFACE_STATE_MAXIMIZED = 1, + XDG_SURFACE_STATE_FULLSCREEN = 2, + XDG_SURFACE_STATE_RESIZING = 3, + XDG_SURFACE_STATE_ACTIVATED = 4, }; #endif /* XDG_SURFACE_STATE_ENUM */ /** - * xdg_surface - desktop-style metadata interface + * xdg_surface - A desktop window * @configure: suggest a surface change * @close: surface wants to be closed * @@ -237,256 +257,301 @@ enum xdg_surface_state { * 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 client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_surface state to take effect. Prior to committing the new + * state, it can set up initial configuration, such as maximizing or + * setting a window geometry. + * + * Even without attaching a buffer the compositor must respond to initial + * committed configuration, for instance sending a configure event with + * expected window geometry if the client maximized its surface during + * initialization. + * + * For a surface to be mapped by the compositor the client must have + * committed both an xdg_surface state and a buffer. */ struct xdg_surface_listener { - /** - * configure - suggest a surface change - * @width: (none) - * @height: (none) - * @states: (none) - * @serial: (none) - * - * The configure event asks the client to resize its surface. - * - * 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. - * - * 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. - * - * If the client receives multiple configure events before it can - * respond to one, it is free to discard all but the last event it - * received. - */ - void (*configure)(void *data, - struct xdg_surface *xdg_surface, - int32_t width, - int32_t height, - struct wl_array *states, - uint32_t serial); - /** - * close - surface wants to be closed - * - * The close event is sent by the compositor when the user wants - * the surface to be closed. This should be equivalent to the user - * clicking the close button in client-side decorations, if your - * application has any... - * - * This is only a request that the user intends to close your - * window. The client may choose to ignore this request, or show a - * dialog to ask the user to save their data... - */ - void (*close)(void *data, - struct xdg_surface *xdg_surface); + /** + * configure - suggest a surface change + * @width: (none) + * @height: (none) + * @states: (none) + * @serial: (none) + * + * 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. See set_window_geometry. + * + * If the width or height arguments are zero, it means the client + * should decide its own window dimension. This may happen when the + * compositor need to configure the state of the surface but + * doesn't have any information about any previous or expected + * dimension. + * + * 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 event it + * received. + */ + void (*configure)(void *data, + struct xdg_surface *xdg_surface, + int32_t width, + int32_t height, + struct wl_array *states, + uint32_t serial); + /** + * close - surface wants to be closed + * + * The close event is sent by the compositor when the user wants + * the surface to be closed. This should be equivalent to the user + * clicking the close button in client-side decorations, if your + * application has any... + * + * This is only a request that the user intends to close your + * window. The client may choose to ignore this request, or show a + * dialog to ask the user to save their data... + */ + void (*close)(void *data, + struct xdg_surface *xdg_surface); }; static inline int xdg_surface_add_listener(struct xdg_surface *xdg_surface, - const struct xdg_surface_listener *listener, void *data) + const struct xdg_surface_listener *listener, void *data) { - return wl_proxy_add_listener((struct wl_proxy *) xdg_surface, - (void (**)(void)) listener, data); + return wl_proxy_add_listener((struct wl_proxy *) xdg_surface, + (void (**)(void)) listener, data); } -#define XDG_SURFACE_DESTROY 0 -#define XDG_SURFACE_SET_PARENT 1 -#define XDG_SURFACE_SET_TITLE 2 -#define XDG_SURFACE_SET_APP_ID 3 -#define XDG_SURFACE_SHOW_WINDOW_MENU 4 -#define XDG_SURFACE_MOVE 5 -#define XDG_SURFACE_RESIZE 6 -#define XDG_SURFACE_ACK_CONFIGURE 7 -#define XDG_SURFACE_SET_WINDOW_GEOMETRY 8 -#define XDG_SURFACE_SET_MAXIMIZED 9 -#define XDG_SURFACE_UNSET_MAXIMIZED 10 -#define XDG_SURFACE_SET_FULLSCREEN 11 -#define XDG_SURFACE_UNSET_FULLSCREEN 12 -#define XDG_SURFACE_SET_MINIMIZED 13 +#define XDG_SURFACE_DESTROY 0 +#define XDG_SURFACE_SET_PARENT 1 +#define XDG_SURFACE_SET_TITLE 2 +#define XDG_SURFACE_SET_APP_ID 3 +#define XDG_SURFACE_SHOW_WINDOW_MENU 4 +#define XDG_SURFACE_MOVE 5 +#define XDG_SURFACE_RESIZE 6 +#define XDG_SURFACE_ACK_CONFIGURE 7 +#define XDG_SURFACE_SET_WINDOW_GEOMETRY 8 +#define XDG_SURFACE_SET_MAXIMIZED 9 +#define XDG_SURFACE_UNSET_MAXIMIZED 10 +#define XDG_SURFACE_SET_FULLSCREEN 11 +#define XDG_SURFACE_UNSET_FULLSCREEN 12 +#define XDG_SURFACE_SET_MINIMIZED 13 static inline void xdg_surface_set_user_data(struct xdg_surface *xdg_surface, void *user_data) { - wl_proxy_set_user_data((struct wl_proxy *) xdg_surface, user_data); + wl_proxy_set_user_data((struct wl_proxy *) xdg_surface, user_data); } static inline void * xdg_surface_get_user_data(struct xdg_surface *xdg_surface) { - return wl_proxy_get_user_data((struct wl_proxy *) xdg_surface); + return wl_proxy_get_user_data((struct wl_proxy *) xdg_surface); } static inline void xdg_surface_destroy(struct xdg_surface *xdg_surface) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_DESTROY); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_DESTROY); - wl_proxy_destroy((struct wl_proxy *) xdg_surface); + wl_proxy_destroy((struct wl_proxy *) xdg_surface); } static inline void -xdg_surface_set_parent(struct xdg_surface *xdg_surface, struct wl_surface *parent) +xdg_surface_set_parent(struct xdg_surface *xdg_surface, struct xdg_surface *parent) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_PARENT, parent); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_PARENT, parent); } static inline void xdg_surface_set_title(struct xdg_surface *xdg_surface, const char *title) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_TITLE, title); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_TITLE, title); } static inline void xdg_surface_set_app_id(struct xdg_surface *xdg_surface, const char *app_id) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_APP_ID, app_id); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_APP_ID, app_id); } static inline void xdg_surface_show_window_menu(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SHOW_WINDOW_MENU, seat, serial, x, y); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SHOW_WINDOW_MENU, seat, serial, x, y); } static inline void xdg_surface_move(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_MOVE, seat, serial); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_MOVE, seat, serial); } static inline void xdg_surface_resize(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, uint32_t edges) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_RESIZE, seat, serial, edges); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_RESIZE, seat, serial, edges); } static inline void xdg_surface_ack_configure(struct xdg_surface *xdg_surface, uint32_t serial) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_ACK_CONFIGURE, serial); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_ACK_CONFIGURE, serial); } static inline void xdg_surface_set_window_geometry(struct xdg_surface *xdg_surface, int32_t x, int32_t y, int32_t width, int32_t height) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_WINDOW_GEOMETRY, x, y, width, height); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_WINDOW_GEOMETRY, x, y, width, height); } static inline void xdg_surface_set_maximized(struct xdg_surface *xdg_surface) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_MAXIMIZED); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_MAXIMIZED); } static inline void xdg_surface_unset_maximized(struct xdg_surface *xdg_surface) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_UNSET_MAXIMIZED); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_UNSET_MAXIMIZED); } static inline void xdg_surface_set_fullscreen(struct xdg_surface *xdg_surface, struct wl_output *output) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_FULLSCREEN, output); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_FULLSCREEN, output); } static inline void xdg_surface_unset_fullscreen(struct xdg_surface *xdg_surface) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_UNSET_FULLSCREEN); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_UNSET_FULLSCREEN); } static inline void xdg_surface_set_minimized(struct xdg_surface *xdg_surface) { - wl_proxy_marshal((struct wl_proxy *) xdg_surface, - XDG_SURFACE_SET_MINIMIZED); + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + XDG_SURFACE_SET_MINIMIZED); } /** - * xdg_popup - desktop-style metadata interface + * xdg_popup - short-lived, popup surfaces for menus * @popup_done: popup interaction is done * - * 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. + * + * 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. + * + * 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. + * + * Clients that want to dismiss the popup when another surface of their own + * is clicked should dismiss the popup using the destroy request. + * + * 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. * - * 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 compositors choose to dismiss a popup, they will likely dismiss + * every nested popup as well. When a compositor dismisses popups, it will + * follow the same dismissing order as required from the client. * - * 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. + * The x and y arguments passed when creating the popup object specify + * where the top left of the popup should be placed, relative to the local + * surface coordinates of the parent surface. See xdg_shell.get_xdg_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. + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_popup state to take effect. * - * xdg_popup surfaces are always transient for another surface. + * For a surface to be mapped by the compositor the client must have + * committed both the xdg_popup state and a buffer. */ struct xdg_popup_listener { - /** - * popup_done - popup interaction is done - * @serial: serial of the implicit grab on the pointer - * - * 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. - */ - void (*popup_done)(void *data, - struct xdg_popup *xdg_popup, - uint32_t serial); + /** + * popup_done - popup interaction is done + * + * The popup_done event is sent out when a popup is dismissed by + * the compositor. The client should destroy the xdg_popup object + * at this point. + */ + void (*popup_done)(void *data, + struct xdg_popup *xdg_popup); }; static inline int xdg_popup_add_listener(struct xdg_popup *xdg_popup, - const struct xdg_popup_listener *listener, void *data) + const struct xdg_popup_listener *listener, void *data) { - return wl_proxy_add_listener((struct wl_proxy *) xdg_popup, - (void (**)(void)) listener, data); + return wl_proxy_add_listener((struct wl_proxy *) xdg_popup, + (void (**)(void)) listener, data); } -#define XDG_POPUP_DESTROY 0 +#define XDG_POPUP_DESTROY 0 static inline void xdg_popup_set_user_data(struct xdg_popup *xdg_popup, void *user_data) { - wl_proxy_set_user_data((struct wl_proxy *) xdg_popup, user_data); + wl_proxy_set_user_data((struct wl_proxy *) xdg_popup, user_data); } static inline void * xdg_popup_get_user_data(struct xdg_popup *xdg_popup) { - return wl_proxy_get_user_data((struct wl_proxy *) xdg_popup); + return wl_proxy_get_user_data((struct wl_proxy *) xdg_popup); } static inline void xdg_popup_destroy(struct xdg_popup *xdg_popup) { - wl_proxy_marshal((struct wl_proxy *) xdg_popup, - XDG_POPUP_DESTROY); + wl_proxy_marshal((struct wl_proxy *) xdg_popup, + XDG_POPUP_DESTROY); - wl_proxy_destroy((struct wl_proxy *) xdg_popup); + wl_proxy_destroy((struct wl_proxy *) xdg_popup); } #ifdef __cplusplus diff --git a/src/lib/ecore_wayland/xdg-shell-protocol.c b/src/lib/ecore_wayland/xdg-shell-protocol.c index 81c7519..82433ea 100644 --- a/src/lib/ecore_wayland/xdg-shell-protocol.c +++ b/src/lib/ecore_wayland/xdg-shell-protocol.c @@ -1,9 +1,9 @@ -/* +/* * Copyright © 2008-2013 Kristian Høgsberg * Copyright © 2013 Rafael Antognolli * Copyright © 2013 Jasper St. Pierre * Copyright © 2010-2013 Intel Corporation - * + * * 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 @@ -15,7 +15,7 @@ * representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * 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 @@ -37,88 +37,89 @@ extern const struct wl_interface xdg_popup_interface; extern const struct wl_interface xdg_surface_interface; static const struct wl_interface *types[] = { - NULL, - NULL, - NULL, - NULL, - &xdg_surface_interface, - &wl_surface_interface, - &xdg_popup_interface, - &wl_surface_interface, - &wl_surface_interface, - &wl_seat_interface, - NULL, - NULL, - NULL, - NULL, - &wl_surface_interface, - &wl_seat_interface, - NULL, - NULL, - NULL, - &wl_seat_interface, - NULL, - &wl_seat_interface, - NULL, - NULL, - &wl_output_interface, + NULL, + NULL, + NULL, + NULL, + &xdg_surface_interface, + &wl_surface_interface, + &xdg_popup_interface, + &wl_surface_interface, + &wl_surface_interface, + &wl_seat_interface, + NULL, + NULL, + NULL, + &xdg_surface_interface, + &wl_seat_interface, + NULL, + NULL, + NULL, + &wl_seat_interface, + NULL, + &wl_seat_interface, + NULL, + NULL, + &wl_output_interface, }; static const struct wl_message xdg_shell_requests[] = { - { "use_unstable_version", "i", types + 0 }, - { "get_xdg_surface", "no", types + 4 }, - { "get_xdg_popup", "nooouiiu", types + 6 }, - { "pong", "u", types + 0 }, + { "destroy", "", types + 0 }, + { "use_unstable_version", "i", types + 0 }, + { "get_xdg_surface", "no", types + 4 }, + { "get_xdg_popup", "nooouii", types + 6 }, + { "pong", "u", types + 0 }, }; static const struct wl_message xdg_shell_events[] = { - { "ping", "u", types + 0 }, + { "ping", "u", types + 0 }, }; WL_EXPORT const struct wl_interface xdg_shell_interface = { - "xdg_shell", 1, - 4, xdg_shell_requests, - 1, xdg_shell_events, + "xdg_shell", 1, + 5, xdg_shell_requests, + 1, xdg_shell_events, }; static const struct wl_message xdg_surface_requests[] = { - { "destroy", "", types + 0 }, - { "set_parent", "?o", types + 14 }, - { "set_title", "s", types + 0 }, - { "set_app_id", "s", types + 0 }, - { "show_window_menu", "ouii", types + 15 }, - { "move", "ou", types + 19 }, - { "resize", "ouu", types + 21 }, - { "ack_configure", "u", types + 0 }, - { "set_window_geometry", "iiii", types + 0 }, - { "set_maximized", "", types + 0 }, - { "unset_maximized", "", types + 0 }, - { "set_fullscreen", "?o", types + 24 }, - { "unset_fullscreen", "", types + 0 }, - { "set_minimized", "", types + 0 }, + { "destroy", "", types + 0 }, + { "set_parent", "?o", types + 13 }, + { "set_title", "s", types + 0 }, + { "set_app_id", "s", types + 0 }, + { "show_window_menu", "ouii", types + 14 }, + { "move", "ou", types + 18 }, + { "resize", "ouu", types + 20 }, + { "ack_configure", "u", types + 0 }, + { "set_window_geometry", "iiii", types + 0 }, + { "set_maximized", "", types + 0 }, + { "unset_maximized", "", types + 0 }, + { "set_fullscreen", "?o", types + 23 }, + { "unset_fullscreen", "", types + 0 }, + { "set_minimized", "", types + 0 }, }; static const struct wl_message xdg_surface_events[] = { - { "configure", "iiau", types + 0 }, - { "close", "", types + 0 }, + { "configure", "iiau", types + 0 }, + { "close", "", types + 0 }, }; WL_EXPORT const struct wl_interface xdg_surface_interface = { - "xdg_surface", 1, - 14, xdg_surface_requests, - 2, xdg_surface_events, + "xdg_surface", 1, + 14, xdg_surface_requests, + 2, xdg_surface_events, }; static const struct wl_message xdg_popup_requests[] = { - { "destroy", "", types + 0 }, + { "destroy", "", types + 0 }, }; static const struct wl_message xdg_popup_events[] = { - { "popup_done", "u", types + 0 }, + { "popup_done", "", types + 0 }, }; WL_EXPORT const struct wl_interface xdg_popup_interface = { - "xdg_popup", 1, - 1, xdg_popup_requests, - 1, xdg_popup_events, + "xdg_popup", 1, + 1, xdg_popup_requests, + 1, xdg_popup_events, }; + --