3.89.1

Fix a regression introduced in 4ce6d10601
which causes devices with an odd-numbered zero-based index in the list
to be passed over incorrectly. This might present as yet another "device
does not send pressure" bug for ~50% of devices out there.

This commit also closes off another potential segfault for wintab_devices
lists which have an odd length.

https://bugzilla.gnome.org/show_bug.cgi?id=774699

NEWS

@@ -1,3 +1,129 @@
+Overview of Changes in GTK+ 3.89.1
+==================================
+
+This release marks the first snapshot of development leading to GTK+ 4,
+it is unstable and expected to change drastically.
+
+Do not use it in production.
+
+GTK+ 3.89 is parallel-installable with the stable GTK+ 3.22.x releases.
+
+The API documentation contains an initial migration guide for porting
+from GTK+ 3 to GTK+ 4.
+
+Detailed changes:
+
+* GSK has been integrated. Widgets are now rendered into
+  GskRenderNodes, which then get drawn using GL
+
+* GTK+ now installs a single shared library, libgtk.so, which includes
+  GDK and GSK as well
+
+* All installed binaries now use a consistent gtk4- prefix to avoid conflicts
+
+* Dropped APIs:
+  - all APIs that have been deprecated in GTK+ 3
+  - (almost) all widget style properties
+  - offscreen windows
+  - -gtk-gradient in CSS
+  - gdk_pixbuf_get_from_window and gdk_cairo_set_source_window
+
+* Changed APIs:
+ - GtkCssProvider load functions lost their GError argument
+
+* New APIs:
+ - GMenu items can now have a text-direction attribute
+ - GtkShortcutsShortcut supports single-finger swipe gestures
+ - gdk_display_is_rgba and gdk_display_is_composited
+ - New GtkButton API to construct image buttons:
+     gtk_button_new_from_icon_name
+     gtk_button_set_icon_name
+ - New GdkWindow constructors replacing gdk_window_new:
+     gdk_window_new_toplevel
+     gdk_window_new_popup
+     gdk_window_new_temp
+     gdk_window_new_child
+     gdk_window_new_input
+     gdk_wayland_window_new_subsurface
+ - gtk_widget_measure replaces gtk_widget_get_preferred_...
+ - gtk_widget_snapshot replaces gtk_widget_render
+ - gtk_drawing_area_set_draw_func replaces the ::draw signal
+
+* New examples in gtk4-demo:
+ - Gestures
+ - Fishbowl
+
+* GtkInspector now has a frame recorder which shows detailed information
+  about the widget to render node conversion
+
+* Hi-DPI is now supported with the Windows backend
+
+* gtk-builder-tool can now replace the input file
+
+* Bugs fixed:
+ 756570 gtkplacesview no longer provides guidance on address formats
+ 767713 Fullscreen in wayland is buggy
+ 768531 wayland: Startup notification doesn't work on some apps (eg. gnome-terminal)...
+ 771205 Buttons with circular style class have a suddenly clipped shadow at the bottom
+ 771320 [Wayland] Maps widget is displayed at wrong position inside gnome-contacts
+ 771694 GtkSourceView completion popup window not shown, no grabbed seat found
+ 772075 GTK+ uses a lot more CPU under Wayland than under X11
+ 772345 placesviewrow: busy_spinner when visible offsets the rest of the widgets on the row
+ 772348 placesviewrow: busy_spinner when visible offsets the rest of the widgets on the row
+ 772683 Usage of FALSE instead of gint in glarea demo
+ 772695 Show the keyboard shortcuts from left to right even in RTL
+ 772770 [GtkShortcutsWindow] Support for single-finger swipe gestures
+ 772859 Fix memory leaks in implementations of common widgets
+ 772922 GtkMenu: Try using gdk_window_move_to_rect() more often
+ 772926 shortcutswindow: working version of set_section_name()
+ 773007 GtkFilechooser gives completion for non-matching extensions
+ 773082 overlay: Document availability of properties
+ 773113 tests: fix clipboard test by loading correct icon
+ 773180 Don't second-guess whether our GDK GL context is GLES
+ 773246 Typo in css color definitions documentation
+ 773299 Ensure GTK+-4.x builds and works on Windows (MSVC in particular)
+ 773474 Color chooser dialog opened with show-editor=TRUE has black header bar
+ 773587 recent-manager: Add a limit to the list's size
+ 773799 GtkLevelBar doesn't update blocks on discrete mode
+ 773857 gdkwindow-x11: Add support for gdk_window_fullscreen_on_monitor
+ 773885 pop down GtkPopover on pressing escape
+ 773903 Gtk+4: gtk.h and gtktextiter.h include private gtktextattributes.h
+ 773916 GtkComposeTable caches broken: using a same ~/.XCompose does not work twice in a row
+ 773954 gtkstylecontext: Clarify memory allocation behaviour of getters
+ 773979 GdkGLContext does not chain finalize handler
+ 774046 GtkSpinButton does not always unref priv->{up,down}_button
+ 774066 GtkHeaderBar does not unref all GtkBox and GtkSeparator it creates
+ 774097 GtkPrintOperation should not truncate job names
+ 774114 Window shadows are repainted even if only the contents of the window change
+ 774185 GtkPlacesSidebar does not unref itsel as many times as it references
+ 774347 Fails to build: unknown type name GdkColor
+ 774352 GtkAppChooserWidget does not unref all GAppInfo it references
+ 774475 wayland: gtk+ prevents using subsurfaces if the parent is not root
+ 774476 surfaces with no outputs get scale factor reset
+ 774490 Deprecated example for modify color or font
+ 774609 small fix to foreign drawing spinbutton demo
+ 774614 Wrong #include in Print docs
+ 774634 GtkPlacesView does not unref all GDaemonFileEnumerator it references
+ 774695 GtkProgressbar needs full and empty classes
+ 774699 wintab: list iteration regression causes odd-indexed devices to be ignored during...
+
+* Translation updates
+ Brazilian Portuguese
+ Catalan
+ Czech
+ Danish
+ French
+ German
+ Greek
+ Hungarian
+ Kazakh
+ Lithuanian
+ Polish
+
+
+=======================================================================
+
+
 Overview of Changes in GTK+ 3.22.1
 ==================================
 

build/win32/gtkpc.py

@@ -28,10 +28,10 @@ def main(argv):
     base_pc.setup(argv, gdk_parser)
 
     atk_min_ver = '2.15.1'
-    cairo_min_ver = '1.14.0'
+    cairo_min_ver = '1.15.2'
     gdk_pixbuf_min_ver = '2.30.0'
     gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi'
-    glib_min_ver = '2.45.8'
+    glib_min_ver = '2.49.4'
     epoxy_min_ver = '1.0'
     graphene_min_ver = '1.2'
 
@@ -54,46 +54,29 @@ def main(argv):
                             'cairo >= ' + cairo_min_ver + ' ' + \
                             'cairo-gobject >= ' + cairo_min_ver
 
-    gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \
-                                              'pangowin32 pangocairo' + ' ' + \
-                                              pkg_required_packages,
-                            '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
-                            '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs,
-                            '@GDK_EXTRA_CFLAGS@': '',
-                            'gdk-4': 'gdk-4.0'}
-
-    gsk_pc_replace_items = {'@GSK_PACKAGES@': pkg_required_packages, + ' ' + \
-                                              'graphene-1.0 >= ' + graphene_min_ver
-                            '@GSK_PRIVATE_PACKAGES@': 'epoxy >= ' + epoxy_min_ver,
-                            '@GSK_EXTRA_LIBS@': '',
-                            '@GSK_EXTRA_CFLAGS@': '',
-                            'gsk-4': 'gsk-4.0'}
-
     gtk_pc_replace_items = {'@host@': gdk_args.host,
                             '@GTK_BINARY_VERSION@': '4.0.0',
+                            '@GDK_PACKAGES@': gio_package + ' ' + \
+                                              'pangowin32 pangocairo' + ' ' + \
+                                              pkg_required_packages,
+                            '@GSK_PACKAGES@': pkg_required_packages + ' ' + \
+                                              'graphene-1.0 >= ' + graphene_min_ver,
                             '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \
                                               pkg_required_packages + ' ' + \
                                               gio_package,
+                            '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
+                            '@GSK_PRIVATE_PACKAGES@': 'epoxy >= ' + epoxy_min_ver,
                             '@GTK_PRIVATE_PACKAGES@': 'atk',
+                            '@GDK_EXTRA_CFLAGS@': '',
+                            '@GSK_EXTRA_CFLAGS@': '',
                             '@GTK_EXTRA_CFLAGS@': '',
-                            '@GTK_EXTRA_LIBS@': '',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            'gtk-4': 'gtk-4.0'}
+                            '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs,
+                            '@GSK_EXTRA_LIBS@': '',
+                            '@GTK_EXTRA_LIBS@': ''}
 
     pkg_replace_items.update(base_pc.base_replace_items)
-    gdk_pc_replace_items.update(pkg_replace_items)
     gtk_pc_replace_items.update(pkg_replace_items)
 
-    # Generate gdk-4.0.pc
-    replace_multi(base_pc.top_srcdir + '/gdk-4.0.pc.in',
-                  base_pc.srcdir + '/gdk-4.0.pc',
-                  gdk_pc_replace_items)
-
-    # Generate gsk-4.0.pc
-    replace_multi(base_pc.top_srcdir + '/gsk-4.0.pc.in',
-                  base_pc.srcdir + '/gsk-4.0.pc',
-                  gsk_pc_replace_items)
-
     # Generate gtk+-4.0.pc
     replace_multi(base_pc.top_srcdir + '/gtk+-4.0.pc.in',
                   base_pc.srcdir + '/gtk+-4.0.pc',

build/win32/vs12/Makefile.am

@@ -5,14 +5,14 @@ GENERATED_ITEMS = \
 	gdk4-win32.vcxproj.filters		\
 	gdk4-broadway.vcxproj			\
 	gdk4-broadway.vcxproj.filters		\
-	broadwayd.vcxproj			\
-	broadwayd.vcxproj.filters		\
 	gdk-4.vcxproj				\
 	gdk-4.vcxproj.filters			\
 	gsk-4.vcxproj				\
 	gsk-4.vcxproj.filters			\
 	gtk-4.vcxproj				\
 	gtk-4.vcxproj.filters			\
+	gtk4-broadwayd.vcxproj			\
+	gtk4-broadwayd.vcxproj.filters		\
 	gtk4-demo.vcxproj			\
 	gtk4-demo.vcxproj.filters		\
 	gtk4-demo-application.vcxproj		\
@@ -38,14 +38,14 @@ EXTRA_DIST += \
 	gdk4-win32.vcxproj.filtersin		\
 	gdk4-broadway.vcxprojin			\
 	gdk4-broadway.vcxproj.filtersin		\
-	broadwayd.vcxprojin			\
-	broadwayd.vcxproj.filtersin		\
 	gdk-4.vcxprojin				\
 	gdk-4.vcxproj.filtersin			\
 	gsk-4.vcxprojin				\
 	gsk-4.vcxproj.filtersin			\
 	gtk-4.vcxprojin				\
 	gtk-4.vcxproj.filtersin			\
+	gtk4-broadwayd.vcxprojin		\
+	gtk4-broadwayd.vcxproj.filtersin	\
 	gtk4-builder-tool.vcxproj		\
 	gtk4-builder-tool.vcxproj.filters	\
 	gtk4-encode-symbolic-svg.vcxproj	\
@@ -63,7 +63,7 @@ EXTRA_DIST += \
 	gtk4-install.vcxproj			\
 	gtk4-install.vcxproj.filters		\
 	gtk4-build-defines.props		\
-	gtk4-copy-gdk-broadway.props		\
+	gtk4-copy-gtk-broadway.props		\
 	gtk4-gen-srcs.props			\
 	gtk4-ignore-broadway.props		\
 	gtk4-install.propsin			\

build/win32/vs12/gdk-4.vcxproj.filtersin

@@ -14,9 +14,6 @@
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
 #include "gdk-4.vs12.sourcefiles.filters"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs12/gdk-4.vcxprojin

@@ -41,46 +41,46 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
@@ -89,35 +89,35 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-ignore-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-ignore-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-ignore-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-ignore-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-copy-gdk-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-copy-gdk-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-copy-gdk-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-copy-gdk-broadway.props" />
+    <Import Project="gtk4-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -143,15 +143,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
     <ClCompile>
@@ -166,15 +157,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -186,17 +168,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
     <ClCompile>
@@ -208,17 +179,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -233,15 +193,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
     <ClCompile>
@@ -256,15 +207,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -276,17 +218,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
     <ClCompile>
@@ -298,35 +229,11 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
-  </ItemGroup>
   <ItemGroup>
 #include "gdk-4.vs12.sourcefiles"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk4-broadway.vcxproj">
-      <Project>{1df4c475-4472-4ee4-ac2b-3ab5a4c1a453}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdk4-win32.vcxproj">
-      <Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

build/win32/vs12/gsk-4.vcxprojin

@@ -25,24 +25,24 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
@@ -85,15 +85,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -105,17 +96,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -130,15 +110,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -150,17 +121,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gsk\gskenumtypes.c.template">
@@ -195,12 +155,6 @@
   <ItemGroup>
 #include "gsk-4.vs12.sourcefiles"
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

build/win32/vs12/gtk+-4.sln

@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win32", "gdk4-win32.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-broadway", "gdk4-broadway.vcxproj", "{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-broadwayd", "gtk4-broadwayd.vcxproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-4", "gdk-4.vcxproj", "{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
 EndProject
@@ -138,14 +138,14 @@ Global
 		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32
 		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64
 		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release|x64
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
 		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32
 		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64

build/win32/vs12/gtk-4.vcxprojin

@@ -5,20 +5,36 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_Broadway|Win32">
+      <Configuration>Debug_Broadway</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_Broadway|x64">
+      <Configuration>Debug_Broadway</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Broadway|Win32">
+      <Configuration>Release_Broadway</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Broadway|x64">
+      <Configuration>Release_Broadway</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}</ProjectGuid>
@@ -26,17 +42,12 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
@@ -46,31 +57,78 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
+    <Import Project="gtk4-ignore-broadway.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
+    <Import Project="gtk4-copy-gtk-broadway.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
+    <Import Project="gtk4-ignore-broadway.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk4-copy-gtk-broadway.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk4-ignore-broadway.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk4-copy-gtk-broadway.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk4-ignore-broadway.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk4-copy-gtk-broadway.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -88,7 +146,30 @@
     <Link>
       <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -108,7 +189,29 @@
     <Link>
       <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -133,7 +236,30 @@
     <Link>
       <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -153,7 +279,29 @@
     <Link>
       <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -176,6 +324,18 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ DBus Sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying GTK+ Win32 Version Resource...</Message>
@@ -190,6 +350,18 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying GTK+ Win32 Version Resource...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGtkWin32RC)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\gtk\libgtk4.manifest.in">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Manifest...</Message>
@@ -204,10 +376,24 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Manifest...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32Manifest)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc">
+      <AdditionalIncludeDirectories>..\..\..\gdk\win32\rc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
 #include "gtk-4.vs12.sourcefiles"
@@ -231,6 +417,14 @@
     <Manifest Include="..\..\..\gtk\libgtk4.manifest" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="gdk4-broadway.vcxproj">
+      <Project>{1df4c475-4472-4ee4-ac2b-3ab5a4c1a453}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gdk4-win32.vcxproj">
+      <Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="gdk-4.vcxproj">
       <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-broadwayd.vcxproj.filtersin

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "broadwayd.vs12.sourcefiles.filters"
+#include "gtk4-broadwayd.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>

build/win32/vs12/gtk4-broadwayd.vcxprojin

@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "broadwayd.vs12.sourcefiles"
+#include "gtk4-broadwayd.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">

build/win32/vs12/gtk4-build-defines.props

@@ -14,7 +14,7 @@
     <GtkGdkCommonLibs>imm32.lib</GtkGdkCommonLibs>
     <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
     <GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
-    <GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
+    <GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GdkAdditionalLibs)</GtkAdditionalLibs>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk4builddefinesprops</_PropertySheetDisplayName>

build/win32/vs12/gtk4-builder-tool.vcxproj

@@ -166,10 +166,6 @@
     <ClCompile Include="..\..\..\gtk\gtk-builder-tool.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-4.vcxproj">
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-copy-gtk-broadway.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gtk4-build-defines.props" />
+    <Import Project="gtk4-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk4copygdkbroadwayprops</_PropertySheetDisplayName>
@@ -13,36 +13,22 @@
     <PostBuildEvent>
       <Command>
 if "$(Configuration)" == "Release" goto END
-
 if "$(Configuration)" == "Debug" goto END
-
 if "$(Configuration)" == "Release_Broadway" goto DoRelease
-
 if "$(Configuration)" == "Debug_Broadway" goto DoDebug
 
-
 :DoRelease
-
 mkdir .\Release\$(Platform)\bin
-
-copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
-
-copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\
-
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
+copy /b $(Configuration)\$(Platform)\bin\gtk-$(ApiVersion).lib .\Release\$(Platform)\bin\
 goto END
 
-
 :DoDebug
-
 mkdir .\Debug\$(Platform)\bin
-
-copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\
-
-copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\
-
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\
+copy /b $(Configuration)\$(Platform)\bin\gtk-$(ApiVersion).lib .\Debug\$(Platform)\bin\
 goto END
 
-
 :END
       </Command>
     </PostBuildEvent>

build/win32/vs12/gtk4-demo-application.vcxprojin

@@ -158,10 +158,6 @@
 #include "gtk4-demo-application.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-4.vcxproj">
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-demo.vcxprojin

@@ -172,10 +172,6 @@
 #include "gtk4-demo.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-4.vcxproj">
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj

@@ -166,8 +166,8 @@
     <ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
+    <ProjectReference Include="gtk-4.vcxproj">
+      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>

build/win32/vs12/gtk4-icon-browser.vcxprojin

@@ -162,10 +162,6 @@
 #include "gtk4-icon-browser.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-4.vcxproj">
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-ignore-broadway.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gtk4-build-defines.props" />
+    <Import Project="gtk4-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk4ignorebroadwayprops</_PropertySheetDisplayName>
@@ -11,7 +11,7 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Link>
-      <AdditionalDependencies>$(OutDir)\gdk4-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(OutDir)\gsk-4.lib;$(OutDir)\gdk-4.lib;$(OutDir)\gdk4-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs12/gtk4-install.propsin

@@ -9,18 +9,11 @@
 mkdir $(CopyDir)\bin
 mkdir $(CopyDir)\lib\pkgconfig
 
-copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
-
 if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
-copy "$(BinDir)\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gsk-$(ApiVersion).lib" $(CopyDir)\lib
 copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
 copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\gtk-$(ApiVersionShort).lib" $(CopyDir)\lib
 copy "$(BinDir)\gtk4-demo.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk4-demo.pdb" $(CopyDir)\bin
 copy "$(BinDir)\gtk4-demo-application.exe" $(CopyDir)\bin
@@ -44,12 +37,9 @@ copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
 if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
 :DO_BROADWAY_RELEASE
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gsk-$(ApiVersion).lib $(CopyDir)\lib
 copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
+copy .\Release\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
 copy .\Release\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
@@ -68,12 +58,9 @@ copy .\Release\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
 goto DONE_BIN
 
 :DO_BROADWAY_DEBUG
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gsk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gsk-$(ApiVersion).lib $(CopyDir)\lib
 copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
+copy .\Debug\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
 copy .\Debug\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
@@ -91,9 +78,8 @@ copy .\Debug\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
 
 :DONE_BIN
 
-copy ..\gdk-4.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gsk-4.0.pc $(CopyDir)\lib\pkgconfig
 copy "..\gtk+-4.0.pc" $(CopyDir)\lib\pkgconfig
+copy "..\gtk+-4.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-4.0.pc"
     </GtkDoInstallBin>
     <GtkDoInstall>
 echo off
@@ -131,7 +117,7 @@ $(CopyDir)\bin\gtk4-update-icon-cache.exe --ignore-theme-index --force "$(CopyDi
     </GtkPostInstall>
     <GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
     <GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
-    <GtkPCFiles>..\gdk-4.0.pc;..\gsk-4.0.pc;..\gtk+-4.0.pc</GtkPCFiles>
+    <GtkPCFiles>..\gtk+-4.0.pc</GtkPCFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk4installsprops</_PropertySheetDisplayName>

build/win32/vs12/gtk4-install.vcxproj

@@ -217,14 +217,6 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gsk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-eb2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk4-demo.vcxproj">
       <Project>{bdae6de2-6bcc-4107-94f0-da12214a02de}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -233,6 +225,10 @@
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gtk4-broadwayd.vcxproj">
+      <Project>{e9687d21-e214-4a0c-9eb4-8b38ebb783e5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="gtk4-demo-application.vcxproj">
       <Project>{be6b4973-c6ff-4c8f-8e97-a47793c50f44}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -241,10 +237,6 @@
       <Project>{343333c4-d46c-4c97-a986-959cca6f1de0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="broadwayd.vcxproj">
-      <Project>{e9687d21-e214-4a0c-9eb4-8b38ebb783e5}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk4-encode-symbolic-svg.vcxproj">
       <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-query-settings.vcxproj

@@ -166,10 +166,6 @@
     <ClCompile Include="..\..\..\gtk\gtk-query-settings.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-4.vcxproj">
       <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs12/gtk4-version-paths.props.in

@@ -4,7 +4,8 @@
     <VSVer>12</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
-    <ApiVersion>4.0</ApiVersion>
+    <ApiVersionShort>4</ApiVersionShort>
+    <ApiVersion>$(ApiVersionShort).0</ApiVersion>
     <GtkVersion>@GTK_VERSION@</GtkVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
     <GtkLibtoolCompatibleDllSuffix>.0-0</GtkLibtoolCompatibleDllSuffix>
@@ -28,6 +29,9 @@
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="ApiVersionShort">
+      <Value>$(ApiVersionShort)</Value>
+    </BuildMacro>
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>

build/win32/vs14/Makefile.am

@@ -29,12 +29,12 @@ EXTRA_DIST +=	\
 	gtk4-icon-browser.vcxproj.filters	\
 	gtk4-install.vcxproj	\
 	gtk4-install.vcxproj.filters	\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
+	gtk4-broadwayd.vcxproj	\
+	gtk4-broadwayd.vcxproj.filters	\
 	gdk4-broadway.vcxproj	\
 	gdk4-broadway.vcxproj.filters	\
 	gtk4-build-defines.props	\
-	gtk4-copy-gdk-broadway.props	\
+	gtk4-copy-gtk-broadway.props	\
 	gtk4-gen-srcs.props	\
 	gtk4-ignore-broadway.props	\
 	gtk4-install.props	\

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [89])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -64,7 +64,7 @@ m4_define([wayland_protocols_required_version], [1.7])
 m4_define([mirclient_required_version], [0.22.0])
 m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.0])
