diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-18 21:10:30 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-18 21:10:30 +0000 |
commit | bb65564c7d6e0a6d96ef9c420fa6498884b6fd5e (patch) | |
tree | c549e9d64829feb0bffdb0c40dfa0c673d836602 | |
parent | 03031b3dc1a43a9b0661661cebabf8bc0bf86abd (diff) | |
parent | ad0c1d4dbe8413d9094a92a3d346604ccc26c7a1 (diff) | |
download | gtk+-bb65564c7d6e0a6d96ef9c420fa6498884b6fd5e.tar.gz |
Merge branch 'seat-v7' into 'master'
gdk/wayland: add support for wl_seat version 7
See merge request GNOME/gtk!3842
-rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 21 | ||||
-rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 2 | ||||
-rw-r--r-- | gdk/wayland/gdkkeys-wayland.c | 2 | ||||
-rw-r--r-- | meson.build | 2 |
4 files changed, 23 insertions, 4 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 2371fc0e84..dc876b1f9a 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -2635,6 +2635,23 @@ touch_handle_cancel (void *data, } static void +touch_handle_shape (void *data, + struct wl_touch *touch, + int32_t id, + wl_fixed_t major, + wl_fixed_t minor) +{ +} + +static void +touch_handle_orientation (void *data, + struct wl_touch *touch, + int32_t id, + wl_fixed_t orientation) +{ +} + +static void emit_gesture_swipe_event (GdkWaylandSeat *seat, GdkTouchpadGesturePhase phase, guint32 _time, @@ -3021,7 +3038,9 @@ static const struct wl_touch_listener touch_listener = { touch_handle_up, touch_handle_motion, touch_handle_frame, - touch_handle_cancel + touch_handle_cancel, + touch_handle_shape, + touch_handle_orientation, }; static const struct zwp_pointer_gesture_swipe_v1_listener gesture_swipe_listener = { diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index ad033076b4..1860a73f78 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -240,7 +240,7 @@ _gdk_wayland_display_add_seat (GdkWaylandDisplay *display_wayland, { struct wl_seat *seat; - display_wayland->seat_version = MIN (version, 5); + display_wayland->seat_version = MIN (version, 7); seat = wl_registry_bind (display_wayland->wl_registry, id, &wl_seat_interface, display_wayland->seat_version); diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c index 38f346c75d..35ac9e8262 100644 --- a/gdk/wayland/gdkkeys-wayland.c +++ b/gdk/wayland/gdkkeys-wayland.c @@ -542,7 +542,7 @@ _gdk_wayland_keymap_update_from_fd (GdkKeymap *keymap, context = xkb_context_new (0); - map_str = mmap (NULL, size, PROT_READ, MAP_SHARED, fd, 0); + map_str = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); if (map_str == MAP_FAILED) { close(fd); diff --git a/meson.build b/meson.build index f2aef2f646..484ce536c3 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,7 @@ cairo_req = '>= 1.14.0' gdk_pixbuf_req = '>= 2.30.0' introspection_req = '>= 1.39.0' wayland_proto_req = '>= 1.21' -wayland_req = '>= 1.14.91' +wayland_req = '>= 1.16.91' graphene_req = '>= 1.9.1' epoxy_req = '>= 1.4' cloudproviders_req = '>= 0.3.1' |