AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
53bc1d60c4
gtk2/gdk/wayland/meson.build

109 lines
3.8 KiB
Meson
Raw Normal View History

meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
gdk_wayland_sources = files([
'gdkapplaunchcontext-wayland.c',
gdk: Add Cairo context implementations for all backends And make the GdkCairoContext as abstract. The idea of this and thje following commits is to get rid of all Cairo code in gdksurface.c (and $backend/gdksurface-$backend.c) by moving that code into the Cairo context files. In particular, the GdkSurfaceClass.begin_frame/end_frame() functions (which are currently exclusively used by the Cairo code should end up being moved to GdkDrawContextClass.begin/end_frame(). This has multiple benefits: 1. It unifies code between the different drawing contexts. GL lives in GLContext, Vulkan in VulkanContext and Cairo in CairoContext. In turn, this makes it way easier to reason about what's going on in surface-specific code. Currently pretty much all backends do things wrong when they want to sync to drawing or to the frame clock. 2. It makes the API of GdkSurface smaller. No drawing code (apart from creating the contexts) needs to remain. 3. It confines Cairo to the Drawcontext, thereby making it way more obvious when backends are still using it in situations where it may now conflict with OpenGL (like when doing the dnd failed animation or in the APIs that I'm removing in this branch). 4. We have 2 very different types of Cairo contexts: The X/win32 model, where we have a natively supported Cairo backend but do double buffering ourselves and use similar surfaces and the Wayland/Broadway model where we use image surfaces without any Cairo backend support and have to submit the buffers manually. By not sharing code between those 2 versions, we can make the actual code way smaller. We also get around the need to create 1x1 image surfaces in the Wayland backend where we pretend there's a native Cairo surface.
2018-04-12 14:48:31 +00:00
'gdkcairocontext-wayland.c',
wayland: Add skeleton for a GdkClipboardWayland Creates the source file and a custom subclass and makes sure it's used by GDK.
2017-12-02 20:54:36 +00:00
'gdkclipboard-wayland.c',
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
'gdkcursor-wayland.c',
'gdkdevice-wayland.c',
'gdkdisplay-wayland.c',
wayland: Rename a source file Rename gdkdnd-wayland.c to gdkdrag-wayland.c to go along with gdkdrop-wayland.c.
2018-07-04 07:28:43 +00:00
'gdkdrag-wayland.c',
wayland: Split drop context into GdkWaylandDrop GdkWaylandDrop no longer inherits from GdkDragContext now.
2018-05-30 02:04:51 +00:00
'gdkdrop-wayland.c',
meson: gdk: build individual backends as static libs This is how it's done in the autotools build. Also avoids problems with multiple source files having the same name (gdkeventsource.c). Also move broadway backend code into broadway subdir.
2017-03-20 00:37:09 +00:00
'gdkeventsource.c',
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
'gdkglcontext-wayland.c',
'gdkkeys-wayland.c',
'gdkmonitor-wayland.c',
wayland: Add primary clipboard subclass I decided to put this in a custom subclass, because then I could keep the whole gtk primary protocol self-contained. The other option would have been reusing GdkWaylandClipboard, but that didn't seem worth it, especially because that code needs to interact with the DND machinery, while the primary doesn't.
2017-12-03 04:39:08 +00:00
'gdkprimary-wayland.c',
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
'gdkselection-wayland.c',
'gdkvulkancontext-wayland.c',
GdkWindow -> GdkSurface: File renames Rename all *window.[ch] source files. This is an automatic operation, done by the following commands: for i in $(git ls-files gdk | grep window); do git mv $i $(echo $i | sed s/window/surface/); git sed -f g $(basename $i) $(basename $i | sed s/window/surface/) ; done git checkout NEWS* po-properties po
2018-03-20 10:46:11 +00:00
'gdksurface-wayland.c',
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
'wm-button-layout-translation.c',
])
gdk_wayland_public_headers = files([
'gdkwaylanddevice.h',
'gdkwaylanddisplay.h',
'gdkwaylandglcontext.h',
'gdkwaylandmonitor.h',
GdkWindow -> GdkSurface: File renames Rename all *window.[ch] source files. This is an automatic operation, done by the following commands: for i in $(git ls-files gdk | grep window); do git mv $i $(echo $i | sed s/window/surface/); git sed -f g $(basename $i) $(basename $i | sed s/window/surface/) ; done git checkout NEWS* po-properties po
2018-03-20 10:46:11 +00:00
'gdkwaylandsurface.h'
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
])
build: Install the backend headers in the backend directories That's where they are in the sources and we include them from other headers. So make sure the directories match.
2019-05-06 18:09:03 +00:00
install_headers(gdk_wayland_public_headers, 'gdkwayland.h', subdir: 'gtk-4.0/gdk/wayland/')
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
gdk_wayland_deps = [
shmlib,
xkbdep,
wlclientdep,
wlprotocolsdep,
wlcursordep,
wlegldep,
]
# wayland protocols
meson: gdk: wayland: use array for protocol file generation
2017-03-19 20:50:58 +00:00
proto_dir = dependency('wayland-protocols').get_pkgconfig_variable('pkgdatadir')
assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
meson: figure out wayland-protocols pkgdatadir via pkg-config Instead of hardcoding the location.
2016-09-20 15:46:30 +00:00
meson: gdk: wayland: use array for protocol file generation
2017-03-19 20:50:58 +00:00
wayland_scanner = find_program('wayland-scanner')
build: Generate wayland protocol files
2016-09-10 18:40:02 +00:00
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
# Format:
# - protocol name
wayland: Add support for xdg-shell stable This commit adds support the stable version of the xdg-shell protocol. Support for the last version of the unstable series is left intact, but will not receive new features. The stable version is prioritized above the older version. https://bugzilla.gnome.org/show_bug.cgi?id=791939
2017-12-18 12:00:36 +00:00
# - protocol stability ('private', 'stable' or 'unstable')
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
# - protocol version (if stability is 'unstable')
meson: gdk: wayland: use array for protocol file generation
2017-03-19 20:50:58 +00:00
proto_sources = [
wayland: Add support for xdg-shell stable This commit adds support the stable version of the xdg-shell protocol. Support for the last version of the unstable series is left intact, but will not receive new features. The stable version is prioritized above the older version. https://bugzilla.gnome.org/show_bug.cgi?id=791939
2017-12-18 12:00:36 +00:00
['gtk-shell', 'private', ],
['gtk-primary-selection', 'private', ],
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
['pointer-gestures', 'unstable', 'v1', ],
['xdg-shell', 'unstable', 'v6', ],
wayland: Add support for xdg-shell stable This commit adds support the stable version of the xdg-shell protocol. Support for the last version of the unstable series is left intact, but will not receive new features. The stable version is prioritized above the older version. https://bugzilla.gnome.org/show_bug.cgi?id=791939
2017-12-18 12:00:36 +00:00
['xdg-shell', 'stable', ],
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
['xdg-foreign', 'unstable', 'v1', ],
['tablet', 'unstable', 'v2', ],
Wayland: Implement KDE's SSD protocol If the compositor prefers server-side decorations and the client doesn't customize the title bar, we disable client-side decorations and let the compositor know. Otherwise, we continue to use client-side decorations. Signed-off-by: Drew DeVault <sir@cmpwn.com> https://bugzilla.gnome.org/show_bug.cgi?id=781909
2017-04-29 00:35:51 +00:00
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
wayland: Add support for xdg-shell stable This commit adds support the stable version of the xdg-shell protocol. Support for the last version of the unstable series is left intact, but will not receive new features. The stable version is prioritized above the older version. https://bugzilla.gnome.org/show_bug.cgi?id=791939
2017-12-18 12:00:36 +00:00
['server-decoration', 'private' ],
wayland: Add support for xdg-output Previously, the GDK backend for Wayland would deduce the logical size of the monitors from the wl_output size and scale. With the addition of fractional scaling which advertises a larger scale value and then scale down the client surface, the computed logical size of the monitors in GDK would be wrong and confuse applications which insist on using the monitor size and position (like Firefox). The xdg-output protocol aims at describing outputs in a way which is more in line with the concept of an output on desktop oriented systems by presenting the outputs using their logical size and position appropriately transformed. Add support for the optional xdg-output protocol so that the size and position of the monitors as reported by GDK is correct even when using fractional scaling. Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1828
2019-04-15 14:42:45 +00:00
['xdg-output', 'unstable', 'v1', ],
meson: gdk: wayland: use array for protocol file generation
2017-03-19 20:50:58 +00:00
]
build: Generate wayland protocol files
2016-09-10 18:40:02 +00:00
meson: gdk: wayland: generate private wayland headers first gdkprivate-wayland.h includes generated wayland client protocol headers and is included from gdkdisplaymanager.c, so we need to generate those client protocol headers first also when building main gdk itself.
2017-03-20 11:44:42 +00:00
gdk_wayland_gen_headers = []
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
foreach p: proto_sources
proto_name = p.get(0)
proto_stability = p.get(1)
if proto_stability == 'stable'
wayland: Add support for xdg-shell stable This commit adds support the stable version of the xdg-shell protocol. Support for the last version of the unstable series is left intact, but will not receive new features. The stable version is prioritized above the older version. https://bugzilla.gnome.org/show_bug.cgi?id=791939
2017-12-18 12:00:36 +00:00
output_base = proto_name
input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
elif proto_stability == 'private'
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
output_base = proto_name
input = 'protocol/@0@.xml'.format(proto_name)
else
proto_version = p.get(2)
output_base = '@0@-@1@-@2@'.format(proto_name, proto_stability, proto_version)
input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base))
endif
build: Generate wayland protocol files
2016-09-10 18:40:02 +00:00
meson: gdk: wayland: generate private wayland headers first gdkprivate-wayland.h includes generated wayland client protocol headers and is included from gdkdisplaymanager.c, so we need to generate those client protocol headers first also when building main gdk itself.
2017-03-20 11:44:42 +00:00
gdk_wayland_gen_headers += custom_target('@0@ client header'.format(output_base),
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
input: input,
output: '@0@-client-protocol.h'.format(output_base),
command: [
wayland_scanner,
'client-header',
Simplify the Wayland code generation Instead of going through an ancillary script to strip away the `WL_EXPORT` annotation from the generated code, we should bump up the required version of Wayland, and use the `private-code` argument for wayland-scanner, which does the right thing for us.
2018-04-11 13:37:57 +00:00
'@INPUT@', '@OUTPUT@',
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
])
build: Generate wayland protocol files
2016-09-10 18:40:02 +00:00
meson: gdk: wayland: move wayland bits into wayland subdir
2017-03-20 00:36:38 +00:00
gdk_wayland_sources += custom_target('@0@ source'.format(output_base),
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
input: input,
output: '@0@-protocol.c'.format(output_base),
command: [
wayland_scanner,
Simplify the Wayland code generation Instead of going through an ancillary script to strip away the `WL_EXPORT` annotation from the generated code, we should bump up the required version of Wayland, and use the `private-code` argument for wayland-scanner, which does the right thing for us.
2018-04-11 13:37:57 +00:00
'private-code',
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
'@INPUT@', '@OUTPUT@',
])
meson: gdk: wayland: use array for protocol file generation
2017-03-19 20:50:58 +00:00
endforeach
meson: gdk: build individual backends as static libs This is how it's done in the autotools build. Also avoids problems with multiple source files having the same name (gdkeventsource.c). Also move broadway backend code into broadway subdir.
2017-03-20 00:37:09 +00:00
meson: gdk: fix static library names Fix double lib prefix in filenames (liblibgdk-xyz.a)
2017-03-30 23:15:08 +00:00
libgdk_wayland = static_library('gdk-wayland',
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
gdk_wayland_sources, gdk_wayland_gen_headers, gdkconfig, gdkenum_h,
include_directories: [ confinc, gdkinc, ],
c_args: [
Use a single compilation symbol We use a compilation symbol in our build to allow the inclusion of specific headers while building GTK, to avoid the need to include only the global header. Each namespace has its own compilation symbol because we used to have different libraries, and strict symbol visibility between libraries; now that we have a single library, and we can use private symbols across namespaces while building GTK, we should have a single compilation symbol, and simplify the build rules.
2019-11-27 13:33:43 +00:00
'-DGTK_COMPILATION',
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
'-DG_LOG_DOMAIN="Gdk"',
build: Add common flags to GDK backends The common compiler and linker flags control, among other things, the default visibility of symbols; without them, we leak symbols that ought to be private.
2017-04-28 21:26:32 +00:00
] + common_cflags,
link_args: common_ldflags,
build: Clean up Wayland protocol code generation We can build the name of the input and output files for the Wayland protocols we use from the protocol name, stability, and version. This is similar to how the autotools build does it, except much more clear and without shelling out twice to sed just to resolve the Makefile rule.
2017-04-26 14:16:21 +00:00
dependencies: [ gdk_deps, gdk_wayland_deps, ])
Reference in New Issue Copy Permalink