-m4_define([graphene_required_version], [1.2])
+m4_define([graphene_required_version], [1.5.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -404,7 +404,7 @@ if test "x$enable_quartz_backend" = xyes; then
   backend_immodules="$backend_immodules,quartz"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa -framework Carbon"
   DISABLE_ON_QUARTZ='%'
   AM_CONDITIONAL(USE_QUARTZ, true)
   if test "x$quartz_relocation" = xyes; then
@@ -1999,7 +1999,6 @@ gdk/broadway/Makefile
 gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/rc/Makefile
-gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
 gdk/mir/Makefile

demos/gtk-demo/Makefile.am

@@ -27,6 +27,7 @@ demos_base =					\
 	event_axes.c				\
 	expander.c  				\
         filtermodel.c				\
+	fishbowl.c				\
 	foreigndrawing.c			\
 	gestures.c				\
 	glarea.c				\

demos/gtk-demo/application.c

@@ -212,7 +212,7 @@ activate_about (GSimpleAction *action,
                          "comments", "Program to demonstrate GTK+ functions.",
                          "authors", authors,
                          "documenters", documentors,
-                         "logo-icon-name", "gtk3-demo",
+                         "logo-icon-name", "gtk4-demo",
                          "title", "About GTK+ Code Demos",
                          NULL);
 }

demos/gtk-demo/application_demo.c

@@ -63,10 +63,10 @@ do_application_demo (GtkWidget *toplevel)
       const gchar *command;
       GError *error = NULL;
 
-      if (g_file_test ("./gtk3-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk3-demo-application" APP_EXTENSION;
+      if (g_file_test ("./gtk4-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
+        command = "./gtk4-demo-application" APP_EXTENSION;
       else
-        command = "gtk3-demo-application";
+        command = "gtk4-demo-application";
 
       if (!g_spawn_command_line_async (command, &error))
         {

demos/gtk-demo/colorsel.c

@@ -15,15 +15,15 @@ static GtkWidget *frame;
 
 /* draw callback for the drawing area
  */
-static gboolean
-draw_callback (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
+static void
+draw_function (GtkDrawingArea *da,
+               cairo_t        *cr,
+               int             width,
+               int             height,
+               gpointer        data)
 {
   gdk_cairo_set_source_rgba (cr, &color);
   cairo_paint (cr);
-
-  return TRUE;
 }
 
 static void
@@ -87,11 +87,9 @@ do_colorsel (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
 
       da = gtk_drawing_area_new ();
-
-      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);
-
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 200, 200);
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 200);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_function, NULL, NULL);
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 

demos/gtk-demo/css_multiplebgs.c

@@ -51,22 +51,17 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_style_context_reset_widgets (gdk_screen_get_default ());
 }
 
-static gboolean
-drawing_area_draw (GtkWidget *widget,
-                   cairo_t *cr)
+static void
+drawing_area_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  GtkStyleContext *context = gtk_widget_get_style_context (widget);
+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));
 
-  gtk_render_background (context, cr,
-                         0, 0,
-                         gtk_widget_get_allocated_width (widget),
-                         gtk_widget_get_allocated_height (widget));
-  gtk_render_frame (context, cr,
-                    0, 0,
-                    gtk_widget_get_allocated_width (widget),
-                    gtk_widget_get_allocated_height (widget));
-
-  return FALSE;
+  gtk_render_background (context, cr, 0, 0, width, height);
+  gtk_render_frame (context, cr, 0, 0, width, height);
 }
 
 static void
@@ -105,8 +100,9 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
       child = gtk_drawing_area_new ();
       gtk_widget_set_name (child, "canvas");
-      g_signal_connect (child, "draw",
-                        G_CALLBACK (drawing_area_draw), NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
+                                      drawing_area_draw,
+                                      NULL, NULL);
       gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new ();

demos/gtk-demo/demo.gresource.xml

@@ -94,6 +94,9 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
+  <gresource prefix="/fishbowl">
+    <file>fishbowl.ui</file>
+  </gresource>
   <gresource prefix="/iconview">
     <file preprocess="to-pixdata">gnome-fs-directory.png</file>
     <file preprocess="to-pixdata">gnome-fs-regular.png</file>
@@ -150,6 +153,7 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
+    <file>fishbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>

demos/gtk-demo/drawingarea.c

@@ -50,15 +50,15 @@ scribble_configure_event (GtkWidget         *widget,
 }
 
 /* Redraw the screen from the surface */
-static gboolean
-scribble_draw (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
+static void
+scribble_draw (GtkDrawingArea *da,
+               cairo_t        *cr,
+               int             width,
+               int             height,
+               gpointer        data)
 {
   cairo_set_source_surface (cr, surface, 0, 0);
   cairo_paint (cr);
-
-  return FALSE;
 }
 
 /* Draw a rectangle on the screen */
@@ -136,12 +136,14 @@ scribble_motion_notify_event (GtkWidget      *widget,
 }
 
 
-static gboolean
-checkerboard_draw (GtkWidget *da,
-                   cairo_t   *cr,
-                   gpointer   data)
+static void
+checkerboard_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  gint i, j, xcount, ycount, width, height;
+  gint i, j, xcount, ycount;
 
 #define CHECK_SIZE 10
 #define SPACING 2
@@ -154,8 +156,6 @@ checkerboard_draw (GtkWidget *da,
    */
 
   xcount = 0;
-  width = gtk_widget_get_allocated_width (da);
-  height = gtk_widget_get_allocated_height (da);
   i = SPACING;
   while (i < width)
     {
@@ -180,11 +180,6 @@ checkerboard_draw (GtkWidget *da,
       i += CHECK_SIZE + SPACING;
       ++xcount;
     }
-
-  /* return TRUE because we've handled this event, so no
-   * further processing is required.
-   */
-  return TRUE;
 }
 
 static void
@@ -233,14 +228,11 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
 
       da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), checkerboard_draw, NULL, NULL);
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      g_signal_connect (da, "draw",
-                        G_CALLBACK (checkerboard_draw), NULL);
-
       /*
        * Create the scribble area
        */
@@ -255,15 +247,13 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
 
       da = gtk_drawing_area_new ();
-      /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
-
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
       gtk_container_add (GTK_CONTAINER (frame), da);
 
       /* Signals used to handle backing surface */
 
-      g_signal_connect (da, "draw",
-                        G_CALLBACK (scribble_draw), NULL);
       g_signal_connect (da,"configure-event",
                         G_CALLBACK (scribble_configure_event), NULL);
 

demos/gtk-demo/fishbowl.c

@@ -0,0 +1,341 @@
+/* Benchmark/Fishbowl
+ *
+ * This demo models the fishbowl demos seen on the web in a GTK way.
+ * It's also a neat little tool to see how fast your computer (or
+ * your GTK version) is.
+ */
+
+#include <gtk/gtk.h>
+
+char **icon_names = NULL;
+gsize n_icon_names = 0;
+
+GtkWidget *allow_changes;
+
+static void
+init_icon_names (GtkIconTheme *theme)
+{
+  GPtrArray *icons;
+  GList *l, *icon_list;
+
+  if (icon_names)
+    return;
+
+  icon_list = gtk_icon_theme_list_icons (theme, NULL);
+  icons = g_ptr_array_new ();
+
+  for (l = icon_list; l; l = l->next)
+    {
+      if (g_str_has_suffix (l->data, "symbolic"))
+        continue;
+
+      g_ptr_array_add (icons, g_strdup (l->data));
+    }
+
+  n_icon_names = icons->len;
+  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
+  icon_names = (char **) g_ptr_array_free (icons, FALSE);
+
+  /* don't free strings, we assigned them to the array */
+  g_list_free_full (icon_list, g_free);
+}
+
+static const char *
+get_random_icon_name (GtkIconTheme *theme)
+{
+  init_icon_names (theme);
+
+  return icon_names[g_random_int_range(0, n_icon_names)];
+}
+
+#define N_STATS 5
+
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
+
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;
+
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
+};
+
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
+    }
+
+  return stats;
+}
+
+static gint64
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
+{
+  Stats *stats;
+  gint64 frame_time, elapsed;
+
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+  elapsed = frame_time - stats->last_frame;
+
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;
+
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("%u icons - %.1f fps",
+                                   stats->item_counter[stats->stats_index],
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);
+
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }
+
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+      
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
+  else
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }
+
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
+
+  return elapsed;
+}
+
+static void
+stats_update (GtkWidget *widget,
+              gint       n_items)
+{
+  Stats *stats;
+
+  stats = get_stats (widget);
+
+  g_assert ((gint) stats->item_counter[stats->stats_index] + n_items > 0);
+  stats->item_counter[stats->stats_index] += n_items;
+}
+
+typedef struct _FishData FishData;
+struct _FishData {
+  double x;
+  double y;
+  double x_speed;
+  double y_speed;
+};
+
+static FishData *
+get_fish_data (GtkWidget *fish)
+{
+  static GQuark fish_quark = 0;
+  FishData *data;
+
+  if (G_UNLIKELY (fish_quark == 0))
+    fish_quark = g_quark_from_static_string ("fish");
+
+  data = g_object_get_qdata (G_OBJECT (fish), fish_quark);
+  if (data == NULL)
+    {
+      data = g_new0 (FishData, 1);
+      g_object_set_qdata_full (G_OBJECT (fish), fish_quark, data, g_free);
+      data->x = 10;
+      data->y = 10;
+      data->x_speed = g_random_double_range (1, 200);
+      data->y_speed = g_random_double_range (1, 200);
+    }
+
+  return data;
+}
+
+static void
+add_fish (GtkWidget *bowl,
+          guint      n_fish)
+{
+  GtkWidget *new_fish;
+  guint i;
+
+  for (i = 0; i < n_fish; i++)
+    {
+      new_fish = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
+                                               GTK_ICON_SIZE_DIALOG);
+      gtk_widget_show (new_fish);
+
+      gtk_fixed_put (GTK_FIXED (bowl),
+                     new_fish,
+                     10, 10);
+    }
+
+  stats_update (bowl, n_fish);
+}
+
+static void
+remove_fish (GtkWidget *bowl,
+             guint      n_fish)
+{
+  GList *list, *children;
+  guint i;
+
+  children = gtk_container_get_children (GTK_CONTAINER (bowl));
+  g_assert (n_fish < g_list_length (children));
+
+  list = children;
+  for (i = 0; i < n_fish; i++)
+    {
+      gtk_container_remove (GTK_CONTAINER (bowl), list->data);
+      list = list->next;
+    }
+
+  g_list_free (children);
+
+  stats_update (bowl, - (gint) n_fish);
+
+  {
+    Stats *stats = get_stats (bowl);
+
+    children = gtk_container_get_children (GTK_CONTAINER (bowl));
+    g_assert (stats->item_counter[stats->stats_index] == g_list_length (children));
+    g_list_free (children);
+  }
+}
+
+static void
+move_one_fish (GtkWidget *fish,
+               gpointer   elapsedp)
+{
+  GtkWidget *fixed = gtk_widget_get_parent (fish);
+  FishData *data = get_fish_data (fish);
+  gint64 elapsed = *(gint64 *) elapsedp;
+
+  data->x += data->x_speed * ((double) elapsed / G_USEC_PER_SEC);
+  data->y += data->y_speed * ((double) elapsed / G_USEC_PER_SEC);
+
+  if (data->x <= 0)
+    {
+      data->x = 0;
+      data->x_speed = - g_random_double_range (1, 200) * (data->x_speed > 0 ? 1 : -1);
+    }
+  else if (data->x > gtk_widget_get_allocated_width (fixed) - gtk_widget_get_allocated_width (fish))
+    {
+      data->x = gtk_widget_get_allocated_width (fixed) - gtk_widget_get_allocated_width (fish);
+      data->x_speed = - g_random_double_range (1, 200) * (data->x_speed > 0 ? 1 : -1);
+    }
+
+  if (data->y <= 0)
+    {
+      data->y = 0;
+      data->y_speed = - g_random_double_range (1, 200) * (data->y_speed > 0 ? 1 : -1);
+    }
+  else if (data->y > gtk_widget_get_allocated_height (fixed) - gtk_widget_get_allocated_height (fish))
+    {
+      data->y = gtk_widget_get_allocated_height (fixed) - gtk_widget_get_allocated_height (fish);
+      data->y_speed = - g_random_double_range (1, 200) * (data->y_speed > 0 ? 1 : -1);
+    }
+
+  gtk_fixed_move (GTK_FIXED (fixed), fish, data->x, data->y);
+}
+
+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint64 elapsed;
+  gint suggested_change = 0;
+  
+  elapsed = do_stats (bowl,
+                      info_label,
+                      !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_container_foreach (GTK_CONTAINER (bowl), move_one_fish, &elapsed);
+
+  if (suggested_change > 0)
+    add_fish (bowl, suggested_change);
+  else if (suggested_change < 0)
+    remove_fish (bowl, - suggested_change);
+
+  return G_SOURCE_CONTINUE;
+}
+
+GtkWidget *
+do_fishbowl (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+      GtkWidget *bowl, *info_label;
+
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_connect_signals (builder, NULL);
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+
+  return window;
+}

demos/gtk-demo/fishbowl.ui

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.6 -->
+  <object class="GtkWindow" id="window">
+    <property name="title" translatable="yes">Fishbowl</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="">
+        <property name="visible">True</property>
+        <property name="show-close-button">True</property>
+        <child>
+          <object class="GtkLabel" id="info_label">
+            <property name="visible">True</property>
+            <property name="label">0 icons - 0 fps</property>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="changes_allow">
+            <property name="active">False</property>
+            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
+            <property name="icon-name">changes-allow</property>
+            <property name="relief">none</property>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="changes_prevent">
+            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">True</property>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">False</property>
+            <property name="icon-name">changes-prevent</property>
+            <property name="relief">none</property>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkFixed" id="bowl">
+        <property name="visible">True</property>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/flowbox.c

@@ -10,11 +10,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-static gboolean
-draw_color (GtkWidget  *drawingarea,
-            cairo_t    *cr,
-            const char *color_name)
+static void
+draw_color (GtkDrawingArea *drawingarea,
+            cairo_t        *cr,
+            int             width,
+            int             height,
+            gpointer        data)
 {
+  const char *color_name = data;
   GdkRGBA rgba;
 
   if (gdk_rgba_parse (&rgba, color_name))
@@ -22,8 +25,6 @@ draw_color (GtkWidget  *drawingarea,
       gdk_cairo_set_source_rgba (cr, &rgba);
       cairo_paint (cr);
     }
-
-  return FALSE;
 }
 
 static GtkWidget *
@@ -33,8 +34,9 @@ color_swatch_new (const gchar *color)
 
   button = gtk_button_new ();
   area = gtk_drawing_area_new ();
-  g_signal_connect (area, "draw", G_CALLBACK (draw_color), (gpointer) color);
-  gtk_widget_set_size_request (area, 24, 24);
+  gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (area), 24);
+  gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
   gtk_container_add (GTK_CONTAINER (button), area);
   gtk_widget_show_all (button);
 

demos/gtk-demo/foreigndrawing.c

@@ -836,7 +836,7 @@ draw_spinbutton (GtkWidget *widget,
 
   /* This information is taken from the GtkSpinButton docs, see "CSS nodes" */
   spin_context = get_style (NULL, "spinbutton.horizontal:focus");
-  entry_context = get_style (NULL, "entry:focus");
+  entry_context = get_style (spin_context, "entry:focus");
   up_context = get_style (spin_context, "button.up:focus:active");
   down_context = get_style (spin_context, "button.down:focus");
 
@@ -881,16 +881,18 @@ draw_spinbutton (GtkWidget *widget,
   g_object_unref (spin_context);
 }
 
-static gboolean
-draw_cb (GtkWidget *widget,
-         cairo_t   *cr)
+static void
+draw_func (GtkDrawingArea *da,
+           cairo_t        *cr,
+           int             width,
+           int             height,
+           gpointer        data)
 {
-  gint panewidth, width, height;
+  GtkWidget *widget = GTK_WIDGET (da);
+  gint panewidth;
   gint x, y;
 
-  width = gtk_widget_get_allocated_width (widget);
   panewidth = width / 2;
-  height = gtk_widget_get_allocated_height (widget);
 
   cairo_rectangle (cr, 0, 0, width, height);
   cairo_set_source_rgb (cr, 0.9, 0.9, 0.9);
@@ -944,8 +946,6 @@ draw_cb (GtkWidget *widget,
 
   y += height + 10;
   draw_combobox (widget, cr, 10 + panewidth, y, panewidth - 20, TRUE, &height);
-
-  return FALSE;
 }
 
 GtkWidget *
@@ -968,13 +968,12 @@ do_foreigndrawing (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_container_add (GTK_CONTAINER (window), box);
       da = gtk_drawing_area_new ();
-      gtk_widget_set_size_request (da, 400, 400);
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);
       gtk_widget_set_hexpand (da, TRUE);
       gtk_widget_set_vexpand (da, TRUE);
-      gtk_widget_set_app_paintable (da, TRUE);
       gtk_container_add (GTK_CONTAINER (box), da);
-
-      g_signal_connect (da, "draw", G_CALLBACK (draw_cb), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/gestures.c

@@ -60,20 +60,18 @@ zoom_scale_changed (GtkGestureZoom *gesture,
   gtk_widget_queue_draw (widget);
 }
 
-static gboolean
-drawing_area_draw (GtkWidget *widget,
-                   cairo_t   *cr)
+static void
+drawing_area_draw (GtkDrawingArea *area,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  GtkAllocation allocation;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
   if (swipe_x != 0 || swipe_y != 0)
     {
       cairo_save (cr);
       cairo_set_line_width (cr, 6);
-      cairo_move_to (cr, allocation.width / 2,
-                     allocation.height / 2);
+      cairo_move_to (cr, width / 2, height / 2);
       cairo_rel_line_to (cr, swipe_x, swipe_y);
       cairo_set_source_rgba (cr, 1, 0, 0, 0.5);
       cairo_stroke (cr);
@@ -87,9 +85,7 @@ drawing_area_draw (GtkWidget *widget,
       gdouble angle, scale;
 
       cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix,
-                              allocation.width / 2,
-                              allocation.height / 2);
+      cairo_matrix_translate (&matrix, width / 2, height / 2);
 
       cairo_save (cr);
 
@@ -116,8 +112,8 @@ drawing_area_draw (GtkWidget *widget,
   if (long_pressed)
     {
       cairo_save (cr);
-      cairo_arc (cr, allocation.width / 2,
-                 allocation.height / 2,
+      cairo_arc (cr,
+                 width / 2, height / 2,
                  50, 0, 2 * G_PI);
 
       cairo_set_source_rgba (cr, 0, 1, 0, 0.5);
@@ -125,8 +121,6 @@ drawing_area_draw (GtkWidget *widget,
 
       cairo_restore (cr);
     }
-
-  return TRUE;
 }
 
 GtkWidget *
@@ -150,8 +144,9 @@ do_gestures (GtkWidget *do_widget)
                              GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                              GDK_POINTER_MOTION_MASK | GDK_TOUCH_MASK);
 
-      g_signal_connect (drawing_area, "draw",
-                        G_CALLBACK (drawing_area_draw), NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
+                                      drawing_area_draw,
+                                      NULL, NULL);
 
       /* Swipe */
       gesture = gtk_gesture_swipe_new (drawing_area);

demos/gtk-demo/pickers.c

@@ -50,6 +50,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
+    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (picker), FALSE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 

demos/gtk-demo/pixbufs.c

@@ -75,15 +75,15 @@ load_pixbufs (GError **error)
 }
 
 /* Expose callback for the drawing area */
-static gint
-draw_cb (GtkWidget *widget,
-         cairo_t   *cr,
-         gpointer   data)
+static void
+draw_func (GtkDrawingArea *area,
+           cairo_t        *cr,
+           int             width,
+           int             height,
+           gpointer        data)
 {
   gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
   cairo_paint (cr);
-
-  return TRUE;
 }
 
 #define CYCLE_TIME 3000000 /* 3 seconds */
@@ -204,14 +204,13 @@ do_pixbufs (GtkWidget *do_widget)
         }
       else
         {
-          gtk_widget_set_size_request (window, back_width, back_height);
-
           frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
 
           da = gtk_drawing_area_new ();
 
-          g_signal_connect (da, "draw",
-                            G_CALLBACK (draw_cb), NULL);
+          gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), back_width);
+          gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), back_height);
+          gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);
 
           gtk_container_add (GTK_CONTAINER (window), da);
 

demos/gtk-demo/rotated_text.c

@@ -88,10 +88,12 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
   return attrs;
 }
 
-static gboolean
-rotated_text_draw (GtkWidget *widget,
-                   cairo_t   *cr,
-                   gpointer   data)
+static void
+rotated_text_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
 #define RADIUS 150
 #define N_WORDS 5
