Regen bindings

gtk-rs · Jun 21, 2024 · 34a0c99 · 34a0c99
1 parent f0e1d9e
commit 34a0c99
Show file tree

Hide file tree

Showing 43 changed files with 254 additions and 189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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 @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
diff --git a/gdk4-wayland/sys/Cargo.toml b/gdk4-wayland/sys/Cargo.toml
@@ -66,7 +66,7 @@ libc = "0.2"
 workspace = true
 
 [build-dependencies]
-system-deps = "6"
+system-deps = "7"
 
 [dev-dependencies]
 shell-words = "1.0.0"

diff --git a/gdk4-wayland/sys/src/lib.rs b/gdk4-wayland/sys/src/lib.rs
@@ -183,12 +183,12 @@ extern "C" {
     //=========================================================================
     pub fn gdk_wayland_device_get_type() -> GType;
     pub fn gdk_wayland_device_get_node_path(device: *mut GdkWaylandDevice) -> *const c_char;
-    pub fn gdk_wayland_device_get_wl_keyboard(device: *mut GdkWaylandDevice) -> gpointer;
-    pub fn gdk_wayland_device_get_wl_pointer(device: *mut GdkWaylandDevice) -> gpointer;
-    pub fn gdk_wayland_device_get_wl_seat(device: *mut GdkWaylandDevice) -> gpointer;
+    pub fn gdk_wayland_device_get_wl_keyboard(device: *mut GdkWaylandDevice) -> *mut wl_keyboard;
+    pub fn gdk_wayland_device_get_wl_pointer(device: *mut GdkWaylandDevice) -> *mut wl_pointer;
+    pub fn gdk_wayland_device_get_wl_seat(device: *mut GdkWaylandDevice) -> *mut wl_seat;
     #[cfg(feature = "v4_4")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_4")))]
-    pub fn gdk_wayland_device_get_xkb_keymap(device: *mut GdkWaylandDevice) -> gpointer;
+    pub fn gdk_wayland_device_get_xkb_keymap(device: *mut GdkWaylandDevice) -> *mut xkb_keymap;
 
     //=========================================================================
     // GdkWaylandDisplay
@@ -200,8 +200,10 @@ extern "C" {
     pub fn gdk_wayland_display_get_startup_notification_id(
         display: *mut GdkWaylandDisplay,
     ) -> *const c_char;
-    pub fn gdk_wayland_display_get_wl_compositor(display: *mut GdkWaylandDisplay) -> gpointer;
-    pub fn gdk_wayland_display_get_wl_display(display: *mut GdkWaylandDisplay) -> gpointer;
+    pub fn gdk_wayland_display_get_wl_compositor(
+        display: *mut GdkWaylandDisplay,
+    ) -> *mut wl_compositor;
+    pub fn gdk_wayland_display_get_wl_display(display: *mut GdkWaylandDisplay) -> *mut wl_display;
     pub fn gdk_wayland_display_query_registry(
         display: *mut GdkWaylandDisplay,
         global: *const c_char,
@@ -225,7 +227,7 @@ extern "C" {
     // GdkWaylandMonitor
     //=========================================================================
     pub fn gdk_wayland_monitor_get_type() -> GType;
-    pub fn gdk_wayland_monitor_get_wl_output(monitor: *mut GdkWaylandMonitor) -> gpointer;
+    pub fn gdk_wayland_monitor_get_wl_output(monitor: *mut GdkWaylandMonitor) -> *mut wl_output;
 
     //=========================================================================
     // GdkWaylandPopup
@@ -236,13 +238,13 @@ extern "C" {
     // GdkWaylandSeat
     //=========================================================================
     pub fn gdk_wayland_seat_get_type() -> GType;
-    pub fn gdk_wayland_seat_get_wl_seat(seat: *mut GdkWaylandSeat) -> gpointer;
+    pub fn gdk_wayland_seat_get_wl_seat(seat: *mut GdkWaylandSeat) -> *mut wl_seat;
 
     //=========================================================================
     // GdkWaylandSurface
     //=========================================================================
     pub fn gdk_wayland_surface_get_type() -> GType;
-    pub fn gdk_wayland_surface_get_wl_surface(surface: *mut GdkWaylandSurface) -> gpointer;
+    pub fn gdk_wayland_surface_get_wl_surface(surface: *mut GdkWaylandSurface) -> *mut wl_surface;
 
     //=========================================================================
     // GdkWaylandToplevel

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 @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
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 @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
diff --git a/gdk4-win32/sys/Cargo.toml b/gdk4-win32/sys/Cargo.toml
@@ -61,7 +61,7 @@ workspace = true
 workspace = true
 
 [build-dependencies]
-system-deps = "6"
+system-deps = "7"
 
 [dev-dependencies]
 shell-words = "1.0.0"

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 @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
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 @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
diff --git a/gdk4-x11/sys/Cargo.toml b/gdk4-x11/sys/Cargo.toml
@@ -65,7 +65,7 @@ workspace = true
 workspace = true
 
 [build-dependencies]
-system-deps = "6"
+system-deps = "7"
 
 [dev-dependencies]
 shell-words = "1.0.0"

diff --git a/gdk4-x11/sys/src/lib.rs b/gdk4-x11/sys/src/lib.rs
@@ -282,10 +282,10 @@ extern "C" {
     pub fn gdk_x11_display_get_xcursor(
         display: *mut GdkX11Display,
         cursor: *mut gdk::GdkCursor,
-    ) -> c_ulong;
-    pub fn gdk_x11_display_get_xdisplay(display: *mut GdkX11Display) -> gpointer;
-    pub fn gdk_x11_display_get_xrootwindow(display: *mut GdkX11Display) -> c_ulong;
-    pub fn gdk_x11_display_get_xscreen(display: *mut GdkX11Display) -> gpointer;
+    ) -> xlib::Cursor;
+    pub fn gdk_x11_display_get_xdisplay(display: *mut GdkX11Display) -> *mut xlib::Display;
+    pub fn gdk_x11_display_get_xrootwindow(display: *mut GdkX11Display) -> xlib::Window;
+    pub fn gdk_x11_display_get_xscreen(display: *mut GdkX11Display) -> *mut xlib::Screen;
     pub fn gdk_x11_display_grab(display: *mut GdkX11Display);
     pub fn gdk_x11_display_set_cursor_theme(
         display: *mut GdkX11Display,
@@ -337,7 +337,7 @@ extern "C" {
     // GdkX11Monitor
     //=========================================================================
     pub fn gdk_x11_monitor_get_type() -> GType;
-    pub fn gdk_x11_monitor_get_output(monitor: *mut GdkX11Monitor) -> c_ulong;
+    pub fn gdk_x11_monitor_get_output(monitor: *mut GdkX11Monitor) -> xlib::XID;
     pub fn gdk_x11_monitor_get_workarea(
         monitor: *mut GdkX11Monitor,
         workarea: *mut gdk::GdkRectangle,
@@ -351,11 +351,11 @@ extern "C" {
     pub fn gdk_x11_screen_get_monitor_output(
         screen: *mut GdkX11Screen,
         monitor_num: c_int,
-    ) -> c_ulong;
+    ) -> xlib::XID;
     pub fn gdk_x11_screen_get_number_of_desktops(screen: *mut GdkX11Screen) -> u32;
     pub fn gdk_x11_screen_get_screen_number(screen: *mut GdkX11Screen) -> c_int;
     pub fn gdk_x11_screen_get_window_manager_name(screen: *mut GdkX11Screen) -> *const c_char;
-    pub fn gdk_x11_screen_get_xscreen(screen: *mut GdkX11Screen) -> gpointer;
+    pub fn gdk_x11_screen_get_xscreen(screen: *mut GdkX11Screen) -> *mut xlib::Screen;
     pub fn gdk_x11_screen_supports_net_wm_hint(
         screen: *mut GdkX11Screen,
         property_name: *const c_char,
@@ -367,11 +367,11 @@ extern "C" {
     pub fn gdk_x11_surface_get_type() -> GType;
     pub fn gdk_x11_surface_lookup_for_display(
         display: *mut GdkX11Display,
-        window: c_ulong,
+        window: xlib::Window,
     ) -> *mut GdkX11Surface;
     pub fn gdk_x11_surface_get_desktop(surface: *mut GdkX11Surface) -> u32;
     pub fn gdk_x11_surface_get_group(surface: *mut GdkX11Surface) -> *mut gdk::GdkSurface;
-    pub fn gdk_x11_surface_get_xid(surface: *mut GdkX11Surface) -> c_ulong;
+    pub fn gdk_x11_surface_get_xid(surface: *mut GdkX11Surface) -> xlib::Window;
     pub fn gdk_x11_surface_move_to_current_desktop(surface: *mut GdkX11Surface);
     pub fn gdk_x11_surface_move_to_desktop(surface: *mut GdkX11Surface, desktop: u32);
     pub fn gdk_x11_surface_set_frame_sync_enabled(
@@ -407,12 +407,12 @@ extern "C" {
     pub fn gdk_x11_get_xatom_by_name_for_display(
         display: *mut GdkX11Display,
         atom_name: *const c_char,
-    ) -> c_ulong;
+    ) -> xlib::Atom;
     pub fn gdk_x11_get_xatom_name_for_display(
         display: *mut GdkX11Display,
-        xatom: c_ulong,
+        xatom: xlib::Atom,
     ) -> *const c_char;
-    pub fn gdk_x11_lookup_xdisplay(xdisplay: gpointer) -> *mut GdkX11Display;
+    pub fn gdk_x11_lookup_xdisplay(xdisplay: *mut xlib::Display) -> *mut GdkX11Display;
     pub fn gdk_x11_set_sm_client_id(sm_client_id: *const c_char);
 
 }
diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
diff --git a/gdk4/src/auto/enums.rs b/gdk4/src/auto/enums.rs
@@ -792,6 +792,8 @@ pub enum EventType {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
     #[doc(alias = "GDK_TOUCHPAD_HOLD")]
     TouchpadHold,
+    #[doc(alias = "GDK_EVENT_LAST")]
+    EventLast,
     #[doc(hidden)]
     __Unknown(i32),
 }
@@ -832,6 +834,7 @@ impl IntoGlib for EventType {
             Self::PadGroupMode => ffi::GDK_PAD_GROUP_MODE,
             #[cfg(feature = "v4_8")]
             Self::TouchpadHold => ffi::GDK_TOUCHPAD_HOLD,
+            Self::EventLast => ffi::GDK_EVENT_LAST,
             Self::__Unknown(value) => value,
         }
     }
@@ -873,6 +876,7 @@ impl FromGlib<ffi::GdkEventType> for EventType {
             ffi::GDK_PAD_GROUP_MODE => Self::PadGroupMode,
             #[cfg(feature = "v4_8")]
             ffi::GDK_TOUCHPAD_HOLD => Self::TouchpadHold,
+            ffi::GDK_EVENT_LAST => Self::EventLast,
             value => Self::__Unknown(value),
         }
     }
@@ -1623,6 +1627,8 @@ pub enum MemoryFormat {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))]
     #[doc(alias = "GDK_MEMORY_X8B8G8R8")]
     X8b8g8r8,
+    #[doc(alias = "GDK_MEMORY_N_FORMATS")]
+    NFormats,
     #[doc(hidden)]
     __Unknown(i32),
 }
@@ -1694,6 +1700,7 @@ impl IntoGlib for MemoryFormat {
             Self::R8g8b8x8 => ffi::GDK_MEMORY_R8G8B8X8,
             #[cfg(feature = "v4_14")]
             Self::X8b8g8r8 => ffi::GDK_MEMORY_X8B8G8R8,
+            Self::NFormats => ffi::GDK_MEMORY_N_FORMATS,
             Self::__Unknown(value) => value,
         }
     }
@@ -1766,6 +1773,7 @@ impl FromGlib<ffi::GdkMemoryFormat> for MemoryFormat {
             ffi::GDK_MEMORY_R8G8B8X8 => Self::R8g8b8x8,
             #[cfg(feature = "v4_14")]
             ffi::GDK_MEMORY_X8B8G8R8 => Self::X8b8g8r8,
+            ffi::GDK_MEMORY_N_FORMATS => Self::NFormats,
             value => Self::__Unknown(value),
         }
     }

diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d)
-from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d)
+Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48)
+from gir-files (https://github.com/gtk-rs/gir-files @ 191ed71a31d8+)
diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml
@@ -97,7 +97,7 @@ workspace = true
 workspace = true
 
 [build-dependencies]
-system-deps = "6"
+system-deps = "7"
 pkg-config = "0.3.30"
 
 [dev-dependencies]