Skip to content
This repository has been archived by the owner on Mar 4, 2024. It is now read-only.

Commit

Permalink
Regenerate
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Aug 12, 2023
1 parent 5e271b6 commit e933792
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 18 deletions.
33 changes: 33 additions & 0 deletions atk/src/auto/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,39 @@ pub trait AtkObjectExt: IsA<Object> + sealed::Sealed + 'static {
}
}

#[cfg(feature = "v2_50")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
#[doc(alias = "notification")]
fn connect_notification<F: Fn(&Self, &str, i32) + 'static>(&self, f: F) -> SignalHandlerId {
unsafe extern "C" fn notification_trampoline<
P: IsA<Object>,
F: Fn(&P, &str, i32) + 'static,
>(
this: *mut ffi::AtkObject,
arg1: *mut libc::c_char,
arg2: libc::c_int,
f: glib::ffi::gpointer,
) {
let f: &F = &*(f as *const F);
f(
Object::from_glib_borrow(this).unsafe_cast_ref(),
&glib::GString::from_glib_borrow(arg1),
arg2,
)
}
unsafe {
let f: Box_<F> = Box_::new(f);
connect_raw(
self.as_ptr() as *mut _,
b"notification\0".as_ptr() as *const _,
Some(transmute::<_, unsafe extern "C" fn()>(
notification_trampoline::<Self, F> as *const (),
)),
Box_::into_raw(f),
)
}
}

//#[doc(alias = "property-change")]
//fn connect_property_change<Unsupported or ignored types>(&self, detail: Option<&str>, f: F) -> SignalHandlerId {
// Ignored arg1: Atk.PropertyValues
Expand Down
4 changes: 2 additions & 2 deletions atk/src/auto/state_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub trait StateSetExt: IsA<StateSet> + sealed::Sealed + 'static {
}

//#[doc(alias = "atk_state_set_add_states")]
//fn add_states(&self, types: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 68 }) {
//fn add_states(&self, types: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 69 }) {
// unsafe { TODO: call ffi:atk_state_set_add_states() }
//}

Expand Down Expand Up @@ -81,7 +81,7 @@ pub trait StateSetExt: IsA<StateSet> + sealed::Sealed + 'static {
}

//#[doc(alias = "atk_state_set_contains_states")]
//fn contains_states(&self, types: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 68 }) -> bool {
//fn contains_states(&self, types: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 69 }) -> bool {
// unsafe { TODO: call ffi:atk_state_set_contains_states() }
//}

Expand Down
4 changes: 2 additions & 2 deletions atk/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
5 changes: 5 additions & 0 deletions atk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ v2_32 = ["v2_30"]
v2_34 = ["v2_32"]
v2_38 = ["v2_34"]
v2_46 = ["v2_38"]
v2_50 = ["v2_46"]

[lib]
name = "atk_sys"
Expand All @@ -43,6 +44,7 @@ rust-version = "1.70"
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
features = []
rustc-args = ["--cfg", "docsrs"]

[package.metadata.system-deps.atk]
name = "atk"
Expand All @@ -62,3 +64,6 @@ version = "2.38"

[package.metadata.system-deps.atk.v2_46]
version = "2.46"

[package.metadata.system-deps.atk.v2_50]
version = "2.50"
10 changes: 10 additions & 0 deletions atk/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ pub const ATK_LAYER_POPUP: AtkLayer = 5;
pub const ATK_LAYER_OVERLAY: AtkLayer = 6;
pub const ATK_LAYER_WINDOW: AtkLayer = 7;

pub type AtkLive = c_int;
pub const ATK_LIVE_NONE: AtkLive = 0;
pub const ATK_LIVE_POLITE: AtkLive = 1;
pub const ATK_LIVE_ASSERTIVE: AtkLive = 2;