@@ -106,15 +108,12 @@ rotated_text_draw (GtkWidget *widget,
   PangoAttrList *attrs;
 
   double device_radius;
-  int width, height;
   int i;
 
   /* Create a cairo context and set up a transformation matrix so that the user
    * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
    * [-RADIUS, RADIUS].
    * We first center, then change the scale. */
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
                    device_radius + (width - 2 * device_radius) / 2,
@@ -128,7 +127,7 @@ rotated_text_draw (GtkWidget *widget,
   cairo_set_source (cr, pattern);
 
   /* Create a PangoContext and set up our shape renderer */
-  context = gtk_widget_create_pango_context (widget);
+  context = gtk_widget_create_pango_context (GTK_WIDGET (da));
   pango_cairo_context_set_shape_renderer (context,
                                           fancy_shape_renderer,
                                           NULL, NULL);
@@ -164,8 +163,6 @@ rotated_text_draw (GtkWidget *widget,
   g_object_unref (layout);
   g_object_unref (context);
   cairo_pattern_destroy (pattern);
-
-  return FALSE;
 }
 
 GtkWidget *
@@ -199,8 +196,9 @@ do_rotated_text (GtkWidget *do_widget)
       gtk_style_context_add_class (gtk_widget_get_style_context (drawing_area),
                                    GTK_STYLE_CLASS_VIEW);
 
-      g_signal_connect (drawing_area, "draw",
-                        G_CALLBACK (rotated_text_draw), NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
+                                      rotated_text_draw,
+                                      NULL, NULL);
 
       /* And a label */
       label = gtk_label_new (text);

demos/gtk-demo/textmask.c

@@ -7,10 +7,12 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-static gboolean
-draw_text (GtkWidget *da,
-           cairo_t   *cr,
-           gpointer   data)
+static void
+draw_text (GtkDrawingArea *da,
+           cairo_t        *cr,
+           int             width,
+           int             height,
+           gpointer        data)
 {
   cairo_pattern_t *pattern;
   PangoLayout *layout;
@@ -18,7 +20,7 @@ draw_text (GtkWidget *da,
 
   cairo_save (cr);
 
-  layout = gtk_widget_create_pango_layout (da, "Pango power!\nPango power!\nPango power!");
+  layout = gtk_widget_create_pango_layout (GTK_WIDGET (da), "Pango power!\nPango power!\nPango power!");
   desc = pango_font_description_from_string ("sans bold 34");
   pango_layout_set_font_description (layout, desc);
   pango_font_description_free (desc);
@@ -27,9 +29,7 @@ draw_text (GtkWidget *da,
   pango_cairo_layout_path (cr, layout);
   g_object_unref (layout);
 
-  pattern = cairo_pattern_create_linear (0.0, 0.0,
-                                         gtk_widget_get_allocated_width (da),
-                                         gtk_widget_get_allocated_height (da));
+  pattern = cairo_pattern_create_linear (0.0, 0.0, width, height);
   cairo_pattern_add_color_stop_rgb (pattern, 0.0, 1.0, 0.0, 0.0);
   cairo_pattern_add_color_stop_rgb (pattern, 0.2, 1.0, 0.0, 0.0);
   cairo_pattern_add_color_stop_rgb (pattern, 0.3, 1.0, 1.0, 0.0);
@@ -49,8 +49,6 @@ draw_text (GtkWidget *da,
   cairo_stroke (cr);
 
   cairo_restore (cr);
-
-  return TRUE;
 }
 
 GtkWidget *
@@ -72,8 +70,7 @@ do_textmask (GtkWidget *do_widget)
       da = gtk_drawing_area_new ();
 
       gtk_container_add (GTK_CONTAINER (window), da);
-      g_signal_connect (da, "draw",
-                        G_CALLBACK (draw_text), NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_text, NULL, NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/toolpalette.c

@@ -567,7 +567,6 @@ do_toolpalette (GtkWidget *do_widget)
       /* ===== passive DnD dest ===== */
 
       contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
 
       g_object_connect (contents,
                         "signal::draw", canvas_draw, NULL,
@@ -594,7 +593,6 @@ do_toolpalette (GtkWidget *do_widget)
       /* ===== interactive DnD dest ===== */
 
       contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
 
       g_object_connect (contents,
                         "signal::draw", canvas_draw, NULL,

demos/widget-factory/widget-factory.c

@@ -1589,6 +1589,16 @@ scale_format_value (GtkScale *scale, gdouble value)
   return g_strdup_printf ("%0.*f", 1, value);
 }
 
+static void
+adjustment3_value_changed (GtkAdjustment *adj, GtkProgressBar *pbar)
+{
+  double fraction;
+
+  fraction = gtk_adjustment_get_value (adj) / (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj));
+
+  gtk_progress_bar_set_fraction (pbar, fraction);
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1861,6 +1871,12 @@ activate (GApplication *app)
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "decrease_button");
   g_object_set_data (G_OBJECT (widget), "decrease_button", widget2);
 
+  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment3");
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar1");
+  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "progressbar2");
+  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
+  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);
+
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);

demos/widget-factory/widget-factory.ui

@@ -103,8 +103,9 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
+    <property name="lower">0</property>
     <property name="upper">4</property>
-    <property name="value">1</property>
+    <property name="value">2</property>
     <property name="step_increment">1</property>
     <property name="page_increment">1</property>
   </object>

docs/reference/gdk/gdk-docs.sgml

@@ -53,7 +53,6 @@
 
   <reference>
     <title>Deprecated</title>
-    <xi:include href="xml/colors.xml" />
     <xi:include href="xml/gdkdevicemanager.xml" />
   </reference>
 

docs/reference/gdk/gdk4-sections.txt

@@ -114,6 +114,8 @@ gdk_display_put_event
 gdk_display_has_pending
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
+gdk_display_is_rgba
+gdk_display_is_composited
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -176,13 +178,9 @@ gdk_display_manager_get_type
 <TITLE>GdkScreen</TITLE>
 GdkScreen
 gdk_screen_get_default
-gdk_screen_get_system_visual
-gdk_screen_get_rgba_visual
-gdk_screen_is_composited
 gdk_screen_get_root_window
 gdk_screen_get_display
 gdk_screen_get_number
-gdk_screen_list_visuals
 gdk_screen_get_toplevel_windows
 gdk_screen_get_n_monitors
 gdk_screen_get_primary_monitor
@@ -215,28 +213,9 @@ gdk_screen_get_type
 <SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
-gdk_pixbuf_get_from_window
 gdk_pixbuf_get_from_surface
 </SECTION>
 
-<SECTION>
-<TITLE>Colors</TITLE>
-<FILE>colors</FILE>
-GdkColor
-gdk_color_copy
-gdk_color_free
-gdk_color_parse
-gdk_color_equal
-gdk_color_hash
-gdk_color_to_string
-
-<SUBSECTION Standard>
-GDK_TYPE_COLOR
-
-<SUBSECTION Private>
-gdk_color_get_type
-</SECTION>
-
 <SECTION>
 <TITLE>RGBA Colors</TITLE>
 <FILE>rgba_colors</FILE>
@@ -295,9 +274,9 @@ GdkGravity
 GdkAnchorHints
 GdkWindowEdge
 GdkWindowTypeHint
-GdkWindowAttr
-GdkWindowAttributesType
-gdk_window_new
+gdk_window_new_toplevel
+gdk_window_new_popup
+gdk_window_new_temp
 gdk_window_new_child
 gdk_window_new_input
 gdk_window_destroy
@@ -378,7 +357,6 @@ gdk_window_get_frame_clock
 
 <SUBSECTION>
 gdk_window_set_user_data
-gdk_window_set_override_redirect
 gdk_window_set_accept_focus
 gdk_window_get_accept_focus
 gdk_window_set_focus_on_map
@@ -559,7 +537,6 @@ gdk_cairo_get_clip_rectangle
 gdk_cairo_get_drawing_context
 gdk_cairo_set_source_rgba
 gdk_cairo_set_source_pixbuf
-gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_region_create_from_surface
@@ -1194,6 +1171,7 @@ gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
 gdk_wayland_display_get_xdg_shell
+gdk_wayland_window_new_subsurface
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
 GdkWaylandWindowExported

docs/reference/gsk/gsk4-sections.txt

@@ -54,7 +54,6 @@ GskBlendMode
 gsk_render_node_set_blend_mode
 GskScalingFilter
 gsk_render_node_set_scaling_filters
-gsk_render_node_get_scale_factor
 gsk_render_node_set_name
 gsk_value_set_render_node
 gsk_value_take_render_node

docs/reference/gtk/Makefile.am

@@ -31,37 +31,49 @@ IGNORE_HFILES = \
 	gtkapplicationprivate.h		\
 	gtkbindingsprivate.h		\
 	gtkbitmaskprivate.h		\
+	gtkboxgadgetprivate.h	        \
 	gtkboxprivate.h		        \
 	gtkbuilderprivate.h		\
+	gtkbuiltiniconprivate.h		\
 	gtkbuttonprivate.h		\
 	gtkcairoblurprivate.h		\
 	gtkcellareaboxcontextprivate.h	\
+	gtkcheckbuttonprivate.h		\
 	gtkclipboardprivate.h		\
 	gtkcolorchooserprivate.h	\
 	gtkcoloreditorprivate.h		\
 	gtkcolorplaneprivate.h		\
 	gtkcolorscaleprivate.h		\
 	gtkcolorswatchprivate.h		\
+	gtkcolorutils.h			\
 	gtkcomboboxprivate.h		\
+	gtkcomposetable.h		\
 	gtkcontainerprivate.h		\
 	gtkcssanimatedstyleprivate.h	\
 	gtkcssanimationprivate.h	\
 	gtkcssarrayvalueprivate.h	\
 	gtkcssbgsizevalueprivate.h	\
 	gtkcssbordervalueprivate.h	\
+	gtkcsscalcvalueprivate.h	\
 	gtkcsscolorvalueprivate.h	\
 	gtkcsscornervalueprivate.h	\
+	gtkcsscustomgadgetprivate.h	\
 	gtkcsscustompropertyprivate.h	\
+	gtkcssdimensionvalueprivate.h	\
 	gtkcsseasevalueprivate.h	\
 	gtkcssenginevalueprivate.h	\
 	gtkcssenumvalueprivate.h	\
+	gtkcssgadgetprivate.h		\
 	gtkcssiconthemevalueprivate.h	\
 	gtkcssimagebuiltinprivate.h	\
 	gtkcssimagecrossfadeprivate.h	\
+	gtkcssimagefallbackprivate.h	\
 	gtkcssimagegradientprivate.h	\
 	gtkcssimageiconthemeprivate.h	\
 	gtkcssimagelinearprivate.h	\
+	gtkcssimageradialprivate.h	\
 	gtkcssimageprivate.h		\
+	gtkcssimagerecolorprivate.h	\
 	gtkcssimagescaledprivate.h	\
 	gtkcssimagesurfaceprivate.h	\
 	gtkcssimageurlprivate.h		\
@@ -73,8 +85,10 @@ IGNORE_HFILES = \
 	gtkcsslookupprivate.h		\
 	gtkcssmatcherprivate.h		\
 	gtkcssnodeprivate.h		\
+	gtkcssnodestylecacheprivate.h	\
 	gtkcssnodedeclarationprivate.h	\
 	gtkcssnumbervalueprivate.h	\
+	gtkcsspalettevalueprivate.h	\
 	gtkcsspathnodeprivate.h		\
 	gtkcssparserprivate.h		\
 	gtkcsspositionvalueprivate.h	\
@@ -88,6 +102,7 @@ IGNORE_HFILES = \
 	gtkcssshorthandpropertyprivate.h\
 	gtkcssstaticstyleprivate.h	\
 	gtkcssstringvalueprivate.h	\
+	gtkcssstylechangeprivate.h	\
 	gtkcssstylefuncsprivate.h	\
 	gtkcssstyleprivate.h		\
 	gtkcssstylepropertyprivate.h	\
@@ -99,9 +114,13 @@ IGNORE_HFILES = \
 	gtkcssunsetvalueprivate.h	\
 	gtkcssvalueprivate.h		\
 	gtkcsswidgetnodeprivate.h	\
+	gtkcsswin32sizevalueprivate.h	\
+	gtkdebugupdatesprivate.h	\
 	gtkdialogprivate.h		\
+	gtkdndprivate.h			\
 	gtkentryprivate.h		\
 	gtkeventcontrollerprivate.h	\
+	gtkfilechoosernativeprivate.h	\
 	gtkfilechooserprivate.h		\
 	gtkfilechooserwidgetprivate.h	\
 	gtkfontchooserprivate.h		\
@@ -116,9 +135,13 @@ IGNORE_HFILES = \
 	gtkgesturezoomprivate.h		\
 	gtkheaderbarprivate.h		\
 	gtkhslaprivate.h		\
+	gtkiconprivate.h		\
 	gtkiconhelperprivate.h		\
+	gtkiconthemeprivate.h		\
 	gtkiconviewprivate.h		\
+	gtkimagedefinitionprivate.h	\
 	gtkimageprivate.h		\
+	gtkimcontextsimpleprivate.h	\
 	gtkimmoduleprivate.h		\
 	gtklabelprivate.h		\
 	gtklockbuttonprivate.h		\
@@ -138,6 +161,7 @@ IGNORE_HFILES = \
 	gtkprinter-private.h		\
 	gtkprintoperation-private.h	\
 	gtkprivate.h		        \
+	gtkprogresstrackerprivate.h     \
 	gtkrangeprivate.h		\
 	gtkrecentchooserprivate.h	\
 	gtkrenderbackgroundprivate.h	\
@@ -154,25 +178,31 @@ IGNORE_HFILES = \
 	gtksearchentryprivate.h		\
 	gtkselectionprivate.h		\
 	gtksettingsprivate.h		\
+	gtkshortcutsshortcutprivate.h	\
+	gtkshortcutswindowprivate.h	\
 	gtksidebarrowprivate.h		\
 	gtksizegroup-private.h		\
 	gtksizerequestcacheprivate.h	\
+	gtksnapshotprivate.h		\
 	gtkstyleanimationprivate.h	\
 	gtkstylecascadeprivate.h	\
 	gtkstylecontextprivate.h	\
 	gtkstylepropertyprivate.h	\
 	gtkstyleproviderprivate.h	\
+	gtktextattributes.h		\
 	gtktextattributesprivate.h	\
 	gtktextchildprivate.h		\
 	gtktexthandleprivate.h		\
 	gtktextiterprivate.h		\
 	gtktextmarkprivate.h		\
 	gtktexttagprivate.h		\
+	gtktextviewprivate.h		\
 	gtktogglebuttonprivate.h	\
 	gtktoolbarprivate.h		\
 	gtktoolpaletteprivate.h		\
 	gtktooltipprivate.h		\
 	gtktooltipwindowprivate.h	\
+	gtkutilsprivate.h		\
 	gtktreeprivate.h		\
 	gtkwidgetprivate.h		\
 	gtkwin32themeprivate.h		\
@@ -219,6 +249,8 @@ IGNORE_HFILES = \
 	gtkprinteroption.h		\
 	gtkprinteroptionset.h		\
 	gtkprinteroptionwidget.h	\
+	gtkprinter-private.h		\
+	gtkprintoperation-portal.h	\
 	gtkprint-win32.h		\
 	gtkprintutils.h			\
 	gtkprivate.h			\
@@ -246,7 +278,10 @@ IGNORE_HFILES = \
 	gtktreedatalist.h		\
 	gtktreemenu.h			\
 	gtktypebuiltins.h		\
+	gtkwidgetpathprivate.h		\
 	gtkwindow-decorate.h		\
+	gtkwin32drawprivate.h		\
+	gtkwin32themeprivate.h		\
 	xdgmime				\
 	xembed.h
 
@@ -277,7 +312,6 @@ MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
 	broadway.xml				\
-	broadwayd.xml				\
 	building.sgml				\
 	compiling.sgml				\
 	css-overview.xml			\
@@ -285,6 +319,7 @@ content_files =					\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
+	gtk4-broadwayd.xml			\
 	gtk4-demo-application.xml		\
 	gtk4-demo.xml				\
 	gtk4-icon-browser.xml			\
@@ -485,17 +520,17 @@ EXTRA_DIST += version.xml.in gtk4.types.in
 ########################################################################
 
 man_MANS = 				\
-	gtk4-query-immodules.1		\
-	gtk4-update-icon-cache.1	\
-	gtk4-encode-symbolic-svg.1	\
-	gtk4-launch.1			\
+	gtk4-broadwayd.1		\
+	gtk4-builder-tool.1 		\
 	gtk4-demo.1			\
 	gtk4-demo-application.1		\
-	gtk4-widget-factory.1		\
+	gtk4-encode-symbolic-svg.1	\
 	gtk4-icon-browser.1		\
-	broadwayd.1			\
-	gtk4-builder-tool.1 		\
-	gtk4-query-settings.1
+	gtk4-launch.1			\
+	gtk4-query-immodules.1		\
+	gtk4-query-settings.1		\
+	gtk4-update-icon-cache.1	\
+	gtk4-widget-factory.1
 
 if ENABLE_MAN
 

docs/reference/gtk/css-overview.xml

@@ -682,7 +682,6 @@ button {
       Gradients are images that smoothly fades from one color to another. CSS
       provides ways to specify repeating and non-repeating linear and radial
       gradients. Radial gradients can be circular, or axis-aligned ellipses.
-      In addition to CSS gradients, GTK+ has its own -gtk-gradient extensions.
     </para>
 
     <para>
@@ -734,76 +733,9 @@ label {
       GTK+ extends the CSS syntax for images and also uses it for specifying icons.
     </para>
 
-<literallayout><code>〈gtk image〉 = 〈gtk gradient〉 | 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
+<literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
 </literallayout>
 
-    <para>
-      GTK+ supports an alternative syntax for linear and radial gradients (which
-      was implemented before CSS gradients were supported).
-    </para>
-
-<literallayout><code>〈gtk gradient〉 = 〈gtk linear gradient〉 | 〈gtk radial gradient〉</code>
-<code>〈gtk linear gradient〉 = -gtk-gradient(linear,</code>
-<code>                          [ 〈x position〉 〈y position〉 , ]{2}</code>
-<code>                          〈gtk color stops〉 )</code>
-<code>〈gtk radial gradient〉 = -gtk-gradient(radial,</code>
-<code>                          [ 〈x position〉 〈y position〉 , 〈radius〉 , ]{2}</code>
-<code>                          〈gtk color stops〉 )</code>
-<code>〈x position〉 = left | right | center | 〈number〉</code>
-<code>〈y position〉 = top | bottom | center | 〈number〉</code>
-<code>〈radius 〉 = 〈number〉</code>
-<code>〈gtk color stops〉 = 〈gtk color stop〉 [ , 〈gtk color stop〉 ]+</code>
-<code>〈gtk color stop〉 = color-stop( 〈number〉 , 〈color〉 ) | from( 〈color〉 ) | to( 〈color〉 )</code>
-</literallayout>
-
-    <para>
-      The numbers used to specify x and y positions, radii, as well as the
-      positions of color stops, must be between 0 and 1. The keywords for for
-      x and y positions (left, right, top, bottom, center), map to numeric
-      values of 0, 1 and 0.5 in the obvious way. Color stops using the from() and
-      to() syntax are abbreviations for color-stop with numeric positions of
-      0 and 1, respectively.
-    </para>
-
-    <example>
-      <title>Linear gradients</title>
-      <programlisting><![CDATA[
-button {
-  background-image: -gtk-gradient (linear,
-                                   left top, right bottom,
-                                   from(@yellow), to(@blue));
-}
-label {
-  background-image: -gtk-gradient (linear,
-                                   0 0, 0 1,
-                                   color-stop(0, @yellow),
-                                   color-stop(0.2, @blue),
-                                   color-stop(1, #0f0));
-}
-]]></programlisting>
-    </example>
-
-    <example>
-      <title>Radial gradients</title>
-      <programlisting><![CDATA[
-button {
-  background-image: -gtk-gradient (radial,
-                                   center center, 0,
-                                   center center, 1,
-                                   from(@yellow), to(@green));
-}
-label {
-  background-image: -gtk-gradient (radial,
-                                   0.4 0.4, 0.1,
-                                   0.6 0.6, 0.7,
-                                   color-stop(0, #f00),
-                                   color-stop(0.1, $a0f),
-                                   color-stop(0.2, @yellow),
-                                   color-stop(1, @green));
-}
-]]></programlisting>
-    </example>
-
     <para>
       GTK+ has extensive support for loading icons from icon themes. It is
       accessible from CSS with the -gtk-icontheme syntax.

docs/reference/gtk/css-properties.xml

@@ -456,9 +456,15 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
         </tgroup>
       </table>
 
-<literallayout><code>〈transform〉 = matrix( 〈number〉 [ , 〈number〉 ]{5} ) | translate( 〈length〉, 〈length〉 ) | translateX( 〈length〉 ) | translateY( 〈length〉 ) |</code>
-<code>                scale( 〈number〉[ , 〈number〉 ]? ) | scaleX( 〈number〉 ) | scaleY( 〈number〉 ) | rotate( 〈angle〉 ) | skew( 〈angle〉 [ , 〈angle〉 ]? ) |</code>
-<code>                skewX( 〈angle〉 ) |  skewY( 〈angle〉 )</code>
+<literallayout><code>〈transform〉 = matrix( 〈number〉 [ , 〈number〉 ]{5} ) |</code>
+<code>                matrix3d( 〈number〉 [ , 〈number〉 ]{15} ) |</code>
+<code>                translate( 〈length〉, 〈length〉 ) | translate3d( 〈length〉, 〈length〉, 〈length〉 ) |</code>
+<code>                translateX( 〈length〉 ) | translateY( 〈length〉 ) | translateZ( 〈length〉 ) |</code>
+<code>                scale( 〈number〉[ , 〈number〉 ]? ) | scale3d( 〈number〉, 〈number〉, 〈number〉) |</code>
+<code>                scaleX( 〈number〉 ) | scaleY( 〈number〉 ) | scaleZ( 〈number〉 ) |</code>
+<code>                rotate( 〈angle〉 ) | rotate3d( 〈number〉, 〈number〉, 〈number〉, 〈angle〉 ) |</code>
+<code>                rotateX( 〈angle〉 ) | rotateY( 〈angle〉 ) | rotateZ( 〈angle〉 ) |</code>
+<code>                skew( 〈angle〉 [ , 〈angle〉 ]? ) | skewX( 〈angle〉 ) |  skewY( 〈angle〉 )</code>
 <code>〈color palette〉 = default | 〈name〉 〈color〉 [ , 〈name〉 〈color〉 ]*</code>
 </literallayout>
 
@@ -1107,7 +1113,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>✓</entry>
               <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">CSS2</ulink>,
                      <ulink url="http://www.w3.org/TR/css3-background/#background-image">CSS3</ulink></entry>
-              <entry>not supported: urls without quotes, CSS radial gradients, colors in crossfades</entry>
+              <entry>not supported: urls without quotes, colors in crossfades</entry>
             </row>
             <row>
               <entry>background-blend-mode</entry>

docs/reference/gtk/gtk-docs.sgml

@@ -259,6 +259,7 @@
       <xi:include href="xml/gtktooltip.xml" />
       <xi:include href="xml/gtkviewport.xml" />
       <xi:include href="xml/gtkaccessible.xml" />
+      <xi:include href="xml/gtksnapshot.xml" />
     </chapter>
 
     <chapter id="AbstractObjects">
@@ -363,7 +364,7 @@
     <xi:include href="gtk4-builder-tool.xml" />
     <xi:include href="gtk4-launch.xml" />
     <xi:include href="gtk4-query-settings.xml" />
-    <xi:include href="broadwayd.xml" />
+    <xi:include href="gtk4-broadwayd.xml" />
   </part>
 
   <part id="platform-support">
@@ -437,6 +438,10 @@
     <title>Index of new symbols in 3.22</title>
     <xi:include href="xml/api-index-3.22.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-90" role="3.90">
+    <title>Index of new symbols in 3.90</title>
+    <xi:include href="xml/api-index-3.90.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk4-broadwayd.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="broadwayd">
+<refentry id="gtk4-broadwayd">
 
 <refentryinfo>
-  <title>broadwayd</title>
+  <title>gtk4-broadwayd</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>broadwayd</refentrytitle>
+  <refentrytitle>gtk4-broadwayd</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>broadwayd</refname>
+  <refname>gtk4-broadwayd</refname>
   <refpurpose>Broadway display server</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>broadwayd</command>
+<command>gtk4-broadwayd</command>
 <arg choice="opt">--port <replaceable>PORT</replaceable></arg>
 <arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
 <arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
@@ -39,15 +39,15 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>broadwayd</command> is a display server for the Broadway
+<command>gtk4-broadwayd</command> is a display server for the Broadway
 GDK backend. It allows multiple GTK+ applications to display their
-windows in the same web browser, by connecting to broadwayd.
+windows in the same web browser, by connecting to gtk4-broadwayd.
 </para>
 <para>
-When using broadwayd, specify the display number to use, prefixed
+When using gtk4-broadwayd, specify the display number to use, prefixed
 with a colon, similar to X. The default display number is 0.
 <programlisting>
-broadwayd :5
+gtk4-broadwayd :5
 </programlisting>
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:

docs/reference/gtk/gtk4-builder-tool.xml

@@ -57,7 +57,8 @@
     <varlistentry>
     <term><option>simplify</option></term>
       <listitem><para>Simplifies the .ui file by removing properties that
-      are set to their default values and write the resulting XML to stdout.</para></listitem>
+      are set to their default values and write the resulting XML to stdout,
+      or back to the input file.</para></listitem>
     </varlistentry>
     <varlistentry>
     <term><option>enumerate</option></term>
@@ -71,6 +72,16 @@
   </variablelist>
 </refsect1>
 
+<refsect1><title>Simplify Options</title>
+  <para>The <option>simplify</option> command accepts the following options:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>--replace</option></term>
+      <listitem><para>Write the content back to the .ui file instead of stdout.</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
 <refsect1><title>Preview Options</title>
   <para>The <option>preview</option> command accepts the following options:</para>
   <variablelist>

docs/reference/gtk/gtk4-sections.txt

@@ -250,24 +250,6 @@ GtkAssistantPrivate
 gtk_assistant_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkarrow</FILE>
-<TITLE>GtkArrow</TITLE>
-GtkArrow
-gtk_arrow_new
-gtk_arrow_set
-<SUBSECTION Standard>
-GTK_ARROW
-GTK_IS_ARROW
-GTK_TYPE_ARROW
-GTK_ARROW_CLASS
-GTK_IS_ARROW_CLASS
-GTK_ARROW_GET_CLASS
-<SUBSECTION Private>
-GtkArrowPrivate
-gtk_arrow_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkaspectframe</FILE>
 <TITLE>GtkAspectFrame</TITLE>
@@ -514,28 +496,15 @@ gtk_button_new
 gtk_button_new_with_label
 gtk_button_new_with_mnemonic
 gtk_button_new_from_icon_name
-gtk_button_pressed
-gtk_button_released
 gtk_button_clicked
-gtk_button_enter
-gtk_button_leave
 gtk_button_set_relief
 gtk_button_get_relief
 gtk_button_get_label
 gtk_button_set_label
 gtk_button_get_use_underline
 gtk_button_set_use_underline
-gtk_button_set_focus_on_click
-gtk_button_get_focus_on_click
-gtk_button_set_alignment
-gtk_button_get_alignment
-gtk_button_set_image
-gtk_button_get_image
-gtk_button_set_image_position
-gtk_button_get_image_position
-gtk_button_set_always_show_image
-gtk_button_get_always_show_image
-gtk_button_get_event_window
+gtk_button_set_icon_name
+gtk_button_get_icon_name
 
 <SUBSECTION Standard>
 GTK_BUTTON
@@ -641,8 +610,6 @@ gtk_check_menu_item_get_type
 GtkColorButton
 gtk_color_button_new
 gtk_color_button_new_with_rgba
-gtk_color_button_set_rgba
-gtk_color_button_get_rgba
 gtk_color_button_set_title
 gtk_color_button_get_title
 <SUBSECTION Standard>
@@ -657,64 +624,6 @@ gtk_color_button_get_type
 GtkColorButtonPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtkcolorsel</FILE>
-<TITLE>GtkColorSelection</TITLE>
-GtkColorSelection
-GtkColorSelectionClass
-gtk_color_selection_new
-gtk_color_selection_set_has_opacity_control
-gtk_color_selection_get_has_opacity_control
-gtk_color_selection_set_has_palette
-gtk_color_selection_get_has_palette
-gtk_color_selection_get_current_alpha
-gtk_color_selection_set_current_alpha
-gtk_color_selection_get_current_color
-gtk_color_selection_set_current_color
-gtk_color_selection_get_previous_alpha
-gtk_color_selection_set_previous_alpha
-gtk_color_selection_get_previous_color
-gtk_color_selection_set_previous_color
-gtk_color_selection_get_current_rgba
-gtk_color_selection_set_current_rgba
-gtk_color_selection_get_previous_rgba
-gtk_color_selection_set_previous_rgba
-gtk_color_selection_is_adjusting
-gtk_color_selection_palette_from_string
-gtk_color_selection_palette_to_string
-GtkColorSelectionChangePaletteFunc
-gtk_color_selection_set_change_palette_with_screen_hook
-GtkColorSelectionChangePaletteWithScreenFunc
-<SUBSECTION Standard>
-GTK_COLOR_SELECTION
-GTK_IS_COLOR_SELECTION
-GTK_TYPE_COLOR_SELECTION
-GTK_COLOR_SELECTION_CLASS
-GTK_IS_COLOR_SELECTION_CLASS
-GTK_COLOR_SELECTION_GET_CLASS
-<SUBSECTION Private>
-GtkColorSelectionPrivate
-gtk_color_selection_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkcolorseldlg</FILE>
-<TITLE>GtkColorSelectionDialog</TITLE>
-GtkColorSelectionDialog
-gtk_color_selection_dialog_new
-gtk_color_selection_dialog_get_color_selection
-<SUBSECTION Standard>
-GTK_COLOR_SELECTION_DIALOG
-GTK_IS_COLOR_SELECTION_DIALOG
-GTK_TYPE_COLOR_SELECTION_DIALOG
-GTK_COLOR_SELECTION_DIALOG_CLASS
-GTK_IS_COLOR_SELECTION_DIALOG_CLASS
-GTK_COLOR_SELECTION_DIALOG_GET_CLASS
-<SUBSECTION Private>
-GtkColorSelectionDialogPrivate
-gtk_color_selection_dialog_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkcombobox</FILE>
 <TITLE>GtkComboBox</TITLE>
@@ -748,10 +657,6 @@ gtk_combo_box_popdown
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_set_row_separator_func
-gtk_combo_box_set_add_tearoffs
-gtk_combo_box_get_add_tearoffs
-gtk_combo_box_set_title
-gtk_combo_box_get_title
 gtk_combo_box_set_button_sensitivity
 gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_has_entry
@@ -805,7 +710,6 @@ gtk_combo_box_text_get_type
 <TITLE>GtkContainer</TITLE>
 GtkContainer
 GtkContainerClass
-GTK_IS_RESIZE_CONTAINER
 GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
 gtk_container_remove
@@ -820,7 +724,6 @@ gtk_container_get_focus_vadjustment
 gtk_container_set_focus_vadjustment
 gtk_container_get_focus_hadjustment
 gtk_container_set_focus_hadjustment
-gtk_container_resize_children
 gtk_container_child_type
 gtk_container_child_get
 gtk_container_child_set
@@ -873,8 +776,6 @@ gtk_dialog_get_widget_for_response
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
 gtk_dialog_get_header_bar
-<SUBSECTION>
-gtk_alternative_dialog_button_order
 
 <SUBSECTION Standard>
 GTK_DIALOG
@@ -893,6 +794,12 @@ gtk_dialog_get_type
 <TITLE>GtkDrawingArea</TITLE>
 GtkDrawingArea
 gtk_drawing_area_new
+gtk_drawing_area_get_content_width
+gtk_drawing_area_set_content_width
+gtk_drawing_area_get_content_height
+gtk_drawing_area_set_content_height
+GtkDrawingAreaDrawFunc
+gtk_drawing_area_set_draw_func
 <SUBSECTION Standard>
 GTK_DRAWING_AREA
 GTK_IS_DRAWING_AREA
@@ -942,7 +849,6 @@ gtk_entry_set_buffer
 gtk_entry_set_text
 gtk_entry_get_text
 gtk_entry_get_text_length
-gtk_entry_get_text_area
 gtk_entry_set_visibility
 gtk_entry_get_visibility
 gtk_entry_set_invisible_char
@@ -1221,6 +1127,10 @@ gtk_file_chooser_select_file
 gtk_file_chooser_set_current_folder_file
 gtk_file_chooser_set_file
 gtk_file_chooser_unselect_file
+gtk_file_chooser_add_choice
+gtk_file_chooser_remove_choice
+gtk_file_chooser_set_choice
+gtk_file_chooser_get_choice
 <SUBSECTION Standard>
 GTK_FILE_CHOOSER
 GTK_IS_FILE_CHOOSER
@@ -1648,6 +1558,7 @@ gtk_im_context_get_type
 GtkIMContextSimple
 gtk_im_context_simple_new
 gtk_im_context_simple_add_table
+gtk_im_context_simple_add_compose_file
 GTK_MAX_COMPOSE_LEN
 <SUBSECTION Standard>
 GTK_IM_CONTEXT_SIMPLE
@@ -1832,11 +1743,9 @@ gtk_menu_set_accel_group
 gtk_menu_get_accel_group
 gtk_menu_set_accel_path
 gtk_menu_get_accel_path
-gtk_menu_set_title
-gtk_menu_get_title
 gtk_menu_set_monitor
 gtk_menu_get_monitor
-gtk_menu_get_tearoff_state
+gtk_menu_place_on_monitor
 gtk_menu_set_reserve_toggle_size
 gtk_menu_get_reserve_toggle_size
 <SUBSECTION>
@@ -1844,7 +1753,6 @@ gtk_menu_popdown
 gtk_menu_reposition
 gtk_menu_get_active
 gtk_menu_set_active
-gtk_menu_set_tearoff_state
 gtk_menu_attach_to_widget
 gtk_menu_detach
 gtk_menu_get_attach_widget
@@ -1924,8 +1832,6 @@ GtkMenuItemClass
 gtk_menu_item_new
 gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
-gtk_menu_item_set_right_justified
-gtk_menu_item_get_right_justified
 gtk_menu_item_get_label
 gtk_menu_item_set_label
 gtk_menu_item_get_use_underline
@@ -2147,6 +2053,7 @@ GTK_IS_PANED_CLASS
 GTK_PANED_GET_CLASS
 
 <SUBSECTION Private>
+GtkPanedPrivate
 gtk_paned_get_type
 </SECTION>
 
@@ -2295,11 +2202,9 @@ gtk_range_set_upper_stepper_sensitivity
 gtk_range_get_upper_stepper_sensitivity
 gtk_range_get_flippable
 gtk_range_set_flippable
-gtk_range_get_min_slider_size
 gtk_range_get_range_rect
 gtk_range_get_slider_range
 gtk_range_get_slider_size_fixed
-gtk_range_set_min_slider_size
 gtk_range_set_slider_size_fixed
 
 <SUBSECTION Standard>
@@ -2747,8 +2652,6 @@ gtk_rc_property_parse_flags
 gtk_rc_property_parse_requisition
 gtk_rc_property_parse_border
 gtk_settings_reset_property
-GtkIMPreeditStyle
-GtkIMStatusStyle
 <SUBSECTION Standard>
 GtkSettingsClass
 GTK_IS_SETTINGS
@@ -2908,24 +2811,6 @@ GtkLevelBarPrivate
 gtk_level_bar_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtktearoffmenuitem</FILE>
-<TITLE>GtkTearoffMenuItem</TITLE>
-GtkTearoffMenuItem
-GtkTearoffMenuItemClass
-gtk_tearoff_menu_item_new
-<SUBSECTION Standard>
-GTK_TEAROFF_MENU_ITEM
-GTK_IS_TEAROFF_MENU_ITEM
-GTK_TYPE_TEAROFF_MENU_ITEM
-GTK_TEAROFF_MENU_ITEM_CLASS
-GTK_IS_TEAROFF_MENU_ITEM_CLASS
-GTK_TEAROFF_MENU_ITEM_GET_CLASS
-<SUBSECTION Private>
-GtkTearoffMenuItemPrivate
-gtk_tearoff_menu_item_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtktextbuffer</FILE>
 <TITLE>GtkTextBuffer</TITLE>
@@ -3064,7 +2949,6 @@ gtk_text_iter_inside_sentence
 gtk_text_iter_is_cursor_position
 gtk_text_iter_get_chars_in_line
 gtk_text_iter_get_bytes_in_line
-gtk_text_iter_get_attributes
 gtk_text_iter_get_language
 gtk_text_iter_is_end
 gtk_text_iter_is_start
@@ -3157,13 +3041,6 @@ gtk_text_tag_get_priority
 gtk_text_tag_set_priority
 gtk_text_tag_event
 gtk_text_tag_changed
-GtkTextAttributes
-GtkTextAppearance
-gtk_text_attributes_new
-gtk_text_attributes_copy
-gtk_text_attributes_copy_values
-gtk_text_attributes_unref
-gtk_text_attributes_ref
 <SUBSECTION Standard>
 GTK_TEXT_TAG
 GTK_IS_TEXT_TAG
@@ -3171,11 +3048,9 @@ GTK_TYPE_TEXT_TAG
 GTK_TEXT_TAG_CLASS
 GTK_IS_TEXT_TAG_CLASS
 GTK_TEXT_TAG_GET_CLASS
-GTK_TYPE_TEXT_ATTRIBUTES
 <SUBSECTION Private>
 GtkTextTagPrivate
 gtk_text_tag_get_type
-gtk_text_attributes_get_type
 </SECTION>
 
 <SECTION>
@@ -3276,7 +3151,6 @@ gtk_text_view_set_tabs
 gtk_text_view_get_tabs
 gtk_text_view_set_accepts_tab
 gtk_text_view_get_accepts_tab
-gtk_text_view_get_default_attributes
 gtk_text_view_im_context_filter_keypress
 gtk_text_view_reset_im_context
 gtk_text_view_set_input_purpose
@@ -3307,30 +3181,6 @@ gtk_text_child_anchor_get_type
 GtkTextBTree
 </SECTION>
 
-<SECTION>
-<FILE>gtktoggleaction</FILE>
-<TITLE>GtkToggleAction</TITLE>
-GtkToggleAction
-gtk_toggle_action_new
-gtk_toggle_action_toggled
-gtk_toggle_action_set_active
-gtk_toggle_action_get_active
-gtk_toggle_action_set_draw_as_radio
-gtk_toggle_action_get_draw_as_radio
-
-<SUBSECTION Standard>
-GTK_TYPE_TOGGLE_ACTION
-GTK_TOGGLE_ACTION
-GTK_TOGGLE_ACTION_CLASS
-GTK_IS_TOGGLE_ACTION
-GTK_IS_TOGGLE_ACTION_CLASS
-GTK_TOGGLE_ACTION_GET_CLASS
-GtkToggleActionClass
-<SUBSECTION Private>
-gtk_toggle_action_get_type
-GtkToggleActionPrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtktogglebutton</FILE>
 <TITLE>GtkToggleButton</TITLE>
@@ -4146,7 +3996,6 @@ gtk_cell_view_set_model
 gtk_cell_view_get_model
 gtk_cell_view_set_displayed_row
 gtk_cell_view_get_displayed_row
-gtk_cell_view_set_background_color
 gtk_cell_view_set_background_rgba
 gtk_cell_view_set_draw_sensitive
 gtk_cell_view_get_draw_sensitive
@@ -4601,6 +4450,30 @@ GTK_VOLUME_BUTTON_GET_CLASS
 gtk_volume_button_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtksnapshot</FILE>
+<TITLE>GtkSnapshot</TITLE>
+GtkSnapshot
+gtk_snapshot_get_renderer
+gtk_snapshot_push
+gtk_snapshot_push_node
+gtk_snapshot_push_cairo_node
+gtk_snapshot_pop
+gtk_snapshot_set_transform
+gtk_snapshot_transform
+gtk_snapshot_translate_2d
+gtk_snapshot_append_node
+gtk_snapshot_append
+gtk_snapshot_append_cairo_node
+gtk_snapshot_clips_rect
+gtk_snapshot_render_background
+gtk_snapshot_render_frame
+gtk_snapshot_render_focus
+gtk_snapshot_render_layout
+gtk_snapshot_render_insertion_cursor
+gtk_snapshot_render_icon
+</SECTION>
+
 <SECTION>
 <FILE>gtkwidget</FILE>
 <TITLE>GtkWidget</TITLE>
@@ -4609,7 +4482,6 @@ GtkWidgetClass
 GtkCallback
 GtkRequisition
 GtkAllocation
-GtkWidgetHelpType
 gtk_widget_new
 gtk_widget_destroy
 gtk_widget_in_destruction
@@ -4662,16 +4534,9 @@ gtk_widget_set_device_enabled
 gtk_widget_get_device_enabled
 gtk_widget_get_toplevel
 gtk_widget_get_ancestor
-gtk_widget_get_visual
-gtk_widget_set_visual
 gtk_widget_is_ancestor
 gtk_widget_translate_coordinates
 gtk_widget_hide_on_delete
-gtk_widget_set_style
-gtk_widget_ensure_style
-gtk_widget_get_style
-gtk_widget_reset_rc_styles
-gtk_widget_get_default_style
 gtk_widget_set_direction
 GtkTextDirection
 gtk_widget_get_direction
@@ -4679,21 +4544,6 @@ gtk_widget_set_default_direction
 gtk_widget_get_default_direction
 gtk_widget_shape_combine_region
 gtk_widget_input_shape_combine_region
-gtk_widget_path
-gtk_widget_class_path
-gtk_widget_override_background_color
-gtk_widget_override_color
-gtk_widget_override_font
-gtk_widget_override_symbolic_color
-gtk_widget_override_cursor
-gtk_widget_modify_style
-gtk_widget_get_modifier_style
-gtk_widget_modify_fg
-gtk_widget_modify_bg
-gtk_widget_modify_text
-gtk_widget_modify_base
-gtk_widget_modify_font
-gtk_widget_modify_cursor
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
 gtk_widget_set_font_options
@@ -4701,22 +4551,17 @@ gtk_widget_get_font_options
 gtk_widget_set_font_map
 gtk_widget_get_font_map
 gtk_widget_create_pango_layout
-gtk_widget_render_icon
-gtk_widget_render_icon_pixbuf
 gtk_widget_queue_draw_area
 gtk_widget_queue_draw_region
-gtk_widget_set_app_paintable
 gtk_widget_set_redraw_on_allocate
 gtk_widget_mnemonic_activate
 gtk_widget_class_install_style_property
 gtk_widget_class_find_style_property
 gtk_widget_class_list_style_properties
-gtk_widget_region_intersect
 gtk_widget_send_focus_change
 gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
-gtk_widget_style_attach
 gtk_widget_class_set_accessible_type
 gtk_widget_class_set_accessible_role
 gtk_widget_get_accessible
@@ -4739,7 +4584,6 @@ gtk_widget_get_no_show_all
 gtk_widget_list_mnemonic_labels
 gtk_widget_add_mnemonic_label
 gtk_widget_remove_mnemonic_label
-gtk_widget_is_composited
 gtk_widget_error_bell
 gtk_widget_keynav_failed
 gtk_widget_get_tooltip_markup
@@ -4764,7 +4608,6 @@ gtk_widget_get_allocated_baseline
 gtk_widget_get_allocated_size
 gtk_widget_get_clip
 gtk_widget_set_clip
-gtk_widget_get_app_paintable
 gtk_widget_get_can_default
 gtk_widget_set_can_default
 gtk_widget_get_can_focus
@@ -4775,7 +4618,6 @@ gtk_widget_get_has_window
 gtk_widget_set_has_window
 gtk_widget_get_sensitive
 gtk_widget_is_sensitive
-GtkStateType
 gtk_widget_get_visible
 gtk_widget_is_visible
 gtk_widget_set_visible
@@ -4786,7 +4628,6 @@ gtk_widget_has_default
 gtk_widget_has_focus
 gtk_widget_has_visible_focus
 gtk_widget_has_grab
-gtk_widget_has_rc_style
 gtk_widget_is_drawable
 gtk_widget_is_toplevel
 gtk_widget_set_window
@@ -4796,7 +4637,6 @@ gtk_widget_set_support_multidevice
 gtk_widget_get_support_multidevice
 gtk_widget_set_realized
 gtk_widget_get_realized
-gtk_widget_set_mapped
 gtk_widget_get_mapped
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
@@ -4896,7 +4736,6 @@ GtkWindowClass
 GtkWindowType
 gtk_window_new
 gtk_window_set_title
-gtk_window_set_wmclass
 gtk_window_set_resizable
 gtk_window_get_resizable
 gtk_window_add_accel_group
@@ -4905,8 +4744,6 @@ gtk_window_activate_focus
 gtk_window_activate_default
 gtk_window_set_modal
 gtk_window_set_default_size
-gtk_window_set_default_geometry
-gtk_window_set_geometry_hints
 gtk_window_set_gravity
 gtk_window_get_gravity
 GtkWindowPosition
@@ -4985,10 +4822,7 @@ gtk_window_get_group
 gtk_window_has_group
 gtk_window_get_window_type
 gtk_window_move
-gtk_window_parse_geometry
-gtk_window_reshow_with_initial_size
 gtk_window_resize
-gtk_window_resize_to_geometry
 gtk_window_set_default_icon_list
 gtk_window_set_default_icon
 gtk_window_set_default_icon_from_file
@@ -5109,11 +4943,6 @@ gtk_get_micro_version
 gtk_get_binary_age
 gtk_get_interface_age
 gtk_check_version
-gtk_major_version
-gtk_minor_version
-gtk_micro_version
-gtk_binary_age
-gtk_interface_age
 
 <SUBSECTION>
 GTK_MAJOR_VERSION
@@ -5178,8 +5007,6 @@ GTK_STYLE_PROVIDER_PRIORITY_THEME
 GTK_STYLE_PROVIDER_PRIORITY_SETTINGS
 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION
 GTK_STYLE_PROVIDER_PRIORITY_USER
-gtk_style_provider_get_icon_factory
-gtk_style_provider_get_style
 gtk_style_provider_get_style_property
 <SUBSECTION Standard>
 GTK_TYPE_STYLE_PROVIDER
@@ -5228,7 +5055,6 @@ GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
 GTK_STYLE_CLASS_FLAT
-GTK_STYLE_CLASS_GRIP
 GTK_STYLE_CLASS_HEADER
 GTK_STYLE_CLASS_HIGHLIGHT
 GTK_STYLE_CLASS_HORIZONTAL
@@ -5315,13 +5141,10 @@ gtk_style_context_get_border_color
 gtk_style_context_get_border
 gtk_style_context_get_padding
 gtk_style_context_get_margin
-gtk_style_context_get_font
-gtk_style_context_state_is_running
 gtk_style_context_lookup_color
 gtk_style_context_remove_provider
 gtk_style_context_remove_provider_for_screen
 gtk_style_context_reset_widgets
-gtk_style_context_set_background
 gtk_style_context_restore
 gtk_style_context_save
 gtk_style_context_set_junction_sides
@@ -5351,7 +5174,6 @@ gtk_render_background
 gtk_render_background_get_clip
 gtk_render_check
 gtk_render_expander
-gtk_render_extension
 gtk_render_focus
 gtk_render_frame
 gtk_render_frame_gap
@@ -5421,47 +5243,6 @@ gtk_css_provider_error_quark
 gtk_css_section_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtksymboliccolor</FILE>
-<TITLE>GtkSymbolicColor</TITLE>
-GtkSymbolicColor
-gtk_symbolic_color_new_literal
-gtk_symbolic_color_new_name
-gtk_symbolic_color_new_shade
-gtk_symbolic_color_new_alpha
-gtk_symbolic_color_new_mix
-gtk_symbolic_color_new_win32
-gtk_symbolic_color_ref
-gtk_symbolic_color_unref
-gtk_symbolic_color_resolve
-gtk_symbolic_color_to_string
-
-<SUBSECTION Standard>
-GTK_TYPE_SYMBOLIC_COLOR
-
-<SUBSECTION Private>
-gtk_symbolic_color_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgradient</FILE>
-<TITLE>GtkGradient</TITLE>
-GtkGradient
-gtk_gradient_new_linear
-gtk_gradient_new_radial
-gtk_gradient_add_color_stop
-gtk_gradient_ref
-gtk_gradient_unref
-gtk_gradient_resolve
-gtk_gradient_resolve_for_context
-gtk_gradient_to_string
-
-<SUBSECTION Standard>
-GTK_TYPE_GRADIENT
-
-gtk_gradient_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkselection</FILE>
 <TITLE>Selections</TITLE>
@@ -5585,7 +5366,6 @@ GtkTargetFlags
 GtkDragResult
 <SUBSECTION Destination Side>
 gtk_drag_dest_set
-gtk_drag_dest_set_proxy
 gtk_drag_dest_unset
 gtk_drag_dest_find_target
 gtk_drag_dest_get_target_list
@@ -5601,7 +5381,6 @@ gtk_drag_get_source_widget
 gtk_drag_highlight
 gtk_drag_unhighlight
 <SUBSECTION Source Side>
-gtk_drag_begin
 gtk_drag_begin_with_coordinates
 gtk_drag_cancel
 gtk_drag_set_icon_widget
@@ -5641,7 +5420,6 @@ gtk_binding_entry_add_signal
 gtk_binding_entry_add_signal_from_string
 gtk_binding_entry_skip
 gtk_binding_entry_remove
-gtk_binding_set_add_path
 </SECTION>
 
 <SECTION>
@@ -5808,7 +5586,7 @@ GtkPrintOperationPrivate
 
 
 <SECTION>
-<INCLUDE>gtk/gtkprintunixdialog.h</INCLUDE>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintunixdialog</FILE>
 <TITLE>GtkPrintUnixDialog</TITLE>
 GtkPrintUnixDialog
@@ -6155,7 +5933,7 @@ gtk_print_context_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkprintjob.h</INCLUDE>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintjob</FILE>
 <TITLE>GtkPrintJob</TITLE>
 GtkPrintJob
@@ -6166,6 +5944,7 @@ gtk_print_job_get_printer
 gtk_print_job_get_title
 gtk_print_job_get_status
 gtk_print_job_set_source_file
+gtk_print_job_set_source_fd
 gtk_print_job_get_surface
 gtk_print_job_send
 gtk_print_job_set_track_print_status
@@ -6206,7 +5985,7 @@ gtk_print_job_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkpagesetupunixdialog.h</INCLUDE>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
@@ -6255,7 +6034,7 @@ gtk_mount_operation_get_parent
 gtk_mount_operation_set_screen
 gtk_mount_operation_get_screen
 gtk_show_uri
-gtk_show_uri_on_parent
+gtk_show_uri_on_window
 <SUBSECTION Standard>
 GTK_IS_MOUNT_OPERATION
 GTK_IS_MOUNT_OPERATION_CLASS
@@ -6895,8 +6674,6 @@ gtk_popover_set_constrain_to
 gtk_popover_get_constrain_to
 gtk_popover_set_modal
 gtk_popover_get_modal
-gtk_popover_set_transitions_enabled
-gtk_popover_get_transitions_enabled
 gtk_popover_set_default_widget
 gtk_popover_get_default_widget
 <SUBSECTION Standard>
@@ -7264,6 +7041,7 @@ GTK_GET_SHORTCUTS_WINDOW_CLASS
 <SUBSECTION Private>
 GtkShortcutsWindowClass
 gtk_shortcuts_window_get_type
+GTK_SHORTCUTS_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -7279,6 +7057,7 @@ GTK_GET_SHORTCUTS_SECTION_CLASS
 <SUBSECTION Private>
 GtkShortcutsSectionClass
 gtk_shortcuts_section_get_type
+GTK_SHORTCUTS_SECTION_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -7294,6 +7073,7 @@ GTK_GET_SHORTCUTS_GROUP_CLASS
 <SUBSECTION Private>
 GtkShortcutsGroupClass
 gtk_shortcuts_group_get_type
+GTK_SHORTCUTS_GROUP_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -7310,4 +7090,26 @@ GTK_GET_SHORTCUTS_SHORTCUT_CLASS
 <SUBSECTION Private>
 GtkShortcutsShortcutClass
 gtk_shortcuts_shortcut_get_type
+gtk_shortcuts_shortcut_update_accel
+GTK_SHORTCUTS_SHORTCUT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtkshortcutlabel</FILE>
+GtkShortcutLabel
+gtk_shortcut_label_new
+gtk_shortcut_label_get_accelerator
+gtk_shortcut_label_get_disabled_text
+gtk_shortcut_label_set_accelerator
+gtk_shortcut_label_set_disabled_text
+
+<SUBSECTION Private>
+GtkShortcutLabelClass
+gtk_shortcut_label_get_type
+GTK_TYPE_SHORTCUT_LABEL
+GTK_SHORTCUT_LABEL
+GTK_SHORTCUT_LABEL_CLASS
+GTK_SHORTCUT_LABEL_GET_CLASS
+GTK_IS_SHORTCUT_LABEL
+GTK_IS_SHORTCUT_LABEL_CLASS
 </SECTION>

docs/reference/gtk/migrating-3to4.xml

@@ -52,6 +52,14 @@
       </para>
     </section>
 
+    <section>
+      <title>Do not use widget style properties</title>
+      <para>
+        Style properties do not exist in GTK+ 4. You should stop using them in
+        your custom CSS.
+      </para>
+    </section>
+
     <section>
       <title>Review your window creation flags</title>
       <para>
@@ -98,6 +106,14 @@
       </para>
     </section>
 
+    <section>
+      <title>Stop using gdk_pixbuf_get_from_window() and gdk_cairo_set_source_window()</title>
+      <para>
+        These functions are not supported in GTK+ 4. Instead, either use backend-specific
+        APIs, or render your widgets using gtk_widget_render().
+      </para>
+    </section>
+
   </section>
 
   <section>
@@ -110,6 +126,17 @@
       have been either impossible or impractical.
     </para>
 
+    <section>
+      <title>Adapt to GdkWindow API changes</title>
+      <para>
+        The gdk_window_new() function has been replaced by a number of more
+        specialized constructors: gdk_window_new_toplevel(), gdk_window_new_popup(),
+        gdk_window_new_temp(), gdk_window_new_child(), gdk_window_new_input(),
+        gdk_wayland_window_new_subsurface(). Use the appropriate ones to create
+        your windows.
+      </para>
+    </section>
+
     <section>
       <title>Adapt to GtkStyleContext API changes</title>
       <para>
@@ -121,6 +148,15 @@
       </para>
     </section>
 
+    <section>
+      <title>Adapt to GtkCssProvider API changes</title>
+      <para>
+        In GTK+ 4, the various #GtkCssProvider load functions have lost
+        their #GError argument. If you want to handle CSS loading errors,
+        use the #GtkCssProvider::parsing-error signal instead.
+      </para>
+    </section>
+
     <section>
       <title>Stop using GtkContainer::border-width</title>
       <para>
@@ -133,7 +169,7 @@
     <section>
       <title>Adapt to GtkWidget's size request changes</title>
       <para>
-        GTK+3 used five different virtual functions in GtkWidget to
+        GTK+ 3 used five different virtual functions in GtkWidget to
         implement size requisition, namely the gtk_widget_get_preferred_width()
         family of functions. To simplify widget implementations, GTK+4 uses
         only one virtual function, GtkWidgetClass::measure() that widgets
@@ -141,6 +177,43 @@
       </para>
     </section>
 
+    <section>
+      <title>Don't use -gtk-gradient in your CSS</title>
+      <para>
+        GTK+ now supports standard CSS syntax for both linear and radial
+        gradients, just use those.
+      </para>
+    </section>
+
+    <section>
+      <title>Use gtk_widget_measure</title>
+      <para>
+        gtk_widget_measure replaces the various gtk_widget_get_preferred_ functions
+        for querying sizes.
+      </para>
+    </section>
+
+    <section>
+      <title>Adapt to drawing model changes</title>
+      <para>
+        This area has seen the most radical changes in the transition from GTK+ 3
+        to GTK+ 4. Widgets no longer use a draw() function to render their contents
+        to a cairo surface. Instead, they have a snapshot() function that creates
+        one or more GskRenderNodes to represent their content. Third-party widgets
+        that use a draw() function or a #GtkWidget::draw signal handler for custom
+        drawing will need to be converted to use gtk_snapshot_append_cairo_node().
+      </para>
+      <para>
+        The auxiliary #GtkSnapshot object has APIs to help with creating render
+        nodes.
+      </para>
+      <para>
+        If you are using a #GtkDrawingArea for custom drawing, you need to switch
+        to using gtk_drawing_area_set_draw_func() to set a draw function. This is
+        pretty much a direct replacement for a #GtkWidget::draw signal handler.
+      </para>
+    </section>
+
   </section>
 
 </chapter>

docs/reference/gtk/question_index.sgml

@@ -570,7 +570,7 @@ RGBA drawing capabilities.
 Note that the presence of an RGBA visual is no guarantee that the
 window will actually appear transparent on screen. On X11, this
 requires a compositing manager to be running. See
-gtk_widget_is_composited() for a way to find out if the alpha
+gdk_display_is_composited() for a way to find out if the alpha
 channel will be respected.
 </para>
 </answer>

docs/reference/gtk/text_widget.sgml

@@ -148,13 +148,10 @@ displays after the widget is created with gtk_text_view_set_buffer().
 
 <para>
 
-There are two ways to affect text attributes in #GtkTextView.
-You can change the default attributes for a given #GtkTextView, and you can 
-apply tags that change the attributes for a region of text.  For text features 
-that come from the theme &mdash; such as font and foreground color &mdash; use 
-standard #GtkWidget functions such as gtk_widget_modify_font() or
-gtk_widget_override_color(). For other attributes there are dedicated methods on
-#GtkTextView such as gtk_text_view_set_tabs().
+The way to affect text attributes in #GtkTextView is to
+apply tags that change the attributes for a region of text.
+For text features that come from the theme &mdash; such as font and
+foreground color &mdash; use CSS to override their default values.
 
 <informalexample><programlisting>
   GtkWidget *view;
@@ -163,6 +160,8 @@ gtk_widget_override_color(). For other attributes there are dedicated methods on
   PangoFontDescription *font_desc;
   GdkRGBA rgba;
   GtkTextTag *tag;
+  GtkCssProvider *provider;
+  GtkStyleContext *context;
 
   view = gtk_text_view_new (<!-- -->);
 
@@ -170,14 +169,18 @@ gtk_widget_override_color(). For other attributes there are dedicated methods on
 
   gtk_text_buffer_set_text (buffer, "Hello, this is some text", -1);
 
-  /* Change default font throughout the widget */
-  font_desc = pango_font_description_from_string ("Serif 15");
-  gtk_widget_modify_font (view, font_desc);
-  pango_font_description_free (font_desc);
-
-  /* Change default color throughout the widget */
-  gdk_rgba_parse ("green", &amp;rgba);
-  gtk_widget_override_color (view, GTK_STATE_FLAG_NORMAL, &amp;rgba);
+  /* Change default font and color throughout the widget */
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (provider,
+                                   "textview {"
+                                   " font: 15 serif;"
+                                   "  color: green;"
+                                   "}",
+                                   -1);
+  context = gtk_widget_get_style_context (view);
+  gtk_style_context_add_provider (context,
+                                  GTK_STYLE_PROVIDER (provider),
+                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
   /* Change left margin throughout the widget */
   gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30);

docs/tools/shooter.c

@@ -1,6 +1,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdkx.h>
+#include <cairo-xlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <sys/wait.h>
@@ -136,9 +137,10 @@ static GdkPixbuf *
 take_window_shot (Window         child,
                   DecorationType decor)
 {
-  GdkWindow *window, *root_window;
+  cairo_surface_t *surface;
+  XWindowAttributes attrs;
   Window xid;
-  gint x_orig, y_orig;
+  Display *dpy;
   gint x = 0, y = 0;
   gint width, height;
 
@@ -150,35 +152,39 @@ take_window_shot (Window         child,
   else
     xid = child;
 
-  window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), xid);
-  root_window = gdk_screen_get_root_window (gdk_window_get_screen (window));
+  dpy = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+  XGetWindowAttributes (dpy, xid, &attrs);
 
-  width = gdk_window_get_width (window);
-  height = gdk_window_get_height (window);
-  gdk_window_get_origin (window, &x_orig, &y_orig);
+  width = attrs.width;
+  height = attrs.height;
 
-  if (x_orig < 0)
+  if (attrs.x < 0)
     {
-      x = - x_orig;
-      width = width + x_orig;
-      x_orig = 0;
+      x = - attrs.x;
+      width = width + attrs.x;
     }
 
-  if (y_orig < 0)
+  if (attrs.y < 0)
     {
-      y = - y_orig;
-      height = height + y_orig;
-      y_orig = 0;
+      y = - attrs.y;
+      height = height + attrs.y;
     }
 
-  if (x_orig + width > gdk_window_get_width (root_window))
-    width = gdk_window_get_width (root_window) - x_orig;
+  if (attrs.x + x + width > WidthOfScreen (DefaultScreenOfDisplay (dpy)))
+    width = WidthOfScreen (DefaultScreenOfDisplay (dpy)) - attrs.x - x;
 
-  if (y_orig + height > gdk_window_get_height (root_window))
-    height = gdk_window_get_height (root_window) - y_orig;
+  if (attrs.y + y + height > HeightOfScreen (DefaultScreenOfDisplay (dpy)))
+    height = HeightOfScreen (DefaultScreenOfDisplay (dpy)) - attrs.y - y;
 
-  tmp = gdk_pixbuf_get_from_window (window,
-				    x, y, width, height);
+  surface = cairo_xlib_surface_create (dpy,
+                                       xid,
+                                       attrs.visual,
+                                       attrs.width,
+                                       attrs.height);
+  tmp = gdk_pixbuf_get_from_surface (surface,
+                                     x, y,
+                                     width, height);
+  cairo_surface_destroy (surface);
 
   if (tmp != NULL)
     {
@@ -203,8 +209,8 @@ take_window_shot (Window         child,
 
 static GList *toplevels;
 static guint shot_id;
-static gboolean
 
+static gboolean
 window_is_csd (GdkWindow *window)
 {
   gboolean set;

docs/tools/widgets.c

@@ -798,7 +798,6 @@ create_page_setup_dialog (void)
 						 settings);
 
   info = new_widget_info ("pagesetupdialog", widget, ASIS);
-  gtk_widget_set_app_paintable (info->window, FALSE);
   info->include_decorations = TRUE;
 
   return info;

gdk/Makefile.am

@@ -92,12 +92,8 @@ gdk_public_h_sources = 				\
 	gdkvisual.h				\
 	gdkwindow.h
 
-deprecated_h_sources =				\
-	deprecated/gdkcolor.h
-
 gdk_h_sources =					\
-	$(gdk_public_h_sources)			\
-	$(deprecated_h_sources)
+	$(gdk_public_h_sources)
 
 gdk_private_headers = 				\
 	gdk-private.h				\
@@ -124,11 +120,7 @@ gdk_private_headers = 				\
 	gdkvisualprivate.h			\
 	gdkx.h
 
-deprecated_c_sources =				\
-	deprecated/gdkcolor.c
-
 gdk_c_sources = 				\
-	$(deprecated_c_sources)			\
 	gdk-private.c				\
 	gdk.c					\
 	gdkapplaunchcontext.c			\
@@ -211,8 +203,6 @@ endif # USE_QUARTZ
 
 if USE_WIN32
 libgdk_4_la_LIBADD += win32/libgdk-win32.la
-libgdk_4_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-libgdk_4_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
@@ -340,7 +330,7 @@ w32_introspection_files =		\
 	win32/gdkwindow-win32.c
 
 if OS_WIN32
-GdkWin32-noinst-4.0.gir: libgdk-3.la Gdk-noinst-4.0.gir Makefile
+GdkWin32-noinst-4.0.gir: libgdk-4.la Gdk-noinst-4.0.gir Makefile
 GdkWin32_noinst_4_0_gir_SCANNERFLAGS = \
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkwin32.h"	\
@@ -355,7 +345,7 @@ endif # OS_WIN32
 
 noinst_DATA = $(INTROSPECTION_GIRS)
 
-CLEANFILES += $(gir_DATA)
+CLEANFILES += $(INTROSPECTION_GIRS)
 
 endif # HAVE_INTROSPECTION
 
@@ -444,29 +434,20 @@ stamp-gc-h: $(top_builddir)/config.status
 #
 # Resources
 #
+
+glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
+
 gdk.gresource.xml: Makefile.am
 	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
 	echo "<gresources>" >> $@; \
 	echo "  <gresource prefix='/org/gtk/libgdk'>" >> $@; \
-	for f in $(srcdir)/resources/glsl/*.glsl; do \
+	for f in $(glsl_sources); do \
 	  n=`basename $$f`; \
 	  echo "    <file alias='glsl/$$n'>resources/glsl/$$n</file>" >> $@; \
 	done; \
 	echo "  </gresource>" >> $@; \
 	echo "</gresources>" >> $@;
 
-glsl_sources = \
-	resources/glsl/gl3-texture-2d.fs.glsl \
-	resources/glsl/gl3-texture-2d.vs.glsl \
-	resources/glsl/gl3-texture-rect.fs.glsl \
-	resources/glsl/gl3-texture-rect.vs.glsl \
-	resources/glsl/gl2-texture-2d.fs.glsl \
-	resources/glsl/gl2-texture-2d.fs.glsl \
-	resources/glsl/gl2-texture-rect.vs.glsl \
-	resources/glsl/gl2-texture-rect.vs.glsl \
-	resources/glsl/gles2-texture.fs.glsl \
-	resources/glsl/gles2-texture.vs.glsl
-
 EXTRA_DIST += $(glsl_sources)
 CLEANFILES += gdk.gresource.xml
 
@@ -510,20 +491,20 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \
 	$(top_builddir)/build/win32/GdkWin32_4_0_gir_list
 
 Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
-Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
-Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_noinst_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_noinst_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gtk-4
 Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_noinst_4_0_gir_SCANNERFLAGS)
 
 GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_noinst_4_0_gir_INCLUDES)
 GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
 GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
 GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =	\
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled=./Gdk-noinst-4.0.gir
+	--include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 

gdk/broadway/Makefile.am

@@ -20,7 +20,7 @@ LDADDS = $(GDK_DEP_LIBS) -lrt
 
 noinst_LTLIBRARIES = libgdk-broadway.la
 
-bin_PROGRAMS = broadwayd
+bin_PROGRAMS = gtk4-broadwayd
 
 libgdkinclude_HEADERS = 	\
 	gdkbroadway.h
@@ -29,8 +29,7 @@ libgdkbroadwayinclude_HEADERS = 	\
 	gdkbroadwaydisplay.h		\
 	gdkbroadwaywindow.h		\
 	gdkbroadwaycursor.h		\
-	gdkbroadwaymonitor.h		\
-	gdkbroadwayvisual.h
+	gdkbroadwaymonitor.h
 
 EXTRA_DIST += toarray.pl
 
@@ -62,6 +61,8 @@ libgdk_broadway_la_SOURCES =		\
 	gdkdisplay-broadway.c	\
 	gdkdisplay-broadway.h	\
 	gdkdnd-broadway.c	\
+	gdkdrawingcontext-broadway.c	\
+	gdkdrawingcontext-broadway.h	\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkglobals-broadway.c	\
@@ -73,7 +74,6 @@ libgdk_broadway_la_SOURCES =		\
 	gdkscreen-broadway.h	\
 	gdkselection-broadway.c	\
 	gdktestutils-broadway.c	\
-	gdkvisual-broadway.c	\
 	gdkwindow-broadway.c	\
 	gdkwindow-broadway.h	\
 	gdkprivate-broadway.h   \
@@ -86,7 +86,7 @@ libgdk_broadway_la_LIBADD = \
 	$(NULL)
 endif
 
-broadwayd_SOURCES = \
+gtk4_broadwayd_SOURCES = \
 	broadway-protocol.h		\
 	broadwayd.c 			\
 	broadway-server.h		\
@@ -97,9 +97,9 @@ broadwayd_SOURCES = \
 	broadway-output.c
 
 if OS_WIN32
-broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
+gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
 else
-broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
+gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
 endif
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)
@@ -108,7 +108,7 @@ EXTRA_DIST += $(broadway_built_sources)
 BUILT_SOURCES = $(broadway_built_sources)
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk4-broadway broadwayd
+MSVCPROJS = gdk4-broadway gtk4-broadwayd
 
 gdk4_broadway_FILES = $(libgdk_broadway_la_SOURCES)
 gdk4_broadway_EXCLUDES = dummy
@@ -118,14 +118,14 @@ gdk4_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
 
 gdk4_broadway_HEADERS_EXCLUDES = dummy
 
-broadwayd_FILES = $(broadwayd_SOURCES)
-broadwayd_EXCLUDES = dummy
+gtk4_broadwayd_FILES = $(gtk4_broadwayd_SOURCES)
+gtk4_broadwayd_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
 	$(top_builddir)/build/win32/vs12/gdk4-broadway.vcxproj		\
-	$(top_builddir)/build/win32/vs12/broadwayd.vcxproj		\
+	$(top_builddir)/build/win32/vs12/gtk4-broadwayd.vcxproj		\
 	$(top_builddir)/build/win32/vs12/gdk4-broadway.vs12.headers
 
 -include $(top_srcdir)/git.mk

gdk/broadway/broadwayd.c

@@ -449,7 +449,7 @@ main (int argc, char *argv[])
     {
       if (*argv[1] != ':')
 	{
-	  g_printerr ("Usage broadwayd [:DISPLAY]\n");
+	  g_printerr ("Usage gtk4-broadwayd [:DISPLAY]\n");
 	  exit (1);
 	}
       display = argv[1];

gdk/broadway/gdkbroadway.h

@@ -33,7 +33,6 @@
 #include <gdk/broadway/gdkbroadwaywindow.h>
 #include <gdk/broadway/gdkbroadwaycursor.h>
 #include <gdk/broadway/gdkbroadwaymonitor.h>
-#include <gdk/broadway/gdkbroadwayvisual.h>
 
 #undef __GDKBROADWAY_H_INSIDE__
 

gdk/broadway/gdkbroadwayvisual.h

@@ -1,46 +0,0 @@
-/* gdkbroadwayvisual.h
- *
- * Copyright (C) 2011  Alexander Larsson  <alexl@redhat.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_BROADWAY_VISUAL_H__
-#define __GDK_BROADWAY_VISUAL_H__
-
-#include <gdk/gdk.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_BROADWAY_VISUAL              (gdk_broadway_visual_get_type ())
-#define GDK_BROADWAY_VISUAL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_VISUAL, GdkBroadwayVisual))
-#define GDK_BROADWAY_VISUAL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_BROADWAY_VISUAL, GdkBroadwayVisualClass))
-#define GDK_IS_BROADWAY_VISUAL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_BROADWAY_VISUAL))
-#define GDK_IS_BROADWAY_VISUAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_VISUAL))
-#define GDK_BROADWAY_VISUAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_VISUAL, GdkBroadwayVisualClass))
-
-#ifdef GDK_COMPILATION
-typedef struct _GdkBroadwayVisual GdkBroadwayVisual;
-#else
-typedef GdkVisual GdkBroadwayVisual;
-#endif
-typedef struct _GdkBroadwayVisualClass GdkBroadwayVisualClass;
-
-
-GDK_AVAILABLE_IN_ALL
-GType gdk_broadway_visual_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GDK_BROADWAY_VISUAL_H__ */

gdk/broadway/gdkdisplay-broadway.c

@@ -101,8 +101,6 @@ _gdk_broadway_display_open (const gchar *display_name)
 
   _gdk_broadway_display_init_dnd (display);
 
-  _gdk_broadway_screen_setup (broadway_display->screens[0]);
-
   if (display_name == NULL)
     display_name = g_getenv ("BROADWAY_DISPLAY");
 

gdk/broadway/gdkdrawingcontext-broadway.c

@@ -1,5 +1,5 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
+/* GDK - The GIMP Drawing Kit
+ * Copyright 2016  Benjamin Otte <otte@gnome.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,19 +15,19 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_SYMBOLIC_COLOR_PRIVATE_H__
-#define __GTK_SYMBOLIC_COLOR_PRIVATE_H__
+#include "config.h"
 
-#include "gtk/deprecated/gtksymboliccolor.h"
-#include "gtk/gtkcssparserprivate.h"
-#include "gtk/gtkcssvalueprivate.h"
+#include "gdkdrawingcontext-broadway.h"
 
-G_BEGIN_DECLS
+G_DEFINE_TYPE (GdkBroadwayDrawingContext, gdk_broadway_drawing_context, GDK_TYPE_DRAWING_CONTEXT)
 
-GtkSymbolicColor * _gtk_css_symbolic_value_new            (GtkCssParser               *parser);
+static void
+gdk_broadway_drawing_context_class_init (GdkBroadwayDrawingContextClass *klass)
+{
+}
 
-GtkCssValue *      _gtk_symbolic_color_get_css_value      (GtkSymbolicColor           *symbolic);
+static void
+gdk_broadway_drawing_context_init (GdkBroadwayDrawingContext *self)
+{
+}
 
-G_END_DECLS
-
-#endif /* __GTK_SYMBOLIC_COLOR_PRIVATE_H__ */

gdk/broadway/gdkdrawingcontext-broadway.h

@@ -0,0 +1,48 @@
+/* GDK - The GIMP Drawing Kit
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_BROADWAY_DRAWING_CONTEXT_H__
+#define __GDK_BROADWAY_DRAWING_CONTEXT_H__
+
+#include "gdk/gdkdrawingcontextprivate.h"
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_BROADWAY_DRAWING_CONTEXT                (gdk_broadway_drawing_context_get_type ())
+#define GDK_BROADWAY_DRAWING_CONTEXT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_BROADWAY_DRAWING_CONTEXT, GdkBroadwayDrawingContext))
+#define GDK_IS_BROADWAY_DRAWING_CONTEXT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_BROADWAY_DRAWING_CONTEXT))
+#define GDK_BROADWAY_DRAWING_CONTEXT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_BROADWAY_DRAWING_CONTEXT, GdkBroadwayDrawingContextClass))
+#define GDK_IS_BROADWAY_DRAWING_CONTEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DRAWING_CONTEXT))
+#define GDK_BROADWAY_DRAWING_CONTEXT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DRAWING_CONTEXT, GdkBroadwayDrawingContextClass))
+
+typedef struct _GdkBroadwayDrawingContext       GdkBroadwayDrawingContext;
+typedef struct _GdkBroadwayDrawingContextClass  GdkBroadwayDrawingContextClass;
+
+struct _GdkBroadwayDrawingContext
+{
+  GdkDrawingContext parent_instance;
+};
+
+struct _GdkBroadwayDrawingContextClass
+{
+  GdkDrawingContextClass parent_instance;
+};
+
+GType gdk_broadway_drawing_context_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* __GDK_BROADWAY_DRAWING_CONTEXT_H__ */

gdk/broadway/gdkprivate-broadway.h

@@ -36,7 +36,6 @@
 #include "gdkdisplay-broadway.h"
 
 #include "gdkbroadwaycursor.h"
-#include "gdkbroadwayvisual.h"
 #include "gdkbroadwaywindow.h"
 
 void _gdk_broadway_resync_windows (void);
@@ -90,15 +89,12 @@ gboolean _gdk_keymap_key_is_modifier   (GdkKeymap       *keymap,
 					guint            keycode);
 
 void _gdk_broadway_screen_events_init   (GdkScreen *screen);
-GdkVisual *_gdk_broadway_screen_get_system_visual (GdkScreen * screen);
-GList *_gdk_broadway_screen_list_visuals (GdkScreen *screen);
 void _gdk_broadway_screen_size_changed (GdkScreen *screen, 
 					BroadwayInputScreenResizeNotify *msg);
 
 void _gdk_broadway_events_got_input      (BroadwayInputMsg *message);
 
 void _gdk_broadway_screen_init_root_window (GdkScreen *screen);
-void _gdk_broadway_screen_init_visuals (GdkScreen *screen);
 void _gdk_broadway_display_init_dnd (GdkDisplay *display);
 GdkDisplay * _gdk_broadway_display_open (const gchar *display_name);
 void _gdk_broadway_display_queue_events (GdkDisplay *display);
@@ -127,8 +123,7 @@ void       _gdk_broadway_display_create_window_impl     (GdkDisplay    *display,
 							 GdkWindow     *real_parent,
 							 GdkScreen     *screen,
 							 GdkEventMask   event_mask,
-							 GdkWindowAttr *attributes,
-							 gint           attributes_mask);
+							 GdkWindowAttr *attributes);
 gboolean _gdk_broadway_display_set_selection_owner (GdkDisplay *display,
 						    GdkWindow  *owner,
 						    GdkAtom     selection,

gdk/broadway/gdkscreen-broadway.c

@@ -99,27 +99,13 @@ static void
 gdk_broadway_screen_finalize (GObject *object)
 {
   GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (object);
-  gint          i;
 
   if (broadway_screen->root_window)
     g_object_unref (broadway_screen->root_window);
 
-  /* Visual Part */
-  for (i = 0; i < broadway_screen->nvisuals; i++)
-    g_object_unref (broadway_screen->visuals[i]);
-  g_free (broadway_screen->visuals);
-
   G_OBJECT_CLASS (gdk_broadway_screen_parent_class)->finalize (object);
 }
 
-static GdkVisual *
-gdk_broadway_screen_get_rgba_visual (GdkScreen *screen)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  return broadway_screen->rgba_visual;
-}
-
 GdkScreen *
 _gdk_broadway_screen_new (GdkDisplay *display,
 			  gint	 screen_number)
@@ -131,29 +117,11 @@ _gdk_broadway_screen_new (GdkDisplay *display,
 
   broadway_screen = GDK_BROADWAY_SCREEN (screen);
   broadway_screen->display = display;
-  _gdk_broadway_screen_init_visuals (screen);
   _gdk_broadway_screen_init_root_window (screen);
 
   return screen;
 }
 
-/*
- * It is important that we first request the selection
- * notification, and then setup the initial state of
- * is_composited to avoid a race condition here.
- */
-void
-_gdk_broadway_screen_setup (GdkScreen *screen)
-{
-}
-
-static gboolean
-gdk_broadway_screen_is_composited (GdkScreen *screen)
-{
-  return TRUE;
-}
-
-
 static gboolean
 gdk_broadway_screen_get_setting (GdkScreen   *screen,
 				 const gchar *name,
@@ -178,10 +146,6 @@ gdk_broadway_screen_class_init (GdkBroadwayScreenClass *klass)
 
   screen_class->get_display = gdk_broadway_screen_get_display;
   screen_class->get_root_window = gdk_broadway_screen_get_root_window;
-  screen_class->is_composited = gdk_broadway_screen_is_composited;
   screen_class->get_setting = gdk_broadway_screen_get_setting;
-  screen_class->get_rgba_visual = gdk_broadway_screen_get_rgba_visual;
-  screen_class->get_system_visual = _gdk_broadway_screen_get_system_visual;
-  screen_class->list_visuals = _gdk_broadway_screen_list_visuals;
 }
 

gdk/broadway/gdkscreen-broadway.h

@@ -23,7 +23,6 @@
 #define __GDK_BROADWAY_SCREEN_H__
 
 #include <gdk/gdkscreenprivate.h>
-#include <gdk/gdkvisual.h>
 #include "gdkprivate-broadway.h"
 
 G_BEGIN_DECLS
@@ -46,16 +45,6 @@ struct _GdkBroadwayScreen
 
   GdkDisplay *display;
   GdkWindow *root_window;
-
-  /* Visual Part */
-  GdkVisual **visuals;
-  gint nvisuals;
-  GdkVisual *system_visual;
-  GdkVisual *rgba_visual;
-  gint available_depths[7];
-  gint navailable_depths;
-  GdkVisualType available_types[6];
-  gint navailable_types;
 };
 
 struct _GdkBroadwayScreenClass
@@ -68,7 +57,6 @@ struct _GdkBroadwayScreenClass
 GType       gdk_broadway_screen_get_type (void);
 GdkScreen * _gdk_broadway_screen_new      (GdkDisplay *display,
 					   gint	  screen_number);
-void _gdk_broadway_screen_setup           (GdkScreen *screen);
 
 G_END_DECLS
 

gdk/broadway/gdkvisual-broadway.c

@@ -1,137 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#include "config.h"
-
-#include "gdkvisualprivate.h"
-
-#include "gdkprivate-broadway.h"
-#include "gdkscreen-broadway.h"
-#include "gdkinternals.h"
-
-struct _GdkBroadwayVisual
-{
-  GdkVisual visual;
-};
-
-struct _GdkBroadwayVisualClass
-{
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (GdkBroadwayVisual, gdk_broadway_visual, GDK_TYPE_VISUAL)
-
-static void
-gdk_broadway_visual_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (gdk_broadway_visual_parent_class)->finalize (object);
-}
-
-static void
-gdk_broadway_visual_class_init (GdkBroadwayVisualClass *visual_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (visual_class);
-
-  object_class->finalize = gdk_broadway_visual_finalize;
-}
-
-static void
-gdk_broadway_visual_init (GdkBroadwayVisual *visual)
-{
-}
-
-void
-_gdk_broadway_screen_init_visuals (GdkScreen *screen)
-{
-  GdkBroadwayScreen *broadway_screen;
-  GdkVisual **visuals;
-  int nvisuals;
-
-  g_return_if_fail (GDK_IS_SCREEN (screen));
-  broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  nvisuals = 2;
-  visuals = g_new (GdkVisual *, nvisuals);
-
-  visuals[0] = g_object_new (GDK_TYPE_BROADWAY_VISUAL, NULL);
-  visuals[0]->screen = screen;
-  visuals[0]->type = GDK_VISUAL_TRUE_COLOR;
-  visuals[0]->depth = 32;
-  visuals[0]->byte_order = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? GDK_LSB_FIRST : GDK_MSB_FIRST;
-  visuals[0]->red_mask = 0xff0000;
-  visuals[0]->green_mask = 0xff00;
-  visuals[0]->blue_mask = 0xff;
-  visuals[0]->colormap_size = 256;
-  visuals[0]->bits_per_rgb = 8;
-
-  visuals[1] = g_object_new (GDK_TYPE_BROADWAY_VISUAL, NULL);
-  visuals[1]->screen = screen;
-  visuals[1]->type = GDK_VISUAL_TRUE_COLOR;
-  visuals[1]->depth = 24;
-  visuals[1]->byte_order = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? GDK_LSB_FIRST : GDK_MSB_FIRST;
-  visuals[1]->red_mask = 0xff0000;
-  visuals[1]->green_mask = 0xff00;
-  visuals[1]->blue_mask = 0xff;
-  visuals[1]->colormap_size = 256;
-  visuals[1]->bits_per_rgb = 8;
-
-  broadway_screen->system_visual = visuals[1];
-  broadway_screen->rgba_visual = visuals[0];
-
-  broadway_screen->navailable_depths = 2;
-  broadway_screen->available_depths[0] = 32;
-  broadway_screen->available_depths[1] = 24;
-
-  broadway_screen->navailable_types = 1;
-  broadway_screen->available_types[0] = GDK_VISUAL_TRUE_COLOR;
-
-  broadway_screen->visuals = visuals;
-  broadway_screen->nvisuals = nvisuals;
-}
-
-GdkVisual *
-_gdk_broadway_screen_get_system_visual (GdkScreen * screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return ((GdkVisual *) GDK_BROADWAY_SCREEN (screen)->system_visual);
-}
-
-GList *
-_gdk_broadway_screen_list_visuals (GdkScreen *screen)
-{
-  GList *list;
-  GdkBroadwayScreen *broadway_screen;
-  guint i;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-  broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  list = NULL;
-
-  for (i = 0; i < broadway_screen->nvisuals; ++i)
-    list = g_list_append (list, broadway_screen->visuals[i]);
-
-  return list;
-}

gdk/broadway/gdkwindow-broadway.c

@@ -33,6 +33,7 @@
 #include "gdkwindow.h"
 #include "gdkwindowimpl.h"
 #include "gdkdisplay-broadway.h"
+#include "gdkdrawingcontext-broadway.h"
 #include "gdkprivate-broadway.h"
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
@@ -256,8 +257,7 @@ _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
 					  GdkWindow     *real_parent,
 					  GdkScreen     *screen,
 					  GdkEventMask   event_mask,
-					  GdkWindowAttr *attributes,
-					  gint           attributes_mask)
+					  GdkWindowAttr *attributes)
 {
   GdkWindowImplBroadway *impl;
   GdkBroadwayDisplay *broadway_display;
@@ -785,13 +785,6 @@ gdk_window_broadway_input_shape_combine_region (GdkWindow       *window,
 {
 }
 
-
-static void
-gdk_broadway_window_set_override_redirect (GdkWindow *window,
-					   gboolean override_redirect)
-{
-}
-
 static void
 gdk_broadway_window_set_accept_focus (GdkWindow *window,
 				      gboolean accept_focus)
@@ -1297,29 +1290,13 @@ static void
 create_moveresize_window (MoveResizeData *mv_resize,
 			  guint32         timestamp)
 {
-  GdkWindowAttr attributes;
-  gint attributes_mask;
   GdkGrabStatus status;
   GdkSeat *seat;
   GdkDevice *pointer;
 
   g_assert (mv_resize->moveresize_emulation_window == NULL);
 
-  attributes.x = -100;
-  attributes.y = -100;
-  attributes.width = 10;
-  attributes.height = 10;
-  attributes.window_type = GDK_WINDOW_TEMP;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.override_redirect = TRUE;
-  attributes.event_mask = 0;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
-
-  mv_resize->moveresize_emulation_window =
-    gdk_window_new (gdk_screen_get_root_window (gdk_display_get_default_screen (mv_resize->display)),
-		    &attributes,
-		    attributes_mask);
+  mv_resize->moveresize_emulation_window = gdk_window_new_temp (mv_resize->display);
 
   gdk_window_show (mv_resize->moveresize_emulation_window);
 
@@ -1534,6 +1511,16 @@ gdk_broadway_get_last_seen_time (GdkWindow  *window)
   return _gdk_broadway_server_get_last_seen_time (GDK_BROADWAY_DISPLAY (display)->server);
 }
 
+static GdkDrawingContext *
+gdk_broadway_window_create_draw_context (GdkWindow            *window,
+                                        const cairo_region_t *region)
+{
+  return g_object_new (GDK_TYPE_BROADWAY_DRAWING_CONTEXT,
+                       "window", window,
+                       "clip", region,
+                       NULL);
+}
+
 static void
 gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
 {
@@ -1580,7 +1567,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->set_startup_id = gdk_broadway_window_set_startup_id;
   impl_class->set_transient_for = gdk_broadway_window_set_transient_for;
   impl_class->get_frame_extents = gdk_broadway_window_get_frame_extents;
-  impl_class->set_override_redirect = gdk_broadway_window_set_override_redirect;
   impl_class->set_accept_focus = gdk_broadway_window_set_accept_focus;
   impl_class->set_focus_on_map = gdk_broadway_window_set_focus_on_map;
   impl_class->set_icon_list = gdk_broadway_window_set_icon_list;
@@ -1613,4 +1599,5 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->change_property = _gdk_broadway_window_change_property;
   impl_class->delete_property = _gdk_broadway_window_delete_property;
   impl_class->get_drag_protocol = _gdk_broadway_window_get_drag_protocol;
+  impl_class->create_draw_context = gdk_broadway_window_create_draw_context;
 }

gdk/deprecated/gdkcolor.c

@@ -1,202 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "config.h"
-
-#include "gdkcolor.h"
-
-#include "gdkscreen.h"
-#include "gdkinternals.h"
-
-#include <time.h>
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-/**
- * SECTION:colors
- * @Short_description: Manipulation of colors
- * @Title: Colors
- *
- * A #GdkColor represents a color.
- *
- * When working with cairo, it is often more convenient
- * to use a #GdkRGBA instead, and #GdkColor has been
- * deprecated in favor of #GdkRGBA.
- */
-
-
-/**
- * gdk_color_copy:
- * @color: a #GdkColor
- *
- * Makes a copy of a #GdkColor.
- *
- * The result must be freed using gdk_color_free().
- *
- * Returns: a copy of @color
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-GdkColor*
-gdk_color_copy (const GdkColor *color)
-{
-  GdkColor *new_color;
-
-  g_return_val_if_fail (color != NULL, NULL);
-
-  new_color = g_slice_new (GdkColor);
-  *new_color = *color;
-  return new_color;
-}
-
-/**
- * gdk_color_free:
- * @color: a #GdkColor
- *
- * Frees a #GdkColor created with gdk_color_copy().
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-void
-gdk_color_free (GdkColor *color)
-{
-  g_return_if_fail (color != NULL);
-
-  g_slice_free (GdkColor, color);
-}
-
-/**
- * gdk_color_hash:
- * @color: a #GdkColor
- *
- * A hash function suitable for using for a hash
- * table that stores #GdkColors.
- *
- * Returns: The hash function applied to @color
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-guint
-gdk_color_hash (const GdkColor *color)
-{
-  return ((color->red) +
-          (color->green << 11) +
-          (color->blue << 22) +
-          (color->blue >> 6));
-}
-
-/**
- * gdk_color_equal:
- * @colora: a #GdkColor
- * @colorb: another #GdkColor
- *
- * Compares two colors.
- *
- * Returns: %TRUE if the two colors compare equal
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-gboolean
-gdk_color_equal (const GdkColor *colora,
-                 const GdkColor *colorb)
-{
-  g_return_val_if_fail (colora != NULL, FALSE);
-  g_return_val_if_fail (colorb != NULL, FALSE);
-
-  return ((colora->red == colorb->red) &&
-          (colora->green == colorb->green) &&
-          (colora->blue == colorb->blue));
-}
-
-G_DEFINE_BOXED_TYPE (GdkColor, gdk_color,
-                     gdk_color_copy,
-                     gdk_color_free)
-
-/**
- * gdk_color_parse:
- * @spec: the string specifying the color
- * @color: (out): the #GdkColor to fill in
- *
- * Parses a textual specification of a color and fill in the
- * @red, @green, and @blue fields of a #GdkColor.
- *
- * The string can either one of a large set of standard names
- * (taken from the X11 `rgb.txt` file), or it can be a hexadecimal
- * value in the form “\#rgb” “\#rrggbb”, “\#rrrgggbbb” or
- * “\#rrrrggggbbbb” where “r”, “g” and “b” are hex digits of
- * the red, green, and blue components of the color, respectively.
- * (White in the four forms is “\#fff”, “\#ffffff”, “\#fffffffff”
- * and “\#ffffffffffff”).
- *
- * Returns: %TRUE if the parsing succeeded
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-gboolean
-gdk_color_parse (const gchar *spec,
-                 GdkColor    *color)
-{
-  PangoColor pango_color;
-
-  if (pango_color_parse (&pango_color, spec))
-    {
-      color->red = pango_color.red;
-      color->green = pango_color.green;
-      color->blue = pango_color.blue;
-
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
-
-/**
- * gdk_color_to_string:
- * @color: a #GdkColor
- *
- * Returns a textual specification of @color in the hexadecimal
- * form “\#rrrrggggbbbb” where “r”, “g” and “b” are hex digits
- * representing the red, green and blue components respectively.
- *
- * The returned string can be parsed by gdk_color_parse().
- *
- * Returns: a newly-allocated text string
- *
- * Since: 2.12
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-gchar *
-gdk_color_to_string (const GdkColor *color)
-{
-  PangoColor pango_color;
-
-  g_return_val_if_fail (color != NULL, NULL);
-
-  pango_color.red = color->red;
-  pango_color.green = color->green;
-  pango_color.blue = color->blue;
-
-  return pango_color_to_string (&pango_color);
-}

gdk/deprecated/gdkcolor.h

@@ -1,87 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDK_COLOR_H__
-#define __GDK_COLOR_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <cairo.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
-
-G_BEGIN_DECLS
-
-
-/**
- * GdkColor:
- * @pixel: For allocated colors, the pixel value used to
- *     draw this color on the screen. Not used anymore.
- * @red: The red component of the color. This is
- *     a value between 0 and 65535, with 65535 indicating
- *     full intensity
- * @green: The green component of the color
- * @blue: The blue component of the color
- *
- * A #GdkColor is used to describe a color,
- * similar to the XColor struct used in the X11 drawing API.
- *
- * Deprecated: 3.14: Use #GdkRGBA
- */
-struct _GdkColor
-{
-  guint32 pixel;
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-};
-
-#define GDK_TYPE_COLOR (gdk_color_get_type ())
-
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_get_type)
-GType     gdk_color_get_type (void) G_GNUC_CONST;
-
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_copy)
-GdkColor *gdk_color_copy      (const GdkColor *color);
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_free)
-void      gdk_color_free      (GdkColor       *color);
-
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_hash)
-guint     gdk_color_hash      (const GdkColor *color);
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_equal)
-gboolean  gdk_color_equal     (const GdkColor *colora,
-                               const GdkColor *colorb);
-
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_parse)
-gboolean  gdk_color_parse     (const gchar    *spec,
-                               GdkColor       *color);
-GDK_DEPRECATED_IN_3_14_FOR(gdk_rgba_to_string)
-gchar *   gdk_color_to_string (const GdkColor *color);
-
-
-G_END_DECLS
-
-#endif /* __GDK_COLOR_H__ */

gdk/gdk.h

@@ -63,10 +63,6 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
-#ifndef GDK_DISABLE_DEPRECATED
-#include <gdk/deprecated/gdkcolor.h>
-#endif
-
 #include <gdk/gdk-autocleanup.h>
 
 #undef __GDK_H_INSIDE__

gdk/gdkcairo.c

@@ -323,40 +323,6 @@ gdk_cairo_set_source_pixbuf (cairo_t         *cr,
   cairo_surface_destroy (surface);
 }
 
-/**
- * gdk_cairo_set_source_window:
- * @cr: a cairo context
- * @window: a #GdkWindow
- * @x: X coordinate of location to place upper left corner of @window
- * @y: Y coordinate of location to place upper left corner of @window
- *
- * Sets the given window as the source pattern for @cr.
- *
- * The pattern has an extend mode of %CAIRO_EXTEND_NONE and is aligned
- * so that the origin of @window is @x, @y. The window contains all its
- * subwindows when rendering.
- *
- * Note that the contents of @window are undefined outside of the
- * visible part of @window, so use this function with care.
- *
- * Since: 2.24
- */
-void
-gdk_cairo_set_source_window (cairo_t   *cr,
-                             GdkWindow *window,
-                             gdouble    x,
-                             gdouble    y)
-{
-  cairo_surface_t *surface;
-
-  g_return_if_fail (cr != NULL);
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  surface = _gdk_window_ref_cairo_surface (window);
-  cairo_set_source_surface (cr, surface, x, y);
-  cairo_surface_destroy (surface);
-}
-
 /*
  * _gdk_cairo_surface_extents:
  * @surface: surface to measure

gdk/gdkcairo.h

@@ -23,7 +23,6 @@
 #endif
 
 #include <gdk/gdkversionmacros.h>
-#include <gdk/deprecated/gdkcolor.h>
 #include <gdk/gdkrgba.h>
 #include <gdk/gdkdrawingcontext.h>
 #include <gdk/gdkpixbuf.h>
@@ -43,11 +42,6 @@ void       gdk_cairo_set_source_pixbuf  (cairo_t              *cr,
                                          const GdkPixbuf      *pixbuf,
                                          gdouble               pixbuf_x,
                                          gdouble               pixbuf_y);
-GDK_AVAILABLE_IN_ALL
-void       gdk_cairo_set_source_window  (cairo_t              *cr,
-                                         GdkWindow            *window,
-                                         gdouble               x,
-                                         gdouble               y);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_rectangle          (cairo_t              *cr,

gdk/gdkdisplay.c

@@ -24,6 +24,7 @@
 #include "gdkdisplay.h"
 #include "gdkdisplayprivate.h"
 
+#include "gdkintl.h"
 #include "gdk-private.h"
 
 #include "gdkdeviceprivate.h"
@@ -66,6 +67,15 @@
  * gdk_display_get_device_manager().
  */
 
+enum
+{
+  PROP_0,
+  PROP_COMPOSITED,
+  PROP_RGBA,
+  LAST_PROP
+};
+
+static GParamSpec *props[LAST_PROP] = { NULL, };
 
 enum {
   OPENED,
@@ -89,6 +99,29 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)
 
+static void
+gdk_display_get_property (GObject    *object,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  GdkDisplay *display = GDK_DISPLAY (object);
+
+  switch (prop_id)
+    {
+    case PROP_COMPOSITED:
+      g_value_set_boolean (value, gdk_display_is_composited (display));
+      break;
+
+    case PROP_RGBA:
+      g_value_set_boolean (value, gdk_display_is_rgba (display));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
 static void
 gdk_display_real_make_default (GdkDisplay *display)
 {
@@ -156,6 +189,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 
   object_class->finalize = gdk_display_finalize;
   object_class->dispose = gdk_display_dispose;
+  object_class->get_property = gdk_display_get_property;
 
   class->get_app_launch_context = gdk_display_real_get_app_launch_context;
   class->window_type = GDK_TYPE_WINDOW;
@@ -168,6 +202,38 @@ gdk_display_class_init (GdkDisplayClass *class)
 
   class->get_primary_monitor = gdk_display_real_get_primary_monitor;
 
+  /**
+   * GdkDisplay:composited:
+   *
+   * %TRUE if the display properly composits the alpha channel.
+   * See gdk_display_is_composited() for details.
+   *
+   * Since: 3.90
+   */
+  props[PROP_COMPOSITED] =
+    g_param_spec_boolean ("composited",
+                          P_("Composited"),
+                          P_("Composited"),
+                          TRUE,
+                          G_PARAM_READABLE);
+
+  /**
+   * GdkDisplay:rgba:
+   *
+   * %TRUE if the display supports an alpha channel. See gdk_display_is_rgba()
+   * for details.
+   *
+   * Since: 3.90
+   */
+  props[PROP_RGBA] =
+    g_param_spec_boolean ("rgba",
+                          P_("RGBA"),
+                          P_("RGBA"),
+                          TRUE,
+                          G_PARAM_READABLE);
+
+  g_object_class_install_properties (object_class, LAST_PROP, props);
+
   /**
    * GdkDisplay::opened:
    * @display: the object on which the signal is emitted
@@ -324,6 +390,9 @@ gdk_display_init (GdkDisplay *display)
                                                         (GDestroyNotify) g_free);
 
   display->rendering_mode = _gdk_rendering_mode;
+
+  display->composited = TRUE;
+  display->rgba = TRUE;
 }
 
 static void
@@ -1862,16 +1931,14 @@ _gdk_display_create_window_impl (GdkDisplay       *display,
                                  GdkWindow        *real_parent,
                                  GdkScreen        *screen,
                                  GdkEventMask      event_mask,
-                                 GdkWindowAttr    *attributes,
-                                 gint              attributes_mask)
+                                 GdkWindowAttr    *attributes)
 {
   GDK_DISPLAY_GET_CLASS (display)->create_window_impl (display,
                                                        window,
                                                        real_parent,
                                                        screen,
                                                        event_mask,
-                                                       attributes,
-                                                       attributes_mask);
+                                                       attributes);
 }
 
 GdkWindow *
@@ -2068,6 +2135,94 @@ gdk_display_set_rendering_mode (GdkDisplay       *display,
   display->rendering_mode = mode;
 }
 
+/**
+ * gdk_display_is_composited:
+ * @display: a #GdkDisplay
+ *
+ * Returns whether windows can reasonably be expected to have
+ * their alpha channel drawn correctly on the screen. Check
+ * gdk_display_is_rgba() for wether the display supports an
+ * alpha channel.
+ *
+ * On X11 this function returns whether a compositing manager is
+ * compositing on @display.
+ *
+ * On modern displays, this value is always %TRUE.
+ *
+ * Returns: Whether windows with RGBA visuals can reasonably be
+ * expected to have their alpha channels drawn correctly on the screen.
+ *
+ * Since: 3.90
+ **/
+gboolean
+gdk_display_is_composited (GdkDisplay *display)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+
+  return display->composited;
+}
+
+void
+gdk_display_set_composited (GdkDisplay *display,
+                            gboolean    composited)
+{
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+
+  if (display->composited == composited)
+    return;
+
+  display->composited = composited;
+
+  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_COMPOSITED]);
+}
+
+/**
+ * gdk_display_is_rgba:
+ * @display: a #GdkDisplay
+ *
+ * Returns wether windows on this @display are created with an
+ * alpha channel.
+ *
+ * Even if a %TRUE is returned, it is possible that the
+ * window’s alpha channel won’t be honored when displaying the
+ * window on the screen: in particular, for X an appropriate
+ * windowing manager and compositing manager must be running to
+ * provide appropriate display. Use gdk_display_is_composited()
+ * to check if that is the case.
+ *
+ * For setting an overall opacity for a top-level window, see
+ * gdk_window_set_opacity().
+ *
+ * On modern displays, this value is always %TRUE.
+ *
+ * Returns: %TRUE if windows are created with an alpha channel or
+ *     %FALSE if the display does not support this functionality.
+ *
+ * Since: 3.90
+ **/
+gboolean
+gdk_display_is_rgba (GdkDisplay *display)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+
+  return display->rgba;
+}
+
+void
+gdk_display_set_rgba (GdkDisplay *display,
+                      gboolean    rgba)
+{
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+
+  if (display->rgba == rgba)
+    return;
+
+  display->rgba = rgba;
+
+  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_RGBA]);
+}
+
+
 void
 gdk_display_add_seat (GdkDisplay *display,
                       GdkSeat    *seat)

