isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Use pointer gestures protocol from wayand-protocols

Browse Source 
Remove our own copy of the pointer gestures protocol, and us the one
installed by wayland-protocols. This also means the new fixed unstable
naming conventions are used for the new version of the protocol, which
is reflected in the change. No functional changes were made, it is only
a rename.

https://bugzilla.gnome.org/show_bug.cgi?id=758633
This commit is contained in:
Jonas Ådahl
2015-11-09 15:28:14 +08:00
parent c625d2ee9d
commit 2ee1c5fa61
8 changed files with 60 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/wayland/meta-wayland-pointer-gesture-pinch.c
View File

@ -30,7 +30,7 @@
#include "meta-wayland-pointer-gesture-pinch.h"
#include "meta-wayland-pointer.h"
#include "meta-wayland-surface.h"
#include "pointer-gestures-server-protocol.h"
#include "pointer-gestures-unstable-v1-server-protocol.h"
static void
handle_pinch_begin (MetaWaylandPointer *pointer,
@ -45,10 +45,10 @@ handle_pinch_begin (MetaWaylandPointer *pointer,
wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
{
_wl_pointer_gesture_pinch_send_begin (resource, serial,
clutter_event_get_time (event),
pointer->focus_surface->resource,
2);
zwp_pointer_gesture_pinch_v1_send_begin (resource, serial,
clutter_event_get_time (event),
pointer->focus_surface->resource,
2);
}
}
@ -67,12 +67,12 @@ handle_pinch_update (MetaWaylandPointer *pointer,
wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
{
_wl_pointer_gesture_pinch_send_update (resource,
clutter_event_get_time (event),
wl_fixed_from_double (dx),
wl_fixed_from_double (dy),
wl_fixed_from_double (scale),
wl_fixed_from_double (rotation));
zwp_pointer_gesture_pinch_v1_send_update (resource,
clutter_event_get_time (event),
wl_fixed_from_double (dx),
wl_fixed_from_double (dy),
wl_fixed_from_double (scale),
wl_fixed_from_double (rotation));
}
}
@ -93,9 +93,9 @@ handle_pinch_end (MetaWaylandPointer *pointer,
wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
{
_wl_pointer_gesture_pinch_send_end (resource, serial,
clutter_event_get_time (event),
cancelled);
zwp_pointer_gesture_pinch_v1_send_end (resource, serial,
clutter_event_get_time (event),
cancelled);
}
}
@ -135,7 +135,7 @@ pointer_gesture_pinch_destroy (struct wl_client *client,
wl_resource_destroy (resource);
}
static const struct _wl_pointer_gesture_pinch_interface pointer_gesture_pinch_interface = {
static const struct zwp_pointer_gesture_pinch_v1_interface pointer_gesture_pinch_interface = {
pointer_gesture_pinch_destroy
};
@ -151,7 +151,7 @@ meta_wayland_pointer_gesture_pinch_create_new_resource (MetaWaylandPointer *poin
pointer_client = meta_wayland_pointer_get_pointer_client (pointer, client);
g_return_if_fail (pointer_client != NULL);
res = wl_resource_create (client, &_wl_pointer_gesture_pinch_interface,
res = wl_resource_create (client, &zwp_pointer_gesture_pinch_v1_interface,
wl_resource_get_version (gestures_resource), id);
wl_resource_set_implementation (res, &pointer_gesture_pinch_interface, pointer,
meta_wayland_pointer_unbind_pointer_client_resource);