[gtk/gtk-3-24: 20/20] Merge branch 'quartz-monitor' into gtk-3-24

[John Ralls <jralls src gnome org>]

commit 46bee8b9fe51d94bc586396dbf06e7eb094432f3
Merge: 239c95af47 833ddc6e8d
Author: John Ralls <jralls ceridwen us>
Date:   Sat Dec 8 11:28:32 2018 -0800

    Merge branch 'quartz-monitor' into gtk-3-24

 gdk/gdkdisplay.c                          |  10 +
 gdk/quartz/GdkQuartzNSWindow.c            |  95 ++++++++--
 gdk/quartz/GdkQuartzNSWindow.h            |   5 +-
 gdk/quartz/GdkQuartzView.c                |   8 +-
 gdk/quartz/gdkdevice-core-quartz.c        |   2 +-
 gdk/quartz/gdkdevicemanager-core-quartz.c |   1 +
 gdk/quartz/gdkdisplay-quartz.c            | 248 ++++++++++++++++++++----
 gdk/quartz/gdkdisplay-quartz.h            | 124 +-----------
 gdk/quartz/gdkdisplaymanager-quartz.c     |   1 -
 gdk/quartz/gdkeventloop-quartz.c          |  18 +-
 gdk/quartz/gdkevents-quartz.c             | 305 ++++++++++++++----------------
 gdk/quartz/gdkglobals-quartz.c            |   7 +
 gdk/quartz/gdkkeys-quartz.c               |  56 ++----
 gdk/quartz/gdkmonitor-quartz.h            |   3 +-
 gdk/quartz/gdkproperty-quartz.c           |  20 --
 gdk/quartz/gdkquartzkeys.h                |  73 +++++++
 gdk/quartz/gdkscreen-quartz.c             | 163 +++-------------
 gdk/quartz/gdkscreen-quartz.h             |   2 +
 gdk/quartz/gdkselection-quartz.c          |  28 ++-
 gdk/quartz/gdkwindow-quartz.c             | 175 +++++++++--------
 gtk/gtkicontheme.c                        |   3 +-
 gtk/gtkstyleproviderprivate.c             |   2 +-
 22 files changed, 701 insertions(+), 648 deletions(-)
---