gdk/gdkdisplay.h

@@ -65,6 +65,11 @@ void        gdk_display_close                  (GdkDisplay  *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_closed          (GdkDisplay  *display);
 
+GDK_AVAILABLE_IN_3_90
+gboolean    gdk_display_is_composited      (GdkDisplay  *display);
+GDK_AVAILABLE_IN_3_90
+gboolean    gdk_display_is_rgba            (GdkDisplay  *display);
+
 GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
 GDK_AVAILABLE_IN_ALL

gdk/gdkdisplayprivate.h

@@ -123,6 +123,9 @@ struct _GdkDisplay
   guint has_gl_extension_texture_non_power_of_two : 1;
   guint has_gl_extension_texture_rectangle : 1;
 
+  guint rgba : 1;
+  guint composited : 1;
+
   GdkRenderingMode rendering_mode;
 
   GList *seats;
@@ -192,8 +195,7 @@ struct _GdkDisplayClass
                                                     GdkWindow     *real_parent,
                                                     GdkScreen     *screen,
                                                     GdkEventMask   event_mask,
-                                                    GdkWindowAttr *attributes,
-                                                    gint           attributes_mask);
+                                                    GdkWindowAttr *attributes);
 
   GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);
   void                       (*push_error_trap)    (GdkDisplay    *display);
