diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2012-10-08 13:25:52 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-10-10 20:59:00 -0400 |
commit | 8872956dfd43d36e4165d15cb50d8ef4f81fbe0d (patch) | |
tree | 4e682120746b5fea5588cee49854d660f7defa03 /src/wayland-client.c | |
parent | 85a6a470873357089ffb968a176d5074fddd1756 (diff) |
scanner: Generate client stubs for wl_display requests
We used to special case this because of the untyped new-id argument in
the bind request. Now that the scanner can handle that, we can
remove the special case.
Switching to the generated stubs does bring an API change since we now
also take the interface version that the client expects as an argument.
Previously we would take this from the interface struct, but the
application may implement a lower version than what the interface struct
provides. To make sure we don't try to dispatch event the client
doesn't implement handlers for, we have to use a client supplied version
number.
Diffstat (limited to 'src/wayland-client.c')
-rw-r--r-- | src/wayland-client.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/wayland-client.c b/src/wayland-client.c index e88228a..fb751ef 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -711,37 +711,6 @@ wl_display_flush(struct wl_display *display) return ret; } -WL_EXPORT void * -wl_display_bind(struct wl_display *display, - uint32_t name, const struct wl_interface *interface) -{ - struct wl_proxy *proxy; - - proxy = wl_proxy_create(&display->proxy, interface); - if (proxy == NULL) - return NULL; - - wl_proxy_marshal(&display->proxy, WL_DISPLAY_BIND, - name, interface->name, interface->version, proxy); - - return proxy; -} - -WL_EXPORT struct wl_callback * -wl_display_sync(struct wl_display *display) -{ - struct wl_proxy *proxy; - - proxy = wl_proxy_create(&display->proxy, &wl_callback_interface); - - if (!proxy) - return NULL; - - wl_proxy_marshal(&display->proxy, WL_DISPLAY_SYNC, proxy); - - return (struct wl_callback *) proxy; -} - WL_EXPORT void wl_proxy_set_user_data(struct wl_proxy *proxy, void *user_data) { |