gtk-rs · bilelmoussaoui · Jun 2, 2024 · Jun 1, 2024 · Jun 1, 2024 · Jun 1, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,6 +58,9 @@ libc = "0.2"
 pango-sys = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.20", branch = "master", features = ["v1_46"]}
 pango = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.20", branch = "master", features = ["v1_46"]}
 gir-format-check = "^0.1"
+gdk4-x11-sys = {path = "gdk4-x11/sys", version = "0.9"}
+gdk4-wayland-sys = {path = "gdk4-wayland/sys", version = "0.9"}
+gdk4-win32-sys = {path = "gdk4-win32/sys", version = "0.9"}
 gdk4-sys = {path = "gdk4/sys", version = "0.9"}
 gdk = {package = "gdk4", path = "gdk4", version = "0.9"}
 gsk4-sys = {path = "gsk4/sys", version = "0.9"}

diff --git a/gdk4-wayland/Cargo.toml b/gdk4-wayland/Cargo.toml
@@ -14,15 +14,15 @@ rust-version.workspace = true
 version.workspace = true
 
 [features]
-v4_4 = ["ffi/v4_4", "gdk/v4_4"]
-v4_10 = ["ffi/v4_10", "v4_4", "gdk/v4_10"]
-v4_12 = ["ffi/v4_12", "v4_10", "gdk/v4_12"]
-v4_16 = ["ffi/v4_16", "v4_12", "gdk/v4_16"]
+v4_4 = ["gdk4-wayland-sys/v4_4", "gdk/v4_4"]
+v4_10 = ["gdk4-wayland-sys/v4_10", "v4_4", "gdk/v4_10"]
+v4_12 = ["gdk4-wayland-sys/v4_12", "v4_10", "gdk/v4_12"]
+v4_16 = ["gdk4-wayland-sys/v4_16", "v4_12", "gdk/v4_16"]
 wayland_crate = ["wayland-client", "wayland-backend"]
 egl = ["khronos-egl"]
 
 [dependencies]
-ffi = {path = "./sys", package = "gdk4-wayland-sys", version = "0.9"}
+gdk4-wayland-sys.workspace = true
 gdk.workspace=  true
 gio.workspace = true
 glib.workspace = true

diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 839b834456d2)
+Generated by gir (https://github.com/gtk-rs/gir @ 6a8847ce15a5)
 from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
diff --git a/gdk4-wayland/src/auto/wayland_device.rs b/gdk4-wayland/src/auto/wayland_device.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::translate::*;
 
 glib::wrapper! {

diff --git a/gdk4-wayland/src/auto/wayland_display.rs b/gdk4-wayland/src/auto/wayland_display.rs
@@ -3,6 +3,7 @@
 // DO NOT EDIT
 #![allow(deprecated)]
 
+use crate::ffi;
 use glib::translate::*;
 
 glib::wrapper! {

diff --git a/gdk4-wayland/src/auto/wayland_gl_context.rs b/gdk4-wayland/src/auto/wayland_gl_context.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWaylandGLContext")]
     pub struct WaylandGLContext(Object<ffi::GdkWaylandGLContext, ffi::GdkWaylandGLContextClass>) @extends gdk::GLContext, gdk::DrawContext;

diff --git a/gdk4-wayland/src/auto/wayland_monitor.rs b/gdk4-wayland/src/auto/wayland_monitor.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWaylandMonitor")]
     pub struct WaylandMonitor(Object<ffi::GdkWaylandMonitor, ffi::GdkWaylandMonitorClass>) @extends gdk::Monitor;

diff --git a/gdk4-wayland/src/auto/wayland_popup.rs b/gdk4-wayland/src/auto/wayland_popup.rs
@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use crate::WaylandSurface;
+use crate::{ffi, WaylandSurface};
 
 glib::wrapper! {
     #[doc(alias = "GdkWaylandPopup")]

diff --git a/gdk4-wayland/src/auto/wayland_seat.rs b/gdk4-wayland/src/auto/wayland_seat.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWaylandSeat")]
     pub struct WaylandSeat(Object<ffi::GdkWaylandSeat, ffi::GdkWaylandSeatClass>) @extends gdk::Seat;

diff --git a/gdk4-wayland/src/auto/wayland_surface.rs b/gdk4-wayland/src/auto/wayland_surface.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWaylandSurface")]
     pub struct WaylandSurface(Object<ffi::GdkWaylandSurface>) @extends gdk::Surface;

diff --git a/gdk4-wayland/src/auto/wayland_toplevel.rs b/gdk4-wayland/src/auto/wayland_toplevel.rs
@@ -3,7 +3,7 @@
 // DO NOT EDIT
 #![allow(deprecated)]
 
-use crate::WaylandSurface;
+use crate::{ffi, WaylandSurface};
 use glib::translate::*;
 
 glib::wrapper! {

diff --git a/gdk4-wayland/src/lib.rs b/gdk4-wayland/src/lib.rs
@@ -4,8 +4,8 @@
 #![allow(deprecated)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-pub use ffi;
 pub use gdk;
+pub use gdk4_wayland_sys as ffi;
 pub use gio;
 pub use glib;
 #[cfg(all(feature = "v4_4", feature = "egl"))]

diff --git a/gdk4-wayland/src/wayland_device.rs b/gdk4-wayland/src/wayland_device.rs
@@ -11,10 +11,10 @@ use wayland_client::{
     Proxy,
 };
 
+use crate::WaylandDevice;
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use crate::prelude::*;
-use crate::WaylandDevice;
+use crate::{ffi, prelude::*};
 
 impl WaylandDevice {
     #[doc(alias = "gdk_wayland_device_get_wl_keyboard")]

diff --git a/gdk4-wayland/src/wayland_display.rs b/gdk4-wayland/src/wayland_display.rs
@@ -1,5 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#[cfg(feature = "wayland_crate")]
+#[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
+use crate::ffi;
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
 use glib::{prelude::*, translate::*, Quark};

diff --git a/gdk4-wayland/src/wayland_monitor.rs b/gdk4-wayland/src/wayland_monitor.rs
@@ -5,7 +5,10 @@
 use wayland_client::{backend::ObjectId, protocol::wl_output::WlOutput, Proxy};
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use {crate::prelude::*, glib::translate::*};
+use {
+    crate::{ffi, prelude::*},
+    glib::translate::*,
+};
 
 use crate::WaylandMonitor;
 

diff --git a/gdk4-wayland/src/wayland_seat.rs b/gdk4-wayland/src/wayland_seat.rs
@@ -5,7 +5,10 @@
 use wayland_client::{backend::ObjectId, protocol::wl_seat::WlSeat, Proxy};
 #[cfg(feature = "wayland_crate")]
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-use {crate::prelude::*, glib::translate::*};
+use {
+    crate::{ffi, prelude::*},
+    glib::translate::*,
+};
 
 use crate::WaylandSeat;
 

diff --git a/gdk4-wayland/src/wayland_surface.rs b/gdk4-wayland/src/wayland_surface.rs
@@ -7,7 +7,7 @@ use glib::translate::*;
 #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
 use wayland_client::{backend::ObjectId, protocol::wl_surface::WlSurface, Proxy};
 
-use crate::{prelude::*, WaylandSurface};
+use crate::{ffi, prelude::*, WaylandSurface};
 
 mod sealed {
     pub trait Sealed {}

diff --git a/gdk4-wayland/src/wayland_toplevel.rs b/gdk4-wayland/src/wayland_toplevel.rs
@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::WaylandToplevel;
+use crate::{ffi, WaylandToplevel};
 use glib::translate::*;
 use std::boxed::Box as Box_;
 

diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 839b834456d2)
+Generated by gir (https://github.com/gtk-rs/gir @ 6a8847ce15a5)
 from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
diff --git a/gdk4-win32/Cargo.toml b/gdk4-win32/Cargo.toml
@@ -18,12 +18,12 @@ name = "gtk4-win32"
 version = "4"
 
 [features]
-v4_4 = ["ffi/v4_4", "gdk/v4_4"]
+v4_4 = ["gdk4-win32-sys/v4_4", "gdk/v4_4"]
 egl = ["khronos-egl"]
 win32 = ["windows"]
 
 [dependencies]
-ffi = { path = "./sys", version = "0.9", package = "gdk4-win32-sys"}
+gdk4-win32-sys.workspace = true
 gdk.workspace = true
 gio.workspace = true
 glib.workspace = true

diff --git a/gdk4-win32/src/auto/enums.rs b/gdk4-win32/src/auto/enums.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::translate::*;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]

diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 839b834456d2)
+Generated by gir (https://github.com/gtk-rs/gir @ 6a8847ce15a5)
 from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
diff --git a/gdk4-win32/src/auto/win32_display.rs b/gdk4-win32/src/auto/win32_display.rs
@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use crate::Win32HCursor;
+use crate::{ffi, Win32HCursor};
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-win32/src/auto/win32_display_manager.rs b/gdk4-win32/src/auto/win32_display_manager.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWin32DisplayManager")]
     pub struct Win32DisplayManager(Object<ffi::GdkWin32DisplayManager, ffi::GdkWin32DisplayManagerClass>) @extends gdk::DisplayManager;

diff --git a/gdk4-win32/src/auto/win32_drag.rs b/gdk4-win32/src/auto/win32_drag.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWin32Drag")]
     pub struct Win32Drag(Object<ffi::GdkWin32Drag, ffi::GdkWin32DragClass>) @extends gdk::Drag;

diff --git a/gdk4-win32/src/auto/win32_gl_context.rs b/gdk4-win32/src/auto/win32_gl_context.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWin32GLContext")]
     pub struct Win32GLContext(Object<ffi::GdkWin32GLContext, ffi::GdkWin32GLContextClass>) @extends gdk::GLContext, gdk::DrawContext;

diff --git a/gdk4-win32/src/auto/win32_hcursor.rs b/gdk4-win32/src/auto/win32_hcursor.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-win32/src/auto/win32_monitor.rs b/gdk4-win32/src/auto/win32_monitor.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-win32/src/auto/win32_screen.rs b/gdk4-win32/src/auto/win32_screen.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkWin32Screen")]
     pub struct Win32Screen(Object<ffi::GdkWin32Screen, ffi::GdkWin32ScreenClass>);

diff --git a/gdk4-win32/src/auto/win32_surface.rs b/gdk4-win32/src/auto/win32_surface.rs
@@ -3,6 +3,7 @@
 // DO NOT EDIT
 #![allow(deprecated)]
 
+use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-win32/src/lib.rs b/gdk4-win32/src/lib.rs
@@ -4,8 +4,8 @@
 #![allow(deprecated)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-pub use ffi;
 pub use gdk;
+pub use gdk4_win32_sys as ffi;
 pub use gio;
 pub use glib;
 #[cfg(feature = "win32")]

diff --git a/gdk4-win32/src/win32_display.rs b/gdk4-win32/src/win32_display.rs
@@ -5,7 +5,7 @@ use glib::translate::*;
 #[cfg_attr(docsrs, doc(cfg(all(feature = "v4_4", feature = "egl"))))]
 use khronos_egl as egl;
 
-use crate::{Win32Display, Win32MessageFilterReturn, MSG};
+use crate::{ffi, Win32Display, Win32MessageFilterReturn, MSG};
 
 impl Win32Display {
     #[cfg(all(feature = "v4_4", feature = "egl"))]

diff --git a/gdk4-win32/src/win32_hcursor.rs b/gdk4-win32/src/win32_hcursor.rs
@@ -4,7 +4,7 @@ use std::ptr::NonNull;
 
 use glib::{translate::*, types::Pointee};
 
-use crate::{prelude::*, Win32HCursor, HCURSOR};
+use crate::{ffi, prelude::*, Win32HCursor, HCURSOR};
 
 impl Win32HCursor {
     #[doc(alias = "gdk_win32_hcursor_new")]

diff --git a/gdk4-win32/src/win32_surface.rs b/gdk4-win32/src/win32_surface.rs
@@ -2,7 +2,7 @@
 
 use glib::translate::*;
 
-use crate::{prelude::*, Win32Surface, HWND};
+use crate::{ffi, prelude::*, Win32Surface, HWND};
 
 impl Win32Surface {
     #[doc(alias = "gdk_win32_surface_lookup_for_display")]

diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 839b834456d2)
+Generated by gir (https://github.com/gtk-rs/gir @ 6a8847ce15a5)
 from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
diff --git a/gdk4-x11/Cargo.toml b/gdk4-x11/Cargo.toml
@@ -14,14 +14,14 @@ rust-version.workspace = true
 version.workspace = true
 
 [features]
-v4_4 = ["ffi/v4_4", "gdk/v4_4"]
-v4_10 = ["ffi/v4_10", "v4_4", "gdk/v4_10"]
-v4_16 = ["ffi/v4_16", "v4_10", "gdk/v4_16"]
+v4_4 = ["gdk4-x11-sys/v4_4", "gdk/v4_4"]
+v4_10 = ["gdk4-x11-sys/v4_10", "v4_4", "gdk/v4_10"]
+v4_16 = ["gdk4-x11-sys/v4_16", "v4_10", "gdk/v4_16"]
 egl = ["khronos-egl"]
 xlib = ["x11"]
 
 [dependencies]
-ffi = {path = "./sys", package = "gdk4-x11-sys", version = "0.9"}
+gdk4-x11-sys.workspace = true
 gdk.workspace = true
 gio.workspace = true
 glib.workspace = true

diff --git a/gdk4-x11/src/auto/enums.rs b/gdk4-x11/src/auto/enums.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::translate::*;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]

diff --git a/gdk4-x11/src/auto/functions.rs b/gdk4-x11/src/auto/functions.rs
@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use crate::{X11DeviceManagerXI2, X11DeviceXI2, X11Surface};
+use crate::{ffi, X11DeviceManagerXI2, X11DeviceXI2, X11Surface};
 use glib::translate::*;
 
 #[doc(alias = "gdk_x11_device_get_id")]

diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 839b834456d2)
+Generated by gir (https://github.com/gtk-rs/gir @ 6a8847ce15a5)
 from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
diff --git a/gdk4-x11/src/auto/x11_app_launch_context.rs b/gdk4-x11/src/auto/x11_app_launch_context.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
+
 glib::wrapper! {
     #[doc(alias = "GdkX11AppLaunchContext")]
     pub struct X11AppLaunchContext(Object<ffi::GdkX11AppLaunchContext, ffi::GdkX11AppLaunchContextClass>) @extends gdk::AppLaunchContext, gio::AppLaunchContext;

diff --git a/gdk4-x11/src/auto/x11_device_manager_xi2.rs b/gdk4-x11/src/auto/x11_device_manager_xi2.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-x11/src/auto/x11_device_xi2.rs b/gdk4-x11/src/auto/x11_device_xi2.rs
@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::ffi;
 use glib::{prelude::*, translate::*};
 
 glib::wrapper! {

diff --git a/gdk4-x11/src/auto/x11_display.rs b/gdk4-x11/src/auto/x11_display.rs
@@ -3,7 +3,7 @@
 // DO NOT EDIT
 #![allow(deprecated)]
 
-use crate::X11Screen;
+use crate::{ffi, X11Screen};
 use glib::translate::*;
 
 glib::wrapper! {