@@ -321,13 +323,17 @@ void                _gdk_display_create_window_impl   (GdkDisplay       *display
                                                        GdkWindow        *real_parent,
                                                        GdkScreen        *screen,
                                                        GdkEventMask      event_mask,
-                                                       GdkWindowAttr    *attributes,
-                                                       gint              attributes_mask);
+                                                       GdkWindowAttr    *attributes);
 GdkWindow *         _gdk_display_create_window        (GdkDisplay       *display);
 
 gboolean            gdk_display_make_gl_context_current  (GdkDisplay        *display,
                                                           GdkGLContext      *context);
 
+void                gdk_display_set_rgba              (GdkDisplay       *display,
+                                                       gboolean          rgba);
+void                gdk_display_set_composited        (GdkDisplay       *display,
+                                                       gboolean          composited);
+
 void                gdk_display_add_seat              (GdkDisplay       *display,
                                                        GdkSeat          *seat);
 void                gdk_display_remove_seat           (GdkDisplay       *display,

gdk/gdkgl.c

@@ -741,10 +741,8 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
   gdk_window_get_unscaled_size (window, NULL, &unscaled_window_height);
 
   sx = sy = 1;
-  cairo_surface_get_device_scale (window->current_paint.surface, &sx, &sy);
-
-  cairo_surface_get_device_offset (surface,
-                                   &device_x_offset, &device_y_offset);
+  cairo_surface_get_device_scale (surface, &sx, &sy);
+  cairo_surface_get_device_offset (surface, &device_x_offset, &device_y_offset);
 
   glGenTextures (1, &texture_id);
   if (use_texture_rectangle)
@@ -780,7 +778,12 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
       e.height *= sy;
       image = cairo_surface_map_to_image (surface, &e);
 
-      gdk_gl_context_upload_texture (paint_context, image, e.width, e.height, target);
+      gdk_gl_context_upload_texture (paint_context, 
+                                     cairo_image_surface_get_data (image),
+                                     e.width,
+                                     e.height,
+                                     cairo_image_surface_get_stride (image),
+                                     target);
 
       cairo_surface_unmap_image (surface, image);
 
@@ -855,7 +858,12 @@ gdk_cairo_surface_upload_to_gl (cairo_surface_t *surface,
   rect.height = height;
   tmp = cairo_surface_map_to_image (surface, &rect);
 
-  gdk_gl_context_upload_texture (context, tmp, rect.width, rect.height, target);
+  gdk_gl_context_upload_texture (context,
+                                 cairo_image_surface_get_data (tmp),
+                                 rect.width,
+                                 rect.height,
+                                 cairo_image_surface_get_stride (tmp),
+                                 target);
 
   cairo_surface_unmap_image (surface, tmp);
 }

gdk/gdkglcontext.c

@@ -154,6 +154,7 @@ gdk_gl_context_finalize (GObject *gobject)
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
 
   g_clear_pointer (&priv->paint_data, g_free);
+  G_OBJECT_CLASS (gdk_gl_context_parent_class)->finalize (gobject);
 }
 
 static void
