[gtk: 2/2] Merge branch 'wayland-cursors' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 2bc6e1b8755f4d11bddc2d940a166981aa4e4df6
Merge: 53bc1d60c4 4e58541d52
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 24 23:03:56 2020 +0000

    Merge branch 'wayland-cursors' into 'master'
    
    Make wayland load cursors on demand
    
    See merge request GNOME/gtk!1350

 gdk/wayland/cursor/meson.build        |  12 +
 gdk/wayland/cursor/os-compatibility.c | 173 ++++++++++
 gdk/wayland/cursor/os-compatibility.h |  34 ++
 gdk/wayland/cursor/wayland-cursor.c   | 385 +++++++++++++++++++++
 gdk/wayland/cursor/wayland-cursor.h   |  72 ++++
 gdk/wayland/cursor/xcursor.c          | 612 ++++++++++++++++++++++++++++++++++
 gdk/wayland/cursor/xcursor.h          |  61 ++++
 gdk/wayland/gdkcursor-wayland.c       |  14 +-
 gdk/wayland/gdkdisplay-wayland.c      |  76 ++---
 gdk/wayland/gdkdisplay-wayland.h      |   4 +-
 gdk/wayland/gdkprivate-wayland.h      |   3 +-
 gdk/wayland/meson.build               |   6 +-
 meson.build                           |   2 -
 13 files changed, 1402 insertions(+), 52 deletions(-)
---