pub type AtkRelationType = c_int;
pub const ATK_RELATION_NULL: AtkRelationType = 0;
pub const ATK_RELATION_CONTROLLED_BY: AtkRelationType = 1;
Expand Down Expand Up @@ -1819,6 +1824,11 @@ extern "C" {
//=========================================================================
pub fn atk_layer_get_type() -> GType;

//=========================================================================
// AtkLive
//=========================================================================
pub fn atk_live_get_type() -> GType;

//=========================================================================
// AtkRelationType
//=========================================================================
Expand Down
10 changes: 10 additions & 0 deletions atk/sys/tests/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
alignment: align_of::<AtkLayer>(),
},
),
(
"AtkLive",
Layout {
size: size_of::<AtkLive>(),
alignment: align_of::<AtkLive>(),
},
),
(
"AtkMisc",
Layout {
Expand Down Expand Up @@ -653,6 +660,9 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("(gint) ATK_LAYER_POPUP", "5"),
("(gint) ATK_LAYER_WIDGET", "3"),
("(gint) ATK_LAYER_WINDOW", "7"),
("(gint) ATK_LIVE_ASSERTIVE", "2"),
("(gint) ATK_LIVE_NONE", "0"),
("(gint) ATK_LIVE_POLITE", "1"),
("(gint) ATK_RELATION_CONTROLLED_BY", "1"),
("(gint) ATK_RELATION_CONTROLLER_FOR", "2"),
("(gint) ATK_RELATION_DESCRIBED_BY", "14"),
Expand Down
3 changes: 3 additions & 0 deletions atk/sys/tests/constant.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ int main() {
PRINT_CONSTANT((gint) ATK_LAYER_POPUP);
PRINT_CONSTANT((gint) ATK_LAYER_WIDGET);
PRINT_CONSTANT((gint) ATK_LAYER_WINDOW);
PRINT_CONSTANT((gint) ATK_LIVE_ASSERTIVE);
PRINT_CONSTANT((gint) ATK_LIVE_NONE);
PRINT_CONSTANT((gint) ATK_LIVE_POLITE);
PRINT_CONSTANT((gint) ATK_RELATION_CONTROLLED_BY);
PRINT_CONSTANT((gint) ATK_RELATION_CONTROLLER_FOR);
PRINT_CONSTANT((gint) ATK_RELATION_DESCRIBED_BY);
Expand Down
1 change: 1 addition & 0 deletions atk/sys/tests/layout.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ int main() {
printf("%s;%zu;%zu\n", "AtkKeyEventStruct", sizeof(AtkKeyEventStruct), alignof(AtkKeyEventStruct));
printf("%s;%zu;%zu\n", "AtkKeyEventType", sizeof(AtkKeyEventType), alignof(AtkKeyEventType));
printf("%s;%zu;%zu\n", "AtkLayer", sizeof(AtkLayer), alignof(AtkLayer));
printf("%s;%zu;%zu\n", "AtkLive", sizeof(AtkLive), alignof(AtkLive));
printf("%s;%zu;%zu\n", "AtkMisc", sizeof(AtkMisc), alignof(AtkMisc));
printf("%s;%zu;%zu\n", "AtkMiscClass", sizeof(AtkMiscClass), alignof(AtkMiscClass));
printf("%s;%zu;%zu\n", "AtkNoOpObject", sizeof(AtkNoOpObject), alignof(AtkNoOpObject));
Expand Down
4 changes: 2 additions & 2 deletions atk/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
4 changes: 2 additions & 2 deletions gdk/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1 change: 1 addition & 0 deletions gdk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ rust-version = "1.70"
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
features = []
rustc-args = ["--cfg", "docsrs"]

[package.metadata.system-deps.gdk_3_0]
name = "gdk-3.0"
Expand Down
4 changes: 2 additions & 2 deletions gdk/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
4 changes: 2 additions & 2 deletions gdkx11/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1 change: 1 addition & 0 deletions gdkx11/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ rust-version = "1.70"
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
features = []
rustc-args = ["--cfg", "docsrs"]

[package.metadata.system-deps.gdk_x11_3_0]
name = "gdk-x11-3.0"
Expand Down
4 changes: 2 additions & 2 deletions gdkx11/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
4 changes: 2 additions & 2 deletions gtk/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1 change: 1 addition & 0 deletions gtk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rust-version = "1.70"
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
features = []
rustc-args = ["--cfg", "docsrs"]

[package.metadata.system-deps."gtk+_3_0"]
name = "gtk+-3.0"
Expand Down
4 changes: 2 additions & 2 deletions gtk/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

0 comments on commit e933792

Please sign in to comment.