@@ -237,9 +238,10 @@ gdk_gl_context_get_property (GObject    *gobject,
 
 void
 gdk_gl_context_upload_texture (GdkGLContext    *context,
-                               cairo_surface_t *image_surface,
+                               const guchar    *data,
                                int              width,
                                int              height,
+                               int              stride,
                                guint            texture_target)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
@@ -253,21 +255,19 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
       (priv->use_es && (priv->gl_version >= 30 || priv->has_unpack_subimage)))
     {
       glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
-      glPixelStorei (GL_UNPACK_ROW_LENGTH, cairo_image_surface_get_stride (image_surface) / 4);
+      glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / 4);
 
       if (priv->use_es)
         glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                      cairo_image_surface_get_data (image_surface));
+                      data);
       else
         glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
-                      cairo_image_surface_get_data (image_surface));
+                      data);
 
       glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
     }
   else
     {
-      GLvoid *data = cairo_image_surface_get_data (image_surface);
-      int stride = cairo_image_surface_get_stride (image_surface);
       int i;
 
       if (priv->use_es)
@@ -275,14 +275,14 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
           glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
           for (i = 0; i < height; i++)
-            glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_RGBA, GL_UNSIGNED_BYTE, (unsigned char*) data + (i * stride));
+            glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_RGBA, GL_UNSIGNED_BYTE, data + (i * stride));
         }
       else
         {
           glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
 
           for (i = 0; i < height; i++)
-            glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride));
+            glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data + (i * stride));
         }
     }
 }

