[PATCH weston 05/10] xdg-shell: Remove the flags from get_xdg_popup
Jonas Ã…dahl
jadahl at gmail.com
Thu Feb 12 22:01:57 PST 2015
From: "Jasper St. Pierre" <jstpierre at mecheye.net>
There haven't been any ideas for flags, so we don't need a useless,
unused parameter hanging around. Any future ideas should be done with a
new request entirely.
---
clients/window.c | 3 +--
desktop-shell/shell.c | 2 +-
protocol/xdg-shell.xml | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/clients/window.c b/clients/window.c
index d919210..57f7a8d 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4840,8 +4840,7 @@ window_show_menu(struct display *display,
input->seat,
display_get_serial(window->display),
window->x - ix,
- window->y - iy,
- 0);
+ window->y - iy);
fail_on_null(window->xdg_popup);
xdg_popup_set_user_data(window->xdg_popup, window);
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index b081e33..4990c4d 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4073,7 +4073,7 @@ xdg_get_xdg_popup(struct wl_client *client,
struct wl_resource *parent_resource,
struct wl_resource *seat_resource,
uint32_t serial,
- int32_t x, int32_t y, uint32_t flags)
+ int32_t x, int32_t y)
{
struct weston_surface *surface =
wl_resource_get_user_data(surface_resource);
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index d0a2124..4414d46 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -94,7 +94,6 @@
<arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
<arg name="x" type="int"/>
<arg name="y" type="int"/>
- <arg name="flags" type="uint"/>
</request>
<event name="ping">
--
2.1.0
More information about the wayland-devel
mailing list