brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Support pinging Wayland surfaces as well

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-11-21 14:20:52 -05:00
parent aa3643cdde
commit 6d639ac528
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/window.c
View File

@ -12169,7 +12169,9 @@ meta_window_ping (MetaWindow *window,
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
"Sending ping with timestamp %u to window %s\n", "Sending ping with timestamp %u to window %s\n",
timestamp, window->desc); timestamp, window->desc);
meta_window_send_icccm_message (window,
display->atom__NET_WM_PING, if (window->client_type == META_WINDOW_CLIENT_TYPE_X11)
timestamp); meta_window_send_icccm_message (window, display->atom__NET_WM_PING, timestamp);
else
meta_wayland_surface_ping (window->surface, timestamp);
} }

18
src/wayland/meta-wayland-surface.c
View File

@ -566,6 +566,10 @@ xdg_surface_pong (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
guint32 serial) guint32 serial)
{ {
MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface);
meta_window_pong (surface->window, serial);
} }
static gboolean static gboolean
@ -769,6 +773,10 @@ xdg_popup_pong (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
uint32_t serial) uint32_t serial)
{ {
MetaWaylandSurfaceExtension *xdg_popup = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (xdg_popup, surface, xdg_popup);
meta_window_pong (surface->window, serial);
} }
static const struct xdg_popup_interface meta_wayland_xdg_popup_interface = { static const struct xdg_popup_interface meta_wayland_xdg_popup_interface = {
@ -940,3 +948,13 @@ meta_wayland_surface_focused_unset (MetaWaylandSurface *surface)
if (surface->xdg_surface.resource) if (surface->xdg_surface.resource)
xdg_surface_send_focused_unset (surface->xdg_surface.resource); xdg_surface_send_focused_unset (surface->xdg_surface.resource);
} }
void
meta_wayland_surface_ping (MetaWaylandSurface *surface,
guint32 timestamp)
{
if (surface->xdg_surface.resource)
xdg_surface_send_ping (surface->xdg_surface.resource, timestamp);
else if (surface->xdg_popup.resource)
xdg_popup_send_ping (surface->xdg_popup.resource, timestamp);
}

3
src/wayland/meta-wayland-surface.h
View File

@ -102,4 +102,7 @@ void meta_wayland_surface_configure_notify (MetaWaylandSurface *s
void meta_wayland_surface_focused_set (MetaWaylandSurface *surface); void meta_wayland_surface_focused_set (MetaWaylandSurface *surface);
void meta_wayland_surface_focused_unset (MetaWaylandSurface *surface); void meta_wayland_surface_focused_unset (MetaWaylandSurface *surface);
void meta_wayland_surface_ping (MetaWaylandSurface *surface,
guint32 serial);
#endif #endif