gdk/gdkglcontextprivate.h

@@ -77,9 +77,10 @@ void                    gdk_gl_context_set_is_legacy            (GdkGLContext
                                                                  gboolean         is_legacy);
 
 void                    gdk_gl_context_upload_texture           (GdkGLContext    *context,
-                                                                 cairo_surface_t *image_surface,
+                                                                 const guchar    *data,
                                                                  int              width,
                                                                  int              height,
+                                                                 int              stride,
                                                                  guint            texture_target);
 GdkGLContextPaintData * gdk_gl_context_get_paint_data           (GdkGLContext    *context);
 gboolean                gdk_gl_context_use_texture_rectangle    (GdkGLContext    *context);

gdk/gdkinternals.h

@@ -41,6 +41,7 @@ G_BEGIN_DECLS
 /* Debugging support */
 
 typedef struct _GdkEventFilter         GdkEventFilter;
+typedef struct _GdkWindowAttr          GdkWindowAttr;
 
 typedef enum {
   GDK_EVENT_FILTER_REMOVED = 1 << 0
@@ -147,6 +148,17 @@ struct _GdkEventPrivate
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
 
+struct _GdkWindowAttr
+{
+  gint event_mask;
+  gint x, y;
+  gint width;
+  gint height;
+  GdkWindowWindowClass wclass;
+  GdkWindowType window_type;
+  GdkWindowTypeHint type_hint;
+};
+
 struct _GdkWindow
 {
   GObject parent_instance;
@@ -410,6 +422,8 @@ void            gdk_cairo_set_drawing_context    (cairo_t           *cr,
 cairo_surface_t *
            _gdk_window_ref_cairo_surface (GdkWindow *window);
 
+GdkWindow* gdk_window_new                (GdkWindow      *parent,
+                                          GdkWindowAttr  *attributes);
 void       _gdk_window_destroy           (GdkWindow      *window,
                                           gboolean        foreign_destroy);
 void       _gdk_window_clear_update_area (GdkWindow      *window);

gdk/gdkpixbuf-drawable.c

@@ -41,92 +41,6 @@
  * #GdkWindows and cairo surfaces.
  */
 
-
-/**
- * gdk_pixbuf_get_from_window:
- * @window: Source window
- * @src_x: Source X coordinate within @window
- * @src_y: Source Y coordinate within @window
- * @width: Width in pixels of region to get
- * @height: Height in pixels of region to get
- *
- * Transfers image data from a #GdkWindow and converts it to an RGB(A)
- * representation inside a #GdkPixbuf. In other words, copies
- * image data from a server-side drawable to a client-side RGB(A) buffer.
- * This allows you to efficiently read individual pixels on the client side.
- *
- * This function will create an RGB pixbuf with 8 bits per channel with
- * the size specified by the @width and @height arguments scaled by the
- * scale factor of @window. The pixbuf will contain an alpha channel if
- * the @window contains one.
- *
- * If the window is off the screen, then there is no image data in the
- * obscured/offscreen regions to be placed in the pixbuf. The contents of
- * portions of the pixbuf corresponding to the offscreen region are undefined.
- *
- * If the window you’re obtaining data from is partially obscured by
- * other windows, then the contents of the pixbuf areas corresponding
- * to the obscured regions are undefined.
- *
- * If the window is not mapped (typically because it’s iconified/minimized
- * or not on the current workspace), then %NULL will be returned.
- *
- * If memory can’t be allocated for the return value, %NULL will be returned
- * instead.
- *
- * (In short, there are several ways this function can fail, and if it fails
- *  it returns %NULL; so check the return value.)
- *
- * Returns: (nullable) (transfer full): A newly-created pixbuf with a
- *     reference count of 1, or %NULL on error
- */
-GdkPixbuf *
-gdk_pixbuf_get_from_window (GdkWindow *src,
-                            gint       src_x,
-                            gint       src_y,
-                            gint       width,
-                            gint       height)
-{
-  cairo_surface_t *surface;
-  cairo_surface_t *copy;
-  cairo_t *cr;
-  GdkPixbuf *dest;
-  int scale;
-
-  g_return_val_if_fail (GDK_IS_WINDOW (src), NULL);
-  g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
-
-  surface = _gdk_window_ref_cairo_surface (src);
-  scale = gdk_window_get_scale_factor (src);
-
-  /* We do not know what happened to this surface outside of GDK.
-   * Especially for foreign windows, they will have been modified
-   * by external applications.
-   * So be on the safe side and:
-   */
-  cairo_surface_mark_dirty (surface);
-
-  if (cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA)
-    copy = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width * scale, height * scale);
-  else
-    copy = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width * scale, height * scale);
-
-  cairo_surface_set_device_scale (copy, scale, scale);
-
-  cr = cairo_create (copy);
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-  cairo_set_source_surface (cr, surface, -src_x, -src_y);
-  cairo_paint (cr);
-  cairo_destroy (cr);
-
-  dest = gdk_pixbuf_get_from_surface (copy, 0, 0, width * scale, height * scale);
-
-  cairo_surface_destroy (copy);
-  cairo_surface_destroy (surface);
-
-  return dest;
-}
-
 static cairo_format_t
 gdk_cairo_format_for_content (cairo_content_t content)
 {
@@ -244,8 +158,7 @@ convert_no_alpha (guchar *dest_data,
  *
  * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
  * representation inside a #GdkPixbuf. This allows you to efficiently read
- * individual pixels from cairo surfaces. For #GdkWindows, use
- * gdk_pixbuf_get_from_window() instead.
+ * individual pixels from cairo surfaces.
  *
  * This function will create an RGB pixbuf with 8 bits per channel.
  * The pixbuf will contain an alpha channel if the @surface contains one.

gdk/gdkpixbuf.h

@@ -36,13 +36,6 @@
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_ALL
-GdkPixbuf *gdk_pixbuf_get_from_window  (GdkWindow       *window,
-                                        gint             src_x,
-                                        gint             src_y,
-                                        gint             width,
-                                        gint             height);
-
 GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
                                         gint             src_x,

gdk/gdkscreen.c

@@ -40,10 +40,7 @@
  * combines several physical monitors (see gdk_screen_get_n_monitors()).
  *
  * GdkScreen is used throughout GDK and GTK+ to specify which screen
- * the top level windows are to be displayed on. it is also used to
- * query the screen specification and default settings such as
- * the default visual (gdk_screen_get_system_visual()), the dimensions
- * of the physical monitors (gdk_screen_get_monitor_geometry()), etc.
+ * the top level windows are to be displayed on.
  */
 
 
@@ -65,7 +62,6 @@ enum
 enum
 {
   SIZE_CHANGED,
-  COMPOSITED_CHANGED,
   MONITORS_CHANGED,
   LAST_SIGNAL
 };
@@ -93,25 +89,6 @@ gdk_screen_class_init (GdkScreenClass *klass)
 							G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
 							G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
 
-  /**
-   * GdkScreen::composited-changed:
-   * @screen: the object on which the signal is emitted
-   *
-   * The ::composited-changed signal is emitted when the composited
-   * status of the screen changes
-   *
-   * Since: 2.10
-   */
-  signals[COMPOSITED_CHANGED] =
-    g_signal_new (g_intern_static_string ("composited-changed"),
-		  G_OBJECT_CLASS_TYPE (klass),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GdkScreenClass, composited_changed),
-		  NULL, NULL,
-		  g_cclosure_marshal_VOID__VOID,
-		  G_TYPE_NONE,
-		  0);
-	
   /**
    * GdkScreen::monitors-changed:
    * @screen: the object on which the signal is emitted
@@ -302,106 +279,6 @@ gdk_screen_get_root_window (GdkScreen *screen)
   return GDK_SCREEN_GET_CLASS (screen)->get_root_window (screen);
 }
 
-/**
- * gdk_screen_list_visuals:
- * @screen: the relevant #GdkScreen.
- *
- * Lists the available visuals for the specified @screen.
- * A visual describes a hardware image data format.
- * For example, a visual might support 24-bit color, or 8-bit color,
- * and might expect pixels to be in a certain format.
- *
- * Call g_list_free() on the return value when you’re finished with it.
- *
- * Returns: (transfer container) (element-type GdkVisual):
- *     a list of visuals; the list must be freed, but not its contents
- *
- * Since: 2.2
- **/
-GList *
-gdk_screen_list_visuals (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_GET_CLASS (screen)->list_visuals (screen);
-}
-
-/**
- * gdk_screen_get_system_visual:
- * @screen: a #GdkScreen.
- *
- * Get the system’s default visual for @screen.
- * This is the visual for the root window of the display.
- * The return value should not be freed.
- *
- * Returns: (transfer none): the system visual
- *
- * Since: 2.2
- **/
-GdkVisual *
-gdk_screen_get_system_visual (GdkScreen * screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_GET_CLASS (screen)->get_system_visual (screen);
-}
-
-/**
- * gdk_screen_get_rgba_visual:
- * @screen: a #GdkScreen
- *
- * Gets a visual to use for creating windows with an alpha channel.
- * The windowing system on which GTK+ is running
- * may not support this capability, in which case %NULL will
- * be returned. Even if a non-%NULL value is returned, its
- * possible that the window’s alpha channel won’t be honored
- * when displaying the window on the screen: in particular, for
- * X an appropriate windowing manager and compositing manager
- * must be running to provide appropriate display.
- *
- * This functionality is not implemented in the Windows backend.
- *
- * For setting an overall opacity for a top-level window, see
- * gdk_window_set_opacity().
- *
- * Returns: (nullable) (transfer none): a visual to use for windows
- *     with an alpha channel or %NULL if the capability is not
- *     available.
- *
- * Since: 2.8
- **/
-GdkVisual *
-gdk_screen_get_rgba_visual (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_GET_CLASS (screen)->get_rgba_visual (screen);
-}
-
-/**
- * gdk_screen_is_composited:
- * @screen: a #GdkScreen
- *
- * Returns whether windows with an RGBA visual can reasonably
- * be expected to have their alpha channel drawn correctly on
- * the screen.
- *
- * On X11 this function returns whether a compositing manager is
- * compositing @screen.
- *
- * Returns: Whether windows with RGBA visuals can reasonably be
- * expected to have their alpha channels drawn correctly on the screen.
- *
- * Since: 2.10
- **/
-gboolean
-gdk_screen_is_composited (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
-
-  return GDK_SCREEN_GET_CLASS (screen)->is_composited (screen);
-}
-
 /**
  * gdk_screen_get_setting:
  * @screen: the #GdkScreen where the setting is located

gdk/gdkscreen.h

@@ -41,20 +41,11 @@ G_BEGIN_DECLS
 GDK_AVAILABLE_IN_ALL
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
-GdkVisual *  gdk_screen_get_system_visual     (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
-GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
-gboolean     gdk_screen_is_composited         (GdkScreen   *screen);
-
 GDK_AVAILABLE_IN_ALL
 GdkWindow *  gdk_screen_get_root_window       (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
 
-GDK_AVAILABLE_IN_ALL
-GList *      gdk_screen_list_visuals          (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 GList *      gdk_screen_get_toplevel_windows  (GdkScreen   *screen);
 

gdk/gdkscreenprivate.h

@@ -58,10 +58,6 @@ struct _GdkScreenClass
   void         (* get_monitor_workarea)  (GdkScreen    *screen,
                                           gint          monitor_num,
                                           GdkRectangle *dest);
-  GList *      (* list_visuals)          (GdkScreen *screen);
-  GdkVisual *  (* get_system_visual)     (GdkScreen *screen);
-  GdkVisual *  (* get_rgba_visual)       (GdkScreen *screen);
-  gboolean     (* is_composited)         (GdkScreen *screen);
   gboolean     (* get_setting)           (GdkScreen   *screen,
                                           const gchar *name,
                                           GValue      *value);

gdk/gdktypes.h

@@ -129,7 +129,6 @@ typedef struct _GdkAtom            *GdkAtom;
 #define GDK_NONE            _GDK_MAKE_ATOM (0)
 
 /* Forward declarations of commonly used types */
-typedef struct _GdkColor              GdkColor;
 typedef struct _GdkRGBA               GdkRGBA;
 typedef struct _GdkCursor             GdkCursor;
 typedef struct _GdkVisual             GdkVisual;

gdk/gdkwindow.c

@@ -1113,33 +1113,15 @@ sync_native_window_stack_position (GdkWindow *window)
     }
 }
 
