- This document is for the GDK 3 library, version 3.24.11
+ This document is for the GDK 3 library, version 3.24.12
The latest versions can be found online at
https://developer.gnome.org/gdk3/ .
diff --git a/docs/reference/gdk/version.xml b/docs/reference/gdk/version.xml
index 3b9c997160..2c525e1031 100644
--- a/docs/reference/gdk/version.xml
+++ b/docs/reference/gdk/version.xml
@@ -1 +1 @@
-3.24.11
+3.24.12
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4e20337d7d..fabfbcd931 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -307,7 +307,6 @@ content_files = \
migrating-GtkStyleContext.xml \
migrating-smclient-GtkApplication.xml \
migrating-unique-GtkApplication.xml \
- mir.xml \
osx.sgml \
overview.xml \
question_index.sgml \
diff --git a/docs/reference/gtk/Makefile.in b/docs/reference/gtk/Makefile.in
index 8bacc28536..369d340734 100644
--- a/docs/reference/gtk/Makefile.in
+++ b/docs/reference/gtk/Makefile.in
@@ -761,7 +761,6 @@ content_files = \
migrating-GtkStyleContext.xml \
migrating-smclient-GtkApplication.xml \
migrating-unique-GtkApplication.xml \
- mir.xml \
osx.sgml \
overview.xml \
question_index.sgml \
diff --git a/docs/reference/gtk/broadwayd.1 b/docs/reference/gtk/broadwayd.1
index 6e944d3273..1fbe344f72 100644
--- a/docs/reference/gtk/broadwayd.1
+++ b/docs/reference/gtk/broadwayd.1
@@ -2,7 +2,7 @@
.\" Title: broadwayd
.\" Author: Alexander Larsson
.\" Generator: DocBook XSL Stylesheets vsnapshot --disable-wayland-backend
- --enable-mir-backend
- --disable-mir-backend
-
-
--enable-introspection=[no/auto/yes]
@@ -609,9 +604,7 @@ How to compile GTK+ itself
--enable-broadway-backend ,
--disable-broadway-backend ,
--enable-wayland-backend ,
- --disable-wayland-backend
- --enable-mir-backend , and
- --disable-mir-backend
+ --disable-wayland-backend
Enables specific backends for GDK. If none of these options
diff --git a/docs/reference/gtk/gtk-builder-tool.1 b/docs/reference/gtk/gtk-builder-tool.1
index 52d7157e13..d3658f803a 100644
--- a/docs/reference/gtk/gtk-builder-tool.1
+++ b/docs/reference/gtk/gtk-builder-tool.1
@@ -2,7 +2,7 @@
.\" Title: gtk-builder-tool
.\" Author: Matthias Clasen
.\" Generator: DocBook XSL Stylesheets vsnapshot
.\" Generator: DocBook XSL Stylesheets vsnapshot
diff --git a/docs/reference/gtk/html/gtk-building.html b/docs/reference/gtk/html/gtk-building.html
index 3020c4b2b8..baac8b21d1 100644
--- a/docs/reference/gtk/html/gtk-building.html
+++ b/docs/reference/gtk/html/gtk-building.html
@@ -311,7 +311,7 @@ How to compile GTK+ itself
the documentation distributed with the those libraries.)
-
configure
+
configure
--disable-modules and
@@ -443,9 +443,7 @@ How to compile GTK+ itself
--enable-broadway-backend,
--disable-broadway-backend,
--enable-wayland-backend,
- --disable-wayland-backend
- --enable-mir-backend, and
- --disable-mir-backend. --disable-wayland-backend.
Enables specific backends for GDK. If none of these options
are given, the x11 backend will be enabled by default,
unless the platform is Windows, in which case the default is
diff --git a/docs/reference/gtk/html/gtk-mir.html b/docs/reference/gtk/html/gtk-mir.html
deleted file mode 100644
index 419bb7e179..0000000000
--- a/docs/reference/gtk/html/gtk-mir.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
Using GTK+ with Mir: GTK+ 3 Reference Manual
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Using GTK+ with Mir Using GTK+ with Mir —
-Mir-specific aspects of using GTK+
-
-
-
-
-
Using GTK+ with Mir
-
-The GDK Mir backend provides support for running GTK+ applications
-under Mir based display servers. To run your application in this way,
-select the Mir backend by setting GDK_BACKEND=mir.
-
-
-Currently, the Mir backend does not use any additional commandline
-options or environment variables.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/reference/gtk/html/gtk-running.html b/docs/reference/gtk/html/gtk-running.html
index 3d694b5a4a..0093bd6cc4 100644
--- a/docs/reference/gtk/html/gtk-running.html
+++ b/docs/reference/gtk/html/gtk-running.html
@@ -428,10 +428,6 @@ nevertheless.
wayland
Selects the Wayland backend for connecting to Wayland display servers
-
-mir
Selects the Mir backend for connecting to Mir display servers
diff --git a/docs/reference/gtk/html/gtk-wayland.html b/docs/reference/gtk/html/gtk-wayland.html
index cd681e72d0..028cebe204 100644
--- a/docs/reference/gtk/html/gtk-wayland.html
+++ b/docs/reference/gtk/html/gtk-wayland.html
@@ -7,7 +7,7 @@
diff --git a/docs/reference/gtk/html/gtk3-Feature-Test-Macros.html b/docs/reference/gtk/html/gtk3-Feature-Test-Macros.html
index ab0e08ad46..8b9e741f77 100644
--- a/docs/reference/gtk/html/gtk3-Feature-Test-Macros.html
+++ b/docs/reference/gtk/html/gtk3-Feature-Test-Macros.html
@@ -397,7 +397,7 @@ against at application run time.
GTK_MICRO_VERSION
-
#define GTK_MICRO_VERSION (11)
+#define GTK_MICRO_VERSION (12)
Like gtk_get_micro_version()
GTK_BINARY_AGE
-
#define GTK_BINARY_AGE (2411)
+#define GTK_BINARY_AGE (2412)
Like gtk_get_binary_age()
GTK_INTERFACE_AGE
-
#define GTK_INTERFACE_AGE (7)
+#define GTK_INTERFACE_AGE (8)
Like gtk_get_interface_age()
- This document is for the GTK+ 3 library, version 3.24.11
+ This document is for the GTK+ 3 library, version 3.24.12
.
The latest versions can be found online at
https://developer.gnome.org/gtk3/ .
@@ -1070,11 +1070,6 @@ HTML-specific aspects of using GTK+
Wayland-specific aspects of using GTK+
-
-Using GTK+ with Mir —
-Mir-specific aspects of using GTK+
-
-
Glossary Index of all symbols
diff --git a/docs/reference/gtk/html/platform-support.html b/docs/reference/gtk/html/platform-support.html
index 53795554a0..57c80e9a0d 100644
--- a/docs/reference/gtk/html/platform-support.html
+++ b/docs/reference/gtk/html/platform-support.html
@@ -65,11 +65,6 @@ HTML-specific aspects of using GTK+
Wayland-specific aspects of using GTK+
-
-Using GTK+ with Mir —
-Mir-specific aspects of using GTK+
-
-
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index a49235cb1e..d3f55b442c 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -395,7 +395,6 @@ content_files = [
'gtk-query-immodules-3.0.xml',
'gtk-query-settings.xml',
'gtk-update-icon-cache.xml',
- 'mir.xml',
'osx.sgml',
'overview.xml',
'resources.sgml',
diff --git a/docs/reference/gtk/mir.xml b/docs/reference/gtk/mir.xml
deleted file mode 100644
index 3a0a52e082..0000000000
--- a/docs/reference/gtk/mir.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-Using GTK+ with Mir
-3
-GTK Library
-
-
-
-Using GTK+ with Mir
-
-Mir-specific aspects of using GTK+
-
-
-
-
-Using GTK+ with Mir
-
-
-The GDK Mir backend provides support for running GTK+ applications
-under Mir based display servers. To run your application in this way,
-select the Mir backend by setting GDK_BACKEND=mir .
-
-
-
-Currently, the Mir backend does not use any additional commandline
-options or environment variables.
-
-
-
-
-
diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 5e04460ae8..520a12d42d 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -508,11 +508,6 @@ nevertheless.
Selects the Wayland backend for connecting to Wayland display servers
- mir
- Selects the Mir backend for connecting to Mir display servers
-
Since 3.10, this environment variable can contain a comma-separated list
of backend names, which are tried in order. The list may also contain
diff --git a/docs/reference/gtk/version.xml b/docs/reference/gtk/version.xml
index 3b9c997160..2c525e1031 100644
--- a/docs/reference/gtk/version.xml
+++ b/docs/reference/gtk/version.xml
@@ -1 +1 @@
-3.24.11
+3.24.12
diff --git a/docs/reference/libgail-util/html/index.html b/docs/reference/libgail-util/html/index.html
index ce52a8a8dd..4bf23a2832 100644
--- a/docs/reference/libgail-util/html/index.html
+++ b/docs/reference/libgail-util/html/index.html
@@ -15,7 +15,7 @@
- Version 3.24.11
+ Version 3.24.12
The latest version of this documentation can be found on-line at
http://developer.gnome.org/gail-libgail-util/unstable/ .
diff --git a/docs/reference/libgail-util/version.xml b/docs/reference/libgail-util/version.xml
index 3b9c997160..2c525e1031 100644
--- a/docs/reference/libgail-util/version.xml
+++ b/docs/reference/libgail-util/version.xml
@@ -1 +1 @@
-3.24.11
+3.24.12
diff --git a/examples/listbox-dnd.c b/examples/listbox-dnd.c
index ab77209629..6f333934d6 100644
--- a/examples/listbox-dnd.c
+++ b/examples/listbox-dnd.c
@@ -14,6 +14,7 @@ drag_begin (GtkWidget *widget,
cairo_surface_t *surface;
cairo_t *cr;
int x, y;
+ double sx, sy;
row = gtk_widget_get_ancestor (widget, GTK_TYPE_LIST_BOX_ROW);
gtk_widget_get_allocation (row, &alloc);
@@ -25,7 +26,8 @@ drag_begin (GtkWidget *widget,
gtk_style_context_remove_class (gtk_widget_get_style_context (row), "drag-icon");
gtk_widget_translate_coordinates (widget, row, 0, 0, &x, &y);
- cairo_surface_set_device_offset (surface, -x, -y);
+ cairo_surface_get_device_scale (surface, &sx, &sy);
+ cairo_surface_set_device_offset (surface, -x * sx, -y * sy);
gtk_drag_set_icon_surface (context, surface);
cairo_destroy (cr);
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6373e26a26..a53391c5d1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -13,7 +13,7 @@ INTROSPECTION_COMPILER_ARGS = \
SUBDIRS = $(GDK_BACKENDS) .
-DIST_SUBDIRS = win32 x11 quartz broadway wayland mir
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
CLEANFILES =
@@ -240,10 +240,6 @@ if USE_WAYLAND
libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
endif
-if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
-endif
-
if HAVE_INTROSPECTION
introspection_files = \
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
index d797f148f4..8024051a1c 100644
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -161,17 +161,15 @@ host_triplet = @host@
@USE_WIN32_FALSE@libgdk_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@USE_WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__append_1) \
@USE_WIN32_FALSE@ $(am__append_3) $(am__append_4) \
-@USE_WIN32_FALSE@ $(am__append_6) $(am__append_7) \
-@USE_WIN32_FALSE@ $(am__append_8)
+@USE_WIN32_FALSE@ $(am__append_6) $(am__append_7)
@USE_WIN32_TRUE@am__append_5 = -Wl,win32/rc/gdk-win32-res.o
@USE_BROADWAY_TRUE@am__append_6 = broadway/libgdk-broadway.la
@USE_WAYLAND_TRUE@am__append_7 = wayland/libgdk-wayland.la
-@USE_MIR_TRUE@am__append_8 = mir/libgdk-mir.la
-@HAVE_INTROSPECTION_TRUE@am__append_9 = Gdk-3.0.gir
-@HAVE_INTROSPECTION_TRUE@@OS_WIN32_TRUE@am__append_10 = -I$(srcdir)/win32 -I$(srcdir)
-@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_11 = GdkX11-3.0.gir
-@HAVE_INTROSPECTION_TRUE@@OS_WIN32_TRUE@am__append_12 = GdkWin32-3.0.gir
-@HAVE_INTROSPECTION_TRUE@am__append_13 = $(gir_DATA) $(typelibs_DATA)
+@HAVE_INTROSPECTION_TRUE@am__append_8 = Gdk-3.0.gir
+@HAVE_INTROSPECTION_TRUE@@OS_WIN32_TRUE@am__append_9 = -I$(srcdir)/win32 -I$(srcdir)
+@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_10 = GdkX11-3.0.gir
+@HAVE_INTROSPECTION_TRUE@@OS_WIN32_TRUE@am__append_11 = GdkWin32-3.0.gir
+@HAVE_INTROSPECTION_TRUE@am__append_12 = $(gir_DATA) $(typelibs_DATA)
subdir = gdk
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
@@ -722,7 +720,7 @@ XVFB_START = \
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-INTROSPECTION_GIRS = $(am__append_9) $(am__append_11) $(am__append_12)
+INTROSPECTION_GIRS = $(am__append_8) $(am__append_10) $(am__append_11)
INTROSPECTION_SCANNER_ENV = \
CC="$(CC)"
@@ -735,8 +733,8 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=.
SUBDIRS = $(GDK_BACKENDS) .
-DIST_SUBDIRS = win32 x11 quartz broadway wayland mir
-CLEANFILES = $(am__append_13) gdk.gresource.xml
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
+CLEANFILES = $(am__append_12) gdk.gresource.xml
GDK_CFLAGS_DEFINES = \
-DG_LOG_USE_STRUCTURED=1 \
-DGDK_COMPILATION
@@ -917,7 +915,7 @@ libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) \
$(am__append_2)
libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS) $(am__append_1) \
$(am__append_3) $(am__append_4) $(am__append_6) \
- $(am__append_7) $(am__append_8)
+ $(am__append_7)
libgdk_3_la_LDFLAGS = $(LDADD) $(am__append_5)
@USE_WIN32_TRUE@libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
@HAVE_INTROSPECTION_TRUE@introspection_files = \
@@ -932,7 +930,7 @@ libgdk_3_la_LDFLAGS = $(LDADD) $(am__append_5)
@HAVE_INTROSPECTION_TRUE@Gdk_3_0_gir_LIBS = libgdk-3.la
@HAVE_INTROSPECTION_TRUE@Gdk_3_0_gir_FILES = $(introspection_files)
@HAVE_INTROSPECTION_TRUE@Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS) \
-@HAVE_INTROSPECTION_TRUE@ $(am__append_10)
+@HAVE_INTROSPECTION_TRUE@ $(am__append_9)
@HAVE_INTROSPECTION_TRUE@Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@x11_introspection_files = \
@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@ x11/gdkapplaunchcontext-x11.c \
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index d87ed133ae..24f8ea09f6 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -60,10 +60,6 @@
#include "wayland/gdkprivate-wayland.h"
#endif
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir-private.h"
-#endif
-
/**
* SECTION:gdkdisplaymanager
* @Short_description: Maintains a list of all open GdkDisplays
@@ -276,9 +272,6 @@ static GdkBackend gdk_backends[] = {
#ifdef GDK_WINDOWING_WAYLAND
{ "wayland", _gdk_wayland_display_open },
#endif
-#ifdef GDK_WINDOWING_MIR
- { "mir", _gdk_mir_display_open },
-#endif
#ifdef GDK_WINDOWING_X11
{ "x11", _gdk_x11_display_open },
#endif
diff --git a/gdk/gdkversionmacros.h b/gdk/gdkversionmacros.h
index 0351fcf4c2..a9057dfb66 100644
--- a/gdk/gdkversionmacros.h
+++ b/gdk/gdkversionmacros.h
@@ -26,7 +26,7 @@
#define GDK_MAJOR_VERSION (3)
#define GDK_MINOR_VERSION (24)
-#define GDK_MICRO_VERSION (11)
+#define GDK_MICRO_VERSION (12)
#ifndef _GDK_EXTERN
#define _GDK_EXTERN extern
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index ede040b157..6ae0f86710 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2664,6 +2664,7 @@ gdk_window_add_filter (GdkWindow *window,
if ((filter->function == function) && (filter->data == data))
{
filter->ref_count++;
+ filter->flags = 0;
return;
}
tmp_list = tmp_list->next;
diff --git a/gdk/meson.build b/gdk/meson.build
index d56803486d..fd234917cc 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -258,7 +258,7 @@ endif
gdk_backends = []
gdk_backends_gen_headers = [] # non-public generated headers
-foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
+foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11']
if get_variable('@0@_enabled'.format(backend))
subdir(backend)
gdk_deps += get_variable('gdk_@0@_deps'.format(backend))
diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
deleted file mode 100644
index 0f0174cefc..0000000000
--- a/gdk/mir/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
-
-AM_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"Gdk\" \
- -DG_LOG_USE_STRUCTURED=1 \
- -DGDK_COMPILATION \
- -I$(top_srcdir) \
- -I$(top_srcdir)/gdk \
- -I$(top_builddir)/gdk \
- $(GDK_HIDDEN_VISIBILITY_CFLAGS) \
- $(GTK_DEBUG_FLAGS) \
- $(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = \
- libgdk-mir.la
-
-libgdk_mir_la_SOURCES = \
- gdkmircursor.c \
- gdkmirdevicemanager.c \
- gdkmirdisplay.c \
- gdkmireventsource.c \
- gdkmirglcontext.c \
- gdkmirkeyboard.c \
- gdkmirkeymap.c \
- gdkmirpointer.c \
- gdkmirscreen.c \
- gdkmirwindow.c \
- gdkmirwindowimpl.c \
- gdkmir-debug.c \
- gdkmir-private.h \
- gdkmir.h
-
-libgdkinclude_HEADERS = \
- gdkmir.h
-
-EXTRA_DIST += \
- meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/mir/Makefile.in b/gdk/mir/Makefile.in
deleted file mode 100644
index 3225a0c5dd..0000000000
--- a/gdk/mir/Makefile.in
+++ /dev/null
@@ -1,990 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# GTK+ - The GIMP Toolkit
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = gdk/mir
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/pkg_config_for_build.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(libgdkinclude_HEADERS) \
- $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libgdk_mir_la_LIBADD =
-am_libgdk_mir_la_OBJECTS = gdkmircursor.lo gdkmirdevicemanager.lo \
- gdkmirdisplay.lo gdkmireventsource.lo gdkmirglcontext.lo \
- gdkmirkeyboard.lo gdkmirkeymap.lo gdkmirpointer.lo \
- gdkmirscreen.lo gdkmirwindow.lo gdkmirwindowimpl.lo \
- gdkmir-debug.lo
-libgdk_mir_la_OBJECTS = $(am_libgdk_mir_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/gdkmir-debug.Plo \
- ./$(DEPDIR)/gdkmircursor.Plo \
- ./$(DEPDIR)/gdkmirdevicemanager.Plo \
- ./$(DEPDIR)/gdkmirdisplay.Plo \
- ./$(DEPDIR)/gdkmireventsource.Plo \
- ./$(DEPDIR)/gdkmirglcontext.Plo ./$(DEPDIR)/gdkmirkeyboard.Plo \
- ./$(DEPDIR)/gdkmirkeymap.Plo ./$(DEPDIR)/gdkmirpointer.Plo \
- ./$(DEPDIR)/gdkmirscreen.Plo ./$(DEPDIR)/gdkmirwindow.Plo \
- ./$(DEPDIR)/gdkmirwindowimpl.Plo
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(libgdk_mir_la_SOURCES)
-DIST_SOURCES = $(libgdk_mir_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(libgdkincludedir)"
-HEADERS = $(libgdkinclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \
- $(top_srcdir)/build-aux/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-ATK_CFLAGS = @ATK_CFLAGS@
-ATK_LIBS = @ATK_LIBS@
-ATK_PREFIX = @ATK_PREFIX@
-ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
-BUILD_EXEEXT = @BUILD_EXEEXT@
-BUILD_OBJEXT = @BUILD_OBJEXT@
-CAIRO_BACKEND_CFLAGS = @CAIRO_BACKEND_CFLAGS@
-CAIRO_BACKEND_LIBS = @CAIRO_BACKEND_LIBS@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_PREFIX = @CAIRO_PREFIX@
-CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CPP_FOR_BUILD = @CPP_FOR_BUILD@
-CUPS_API_MAJOR = @CUPS_API_MAJOR@
-CUPS_API_MINOR = @CUPS_API_MINOR@
-CUPS_CFLAGS = @CUPS_CFLAGS@
-CUPS_CONFIG = @CUPS_CONFIG@
-CUPS_LIBS = @CUPS_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISABLE_ON_QUARTZ = @DISABLE_ON_QUARTZ@
-DISABLE_ON_W32 = @DISABLE_ON_W32@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_ON_X11 = @ENABLE_ON_X11@
-EXEEXT = @EXEEXT@
-EXE_MANIFEST_ARCHITECTURE = @EXE_MANIFEST_ARCHITECTURE@
-FGREP = @FGREP@
-GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
-GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-GDK_BACKENDS = @GDK_BACKENDS@
-GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@
-GDK_DEP_LIBS = @GDK_DEP_LIBS@
-GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@
-GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@
-GDK_HIDDEN_VISIBILITY_CFLAGS = @GDK_HIDDEN_VISIBILITY_CFLAGS@
-GDK_PACKAGES = @GDK_PACKAGES@
-GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
-GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CFLAGS_FOR_BUILD = @GLIB_CFLAGS_FOR_BUILD@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_LIBS_FOR_BUILD = @GLIB_LIBS_FOR_BUILD@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_PREFIX = @GLIB_PREFIX@
-GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_API_VERSION = @GTK_API_VERSION@
-GTK_BINARY_AGE = @GTK_BINARY_AGE@
-GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
-GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
-GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
-GTK_DEP_LIBS = @GTK_DEP_LIBS@
-GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
-GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
-GTK_FONT_CHOOSER_WIDGET_CFLAGS = @GTK_FONT_CHOOSER_WIDGET_CFLAGS@
-GTK_FONT_CHOOSER_WIDGET_LIBS = @GTK_FONT_CHOOSER_WIDGET_LIBS@
-GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-GTK_LINK_FLAGS = @GTK_LINK_FLAGS@
-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
-GTK_PACKAGES = @GTK_PACKAGES@
-GTK_PRINT_BACKENDS = @GTK_PRINT_BACKENDS@
-GTK_PRIVATE_PACKAGES = @GTK_PRIVATE_PACKAGES@
-GTK_VERSION = @GTK_VERSION@
-GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
-HTML_DIR = @HTML_DIR@
-INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@
-INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_REQUIRED_VERSION = @INTROSPECTION_REQUIRED_VERSION@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-ISO_CODES_PREFIX = @ISO_CODES_PREFIX@
-JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@
-JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LT_VERSION_INFO = @LT_VERSION_INFO@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIB = @MATH_LIB@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGO_PREFIX = @PANGO_PREFIX@
-PANGO_REQUIRED_VERSION = @PANGO_REQUIRED_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_FOR_BUILD = @PKG_CONFIG_FOR_BUILD@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-REST_CFLAGS = @REST_CFLAGS@
-REST_LIBS = @REST_LIBS@
-SASSC = @SASSC@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_LIBS = @SHM_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
-WAYLAND_SCANNER = @WAYLAND_SCANNER@
-WINDRES = @WINDRES@
-X11_PREFIX = @X11_PREFIX@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-XMLCATALOG = @XMLCATALOG@
-XML_CATALOG_FILE = @XML_CATALOG_FILE@
-XSLTPROC = @XSLTPROC@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-ms_librarian = @ms_librarian@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-GTESTER = gtester -k # in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-
-# initialize variables for unconditional += appending
-EXTRA_DIST = meson.build
-TEST_PROGS =
-
-### testing rules
-
-# Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
- 9995 9996 9997 9998 9999
-
-@USE_X11_FALSE@SKIP_GDKTARGET = \
-@USE_X11_FALSE@ echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-
-@USE_X11_TRUE@SKIP_GDKTARGET = \
-@USE_X11_TRUE@ false
-
-@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-XVFB_START = \
- ${XVFB} -help 2>/dev/null 1>&2 \
- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
- && { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
-AM_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"Gdk\" \
- -DG_LOG_USE_STRUCTURED=1 \
- -DGDK_COMPILATION \
- -I$(top_srcdir) \
- -I$(top_srcdir)/gdk \
- -I$(top_builddir)/gdk \
- $(GDK_HIDDEN_VISIBILITY_CFLAGS) \
- $(GTK_DEBUG_FLAGS) \
- $(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS)
-noinst_LTLIBRARIES = \
- libgdk-mir.la
-
-libgdk_mir_la_SOURCES = \
- gdkmircursor.c \
- gdkmirdevicemanager.c \
- gdkmirdisplay.c \
- gdkmireventsource.c \
- gdkmirglcontext.c \
- gdkmirkeyboard.c \
- gdkmirkeymap.c \
- gdkmirpointer.c \
- gdkmirscreen.c \
- gdkmirwindow.c \
- gdkmirwindowimpl.c \
- gdkmir-debug.c \
- gdkmir-private.h \
- gdkmir.h
-
-libgdkinclude_HEADERS = \
- gdkmir.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/mir/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu gdk/mir/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
- esac;
-$(top_srcdir)/Makefile.decl $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libgdk-mir.la: $(libgdk_mir_la_OBJECTS) $(libgdk_mir_la_DEPENDENCIES) $(EXTRA_libgdk_mir_la_DEPENDENCIES)
- $(AM_V_CCLD)$(LINK) $(libgdk_mir_la_OBJECTS) $(libgdk_mir_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmir-debug.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmircursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirdevicemanager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirdisplay.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmireventsource.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirglcontext.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirkeyboard.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirkeymap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirpointer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirscreen.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirwindow.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkmirwindowimpl.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
- @$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS)
- @$(NORMAL_INSTALL)
- @list='$(libgdkinclude_HEADERS)'; test -n "$(libgdkincludedir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(libgdkincludedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgdkincludedir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgdkincludedir)" || exit $$?; \
- done
-
-uninstall-libgdkincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(libgdkinclude_HEADERS)'; test -n "$(libgdkincludedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libgdkincludedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(libgdkincludedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -f ./$(DEPDIR)/gdkmir-debug.Plo
- -rm -f ./$(DEPDIR)/gdkmircursor.Plo
- -rm -f ./$(DEPDIR)/gdkmirdevicemanager.Plo
- -rm -f ./$(DEPDIR)/gdkmirdisplay.Plo
- -rm -f ./$(DEPDIR)/gdkmireventsource.Plo
- -rm -f ./$(DEPDIR)/gdkmirglcontext.Plo
- -rm -f ./$(DEPDIR)/gdkmirkeyboard.Plo
- -rm -f ./$(DEPDIR)/gdkmirkeymap.Plo
- -rm -f ./$(DEPDIR)/gdkmirpointer.Plo
- -rm -f ./$(DEPDIR)/gdkmirscreen.Plo
- -rm -f ./$(DEPDIR)/gdkmirwindow.Plo
- -rm -f ./$(DEPDIR)/gdkmirwindowimpl.Plo
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libgdkincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/gdkmir-debug.Plo
- -rm -f ./$(DEPDIR)/gdkmircursor.Plo
- -rm -f ./$(DEPDIR)/gdkmirdevicemanager.Plo
- -rm -f ./$(DEPDIR)/gdkmirdisplay.Plo
- -rm -f ./$(DEPDIR)/gdkmireventsource.Plo
- -rm -f ./$(DEPDIR)/gdkmirglcontext.Plo
- -rm -f ./$(DEPDIR)/gdkmirkeyboard.Plo
- -rm -f ./$(DEPDIR)/gdkmirkeymap.Plo
- -rm -f ./$(DEPDIR)/gdkmirpointer.Plo
- -rm -f ./$(DEPDIR)/gdkmirscreen.Plo
- -rm -f ./$(DEPDIR)/gdkmirwindow.Plo
- -rm -f ./$(DEPDIR)/gdkmirwindowimpl.Plo
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libgdkincludeHEADERS
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
- check-local clean clean-generic clean-libtool \
- clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libgdkincludeHEADERS install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am \
- uninstall-libgdkincludeHEADERS
-
-.PRECIOUS: Makefile
-
-# call as: $(XVFB_START) && someprogram
-
-# test: run all tests in cwd and subdirs
-test: test-cwd test-recurse
-# test-cwd: run tests in cwd
-test-cwd: ${TEST_PROGS}
- @$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
- $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \
- }
-# test-recurse: run tests in subdirs
-test-recurse:
- @ for subdir in $(SUBDIRS) ; do \
- test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
- ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
- done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report: ${TEST_PROGS}
- @ ignore_logdir=true ; \
- if test -z "$$GTESTER_LOGDIR" ; then \
- GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
- ignore_logdir=false ; \
- fi ; \
- for subdir in $(SUBDIRS) ; do \
- test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
- ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
- done ; \
- $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
- case $@ in \
- test-report) test_options="-k";; \
- perf-report) test_options="-k -m=perf";; \
- full-report) test_options="-k -m=perf -m=slow";; \
- esac ; \
- $(XVFB_START) && { \
- set -e; \
- if test -z "$$GTESTER_LOGDIR" ; then \
- G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
- elif test -n "${TEST_PROGS}" ; then \
- G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
- fi ; \
- }; \
- }; \
- $$ignore_logdir || { \
- echo '' > $@.xml ; \
- echo '' >> $@.xml ; \
- for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
- sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
- done ; \
- echo >> $@.xml ; \
- echo ' ' >> $@.xml ; \
- rm -rf "$$GTESTER_LOGDIR"/ ; \
- ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
- }
-.PHONY: test test-cwd test-recurse test-report perf-report full-report
-# run make test-cwd as part of make check
-check-local: test-cwd
-
--include $(top_srcdir)/git.mk
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
deleted file mode 100644
index 73dcd805c5..0000000000
--- a/gdk/mir/gdkmir-debug.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-
-static void
-_gdk_mir_print_modifiers (unsigned int modifiers)
-{
- g_printerr (" Modifiers");
- if ((modifiers & mir_input_event_modifier_alt) != 0)
- g_printerr (" alt");
- if ((modifiers & mir_input_event_modifier_alt_left) != 0)
- g_printerr (" alt-left");
- if ((modifiers & mir_input_event_modifier_alt_right) != 0)
- g_printerr (" alt-right");
- if ((modifiers & mir_input_event_modifier_shift) != 0)
- g_printerr (" shift");
- if ((modifiers & mir_input_event_modifier_shift_left) != 0)
- g_printerr (" shift-left");
- if ((modifiers & mir_input_event_modifier_shift_right) != 0)
- g_printerr (" shift-right");
- if ((modifiers & mir_input_event_modifier_sym) != 0)
- g_printerr (" sym");
- if ((modifiers & mir_input_event_modifier_function) != 0)
- g_printerr (" function");
- if ((modifiers & mir_input_event_modifier_ctrl) != 0)
- g_printerr (" ctrl");
- if ((modifiers & mir_input_event_modifier_ctrl_left) != 0)
- g_printerr (" ctrl-left");
- if ((modifiers & mir_input_event_modifier_ctrl_right) != 0)
- g_printerr (" ctrl-right");
- if ((modifiers & mir_input_event_modifier_meta) != 0)
- g_printerr (" meta");
- if ((modifiers & mir_input_event_modifier_meta_left) != 0)
- g_printerr (" meta-left");
- if ((modifiers & mir_input_event_modifier_meta_right) != 0)
- g_printerr (" meta-right");
- if ((modifiers & mir_input_event_modifier_caps_lock) != 0)
- g_printerr (" caps-lock");
- if ((modifiers & mir_input_event_modifier_num_lock) != 0)
- g_printerr (" num-lock");
- if ((modifiers & mir_input_event_modifier_scroll_lock) != 0)
- g_printerr (" scroll-lock");
- g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_key_event (const MirInputEvent *event)
-{
- const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
-
- if (!keyboard_event)
- return;
-
- g_printerr ("KEY\n");
- g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
- g_printerr (" Action ");
- switch (mir_keyboard_event_action (keyboard_event))
- {
- case mir_keyboard_action_down:
- g_printerr ("down");
- break;
- case mir_keyboard_action_up:
- g_printerr ("up");
- break;
- case mir_keyboard_action_repeat:
- g_printerr ("repeat");
- break;
- default:
- g_printerr ("%u", mir_keyboard_event_action (keyboard_event));
- break;
- }
- g_printerr ("\n");
- _gdk_mir_print_modifiers (mir_keyboard_event_modifiers (keyboard_event));
- g_printerr (" Key Code %i\n", mir_keyboard_event_key_code (keyboard_event));
- g_printerr (" Scan Code %i\n", mir_keyboard_event_scan_code (keyboard_event));
- g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
-}
-
-static void
-_gdk_mir_print_touch_event (const MirInputEvent *event)
-{
- const MirTouchEvent *touch_event = mir_input_event_get_touch_event (event);
- guint i;
- guint n;
-
- if (!touch_event)
- return;
-
- g_printerr ("TOUCH\n");
- g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
- g_printerr (" Event Time %lld\n", (long long int) mir_input_event_get_event_time (event));
- _gdk_mir_print_modifiers (mir_touch_event_modifiers (touch_event));
- n = mir_touch_event_point_count (touch_event);
-
- for (i = 0; i < n; i++)
- {
- g_printerr (" [%u] (%u/%u) ", mir_touch_event_id (touch_event, i), i + 1, n);
- switch (mir_touch_event_action (touch_event, i))
- {
- case mir_touch_action_down:
- g_printerr ("Down");
- break;
- case mir_touch_action_up:
- g_printerr ("Up");
- break;
- case mir_touch_action_change:
- g_printerr ("Change");
- break;
- default:
- g_printerr ("%u", mir_touch_event_action (touch_event, i));
- break;
- }
- switch (mir_touch_event_tooltype (touch_event, i))
- {
- default:
- case mir_touch_tooltype_unknown:
- g_printerr (" ? ");
- break;
- case mir_touch_tooltype_finger:
- g_printerr (" finger ");
- break;
- case mir_touch_tooltype_stylus:
- g_printerr (" stylus ");
- break;
- }
- g_printerr ("\n x: %f y: %f P: %f A: %f B: %f d: %f\n",
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_x),
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_y),
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_pressure),
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_touch_major),
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_touch_minor),
- mir_touch_event_axis_value (touch_event, i, mir_touch_axis_size));
- }
-}
-
-static void
-_gdk_mir_print_motion_event (const MirInputEvent *event)
-{
- const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
-
- if (!pointer_event)
- return;
-
- g_printerr ("MOTION\n");
- g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
- g_printerr (" Action ");
- switch (mir_pointer_event_action (pointer_event))
- {
- case mir_pointer_action_button_down:
- g_printerr ("down");
- break;
- case mir_pointer_action_button_up:
- g_printerr ("up");
- break;
- case mir_pointer_action_enter:
- g_printerr ("enter");
- break;
- case mir_pointer_action_leave:
- g_printerr ("leave");
- break;
- case mir_pointer_action_motion:
- g_printerr ("motion");
- break;
- default:
- g_printerr ("%u", mir_pointer_event_action (pointer_event));
- }
- g_printerr ("\n");
- _gdk_mir_print_modifiers (mir_pointer_event_modifiers (pointer_event));
- g_printerr (" Button State");
- if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_primary))
- g_printerr (" primary");
- if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_secondary))
- g_printerr (" secondary");
- if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_tertiary))
- g_printerr (" tertiary");
- if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_back))
- g_printerr (" back");
- if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_forward))
- g_printerr (" forward");
- g_printerr ("\n");
- g_printerr (" Offset (%f, %f)\n", mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x),
- mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y));
- g_printerr (" Scroll (%f, %f)\n", mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_hscroll),
- mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_vscroll));
- g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
-}
-
-static void
-_gdk_mir_print_input_event (const MirInputEvent *event)
-{
- g_printerr ("INPUT\n");
-}
-
-static void
-_gdk_mir_print_window_event (const MirWindowEvent *event)
-{
- g_printerr ("WINDOW\n");
- g_printerr (" Attribute ");
- switch (mir_window_event_get_attribute (event))
- {
- case mir_window_attrib_type:
- g_printerr ("type");
- break;
- case mir_window_attrib_state:
- g_printerr ("state");
- break;
- case mir_window_attrib_swapinterval:
- g_printerr ("swapinterval");
- break;
- case mir_window_attrib_focus:
- g_printerr ("focus");
- break;
- case mir_window_attrib_dpi:
- g_printerr ("dpi");
- break;
- case mir_window_attrib_visibility:
- g_printerr ("visibility");
- break;
- case mir_window_attrib_preferred_orientation:
- g_printerr ("preferred_orientation");
- break;
- default:
- g_printerr ("%u", mir_window_event_get_attribute (event));
- break;
- }
- g_printerr ("\n");
- g_printerr (" Value %i\n", mir_window_event_get_attribute_value (event));
-}
-
-static void
-_gdk_mir_print_resize_event (const MirResizeEvent *event)
-{
- g_printerr ("RESIZE\n");
- g_printerr (" Size (%i, %i)\n", mir_resize_event_get_width (event), mir_resize_event_get_height (event));
-}
-
-static void
-_gdk_mir_print_prompt_session_state_change_event (const MirPromptSessionEvent *event)
-{
- g_printerr ("PROMPT_SESSION_STATE_CHANGE\n");
- g_printerr (" State ");
-
- switch (mir_prompt_session_event_get_state (event))
- {
- case mir_prompt_session_state_stopped:
- g_printerr ("stopped");
- break;
- case mir_prompt_session_state_started:
- g_printerr ("started");
- break;
- case mir_prompt_session_state_suspended:
- g_printerr ("suspended");
- break;
- default:
- g_printerr ("%u", mir_prompt_session_event_get_state (event));
- break;
- }
-
- g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_orientation_event (const MirOrientationEvent *event)
-{
- g_printerr ("ORIENTATION\n");
- g_printerr (" Direction ");
-
- switch (mir_orientation_event_get_direction (event))
- {
- case mir_orientation_normal:
- g_printerr ("normal");
- break;
- case mir_orientation_left:
- g_printerr ("left");
- break;
- case mir_orientation_inverted:
- g_printerr ("inverted");
- break;
- case mir_orientation_right:
- g_printerr ("right");
- break;
- default:
- g_printerr ("%u", mir_orientation_event_get_direction (event));
- break;
- }
-
- g_printerr ("\n");
-}
-
-static void
-_gdk_mir_print_close_event (void)
-{
- g_printerr ("CLOSED\n");
-}
-
-static void
-_gdk_mir_print_keymap_event (const MirKeymapEvent *event)
-{
- g_printerr ("KEYMAP\n");
-}
-
-static void
-_gdk_mir_print_window_output_event (const MirWindowOutputEvent *event)
-{
- g_printerr ("WINDOW_OUTPUT\n");
- g_printerr (" DPI %d\n", mir_window_output_event_get_dpi (event));
- g_printerr (" Form Factor ");
-
- switch (mir_window_output_event_get_form_factor (event))
- {
- case mir_form_factor_unknown:
- g_printerr ("unknown");
- break;
- case mir_form_factor_phone:
- g_printerr ("phone");
- break;
- case mir_form_factor_tablet:
- g_printerr ("tablet");
- break;
- case mir_form_factor_monitor:
- g_printerr ("monitor");
- break;
- case mir_form_factor_tv:
- g_printerr ("tv");
- break;
- case mir_form_factor_projector:
- g_printerr ("projector");
- break;
- default:
- g_printerr ("%u", mir_window_output_event_get_form_factor (event));
- break;
- }
-
- g_printerr ("\n");
- g_printerr (" Scale %f\n", mir_window_output_event_get_scale (event));
- g_printerr (" Refresh Rate %lf\n", mir_window_output_event_get_refresh_rate (event));
- g_printerr (" Output ID %u\n", mir_window_output_event_get_output_id (event));
-}
-
-static void
-_gdk_mir_print_input_device_state_event (const MirInputDeviceStateEvent *event)
-{
- MirPointerButtons buttons;
- MirInputEventModifiers modifiers;
- gint i;
- gint j;
-
- g_printerr ("INPUT_DEVICE_STATE\n");
- g_printerr (" Pointer Buttons\n");
- buttons = mir_input_device_state_event_pointer_buttons (event);
-
- if (buttons == 0)
- g_printerr (" none\n");
- else
- {
- if (buttons & mir_pointer_button_primary)
- g_printerr (" primary\n");
- if (buttons & mir_pointer_button_secondary)
- g_printerr (" secondary\n");
- if (buttons & mir_pointer_button_tertiary)
- g_printerr (" tertiary\n");
- if (buttons & mir_pointer_button_back)
- g_printerr (" back\n");
- if (buttons & mir_pointer_button_forward)
- g_printerr (" forward\n");
- if (buttons & mir_pointer_button_side)
- g_printerr (" side\n");
- if (buttons & mir_pointer_button_extra)
- g_printerr (" extra\n");
- if (buttons & mir_pointer_button_task)
- g_printerr (" task\n");
- }
-
- g_printerr (" Pointer Axis\n");
- g_printerr (" X %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_x));
- g_printerr (" Y %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_y));
- g_printerr (" V Scroll %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_vscroll));
- g_printerr (" H Scroll %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_hscroll));
- g_printerr (" Relative X %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_relative_x));
- g_printerr (" Relative Y %f\n", mir_input_device_state_event_pointer_axis (event, mir_pointer_axis_relative_y));
- g_printerr (" Time %ld\n", mir_input_device_state_event_time (event));
- g_printerr (" Event Modifiers\n");
- modifiers = mir_input_device_state_event_modifiers (event);
-
- if (modifiers & mir_input_event_modifier_none)
- g_printerr (" none\n");
- if (modifiers & mir_input_event_modifier_alt)
- g_printerr (" alt\n");
- if (modifiers & mir_input_event_modifier_alt_left)
- g_printerr (" alt_left\n");
- if (modifiers & mir_input_event_modifier_alt_right)
- g_printerr (" alt_right\n");
- if (modifiers & mir_input_event_modifier_shift)
- g_printerr (" shift\n");
- if (modifiers & mir_input_event_modifier_shift_left)
- g_printerr (" shift_left\n");
- if (modifiers & mir_input_event_modifier_shift_right)
- g_printerr (" shift_right\n");
- if (modifiers & mir_input_event_modifier_sym)
- g_printerr (" sym\n");
- if (modifiers & mir_input_event_modifier_function)
- g_printerr (" function\n");
- if (modifiers & mir_input_event_modifier_ctrl)
- g_printerr (" ctrl\n");
- if (modifiers & mir_input_event_modifier_ctrl_left)
- g_printerr (" ctrl_left\n");
- if (modifiers & mir_input_event_modifier_ctrl_right)
- g_printerr (" ctrl_right\n");
- if (modifiers & mir_input_event_modifier_meta)
- g_printerr (" meta\n");
- if (modifiers & mir_input_event_modifier_meta_left)
- g_printerr (" meta_left\n");
- if (modifiers & mir_input_event_modifier_meta_right)
- g_printerr (" meta_right\n");
- if (modifiers & mir_input_event_modifier_caps_lock)
- g_printerr (" caps_lock\n");
- if (modifiers & mir_input_event_modifier_num_lock)
- g_printerr (" num_lock\n");
- if (modifiers & mir_input_event_modifier_scroll_lock)
- g_printerr (" scroll_lock\n");
-
- for (i = 0; i < mir_input_device_state_event_device_count (event); i++)
- {
- g_printerr (" Device %ld\n", mir_input_device_state_event_device_id (event, i));
-
- for (j = 0; j < mir_input_device_state_event_device_pressed_keys_count (event, i); j++)
- g_printerr (" Pressed %u\n", mir_input_device_state_event_device_pressed_keys_for_index (event, i, j));
-
- g_printerr (" Pointer Buttons\n");
- buttons = mir_input_device_state_event_device_pointer_buttons (event, i);
-
- if (buttons == 0)
- g_printerr (" none\n");
- else
- {
- if (buttons & mir_pointer_button_primary)
- g_printerr (" primary\n");
- if (buttons & mir_pointer_button_secondary)
- g_printerr (" secondary\n");
- if (buttons & mir_pointer_button_tertiary)
- g_printerr (" tertiary\n");
- if (buttons & mir_pointer_button_back)
- g_printerr (" back\n");
- if (buttons & mir_pointer_button_forward)
- g_printerr (" forward\n");
- if (buttons & mir_pointer_button_side)
- g_printerr (" side\n");
- if (buttons & mir_pointer_button_extra)
- g_printerr (" extra\n");
- if (buttons & mir_pointer_button_task)
- g_printerr (" task\n");
- }
- }
-}
-
-static void
-_gdk_mir_print_window_placement_event (const MirWindowPlacementEvent *event)
-{
- MirRectangle rect = mir_window_placement_get_relative_position (event);
-
- g_printerr ("WINDOW_PLACEMENT\n");
- g_printerr (" X %d\n", rect.left);
- g_printerr (" Y %d\n", rect.top);
- g_printerr (" Width %u\n", rect.width);
- g_printerr (" Height %u\n", rect.height);
-}
-
-void
-_gdk_mir_print_event (const MirEvent *event)
-{
- const MirInputEvent *input_event;
-
- switch (mir_event_get_type (event))
- {
- case mir_event_type_input:
- input_event = mir_event_get_input_event (event);
-
- switch (mir_input_event_get_type (input_event))
- {
- case mir_input_event_type_key:
- _gdk_mir_print_key_event (mir_event_get_input_event (event));
- break;
- case mir_input_event_type_touch:
- _gdk_mir_print_touch_event (mir_event_get_input_event (event));
- break;
- case mir_input_event_type_pointer:
- _gdk_mir_print_motion_event (mir_event_get_input_event (event));
- break;
- default:
- _gdk_mir_print_input_event (mir_event_get_input_event (event));
- break;
- }
- break;
- case mir_event_type_key:
- _gdk_mir_print_key_event (mir_event_get_input_event (event));
- break;
- case mir_event_type_motion:
- _gdk_mir_print_motion_event (mir_event_get_input_event (event));
- break;
- case mir_event_type_window:
- _gdk_mir_print_window_event (mir_event_get_window_event (event));
- break;
- case mir_event_type_resize:
- _gdk_mir_print_resize_event (mir_event_get_resize_event (event));
- break;
- case mir_event_type_prompt_session_state_change:
- _gdk_mir_print_prompt_session_state_change_event (mir_event_get_prompt_session_event (event));
- break;
- case mir_event_type_orientation:
- _gdk_mir_print_orientation_event (mir_event_get_orientation_event (event));
- break;
- case mir_event_type_close_window:
- _gdk_mir_print_close_event ();
- break;
- case mir_event_type_keymap:
- _gdk_mir_print_keymap_event (mir_event_get_keymap_event (event));
- break;
- case mir_event_type_window_output:
- _gdk_mir_print_window_output_event (mir_event_get_window_output_event (event));
- break;
- case mir_event_type_input_device_state:
- _gdk_mir_print_input_device_state_event (mir_event_get_input_device_state_event (event));
- break;
- case mir_event_type_window_placement:
- _gdk_mir_print_window_placement_event (mir_event_get_window_placement_event (event));
- break;
- default:
- g_printerr ("EVENT %u\n", mir_event_get_type (event));
- break;
- }
-}
diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
deleted file mode 100644
index e726703b21..0000000000
--- a/gdk/mir/gdkmir-private.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-
-#include "gdkmir.h"
-#include "gdkdisplay.h"
-#include "gdkscreen.h"
-#include "gdkdevicemanager.h"
-#include "gdkglcontextprivate.h"
-#include "gdkkeys.h"
-#include "gdkwindowimpl.h"
-
-typedef struct _GdkMirWindowImpl GdkMirWindowImpl;
-typedef struct _GdkMirWindowReference GdkMirWindowReference;
-typedef struct _GdkMirEventSource GdkMirEventSource;
-
-#define GDK_TYPE_MIR_WINDOW_IMPL (gdk_mir_window_impl_get_type ())
-#define GDK_MIR_WINDOW_IMPL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_WINDOW_IMPL, GdkMirWindowImpl))
-#define GDK_IS_WINDOW_IMPL_MIR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW_IMPL))
-
-GType gdk_mir_window_impl_get_type (void);
-
-
-struct _GdkMirGLContext
-{
- GdkGLContext parent_instance;
-
- EGLContext egl_context;
- EGLConfig egl_config;
- gboolean is_attached;
-};
-
-struct _GdkMirGLContextClass
-{
- GdkGLContextClass parent_class;
-};
-
-typedef struct _GdkMirGLContext GdkMirGLContext;
-typedef struct _GdkMirGLContextClass GdkMirGLContextClass;
-
-#define GDK_MIR_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_MIR_GL_CONTEXT, GdkMirGLContext))
-
-
-GdkDisplay *_gdk_mir_display_open (const gchar *display_name);
-
-GdkScreen *_gdk_mir_screen_new (GdkDisplay *display);
-
-GdkDeviceManager *_gdk_mir_device_manager_new (GdkDisplay *display);
-
-GdkDevice *_gdk_mir_device_manager_get_keyboard (GdkDeviceManager *device_manager);
-
-GdkKeymap *_gdk_mir_keymap_new (void);
-
-gboolean _gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap, guint keycode);
-
-GdkDevice *_gdk_mir_keyboard_new (GdkDeviceManager *device_manager, const gchar *name);
-
-GdkDevice *_gdk_mir_pointer_new (GdkDeviceManager *device_manager, const gchar *name);
-
-void _gdk_mir_pointer_set_location (GdkDevice *pointer, gdouble x, gdouble y, GdkWindow *window, GdkModifierType mask);
-
-GdkCursor *_gdk_mir_cursor_new_for_type (GdkDisplay *display, GdkCursorType type);
-
-GdkCursor *_gdk_mir_cursor_new_for_name (GdkDisplay *display, const gchar *name);
-
-const gchar *_gdk_mir_cursor_get_name (GdkCursor *cursor);
-
-MirWindow *_gdk_mir_window_get_mir_window (GdkWindow *window);
-
-GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask);
-
-void _gdk_mir_window_impl_set_window_state (GdkMirWindowImpl *impl, MirWindowState state);
-
-void _gdk_mir_window_impl_set_window_type (GdkMirWindowImpl *impl, MirWindowType type);
-
-void _gdk_mir_window_set_scale (GdkWindow *window, gdouble scale);
-
-void _gdk_mir_window_set_final_rect (GdkWindow *window, MirRectangle rect);
-
-void _gdk_mir_window_impl_set_cursor_state (GdkMirWindowImpl *impl, gdouble x, gdouble y, gboolean cursor_inside, guint button_state);
-
-void _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl, gdouble *x, gdouble *y, gboolean *cursor_inside, guint *button_state);
-
-GdkMirEventSource *_gdk_mir_display_get_event_source (GdkDisplay *display);
-
-GdkMirEventSource *_gdk_mir_event_source_new (GdkDisplay *display);
-
-GdkMirWindowReference *_gdk_mir_event_source_get_window_reference (GdkWindow *window);
-
-void _gdk_mir_window_reference_unref (GdkMirWindowReference *ref);
-
-void _gdk_mir_event_source_queue (GdkMirWindowReference *window_ref, const MirEvent *event);
-
-MirPixelFormat _gdk_mir_display_get_pixel_format (GdkDisplay *display, MirBufferUsage usage);
-
-void _gdk_mir_display_focus_window (GdkDisplay *display, GdkWindow *window);
-
-void _gdk_mir_display_unfocus_window (GdkDisplay *display, GdkWindow *window);
-
-void _gdk_mir_display_create_paste (GdkDisplay *display,
- const gchar * const *paste_formats,
- gconstpointer paste_data,
- gsize paste_size);
-
-gboolean _gdk_mir_display_init_egl_display (GdkDisplay *display);
-
-EGLDisplay _gdk_mir_display_get_egl_display (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_khr_create_context (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_buffer_age (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_swap_buffers_with_damage (GdkDisplay *display);
-
-gboolean _gdk_mir_display_have_egl_surfaceless_context (GdkDisplay *display);
-
-EGLSurface _gdk_mir_window_get_egl_surface (GdkWindow *window, EGLConfig config);
-
-EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig config);
-
-void _gdk_mir_print_event (const MirEvent *event);
-
-#endif /* __GDK_PRIVATE_MIR_H__ */
diff --git a/gdk/mir/gdkmir.h b/gdk/mir/gdkmir.h
deleted file mode 100644
index 811a8dfe86..0000000000
--- a/gdk/mir/gdkmir.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-#include
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_MIR_DISPLAY (gdk_mir_display_get_type ())
-#define GDK_IS_MIR_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_DISPLAY))
-
-#define GDK_TYPE_MIR_GL_CONTEXT (gdk_mir_gl_context_get_type ())
-#define GDK_MIR_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_MIR_GL_CONTEXT))
-
-#define GDK_TYPE_MIR_WINDOW (gdk_mir_window_get_type ())
-#define GDK_IS_MIR_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW))
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_display_get_type (void);
-
-GDK_AVAILABLE_IN_3_16
-MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_window_get_type (void);
-
-GDK_DEPRECATED_IN_3_22
-MirSurface *gdk_mir_window_get_mir_surface (GdkWindow *window);
-
-GDK_AVAILABLE_IN_3_16
-GType gdk_mir_gl_context_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GDK_MIR_H__ */
diff --git a/gdk/mir/gdkmircursor.c b/gdk/mir/gdkmircursor.c
deleted file mode 100644
index 92fe452da8..0000000000
--- a/gdk/mir/gdkmircursor.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-
-#include
-
-#define GDK_TYPE_DISPLAY_MIR (gdk_mir_display_get_type ())
-#define GDK_MIR_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MIR, GdkMirDisplay))
-#define GDK_MIR_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MIR, GdkMirDisplayClass))
-#define GDK_IS_MIR_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_DISPLAY))
-#define GDK_MIR_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_DISPLAY, GdkMirDisplayImplClass))
-
-typedef struct GdkMirDisplay
-{
- GdkDisplay parent_instance;
-
- /* Connection to Mir server */
- MirConnection *connection;
-
- /* Event source */
- GdkMirEventSource *event_source;
-
- /* Serial number? */
- gulong serial;
-
- /* Screen information */
- GdkScreen *screen;
-
- GdkKeymap *keymap;
-
- GdkWindow *focused_window;
-
- MirPixelFormat sw_pixel_format;
- MirPixelFormat hw_pixel_format;
-
- EGLDisplay egl_display;
- guint have_egl_khr_create_context : 1;
- guint have_egl_buffer_age : 1;
- guint have_egl_swap_buffers_with_damage : 1;
- guint have_egl_surfaceless_context : 1;
-
- ContentHubService *content_service;
- ContentHubHandler *content_handler;
- GVariant *paste_data;
-} GdkMirDisplay;
-
-typedef struct GdkMirDisplayClass
-{
- GdkDisplayClass parent_class;
-} GdkMirDisplayClass;
-
-static void get_pixel_formats (MirConnection *, MirPixelFormat *sw, MirPixelFormat *hw);
-
-/**
- * SECTION:mir_interaction
- * @Short_description: Mir backend-specific functions
- * @Title: Mir Interaction
- *
- * The functions in this section are specific to the GDK Mir backend.
- * To use them, you need to include the <gdk/gdkmir.h>
- * header and use the Mir-specific pkg-config files to build your
- * application (either gdk-mir-3.0 or
- * gtk+-mir-3.0 ).
- *
- * To make your code compile with other GDK backends, guard backend-specific
- * calls by an ifdef as follows. Since GDK may be built with multiple
- * backends, you should also check for the backend that is in use (e.g. by
- * using the GDK_IS_MIR_DISPLAY() macro).
- * |[
- * #ifdef GDK_WINDOWING_MIR
- * if (GDK_IS_MIR_DISPLAY (display))
- * {
- * /* make Mir-specific calls here */
- * }
- * else
- * #endif
- * #ifdef GDK_WINDOWING_X11
- * if (GDK_IS_X11_DISPLAY (display))
- * {
- * /* make X11-specific calls here */
- * }
- * else
- * #endif
- * g_error ("Unsupported GDK backend");
- * ]|
- */
-
-G_DEFINE_TYPE (GdkMirDisplay, gdk_mir_display, GDK_TYPE_DISPLAY)
-
-static void
-pasteboard_changed_cb (GdkMirDisplay *display,
- gpointer user_data)
-{
- g_clear_pointer (&display->paste_data, g_variant_unref);
-}
-
-GdkDisplay *
-_gdk_mir_display_open (const gchar *display_name)
-{
- MirConnection *connection;
- MirPixelFormat sw_pixel_format, hw_pixel_format;
- GdkMirDisplay *display;
- GDBusConnection *session;
-
- connection = mir_connect_sync (NULL, g_get_prgname ());
- if (!connection)
- return NULL;
-
- if (!mir_connection_is_valid (connection))
- {
- mir_connection_release (connection);
- return NULL;
- }
-
- get_pixel_formats (connection, &sw_pixel_format, &hw_pixel_format);
-
- if (sw_pixel_format == mir_pixel_format_invalid ||
- hw_pixel_format == mir_pixel_format_invalid)
- {
- g_printerr ("Mir display does not support required pixel formats\n");
- mir_connection_release (connection);
- return NULL;
- }
-
- display = g_object_new (GDK_TYPE_MIR_DISPLAY, NULL);
-
- display->connection = connection;
- GDK_DISPLAY (display)->device_manager = _gdk_mir_device_manager_new (GDK_DISPLAY (display));
- display->screen = _gdk_mir_screen_new (GDK_DISPLAY (display));
- display->sw_pixel_format = sw_pixel_format;
- display->hw_pixel_format = hw_pixel_format;
-
- session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-
- display->content_service = content_hub_service_proxy_new_sync (
- session,
- G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
- "com.ubuntu.content.dbus.Service",
- "/",
- NULL,
- NULL);
-
- g_signal_connect_swapped (
- display->content_service,
- "pasteboard-changed",
- G_CALLBACK (pasteboard_changed_cb),
- display);
-
- display->content_handler = content_hub_handler_skeleton_new ();
-
- g_dbus_interface_skeleton_export (
- G_DBUS_INTERFACE_SKELETON (display->content_handler),
- session,
- "/org/gnome/gtk/content/handler",
- NULL);
-
- g_object_unref (session);
-
- content_hub_service_call_register_import_export_handler_sync (
- display->content_service,
- g_application_get_application_id (g_application_get_default ()),
- "/org/gnome/gtk/content/handler",
- NULL,
- NULL);
-
- content_hub_service_call_handler_active_sync (
- display->content_service,
- g_application_get_application_id (g_application_get_default ()),
- NULL,
- NULL);
-
- g_signal_emit_by_name (display, "opened");
-
- return GDK_DISPLAY (display);
-}
-
-/**
- * gdk_mir_display_get_mir_connection
- * @display: (type GdkMirDisplay): a #GdkDisplay
- *
- * Returns the #MirConnection for a #GdkDisplay
- *
- * Returns: (transfer none): a #MirConnection
- *
- * Since: 3.14
- */
-struct MirConnection *
-gdk_mir_display_get_mir_connection (GdkDisplay *display)
-{
- g_return_val_if_fail (GDK_IS_MIR_DISPLAY (display), NULL);
- return GDK_MIR_DISPLAY (display)->connection;
-}
-
-GdkMirEventSource *
-_gdk_mir_display_get_event_source (GdkDisplay *display)
-{
- g_return_val_if_fail (GDK_IS_MIR_DISPLAY (display), NULL);
-
- return GDK_MIR_DISPLAY (display)->event_source;
-}
-
-static void
-gdk_mir_display_dispose (GObject *object)
-{
- GdkMirDisplay *display = GDK_MIR_DISPLAY (object);
-
- g_clear_pointer (&display->paste_data, g_variant_unref);
- g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (display->content_handler));
- g_clear_object (&display->content_handler);
- g_clear_object (&display->content_service);
- g_clear_object (&display->screen);
- g_clear_object (&display->keymap);
- g_clear_pointer (&display->event_source, g_source_unref);
-
- G_OBJECT_CLASS (gdk_mir_display_parent_class)->dispose (object);
-}
-
-static void
-gdk_mir_display_finalize (GObject *object)
-{
- GdkMirDisplay *display = GDK_MIR_DISPLAY (object);
-
- mir_connection_release (display->connection);
-
- G_OBJECT_CLASS (gdk_mir_display_parent_class)->finalize (object);
-}
-
-static const gchar *
-gdk_mir_display_get_name (GdkDisplay *display)
-{
- return "Mir";
-}
-
-static GdkScreen *
-gdk_mir_display_get_default_screen (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->screen;
-}
-
-static void
-gdk_mir_display_beep (GdkDisplay *display)
-{
- /* No system level beep... */
-}
-
-static void
-gdk_mir_display_sync (GdkDisplay *display)
-{
-}
-
-static void
-gdk_mir_display_flush (GdkDisplay *display)
-{
-}
-
-static gboolean
-gdk_mir_display_has_pending (GdkDisplay *display)
-{
- /* We don't need to poll for events - so nothing pending */
- return FALSE;
-}
-
-static void
-gdk_mir_display_queue_events (GdkDisplay *display)
-{
- /* We don't need to poll for events - so don't do anything*/
-}
-
-static void
-gdk_mir_display_make_default (GdkDisplay *display)
-{
-}
-
-static GdkWindow *
-gdk_mir_display_get_default_group (GdkDisplay *display)
-{
- return NULL;
-}
-
-static gboolean
-gdk_mir_display_supports_shapes (GdkDisplay *display)
-{
- /* Mir doesn't support shaped windows */
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_input_shapes (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_composite (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_clipboard_persistence (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_cursor_alpha (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_cursor_color (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_supports_selection_notification (GdkDisplay *display)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_display_request_selection_notification (GdkDisplay *display,
- GdkAtom selection)
-{
- return FALSE;
-}
-
-static void
-gdk_mir_display_store_clipboard (GdkDisplay *display,
- GdkWindow *clipboard_window,
- guint32 time_,
- const GdkAtom *targets,
- gint n_targets)
-{
-}
-
-static void
-gdk_mir_display_get_default_cursor_size (GdkDisplay *display,
- guint *width,
- guint *height)
-{
- *width = *height = 32; // FIXME: Random value
-}
-
-static void
-gdk_mir_display_get_maximal_cursor_size (GdkDisplay *display,
- guint *width,
- guint *height)
-{
- *width = *height = 32; // FIXME: Random value
-}
-
-static GdkCursor *
-gdk_mir_display_get_cursor_for_type (GdkDisplay *display,
- GdkCursorType cursor_type)
-{
- return _gdk_mir_cursor_new_for_type (display, cursor_type);
-}
-
-static GdkCursor *
-gdk_mir_display_get_cursor_for_name (GdkDisplay *display,
- const gchar *name)
-{
- return _gdk_mir_cursor_new_for_name (display, name);
-}
-
-static GdkCursor *
-gdk_mir_display_get_cursor_for_surface (GdkDisplay *display,
- cairo_surface_t *surface,
- gdouble x,
- gdouble y)
-{
- return NULL;
-}
-
-static GdkAppLaunchContext *
-gdk_mir_display_get_app_launch_context (GdkDisplay *display)
-{
- return NULL;
-}
-
-static void
-gdk_mir_display_before_process_all_updates (GdkDisplay *display)
-{
-}
-
-static void
-gdk_mir_display_after_process_all_updates (GdkDisplay *display)
-{
-}
-
-static gulong
-gdk_mir_display_get_next_serial (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->serial++;
-}
-
-static void
-gdk_mir_display_notify_startup_complete (GdkDisplay *display,
- const gchar *startup_id)
-{
-}
-
-static void
-gdk_mir_display_create_window_impl (GdkDisplay *display,
- GdkWindow *window,
- GdkWindow *real_parent,
- GdkScreen *screen,
- GdkEventMask event_mask,
- GdkWindowAttr *attributes,
- gint attributes_mask)
-{
- if (attributes->wclass == GDK_INPUT_OUTPUT)
- {
- window->impl = _gdk_mir_window_impl_new (display, window, attributes, attributes_mask);
- window->impl_window = window;
- }
- else /* attributes->wclass == GDK_INPUT_ONLY */
- {
- window->impl = g_object_ref (real_parent->impl);
- window->impl_window = real_parent;
-
- /* FIXME: this is called in gdk_window_new, which sets window->impl_window
- * back to window after this function returns. */
- }
-}
-
-static GdkKeymap *
-gdk_mir_display_get_keymap (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->keymap;
-}
-
-static void
-gdk_mir_display_push_error_trap (GdkDisplay *display)
-{
-}
-
-static gint
-gdk_mir_display_pop_error_trap (GdkDisplay *display,
- gboolean ignored)
-{
- return 0;
-}
-
-static GdkWindow *
-gdk_mir_display_get_selection_owner (GdkDisplay *display,
- GdkAtom selection)
-{
- return NULL;
-}
-
-static gboolean
-gdk_mir_display_set_selection_owner (GdkDisplay *display,
- GdkWindow *owner,
- GdkAtom selection,
- guint32 time,
- gboolean send_event)
-{
- GdkEvent *event;
-
- if (selection == GDK_SELECTION_CLIPBOARD)
- {
- if (owner)
- {
- event = gdk_event_new (GDK_SELECTION_REQUEST);
- event->selection.window = g_object_ref (owner);
- event->selection.send_event = FALSE;
- event->selection.selection = selection;
- event->selection.target = gdk_atom_intern_static_string ("TARGETS");
- event->selection.property = gdk_atom_intern_static_string ("AVAILABLE_TARGETS");
- event->selection.time = GDK_CURRENT_TIME;
- event->selection.requestor = g_object_ref (owner);
-
- gdk_event_put (event);
- gdk_event_free (event);
-
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-static void
-gdk_mir_display_send_selection_notify (GdkDisplay *display,
- GdkWindow *requestor,
- GdkAtom selection,
- GdkAtom target,
- GdkAtom property,
- guint32 time)
-{
-}
-
-static gint
-gdk_mir_display_get_selection_property (GdkDisplay *display,
- GdkWindow *requestor,
- guchar **data,
- GdkAtom *ret_type,
- gint *ret_format)
-{
- gint length;
-
- gdk_property_get (requestor,
- gdk_atom_intern_static_string ("GDK_SELECTION"),
- GDK_NONE,
- 0,
- G_MAXULONG,
- FALSE,
- ret_type,
- ret_format,
- &length,
- data);
-
- return length;
-}
-
-static gint
-get_format_score (const gchar *format,
- GdkAtom target,
- GdkAtom *out_type,
- gint *out_size)
-{
- const gchar *target_string;
- GdkAtom dummy_type;
- gint dummy_size;
-
- target_string = _gdk_atom_name_const (target);
-
- if (!out_type)
- out_type = &dummy_type;
-
- if (!out_size)
- out_size = &dummy_size;
-
- if (!g_ascii_strcasecmp (format, target_string))
- {
- *out_type = GDK_SELECTION_TYPE_STRING;
- *out_size = sizeof (guchar);
-
- return G_MAXINT;
- }
-
- if (target == gdk_atom_intern_static_string ("UTF8_STRING"))
- return get_format_score (format, gdk_atom_intern_static_string ("text/plain;charset=utf-8"), out_type, out_size);
-
- /* TODO: use best media type for COMPOUND_TEXT target */
- if (target == gdk_atom_intern_static_string ("COMPOUND_TEXT"))
- return get_format_score (format, gdk_atom_intern_static_string ("text/plain;charset=utf-8"), out_type, out_size);
-
- if (target == GDK_TARGET_STRING)
- return get_format_score (format, gdk_atom_intern_static_string ("text/plain;charset=iso-8859-1"), out_type, out_size);
-
- if (target == gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
- return get_format_score (format, gdk_atom_intern_static_string ("text/plain;charset=utf-8"), out_type, out_size);
-
- if (g_content_type_is_a (format, target_string))
- {
- *out_type = GDK_SELECTION_TYPE_STRING;
- *out_size = sizeof (guchar);
-
- return 2;
- }
-
- if (g_content_type_is_a (target_string, format))
- {
- *out_type = GDK_SELECTION_TYPE_STRING;
- *out_size = sizeof (guchar);
-
- return 1;
- }
-
- return 0;
-}
-
-static gint
-get_best_format_index (const gchar * const *formats,
- guint n_formats,
- GdkAtom target,
- GdkAtom *out_type,
- gint *out_size)
-{
- gint best_i = -1;
- gint best_score = 0;
- GdkAtom best_type;
- gint best_size;
- gint score;
- GdkAtom type;
- gint size;
- gint i;
-
- if (!out_type)
- out_type = &best_type;
-
- if (!out_size)
- out_size = &best_size;
-
- *out_type = GDK_NONE;
- *out_size = 0;
-
- for (i = 0; i < n_formats; i++)
- {
- score = get_format_score (formats[i], target, &type, &size);
-
- if (score > best_score)
- {
- best_i = i;
- best_score = score;
- *out_type = type;
- *out_size = size;
- }
- }
-
- return best_i;
-}
-
-static void
-gdk_mir_display_real_convert_selection (GdkDisplay *display,
- GdkWindow *requestor,
- GdkAtom selection,
- GdkAtom target,
- guint32 time)
-{
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
- const gchar *paste_data;
- gsize paste_size;
- const gint *paste_header;
- GPtrArray *paste_formats;
- GArray *paste_targets;
- GdkAtom paste_target;
- GdkEvent *event;
- gint best_i;
- GdkAtom best_type;
- gint best_size;
- gint i;
-
- g_return_if_fail (mir_display->paste_data);
-
- paste_data = g_variant_get_fixed_array (mir_display->paste_data, &paste_size, sizeof (guchar));
- paste_header = (const gint *) paste_data;
-
- if (paste_data)
- {
- paste_formats = g_ptr_array_new_full (paste_header[0], g_free);
-
- for (i = 0; i < paste_header[0]; i++)
- g_ptr_array_add (paste_formats, g_strndup (paste_data + paste_header[1 + 4 * i], paste_header[2 + 4 * i]));
- }
- else
- paste_formats = g_ptr_array_new_with_free_func (g_free);
-
- if (target == gdk_atom_intern_static_string ("TARGETS"))
- {
- paste_targets = g_array_sized_new (TRUE, FALSE, sizeof (GdkAtom), paste_formats->len);
-
- for (i = 0; i < paste_formats->len; i++)
- {
- paste_target = gdk_atom_intern (g_ptr_array_index (paste_formats, i), FALSE);
- g_array_append_val (paste_targets, paste_target);
- }
-
- gdk_property_change (requestor,
- gdk_atom_intern_static_string ("GDK_SELECTION"),
- GDK_SELECTION_TYPE_ATOM,
- 8 * sizeof (GdkAtom),
- GDK_PROP_MODE_REPLACE,
- (const guchar *) paste_targets->data,
- paste_targets->len);
-
- g_array_unref (paste_targets);
-
- event = gdk_event_new (GDK_SELECTION_NOTIFY);
- event->selection.window = g_object_ref (requestor);
- event->selection.send_event = FALSE;
- event->selection.selection = selection;
- event->selection.target = target;
- event->selection.property = gdk_atom_intern_static_string ("GDK_SELECTION");
- event->selection.time = time;
- event->selection.requestor = g_object_ref (requestor);
-
- gdk_event_put (event);
- gdk_event_free (event);
- }
- else
- {
- best_i = get_best_format_index ((const gchar * const *) paste_formats->pdata,
- paste_formats->len,
- target,
- &best_type,
- &best_size);
-
- if (best_i >= 0)
- {
- gdk_property_change (requestor,
- gdk_atom_intern_static_string ("GDK_SELECTION"),
- best_type,
- 8 * best_size,
- GDK_PROP_MODE_REPLACE,
- (const guchar *) paste_data + paste_header[3 + 4 * best_i],
- paste_header[4 + 4 * best_i] / best_size);
-
- event = gdk_event_new (GDK_SELECTION_NOTIFY);
- event->selection.window = g_object_ref (requestor);
- event->selection.send_event = FALSE;
- event->selection.selection = selection;
- event->selection.target = target;
- event->selection.property = gdk_atom_intern_static_string ("GDK_SELECTION");
- event->selection.time = time;
- event->selection.requestor = g_object_ref (requestor);
-
- gdk_event_put (event);
- gdk_event_free (event);
- }
- }
-
- g_ptr_array_unref (paste_formats);
-}
-
-typedef struct
-{
- GdkDisplay *display;
- GdkWindow *requestor;
- GdkAtom selection;
- GdkAtom target;
- guint32 time;
-} ConvertInfo;
-
-static void
-paste_data_ready_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- ContentHubService *content_service = CONTENT_HUB_SERVICE (source_object);
- ConvertInfo *info = user_data;
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (info->display);
- gboolean result;
-
- g_clear_pointer (&mir_display->paste_data, g_variant_unref);
-
- result = content_hub_service_call_get_latest_paste_data_finish (content_service,
- &mir_display->paste_data,
- res,
- NULL);
-
- if (result)
- gdk_mir_display_real_convert_selection (info->display,
- info->requestor,
- info->selection,
- info->target,
- info->time);
-
- g_object_unref (info->requestor);
- g_object_unref (info->display);
- g_free (info);
-}
-
-static void
-gdk_mir_display_convert_selection (GdkDisplay *display,
- GdkWindow *requestor,
- GdkAtom selection,
- GdkAtom target,
- guint32 time)
-{
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
- MirWindow *mir_window;
- MirWindowId *mir_window_id;
- ConvertInfo *info;
-
- if (selection != GDK_SELECTION_CLIPBOARD)
- return;
- else if (mir_display->paste_data)
- gdk_mir_display_real_convert_selection (display, requestor, selection, target, time);
- else if (mir_display->focused_window)
- {
- mir_window = _gdk_mir_window_get_mir_window (mir_display->focused_window);
-
- if (!mir_window)
- return;
-
- mir_window_id = mir_window_request_window_id_sync (mir_window);
-
- if (!mir_window_id)
- return;
-
- if (mir_window_id_is_valid (mir_window_id))
- {
- info = g_new (ConvertInfo, 1);
- info->display = g_object_ref (display);
- info->requestor = g_object_ref (requestor);
- info->selection = selection;
- info->target = target;
- info->time = time;
-
- content_hub_service_call_get_latest_paste_data (
- mir_display->content_service,
- mir_window_id_as_string (mir_window_id),
- NULL,
- paste_data_ready_cb,
- info);
- }
-
- mir_window_id_release (mir_window_id);
- }
-}
-
-static gint
-gdk_mir_display_text_property_to_utf8_list (GdkDisplay *display,
- GdkAtom encoding,
- gint format,
- const guchar *text,
- gint length,
- gchar ***list)
-{
- GPtrArray *array;
- const gchar *ptr;
- gsize chunk_len;
- gchar *copy;
- guint nitems;
-
- ptr = (const gchar *) text;
- array = g_ptr_array_new ();
-
- /* split text into utf-8 strings */
- while (ptr < (const gchar *) &text[length])
- {
- chunk_len = strlen (ptr);
-
- if (g_utf8_validate (ptr, chunk_len, NULL))
- {
- copy = g_strndup (ptr, chunk_len);
- g_ptr_array_add (array, copy);
- }
-
- ptr = &ptr[chunk_len + 1];
- }
-
- nitems = array->len;
- g_ptr_array_add (array, NULL);
-
- if (list)
- *list = (gchar **) g_ptr_array_free (array, FALSE);
- else
- g_ptr_array_free (array, TRUE);
-
- return nitems;
-}
-
-static gchar *
-gdk_mir_display_utf8_to_string_target (GdkDisplay *display,
- const gchar *str)
-{
- return NULL;
-}
-
-static void
-get_pixel_formats (MirConnection *connection,
- MirPixelFormat *sw_pixel_format,
- MirPixelFormat *hw_pixel_format)
-{
- MirPixelFormat formats[mir_pixel_formats];
- unsigned int n_formats, i;
-
- mir_connection_get_available_surface_formats (connection, formats,
- mir_pixel_formats, &n_formats);
-
- if (sw_pixel_format)
- {
- *sw_pixel_format = mir_pixel_format_invalid;
-
- for (i = 0; i < n_formats && *sw_pixel_format == mir_pixel_format_invalid; i++)
- {
- switch (formats[i])
- {
- case mir_pixel_format_abgr_8888:
- case mir_pixel_format_xbgr_8888:
- case mir_pixel_format_argb_8888:
- case mir_pixel_format_xrgb_8888:
- case mir_pixel_format_rgb_565:
- *sw_pixel_format = formats[i];
- break;
- default:
- break;
- }
- }
- }
-
- if (hw_pixel_format)
- {
- *hw_pixel_format = mir_pixel_format_invalid;
-
- for (i = 0; i < n_formats && *hw_pixel_format == mir_pixel_format_invalid; i++)
- {
- switch (formats[i])
- {
- case mir_pixel_format_abgr_8888:
- case mir_pixel_format_xbgr_8888:
- case mir_pixel_format_argb_8888:
- case mir_pixel_format_xrgb_8888:
- case mir_pixel_format_rgb_565:
- *hw_pixel_format = formats[i];
- break;
- default:
- break;
- }
- }
- }
-}
-
-MirPixelFormat
-_gdk_mir_display_get_pixel_format (GdkDisplay *display,
- MirBufferUsage usage)
-{
- GdkMirDisplay *mir_dpy = GDK_MIR_DISPLAY (display);
-
- if (usage == mir_buffer_usage_hardware)
- return mir_dpy->hw_pixel_format;
-
- return mir_dpy->sw_pixel_format;
-}
-
-void
-_gdk_mir_display_focus_window (GdkDisplay *display,
- GdkWindow *window)
-{
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
-
- g_set_object (&mir_display->focused_window, window);
-}
-
-void
-_gdk_mir_display_unfocus_window (GdkDisplay *display,
- GdkWindow *window)
-{
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
-
- if (window == mir_display->focused_window)
- g_clear_object (&mir_display->focused_window);
-}
-
-void
-_gdk_mir_display_create_paste (GdkDisplay *display,
- const gchar * const *paste_formats,
- gconstpointer paste_data,
- gsize paste_size)
-{
- GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
- MirWindow *mir_window;
- MirWindowId *mir_window_id;
-
- if (!mir_display->focused_window)
- return;
-
- mir_window = _gdk_mir_window_get_mir_window (mir_display->focused_window);
-
- if (!mir_window)
- return;
-
- mir_window_id = mir_window_request_window_id_sync (mir_window);
-
- if (!mir_window_id)
- return;
-
- if (mir_window_id_is_valid (mir_window_id))
- content_hub_service_call_create_paste_sync (
- mir_display->content_service,
- g_application_get_application_id (g_application_get_default ()),
- mir_window_id_as_string (mir_window_id),
- g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, paste_data, paste_size, sizeof (guchar)),
- paste_formats,
- NULL,
- NULL,
- NULL);
-
- mir_window_id_release (mir_window_id);
-}
-
-gboolean
-_gdk_mir_display_init_egl_display (GdkDisplay *display)
-{
- GdkMirDisplay *mir_dpy = GDK_MIR_DISPLAY (display);
- EGLint major_version, minor_version;
- EGLDisplay *dpy;
-
- if (mir_dpy->egl_display)
- return TRUE;
-
- dpy = eglGetDisplay (mir_connection_get_egl_native_display (mir_dpy->connection));
- if (dpy == NULL)
- return FALSE;
-
- if (!eglInitialize (dpy, &major_version, &minor_version))
- return FALSE;
-
- if (!eglBindAPI (EGL_OPENGL_API))
- return FALSE;
-
- mir_dpy->egl_display = dpy;
-
- mir_dpy->have_egl_khr_create_context =
- epoxy_has_egl_extension (dpy, "EGL_KHR_create_context");
-
- mir_dpy->have_egl_buffer_age =
- epoxy_has_egl_extension (dpy, "EGL_EXT_buffer_age");
-
- mir_dpy->have_egl_swap_buffers_with_damage =
- epoxy_has_egl_extension (dpy, "EGL_EXT_swap_buffers_with_damage");
-
- mir_dpy->have_egl_surfaceless_context =
- epoxy_has_egl_extension (dpy, "EGL_KHR_surfaceless_context");
-
- GDK_NOTE (OPENGL,
- g_print ("EGL API version %d.%d found\n"
- " - Vendor: %s\n"
- " - Version: %s\n"
- " - Client APIs: %s\n"
- " - Extensions:\n"
- "\t%s\n",
- major_version,
- minor_version,
- eglQueryString (dpy, EGL_VENDOR),
- eglQueryString (dpy, EGL_VERSION),
- eglQueryString (dpy, EGL_CLIENT_APIS),
- eglQueryString (dpy, EGL_EXTENSIONS)));
-
- return TRUE;
-}
-
-static gboolean
-gdk_mir_display_make_gl_context_current (GdkDisplay *display,
- GdkGLContext *context)
-{
- EGLDisplay egl_display = _gdk_mir_display_get_egl_display (display);
- GdkMirGLContext *mir_context;
- GdkWindow *window;
- EGLSurface egl_surface;
-
- if (context == NULL)
- {
- eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- return TRUE;
- }
-
- mir_context = GDK_MIR_GL_CONTEXT (context);
- window = gdk_gl_context_get_window (context);
-
- if (mir_context->is_attached)
- {
- egl_surface = _gdk_mir_window_get_egl_surface (window,
- mir_context->egl_config);
- }
- else
- {
- if (_gdk_mir_display_have_egl_surfaceless_context (display))
- egl_surface = EGL_NO_SURFACE;
- else
- egl_surface = _gdk_mir_window_get_dummy_egl_surface (window,
- mir_context->egl_config);
- }
-
- if (!eglMakeCurrent (egl_display, egl_surface, egl_surface, mir_context->egl_context))
- {
- g_warning ("eglMakeCurrent failed");
- return FALSE;
- }
-
- return TRUE;
-}
-
-EGLDisplay _gdk_mir_display_get_egl_display (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->egl_display;
-}
-
-gboolean _gdk_mir_display_have_egl_khr_create_context (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->have_egl_khr_create_context;
-}
-
-gboolean _gdk_mir_display_have_egl_buffer_age (GdkDisplay *display)
-{
- /* FIXME: this is not really supported by mir yet (despite is advertised) */
- // return GDK_MIR_DISPLAY (display)->have_egl_buffer_age;
- return FALSE;
-}
-
-gboolean _gdk_mir_display_have_egl_swap_buffers_with_damage (GdkDisplay *display)
-{
- /* FIXME: this is not really supported by mir yet (despite is advertised) */
- // return GDK_MIR_DISPLAY (display)->have_egl_swap_buffers_with_damage;
- return FALSE;
-}
-
-gboolean _gdk_mir_display_have_egl_surfaceless_context (GdkDisplay *display)
-{
- return GDK_MIR_DISPLAY (display)->have_egl_surfaceless_context;
-}
-
-
-static void
-gdk_mir_display_init (GdkMirDisplay *display)
-{
- display->event_source = _gdk_mir_event_source_new (GDK_DISPLAY (display));
- display->keymap = _gdk_mir_keymap_new ();
-}
-
-static void
-gdk_mir_display_class_init (GdkMirDisplayClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (klass);
-
- object_class->dispose = gdk_mir_display_dispose;
- object_class->finalize = gdk_mir_display_finalize;
-
- display_class->window_type = gdk_mir_window_get_type ();
-
- display_class->get_name = gdk_mir_display_get_name;
- display_class->get_default_screen = gdk_mir_display_get_default_screen;
- display_class->beep = gdk_mir_display_beep;
- display_class->sync = gdk_mir_display_sync;
- display_class->flush = gdk_mir_display_flush;
- display_class->has_pending = gdk_mir_display_has_pending;
- display_class->queue_events = gdk_mir_display_queue_events;
- display_class->make_default = gdk_mir_display_make_default;
- display_class->get_default_group = gdk_mir_display_get_default_group;
- display_class->supports_shapes = gdk_mir_display_supports_shapes;
- display_class->supports_input_shapes = gdk_mir_display_supports_input_shapes;
- display_class->supports_composite = gdk_mir_display_supports_composite;
- display_class->supports_clipboard_persistence = gdk_mir_display_supports_clipboard_persistence;
- display_class->supports_cursor_alpha = gdk_mir_display_supports_cursor_alpha;
- display_class->supports_cursor_color = gdk_mir_display_supports_cursor_color;
- display_class->supports_selection_notification = gdk_mir_display_supports_selection_notification;
- display_class->request_selection_notification = gdk_mir_display_request_selection_notification;
- display_class->store_clipboard = gdk_mir_display_store_clipboard;
- display_class->get_default_cursor_size = gdk_mir_display_get_default_cursor_size;
- display_class->get_maximal_cursor_size = gdk_mir_display_get_maximal_cursor_size;
- display_class->get_cursor_for_type = gdk_mir_display_get_cursor_for_type;
- display_class->get_cursor_for_name = gdk_mir_display_get_cursor_for_name;
- display_class->get_cursor_for_surface = gdk_mir_display_get_cursor_for_surface;
- display_class->get_app_launch_context = gdk_mir_display_get_app_launch_context;
- display_class->before_process_all_updates = gdk_mir_display_before_process_all_updates;
- display_class->after_process_all_updates = gdk_mir_display_after_process_all_updates;
- display_class->get_next_serial = gdk_mir_display_get_next_serial;
- display_class->notify_startup_complete = gdk_mir_display_notify_startup_complete;
- display_class->create_window_impl = gdk_mir_display_create_window_impl;
- display_class->get_keymap = gdk_mir_display_get_keymap;
- display_class->push_error_trap = gdk_mir_display_push_error_trap;
- display_class->pop_error_trap = gdk_mir_display_pop_error_trap;
- display_class->get_selection_owner = gdk_mir_display_get_selection_owner;
- display_class->set_selection_owner = gdk_mir_display_set_selection_owner;
- display_class->send_selection_notify = gdk_mir_display_send_selection_notify;
- display_class->get_selection_property = gdk_mir_display_get_selection_property;
- display_class->convert_selection = gdk_mir_display_convert_selection;
- display_class->text_property_to_utf8_list = gdk_mir_display_text_property_to_utf8_list;
- display_class->utf8_to_string_target = gdk_mir_display_utf8_to_string_target;
- display_class->make_gl_context_current = gdk_mir_display_make_gl_context_current;
-}
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
deleted file mode 100644
index ea0cc52819..0000000000
--- a/gdk/mir/gdkmireventsource.c
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-
-#define NANO_TO_MILLI(x) ((x) / 1000000)
-
-struct _GdkMirWindowReference {
- GdkMirEventSource *source;
- GdkWindow *window;
- gint ref_count;
-};
-
-typedef struct {
- GdkMirWindowReference *window_ref;
- const MirEvent *event;
-} GdkMirQueuedEvent;
-
-struct _GdkMirEventSource
-{
- GSource parent_instance;
-
- GMutex mir_event_lock;
- GQueue mir_events;
- gboolean log_events;
-
- GdkDisplay *display;
-};
-
-static void
-send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
-{
- GdkDisplay *display;
- GList *node;
-
- gdk_event_set_device (event, device);
- gdk_event_set_source_device (event, device);
- gdk_event_set_screen (event, gdk_display_get_default_screen (gdk_window_get_display (window)));
- event->any.window = g_object_ref (window);
-
- display = gdk_window_get_display (window);
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, _gdk_display_get_next_serial (display));
-}
-
-static void
-set_key_event_string (GdkEventKey *event)
-{
- gunichar c = 0;
-
- if (event->keyval != GDK_KEY_VoidSymbol)
- c = gdk_keyval_to_unicode (event->keyval);
-
- if (c)
- {
- gchar buf[7];
- gint len;
- gsize bytes_written;
-
- /* Apply the control key - Taken from Xlib
- */
- if (event->state & GDK_CONTROL_MASK)
- {
- if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
- else if (c == '2')
- {
- event->string = g_memdup ("\0\0", 2);
- event->length = 1;
- buf[0] = '\0';
- return;
- }
- else if (c >= '3' && c <= '7') c -= ('3' - '\033');
- else if (c == '8') c = '\177';
- else if (c == '/') c = '_' & 0x1F;
- }
-
- len = g_unichar_to_utf8 (c, buf);
- buf[len] = '\0';
-
- event->string = g_locale_from_utf8 (buf, len,
- NULL, &bytes_written,
- NULL);
- if (event->string)
- event->length = bytes_written;
- }
- else if (event->keyval == GDK_KEY_Escape)
- {
- event->length = 1;
- event->string = g_strdup ("\033");
- }
- else if (event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_KP_Enter)
- {
- event->length = 1;
- event->string = g_strdup ("\r");
- }
-
- if (!event->string)
- {
- event->length = 0;
- event->string = g_strdup ("");
- }
-}
-
-static void
-generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint keyval, guint16 keycode, gboolean is_modifier, guint32 event_time)
-{
- GdkEvent *event;
- GdkDisplay *display;
- GdkSeat *seat;
- GdkDevice *keyboard;
-
- event = gdk_event_new (type);
- event->key.state = state;
- event->key.keyval = keyval;
- event->key.hardware_keycode = keycode + 8;
- gdk_event_set_scancode (event, keycode + 8);
- event->key.is_modifier = is_modifier;
- event->key.time = event_time;
- set_key_event_string (&event->key);
-
- display = gdk_window_get_display (window);
- seat = gdk_display_get_default_seat (display);
- keyboard = gdk_seat_get_keyboard (seat);
-
- send_event (window, keyboard, event);
-}
-
-static GdkDevice *
-get_pointer (GdkWindow *window)
-{
- GdkDisplay *display;
- GdkSeat *seat;
- GdkDevice *pointer;
-
- display = gdk_window_get_display (window);
- seat = gdk_display_get_default_seat (display);
- pointer = gdk_seat_get_pointer (seat);
-
- return pointer;
-}
-
-static void
-generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint button, guint state, guint32 event_time)
-{
- GdkEvent *event;
-
- event = gdk_event_new (type);
- event->button.x = x;
- event->button.y = y;
- event->button.state = state;
- event->button.button = button;
- event->button.time = event_time;
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_scroll_event (GdkWindow *window, gdouble x, gdouble y, gdouble delta_x, gdouble delta_y, guint state, guint32 event_time)
-{
- GdkEvent *event;
-
- event = gdk_event_new (GDK_SCROLL);
- event->scroll.x = x;
- event->scroll.y = y;
- event->scroll.state = state;
- event->scroll.time = event_time;
-
- if (ABS (delta_x) == 1 && delta_y == 0)
- {
- event->scroll.direction = (delta_x < 0) ? GDK_SCROLL_LEFT : GDK_SCROLL_RIGHT;
- }
- else if (ABS (delta_y) == 1 && delta_x == 0)
- {
- event->scroll.direction = (delta_y < 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
- }
- else
- {
- event->scroll.direction = GDK_SCROLL_SMOOTH;
- event->scroll.delta_x = delta_x;
- event->scroll.delta_y = -delta_y;
- }
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_motion_event (GdkWindow *window, gdouble x, gdouble y, guint state, guint32 event_time)
-{
- GdkEvent *event;
-
- event = gdk_event_new (GDK_MOTION_NOTIFY);
- event->motion.x = x;
- event->motion.y = y;
- event->motion.state = state;
- event->motion.is_hint = FALSE;
- event->motion.time = event_time;
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint32 event_time)
-{
- GdkEvent *event;
-
- event = gdk_event_new (type);
- event->crossing.x = x;
- event->crossing.y = y;
- event->crossing.mode = GDK_CROSSING_NORMAL;
- event->crossing.detail = GDK_NOTIFY_ANCESTOR;
- event->crossing.focus = TRUE;
- event->crossing.time = event_time;
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-generate_focus_event (GdkWindow *window, gboolean focused)
-{
- GdkEvent *event;
-
- if (focused)
- {
- gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FOCUSED);
- _gdk_mir_display_focus_window (gdk_window_get_display (window), window);
- }
- else
- {
- gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FOCUSED, 0);
- _gdk_mir_display_unfocus_window (gdk_window_get_display (window), window);
- }
-
- event = gdk_event_new (GDK_FOCUS_CHANGE);
- event->focus_change.send_event = FALSE;
- event->focus_change.in = focused;
-
- send_event (window, get_pointer (window), event);
-}
-
-static guint
-get_modifier_state (unsigned int modifiers, guint button_state)
-{
- guint modifier_state = button_state;
-
- if ((modifiers & (mir_input_event_modifier_alt |
- mir_input_event_modifier_alt_left |
- mir_input_event_modifier_alt_right)) != 0)
- modifier_state |= GDK_MOD1_MASK;
- if ((modifiers & (mir_input_event_modifier_shift |
- mir_input_event_modifier_shift_left |
- mir_input_event_modifier_shift_right)) != 0)
- modifier_state |= GDK_SHIFT_MASK;
- if ((modifiers & (mir_input_event_modifier_ctrl |
- mir_input_event_modifier_ctrl_left |
- mir_input_event_modifier_ctrl_right)) != 0)
- modifier_state |= GDK_CONTROL_MASK;
- if ((modifiers & (mir_input_event_modifier_meta |
- mir_input_event_modifier_meta_left |
- mir_input_event_modifier_meta_right)) != 0)
- modifier_state |= GDK_META_MASK;
- if ((modifiers & mir_input_event_modifier_caps_lock) != 0)
- modifier_state |= GDK_LOCK_MASK;
-
- return modifier_state;
-}
-
-static void
-handle_key_event (GdkWindow *window, const MirInputEvent *event)
-{
- const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkKeymap *keymap;
- guint modifier_state;
- guint button_state;
-
- if (!keyboard_event)
- return;
-
- _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, NULL, &button_state);
- modifier_state = get_modifier_state (mir_keyboard_event_modifiers (keyboard_event), button_state);
- keymap = gdk_keymap_get_for_display (gdk_window_get_display (window));
-
- generate_key_event (window,
- mir_keyboard_event_action (keyboard_event) == mir_keyboard_action_up ? GDK_KEY_RELEASE : GDK_KEY_PRESS,
- modifier_state,
- mir_keyboard_event_key_code (keyboard_event),
- mir_keyboard_event_scan_code (keyboard_event),
- _gdk_mir_keymap_key_is_modifier (keymap, mir_keyboard_event_key_code (keyboard_event)),
- NANO_TO_MILLI (mir_input_event_get_event_time (event)));
-}
-
-static void
-handle_touch_event (GdkWindow *window,
- const MirTouchEvent *mir_touch_event)
-{
- const MirInputEvent *mir_input_event = mir_touch_event_input_event (mir_touch_event);
- guint n = mir_touch_event_point_count (mir_touch_event);
- GdkEvent *gdk_event;
- guint i;
-
- for (i = 0; i < n; i++)
- {
- MirTouchAction action = mir_touch_event_action (mir_touch_event, i);
- if (action == mir_touch_action_up)
- gdk_event = gdk_event_new (GDK_TOUCH_END);
- else if (action == mir_touch_action_down)
- gdk_event = gdk_event_new (GDK_TOUCH_BEGIN);
- else
- gdk_event = gdk_event_new (GDK_TOUCH_UPDATE);
-
- gdk_event->touch.window = window;
- gdk_event->touch.sequence = GINT_TO_POINTER (mir_touch_event_id (mir_touch_event, i));
- gdk_event->touch.time = mir_input_event_get_event_time (mir_input_event);
- gdk_event->touch.state = get_modifier_state (mir_touch_event_modifiers (mir_touch_event), 0);
- gdk_event->touch.x = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_x);
- gdk_event->touch.y = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_y);
- gdk_event->touch.x_root = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_x);
- gdk_event->touch.y_root = mir_touch_event_axis_value (mir_touch_event, i, mir_touch_axis_y);
- gdk_event->touch.emulating_pointer = TRUE;
- gdk_event_set_pointer_emulated (gdk_event, TRUE);
-
- send_event (window, get_pointer (window), gdk_event);
- }
-}
-
-static guint
-get_button_state (const MirPointerEvent *event)
-{
- guint state = 0;
-
- if (mir_pointer_event_button_state (event, mir_pointer_button_primary)) /* left */
- state |= GDK_BUTTON1_MASK;
- if (mir_pointer_event_button_state (event, mir_pointer_button_secondary)) /* right */
- state |= GDK_BUTTON3_MASK;
- if (mir_pointer_event_button_state (event, mir_pointer_button_tertiary)) /* middle */
- state |= GDK_BUTTON2_MASK;
-
- return state;
-}
-
-static void
-handle_motion_event (GdkWindow *window, const MirInputEvent *event)
-{
- const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- gdouble x, y;
- gboolean cursor_inside;
- guint button_state;
- guint new_button_state;
- guint modifier_state;
- guint32 event_time;
- GdkEventType event_type;
- guint changed_button_state;
-
- if (!pointer_event)
- return;
-
- _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
- new_button_state = get_button_state (pointer_event);
- modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), new_button_state);
- event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
-
- if (window)
- {
- gdouble new_x;
- gdouble new_y;
- gdouble hscroll;
- gdouble vscroll;
-
- /* Update which window has focus */
- _gdk_mir_pointer_set_location (get_pointer (window), x, y, window, modifier_state);
- switch (mir_pointer_event_action (pointer_event))
- {
- case mir_pointer_action_button_up:
- case mir_pointer_action_button_down:
- event_type = mir_pointer_event_action (pointer_event) == mir_pointer_action_button_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
- changed_button_state = button_state ^ new_button_state;
- if (changed_button_state == 0 || (changed_button_state & GDK_BUTTON1_MASK) != 0)
- generate_button_event (window, event_type, x, y, GDK_BUTTON_PRIMARY, modifier_state, event_time);
- if ((changed_button_state & GDK_BUTTON2_MASK) != 0)
- generate_button_event (window, event_type, x, y, GDK_BUTTON_MIDDLE, modifier_state, event_time);
- if ((changed_button_state & GDK_BUTTON3_MASK) != 0)
- generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
- button_state = new_button_state;
- break;
- case mir_pointer_action_motion:
- new_x = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x);
- new_y = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y);
- hscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_hscroll);
- vscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_vscroll);
-
- if (hscroll != 0.0 || vscroll != 0.0)
- generate_scroll_event (window, x, y, hscroll, vscroll, modifier_state, event_time);
- if (ABS (new_x - x) > 0.5 || ABS (new_y - y) > 0.5)
- {
- generate_motion_event (window, new_x, new_y, modifier_state, event_time);
- x = new_x;
- y = new_y;
- }
-
- break;
- case mir_pointer_action_enter:
- if (!cursor_inside)
- {
- cursor_inside = TRUE;
- generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
- }
- break;
- case mir_pointer_action_leave:
- if (cursor_inside)
- {
- cursor_inside = FALSE;
- generate_crossing_event (window, GDK_LEAVE_NOTIFY, x, y, event_time);
- }
- break;
- default:
- break;
- }
-
- _gdk_mir_window_impl_set_cursor_state (impl, x, y, cursor_inside, button_state);
- }
-}
-
-static void
-handle_window_event (GdkWindow *window,
- const MirWindowEvent *event)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirWindowState state;
-
- switch (mir_window_event_get_attribute (event))
- {
- case mir_window_attrib_type:
- _gdk_mir_window_impl_set_window_type (impl, mir_window_event_get_attribute_value (event));
- break;
- case mir_window_attrib_state:
- state = mir_window_event_get_attribute_value (event);
- _gdk_mir_window_impl_set_window_state (impl, state);
-
- switch (state)
- {
- case mir_window_state_restored:
- case mir_window_state_hidden:
- gdk_synthesize_window_state (window,
- GDK_WINDOW_STATE_ICONIFIED |
- GDK_WINDOW_STATE_MAXIMIZED |
- GDK_WINDOW_STATE_FULLSCREEN,
- 0);
- break;
- case mir_window_state_minimized:
- gdk_synthesize_window_state (window,
- GDK_WINDOW_STATE_MAXIMIZED |
- GDK_WINDOW_STATE_FULLSCREEN,
- GDK_WINDOW_STATE_ICONIFIED);
- break;
- case mir_window_state_maximized:
- case mir_window_state_vertmaximized:
- case mir_window_state_horizmaximized:
- gdk_synthesize_window_state (window,
- GDK_WINDOW_STATE_ICONIFIED |
- GDK_WINDOW_STATE_FULLSCREEN,
- GDK_WINDOW_STATE_MAXIMIZED);
- break;
- case mir_window_state_fullscreen:
- gdk_synthesize_window_state (window,
- GDK_WINDOW_STATE_ICONIFIED |
- GDK_WINDOW_STATE_MAXIMIZED,
- GDK_WINDOW_STATE_FULLSCREEN);
- break;
- default:
- break;
- }
-
- break;
- case mir_window_attrib_swapinterval:
- break;
- case mir_window_attrib_focus:
- generate_focus_event (window, mir_window_event_get_attribute_value (event) != 0);
- break;
- default:
- break;
- }
-}
-
-static void
-generate_configure_event (GdkWindow *window,
- gint width,
- gint height)
-{
- GdkEvent *event;
-
- event = gdk_event_new (GDK_CONFIGURE);
- event->configure.send_event = FALSE;
- event->configure.width = width;
- event->configure.height = height;
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-handle_resize_event (GdkWindow *window,
- const MirResizeEvent *event)
-{
- window->width = mir_resize_event_get_width (event);
- window->height = mir_resize_event_get_height (event);
- _gdk_window_update_size (window);
-
- generate_configure_event (window, mir_resize_event_get_width (event), mir_resize_event_get_height (event));
-}
-
-static void
-handle_close_event (GdkWindow *window)
-{
- send_event (window, get_pointer (window), gdk_event_new (GDK_DESTROY));
- gdk_window_destroy_notify (window);
-}
-
-static void
-handle_window_output_event (GdkWindow *window,
- const MirWindowOutputEvent *event)
-{
- _gdk_mir_window_set_scale (window, mir_window_output_event_get_scale (event));
-}
-
-static void
-handle_window_placement_event (GdkWindow *window,
- const MirWindowPlacementEvent *event)
-{
- _gdk_mir_window_set_final_rect (window, mir_window_placement_get_relative_position (event));
-}
-
-typedef struct
-{
- GdkWindow *window;
- MirEvent *event;
-} EventData;
-
-static void
-gdk_mir_event_source_queue_event (GdkDisplay *display,
- GdkWindow *window,
- const MirEvent *event)
-{
- const MirInputEvent *input_event;
-
- // FIXME: Only generate events if the window wanted them?
- switch (mir_event_get_type (event))
- {
- case mir_event_type_input:
- input_event = mir_event_get_input_event (event);
-
- switch (mir_input_event_get_type (input_event))
- {
- case mir_input_event_type_key:
- handle_key_event (window, input_event);
- break;
- case mir_input_event_type_touch:
- handle_touch_event (window, mir_input_event_get_touch_event (input_event));
- break;
- case mir_input_event_type_pointer:
- handle_motion_event (window, input_event);
- break;
- default:
- break;
- }
-
- break;
- case mir_event_type_key:
- handle_key_event (window, mir_event_get_input_event (event));
- break;
- case mir_event_type_motion:
- handle_motion_event (window, mir_event_get_input_event (event));
- break;
- case mir_event_type_window:
- handle_window_event (window, mir_event_get_window_event (event));
- break;
- case mir_event_type_resize:
- handle_resize_event (window, mir_event_get_resize_event (event));
- break;
- case mir_event_type_prompt_session_state_change:
- break;
- case mir_event_type_orientation:
- break;
- case mir_event_type_close_window:
- handle_close_event (window);
- break;
- case mir_event_type_keymap:
- break;
- case mir_event_type_window_output:
- handle_window_output_event (window, mir_event_get_window_output_event (event));
- break;
- case mir_event_type_input_device_state:
- break;
- case mir_event_type_window_placement:
- handle_window_placement_event (window, mir_event_get_window_placement_event (event));
- break;
- default:
- g_warning ("Ignoring unknown Mir event %d", mir_event_get_type (event));
- break;
- }
-}
-
-static GdkMirQueuedEvent *
-gdk_mir_event_source_take_queued_event (GdkMirEventSource *source)
-{
- GdkMirQueuedEvent *queued_event;
-
- g_mutex_lock (&source->mir_event_lock);
- queued_event = g_queue_pop_head (&source->mir_events);
- g_mutex_unlock (&source->mir_event_lock);
-
- return queued_event;
-}
-
-static void
-gdk_mir_queued_event_free (GdkMirQueuedEvent *event)
-{
- _gdk_mir_window_reference_unref (event->window_ref);
- mir_event_unref (event->event);
- g_slice_free (GdkMirQueuedEvent, event);
-}
-
-static void
-gdk_mir_event_source_convert_events (GdkMirEventSource *source)
-{
- GdkMirQueuedEvent *event;
-
- while ((event = gdk_mir_event_source_take_queued_event (source)))
- {
- GdkWindow *window = event->window_ref->window;
-
- /* The window may have been destroyed in the main thread while the
- * event was being dispatched...
- */
- if (window != NULL)
- {
- if (source->log_events)
- _gdk_mir_print_event (event->event);
-
- gdk_mir_event_source_queue_event (source->display, window, event->event);
- }
- else
- g_warning ("window was destroyed before event arrived...");
-
- gdk_mir_queued_event_free (event);
- }
-}
-
-static gboolean
-gdk_mir_event_source_prepare (GSource *g_source,
- gint *timeout)
-{
- GdkMirEventSource *source = (GdkMirEventSource *) g_source;
- gboolean mir_events_in_queue;
-
- if (_gdk_event_queue_find_first (source->display))
- return TRUE;
-
- g_mutex_lock (&source->mir_event_lock);
- mir_events_in_queue = g_queue_get_length (&source->mir_events) > 0;
- g_mutex_unlock (&source->mir_event_lock);
-
- return mir_events_in_queue;
-}
-
-static gboolean
-gdk_mir_event_source_check (GSource *g_source)
-{
- return gdk_mir_event_source_prepare (g_source, NULL);
-}
-
-static gboolean
-gdk_mir_event_source_dispatch (GSource *g_source,
- GSourceFunc callback,
- gpointer user_data)
-{
- GdkMirEventSource *source = (GdkMirEventSource *) g_source;
- GdkEvent *event;
-
- /* First, run the queue of events from the thread */
- gdk_mir_event_source_convert_events (source);
-
- /* Next, dispatch one single event from the display's queue.
- *
- * If there is more than one event then we will soon find ourselves
- * back here again.
- */
-
- gdk_threads_enter ();
-
- event = gdk_display_get_event (source->display);
-
- if (event)
- {
- _gdk_event_emit (event);
-
- gdk_event_free (event);
- }
-
- gdk_threads_leave ();
-
- return TRUE;
-}
-
-static void
-gdk_mir_event_source_finalize (GSource *g_source)
-{
- GdkMirEventSource *source = (GdkMirEventSource *) g_source;
- GdkMirQueuedEvent *event;
-
- while ((event = gdk_mir_event_source_take_queued_event (source)))
- gdk_mir_queued_event_free (event);
-
- g_mutex_clear (&source->mir_event_lock);
-}
-
-static GSourceFuncs gdk_mir_event_source_funcs = {
- gdk_mir_event_source_prepare,
- gdk_mir_event_source_check,
- gdk_mir_event_source_dispatch,
- gdk_mir_event_source_finalize
-};
-
-GdkMirEventSource *
-_gdk_mir_event_source_new (GdkDisplay *display)
-{
- GdkMirEventSource *source;
- GSource *g_source;
- char *name;
-
- g_source = g_source_new (&gdk_mir_event_source_funcs, sizeof (GdkMirEventSource));
- name = g_strdup_printf ("GDK Mir Event source (%s)", gdk_display_get_name (display));
- g_source_set_name (g_source, name);
- g_free (name);
- g_source_set_priority (g_source, GDK_PRIORITY_EVENTS);
- g_source_set_can_recurse (g_source, TRUE);
- g_source_attach (g_source, NULL);
-
- source = (GdkMirEventSource *) g_source;
- g_mutex_init (&source->mir_event_lock);
- source->display = display;
- source->log_events = (g_getenv ("GDK_MIR_LOG_EVENTS") != NULL);
-
- return source;
-}
-
-GdkMirWindowReference *
-_gdk_mir_event_source_get_window_reference (GdkWindow *window)
-{
- static GQuark win_ref_quark;
- GdkMirWindowReference *ref;
-
- if G_UNLIKELY (!win_ref_quark)
- win_ref_quark = g_quark_from_string ("GdkMirEventSource window reference");
-
- ref = g_object_get_qdata (G_OBJECT (window), win_ref_quark);
-
- if (!ref)
- {
- GdkMirEventSource *source;
-
- source = _gdk_mir_display_get_event_source (gdk_window_get_display (window));
- g_source_ref ((GSource *) source);
-
- ref = g_slice_new (GdkMirWindowReference);
- ref->window = window;
- ref->source = source;
- ref->ref_count = 0;
- g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &ref->window);
-
- g_object_set_qdata_full (G_OBJECT (window), win_ref_quark,
- ref, (GDestroyNotify) _gdk_mir_window_reference_unref);
- }
-
- g_atomic_int_inc (&ref->ref_count);
-
- return ref;
-}
-
-void
-_gdk_mir_window_reference_unref (GdkMirWindowReference *ref)
-{
- if (g_atomic_int_dec_and_test (&ref->ref_count))
- {
- if (ref->window)
- g_object_remove_weak_pointer (G_OBJECT (ref->window), (gpointer *) &ref->window);
-
- g_source_unref ((GSource *) ref->source);
-
- g_slice_free (GdkMirWindowReference, ref);
- }
-}
-
-void
-_gdk_mir_event_source_queue (GdkMirWindowReference *window_ref,
- const MirEvent *event)
-{
- GdkMirEventSource *source = window_ref->source;
- GdkMirQueuedEvent *queued_event;
-
- /* We are in the wrong thread right now. We absolutely cannot touch
- * the window.
- *
- * We can do pretty much anything we want with the source, though...
- */
-
- queued_event = g_slice_new (GdkMirQueuedEvent);
- g_atomic_int_inc (&window_ref->ref_count);
- queued_event->window_ref = window_ref;
- queued_event->event = mir_event_ref (event);
-
- g_mutex_lock (&source->mir_event_lock);
- g_queue_push_tail (&source->mir_events, queued_event);
- g_mutex_unlock (&source->mir_event_lock);
-
- g_main_context_wakeup (NULL);
-}
diff --git a/gdk/mir/gdkmirglcontext.c b/gdk/mir/gdkmirglcontext.c
deleted file mode 100644
index 9506461f1c..0000000000
--- a/gdk/mir/gdkmirglcontext.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- *
- * gdkmirglcontext.c: Mir specific OpenGL wrappers
- *
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see
-
-#include "gdkkeysprivate.h"
-
-typedef struct GdkMirKeymap GdkMirKeymap;
-typedef struct GdkMirKeymapClass GdkMirKeymapClass;
-
-#define GDK_TYPE_MIR_KEYMAP (gdk_mir_keymap_get_type ())
-#define GDK_MIR_KEYMAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_KEYMAP, GdkMirKeymap))
-#define GDK_MIR_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_KEYMAP, GdkMirKeymapClass))
-#define GDK_IS_MIR_KEYMAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_KEYMAP))
-#define GDK_IS_MIR_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_KEYMAP))
-#define GDK_MIR_KEYMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_KEYMAP, GdkMirKeymapClass))
-
-#define IsModifierKey(keysym) \
- (((keysym) >= XKB_KEY_Shift_L && (keysym) <= XKB_KEY_Hyper_R) || \
- ((keysym) >= XKB_KEY_ISO_Lock && (keysym) <= XKB_KEY_ISO_Last_Group_Lock) || \
- ((keysym) == XKB_KEY_Mode_switch) || \
- ((keysym) == XKB_KEY_Num_Lock))
-
-struct GdkMirKeymap
-{
- GdkKeymap parent_instance;
-
- struct xkb_keymap *xkb_keymap;
- struct xkb_state *xkb_state;
-
- PangoDirection *direction;
- gboolean bidi;
-};
-
-struct GdkMirKeymapClass
-{
- GdkKeymapClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirKeymap, gdk_mir_keymap, GDK_TYPE_KEYMAP)
-
-GdkKeymap *
-_gdk_mir_keymap_new (void)
-{
- return g_object_new (GDK_TYPE_MIR_KEYMAP, NULL);
-}
-
-static PangoDirection
-gdk_mir_keymap_get_direction (GdkKeymap *keymap)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- gint i;
-
- for (i = 0; i < xkb_keymap_num_layouts (mir_keymap->xkb_keymap); i++)
- {
- if (xkb_state_layout_index_is_active (mir_keymap->xkb_state, i, XKB_STATE_LAYOUT_EFFECTIVE))
- return mir_keymap->direction[i];
- }
-
- return PANGO_DIRECTION_NEUTRAL;
-}
-
-static gboolean
-gdk_mir_keymap_have_bidi_layouts (GdkKeymap *keymap)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_keymap_get_caps_lock_state (GdkKeymap *keymap)
-{
- return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_CAPS);
-}
-
-static gboolean
-gdk_mir_keymap_get_num_lock_state (GdkKeymap *keymap)
-{
- return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_NUM);
-}
-
-static gboolean
-gdk_mir_keymap_get_scroll_lock_state (GdkKeymap *keymap)
-{
- return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_SCROLL);
-}
-
-static gboolean
-gdk_mir_keymap_get_entries_for_keyval (GdkKeymap *keymap,
- guint keyval,
- GdkKeymapKey **keys,
- gint *n_keys)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- GArray *key_array;
- guint keycode;
-
- key_array = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
-
- for (keycode = 8; keycode < 255; keycode++) /* FIXME: min/max keycode */
- {
- gint num_layouts, layout;
-
- num_layouts = xkb_keymap_num_layouts_for_key (mir_keymap->xkb_keymap, keycode);
- for (layout = 0; layout < num_layouts; layout++)
- {
- gint num_levels, level;
-
- num_levels = xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, keycode, layout);
- for (level = 0; level < num_levels; level++)
- {
- const xkb_keysym_t *syms;
- gint num_syms, sym;
-
- num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap, keycode, layout, level, &syms);
- for (sym = 0; sym < num_syms; sym++)
- {
- if (syms[sym] == keyval)
- {
- GdkKeymapKey key;
-
- key.keycode = keycode;
- key.group = layout;
- key.level = level;
-
- g_array_append_val (key_array, key);
- }
- }
- }
- }
- }
-
- *n_keys = key_array->len;
- *keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
-
- return TRUE;
-}
-
-static gboolean
-gdk_mir_keymap_get_entries_for_keycode (GdkKeymap *keymap,
- guint hardware_keycode,
- GdkKeymapKey **keys,
- guint **keyvals,
- gint *n_entries)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- gint num_layouts, layout;
- gint num_entries;
- gint i;
-
- num_layouts = xkb_keymap_num_layouts_for_key (mir_keymap->xkb_keymap, hardware_keycode);
-
- num_entries = 0;
- for (layout = 0; layout < num_layouts; layout++)
- num_entries += xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, hardware_keycode, layout);
-
- if (n_entries)
- *n_entries = num_entries;
- if (keys)
- *keys = g_new0 (GdkKeymapKey, num_entries);
- if (keyvals)
- *keyvals = g_new0 (guint, num_entries);
-
- i = 0;
- for (layout = 0; layout < num_layouts; layout++)
- {
- gint num_levels, level;
- num_levels = xkb_keymap_num_levels_for_key (mir_keymap->xkb_keymap, hardware_keycode, layout);
- for (level = 0; level < num_levels; level++)
- {
- const xkb_keysym_t *syms;
- int num_syms;
-
- num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap, hardware_keycode, layout, 0, &syms);
- if (keys)
- {
- (*keys)[i].keycode = hardware_keycode;
- (*keys)[i].group = layout;
- (*keys)[i].level = level;
- }
- if (keyvals && num_syms > 0)
- (*keyvals)[i] = syms[0];
-
- i++;
- }
- }
-
- return num_entries > 0;
-}
-
-static guint
-gdk_mir_keymap_lookup_key (GdkKeymap *keymap,
- const GdkKeymapKey *key)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- const xkb_keysym_t *syms;
- int num_syms;
-
- num_syms = xkb_keymap_key_get_syms_by_level (mir_keymap->xkb_keymap,
- key->keycode,
- key->group,
- key->level,
- &syms);
- if (num_syms > 0)
- return syms[0];
- else
- return XKB_KEY_NoSymbol;
-}
-
-static guint32
-get_xkb_modifiers (struct xkb_keymap *xkb_keymap,
- GdkModifierType state)
-{
- guint32 mods = 0;
-
- if (state & GDK_SHIFT_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT);
- if (state & GDK_LOCK_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS);
- if (state & GDK_CONTROL_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL);
- if (state & GDK_MOD1_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT);
- if (state & GDK_MOD2_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2");
- if (state & GDK_MOD3_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3");
- if (state & GDK_MOD4_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO);
- if (state & GDK_MOD5_MASK)
- mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5");
-
- return mods;
-}
-
-static GdkModifierType
-get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
- guint32 mods)
-{
- GdkModifierType state = 0;
-
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT)))
- state |= GDK_SHIFT_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS)))
- state |= GDK_LOCK_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)))
- state |= GDK_CONTROL_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)))
- state |= GDK_MOD1_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2")))
- state |= GDK_MOD2_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
- state |= GDK_MOD3_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)))
- state |= GDK_MOD4_MASK;
- if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5")))
- state |= GDK_MOD5_MASK;
-
- return state;
-}
-
-static gboolean
-gdk_mir_keymap_translate_keyboard_state (GdkKeymap *keymap,
- guint hardware_keycode,
- GdkModifierType state,
- gint group,
- guint *keyval,
- gint *effective_group,
- gint *effective_level,
- GdkModifierType *consumed_modifiers)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- struct xkb_state *xkb_state;
- guint32 modifiers;
- guint32 consumed;
- xkb_layout_index_t layout;
- xkb_level_index_t level;
- xkb_keysym_t sym;
-
- modifiers = get_xkb_modifiers (mir_keymap->xkb_keymap, state);
-
- xkb_state = xkb_state_new (mir_keymap->xkb_keymap);
-
- xkb_state_update_mask (xkb_state, modifiers, 0, 0, group, 0, 0);
-
- layout = xkb_state_key_get_layout (xkb_state, hardware_keycode);
- level = xkb_state_key_get_level (xkb_state, hardware_keycode, layout);
- sym = xkb_state_key_get_one_sym (xkb_state, hardware_keycode);
- consumed = modifiers & ~xkb_state_mod_mask_remove_consumed (xkb_state, hardware_keycode, modifiers);
-
- xkb_state_unref (xkb_state);
-
- if (keyval)
- *keyval = sym;
- if (effective_group)
- *effective_group = layout;
- if (effective_level)
- *effective_level = level;
- if (consumed_modifiers)
- *consumed_modifiers = get_gdk_modifiers (mir_keymap->xkb_keymap, consumed);
-
- return TRUE;
-}
-
-static void
-gdk_mir_keymap_add_virtual_modifiers (GdkKeymap *keymap,
- GdkModifierType *state)
-{
- // FIXME: What is this?
-}
-
-static gboolean
-gdk_mir_keymap_map_virtual_modifiers (GdkKeymap *keymap,
- GdkModifierType *state)
-{
- // FIXME: What is this?
- return TRUE;
-}
-
-static guint
-gdk_mir_keymap_get_modifier_state (GdkKeymap *keymap)
-{
- GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
- xkb_mod_mask_t mods;
-
- mods = xkb_state_serialize_mods (mir_keymap->xkb_state, XKB_STATE_MODS_EFFECTIVE);
-
- return get_gdk_modifiers (mir_keymap->xkb_keymap, mods);
-}
-
-gboolean
-_gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap,
- guint keycode)
-{
- // FIXME: use xkb_state
- return IsModifierKey (keycode);
-}
-
-static void
-update_direction (GdkMirKeymap *keymap)
-{
- gint num_layouts;
- gint *rtl;
- guint key;
- gboolean have_rtl, have_ltr;
- gint i;
-
- num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap);
-
- g_free (keymap->direction);
- keymap->direction = g_new0 (PangoDirection, num_layouts);
-
- rtl = g_new0 (gint, num_layouts);
-
- for (key = 8; key < 255; key++) /* FIXME: min/max keycode */
- {
- gint layouts;
- gint layout;
-
- layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key);
- for (layout = 0; layout < layouts; layout++)
- {
- const xkb_keysym_t *syms;
- gint num_syms;
- gint sym;
-
- num_syms = xkb_keymap_key_get_syms_by_level (keymap->xkb_keymap, key, layout, 0, &syms);
- for (sym = 0; sym < num_syms; sym++)
- {
- PangoDirection dir;
- dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
- switch (dir)
- {
- case PANGO_DIRECTION_RTL:
- rtl[layout]++;
- break;
- case PANGO_DIRECTION_LTR:
- rtl[layout]--;
- break;
- default:
- break;
- }
- }
- }
- }
-
- have_rtl = have_ltr = FALSE;
- for (i = 0; i < num_layouts; i++)
- {
- if (rtl[i] > 0)
- {
- keymap->direction[i] = PANGO_DIRECTION_RTL;
- have_rtl = TRUE;
- }
- else
- {
- keymap->direction[i] = PANGO_DIRECTION_LTR;
- have_ltr = TRUE;
- }
- }
-
- if (have_rtl && have_ltr)
- keymap->bidi = TRUE;
-
- g_free (rtl);
-}
-
-static void
-gdk_mir_keymap_init (GdkMirKeymap *keymap)
-{
- struct xkb_context *context;
- struct xkb_rule_names names;
-
- context = xkb_context_new (0);
-
- names.rules = "evdev";
- names.model = "pc105";
- names.layout = "us";
- names.variant = "";
- names.options = "";
- keymap->xkb_keymap = xkb_keymap_new_from_names (context, &names, 0);
- keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
-
- xkb_context_unref (context);
-
- update_direction (keymap);
-}
-
-static void
-gdk_mir_keymap_finalize (GObject *object)
-{
- GdkMirKeymap *keymap = GDK_MIR_KEYMAP (object);
-
- xkb_keymap_unref (keymap->xkb_keymap);
- xkb_state_unref (keymap->xkb_state);
- g_free (keymap->direction);
-
- G_OBJECT_CLASS (gdk_mir_keymap_parent_class)->finalize (object);
-}
-
-static void
-gdk_mir_keymap_class_init (GdkMirKeymapClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GdkKeymapClass *keymap_class = GDK_KEYMAP_CLASS (klass);
-
- object_class->finalize = gdk_mir_keymap_finalize;
-
- keymap_class->get_direction = gdk_mir_keymap_get_direction;
- keymap_class->have_bidi_layouts = gdk_mir_keymap_have_bidi_layouts;
- keymap_class->get_caps_lock_state = gdk_mir_keymap_get_caps_lock_state;
- keymap_class->get_num_lock_state = gdk_mir_keymap_get_num_lock_state;
- keymap_class->get_scroll_lock_state = gdk_mir_keymap_get_scroll_lock_state;
- keymap_class->get_entries_for_keyval = gdk_mir_keymap_get_entries_for_keyval;
- keymap_class->get_entries_for_keycode = gdk_mir_keymap_get_entries_for_keycode;
- keymap_class->lookup_key = gdk_mir_keymap_lookup_key;
- keymap_class->translate_keyboard_state = gdk_mir_keymap_translate_keyboard_state;
- keymap_class->add_virtual_modifiers = gdk_mir_keymap_add_virtual_modifiers;
- keymap_class->map_virtual_modifiers = gdk_mir_keymap_map_virtual_modifiers;
- keymap_class->get_modifier_state = gdk_mir_keymap_get_modifier_state;
-}
diff --git a/gdk/mir/gdkmirpointer.c b/gdk/mir/gdkmirpointer.c
deleted file mode 100644
index b5504245a8..0000000000
--- a/gdk/mir/gdkmirpointer.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-
-#include "gdkscreenprivate.h"
-#include "gdkdisplayprivate.h"
-#include "gdkvisualprivate.h"
-#include "gdkinternals.h"
-
-#include "gdkmir.h"
-#include "gdkmir-private.h"
-
-#define VISUAL_TYPE GDK_VISUAL_TRUE_COLOR
-#define VISUAL_DEPTH 32
-
-typedef struct GdkMirScreen GdkMirScreen;
-typedef struct GdkMirScreenClass GdkMirScreenClass;
-
-#define GDK_TYPE_MIR_SCREEN (gdk_mir_screen_get_type ())
-#define GDK_MIR_SCREEN(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_SCREEN, GdkMirScreen))
-#define GDK_MIR_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_SCREEN, GdkMirScreenClass))
-#define GDK_IS_MIR_SCREEN(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_SCREEN))
-#define GDK_IS_MIR_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_SCREEN))
-#define GDK_MIR_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_SCREEN, GdkMirScreenClass))
-
-struct GdkMirScreen
-{
- GdkScreen parent_instance;
-
- /* Display this screen is running on */
- GdkDisplay *display;
-
- /* Current monitor configuration */
- MirDisplayConfig *display_config;
-
- /* Display format */
- GdkVisual *visual;
-
- /* Root window */
- GdkWindow *root_window;
-
- /* Settings */
- GHashTable *settings_objects;
- GHashTable *current_settings;
-};
-
-struct GdkMirScreenClass
-{
- GdkScreenClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirScreen, gdk_mir_screen, GDK_TYPE_SCREEN)
-
-static MirConnection *
-get_connection (GdkMirScreen *screen)
-{
- return gdk_mir_display_get_mir_connection (GDK_DISPLAY (screen->display));
-}
-
-static void
-get_screen_size (MirDisplayConfig *config,
- gint *width,
- gint *height)
-{
- const MirOutput *output;
- const MirOutputMode *mode;
- gint right;
- gint bottom;
- gint i;
-
- *width = 0;
- *height = 0;
-
- if (!config)
- return;
-
- for (i = 0; i < mir_display_config_get_num_outputs (config); i++)
- {
- output = mir_display_config_get_output (config, i);
-
- if (!mir_output_is_enabled (output))
- continue;
-
- mode = mir_output_get_current_mode (output);
-
- right = mir_output_get_position_x (output) + mir_output_mode_get_width (mode);
- bottom = mir_output_get_position_y (output) + mir_output_mode_get_height (mode);
-
- if (right > *width)
- *width = right;
-
- if (bottom > *height)
- *height = bottom;
- }
-}
-
-static void
-get_screen_size_mm (MirDisplayConfig *config,
- gint *width,
- gint *height)
-{
- const MirOutput *output;
- gint i;
-
- *width = 0;
- *height = 0;
-
- if (!config)
- return;
-
- for (i = 0; i < mir_display_config_get_num_outputs (config); i++)
- {
- output = mir_display_config_get_output (config, i);
-
- if (!mir_output_is_enabled (output))
- continue;
-
- *width += mir_output_get_physical_width_mm (output);
- *height += mir_output_get_physical_height_mm (output);
- }
-}
-
-static void
-update_display_config (GdkMirScreen *screen)
-{
- gdk_mir_display_get_mir_connection (GDK_DISPLAY (screen->display));
- mir_display_config_release (screen->display_config);
- screen->display_config = mir_connection_create_display_configuration (get_connection (screen));
-}
-
-static void
-config_changed_cb (MirConnection *connection, void *data)
-{
- GdkMirScreen *screen = data;
- gint old_width, old_height, new_width, new_height;
-
- get_screen_size (screen->display_config, &old_width, &old_height);
- update_display_config (screen);
- get_screen_size (screen->display_config, &new_width, &new_height);
-
- g_signal_emit_by_name (screen, "monitors-changed");
- if (old_width > 0 && (old_width != new_width || old_height != new_height))
- g_signal_emit_by_name (screen, "size-changed");
-}
-
-GdkScreen *
-_gdk_mir_screen_new (GdkDisplay *display)
-{
- GdkMirScreen *screen;
-
- screen = g_object_new (GDK_TYPE_MIR_SCREEN, NULL);
- screen->display = display;
- mir_connection_set_display_config_change_callback (get_connection (screen), config_changed_cb, screen);
- update_display_config (screen);
-
- return GDK_SCREEN (screen);
-}
-
-static void
-gdk_mir_screen_dispose (GObject *object)
-{
- GdkMirScreen *screen = GDK_MIR_SCREEN (object);
-
- g_clear_pointer (&screen->current_settings, g_hash_table_unref);
- g_clear_pointer (&screen->settings_objects, g_hash_table_unref);
-
- G_OBJECT_CLASS (gdk_mir_screen_parent_class)->dispose (object);
-}
-
-static void
-gdk_mir_screen_finalize (GObject *object)
-{
- GdkMirScreen *screen = GDK_MIR_SCREEN (object);
-
- mir_connection_set_display_config_change_callback (get_connection (screen), NULL, NULL);
- mir_display_config_release (screen->display_config);
- g_clear_object (&screen->visual);
- g_clear_object (&screen->root_window);
-
- G_OBJECT_CLASS (gdk_mir_screen_parent_class)->finalize (object);
-}
-
-static GdkDisplay *
-gdk_mir_screen_get_display (GdkScreen *screen)
-{
- return GDK_DISPLAY (GDK_MIR_SCREEN (screen)->display);
-}
-
-static const MirOutput *
-get_output (GdkScreen *screen,
- gint monitor_num)
-{
- MirDisplayConfig *config;
- const MirOutput *output;
- gint i;
- gint j;
-
- config = GDK_MIR_SCREEN (screen)->display_config;
-
- for (i = 0, j = 0; i < mir_display_config_get_num_outputs (config); i++)
- {
- output = mir_display_config_get_output (config, i);
-
- if (!mir_output_is_enabled (output))
- continue;
-
- if (j == monitor_num)
- return output;
-
- j++;
- }
-
- return NULL;
-}
-
-static gint
-gdk_mir_screen_get_width (GdkScreen *screen)
-{
- gint width, height;
- get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
- return width;
-}
-
-static gint
-gdk_mir_screen_get_height (GdkScreen *screen)
-{
- gint width, height;
- get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
- return height;
-}
-
-static gint
-gdk_mir_screen_get_width_mm (GdkScreen *screen)
-{
- gint width, height;
- get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
- return width;
-}
-
-static gint
-gdk_mir_screen_get_height_mm (GdkScreen *screen)
-{
- gint width, height;
- get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
- return height;
-}
-
-static gint
-gdk_mir_screen_get_number (GdkScreen *screen)
-{
- /* There is only one screen... */
- return 0;
-}
-
-static GdkWindow *
-gdk_mir_screen_get_root_window (GdkScreen *screen)
-{
- GdkMirScreen *s = GDK_MIR_SCREEN (screen);
- gint width, height;
-
- if (s->root_window)
- return s->root_window;
-
- get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
-
- s->root_window = _gdk_display_create_window (s->display);
- s->root_window->impl_window = s->root_window;
- s->root_window->visual = s->visual;
- s->root_window->window_type = GDK_WINDOW_ROOT;
- s->root_window->depth = VISUAL_DEPTH;
- s->root_window->x = 0;
- s->root_window->y = 0;
- s->root_window->abs_x = 0;
- s->root_window->abs_y = 0;
- s->root_window->width = width;
- s->root_window->height = height;
- s->root_window->viewable = TRUE;
- s->root_window->impl = _gdk_mir_window_impl_new (s->display, s->root_window, NULL, 0);
-
- return s->root_window;
-}
-
-static gint
-gdk_mir_screen_get_n_monitors (GdkScreen *screen)
-{
- MirDisplayConfig *config;
- gint count = 0;
- gint i;
-
- config = GDK_MIR_SCREEN (screen)->display_config;
-
- for (i = 0; i < mir_display_config_get_num_outputs (config); i++)
- if (mir_output_is_enabled (mir_display_config_get_output (config, i)))
- count++;
-
- return count;
-}
-
-static gint
-gdk_mir_screen_get_primary_monitor (GdkScreen *screen)
-{
- return 0; //?
-}
-
-static gint
-gdk_mir_screen_get_monitor_width_mm (GdkScreen *screen,
- gint monitor_num)
-{
- const MirOutput *output = get_output (screen, monitor_num);
-
- return output ? mir_output_get_physical_width_mm (output) : 0;
-}
-
-static gint
-gdk_mir_screen_get_monitor_height_mm (GdkScreen *screen,
- gint monitor_num)
-{
- const MirOutput *output = get_output (screen, monitor_num);
-
- return output ? mir_output_get_physical_height_mm (output) : 0;
-}
-
-static gchar *
-gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
- gint monitor_num)
-{
- const MirOutput *output = get_output (screen, monitor_num);
-
- if (output)
- {
- switch (mir_output_get_type (output))
- {
- case mir_output_type_unknown:
- return g_strdup_printf ("None-%u", mir_output_get_id (output));
- case mir_output_type_vga:
- return g_strdup_printf ("VGA-%u", mir_output_get_id (output));
- case mir_output_type_dvii:
- case mir_output_type_dvid:
- case mir_output_type_dvia:
- return g_strdup_printf ("DVI-%u", mir_output_get_id (output));
- case mir_output_type_composite:
- return g_strdup_printf ("Composite-%u", mir_output_get_id (output));
- case mir_output_type_lvds:
- return g_strdup_printf ("LVDS-%u", mir_output_get_id (output));
- case mir_output_type_component:
- return g_strdup_printf ("CTV-%u", mir_output_get_id (output));
- case mir_output_type_ninepindin:
- return g_strdup_printf ("DIN-%u", mir_output_get_id (output));
- case mir_output_type_displayport:
- return g_strdup_printf ("DP-%u", mir_output_get_id (output));
- case mir_output_type_hdmia:
- case mir_output_type_hdmib:
- return g_strdup_printf ("HDMI-%u", mir_output_get_id (output));
- case mir_output_type_svideo:
- case mir_output_type_tv:
- return g_strdup_printf ("TV-%u", mir_output_get_id (output));
- case mir_output_type_edp:
- return g_strdup_printf ("eDP-%u", mir_output_get_id (output));
- case mir_output_type_virtual:
- return g_strdup_printf ("Virtual-%u", mir_output_get_id (output));
- case mir_output_type_dsi:
- return g_strdup_printf ("DSI-%u", mir_output_get_id (output));
- case mir_output_type_dpi:
- return g_strdup_printf ("DPI-%u", mir_output_get_id (output));
- }
- }
-
- return NULL;
-}
-
-static void
-gdk_mir_screen_get_monitor_geometry (GdkScreen *screen,
- gint monitor_num,
- GdkRectangle *dest)
-{
- const MirOutput *output;
- const MirOutputMode *mode;
-
- output = get_output (screen, monitor_num);
-
- if (output)
- {
- mode = mir_output_get_current_mode (output);
-
- dest->x = mir_output_get_position_x (output);
- dest->y = mir_output_get_position_y (output);
- dest->width = mir_output_mode_get_width (mode);
- dest->height = mir_output_mode_get_height (mode);
- }
- else
- {
- dest->x = 0;
- dest->y = 0;
- dest->width = 0;
- dest->height = 0;
- }
-}
-
-static void
-gdk_mir_screen_get_monitor_workarea (GdkScreen *screen,
- gint monitor_num,
- GdkRectangle *dest)
-{
- // FIXME: Don't know what this is
- gdk_mir_screen_get_monitor_geometry (screen, monitor_num, dest);
-}
-
-static GList *
-gdk_mir_screen_list_visuals (GdkScreen *screen)
-{
- return g_list_append (NULL, GDK_MIR_SCREEN (screen)->visual);
-}
-
-static GdkVisual *
-gdk_mir_screen_get_system_visual (GdkScreen *screen)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual *
-gdk_mir_screen_get_rgba_visual (GdkScreen *screen)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static gboolean
-gdk_mir_screen_is_composited (GdkScreen *screen)
-{
- /* We're always composited */
- return TRUE;
-}
-
-static gchar *
-gdk_mir_screen_make_display_name (GdkScreen *screen)
-{
- return NULL; // FIXME
-}
-
-static GdkWindow *
-gdk_mir_screen_get_active_window (GdkScreen *screen)
-{
- return NULL; // FIXME
-}
-
-static GList *
-gdk_mir_screen_get_window_stack (GdkScreen *screen)
-{
- return NULL; // FIXME
-}
-
-static void
-gdk_mir_screen_broadcast_client_message (GdkScreen *screen,
- GdkEvent *event)
-{
- // FIXME
-}
-
-static void setting_changed (GSettings *settings,
- const gchar *key,
- GdkMirScreen *screen);
-
-static GSettings *
-get_settings (GdkMirScreen *screen,
- const gchar *schema_id)
-{
- GSettings *settings;
- GSettingsSchemaSource *source;
- GSettingsSchema *schema;
-
- settings = g_hash_table_lookup (screen->settings_objects, schema_id);
-
- if (settings)
- return g_object_ref (settings);
-
- source = g_settings_schema_source_get_default ();
-
- if (!source)
- {
- g_warning ("no schemas installed");
- return NULL;
- }
-
- schema = g_settings_schema_source_lookup (source, schema_id, TRUE);
-
- if (!schema)
- {
- g_warning ("schema not found: %s", schema_id);
- return NULL;
- }
-
- settings = g_settings_new_full (schema, NULL, NULL);
- g_signal_connect (settings, "changed", G_CALLBACK (setting_changed), screen);
- g_hash_table_insert (screen->settings_objects, g_strdup (schema_id), g_object_ref (settings));
- g_settings_schema_unref (schema);
- return settings;
-}
-
-static GVariant *
-read_setting (GdkMirScreen *screen,
- const gchar *schema_id,
- const gchar *key)
-{
- GSettings *settings;
- GVariant *variant;
-
- settings = get_settings (screen, schema_id);
-
- if (!settings)
- return NULL;
-
- variant = g_settings_get_value (settings, key);
- g_object_unref (settings);
- return variant;
-}
-
-static void
-change_setting (GdkMirScreen *screen,
- const gchar *name,
- GVariant *variant)
-{
- GVariant *old_variant;
- GdkEventSetting event;
-
- old_variant = g_hash_table_lookup (screen->current_settings, name);
-
- if (variant == old_variant)
- return;
-
- if (variant && old_variant && g_variant_equal (variant, old_variant))
- return;
-
- event.type = GDK_SETTING;
- event.window = gdk_screen_get_root_window (GDK_SCREEN (screen));
- event.send_event = FALSE;
- event.name = g_strdup (name);
-
- if (variant)
- {
- event.action = old_variant ? GDK_SETTING_ACTION_CHANGED : GDK_SETTING_ACTION_NEW;
- g_hash_table_insert (screen->current_settings, g_strdup (name), g_variant_ref_sink (variant));
- }
- else
- {
- event.action = GDK_SETTING_ACTION_DELETED;
- g_hash_table_remove (screen->current_settings, name);
- }
-
- gdk_event_put ((const GdkEvent *) &event);
- g_free (event.name);
-}
-
-static const struct
-{
- const gchar *name;
- const gchar *schema_id;
- const gchar *key;
-} SETTINGS_MAP[] = {
- {
- "gtk-double-click-time",
- "org.gnome.settings-daemon.peripherals.mouse",
- "double-click"
- },
- {
- "gtk-cursor-blink",
- "org.gnome.desktop.interface",
- "cursor-blink"
- },
- {
- "gtk-cursor-blink-time",
- "org.gnome.desktop.interface",
- "cursor-blink-time"
- },
- {
- "gtk-cursor-blink-timeout",
- "org.gnome.desktop.interface",
- "cursor-blink-timeout"
- },
- {
- "gtk-theme-name",
- "org.gnome.desktop.interface",
- "gtk-theme"
- },
- {
- "gtk-icon-theme-name",
- "org.gnome.desktop.interface",
- "icon-theme"
- },
- {
- "gtk-key-theme-name",
- "org.gnome.desktop.interface",
- "gtk-key-theme"
- },
- {
- "gtk-dnd-drag-threshold",
- "org.gnome.settings-daemon.peripherals.mouse",
- "drag-threshold"
- },
- {
- "gtk-font-name",
- "org.gnome.desktop.interface",
- "font-name"
- },
- {
- "gtk-xft-antialias",
- "org.gnome.settings-daemon.plugins.xsettings",
- "antialiasing"
- },
- {
- "gtk-xft-hinting",
- "org.gnome.settings-daemon.plugins.xsettings",
- "hinting"
- },
- {
- "gtk-xft-hintstyle",
- "org.gnome.settings-daemon.plugins.xsettings",
- "hinting"
- },
- {
- "gtk-xft-rgba",
- "org.gnome.settings-daemon.plugins.xsettings",
- "rgba-order"
- },
- {
- "gtk-xft-dpi",
- "org.gnome.desktop.interface",
- "text-scaling-factor"
- },
- {
- "gtk-cursor-theme-name",
- "org.gnome.desktop.interface",
- "cursor-theme"
- },
- {
- "gtk-cursor-theme-size",
- "org.gnome.desktop.interface",
- "cursor-size"
- },
- {
- "gtk-enable-animations",
- "org.gnome.desktop.interface",
- "enable-animations"
- },
- {
- "gtk-im-module",
- "org.gnome.desktop.interface",
- "gtk-im-module"
- },
- {
- "gtk-recent-files-max-age",
- "org.gnome.desktop.privacy",
- "recent-files-max-age"
- },
- {
- "gtk-sound-theme-name",
- "org.gnome.desktop.sound",
- "theme-name"
- },
- {
- "gtk-enable-input-feedback-sounds",
- "org.gnome.desktop.sound",
- "input-feedback-sounds"
- },
- {
- "gtk-enable-event-sounds",
- "org.gnome.desktop.sound",
- "event-sounds"
- },
- {
- "gtk-shell-shows-desktop",
- "org.gnome.desktop.background",
- "show-desktop-icons"
- },
- {
- "gtk-decoration-layout",
- "org.gnome.desktop.wm.preferences",
- "button-layout"
- },
- {
- "gtk-titlebar-double-click",
- "org.gnome.desktop.wm.preferences",
- "action-double-click-titlebar"
- },
- {
- "gtk-titlebar-middle-click",
- "org.gnome.desktop.wm.preferences",
- "action-middle-click-titlebar"
- },
- {
- "gtk-titlebar-right-click",
- "org.gnome.desktop.wm.preferences",
- "action-right-click-titlebar"
- },
- {
- "gtk-enable-primary-paste",
- "org.gnome.desktop.interface",
- "gtk-enable-primary-paste"
- },
- {
- "gtk-recent-files-enabled",
- "org.gnome.desktop.privacy",
- "remember-recent-files"
- },
- {
- "gtk-keynav-use-caret",
- "org.gnome.desktop.a11y",
- "always-show-text-caret"
- },
- { NULL }
-};
-
-static guint
-get_scaling_factor (GdkMirScreen *screen)
-{
- GVariant *variant;
- guint scaling_factor;
-
- variant = read_setting (screen, "org.gnome.desktop.interface", "scaling-factor");
-
- if (!variant)
- {
- g_warning ("no scaling factor: org.gnome.desktop.interface.scaling-factor");
- variant = g_variant_ref_sink (g_variant_new_uint32 (0));
- }
-
- scaling_factor = g_variant_get_uint32 (variant);
- g_variant_unref (variant);
-
- if (scaling_factor)
- return scaling_factor;
-
- scaling_factor = 1;
-
- /* TODO: scaling_factor = 2 if HiDPI >= 2 * 96 */
-
- return scaling_factor;
-}
-
-static void
-update_setting (GdkMirScreen *screen,
- const gchar *name)
-{
- GVariant *variant;
- GVariant *antialiasing_variant;
- gboolean gtk_xft_antialias;
- gboolean gtk_xft_hinting;
- gdouble text_scaling_factor;
- gint cursor_size;
- gint i;
-
- if (!g_strcmp0 (name, "gtk-modules"))
- {
- /* TODO: X-GTK-Module-Enabled-Schema, X-GTK-Module-Enabled-Key */
- /* TODO: org.gnome.settings-daemon.plugins.xsettings.enabled-gtk-modules */
- /* TODO: org.gnome.settings-daemon.plugins.xsettings.disabled-gtk-modules */
- return;
- }
- else
- {
- for (i = 0; SETTINGS_MAP[i].name; i++)
- if (!g_strcmp0 (name, SETTINGS_MAP[i].name))
- break;
-
- if (!SETTINGS_MAP[i].name)
- return;
-
- variant = read_setting (screen, SETTINGS_MAP[i].schema_id, SETTINGS_MAP[i].key);
-
- if (!variant)
- {
- g_warning ("no setting for %s: %s.%s", SETTINGS_MAP[i].name, SETTINGS_MAP[i].schema_id, SETTINGS_MAP[i].key);
- return;
- }
- }
-
- if (!g_strcmp0 (name, "gtk-xft-antialias"))
- {
- gtk_xft_antialias = g_strcmp0 (g_variant_get_string (variant, NULL), "none");
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_int32 (gtk_xft_antialias ? 1 : 0));
- }
- else if (!g_strcmp0 (name, "gtk-xft-hinting"))
- {
- gtk_xft_hinting = g_strcmp0 (g_variant_get_string (variant, NULL), "none");
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_int32 (gtk_xft_hinting ? 1 : 0));
- }
- else if (!g_strcmp0 (name, "gtk-xft-hintstyle"))
- {
- if (!g_strcmp0 (g_variant_get_string (variant, NULL), "none"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("hintnone"));
- }
- else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "slight"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("hintslight"));
- }
- else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "medium"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("hintmedium"));
- }
- else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "full"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("hintfull"));
- }
- else
- {
- g_warning ("unknown org.gnome.settings-daemon.plugins.xsettings.hinting value: %s", g_variant_get_string (variant, NULL));
- g_variant_unref (variant);
- return;
- }
- }
- else if (!g_strcmp0 (name, "gtk-xft-rgba"))
- {
- antialiasing_variant = read_setting (screen, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing");
-
- if (g_strcmp0 (g_variant_get_string (antialiasing_variant, NULL), "rgba"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("none"));
- }
- else if (g_strcmp0 (g_variant_get_string (variant, NULL), "rgba"))
- {
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_string ("rgb"));
- }
-
- g_variant_unref (antialiasing_variant);
- }
- else if (!g_strcmp0 (name, "gtk-xft-dpi"))
- {
- text_scaling_factor = g_variant_get_double (variant);
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_int32 (1024 * get_scaling_factor (screen) * text_scaling_factor + 0.5));
- }
- else if (!g_strcmp0 (name, "gtk-cursor-theme-size"))
- {
- cursor_size = g_variant_get_int32 (variant);
- g_variant_unref (variant);
- variant = g_variant_ref_sink (g_variant_new_int32 (get_scaling_factor (screen) * cursor_size));
- }
- else if (!g_strcmp0 (name, "gtk-enable-animations"))
- {
- /* TODO: disable under vnc/vino/llvmpipe */
- }
-
- change_setting (screen, name, variant);
- g_variant_unref (variant);
-}
-
-static void
-setting_changed (GSettings *settings,
- const gchar *key,
- GdkMirScreen *screen)
-{
- gchar *schema_id;
- gint i;
-
- g_object_get (settings, "schema-id", &schema_id, NULL);
-
- for (i = 0; SETTINGS_MAP[i].name; i++)
- if (!g_strcmp0 (schema_id, SETTINGS_MAP[i].schema_id) && !g_strcmp0 (key, SETTINGS_MAP[i].key))
- update_setting (screen, SETTINGS_MAP[i].name);
-
- if (!g_strcmp0 (schema_id, "org.gnome.settings-daemon.plugins.xsettings"))
- {
- if (!g_strcmp0 (key, "enabled-gtk-modules"))
- update_setting (screen, "gtk-modules");
- else if (!g_strcmp0 (key, "disabled-gtk-modules"))
- update_setting (screen, "gtk-modules");
- else if (!g_strcmp0 (key, "antialiasing"))
- update_setting (screen, "rgba-order");
- }
- else if (!g_strcmp0 (schema_id, "org.gnome.desktop.interface"))
- {
- if (!g_strcmp0 (key, "scaling-factor"))
- {
- update_setting (screen, "gtk-xft-dpi");
- update_setting (screen, "gtk-cursor-theme-size");
- }
- }
-
- g_free (schema_id);
-}
-
-static const gchar * const KNOWN_SETTINGS[] =
-{
- "gtk-double-click-time",
- "gtk-double-click-distance",
- "gtk-cursor-blink",
- "gtk-cursor-blink-time",
- "gtk-cursor-blink-timeout",
- "gtk-split-cursor",
- "gtk-theme-name",
- "gtk-icon-theme-name",
- "gtk-fallback-icon-theme",
- "gtk-key-theme-name",
- "gtk-menu-bar-accel",
- "gtk-dnd-drag-threshold",
- "gtk-font-name",
- "gtk-icon-sizes",
- "gtk-modules",
- "gtk-xft-antialias",
- "gtk-xft-hinting",
- "gtk-xft-hintstyle",
- "gtk-xft-rgba",
- "gtk-xft-dpi",
- "gtk-cursor-theme-name",
- "gtk-cursor-theme-size",
- "gtk-alternative-button-order",
- "gtk-alternative-sort-arrows",
- "gtk-show-input-method-menu",
- "gtk-show-unicode-menu",
- "gtk-timeout-initial",
- "gtk-timeout-repeat",
- "gtk-timeout-expand",
- "gtk-color-scheme",
- "gtk-enable-animations",
- "gtk-touchscreen-mode",
- "gtk-tooltip-timeout",
- "gtk-tooltip-browse-timeout",
- "gtk-tooltip-browse-mode-timeout",
- "gtk-keynav-cursor-only",
- "gtk-keynav-wrap-around",
- "gtk-error-bell",
- "color-hash",
- "gtk-file-chooser-backend",
- "gtk-print-backends",
- "gtk-print-preview-command",
- "gtk-enable-mnemonics",
- "gtk-enable-accels",
- "gtk-recent-files-limit",
- "gtk-im-module",
- "gtk-recent-files-max-age",
- "gtk-fontconfig-timestamp",
- "gtk-sound-theme-name",
- "gtk-enable-input-feedback-sounds",
- "gtk-enable-event-sounds",
- "gtk-enable-tooltips",
- "gtk-toolbar-style",
- "gtk-toolbar-icon-size",
- "gtk-auto-mnemonics",
- "gtk-primary-button-warps-slider",
- "gtk-visible-focus",
- "gtk-application-prefer-dark-theme",
- "gtk-button-images",
- "gtk-entry-select-on-focus",
- "gtk-entry-password-hint-timeout",
- "gtk-menu-images",
- "gtk-menu-bar-popup-delay",
- "gtk-scrolled-window-placement",
- "gtk-can-change-accels",
- "gtk-menu-popup-delay",
- "gtk-menu-popdown-delay",
- "gtk-label-select-on-focus",
- "gtk-color-palette",
- "gtk-im-preedit-style",
- "gtk-im-status-style",
- "gtk-shell-shows-app-menu",
- "gtk-shell-shows-menubar",
- "gtk-shell-shows-desktop",
- "gtk-decoration-layout",
- "gtk-titlebar-double-click",
- "gtk-titlebar-middle-click",
- "gtk-titlebar-right-click",
- "gtk-dialogs-use-header",
- "gtk-enable-primary-paste",
- "gtk-recent-files-enabled",
- "gtk-long-press-time",
- "gtk-keynav-use-caret",
- NULL
-};
-
-static gboolean
-gdk_mir_screen_get_setting (GdkScreen *screen,
- const gchar *name,
- GValue *value)
-{
- GdkMirScreen *mir_screen;
- GVariant *variant;
-
- mir_screen = GDK_MIR_SCREEN (screen);
- variant = g_hash_table_lookup (mir_screen->current_settings, name);
-
- if (!variant)
- update_setting (mir_screen, name);
-
- variant = g_hash_table_lookup (mir_screen->current_settings, name);
-
- if (!variant)
- {
- if (!g_strv_contains (KNOWN_SETTINGS, name))
- g_warning ("unknown setting: %s", name);
-
- return FALSE;
- }
-
- g_dbus_gvariant_to_gvalue (variant, value);
- return TRUE;
-}
-
-static gint
-gdk_mir_screen_visual_get_best_depth (GdkScreen *screen)
-{
- return VISUAL_DEPTH;
-}
-
-static GdkVisualType
-gdk_mir_screen_visual_get_best_type (GdkScreen *screen)
-{
- return VISUAL_TYPE;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best (GdkScreen *screen)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_depth (GdkScreen *screen,
- gint depth)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_type (GdkScreen *screen,
- GdkVisualType visual_type)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_both (GdkScreen *screen,
- gint depth,
- GdkVisualType visual_type)
-{
- return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static void
-gdk_mir_screen_query_depths (GdkScreen *screen,
- gint **depths,
- gint *count)
-{
- static gint supported_depths[] = { VISUAL_DEPTH };
- *depths = supported_depths;
- *count = 1;
-}
-
-static void
-gdk_mir_screen_query_visual_types (GdkScreen *screen,
- GdkVisualType **visual_types,
- gint *count)
-{
- static GdkVisualType supported_visual_types[] = { VISUAL_TYPE };
- *visual_types = supported_visual_types;
- *count = 1;
-}
-
-static gint
-gdk_mir_screen_get_monitor_scale_factor (GdkScreen *screen,
- gint monitor_num)
-{
- /* Don't support monitor scaling */
- return 1;
-}
-
-static void
-gdk_mir_screen_init (GdkMirScreen *screen)
-{
- screen->visual = g_object_new (GDK_TYPE_VISUAL, NULL);
- screen->visual->screen = GDK_SCREEN (screen);
- screen->visual->type = VISUAL_TYPE;
- screen->visual->depth = VISUAL_DEPTH;
-
- screen->settings_objects = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- screen->current_settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
-}
-
-static void
-gdk_mir_screen_class_init (GdkMirScreenClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
-
- object_class->dispose = gdk_mir_screen_dispose;
- object_class->finalize = gdk_mir_screen_finalize;
-
- screen_class->get_display = gdk_mir_screen_get_display;
- screen_class->get_width = gdk_mir_screen_get_width;
- screen_class->get_height = gdk_mir_screen_get_height;
- screen_class->get_width_mm = gdk_mir_screen_get_width_mm;
- screen_class->get_height_mm = gdk_mir_screen_get_height_mm;
- screen_class->get_number = gdk_mir_screen_get_number;
- screen_class->get_root_window = gdk_mir_screen_get_root_window;
- screen_class->get_n_monitors = gdk_mir_screen_get_n_monitors;
- screen_class->get_primary_monitor = gdk_mir_screen_get_primary_monitor;
- screen_class->get_monitor_width_mm = gdk_mir_screen_get_monitor_width_mm;
- screen_class->get_monitor_height_mm = gdk_mir_screen_get_monitor_height_mm;
- screen_class->get_monitor_plug_name = gdk_mir_screen_get_monitor_plug_name;
- screen_class->get_monitor_geometry = gdk_mir_screen_get_monitor_geometry;
- screen_class->get_monitor_workarea = gdk_mir_screen_get_monitor_workarea;
- screen_class->list_visuals = gdk_mir_screen_list_visuals;
- screen_class->get_system_visual = gdk_mir_screen_get_system_visual;
- screen_class->get_rgba_visual = gdk_mir_screen_get_rgba_visual;
- screen_class->is_composited = gdk_mir_screen_is_composited;
- screen_class->make_display_name = gdk_mir_screen_make_display_name;
- screen_class->get_active_window = gdk_mir_screen_get_active_window;
- screen_class->get_window_stack = gdk_mir_screen_get_window_stack;
- screen_class->broadcast_client_message = gdk_mir_screen_broadcast_client_message;
- screen_class->get_setting = gdk_mir_screen_get_setting;
- screen_class->visual_get_best_depth = gdk_mir_screen_visual_get_best_depth;
- screen_class->visual_get_best_type = gdk_mir_screen_visual_get_best_type;
- screen_class->visual_get_best = gdk_mir_screen_visual_get_best;
- screen_class->visual_get_best_with_depth = gdk_mir_screen_visual_get_best_with_depth;
- screen_class->visual_get_best_with_type = gdk_mir_screen_visual_get_best_with_type;
- screen_class->visual_get_best_with_both = gdk_mir_screen_visual_get_best_with_both;
- screen_class->query_depths = gdk_mir_screen_query_depths;
- screen_class->query_visual_types = gdk_mir_screen_query_visual_types;
- screen_class->get_monitor_scale_factor = gdk_mir_screen_get_monitor_scale_factor;
-}
diff --git a/gdk/mir/gdkmirwindow.c b/gdk/mir/gdkmirwindow.c
deleted file mode 100644
index 03da7e0013..0000000000
--- a/gdk/mir/gdkmirwindow.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
-#include
-
-#include "config.h"
-
-#include "gdk.h"
-#include "gdkmir.h"
-#include "gdkmir-private.h"
-
-#include "gdkwindowimpl.h"
-#include "gdkinternals.h"
-#include "gdkintl.h"
-#include "gdkdisplayprivate.h"
-#include "gdkdeviceprivate.h"
-
-#define GDK_MIR_WINDOW_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW_IMPL_MIR, GdkMirWindowImplClass))
-#define GDK_IS_WINDOW_IMPL_MIR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW_IMPL_MIR))
-#define GDK_MIR_WINDOW_IMPL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW_IMPL_MIR, GdkMirWindowImplClass))
-
-#define MAX_EGL_ATTRS 30
-
-typedef struct
-{
- GdkAtom type;
- GArray *array;
-} GdkMirProperty;
-
-static GdkMirProperty *
-gdk_mir_property_new (GdkAtom type,
- guint format,
- guint capacity)
-{
- GdkMirProperty *property = g_slice_new (GdkMirProperty);
-
- property->type = type;
- property->array = g_array_sized_new (TRUE, FALSE, format, capacity);
-
- return property;
-}
-
-static void
-gdk_mir_property_free (gpointer data)
-{
- GdkMirProperty *property = data;
-
- if (!property)
- return;
-
- g_array_unref (property->array);
- g_slice_free (GdkMirProperty, property);
-}
-
-typedef struct _GdkMirWindowImplClass GdkMirWindowImplClass;
-
-struct _GdkMirWindowImpl
-{
- GdkWindowImpl parent_instance;
-
- GHashTable *properties;
-
- /* Window we are temporary for */
- GdkWindow *transient_for;
- gint transient_x;
- gint transient_y;
-
- /* gdk_window_move_to_rect */
- gboolean has_rect;
- GdkRectangle rect;
- MirRectangle mir_rect;
- MirPlacementGravity rect_anchor;
- MirPlacementGravity window_anchor;
- MirPlacementHints anchor_hints;
- gint rect_anchor_dx;
- gint rect_anchor_dy;
-
- /* Desired window attributes */
- GdkWindowTypeHint type_hint;
- MirWindowState window_state;
- gboolean modal;
-
- /* Pattern for background */
- cairo_pattern_t *background;
-
- /* Current button state for checking which buttons are being pressed / released */
- gdouble x;
- gdouble y;
- guint button_state;
-
- GdkDisplay *display;
-
- /* Window being rendered to (only exists when visible) */
- MirWindow *mir_window;
- MirBufferStream *buffer_stream;
- MirBufferUsage buffer_usage;
-
- /* Cairo context for current frame */
- cairo_surface_t *cairo_surface;
-
- gchar *title;
-
- GdkGeometry geometry_hints;
- GdkWindowHints geometry_mask;
-
- /* Egl surface for the current mir window */
- EGLSurface egl_surface;
-
- /* Dummy MIR and EGL surfaces */
- EGLSurface dummy_egl_surface;
-
- /* TRUE if the window can be seen */
- gboolean visible;
-
- /* TRUE if cursor is inside this window */
- gboolean cursor_inside;
-
- gboolean pending_spec_update;
- gint output_scale;
-};
-
-struct _GdkMirWindowImplClass
-{
- GdkWindowImplClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkMirWindowImpl, gdk_mir_window_impl, GDK_TYPE_WINDOW_IMPL)
-
-static cairo_surface_t *gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window);
-static void ensure_mir_window (GdkWindow *window);
-
-static gboolean
-type_hint_differs (GdkWindowTypeHint lhs, GdkWindowTypeHint rhs)
-{
- if (lhs == rhs)
- return FALSE;
-
- switch (lhs)
- {
- case GDK_WINDOW_TYPE_HINT_DIALOG:
- case GDK_WINDOW_TYPE_HINT_DOCK:
- return rhs != GDK_WINDOW_TYPE_HINT_DIALOG &&
- rhs != GDK_WINDOW_TYPE_HINT_DOCK;
- case GDK_WINDOW_TYPE_HINT_MENU:
- case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
- case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
- case GDK_WINDOW_TYPE_HINT_TOOLBAR:
- case GDK_WINDOW_TYPE_HINT_COMBO:
- case GDK_WINDOW_TYPE_HINT_DND:
- case GDK_WINDOW_TYPE_HINT_TOOLTIP:
- case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
- return rhs != GDK_WINDOW_TYPE_HINT_MENU &&
- rhs != GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU &&
- rhs != GDK_WINDOW_TYPE_HINT_POPUP_MENU &&
- rhs != GDK_WINDOW_TYPE_HINT_TOOLBAR &&
- rhs != GDK_WINDOW_TYPE_HINT_COMBO &&
- rhs != GDK_WINDOW_TYPE_HINT_DND &&
- rhs != GDK_WINDOW_TYPE_HINT_TOOLTIP &&
- rhs != GDK_WINDOW_TYPE_HINT_NOTIFICATION;
- case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
- case GDK_WINDOW_TYPE_HINT_UTILITY:
- return rhs != GDK_WINDOW_TYPE_HINT_SPLASHSCREEN &&
- rhs != GDK_WINDOW_TYPE_HINT_UTILITY;
- case GDK_WINDOW_TYPE_HINT_NORMAL:
- case GDK_WINDOW_TYPE_HINT_DESKTOP:
- default:
- return rhs != GDK_WINDOW_TYPE_HINT_NORMAL &&
- rhs != GDK_WINDOW_TYPE_HINT_DESKTOP;
- }
-}
-
-static void
-drop_cairo_surface (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
-}
-
-static const gchar *
-get_default_title (void)
-{
- const char *title;
-
- title = g_get_application_name ();
- if (!title)
- title = g_get_prgname ();
- if (!title)
- title = "";
-
- return title;
-}
-
-GdkWindowImpl *
-_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask)
-{
- GdkMirWindowImpl *impl = g_object_new (GDK_TYPE_MIR_WINDOW_IMPL, NULL);
-
- impl->display = display;
-
- if (attributes && attributes_mask & GDK_WA_TITLE)
- impl->title = g_strdup (attributes->title);
- else
- impl->title = g_strdup (get_default_title ());
-
- if (attributes && attributes_mask & GDK_WA_TYPE_HINT)
- impl->type_hint = attributes->type_hint;
-
- impl->pending_spec_update = TRUE;
-
- return (GdkWindowImpl *) impl;
-}
-
-void
-_gdk_mir_window_impl_set_window_state (GdkMirWindowImpl *impl,
- MirWindowState state)
-{
- impl->window_state = state;
-}
-
-void
-_gdk_mir_window_impl_set_window_type (GdkMirWindowImpl *impl,
- MirWindowType type)
-{
-}
-
-void
-_gdk_mir_window_impl_set_cursor_state (GdkMirWindowImpl *impl,
- gdouble x,
- gdouble y,
- gboolean cursor_inside,
- guint button_state)
-{
- impl->x = x;
- impl->y = y;
- impl->cursor_inside = cursor_inside;
- impl->button_state = button_state;
-}
-
-void
-_gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl,
- gdouble *x,
- gdouble *y,
- gboolean *cursor_inside,
- guint *button_state)
-{
- if (x)
- *x = impl->x;
- if (y)
- *y = impl->y;
- if (cursor_inside)
- *cursor_inside = impl->cursor_inside;
- if (button_state)
- *button_state = impl->button_state;
-}
-
-static void
-gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
-{
- impl->properties = g_hash_table_new_full (NULL, NULL, NULL, gdk_mir_property_free);
- impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
- impl->window_state = mir_window_state_unknown;
- impl->output_scale = 1;
-}
-
-static void
-set_window_state (GdkMirWindowImpl *impl,
- MirWindowState state)
-{
- MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
- MirWindowSpec *spec;
-
- if (state == impl->window_state)
- return;
-
- impl->window_state = state;
-
- if (impl->mir_window && !impl->pending_spec_update)
- {
- spec = mir_create_window_spec (connection);
- mir_window_spec_set_state (spec, state);
- mir_window_apply_spec (impl->mir_window, spec);
- mir_window_spec_release (spec);
- }
-}
-
-static void
-event_cb (MirWindow *mir_window,
- const MirEvent *event,
- void *context)
-{
- _gdk_mir_event_source_queue (context, event);
-}
-
-static MirWindowSpec *
-create_window_type_spec (GdkDisplay *display,
- GdkWindow *parent,
- gint x,
- gint y,
- gint width,
- gint height,
- gboolean modal,
- GdkWindowTypeHint type,
- MirBufferUsage buffer_usage)
-{
- MirConnection *connection = gdk_mir_display_get_mir_connection (display);
- MirWindow *parent_mir_window = NULL;
- MirPixelFormat format;
- MirRectangle rect;
- MirWindowSpec *spec;
-
- if (parent && parent->impl)
- {
- ensure_mir_window (parent);
- parent_mir_window = GDK_MIR_WINDOW_IMPL (parent->impl)->mir_window;
- }
-
- if (!parent_mir_window)
- {
- switch (type)
- {
- case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
- case GDK_WINDOW_TYPE_HINT_UTILITY:
- type = GDK_WINDOW_TYPE_HINT_DIALOG;
- break;
- default:
- break;
- }
- }
-
- format = _gdk_mir_display_get_pixel_format (display, buffer_usage);
-
- rect.left = x;
- rect.top = y;
- rect.width = 1;
- rect.height = 1;
-
- switch (type)
- {
- case GDK_WINDOW_TYPE_HINT_DIALOG:
- if (modal)
- spec = mir_create_modal_dialog_window_spec (connection,
- width,
- height,
- parent_mir_window);
- else
- spec = mir_create_dialog_window_spec (connection,
- width,
- height);
- break;
- case GDK_WINDOW_TYPE_HINT_DOCK:
- spec = mir_create_dialog_window_spec (connection,
- width,
- height);
- break;
- case GDK_WINDOW_TYPE_HINT_MENU:
- case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
- case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
- case GDK_WINDOW_TYPE_HINT_TOOLBAR:
- case GDK_WINDOW_TYPE_HINT_COMBO:
- case GDK_WINDOW_TYPE_HINT_DND:
- case GDK_WINDOW_TYPE_HINT_TOOLTIP:
- case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
- spec = mir_create_menu_window_spec (connection,
- width,
- height,
- parent_mir_window,
- &rect,
- 0);
- break;
- case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
- case GDK_WINDOW_TYPE_HINT_UTILITY:
- spec = mir_create_modal_dialog_window_spec (connection,
- width,
- height,
- parent_mir_window);
- break;
- case GDK_WINDOW_TYPE_HINT_NORMAL:
- case GDK_WINDOW_TYPE_HINT_DESKTOP:
- default:
- spec = mir_create_normal_window_spec (connection,
- width,
- height);
- break;
- }
-
- mir_window_spec_set_pixel_format (spec, format);
-
- return spec;
-}
-
-static void
-apply_geometry_hints (MirWindowSpec *spec,
- GdkMirWindowImpl *impl)
-{
- if (impl->geometry_mask & GDK_HINT_RESIZE_INC)
- {
- mir_window_spec_set_width_increment (spec, impl->geometry_hints.width_inc);
- mir_window_spec_set_height_increment (spec, impl->geometry_hints.height_inc);
- }
- if (impl->geometry_mask & GDK_HINT_MIN_SIZE)
- {
- mir_window_spec_set_min_width (spec, impl->geometry_hints.min_width);
- mir_window_spec_set_min_height (spec, impl->geometry_hints.min_height);
- }
- if (impl->geometry_mask & GDK_HINT_MAX_SIZE)
- {
- mir_window_spec_set_max_width (spec, impl->geometry_hints.max_width);
- mir_window_spec_set_max_height (spec, impl->geometry_hints.max_height);
- }
- if (impl->geometry_mask & GDK_HINT_ASPECT)
- {
- mir_window_spec_set_min_aspect_ratio (spec, (guint) 1000 * impl->geometry_hints.min_aspect, 1000);
- mir_window_spec_set_max_aspect_ratio (spec, (guint) 1000 * impl->geometry_hints.max_aspect, 1000);
- }
-}
-
-static MirWindowSpec *
-create_spec (GdkWindow *window,
- GdkMirWindowImpl *impl)
-{
- MirWindowSpec *spec = NULL;
- GdkWindow *parent;
- MirRectangle rect;
-
- spec = create_window_type_spec (impl->display,
- impl->transient_for,
- impl->transient_x,
- impl->transient_y,
- window->width,
- window->height,
- impl->modal,
- impl->type_hint,
- impl->buffer_usage);
-
- mir_window_spec_set_name (spec, impl->title);
- mir_window_spec_set_buffer_usage (spec, impl->buffer_usage);
-
- apply_geometry_hints (spec, impl);
-
- if (impl->has_rect)
- {
- impl->mir_rect.left = impl->rect.x;
- impl->mir_rect.top = impl->rect.y;
- impl->mir_rect.width = impl->rect.width;
- impl->mir_rect.height = impl->rect.height;
-
- parent = impl->transient_for;
-
- while (parent && !gdk_window_has_native (parent))
- {
- impl->mir_rect.left += parent->x;
- impl->mir_rect.top += parent->y;
-
- parent = gdk_window_get_parent (parent);
- }
-
- mir_window_spec_set_placement (spec,
- &impl->mir_rect,
- impl->rect_anchor,
- impl->window_anchor,
- impl->anchor_hints,
- impl->rect_anchor_dx,
- impl->rect_anchor_dy);
- }
- else
- {
- switch (impl->type_hint)
- {
- case GDK_WINDOW_TYPE_HINT_MENU:
- case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
- case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
- case GDK_WINDOW_TYPE_HINT_TOOLBAR:
- case GDK_WINDOW_TYPE_HINT_COMBO:
- case GDK_WINDOW_TYPE_HINT_DND:
- case GDK_WINDOW_TYPE_HINT_TOOLTIP:
- case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
- rect.left = impl->transient_x;
- rect.top = impl->transient_y;
- rect.width = 1;
- rect.height = 1;
-
- mir_window_spec_set_placement (spec,
- &rect,
- mir_placement_gravity_southeast,
- mir_placement_gravity_northwest,
- (mir_placement_hints_flip_x |
- mir_placement_hints_flip_y |
- mir_placement_hints_slide_x |
- mir_placement_hints_slide_y |
- mir_placement_hints_resize_x |
- mir_placement_hints_resize_y),
- -window->shadow_left,
- -window->shadow_top);
-
- break;
- default:
- break;
- }
- }
-
- return spec;
-}
-
-static void
-update_window_spec (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirWindowSpec *spec;
-
- if (!impl->mir_window)
- return;
-
- spec = create_spec (window, impl);
-
- mir_window_apply_spec (impl->mir_window, spec);
- mir_window_spec_release (spec);
-
- impl->pending_spec_update = FALSE;
- impl->buffer_stream = mir_window_get_buffer_stream (impl->mir_window);
-}
-
-static GdkDevice *
-get_pointer (GdkWindow *window)
-{
- GdkDisplay *display;
- GdkSeat *seat;
- GdkDevice *pointer;
-
- display = gdk_window_get_display (window);
- seat = gdk_display_get_default_seat (display);
- pointer = gdk_seat_get_pointer (seat);
-
- return pointer;
-}
-
-static void
-send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
-{
- GdkDisplay *display;
- GList *node;
-
- display = gdk_window_get_display (window);
- gdk_event_set_device (event, device);
- gdk_event_set_source_device (event, device);
- gdk_event_set_screen (event, gdk_display_get_default_screen (display));
- event->any.window = g_object_ref (window);
-
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, _gdk_display_get_next_serial (display));
-}
-
-static void
-generate_configure_event (GdkWindow *window,
- gint width,
- gint height)
-{
- GdkEvent *event;
-
- event = gdk_event_new (GDK_CONFIGURE);
- event->configure.send_event = FALSE;
- event->configure.width = width;
- event->configure.height = height;
-
- send_event (window, get_pointer (window), event);
-}
-
-static void
-synthesize_resize (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirWindowParameters params;
-
- if (!impl->mir_window)
- return;
-
- mir_window_get_parameters (impl->mir_window, ¶ms);
-
- window->width = params.width;
- window->height = params.height;
-
- _gdk_window_update_size (window);
-
- generate_configure_event (window, window->width, window->height);
-}
-
-static void
-maybe_synthesize_resize (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirWindowParameters params;
-
- if (!impl->mir_window)
- return;
-
- mir_window_get_parameters (impl->mir_window, ¶ms);
-
- if (params.width != window->width || params.height != window->height)
- {
- window->width = params.width;
- window->height = params.height;
-
- _gdk_window_update_size (window);
-
- generate_configure_event (window, window->width, window->height);
- }
-}
-
-static void
-ensure_mir_window_full (GdkWindow *window,
- MirBufferUsage buffer_usage)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkMirWindowReference *window_ref;
- MirWindowSpec *spec;
-
- if (window->input_only)
- return;
-
- if (impl->mir_window)
- {
- if (impl->pending_spec_update)
- update_window_spec (window);
- return;
- }
-
- /* no destroy notify -- we must leak for now
- * https://bugs.launchpad.net/mir/+bug/1324100
- */
- window_ref = _gdk_mir_event_source_get_window_reference (window);
- impl->buffer_usage = buffer_usage;
-
- spec = create_spec (window, impl);
-
- impl->mir_window = mir_create_window_sync (spec);
-
- mir_window_spec_release (spec);
-
- impl->pending_spec_update = FALSE;
- impl->buffer_stream = mir_window_get_buffer_stream (impl->mir_window);
-
- synthesize_resize (window);
-
- /* FIXME: Ignore some events until shown */
- mir_window_set_event_handler (impl->mir_window, event_cb, window_ref);
-}
-
-static void
-ensure_mir_window (GdkWindow *window)
-{
- ensure_mir_window_full (window,
- window->gl_paint_context ?
- mir_buffer_usage_hardware :
- mir_buffer_usage_software);
-}
-
-static void
-ensure_no_mir_window (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (impl->cairo_surface)
- {
- cairo_surface_finish (impl->cairo_surface);
- g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
- }
-
- if (window->gl_paint_context)
- {
- GdkDisplay *display = gdk_window_get_display (window);
- EGLDisplay egl_display = _gdk_mir_display_get_egl_display (display);
-
- if (impl->egl_surface)
- {
- eglDestroySurface (egl_display, impl->egl_surface);
- impl->egl_surface = NULL;
- }
-
- if (impl->dummy_egl_surface)
- {
- eglDestroySurface (egl_display, impl->dummy_egl_surface);
- impl->dummy_egl_surface = NULL;
- }
- }
-
- g_clear_pointer (&impl->mir_window, mir_window_release_sync);
-}
-
-static void
-send_buffer (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- /* Send the completed buffer to Mir */
- if (impl->mir_window)
- mir_buffer_stream_swap_buffers_sync (mir_window_get_buffer_stream (impl->mir_window));
-
- /* The Cairo context is no longer valid */
- g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
- if (impl->pending_spec_update)
- update_window_spec (window);
-
- impl->pending_spec_update = FALSE;
-
- maybe_synthesize_resize (window);
-}
-
-static cairo_surface_t *
-gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirGraphicsRegion region;
- cairo_format_t pixel_format = CAIRO_FORMAT_ARGB32;
- cairo_surface_t *cairo_surface;
- cairo_t *c;
-
- if (impl->cairo_surface)
- {
- cairo_surface_reference (impl->cairo_surface);
- return impl->cairo_surface;
- }
-
- ensure_mir_window (window);
-
- if (!impl->mir_window)
- return NULL;
-
- if (window->gl_paint_context)
- {
- cairo_surface = cairo_image_surface_create (pixel_format, window->width, window->height);
- cairo_surface_set_device_scale (cairo_surface, (double) impl->output_scale, (double) impl->output_scale);
- }
- else if (impl->visible)
- {
- mir_buffer_stream_get_graphics_region (mir_window_get_buffer_stream (impl->mir_window), ®ion);
-
- switch (region.pixel_format)
- {
- case mir_pixel_format_abgr_8888:
- g_warning ("pixel format ABGR 8888 not supported, using ARGB 8888");
- pixel_format = CAIRO_FORMAT_ARGB32;
- break;
- case mir_pixel_format_xbgr_8888:
- g_warning ("pixel format XBGR 8888 not supported, using XRGB 8888");
- pixel_format = CAIRO_FORMAT_RGB24;
- break;
- case mir_pixel_format_argb_8888:
- pixel_format = CAIRO_FORMAT_ARGB32;
- break;
- case mir_pixel_format_xrgb_8888:
- pixel_format = CAIRO_FORMAT_RGB24;
- break;
- case mir_pixel_format_bgr_888:
- g_error ("pixel format BGR 888 not supported");
- break;
- case mir_pixel_format_rgb_888:
- g_error ("pixel format RGB 888 not supported");
- break;
- case mir_pixel_format_rgb_565:
- pixel_format = CAIRO_FORMAT_RGB16_565;
- break;
- case mir_pixel_format_rgba_5551:
- g_error ("pixel format RGBA 5551 not supported");
- break;
- case mir_pixel_format_rgba_4444:
- g_error ("pixel format RGBA 4444 not supported");
- break;
- default:
- g_error ("unknown pixel format");
- break;
- }
-
- cairo_surface = cairo_image_surface_create_for_data ((unsigned char *) region.vaddr,
- pixel_format,
- region.width,
- region.height,
- region.stride);
- cairo_surface_set_device_scale (cairo_surface, (double) impl->output_scale, (double) impl->output_scale);
- }
- else
- cairo_surface = cairo_image_surface_create (pixel_format, 0, 0);
-
- impl->cairo_surface = cairo_surface_reference (cairo_surface);
-
- /* Draw background */
- if (impl->background)
- {
- c = cairo_create (impl->cairo_surface);
- cairo_set_source (c, impl->background);
- cairo_paint (c);
- cairo_destroy (c);
- }
-
- return cairo_surface;
-}
-
-static cairo_surface_t *
-gdk_mir_window_impl_create_similar_image_surface (GdkWindow *window,
- cairo_format_t format,
- int width,
- int height)
-{
- return cairo_image_surface_create (format, width, height);
-}
-
-static void
-gdk_mir_window_impl_finalize (GObject *object)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (object);
-
- g_free (impl->title);
-
- g_clear_pointer (&impl->background, cairo_pattern_destroy);
- g_clear_pointer (&impl->mir_window, mir_window_release_sync);
- g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
- g_clear_pointer (&impl->properties, g_hash_table_unref);
-
- G_OBJECT_CLASS (gdk_mir_window_impl_parent_class)->finalize (object);
-}
-
-static void
-gdk_mir_window_impl_show (GdkWindow *window,
- gboolean already_mapped)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- cairo_surface_t *s;
-
- impl->visible = TRUE;
- set_window_state (impl, mir_window_state_restored);
-
- /* Make sure there's a window to see */
- ensure_mir_window (window);
-
- if (!window->gl_paint_context)
- {
- /* Make sure something is rendered and then show first frame */
- s = gdk_mir_window_impl_ref_cairo_surface (window);
- send_buffer (window);
- cairo_surface_destroy (s);
- }
-}
-
-static void
-gdk_mir_window_impl_hide (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- impl->cursor_inside = FALSE;
- impl->visible = FALSE;
-
- set_window_state (impl, mir_window_state_hidden);
-}
-
-static void
-gdk_mir_window_impl_withdraw (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- impl->cursor_inside = FALSE;
- impl->visible = FALSE;
-
- set_window_state (impl, mir_window_state_hidden);
-}
-
-static void
-gdk_mir_window_impl_raise (GdkWindow *window)
-{
- /* We don't support client window stacking */
-}
-
-static void
-gdk_mir_window_impl_lower (GdkWindow *window)
-{
- /* We don't support client window stacking */
-}
-
-static void
-gdk_mir_window_impl_restack_under (GdkWindow *window,
- GList *native_siblings)
-{
- /* We don't support client window stacking */
-}
-
-static void
-gdk_mir_window_impl_restack_toplevel (GdkWindow *window,
- GdkWindow *sibling,
- gboolean above)
-{
- /* We don't support client window stacking */
-}
-
-static void
-gdk_mir_window_impl_move_resize (GdkWindow *window,
- gboolean with_move,
- gint x,
- gint y,
- gint width,
- gint height)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- /* If resize requested then rebuild window */
- if (width >= 0 && (window->width != width || window->height != height))
- {
- /* We accept any resize */
- window->width = width;
- window->height = height;
- impl->pending_spec_update = TRUE;
- }
-
- /* Transient windows can move wherever they want */
- if (with_move)
- {
- if (impl->has_rect || x != impl->transient_x || y != impl->transient_y)
- {
- impl->has_rect = FALSE;
- impl->transient_x = x;
- impl->transient_y = y;
- if (!impl->pending_spec_update && impl->mir_window)
- update_window_spec (window);
- }
- }
-}
-
-static MirPlacementGravity
-get_mir_placement_gravity (GdkGravity gravity)
-{
- switch (gravity)
- {
- case GDK_GRAVITY_STATIC:
- case GDK_GRAVITY_NORTH_WEST:
- return mir_placement_gravity_northwest;
- case GDK_GRAVITY_NORTH:
- return mir_placement_gravity_north;
- case GDK_GRAVITY_NORTH_EAST:
- return mir_placement_gravity_northeast;
- case GDK_GRAVITY_WEST:
- return mir_placement_gravity_west;
- case GDK_GRAVITY_CENTER:
- return mir_placement_gravity_center;
- case GDK_GRAVITY_EAST:
- return mir_placement_gravity_east;
- case GDK_GRAVITY_SOUTH_WEST:
- return mir_placement_gravity_southwest;
- case GDK_GRAVITY_SOUTH:
- return mir_placement_gravity_south;
- case GDK_GRAVITY_SOUTH_EAST:
- return mir_placement_gravity_southeast;
- }
-
- g_warn_if_reached ();
-
- return mir_placement_gravity_center;
-}
-
-static MirPlacementHints
-get_mir_placement_hints (GdkAnchorHints hints)
-{
- MirPlacementHints mir_hints = 0;
-
- if (hints & GDK_ANCHOR_FLIP_X)
- mir_hints |= mir_placement_hints_flip_x;
-
- if (hints & GDK_ANCHOR_FLIP_Y)
- mir_hints |= mir_placement_hints_flip_y;
-
- if (hints & GDK_ANCHOR_SLIDE_X)
- mir_hints |= mir_placement_hints_slide_x;
-
- if (hints & GDK_ANCHOR_SLIDE_Y)
- mir_hints |= mir_placement_hints_slide_y;
-
- if (hints & GDK_ANCHOR_RESIZE_X)
- mir_hints |= mir_placement_hints_resize_x;
-
- if (hints & GDK_ANCHOR_RESIZE_Y)
- mir_hints |= mir_placement_hints_resize_y;
-
- return mir_hints;
-}
-
-static gint
-get_window_shadow_dx (GdkWindow *window,
- GdkGravity window_anchor)
-{
- switch (window_anchor)
- {
- case GDK_GRAVITY_STATIC:
- case GDK_GRAVITY_NORTH_WEST:
- case GDK_GRAVITY_WEST:
- case GDK_GRAVITY_SOUTH_WEST:
- return -window->shadow_left;
-
- case GDK_GRAVITY_NORTH:
- case GDK_GRAVITY_CENTER:
- case GDK_GRAVITY_SOUTH:
- return (window->shadow_right - window->shadow_left) / 2;
-
- case GDK_GRAVITY_NORTH_EAST:
- case GDK_GRAVITY_EAST:
- case GDK_GRAVITY_SOUTH_EAST:
- return window->shadow_right;
- }
-
- g_warn_if_reached ();
-
- return 0;
-}
-
-static gint
-get_window_shadow_dy (GdkWindow *window,
- GdkGravity window_anchor)
-{
- switch (window_anchor)
- {
- case GDK_GRAVITY_STATIC:
- case GDK_GRAVITY_NORTH_WEST:
- case GDK_GRAVITY_NORTH:
- case GDK_GRAVITY_NORTH_EAST:
- return -window->shadow_top;
-
- case GDK_GRAVITY_WEST:
- case GDK_GRAVITY_CENTER:
- case GDK_GRAVITY_EAST:
- return (window->shadow_bottom - window->shadow_top) / 2;
-
- case GDK_GRAVITY_SOUTH_WEST:
- case GDK_GRAVITY_SOUTH:
- case GDK_GRAVITY_SOUTH_EAST:
- return window->shadow_bottom;
- }
-
- g_warn_if_reached ();
-
- return 0;
-}
-
-static void
-gdk_mir_window_impl_move_to_rect (GdkWindow *window,
- const GdkRectangle *rect,
- GdkGravity rect_anchor,
- GdkGravity window_anchor,
- GdkAnchorHints anchor_hints,
- gint rect_anchor_dx,
- gint rect_anchor_dy)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- impl->has_rect = TRUE;
- impl->rect = *rect;
- impl->rect_anchor = get_mir_placement_gravity (rect_anchor);
- impl->window_anchor = get_mir_placement_gravity (window_anchor);
- impl->anchor_hints = get_mir_placement_hints (anchor_hints);
- impl->rect_anchor_dx = rect_anchor_dx + get_window_shadow_dx (window, window_anchor);
- impl->rect_anchor_dy = rect_anchor_dy + get_window_shadow_dy (window, window_anchor);
-
- if (impl->mir_window && !impl->pending_spec_update)
- update_window_spec (window);
-}
-
-static gint
-get_mir_placement_gravity_x (MirPlacementGravity gravity)
-{
- switch (gravity)
- {
- case mir_placement_gravity_west:
- case mir_placement_gravity_northwest:
- case mir_placement_gravity_southwest:
- return 0;
-
- case mir_placement_gravity_center:
- case mir_placement_gravity_north:
- case mir_placement_gravity_south:
- return 1;
-
- case mir_placement_gravity_east:
- case mir_placement_gravity_northeast:
- case mir_placement_gravity_southeast:
- return 2;
- }
-
- g_warn_if_reached ();
-
- return 1;
-}
-
-static gint
-get_mir_placement_gravity_y (MirPlacementGravity gravity)
-{
- switch (gravity)
- {
- case mir_placement_gravity_north:
- case mir_placement_gravity_northwest:
- case mir_placement_gravity_northeast:
- return 0;
-
- case mir_placement_gravity_center:
- case mir_placement_gravity_west:
- case mir_placement_gravity_east:
- return 1;
-
- case mir_placement_gravity_south:
- case mir_placement_gravity_southwest:
- case mir_placement_gravity_southeast:
- return 2;
- }
-
- g_warn_if_reached ();
-
- return 1;
-}
-
-static GdkRectangle
-get_unflipped_rect (const GdkRectangle *rect,
- gint width,
- gint height,
- MirPlacementGravity rect_anchor,
- MirPlacementGravity window_anchor,
- gint rect_anchor_dx,
- gint rect_anchor_dy)
-{
- GdkRectangle unflipped_rect;
-
- unflipped_rect.x = rect->x;
- unflipped_rect.x += rect->width * get_mir_placement_gravity_x (rect_anchor) / 2;
- unflipped_rect.x -= width * get_mir_placement_gravity_x (window_anchor) / 2;
- unflipped_rect.x += rect_anchor_dx;
- unflipped_rect.y = rect->y;
- unflipped_rect.y += rect->height * get_mir_placement_gravity_y (rect_anchor) / 2;
- unflipped_rect.y -= height * get_mir_placement_gravity_y (window_anchor) / 2;
- unflipped_rect.y += rect_anchor_dy;
- unflipped_rect.width = width;
- unflipped_rect.height = height;
-
- return unflipped_rect;
-}
-
-static MirPlacementGravity
-get_opposite_mir_placement_gravity (MirPlacementGravity gravity)
-{
- switch (gravity)
- {
- case mir_placement_gravity_center:
- return mir_placement_gravity_center;
- case mir_placement_gravity_west:
- return mir_placement_gravity_east;
- case mir_placement_gravity_east:
- return mir_placement_gravity_west;
- case mir_placement_gravity_north:
- return mir_placement_gravity_south;
- case mir_placement_gravity_south:
- return mir_placement_gravity_north;
- case mir_placement_gravity_northwest:
- return mir_placement_gravity_southeast;
- case mir_placement_gravity_northeast:
- return mir_placement_gravity_southwest;
- case mir_placement_gravity_southwest:
- return mir_placement_gravity_northeast;
- case mir_placement_gravity_southeast:
- return mir_placement_gravity_northwest;
- }
-
- g_warn_if_reached ();
-
- return gravity;
-}
-
-static gint
-get_anchor_x (const GdkRectangle *rect,
- MirPlacementGravity anchor)
-{
- return rect->x + rect->width * get_mir_placement_gravity_x (anchor) / 2;
-}
-
-static gint
-get_anchor_y (const GdkRectangle *rect,
- MirPlacementGravity anchor)
-{
- return rect->y + rect->height * get_mir_placement_gravity_y (anchor) / 2;
-}
-
-void
-_gdk_mir_window_set_final_rect (GdkWindow *window,
- MirRectangle rect)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkRectangle best_rect;
- GdkRectangle worst_rect;
- GdkRectangle flipped_rect;
- GdkRectangle final_rect;
- gboolean flipped_x = FALSE;
- gboolean flipped_y = FALSE;
- gint test_position;
- gint final_position;
- gint unflipped_offset;
- gint flipped_offset;
-
- if (!impl->has_rect)
- return;
-
- best_rect = get_unflipped_rect (&impl->rect,
- window->width,
- window->height,
- impl->rect_anchor,
- impl->window_anchor,
- impl->rect_anchor_dx,
- impl->rect_anchor_dy);
-
- worst_rect = get_unflipped_rect (&impl->rect,
- window->width,
- window->height,
- get_opposite_mir_placement_gravity (impl->rect_anchor),
- get_opposite_mir_placement_gravity (impl->window_anchor),
- -impl->rect_anchor_dx,
- -impl->rect_anchor_dy);
-
- flipped_rect.x = best_rect.x;
- flipped_rect.y = best_rect.y;
- flipped_rect.width = window->width;
- flipped_rect.height = window->height;
-
- final_rect.x = rect.left - (impl->mir_rect.left - impl->rect.x);
- final_rect.y = rect.top - (impl->mir_rect.top - impl->rect.y);
- final_rect.width = rect.width;
- final_rect.height = rect.height;
-
- if (impl->anchor_hints & mir_placement_hints_flip_x)
- {
- test_position = get_anchor_x (&best_rect, impl->window_anchor);
- final_position = get_anchor_x (&final_rect, impl->window_anchor);
- unflipped_offset = final_position - test_position;
-
- test_position = get_anchor_x (&worst_rect, get_opposite_mir_placement_gravity (impl->window_anchor));
- final_position = get_anchor_x (&final_rect, get_opposite_mir_placement_gravity (impl->window_anchor));
- flipped_offset = final_position - test_position;
-
- if (ABS (flipped_offset) < ABS (unflipped_offset))
- {
- flipped_rect.x = worst_rect.x;
- flipped_x = TRUE;
- }
- }
-
- if (impl->anchor_hints & mir_placement_hints_flip_y)
- {
- test_position = get_anchor_y (&best_rect, impl->window_anchor);
- final_position = get_anchor_y (&final_rect, impl->window_anchor);
- unflipped_offset = final_position - test_position;
-
- test_position = get_anchor_y (&worst_rect, get_opposite_mir_placement_gravity (impl->window_anchor));
- final_position = get_anchor_y (&final_rect, get_opposite_mir_placement_gravity (impl->window_anchor));
- flipped_offset = final_position - test_position;
-
- if (ABS (flipped_offset) < ABS (unflipped_offset))
- {
- flipped_rect.y = worst_rect.y;
- flipped_y = TRUE;
- }
- }
-
- g_signal_emit_by_name (window,
- "moved-to-rect",
- &flipped_rect,
- &final_rect,
- flipped_x,
- flipped_y);
-}
-
-static void
-gdk_mir_window_impl_set_background (GdkWindow *window,
- cairo_pattern_t *pattern)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (impl->background)
- cairo_pattern_destroy (impl->background);
- impl->background = cairo_pattern_reference (pattern);
-}
-
-static GdkEventMask
-gdk_mir_window_impl_get_events (GdkWindow *window)
-{
- return window->event_mask;
-}
-
-static void
-gdk_mir_window_impl_set_events (GdkWindow *window,
- GdkEventMask event_mask)
-{
- /* We send all events and let GDK decide */
-}
-
-static gboolean
-gdk_mir_window_impl_reparent (GdkWindow *window,
- GdkWindow *new_parent,
- gint x,
- gint y)
-{
- return FALSE;
-}
-
-static void
-gdk_mir_window_impl_set_device_cursor (GdkWindow *window,
- GdkDevice *device,
- GdkCursor *cursor)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
- MirWindowSpec *spec;
- const gchar *cursor_name;
-
- if (cursor)
- cursor_name = _gdk_mir_cursor_get_name (cursor);
- else
- cursor_name = mir_default_cursor_name;
-
- spec = mir_create_window_spec (connection);
- mir_window_spec_set_cursor_name (spec, cursor_name);
- mir_window_apply_spec (impl->mir_window, spec);
- mir_window_spec_release (spec);
-}
-
-static void
-gdk_mir_window_impl_get_geometry (GdkWindow *window,
- gint *x,
- gint *y,
- gint *width,
- gint *height)
-{
- if (x)
- *x = 0; // FIXME
- if (y)
- *y = 0; // FIXME
- if (width)
- *width = window->width;
- if (height)
- *height = window->height;
-}
-
-static void
-gdk_mir_window_impl_get_root_coords (GdkWindow *window,
- gint x,
- gint y,
- gint *root_x,
- gint *root_y)
-{
- if (root_x)
- *root_x = x; // FIXME
- if (root_y)
- *root_y = y; // FIXME
-}
-
-static gboolean
-gdk_mir_window_impl_get_device_state (GdkWindow *window,
- GdkDevice *device,
- gdouble *x,
- gdouble *y,
- GdkModifierType *mask)
-{
- GdkWindow *child;
-
- _gdk_device_query_state (device, window, NULL, &child, NULL, NULL, x, y, mask);
-
- return child != NULL;
-}
-
-static gboolean
-gdk_mir_window_impl_begin_paint (GdkWindow *window)
-{
- /* Indicate we are ready to be drawn onto directly? */
- return FALSE;
-}
-
-static void
-gdk_mir_window_impl_end_paint (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (impl->visible && !window->current_paint.use_gl)
- send_buffer (window);
-}
-
-static cairo_region_t *
-gdk_mir_window_impl_get_shape (GdkWindow *window)
-{
- return NULL;
-}
-
-static cairo_region_t *
-gdk_mir_window_impl_get_input_shape (GdkWindow *window)
-{
- return NULL;
-}
-
-static void
-gdk_mir_window_impl_shape_combine_region (GdkWindow *window,
- const cairo_region_t *shape_region,
- gint offset_x,
- gint offset_y)
-{
-}
-
-static void
-gdk_mir_window_impl_input_shape_combine_region (GdkWindow *window,
- const cairo_region_t *shape_region,
- gint offset_x,
- gint offset_y)
-{
-}
-
-static void
-gdk_mir_window_impl_destroy (GdkWindow *window,
- gboolean recursing,
- gboolean foreign_destroy)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- impl->visible = FALSE;
- ensure_no_mir_window (window);
-}
-
-static void
-gdk_mir_window_impl_destroy_foreign (GdkWindow *window)
-{
-}
-
-static void
-gdk_mir_window_impl_focus (GdkWindow *window,
- guint32 timestamp)
-{
-}
-
-static void
-gdk_mir_window_impl_set_type_hint (GdkWindow *window,
- GdkWindowTypeHint hint)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (type_hint_differs (hint, impl->type_hint))
- {
- impl->type_hint = hint;
-
- if (impl->mir_window && !impl->pending_spec_update)
- update_window_spec (window);
- }
-}
-
-static GdkWindowTypeHint
-gdk_mir_window_impl_get_type_hint (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- return impl->type_hint;
-}
-
-void
-gdk_mir_window_impl_set_modal_hint (GdkWindow *window,
- gboolean modal)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (modal != impl->modal)
- {
- impl->modal = modal;
-
- if (impl->mir_window && !impl->pending_spec_update)
- update_window_spec (window);
- }
-}
-
-static void
-gdk_mir_window_impl_set_skip_taskbar_hint (GdkWindow *window,
- gboolean skips_taskbar)
-{
-}
-
-static void
-gdk_mir_window_impl_set_skip_pager_hint (GdkWindow *window,
- gboolean skips_pager)
-{
-}
-
-static void
-gdk_mir_window_impl_set_urgency_hint (GdkWindow *window,
- gboolean urgent)
-{
-}
-
-static void
-gdk_mir_window_impl_set_geometry_hints (GdkWindow *window,
- const GdkGeometry *geometry,
- GdkWindowHints geom_mask)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
- MirWindowSpec *spec;
-
- impl->geometry_hints = *geometry;
- impl->geometry_mask = geom_mask;
-
- if (impl->mir_window && !impl->pending_spec_update)
- {
- spec = mir_create_window_spec (connection);
- apply_geometry_hints (spec, impl);
- mir_window_apply_spec (impl->mir_window, spec);
- mir_window_spec_release (spec);
- }
-}
-
-static void
-gdk_mir_window_impl_set_title (GdkWindow *window,
- const gchar *title)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
- MirWindowSpec *spec;
-
- g_free (impl->title);
- impl->title = g_strdup (title);
-
- if (impl->mir_window && !impl->pending_spec_update)
- {
- spec = mir_create_window_spec (connection);
- mir_window_spec_set_name (spec, impl->title);
- mir_window_apply_spec (impl->mir_window, spec);
- mir_window_spec_release (spec);
- }
-}
-
-static void
-gdk_mir_window_impl_set_role (GdkWindow *window,
- const gchar *role)
-{
-}
-
-static void
-gdk_mir_window_impl_set_startup_id (GdkWindow *window,
- const gchar *startup_id)
-{
-}
-
-static void
-gdk_mir_window_impl_set_transient_for (GdkWindow *window,
- GdkWindow *parent)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (impl->transient_for == parent)
- return;
-
- /* Link this window to the parent */
- impl->transient_for = parent;
-
- if (impl->mir_window && !impl->pending_spec_update)
- update_window_spec (window);
-}
-
-static void
-gdk_mir_window_impl_get_frame_extents (GdkWindow *window,
- GdkRectangle *rect)
-{
-}
-
-static void
-gdk_mir_window_impl_set_override_redirect (GdkWindow *window,
- gboolean override_redirect)
-{
-}
-
-static void
-gdk_mir_window_impl_set_accept_focus (GdkWindow *window,
- gboolean accept_focus)
-{
- /* Mir clients cannot control focus */
-}
-
-static void
-gdk_mir_window_impl_set_focus_on_map (GdkWindow *window,
- gboolean focus_on_map)
-{
- /* Mir clients cannot control focus */
-}
-
-static void
-gdk_mir_window_impl_set_icon_list (GdkWindow *window,
- GList *pixbufs)
-{
- // ??
-}
-
-static void
-gdk_mir_window_impl_set_icon_name (GdkWindow *window,
- const gchar *name)
-{
-}
-
-static void
-gdk_mir_window_impl_iconify (GdkWindow *window)
-{
- /* We don't support iconification */
-}
-
-static void
-gdk_mir_window_impl_deiconify (GdkWindow *window)
-{
- /* We don't support iconification */
-}
-
-static void
-gdk_mir_window_impl_stick (GdkWindow *window)
-{
- /* We do not support stick/unstick in Mir */
-}
-
-static void
-gdk_mir_window_impl_unstick (GdkWindow *window)
-{
- /* We do not support stick/unstick in Mir */
-}
-
-static void
-gdk_mir_window_impl_maximize (GdkWindow *window)
-{
- set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_maximized);
-}
-
-static void
-gdk_mir_window_impl_unmaximize (GdkWindow *window)
-{
- set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
-}
-
-static void
-gdk_mir_window_impl_fullscreen (GdkWindow *window)
-{
- set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_fullscreen);
-}
-
-static void
-gdk_mir_window_impl_apply_fullscreen_mode (GdkWindow *window)
-{
-}
-
-static void
-gdk_mir_window_impl_unfullscreen (GdkWindow *window)
-{
- set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
-}
-
-static void
-gdk_mir_window_impl_set_keep_above (GdkWindow *window,
- gboolean setting)
-{
- /* We do not support keep above/below in Mir */
-}
-
-static void
-gdk_mir_window_impl_set_keep_below (GdkWindow *window,
- gboolean setting)
-{
- /* We do not support keep above/below in Mir */
-}
-
-static GdkWindow *
-gdk_mir_window_impl_get_group (GdkWindow *window)
-{
- return NULL;
-}
-
-static void
-gdk_mir_window_impl_set_group (GdkWindow *window,
- GdkWindow *leader)
-{
-}
-
-static void
-gdk_mir_window_impl_set_decorations (GdkWindow *window,
- GdkWMDecoration decorations)
-{
-}
-
-static gboolean
-gdk_mir_window_impl_get_decorations (GdkWindow *window,
- GdkWMDecoration *decorations)
-{
- return FALSE;
-}
-
-static void
-gdk_mir_window_impl_set_functions (GdkWindow *window,
- GdkWMFunction functions)
-{
-}
-
-static void
-gdk_mir_window_impl_begin_resize_drag (GdkWindow *window,
- GdkWindowEdge edge,
- GdkDevice *device,
- gint button,
- gint root_x,
- gint root_y,
- guint32 timestamp)
-{
-}
-
-static void
-gdk_mir_window_impl_begin_move_drag (GdkWindow *window,
- GdkDevice *device,
- gint button,
- gint root_x,
- gint root_y,
- guint32 timestamp)
-{
-}
-
-static void
-gdk_mir_window_impl_enable_synchronized_configure (GdkWindow *window)
-{
-}
-
-static void
-gdk_mir_window_impl_configure_finished (GdkWindow *window)
-{
-}
-
-static void
-gdk_mir_window_impl_set_opacity (GdkWindow *window,
- gdouble opacity)
-{
- // FIXME
-}
-
-static void
-gdk_mir_window_impl_set_composited (GdkWindow *window,
- gboolean composited)
-{
-}
-
-static void
-gdk_mir_window_impl_destroy_notify (GdkWindow *window)
-{
-}
-
-static GdkDragProtocol
-gdk_mir_window_impl_get_drag_protocol (GdkWindow *window,
- GdkWindow **target)
-{
- return 0;
-}
-
-static void
-gdk_mir_window_impl_register_dnd (GdkWindow *window)
-{
-}
-
-static GdkDragContext *
-gdk_mir_window_impl_drag_begin (GdkWindow *window,
- GdkDevice *device,
- GList *targets,
- gint x_root,
- gint y_root)
-{
- return NULL;
-}
-
-static void
-gdk_mir_window_impl_process_updates_recurse (GdkWindow *window,
- cairo_region_t *region)
-{
- cairo_rectangle_int_t rectangle;
-
- /* We redraw the whole region, but we should track the buffers and only redraw what has changed since we sent this buffer */
- rectangle.x = 0;
- rectangle.y = 0;
- rectangle.width = window->width;
- rectangle.height = window->height;
- cairo_region_union_rectangle (region, &rectangle);
-
- _gdk_window_process_updates_recurse (window, region);
-}
-
-static void
-gdk_mir_window_impl_sync_rendering (GdkWindow *window)
-{
- // FIXME: Only used for benchmarking
-}
-
-static gboolean
-gdk_mir_window_impl_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_window_impl_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_mir_window_impl_get_property (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gulong offset,
- gulong length,
- gint pdelete,
- GdkAtom *actual_type,
- gint *actual_format,
- gint *actual_length,
- guchar **data)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkMirProperty *mir_property;
- GdkAtom dummy_actual_type;
- gint dummy_actual_format;
- gint dummy_actual_length;
- guint width;
-
- if (!actual_type)
- actual_type = &dummy_actual_type;
- if (!actual_format)
- actual_format = &dummy_actual_format;
- if (!actual_length)
- actual_length = &dummy_actual_length;
-
- *actual_type = GDK_NONE;
- *actual_format = 0;
- *actual_length = 0;
-
- if (data)
- *data = NULL;
-
- mir_property = g_hash_table_lookup (impl->properties, property);
-
- if (!mir_property)
- return FALSE;
-
- width = g_array_get_element_size (mir_property->array);
- *actual_type = mir_property->type;
- *actual_format = 8 * width;
-
- /* ICCCM 2.7: GdkAtoms can be 64-bit, but ATOMs and ATOM_PAIRs have format 32 */
- if (*actual_type == GDK_SELECTION_TYPE_ATOM || *actual_type == gdk_atom_intern_static_string ("ATOM_PAIR"))
- *actual_format = 32;
-
- if (type != GDK_NONE && type != mir_property->type)
- return FALSE;
-
- offset *= 4;
-
- /* round up to next nearest multiple of width */
- if (length < G_MAXULONG - width + 1)
- length = (length - 1 + width) / width * width;
- else
- length = G_MAXULONG / width * width;
-
- /* we're skipping the first offset bytes */
- if (length > mir_property->array->len * width - offset)
- length = mir_property->array->len * width - offset;
-
- /* leave room for null terminator */
- if (length > G_MAXULONG - width)
- length -= width;
-
- *actual_length = length;
-
- if (data)
- {
- *data = g_memdup (mir_property->array->data + offset, length + width);
- memset (*data + length, 0, width);
- }
-
- return TRUE;
-}
-
-static void
-request_targets (GdkWindow *window,
- const GdkAtom *available_targets,
- gint n_available_targets)
-{
- GArray *requested_targets;
- GdkAtom target_pair[2];
- gchar *target_location;
- GdkEvent *event;
- gint i;
-
- requested_targets = g_array_sized_new (TRUE, FALSE, sizeof (GdkAtom), 2 * n_available_targets);
-
- for (i = 0; i < n_available_targets; i++)
- {
- target_pair[0] = available_targets[i];
-
- if (target_pair[0] == gdk_atom_intern_static_string ("TIMESTAMP") ||
- target_pair[0] == gdk_atom_intern_static_string ("TARGETS") ||
- target_pair[0] == gdk_atom_intern_static_string ("MULTIPLE") ||
- target_pair[0] == gdk_atom_intern_static_string ("SAVE_TARGETS"))
- continue;
-
- target_location = g_strdup_printf ("REQUESTED_TARGET_U%u", requested_targets->len / 2);
- target_pair[1] = gdk_atom_intern (target_location, FALSE);
- g_free (target_location);
-
- g_array_append_vals (requested_targets, target_pair, 2);
- }
-
- gdk_property_delete (window, gdk_atom_intern_static_string ("AVAILABLE_TARGETS"));
- gdk_property_delete (window, gdk_atom_intern_static_string ("REQUESTED_TARGETS"));
-
- gdk_property_change (window,
- gdk_atom_intern_static_string ("REQUESTED_TARGETS"),
- GDK_SELECTION_TYPE_ATOM,
- 8 * sizeof (GdkAtom),
- GDK_PROP_MODE_REPLACE,
- (const guchar *) requested_targets->data,
- requested_targets->len);
-
- g_array_unref (requested_targets);
-
- event = gdk_event_new (GDK_SELECTION_REQUEST);
- event->selection.window = g_object_ref (window);
- event->selection.send_event = FALSE;
- event->selection.selection = GDK_SELECTION_CLIPBOARD;
- event->selection.target = gdk_atom_intern_static_string ("MULTIPLE");
- event->selection.property = gdk_atom_intern_static_string ("REQUESTED_TARGETS");
- event->selection.time = GDK_CURRENT_TIME;
- event->selection.requestor = g_object_ref (window);
-
- gdk_event_put (event);
- gdk_event_free (event);
-}
-
-static void
-create_paste (GdkWindow *window,
- const GdkAtom *requested_targets,
- gint n_requested_targets)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GPtrArray *paste_formats;
- GArray *paste_header;
- GByteArray *paste_data;
- gint sizes[4];
- GdkMirProperty *mir_property;
- const gchar *paste_format;
- gint i;
-
- paste_formats = g_ptr_array_new_full (n_requested_targets, g_free);
- paste_header = g_array_sized_new (FALSE, FALSE, sizeof (gint), 1 + 4 * n_requested_targets);
- paste_data = g_byte_array_new ();
-
- g_array_append_val (paste_header, sizes[0]);
-
- for (i = 0; i < n_requested_targets; i++)
- {
- if (requested_targets[i] == GDK_NONE)
- continue;
-
- mir_property = g_hash_table_lookup (impl->properties, requested_targets[i]);
-
- if (!mir_property)
- continue;
-
- paste_format = _gdk_atom_name_const (mir_property->type);
-
- /* skip non-MIME targets */
- if (!strchr (paste_format, '/'))
- {
- g_hash_table_remove (impl->properties, requested_targets[i]);
- continue;
- }
-
- sizes[0] = paste_data->len;
- sizes[1] = strlen (paste_format);
- sizes[2] = sizes[0] + sizes[1];
- sizes[3] = mir_property->array->len * g_array_get_element_size (mir_property->array);
-
- g_ptr_array_add (paste_formats, g_strdup (paste_format));
- g_array_append_vals (paste_header, sizes, 4);
- g_byte_array_append (paste_data, (const guint8 *) paste_format, sizes[1]);
- g_byte_array_append (paste_data, (const guint8 *) mir_property->array->data, sizes[3]);
-
- g_hash_table_remove (impl->properties, requested_targets[i]);
- }
-
- gdk_property_delete (window, gdk_atom_intern_static_string ("REQUESTED_TARGETS"));
-
- g_array_index (paste_header, gint, 0) = paste_formats->len;
-
- for (i = 0; i < paste_formats->len; i++)
- {
- g_array_index (paste_header, gint, 1 + 4 * i) += paste_header->len * sizeof (gint);
- g_array_index (paste_header, gint, 3 + 4 * i) += paste_header->len * sizeof (gint);
- }
-
- g_byte_array_prepend (paste_data,
- (const guint8 *) paste_header->data,
- paste_header->len * g_array_get_element_size (paste_header));
-
- g_ptr_array_add (paste_formats, NULL);
-
- _gdk_mir_display_create_paste (gdk_window_get_display (window),
- (const gchar * const *) paste_formats->pdata,
- paste_data->data,
- paste_data->len);
-
- g_byte_array_unref (paste_data);
- g_array_unref (paste_header);
- g_ptr_array_unref (paste_formats);
-}
-
-static void
-gdk_mir_window_impl_change_property (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gint format,
- GdkPropMode mode,
- const guchar *data,
- gint n_elements)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkMirProperty *mir_property;
- gboolean existed;
- GdkEvent *event;
-
- /* ICCCM 2.7: ATOMs and ATOM_PAIRs have format 32, but GdkAtoms can be 64-bit */
- if (type == GDK_SELECTION_TYPE_ATOM || type == gdk_atom_intern_static_string ("ATOM_PAIR"))
- format = 8 * sizeof (GdkAtom);
-
- if (mode != GDK_PROP_MODE_REPLACE)
- {
- mir_property = g_hash_table_lookup (impl->properties, property);
- existed = mir_property != NULL;
- }
- else
- {
- mir_property = NULL;
- existed = g_hash_table_contains (impl->properties, property);
- }
-
- if (!mir_property)
- {
- /* format is measured in bits, but we need to know this in bytes */
- mir_property = gdk_mir_property_new (type, format / 8, n_elements);
- g_hash_table_insert (impl->properties, property, mir_property);
- }
-
- /* format is measured in bits, but we need to know this in bytes */
- if (type != mir_property->type || format / 8 != g_array_get_element_size (mir_property->array))
- return;
-
- if (mode == GDK_PROP_MODE_PREPEND)
- g_array_prepend_vals (mir_property->array, data, n_elements);
- else
- g_array_append_vals (mir_property->array, data, n_elements);
-
- event = gdk_event_new (GDK_PROPERTY_NOTIFY);
- event->property.window = g_object_ref (window);
- event->property.send_event = FALSE;
- event->property.atom = property;
- event->property.time = GDK_CURRENT_TIME;
- event->property.state = GDK_PROPERTY_NEW_VALUE;
-
- gdk_event_put (event);
- gdk_event_free (event);
-
- if (property == gdk_atom_intern_static_string ("AVAILABLE_TARGETS"))
- request_targets (window, (const GdkAtom *) data, n_elements);
- else if (property == gdk_atom_intern_static_string ("REQUESTED_TARGETS") && existed)
- create_paste (window, (const GdkAtom *) data, n_elements);
-}
-
-static void
-gdk_mir_window_impl_delete_property (GdkWindow *window,
- GdkAtom property)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkEvent *event;
-
- if (g_hash_table_remove (impl->properties, property))
- {
- event = gdk_event_new (GDK_PROPERTY_NOTIFY);
- event->property.window = g_object_ref (window);
- event->property.send_event = FALSE;
- event->property.atom = property;
- event->property.time = GDK_CURRENT_TIME;
- event->property.state = GDK_PROPERTY_DELETE;
-
- gdk_event_put (event);
- gdk_event_free (event);
- }
-}
-
-static gint
-gdk_mir_window_impl_get_scale_factor (GdkWindow *window)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- return impl->output_scale;
-}
-
-static void
-gdk_mir_window_impl_set_opaque_region (GdkWindow *window,
- cairo_region_t *region)
-{
- /* FIXME: An optimisation to tell the compositor which regions of the window are fully transparent */
-}
-
-static void
-gdk_mir_window_impl_set_shadow_width (GdkWindow *window,
- gint left,
- gint right,
- gint top,
- gint bottom)
-{
-}
-
-static gboolean
-find_eglconfig_for_window (GdkWindow *window,
- EGLConfig *egl_config_out,
- GError **error)
-{
- GdkDisplay *display = gdk_window_get_display (window);
- EGLDisplay *egl_display = _gdk_mir_display_get_egl_display (display);
- GdkVisual *visual = gdk_window_get_visual (window);
- EGLint attrs[MAX_EGL_ATTRS];
- EGLint count;
- EGLConfig *configs;
- gboolean use_rgba;
-
- int i = 0;
-
- attrs[i++] = EGL_SURFACE_TYPE;
- attrs[i++] = EGL_WINDOW_BIT;
-
- attrs[i++] = EGL_COLOR_BUFFER_TYPE;
- attrs[i++] = EGL_RGB_BUFFER;
-
- attrs[i++] = EGL_RED_SIZE;
- attrs[i++] = 1;
- attrs[i++] = EGL_GREEN_SIZE;
- attrs[i++] = 1;
- attrs[i++] = EGL_BLUE_SIZE;
- attrs[i++] = 1;
-
- use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
-
- if (use_rgba)
- {
- attrs[i++] = EGL_ALPHA_SIZE;
- attrs[i++] = 1;
- }
- else
- {
- attrs[i++] = EGL_ALPHA_SIZE;
- attrs[i++] = 0;
- }
-
- attrs[i++] = EGL_NONE;
- g_assert (i < MAX_EGL_ATTRS);
-
- if (!eglChooseConfig (egl_display, attrs, NULL, 0, &count) || count < 1)
- {
- g_set_error_literal (error, GDK_GL_ERROR,
- GDK_GL_ERROR_UNSUPPORTED_FORMAT,
- _("No available configurations for the given pixel format"));
- return FALSE;
- }
-
- configs = g_new (EGLConfig, count);
-
- if (!eglChooseConfig (egl_display, attrs, configs, count, &count) || count < 1)
- {
- g_set_error_literal (error, GDK_GL_ERROR,
- GDK_GL_ERROR_UNSUPPORTED_FORMAT,
- _("No available configurations for the given pixel format"));
- return FALSE;
- }
-
- /* Pick first valid configuration i guess? */
-
- if (egl_config_out != NULL)
- *egl_config_out = configs[0];
-
- g_free (configs);
-
- return TRUE;
-}
-
-static GdkGLContext *
-gdk_mir_window_impl_create_gl_context (GdkWindow *window,
- gboolean attached,
- GdkGLContext *share,
- GError **error)
-{
- GdkDisplay *display = gdk_window_get_display (window);
- GdkMirGLContext *context;
- EGLConfig config;
-
- if (!_gdk_mir_display_init_egl_display (display))
- {
- g_set_error_literal (error, GDK_GL_ERROR,
- GDK_GL_ERROR_NOT_AVAILABLE,
- _("No GL implementation is available"));
- return NULL;
- }
-
- if (!_gdk_mir_display_have_egl_khr_create_context (display))
- {
- g_set_error_literal (error, GDK_GL_ERROR,
- GDK_GL_ERROR_UNSUPPORTED_PROFILE,
- _("3.2 core GL profile is not available on EGL implementation"));
- return NULL;
- }
-
- if (!find_eglconfig_for_window (window, &config, error))
- return NULL;
-
- context = g_object_new (GDK_TYPE_MIR_GL_CONTEXT,
- "display", display,
- "window", window,
- "shared-context", share,
- NULL);
-
- context->egl_config = config;
- context->is_attached = attached;
-
- return GDK_GL_CONTEXT (context);
-}
-
-static void
-gdk_mir_window_impl_invalidate_for_new_frame (GdkWindow *window,
- cairo_region_t *update_area)
-{
- cairo_rectangle_int_t window_rect;
- GdkDisplay *display = gdk_window_get_display (window);
- GdkMirGLContext *context_mir;
- int buffer_age;
- gboolean invalidate_all;
- EGLSurface egl_surface;
-
- /* Minimal update is ok if we're not drawing with gl */
- if (window->gl_paint_context == NULL)
- return;
-
- context_mir = GDK_MIR_GL_CONTEXT (window->gl_paint_context);
- buffer_age = 0;
-
- egl_surface = _gdk_mir_window_get_egl_surface (window, context_mir->egl_config);
-
- if (_gdk_mir_display_have_egl_buffer_age (display))
- {
- gdk_gl_context_make_current (window->gl_paint_context);
- eglQuerySurface (_gdk_mir_display_get_egl_display (display), egl_surface,
- EGL_BUFFER_AGE_EXT, &buffer_age);
- }
-
- invalidate_all = FALSE;
- if (buffer_age == 0 || buffer_age >= 4)
- invalidate_all = TRUE;
- else
- {
- if (buffer_age >= 2)
- {
- if (window->old_updated_area[0])
- cairo_region_union (update_area, window->old_updated_area[0]);
- else
- invalidate_all = TRUE;
- }
- if (buffer_age >= 3)
- {
- if (window->old_updated_area[1])
- cairo_region_union (update_area, window->old_updated_area[1]);
- else
- invalidate_all = TRUE;
- }
- }
-
- if (invalidate_all)
- {
- window_rect.x = 0;
- window_rect.y = 0;
- window_rect.width = gdk_window_get_width (window);
- window_rect.height = gdk_window_get_height (window);
-
- /* If nothing else is known, repaint everything so that the back
- buffer is fully up-to-date for the swapbuffer */
- cairo_region_union_rectangle (update_area, &window_rect);
- }
-}
-
-EGLSurface
-_gdk_mir_window_get_egl_surface (GdkWindow *window,
- EGLConfig config)
-{
- GdkMirWindowImpl *impl;
-
- impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (!impl->egl_surface)
- {
- EGLDisplay egl_display;
- EGLNativeWindowType egl_window;
-
- ensure_no_mir_window (window);
- ensure_mir_window_full (window, mir_buffer_usage_hardware);
-
- egl_display = _gdk_mir_display_get_egl_display (gdk_window_get_display (window));
- egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (impl->buffer_stream);
-
- impl->egl_surface =
- eglCreateWindowSurface (egl_display, config, egl_window, NULL);
- }
-
- return impl->egl_surface;
-}
-
-EGLSurface
-_gdk_mir_window_get_dummy_egl_surface (GdkWindow *window,
- EGLConfig config)
-{
- GdkMirWindowImpl *impl;
-
- impl = GDK_MIR_WINDOW_IMPL (window->impl);
-
- if (!impl->dummy_egl_surface)
- {
- GdkDisplay *display;
- EGLDisplay egl_display;
- EGLNativeWindowType egl_window;
-
- display = gdk_window_get_display (window);
- egl_display = _gdk_mir_display_get_egl_display (display);
- egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (impl->buffer_stream);
-
- impl->dummy_egl_surface =
- eglCreateWindowSurface (egl_display, config, egl_window, NULL);
- }
-
- return impl->dummy_egl_surface;
-}
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-MirSurface *
-gdk_mir_window_get_mir_surface (GdkWindow *window)
-{
- return _gdk_mir_window_get_mir_window (window);
-}
-
-#pragma GCC diagnostic pop
-
-MirWindow *
-_gdk_mir_window_get_mir_window (GdkWindow *window)
-{
- g_return_val_if_fail (GDK_IS_MIR_WINDOW (window), NULL);
-
- return GDK_MIR_WINDOW_IMPL (window->impl)->mir_window;
-}
-
-void
-_gdk_mir_window_set_scale (GdkWindow *window,
- gdouble scale)
-{
- GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- GdkRectangle area = {0, 0, window->width, window->height};
- cairo_region_t *region;
- gint new_scale = (gint) round (scale);
-
- if (impl->output_scale != new_scale)
- {
- impl->output_scale = new_scale;
-
- drop_cairo_surface (window);
-
- if (impl->buffer_stream)
- mir_buffer_stream_set_scale (impl->buffer_stream, (float) new_scale);
-
- region = cairo_region_create_rectangle (&area);
- _gdk_window_invalidate_for_expose (window, region);
- cairo_region_destroy (region);
- }
-}
-
-static void
-gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GdkWindowImplClass *impl_class = GDK_WINDOW_IMPL_CLASS (klass);
-
- object_class->finalize = gdk_mir_window_impl_finalize;
-
- impl_class->ref_cairo_surface = gdk_mir_window_impl_ref_cairo_surface;
- impl_class->create_similar_image_surface = gdk_mir_window_impl_create_similar_image_surface;
- impl_class->show = gdk_mir_window_impl_show;
- impl_class->hide = gdk_mir_window_impl_hide;
- impl_class->withdraw = gdk_mir_window_impl_withdraw;
- impl_class->raise = gdk_mir_window_impl_raise;
- impl_class->lower = gdk_mir_window_impl_lower;
- impl_class->restack_under = gdk_mir_window_impl_restack_under;
- impl_class->restack_toplevel = gdk_mir_window_impl_restack_toplevel;
- impl_class->move_resize = gdk_mir_window_impl_move_resize;
- impl_class->move_to_rect = gdk_mir_window_impl_move_to_rect;
- impl_class->set_background = gdk_mir_window_impl_set_background;
- impl_class->get_events = gdk_mir_window_impl_get_events;
- impl_class->set_events = gdk_mir_window_impl_set_events;
- impl_class->reparent = gdk_mir_window_impl_reparent;
- impl_class->set_device_cursor = gdk_mir_window_impl_set_device_cursor;
- impl_class->get_geometry = gdk_mir_window_impl_get_geometry;
- impl_class->get_root_coords = gdk_mir_window_impl_get_root_coords;
- impl_class->get_device_state = gdk_mir_window_impl_get_device_state;
- impl_class->begin_paint = gdk_mir_window_impl_begin_paint;
- impl_class->end_paint = gdk_mir_window_impl_end_paint;
- impl_class->get_shape = gdk_mir_window_impl_get_shape;
- impl_class->get_input_shape = gdk_mir_window_impl_get_input_shape;
- impl_class->shape_combine_region = gdk_mir_window_impl_shape_combine_region;
- impl_class->input_shape_combine_region = gdk_mir_window_impl_input_shape_combine_region;
- impl_class->destroy = gdk_mir_window_impl_destroy;
- impl_class->destroy_foreign = gdk_mir_window_impl_destroy_foreign;
- impl_class->focus = gdk_mir_window_impl_focus;
- impl_class->set_type_hint = gdk_mir_window_impl_set_type_hint;
- impl_class->get_type_hint = gdk_mir_window_impl_get_type_hint;
- impl_class->set_modal_hint = gdk_mir_window_impl_set_modal_hint;
- impl_class->set_skip_taskbar_hint = gdk_mir_window_impl_set_skip_taskbar_hint;
- impl_class->set_skip_pager_hint = gdk_mir_window_impl_set_skip_pager_hint;
- impl_class->set_urgency_hint = gdk_mir_window_impl_set_urgency_hint;
- impl_class->set_geometry_hints = gdk_mir_window_impl_set_geometry_hints;
- impl_class->set_title = gdk_mir_window_impl_set_title;
- impl_class->set_role = gdk_mir_window_impl_set_role;
- impl_class->set_startup_id = gdk_mir_window_impl_set_startup_id;
- impl_class->set_transient_for = gdk_mir_window_impl_set_transient_for;
- impl_class->get_frame_extents = gdk_mir_window_impl_get_frame_extents;
- impl_class->set_override_redirect = gdk_mir_window_impl_set_override_redirect;
- impl_class->set_accept_focus = gdk_mir_window_impl_set_accept_focus;
- impl_class->set_focus_on_map = gdk_mir_window_impl_set_focus_on_map;
- impl_class->set_icon_list = gdk_mir_window_impl_set_icon_list;
- impl_class->set_icon_name = gdk_mir_window_impl_set_icon_name;
- impl_class->iconify = gdk_mir_window_impl_iconify;
- impl_class->deiconify = gdk_mir_window_impl_deiconify;
- impl_class->stick = gdk_mir_window_impl_stick;
- impl_class->unstick = gdk_mir_window_impl_unstick;
- impl_class->maximize = gdk_mir_window_impl_maximize;
- impl_class->unmaximize = gdk_mir_window_impl_unmaximize;
- impl_class->fullscreen = gdk_mir_window_impl_fullscreen;
- impl_class->apply_fullscreen_mode = gdk_mir_window_impl_apply_fullscreen_mode;
- impl_class->unfullscreen = gdk_mir_window_impl_unfullscreen;
- impl_class->set_keep_above = gdk_mir_window_impl_set_keep_above;
- impl_class->set_keep_below = gdk_mir_window_impl_set_keep_below;
- impl_class->get_group = gdk_mir_window_impl_get_group;
- impl_class->set_group = gdk_mir_window_impl_set_group;
- impl_class->set_decorations = gdk_mir_window_impl_set_decorations;
- impl_class->get_decorations = gdk_mir_window_impl_get_decorations;
- impl_class->set_functions = gdk_mir_window_impl_set_functions;
- impl_class->begin_resize_drag = gdk_mir_window_impl_begin_resize_drag;
- impl_class->begin_move_drag = gdk_mir_window_impl_begin_move_drag;
- impl_class->enable_synchronized_configure = gdk_mir_window_impl_enable_synchronized_configure;
- impl_class->configure_finished = gdk_mir_window_impl_configure_finished;
- impl_class->set_opacity = gdk_mir_window_impl_set_opacity;
- impl_class->set_composited = gdk_mir_window_impl_set_composited;
- impl_class->destroy_notify = gdk_mir_window_impl_destroy_notify;
- impl_class->get_drag_protocol = gdk_mir_window_impl_get_drag_protocol;
- impl_class->register_dnd = gdk_mir_window_impl_register_dnd;
- impl_class->drag_begin = gdk_mir_window_impl_drag_begin;
- impl_class->process_updates_recurse = gdk_mir_window_impl_process_updates_recurse;
- impl_class->sync_rendering = gdk_mir_window_impl_sync_rendering;
- impl_class->simulate_key = gdk_mir_window_impl_simulate_key;
- impl_class->simulate_button = gdk_mir_window_impl_simulate_button;
- impl_class->get_property = gdk_mir_window_impl_get_property;
- impl_class->change_property = gdk_mir_window_impl_change_property;
- impl_class->delete_property = gdk_mir_window_impl_delete_property;
- impl_class->get_scale_factor = gdk_mir_window_impl_get_scale_factor;
- impl_class->set_opaque_region = gdk_mir_window_impl_set_opaque_region;
- impl_class->set_shadow_width = gdk_mir_window_impl_set_shadow_width;
- impl_class->create_gl_context = gdk_mir_window_impl_create_gl_context;
- impl_class->invalidate_for_new_frame = gdk_mir_window_impl_invalidate_for_new_frame;
-}
diff --git a/gdk/mir/meson.build b/gdk/mir/meson.build
deleted file mode 100644
index db5acdac09..0000000000
--- a/gdk/mir/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-error('Mir gdk backend not ported to meson yet')
diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c
index 43df44e095..2f7afd3a74 100644
--- a/gdk/win32/gdkmonitor-win32.c
+++ b/gdk/win32/gdkmonitor-win32.c
@@ -144,6 +144,20 @@ typedef LONG
#define MONITORINFOF_PRIMARY 1
#endif
+/* MinGW-w64 does not have a prototype for function in its headers
+ * at the moment of writing.
+ */
+#if !defined (HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W)
+BOOL WINAPI SetupDiGetDevicePropertyW (HDEVINFO DeviceInfoSet,
+ PSP_DEVINFO_DATA DeviceInfoData,
+ const DEVPROPKEY *PropertyKey,
+ DEVPROPTYPE *PropertyType,
+ PBYTE PropertyBuffer,
+ DWORD PropertyBufferSize,
+ PDWORD RequiredSize,
+ DWORD Flags);
+#endif
+
#define G_GUID_FORMAT "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X"
#define g_format_guid(guid) (guid)->Data1, \
(guid)->Data2, \
diff --git a/gdk/win32/rc/gdk.rc b/gdk/win32/rc/gdk.rc
index 30c7960ecd..319dce525e 100644
--- a/gdk/win32/rc/gdk.rc
+++ b/gdk/win32/rc/gdk.rc
@@ -3,8 +3,8 @@
GTK_ICON ICON "gtk.ico"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,24,11,0
- PRODUCTVERSION 3,24,11,0
+ FILEVERSION 3,24,12,0
+ PRODUCTVERSION 3,24,12,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -17,12 +17,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The GTK developer community"
VALUE "FileDescription", "GIMP Drawing Kit"
- VALUE "FileVersion", "3.24.11.0"
+ VALUE "FileVersion", "3.24.12.0"
VALUE "InternalName", "libgdk-win32-3.0-0"
VALUE "LegalCopyright", "Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2011."
VALUE "OriginalFilename", "libgdk-win32-3.0-0.dll"
VALUE "ProductName", "GTK+"
- VALUE "ProductVersion", "3.24.11"
+ VALUE "ProductVersion", "3.24.12"
END
END
BLOCK "VarFileInfo"
diff --git a/gtk/a11y/gtkaccessibilityutil.c b/gtk/a11y/gtkaccessibilityutil.c
index 1ba892bad5..b6f909f294 100644
--- a/gtk/a11y/gtkaccessibilityutil.c
+++ b/gtk/a11y/gtkaccessibilityutil.c
@@ -101,6 +101,9 @@ _gtk_accessibility_override_atk_util (void)
{
AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL));
+ if (atk_class->get_root)
+ return;
+
atk_class->add_key_event_listener = add_key_event_listener;
atk_class->remove_key_event_listener = remove_key_event_listener;
atk_class->get_root = get_root;
diff --git a/gtk/gtk-win32.rc.body b/gtk/gtk-win32.rc.body
index 27bff72ca3..d2058d6866 100644
--- a/gtk/gtk-win32.rc.body
+++ b/gtk/gtk-win32.rc.body
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,24,11,0
- PRODUCTVERSION 3,24,11,0
+ FILEVERSION 3,24,12,0
+ PRODUCTVERSION 3,24,12,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The GTK developer community"
VALUE "FileDescription", "GIMP Toolkit"
- VALUE "FileVersion", "3.24.11.0"
+ VALUE "FileVersion", "3.24.12.0"
VALUE "InternalName", "libgtk-win32-3.0-0"
VALUE "LegalCopyright", "Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GTK+ Team and others 1997-2011."
VALUE "OriginalFilename", "libgtk-win32-3.0-0.dll"
VALUE "ProductName", "GTK+"
- VALUE "ProductVersion", "3.24.11"
+ VALUE "ProductVersion", "3.24.12"
END
END
BLOCK "VarFileInfo"
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 619aa07e95..78be3d10c0 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -742,6 +742,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
g_value_unset (¶m->value);
}
}
+
g_array_free (construct_parameters, TRUE);
custom_set_property = FALSE;
@@ -755,6 +756,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS
custom_set_property = TRUE;
}
+ /* We're going to set multiple properties in one go, so it's better
+ * to notify changes at the end
+ */
+ g_object_freeze_notify (obj);
+
for (i = 0; i < parameters->len; i++)
{
GParameter *param = &g_array_index (parameters, GParameter, i);
@@ -773,6 +779,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
#endif
g_value_unset (¶m->value);
}
+
+ g_object_thaw_notify (obj);
+
g_array_free (parameters, TRUE);
if (info->bindings)
@@ -819,6 +828,8 @@ _gtk_builder_apply_properties (GtkBuilder *builder,
custom_set_property = TRUE;
}
+ g_object_freeze_notify (info->object);
+
for (i = 0; i < parameters->len; i++)
{
GParameter *param = &g_array_index (parameters, GParameter, i);
@@ -837,6 +848,9 @@ _gtk_builder_apply_properties (GtkBuilder *builder,
#endif
g_value_unset (¶m->value);
}
+
+ g_object_thaw_notify (info->object);
+
g_array_free (parameters, TRUE);
}
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 93f912b969..ef4996c027 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -44,6 +44,7 @@
#include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
+#include "gtktooltipprivate.h"
#include "gtkcomboboxprivate.h"
#include
@@ -2315,6 +2316,7 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
return;
}
+ _gtk_tooltip_hide (GTK_WIDGET (combo_box));
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
if (GTK_IS_WINDOW (toplevel))
{
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index d46be8bd0d..53465a988c 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -1118,7 +1118,12 @@ unpack_font_description (GtkCssShorthandProperty *shorthand,
g_value_init (&v, G_TYPE_DOUBLE);
size = pango_font_description_get_size (description) / PANGO_SCALE;
if (!pango_font_description_get_size_is_absolute (description))
- size = size * gdk_screen_get_resolution (gdk_screen_get_default ()) / 72.0;
+ {
+ double dpi = gdk_screen_get_resolution (gdk_screen_get_default ());
+ if (dpi <= 0.0)
+ dpi = 96.0;
+ size = size * dpi / 72.0;
+ }
g_value_set_double (&v, size);
prop = _gtk_style_property_lookup ("font-size");
_gtk_style_property_assign (prop, props, state, &v);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 54a8bcd3ff..eec28a5ba9 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9911,13 +9911,15 @@ gtk_entry_drag_begin (GtkWidget *widget,
{
gint *ranges, n_ranges;
cairo_surface_t *surface;
+ double sx, sy;
surface = _gtk_text_util_create_drag_icon (widget, text, -1);
gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
+ cairo_surface_get_device_scale (surface, &sx, &sy);
cairo_surface_set_device_offset (surface,
- -(priv->drag_start_x - ranges[0]),
- -(priv->drag_start_y));
+ -(priv->drag_start_x - ranges[0]) * sx,
+ -(priv->drag_start_y) * sy);
g_free (ranges);
gtk_drag_set_icon_surface (context, surface);
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index 0094beb299..a0a622c111 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -38,6 +38,7 @@ G_BEGIN_DECLS
#define SETTINGS_KEY_LOCATION_MODE "location-mode"
#define SETTINGS_KEY_SHOW_HIDDEN "show-hidden"
#define SETTINGS_KEY_SHOW_SIZE_COLUMN "show-size-column"
+#define SETTINGS_KEY_SHOW_TYPE_COLUMN "show-type-column"
#define SETTINGS_KEY_SORT_COLUMN "sort-column"
#define SETTINGS_KEY_SORT_ORDER "sort-order"
#define SETTINGS_KEY_WINDOW_POSITION "window-position"
@@ -47,6 +48,7 @@ G_BEGIN_DECLS
#define SETTINGS_KEY_SORT_DIRECTORIES_FIRST "sort-directories-first"
#define SETTINGS_KEY_CLOCK_FORMAT "clock-format"
#define SETTINGS_KEY_DATE_FORMAT "date-format"
+#define SETTINGS_KEY_TYPE_FORMAT "type-format"
#define GTK_FILE_CHOOSER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_CHOOSER, GtkFileChooserIface))
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index fe9bceacdc..9c7aadb8fd 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -207,6 +207,12 @@ typedef enum {
DATE_FORMAT_WITH_TIME
} DateFormat;
+typedef enum {
+ TYPE_FORMAT_MIME,
+ TYPE_FORMAT_DESCRIPTION,
+ TYPE_FORMAT_CATEGORY
+} TypeFormat;
+
struct _GtkFileChooserWidgetPrivate {
GtkFileChooserAction action;
@@ -229,6 +235,7 @@ struct _GtkFileChooserWidgetPrivate {
GtkWidget *add_shortcut_item;
GtkWidget *hidden_files_item;
GtkWidget *size_column_item;
+ GtkWidget *type_column_item;
GtkWidget *copy_file_location_item;
GtkWidget *visit_file_item;
GtkWidget *open_folder_item;
@@ -332,6 +339,8 @@ struct _GtkFileChooserWidgetPrivate {
GtkCellRenderer *list_time_renderer;
GtkTreeViewColumn *list_size_column;
GtkCellRenderer *list_size_renderer;
+ GtkTreeViewColumn *list_type_column;
+ GtkCellRenderer *list_type_renderer;
GtkTreeViewColumn *list_location_column;
GtkCellRenderer *list_location_renderer;
@@ -348,6 +357,8 @@ struct _GtkFileChooserWidgetPrivate {
gint sort_column;
GtkSortType sort_order;
+ TypeFormat type_format;
+
/* Flags */
guint local_only : 1;
@@ -362,6 +373,7 @@ struct _GtkFileChooserWidgetPrivate {
guint list_sort_ascending : 1;
guint shortcuts_current_folder_active : 1;
guint show_size_column : 1;
+ guint show_type_column : 1;
guint create_folders : 1;
guint auto_selecting_first_row : 1;
};
@@ -396,9 +408,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
"access::can-rename,access::can-delete,access::can-trash," \
"standard::target-uri"
enum {
- /* the first 3 must be these due to settings caching sort column */
+ /* the first 4 must be these due to settings caching sort column */
MODEL_COL_NAME,
MODEL_COL_SIZE,
+ MODEL_COL_TYPE,
MODEL_COL_TIME,
MODEL_COL_FILE,
MODEL_COL_NAME_COLLATED,
@@ -418,6 +431,7 @@ enum {
MODEL_COL_NUM_COLUMNS, \
G_TYPE_STRING, /* MODEL_COL_NAME */ \
G_TYPE_INT64, /* MODEL_COL_SIZE */ \
+ G_TYPE_STRING, /* MODEL_COL_TYPE */ \
G_TYPE_LONG, /* MODEL_COL_TIME */ \
G_TYPE_FILE, /* MODEL_COL_FILE */ \
G_TYPE_STRING, /* MODEL_COL_NAME_COLLATED */ \
@@ -1843,6 +1857,22 @@ change_show_size_state (GSimpleAction *action,
priv->show_size_column);
}
+/* Callback used when the "Show Type Column" menu item is toggled */
+static void
+change_show_type_state (GSimpleAction *action,
+ GVariant *state,
+ gpointer data)
+{
+ GtkFileChooserWidget *impl = data;
+ GtkFileChooserWidgetPrivate *priv = impl->priv;
+
+ g_simple_action_set_state (action, state);
+ priv->show_type_column = g_variant_get_boolean (state);
+
+ gtk_tree_view_column_set_visible (priv->list_type_column,
+ priv->show_type_column);
+}
+
static void
change_sort_directories_first_state (GSimpleAction *action,
GVariant *state,
@@ -2214,6 +2244,7 @@ static GActionEntry entries[] = {
{ "trash", trash_file_cb, NULL, NULL, NULL },
{ "toggle-show-hidden", NULL, NULL, "false", change_show_hidden_state },
{ "toggle-show-size", NULL, NULL, "false", change_show_size_state },
+ { "toggle-show-type", NULL, NULL, "false", change_show_type_state },
{ "toggle-show-time", NULL, NULL, "false", change_show_time_state },
{ "toggle-sort-dirs-first", NULL, NULL, "false", change_sort_directories_first_state }
};
@@ -2294,6 +2325,7 @@ file_list_build_popover (GtkFileChooserWidget *impl)
priv->hidden_files_item = add_button (box, _("Show _Hidden Files"), "item.toggle-show-hidden");
priv->size_column_item = add_button (box, _("Show _Size Column"), "item.toggle-show-size");
+ priv->type_column_item = add_button (box, _("Show T_ype Column"), "item.toggle-show-type");
priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time");
priv->sort_directories_item = add_button (box, _("Sort _Folders before Files"), "item.toggle-sort-dirs-first");
}
@@ -2331,6 +2363,9 @@ file_list_update_popover (GtkFileChooserWidget *impl)
action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-size");
g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_size_column));
+ action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-type");
+ g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_type_column));
+
action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-time");
g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_time));
@@ -2446,6 +2481,7 @@ file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE);
+ gtk_tree_view_column_set_sort_column_id (priv->list_type_column, MODEL_COL_TYPE);
gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT);
}
@@ -3825,8 +3861,10 @@ settings_load (GtkFileChooserWidget *impl)
GtkFileChooserWidgetPrivate *priv = impl->priv;
gboolean show_hidden;
gboolean show_size_column;
+ gboolean show_type_column;
gboolean sort_directories_first;
DateFormat date_format;
+ TypeFormat type_format;
gint sort_column;
GtkSortType sort_order;
StartupMode startup_mode;
@@ -3837,23 +3875,28 @@ settings_load (GtkFileChooserWidget *impl)
show_hidden = g_settings_get_boolean (settings, SETTINGS_KEY_SHOW_HIDDEN);
show_size_column = g_settings_get_boolean (settings, SETTINGS_KEY_SHOW_SIZE_COLUMN);
+ show_type_column = g_settings_get_boolean (settings, SETTINGS_KEY_SHOW_TYPE_COLUMN);
sort_column = g_settings_get_enum (settings, SETTINGS_KEY_SORT_COLUMN);
sort_order = g_settings_get_enum (settings, SETTINGS_KEY_SORT_ORDER);
sidebar_width = g_settings_get_int (settings, SETTINGS_KEY_SIDEBAR_WIDTH);
startup_mode = g_settings_get_enum (settings, SETTINGS_KEY_STARTUP_MODE);
sort_directories_first = g_settings_get_boolean (settings, SETTINGS_KEY_SORT_DIRECTORIES_FIRST);
date_format = g_settings_get_enum (settings, SETTINGS_KEY_DATE_FORMAT);
+ type_format = g_settings_get_enum (settings, SETTINGS_KEY_TYPE_FORMAT);
if (!priv->show_hidden_set)
set_show_hidden (impl, show_hidden);
priv->show_size_column = show_size_column;
gtk_tree_view_column_set_visible (priv->list_size_column, show_size_column);
+ priv->show_type_column = show_type_column;
+ gtk_tree_view_column_set_visible (priv->list_type_column, show_type_column);
priv->sort_column = sort_column;
priv->sort_order = sort_order;
priv->startup_mode = startup_mode;
priv->sort_directories_first = sort_directories_first;
priv->show_time = date_format == DATE_FORMAT_WITH_TIME;
+ priv->type_format = type_format;
/* We don't call set_sort_column() here as the models may not have been
* created yet. The individual functions that create and set the models will
@@ -3878,12 +3921,14 @@ settings_save (GtkFileChooserWidget *impl)
g_settings_set_boolean (settings, SETTINGS_KEY_SHOW_HIDDEN,
gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (impl)));
g_settings_set_boolean (settings, SETTINGS_KEY_SHOW_SIZE_COLUMN, priv->show_size_column);
+ g_settings_set_boolean (settings, SETTINGS_KEY_SHOW_TYPE_COLUMN, priv->show_type_column);
g_settings_set_boolean (settings, SETTINGS_KEY_SORT_DIRECTORIES_FIRST, priv->sort_directories_first);
g_settings_set_enum (settings, SETTINGS_KEY_SORT_COLUMN, priv->sort_column);
g_settings_set_enum (settings, SETTINGS_KEY_SORT_ORDER, priv->sort_order);
g_settings_set_int (settings, SETTINGS_KEY_SIDEBAR_WIDTH,
gtk_paned_get_position (GTK_PANED (priv->browse_widgets_hpaned)));
g_settings_set_enum (settings, SETTINGS_KEY_DATE_FORMAT, priv->show_time ? DATE_FORMAT_WITH_TIME : DATE_FORMAT_REGULAR);
+ g_settings_set_enum (settings, SETTINGS_KEY_TYPE_FORMAT, priv->type_format);
/* Now apply the settings */
g_settings_apply (settings);
@@ -4135,6 +4180,20 @@ compare_size (GtkFileSystemModel *model,
return size_a < size_b ? -1 : (size_a == size_b ? 0 : 1);
}
+static gint
+compare_type (GtkFileSystemModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ GtkFileChooserWidget *impl)
+{
+ const char *key_a, *key_b;
+
+ key_a = g_value_get_string (_gtk_file_system_model_get_value (model, a, MODEL_COL_TYPE));
+ key_b = g_value_get_string (_gtk_file_system_model_get_value (model, b, MODEL_COL_TYPE));
+
+ return g_strcmp0 (key_a, key_b);
+}
+
static gint
compare_time (GtkFileSystemModel *model,
GtkTreeIter *a,
@@ -4201,6 +4260,25 @@ size_sort_func (GtkTreeModel *model,
return result;
}
+/* Sort callback for the type column */
+static gint
+type_sort_func (GtkTreeModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ gpointer user_data)
+{
+ GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
+ GtkFileChooserWidget *impl = user_data;
+ gint result;
+
+ result = compare_directory (fs_model, a, b, impl);
+
+ if (result == 0)
+ result = compare_type (fs_model, a, b, impl);
+
+ return result;
+}
+
/* Sort callback for the time column */
static gint
time_sort_func (GtkTreeModel *model,
@@ -4905,6 +4983,92 @@ file_system_model_got_thumbnail (GObject *object,
gdk_threads_leave ();
}
+/* Copied from src/nautilus_file.c:get_description() */
+struct {
+ const char *icon_name;
+ const char *display_name;
+} mime_type_map[] = {
+ { "application-x-executable", N_("Program") },
+ { "audio-x-generic", N_("Audio") },
+ { "font-x-generic", N_("Font") },
+ { "image-x-generic", N_("Image") },
+ { "package-x-generic", N_("Archive") },
+ { "text-html", N_("Markup") },
+ { "text-x-generic", N_("Text") },
+ { "text-x-generic-template", N_("Text") },
+ { "text-x-script", N_("Program") },
+ { "video-x-generic", N_("Video") },
+ { "x-office-address-book", N_("Contacts") },
+ { "x-office-calendar", N_("Calendar") },
+ { "x-office-document", N_("Document") },
+ { "x-office-presentation", N_("Presentation") },
+ { "x-office-spreadsheet", N_("Spreadsheet") },
+};
+
+static char *
+get_category_from_content_type (const char *content_type)
+{
+ char *icon_name;
+ char *basic_type = NULL;
+
+ icon_name = g_content_type_get_generic_icon_name (content_type);
+ if (icon_name != NULL)
+ {
+ int i;
+
+ for (i = 0; i <
