[gtk: 6/6] Merge branch 'wip/chergert/quartz4u' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 2e07fcd680afa221b823b8f41ccea184edda2c98
Merge: d3365d5a60 9dbf99d91a
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 21 22:22:41 2020 +0000

    Merge branch 'wip/chergert/quartz4u' into 'master'
    
    Merge GDK macOS branch
    
    See merge request GNOME/gtk!2272

 gdk/gdkconfig.h.meson                              |    1 +
 gdk/gdkcontentdeserializer.c                       |    2 +-
 gdk/gdkcontentserializer.c                         |    2 +-
 gdk/gdkdisplaymanager.c                            |    7 +
 gdk/macos/GdkMacosBaseView.c                       |  718 +++++
 .../GdkQuartzView.h => macos/GdkMacosBaseView.h}   |   39 +-
 gdk/macos/GdkMacosCairoSubview.c                   |  171 ++
 gdk/macos/GdkMacosCairoSubview.h                   |   35 +
 gdk/macos/GdkMacosCairoView.c                      |  170 ++
 .../GdkMacosCairoView.h}                           |   35 +-
 gdk/macos/GdkMacosGLLayer.c                        |  157 ++
 .../gdkscreen-quartz.h => macos/GdkMacosGLLayer.h} |   45 +-
 gdk/macos/GdkMacosWindow.c                         |  732 +++++
 gdk/macos/GdkMacosWindow.h                         |   70 +
 gdk/macos/edgesnapping.c                           |  229 ++
 gdk/macos/edgesnapping.h                           |   50 +
 gdk/macos/gdkdisplaylinksource.c                   |  254 ++
 gdk/macos/gdkdisplaylinksource.h                   |   49 +
 gdk/macos/gdkmacos.h                               |   32 +
 gdk/macos/gdkmacoscairocontext-private.h           |   38 +
 gdk/macos/gdkmacoscairocontext.c                   |  155 ++
 gdk/macos/gdkmacosclipboard-private.h              |   54 +
 gdk/macos/gdkmacosclipboard.c                      |  576 ++++
 .../gdkmacoscursor-private.h}                      |   29 +-
 gdk/macos/gdkmacoscursor.c                         |  181 ++
 gdk/macos/gdkmacosdevice.c                         |  208 ++
 gdk/macos/gdkmacosdevice.h                         |   43 +
 gdk/macos/gdkmacosdisplay-private.h                |  154 ++
 gdk/macos/gdkmacosdisplay-settings.c               |  194 ++
 gdk/macos/gdkmacosdisplay-translate.c              | 1219 +++++++++
 gdk/macos/gdkmacosdisplay.c                        | 1071 ++++++++
 gdk/macos/gdkmacosdisplay.h                        |   47 +
 gdk/macos/gdkmacosdrag-private.h                   |   70 +
 gdk/macos/gdkmacosdrag.c                           |  617 +++++
 gdk/macos/gdkmacosdragsurface-private.h            |   50 +
 gdk/macos/gdkmacosdragsurface.c                    |  138 +
 gdk/macos/gdkmacoseventsource-private.h            |   40 +
 .../gdkmacoseventsource.c}                         |  558 ++--
 gdk/macos/gdkmacosglcontext-private.h              |   60 +
 gdk/macos/gdkmacosglcontext.c                      |  153 ++
 gdk/macos/gdkmacosglcontext.h                      |   43 +
 gdk/macos/gdkmacoskeymap-private.h                 |   36 +
 gdk/macos/gdkmacoskeymap.c                         |  698 +++++
 gdk/macos/gdkmacoskeymap.h                         |   43 +
 gdk/macos/gdkmacosmonitor-private.h                |   39 +
 gdk/macos/gdkmacosmonitor.c                        |  288 ++
 gdk/macos/gdkmacosmonitor.h                        |   43 +
 gdk/macos/gdkmacospopupsurface-private.h           |   48 +
 gdk/macos/gdkmacospopupsurface.c                   |  378 +++
 gdk/macos/gdkmacosseat-private.h                   |   35 +
 gdk/macos/gdkmacosseat.c                           |   65 +
 gdk/macos/gdkmacossurface-private.h                |  131 +
 gdk/macos/gdkmacossurface.c                        | 1071 ++++++++
 gdk/macos/gdkmacossurface.h                        |   43 +
 gdk/macos/gdkmacostoplevelsurface-private.h        |   47 +
 gdk/macos/gdkmacostoplevelsurface.c                |  581 ++++
 gdk/macos/gdkmacosutils-private.h                  |   36 +
 gdk/macos/meson.build                              |   62 +
 gdk/meson.build                                    |   14 +-
 gdk/quartz/GdkQuartzNSWindow.c                     |  845 ------
 gdk/quartz/GdkQuartzNSWindow.h                     |   61 -
 gdk/quartz/GdkQuartzView.c                         |  712 -----
 gdk/quartz/gdkcairocontext-quartz.c                |   36 -
 gdk/quartz/gdkcairocontext-quartz.h                |   53 -
 gdk/quartz/gdkcursor-quartz.c                      |  482 ----
 gdk/quartz/gdkdevice-core-quartz.c                 |  347 ---
 gdk/quartz/gdkdevicemanager-core-quartz.c          |  119 -
 gdk/quartz/gdkdisplay-quartz.c                     |  243 --
 gdk/quartz/gdkdisplay-quartz.h                     |   77 -
 gdk/quartz/gdkdisplaymanager-quartz.c              |   61 -
 gdk/quartz/gdkdnd-quartz.c                         |   99 -
 gdk/quartz/gdkevents-quartz.c                      | 1807 -------------
 gdk/quartz/gdkglcontext-quartz.c                   |   39 -
 gdk/quartz/gdkglcontext-quartz.h                   |   39 -
 gdk/quartz/gdkglobals-quartz.c                     |   47 -
 gdk/quartz/gdkkeys-quartz.c                        |  850 ------
 gdk/quartz/gdkmonitor-quartz.c                     |   65 -
 gdk/quartz/gdkmonitor-quartz.h                     |   41 -
 gdk/quartz/gdkprivate-quartz.h                     |  149 --
 gdk/quartz/gdkquartz.h                             |   89 -
 gdk/quartz/gdkquartzcursor.h                       |   50 -
 gdk/quartz/gdkquartzdevice-core.h                  |   44 -
 gdk/quartz/gdkquartzdevicemanager-core.h           |   46 -
 gdk/quartz/gdkquartzdisplay.h                      |   51 -
 gdk/quartz/gdkquartzdisplaymanager.h               |   47 -
 gdk/quartz/gdkquartzdnd.h                          |   56 -
 gdk/quartz/gdkquartzkeys.h                         |   50 -
 gdk/quartz/gdkquartzmonitor.h                      |   45 -
 gdk/quartz/gdkquartzscreen.h                       |   46 -
 gdk/quartz/gdkquartzsurface.h                      |   55 -
 gdk/quartz/gdkquartzutils.h                        |   40 -
 gdk/quartz/gdkscreen-quartz.c                      |  288 --
 gdk/quartz/gdkselection-quartz.c                   |   62 -
 gdk/quartz/gdksurface-quartz.c                     | 2818 --------------------
 gdk/quartz/gdksurface-quartz.h                     |  115 -
 gdk/quartz/gdkutils-quartz.c                       |  244 --
 gdk/quartz/meson.build                             |   45 -
 gdk/quartz/xcursors.h                              |  156 --
 gsk/gskrenderer.c                                  |    7 +
 gtk/meson.build                                    |    8 +-
 meson.build                                        |   14 +-
 meson_options.txt                                  |    2 +
 subprojects/atk.wrap                               |    5 +
 testsuite/gtk/meson.build                          |    6 +-
 104 files changed, 11835 insertions(+), 10880 deletions(-)
---