-/**
- * gdk_window_new: (constructor)
- * @parent: (allow-none): a #GdkWindow, or %NULL to create the window as a child of
- *   the default root window for the default display.
- * @attributes: attributes of the new window
- * @attributes_mask: (type GdkWindowAttributesType): mask indicating which
- *   fields in @attributes are valid
- *
- * Creates a new #GdkWindow using the attributes from
- * @attributes. See #GdkWindowAttr and #GdkWindowAttributesType for
- * more details.  Note: to use this on displays other than the default
- * display, @parent must be specified.
- *
- * Returns: (transfer full): the new #GdkWindow
- **/
 GdkWindow*
 gdk_window_new (GdkWindow     *parent,
-		GdkWindowAttr *attributes,
-		gint           attributes_mask)
+		GdkWindowAttr *attributes)
 {
   GdkWindow *window;
   GdkScreen *screen;
   GdkDisplay *display;
-  int x, y;
   gboolean native;
   GdkEventMask event_mask;
-  GdkWindow *real_parent;
 
   g_return_val_if_fail (attributes != NULL, NULL);
 
@@ -1163,31 +1145,14 @@ gdk_window_new (GdkWindow     *parent,
 
   window = _gdk_display_create_window (display);
 
-  /* Windows with a foreign parent are treated as if they are children
-   * of the root window, except for actual creation.
-   */
-  real_parent = parent;
-  if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_FOREIGN)
-    parent = gdk_screen_get_root_window (screen);
-
   window->parent = parent;
 
   window->accept_focus = TRUE;
   window->focus_on_map = TRUE;
   window->event_compression = TRUE;
 
-  if (attributes_mask & GDK_WA_X)
-    x = attributes->x;
-  else
-    x = 0;
-
-  if (attributes_mask & GDK_WA_Y)
-    y = attributes->y;
-  else
-    y = 0;
-
-  window->x = x;
-  window->y = y;
+  window->x = attributes->x;
+  window->y = attributes->y;
   window->width = (attributes->width > 1) ? (attributes->width) : (1);
   window->height = (attributes->height > 1) ? (attributes->height) : (1);
   window->alpha = 255;
@@ -1255,19 +1220,24 @@ gdk_window_new (GdkWindow     *parent,
   if (window->parent->window_type == GDK_WINDOW_ROOT)
     native = TRUE; /* Always use native windows for toplevels */
 
+#ifdef GDK_WINDOWING_WAYLAND
+  if (window->window_type == GDK_WINDOW_SUBSURFACE)
+    native = TRUE; /* Always use native windows for subsurfaces as well */
+#endif
+
   if (native)
     {
       event_mask = get_native_event_mask (window);
 
       /* Create the impl */
-      _gdk_display_create_window_impl (display, window, real_parent, screen, event_mask, attributes, attributes_mask);
+      _gdk_display_create_window_impl (display, window, parent, screen, event_mask, attributes);
       window->impl_window = window;
 
       parent->impl_window->native_children = g_list_prepend (parent->impl_window->native_children, window);
 
       /* This will put the native window topmost in the native parent, which may
        * be wrong wrt other native windows in the non-native hierarchy, so restack */
-      if (!_gdk_window_has_impl (real_parent))
+      if (!_gdk_window_has_impl (parent))
 	sync_native_window_stack_position (window);
     }
   else
@@ -1295,6 +1265,109 @@ gdk_window_new (GdkWindow     *parent,
   return window;
 }
 
+/**
+ * gdk_window_new_toplevel: (constructor)
+ * @display: the display to create the window on
+ * @event_mask: event mask (see gdk_window_set_events())
+ * @width: width of new window
+ * @height: height of new window
+ *
+ * Creates a new toplevel window. The window will be managed by the window
+ * manager.
+ *
+ * Returns: (transfer full): the new #GdkWindow
+ *
+ * Since: 3.90
+ **/
+GdkWindow *
+gdk_window_new_toplevel (GdkDisplay *display,
+                         gint        event_mask,
+                         gint        width,
+                         gint        height)
+{
+  GdkWindowAttr attr;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  attr.event_mask = event_mask;
+  attr.wclass = GDK_INPUT_OUTPUT;
+  attr.x = 0;
+  attr.y = 0;
+  attr.width = width;
+  attr.height = height;
+  attr.window_type = GDK_WINDOW_TOPLEVEL;
+
+  return gdk_window_new (gdk_screen_get_root_window (gdk_display_get_default_screen (display)),
+                         &attr);
+}
+
+/**
+ * gdk_window_new_popup: (constructor)
+ * @display: the display to create the window on
+ * @event_mask: event mask (see gdk_window_set_events())
+ * @position: position of the window on screen
+ *
+ * Creates a new toplevel popup window. The window will bypass window
+ * management.
+ *
+ * Returns: (transfer full): the new #GdkWindow
+ *
+ * Since: 3.90
+ **/
+GdkWindow *
+gdk_window_new_popup (GdkDisplay         *display,
+                      gint                event_mask,
+                      const GdkRectangle *position)
+{
+  GdkWindowAttr attr;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (position != NULL, NULL);
+
+  attr.event_mask = event_mask;
+  attr.wclass = GDK_INPUT_OUTPUT;
+  attr.x = position->x;
+  attr.y = position->y;
+  attr.width = position->width;
+  attr.height = position->height;
+  attr.window_type = GDK_WINDOW_TEMP;
+
+  return gdk_window_new (gdk_screen_get_root_window (gdk_display_get_default_screen (display)),
+                         &attr);
+}
+
+/**
+ * gdk_window_new_temp: (constructor)
+ * @display: the display to create the window on
+ *
+ * Creates a new toplevel temporary window. The window will be
+ * situated off-screen and not handle output.
+ *
+ * You most likely do not want to use this function.
+ *
+ * Returns: (transfer full): the new #GdkWindow
+ *
+ * Since: 3.90
+ **/
+GdkWindow *
+gdk_window_new_temp (GdkDisplay *display)
+{
+  GdkWindowAttr attr;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  attr.event_mask = 0;
+  attr.wclass = GDK_INPUT_ONLY;
+  attr.x = -100;
+  attr.y = -100;
+  attr.width = 10;
+  attr.height = 10;
+  attr.window_type = GDK_WINDOW_TEMP;
+
+  return gdk_window_new (gdk_screen_get_root_window (gdk_display_get_default_screen (display)),
+                         &attr);
+}
+
 /**
  * gdk_window_new_child: (constructor)
  * @parent: the parent window
@@ -1324,7 +1397,7 @@ gdk_window_new_child (GdkWindow          *parent,
   attr.height = position->height;
   attr.window_type = GDK_WINDOW_CHILD;
 
-  return gdk_window_new (parent, &attr, GDK_WA_X | GDK_WA_Y);
+  return gdk_window_new (parent, &attr);
 }
 
 /**
@@ -1356,7 +1429,7 @@ gdk_window_new_input (GdkWindow          *parent,
   attr.height = position->height;
   attr.window_type = GDK_WINDOW_CHILD;
 
-  return gdk_window_new (parent, &attr, GDK_WA_X | GDK_WA_Y);
+  return gdk_window_new (parent, &attr);
 }
 
 static gboolean
@@ -1673,7 +1746,7 @@ gdk_window_ensure_native (GdkWindow *window)
                                    window, parent,
                                    screen,
                                    get_native_event_mask (window),
-                                   NULL, 0);
+                                   NULL);
   new_impl = window->impl;
 
   parent->impl_window->native_children =
@@ -2819,7 +2892,6 @@ gdk_window_begin_draw_frame (GdkWindow            *window,
                              const cairo_region_t *region)
 {
   GdkDrawingContext *context;
-  GdkWindowImplClass *impl_class;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
@@ -2834,18 +2906,7 @@ gdk_window_begin_draw_frame (GdkWindow            *window,
   if (gdk_window_has_native (window) && gdk_window_is_toplevel (window))
     gdk_window_begin_paint_internal (window, region);
 
-  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-  if (impl_class->create_draw_context != NULL)
-    {
-      context = impl_class->create_draw_context (window, region);
-    }
-  else
-    {
-      context = g_object_new (GDK_TYPE_DRAWING_CONTEXT,
-                              "window", window,
-                              "clip", region,
-                              NULL);
-    }
+  context = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->create_draw_context (window, region);
 
   /* Do not take a reference, to avoid creating cycles */
   window->drawing_context = context;
@@ -2872,8 +2933,6 @@ void
 gdk_window_end_draw_frame (GdkWindow         *window,
                            GdkDrawingContext *context)
 {
-  GdkWindowImplClass *impl_class;
-
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (GDK_IS_DRAWING_CONTEXT (context));
 
@@ -2884,17 +2943,14 @@ gdk_window_end_draw_frame (GdkWindow         *window,
                   "gdk_window_end_draw_frame().", window);
       return;
     }
+  g_return_if_fail (window->drawing_context == context);
 
   if (gdk_window_has_native (window) && gdk_window_is_toplevel (window))
     gdk_window_end_paint_internal (window);
 
-  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-  if (impl_class->destroy_draw_context != NULL)
-    impl_class->destroy_draw_context (window, context);
-  else
-    g_object_unref (context);
-
   window->drawing_context = NULL;
+
+  g_object_unref (context);
 }
 
 /*< private >
@@ -3119,62 +3175,6 @@ _gdk_window_ref_cairo_surface (GdkWindow *window)
     }
 }
 
-#if 0
-/**
- * gdk_cairo_create:
- * @window: a #GdkWindow
- * 
- * Creates a Cairo context for drawing to @window.
- *
- * Note that calling cairo_reset_clip() on the resulting #cairo_t will
- * produce undefined results, so avoid it at all costs.
- *
- * Typically, this function is used to draw on a #GdkWindow out of the paint
- * cycle of the toolkit; this should be avoided, as it breaks various assumptions
- * and optimizations.
- *
- * If you are drawing on a native #GdkWindow in response to a %GDK_EXPOSE event
- * you should use gdk_window_begin_draw_frame() and gdk_drawing_context_get_cairo_context()
- * instead. GTK will automatically do this for you when drawing a widget.
- *
- * Returns: A newly created Cairo context. Free with
- *  cairo_destroy() when you are done drawing.
- * 
- * Since: 2.8
- *
- * Deprecated: 3.22: Use gdk_window_begin_draw_frame() and
- *   gdk_drawing_context_get_cairo_context() instead
- **/
-cairo_t *
-gdk_cairo_create (GdkWindow *window)
-{
-  cairo_region_t *region;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-  surface = _gdk_window_ref_cairo_surface (window);
-
-  cr = cairo_create (surface);
-
-  region = gdk_window_get_current_paint_region (window);
-  gdk_cairo_region (cr, region);
-  cairo_region_destroy (region);
-  cairo_clip (cr);
-
-  /* Assign a drawing context, if one is set; if gdk_cairo_create()
-   * is called outside of a frame drawing then this is going to be
-   * NULL.
-   */
-  gdk_cairo_set_drawing_context (cr, window->drawing_context);
-
-  cairo_surface_destroy (surface);
-
-  return cr;
-}
-#endif
-
 /* Code for dirty-region queueing
  */
 static GSList *update_windows = NULL;
@@ -5318,23 +5318,6 @@ gdk_window_move_resize_toplevel (GdkWindow *window,
   _gdk_synthesize_crossing_events_for_geometry_change (window);
 }
 
-static void
-configure_native_child (GdkWindow *window)
-{
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_CONFIGURE);
-
-  event->configure.window = g_object_ref (window);
-  event->configure.send_event = FALSE;
-  event->configure.x = window->x;
-  event->configure.y = window->y;
-  event->configure.width = window->width;
-  event->configure.height = window->height;
-
-  gdk_event_put (event);
-  gdk_event_free (event);
-}
 
 static void
 move_native_children (GdkWindow *private)
@@ -5355,10 +5338,7 @@ move_native_children (GdkWindow *private)
 				   child->width, child->height);
 	}
       else
-        {
-          configure_native_child (child);
-          move_native_children (child);
-        }
+	move_native_children  (child);
     }
 }
 
@@ -5373,6 +5353,7 @@ gdk_window_move_resize_internal (GdkWindow *window,
   cairo_region_t *old_region, *new_region;
   GdkWindowImplClass *impl_class;
   gboolean expose;
+  int old_abs_x, old_abs_y;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -5430,6 +5411,9 @@ gdk_window_move_resize_internal (GdkWindow *window,
       window->height = height;
     }
 
+  old_abs_x = window->abs_x;
+  old_abs_y = window->abs_y;
+
   recompute_visible_regions (window, FALSE);
 
   if (gdk_window_has_impl (window))
@@ -5442,7 +5426,8 @@ gdk_window_move_resize_internal (GdkWindow *window,
 			       window->x, window->y,
 			       window->width, window->height);
     }
-  else
+  else if (old_abs_x != window->abs_x ||
+	   old_abs_y != window->abs_y)
     move_native_children (window);
 
   if (expose)
@@ -9144,9 +9129,8 @@ gdk_window_set_urgency_hint (GdkWindow *window,
  * gdk_window_move_resize().
  *
  * Note that on X11, this effect has no effect on windows
- * of type %GDK_WINDOW_TEMP or windows where override redirect
- * has been turned on via gdk_window_set_override_redirect()
- * since these windows are not resizable by the user.
+ * of type %GDK_WINDOW_TEMP since these windows are not resizable
+ * by the user.
  *
  * Since you can’t count on the windowing system doing the
  * constraints for programmatic resizes, you should generally
@@ -9292,28 +9276,6 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   GDK_WINDOW_IMPL_GET_CLASS (window->impl)->get_frame_extents (window, rect);
 }
 
-/**
- * gdk_window_set_override_redirect:
- * @window: a toplevel #GdkWindow
- * @override_redirect: %TRUE if window should be override redirect
- *
- * An override redirect window is not under the control of the window manager.
- * This means it won’t have a titlebar, won’t be minimizable, etc. - it will
- * be entirely under the control of the application. The window manager
- * can’t see the override redirect window at all.
- *
- * Override redirect should only be used for short-lived temporary
- * windows, such as popup menus. #GtkMenu uses an override redirect
- * window in its implementation, for example.
- *
- **/
-void
-gdk_window_set_override_redirect (GdkWindow *window,
-				  gboolean override_redirect)
-{
-  GDK_WINDOW_IMPL_GET_CLASS (window->impl)->set_override_redirect (window, override_redirect);
-}
-
 /**
  * gdk_window_set_accept_focus:
  * @window: a toplevel #GdkWindow
@@ -9996,10 +9958,6 @@ gdk_window_begin_move_drag (GdkWindow *window,
  * with alpha, or use gtk_widget_set_opacity() to set an overall opacity
  * for your widgets.
  *
- * For child windows this function only works for non-native windows.
- *
- * For setting up per-pixel alpha topelevels, see gdk_screen_get_rgba_visual().
- *
  * Support for non-toplevel windows was added in 3.8.
  *
  * Since: 2.12

gdk/gdkwindow.h

@@ -38,7 +38,6 @@
 G_BEGIN_DECLS
 
 typedef struct _GdkGeometry          GdkGeometry;
-typedef struct _GdkWindowAttr        GdkWindowAttr;
 typedef struct _GdkWindowRedirect    GdkWindowRedirect;
 
 /**
@@ -83,30 +82,6 @@ typedef enum
   GDK_WINDOW_SUBSURFACE
 } GdkWindowType;
 
-/**
- * GdkWindowAttributesType:
- * @GDK_WA_TITLE: Honor the title field
- * @GDK_WA_X: Honor the X coordinate field
- * @GDK_WA_Y: Honor the Y coordinate field
- * @GDK_WA_NOREDIR: Honor the override_redirect field
- * @GDK_WA_TYPE_HINT: Honor the type_hint field
- *
- * Used to indicate which fields in the #GdkWindowAttr struct should be honored.
- * For example, if you filled in the “title” and “x” fields of #GdkWindowAttr,
- * pass “@GDK_WA_X | @GDK_WA_TITLE” to gdk_window_new(). Fields in
- * #GdkWindowAttr not covered by a bit in this enum are required; for example,
- * the @width/@height, @wclass, and @window_type fields are required, they have
- * no corresponding flag in #GdkWindowAttributesType.
- */
-typedef enum
-{
-  GDK_WA_TITLE	   = 1 << 1,
-  GDK_WA_X	   = 1 << 2,
-  GDK_WA_Y	   = 1 << 3,
-  GDK_WA_NOREDIR   = 1 << 4,
-  GDK_WA_TYPE_HINT = 1 << 5
-} GdkWindowAttributesType;
-
 /* Size restriction enumeration.
  */
 /**
@@ -321,36 +296,6 @@ typedef enum
   GDK_FULLSCREEN_ON_ALL_MONITORS
 } GdkFullscreenMode;
 
-/**
- * GdkWindowAttr:
- * @title: title of the window (for toplevel windows)
- * @event_mask: event mask (see gdk_window_set_events())
- * @x: X coordinate relative to parent window (see gdk_window_move())
- * @y: Y coordinate relative to parent window (see gdk_window_move())
- * @width: width of window
- * @height: height of window
- * @wclass: #GDK_INPUT_OUTPUT (normal window) or #GDK_INPUT_ONLY (invisible
- *  window that receives events)
- * @window_type: type of window
- * @cursor: cursor for the window (see gdk_window_set_cursor())
- * @override_redirect: %TRUE to bypass the window manager
- * @type_hint: a hint of the function of the window
- *
- * Attributes to use for a newly-created window.
- */
-struct _GdkWindowAttr
-{
-  gchar *title;
-  gint event_mask;
-  gint x, y;
-  gint width;
-  gint height;
-  GdkWindowWindowClass wclass;
-  GdkWindowType window_type;
-  gboolean override_redirect;
-  GdkWindowTypeHint type_hint;
-};
-
 /**
  * GdkGeometry:
  * @min_width: minimum width of window (or -1 to use requisition, with
@@ -471,10 +416,17 @@ struct _GdkWindowClass
  */
 GDK_AVAILABLE_IN_ALL
 GType         gdk_window_get_type              (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
-GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
-                                                GdkWindowAttr *attributes,
-                                                gint           attributes_mask);
+GDK_AVAILABLE_IN_3_90
+GdkWindow *   gdk_window_new_toplevel          (GdkDisplay    *display,
+                                                gint           event_mask,
+                                                int            width,
+                                                int            height);
+GDK_AVAILABLE_IN_3_90
+GdkWindow *   gdk_window_new_popup             (GdkDisplay    *display,
+                                                gint           event_mask,
+                                                const GdkRectangle *position);
+GDK_AVAILABLE_IN_3_90
+GdkWindow *   gdk_window_new_temp              (GdkDisplay    *display);
 GDK_AVAILABLE_IN_3_90
 GdkWindow *   gdk_window_new_child             (GdkWindow     *parent,
                                                 gint           event_mask,
@@ -538,9 +490,6 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_user_data         (GdkWindow     *window,
                                                 gpointer       user_data);
 GDK_AVAILABLE_IN_ALL
-void          gdk_window_set_override_redirect (GdkWindow     *window,
-                                                gboolean       override_redirect);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_get_accept_focus      (GdkWindow     *window);
 GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_accept_focus      (GdkWindow     *window,

gdk/gdkwindowimpl.h

@@ -186,8 +186,6 @@ struct _GdkWindowImplClass
 					 GdkWindow *parent);
   void         (* get_frame_extents)    (GdkWindow    *window,
 					 GdkRectangle *rect);
-  void         (* set_override_redirect) (GdkWindow *window,
-					  gboolean override_redirect);
   void         (* set_accept_focus)     (GdkWindow *window,
 					 gboolean accept_focus);
   void         (* set_focus_on_map)     (GdkWindow *window,
@@ -309,8 +307,6 @@ struct _GdkWindowImplClass
 
   GdkDrawingContext *(* create_draw_context)  (GdkWindow            *window,
                                                const cairo_region_t *region);
-  void               (* destroy_draw_context) (GdkWindow            *window,
-                                               GdkDrawingContext    *context);
 };
 
 /* Interface Functions */

gdk/mir/Makefile.am

@@ -24,6 +24,7 @@ libgdk_mir_la_SOURCES =	\
 	gdkmircursor.c \
 	gdkmirdevicemanager.c \
 	gdkmirdisplay.c \
+	gdkmirdrawingcontext.c \
 	gdkmireventsource.c	\
 	gdkmirglcontext.c \
 	gdkmirkeyboard.c \

gdk/mir/gdkmir-private.h

@@ -83,7 +83,7 @@ GdkCursor *_gdk_mir_cursor_new_for_name (GdkDisplay *display, const gchar *name)
 
 const gchar *_gdk_mir_cursor_get_name (GdkCursor *cursor);
 
-GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask);
+GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window);
 
 void _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceState state);
 
@@ -95,6 +95,8 @@ void _gdk_mir_window_impl_set_cursor_state (GdkMirWindowImpl *impl, gdouble x, g
 
 void _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl, gdouble *x, gdouble *y, gboolean *cursor_inside, guint *button_state);
 
+GdkDrawingContext *gdk_mir_drawing_context_new (GdkWindow *window, const cairo_region_t *region);
+
 GdkMirEventSource *_gdk_mir_display_get_event_source (GdkDisplay *display);
 
 GdkMirEventSource *_gdk_mir_event_source_new (GdkDisplay *display);

gdk/mir/gdkmirdisplay.c

@@ -393,8 +393,7 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
                                     GdkWindow     *real_parent,
                                     GdkScreen     *screen,
                                     GdkEventMask   event_mask,
-                                    GdkWindowAttr *attributes,
-                                    gint           attributes_mask)
+                                    GdkWindowAttr *attributes)
 {
   //g_printerr ("gdk_mir_display_create_window_impl");
   //g_printerr (" window=%p", window);
@@ -404,7 +403,7 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
 
   if (attributes->wclass == GDK_INPUT_OUTPUT)
     {
-      window->impl = _gdk_mir_window_impl_new (display, window, attributes, attributes_mask);
+      window->impl = _gdk_mir_window_impl_new (display, window);
       window->impl_window = window;
     }
   else /* attributes->wclass == GDK_INPUT_ONLY */

gdk/mir/gdkmirdrawingcontext.c

@@ -0,0 +1,63 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright 2016  Benjamin Otte <otte@gnome.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#define GDK_TYPE_MIR_DRAWING_CONTEXT                (gdk_mir_drawing_context_get_type ())
+#define GDK_MIR_DRAWING_CONTEXT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_MIR_DRAWING_CONTEXT, GdkMirDrawingContext))
+#define GDK_IS_MIR_DRAWING_CONTEXT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_MIR_DRAWING_CONTEXT))
+#define GDK_MIR_DRAWING_CONTEXT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_MIR_DRAWING_CONTEXT, GdkMirDrawingContextClass))
+#define GDK_IS_MIR_DRAWING_CONTEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_DRAWING_CONTEXT))
+#define GDK_MIR_DRAWING_CONTEXT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_DRAWING_CONTEXT, GdkMirDrawingContextClass))
+
+typedef struct _GdkMirDrawingContext       GdkMirDrawingContext;
+typedef struct _GdkMirDrawingContextClass  GdkMirDrawingContextClass;
+
+struct _GdkMirDrawingContext
+{
+  GdkDrawingContext parent_instance;
+};
+
+struct _GdkMirDrawingContextClass
+{
+  GdkDrawingContextClass parent_instance;
+};
+
+GType gdk_mir_drawing_context_get_type (void) G_GNUC_CONST;
+
+G_DEFINE_TYPE (GdkMirDrawingContext, gdk_mir_drawing_context, GDK_TYPE_DRAWING_CONTEXT)
+
+static void
+gdk_mir_drawing_context_class_init (GdkMirDrawingContextClass *klass)
+{
+}
+
+static void
+gdk_mir_drawing_context_init (GdkMirDrawingContext *self)
+{
+}
+
+GdkDrawingContext *
+gdk_mir_drawing_context_new (GdkWindow            *window,
+                             const cairo_region_t *region)
+{
+  return g_object_new (GDK_TYPE_MIR_DRAWING_CONTEXT,
+                       "window", window,
+                       "clip", region,
+                       NULL);
+}
+

gdk/mir/gdkmirscreen.c

@@ -19,7 +19,6 @@
 
 #include "gdkscreenprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkvisualprivate.h"
 #include "gdkinternals.h"
 
 #include "gdkmir.h"
@@ -48,8 +47,6 @@ struct GdkMirScreen
   /* Current monitor configuration */
   MirDisplayConfiguration *display_config;
 
-  GdkVisual *visual;
-
   GdkWindow *root_window;
 };
 
@@ -166,7 +163,6 @@ gdk_mir_screen_finalize (GObject *object)
 
   mir_connection_set_display_config_change_callback (get_connection (screen), NULL, NULL);
   mir_display_config_destroy (screen->display_config);
-  g_clear_object (&screen->visual);
   g_clear_object (&screen->root_window);
 
   G_OBJECT_CLASS (gdk_mir_screen_parent_class)->finalize (object);
@@ -250,7 +246,6 @@ gdk_mir_screen_get_root_window (GdkScreen *screen)
 
   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;
@@ -260,7 +255,7 @@ gdk_mir_screen_get_root_window (GdkScreen *screen)
   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);
+  s->root_window->impl = _gdk_mir_window_impl_new (s->display, s->root_window);
 
   return s->root_window;
 }
@@ -390,35 +385,6 @@ gdk_mir_screen_get_monitor_workarea (GdkScreen    *screen,
   gdk_mir_screen_get_monitor_geometry (screen, monitor_num, dest);
 }
 
-static GList *
-gdk_mir_screen_list_visuals (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_list_visuals\n");
-  return g_list_append (NULL, GDK_MIR_SCREEN (screen)->visual);
-}
-
-static GdkVisual *
-gdk_mir_screen_get_system_visual (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_system_visual\n");
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual *
-gdk_mir_screen_get_rgba_visual (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_get_rgba_visual\n");
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static gboolean
-gdk_mir_screen_is_composited (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_is_composited\n");
-  /* We're always composited */
-  return TRUE;
-}
-
 static gboolean
 gdk_mir_screen_get_setting (GdkScreen   *screen,
                             const gchar *name,
@@ -689,10 +655,6 @@ gdk_mir_screen_get_monitor_scale_factor (GdkScreen *screen,
 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;
 }
 
 static void
@@ -717,10 +679,6 @@ gdk_mir_screen_class_init (GdkMirScreenClass *klass)
   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->get_setting = gdk_mir_screen_get_setting;
   screen_class->get_monitor_scale_factor = gdk_mir_screen_get_monitor_scale_factor;
 }

gdk/mir/gdkmirwindowimpl.c

@@ -166,19 +166,13 @@ get_default_title (void)
 }
 
 GdkWindowImpl *
-_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window, GdkWindowAttr *attributes, gint attributes_mask)
+_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window)
 {
   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->title = g_strdup (get_default_title ());
 
   impl->pending_spec_update = TRUE;
 
@@ -1174,13 +1168,6 @@ gdk_mir_window_impl_get_frame_extents (GdkWindow    *window,
   //g_printerr ("gdk_mir_window_impl_get_frame_extents window=%p\n", window);
 }
 
-static void
-gdk_mir_window_impl_set_override_redirect (GdkWindow *window,
-                                           gboolean   override_redirect)
-{
-  //g_printerr ("gdk_mir_window_impl_set_override_redirect window=%p\n", window);
-}
-
 static void
 gdk_mir_window_impl_set_accept_focus (GdkWindow *window,
                                       gboolean   accept_focus)
@@ -1805,7 +1792,6 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
   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;
@@ -1846,5 +1832,6 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
   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->create_draw_context = gdk_mir_drawing_context_new;
   impl_class->invalidate_for_new_frame = gdk_mir_window_impl_invalidate_for_new_frame;
 }

gdk/quartz/GdkQuartzNSWindow.c

@@ -575,13 +575,12 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
-  GdkDeviceManager *device_manager;
   GdkEvent *event;
   GdkWindow *window;
 
   if (current_context)
     g_object_unref (current_context);
-  
+
   current_context = g_object_new (GDK_TYPE_QUARTZ_DRAG_CONTEXT, NULL);
   update_context_from_dragging_info (sender);
 
@@ -589,9 +588,8 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
 
   current_context->display = gdk_window_get_display (window);
 
-  device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
   gdk_drag_context_set_device (current_context,
-                               gdk_device_manager_get_client_pointer (device_manager));
+                               gdk_seat_get_pointer (gdk_display_get_default_seat (current_context->display)));
 
   event = gdk_event_new (GDK_DRAG_ENTER);
   event->dnd.window = g_object_ref (window);

gdk/quartz/Makefile.am

@@ -30,6 +30,8 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkdevicemanager-core-quartz.h	\
 	gdkdisplay-quartz.c	\
 	gdkdisplaymanager-quartz.c	\
+	gdkdrawingcontext-quartz.c	\
+	gdkdrawingcontext-quartz.h	\
 	gdkdnd-quartz.c		\
 	gdkdnd-quartz.h		\
 	gdkevents-quartz.c	\
@@ -46,7 +48,6 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkselection-quartz.c	\
 	gdktestutils-quartz.c	\
 	gdkutils-quartz.c	\
-	gdkvisual-quartz.c	\
 	gdkwindow-quartz.c	\
 	gdkwindow-quartz.h	\
 	xcursors.h
@@ -64,7 +65,6 @@ libgdkquartzinclude_HEADERS =		\
 	gdkquartzkeys.h			\
 	gdkquartzscreen.h		\
 	gdkquartzutils.h		\
-	gdkquartzvisual.h		\
 	gdkquartzwindow.h