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

Commit 3ec2253

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request #841 from GuillaumeGomez/backport-regen
Backport #840
2 parents 2810168 + 05df0d6 commit 3ec2253

25 files changed

+236
-20
lines changed

‎atk/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ v2_30 = ["ffi/v2_30"]
2222
v2_32 = ["v2_30", "ffi/v2_32"]
2323
v2_34 = ["v2_32", "ffi/v2_34"]
2424
v2_38 = ["v2_34", "ffi/v2_38"]
25+
v2_46 = ["v2_38", "ffi/v2_46"]
26+
v2_50 = ["v2_46", "ffi/v2_50"]
2527

2628
[package.metadata.docs.rs]
2729
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

‎atk/Gir.toml

+5
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ name = "Atk.Image"
8787
status = "generate"
8888
trait_name = "AtkImageExt" # duplicate with gtk
8989

90+
[[object]]
91+
name = "Atk.Live"
92+
status = "generate"
93+
version = "2.50"
94+
9095
[[object]]
9196
name = "Atk.Misc"
9297
status = "generate"

‎atk/src/auto/enums.rs

+134
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,140 @@ impl From<Layer> for glib::Value {
258258
}
259259
}
260260

261+
#[cfg(feature = "v2_50")]
262+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
263+
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
264+
#[non_exhaustive]
265+
#[doc(alias = "AtkLive")]
266+
pub enum Live {
267+
#[doc(alias = "ATK_LIVE_NONE")]
268+
None,
269+
#[doc(alias = "ATK_LIVE_POLITE")]
270+
Polite,
271+
#[doc(alias = "ATK_LIVE_ASSERTIVE")]
272+
Assertive,
273+
#[doc(hidden)]
274+
__Unknown(i32),
275+
}
276+
277+
#[cfg(feature = "v2_50")]
278+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
279+
impl fmt::Display for Live {
280+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
281+
write!(
282+
f,
283+
"Live::{}",
284+
match *self {
285+
Self::None => "None",
286+
Self::Polite => "Polite",
287+
Self::Assertive => "Assertive",
288+
_ => "Unknown",
289+
}
290+
)
291+
}
292+
}
293+
294+
#[cfg(feature = "v2_50")]
295+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
296+
#[doc(hidden)]
297+
impl IntoGlib for Live {
298+
type GlibType = ffi::AtkLive;
299+
300+
#[inline]
301+
fn into_glib(self) -> ffi::AtkLive {
302+
match self {
303+
Self::None => ffi::ATK_LIVE_NONE,
304+
Self::Polite => ffi::ATK_LIVE_POLITE,
305+
Self::Assertive => ffi::ATK_LIVE_ASSERTIVE,
306+
Self::__Unknown(value) => value,
307+
}
308+
}
309+
}
310+
311+
#[cfg(feature = "v2_50")]
312+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
313+
#[doc(hidden)]
314+
impl FromGlib<ffi::AtkLive> for Live {
315+
#[inline]
316+
unsafe fn from_glib(value: ffi::AtkLive) -> Self {
317+
skip_assert_initialized!();
318+
319+
match value {
320+
ffi::ATK_LIVE_NONE => Self::None,
321+
ffi::ATK_LIVE_POLITE => Self::Polite,
322+
ffi::ATK_LIVE_ASSERTIVE => Self::Assertive,
323+
value => Self::__Unknown(value),
324+
}
325+
}
326+
}
327+
328+
#[cfg(feature = "v2_50")]
329+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
330+
impl StaticType for Live {
331+
#[inline]
332+
fn static_type() -> glib::Type {
333+
unsafe { from_glib(ffi::atk_live_get_type()) }
334+
}
335+
}
336+
337+
#[cfg(feature = "v2_50")]
338+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
339+
impl glib::HasParamSpec for Live {
340+
type ParamSpec = glib::ParamSpecEnum;
341+
type SetValue = Self;
342+
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
343+
344+
fn param_spec_builder() -> Self::BuilderFn {
345+
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
346+
}
347+
}
348+
349+
#[cfg(feature = "v2_50")]
350+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
351+
impl glib::value::ValueType for Live {
352+
type Type = Self;
353+
}
354+
355+
#[cfg(feature = "v2_50")]
356+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
357+
unsafe impl<'a> glib::value::FromValue<'a> for Live {
358+
type Checker = glib::value::GenericValueTypeChecker<Self>;
359+
360+
#[inline]
361+
unsafe fn from_value(value: &'a glib::Value) -> Self {
362+
skip_assert_initialized!();
363+
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
364+
}
365+
}
366+
367+
#[cfg(feature = "v2_50")]
368+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
369+
impl ToValue for Live {
370+
#[inline]
371+
fn to_value(&self) -> glib::Value {
372+
let mut value = glib::Value::for_value_type::<Self>();
373+
unsafe {
374+
glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib());
375+
}
376+
value
377+
}
378+
379+
#[inline]
380+
fn value_type(&self) -> glib::Type {
381+
Self::static_type()
382+
}
383+
}
384+
385+
#[cfg(feature = "v2_50")]
386+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
387+
impl From<Live> for glib::Value {
388+
#[inline]
389+
fn from(v: Live) -> Self {
390+
skip_assert_initialized!();
391+
ToValue::to_value(&v)
392+
}
393+
}
394+
261395
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
262396
#[non_exhaustive]
263397
#[doc(alias = "AtkRelationType")]

‎atk/src/auto/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ pub use self::text_range::TextRange;
9898
mod enums;
9999
pub use self::enums::CoordType;
100100
pub use self::enums::Layer;
101+
#[cfg(feature = "v2_50")]
102+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
103+
pub use self::enums::Live;
101104
pub use self::enums::RelationType;
102105
pub use self::enums::Role;
103106
#[cfg(feature = "v2_30")]

‎atk/src/auto/object.rs

+33
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,39 @@ pub trait AtkObjectExt: IsA<Object> + sealed::Sealed + 'static {
507507
}
508508
}
509509

510+
#[cfg(feature = "v2_50")]
511+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
512+
#[doc(alias = "notification")]
513+
fn connect_notification<F: Fn(&Self, &str, i32) + 'static>(&self, f: F) -> SignalHandlerId {
514+
unsafe extern "C" fn notification_trampoline<
515+
P: IsA<Object>,
516+
F: Fn(&P, &str, i32) + 'static,
517+
>(
518+
this: *mut ffi::AtkObject,
519+
arg1: *mut libc::c_char,
520+
arg2: libc::c_int,
521+
f: glib::ffi::gpointer,
522+
) {
523+
let f: &F = &*(f as *const F);
524+
f(
525+
Object::from_glib_borrow(this).unsafe_cast_ref(),
526+
&glib::GString::from_glib_borrow(arg1),
527+
arg2,
528+
)
529+
}
530+
unsafe {
531+
let f: Box_<F> = Box_::new(f);
532+
connect_raw(
533+
self.as_ptr() as *mut _,
534+
b"notification\0".as_ptr() as *const _,
535+
Some(transmute::<_, unsafe extern "C" fn()>(
536+
notification_trampoline::<Self, F> as *const (),
537+
)),
538+
Box_::into_raw(f),
539+
)
540+
}
541+
}
542+
510543
//#[doc(alias = "property-change")]
511544
//fn connect_property_change<Unsupported or ignored types>(&self, detail: Option<&str>, f: F) -> SignalHandlerId {
512545
// Ignored arg1: Atk.PropertyValues

‎atk/src/auto/state_set.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub trait StateSetExt: IsA<StateSet> + sealed::Sealed + 'static {
4848
}
4949

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

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

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

‎atk/src/auto/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎atk/sys/Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ v2_32 = ["v2_30"]
2626
v2_34 = ["v2_32"]
2727
v2_38 = ["v2_34"]
2828
v2_46 = ["v2_38"]
29+
v2_50 = ["v2_46"]
2930

3031
[lib]
3132
name = "atk_sys"
@@ -47,6 +48,7 @@ rust-version = "1.70"
4748
[package.metadata.docs.rs]
4849
rustdoc-args = ["--cfg", "docsrs"]
4950
features = []
51+
rustc-args = ["--cfg", "docsrs"]
5052

5153
[package.metadata.system-deps.atk]
5254
name = "atk"
@@ -66,3 +68,6 @@ version = "2.38"
6668

6769
[package.metadata.system-deps.atk.v2_46]
6870
version = "2.46"
71+
72+
[package.metadata.system-deps.atk.v2_50]
73+
version = "2.50"

‎atk/sys/Gir.toml

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ extra_versions = [
2424
"2.38"
2525
]
2626

27+
[[object]]
28+
name = "Atk.Live"
29+
status = "generate"
30+
version = "2.50"
31+
2732
[[object]]
2833
name = "Atk.StateType"
2934
status = "generate"

‎atk/sys/src/lib.rs

+12
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ pub const ATK_LAYER_POPUP: AtkLayer = 5;
4545
pub const ATK_LAYER_OVERLAY: AtkLayer = 6;
4646
pub const ATK_LAYER_WINDOW: AtkLayer = 7;
4747

48+
pub type AtkLive = c_int;
49+
pub const ATK_LIVE_NONE: AtkLive = 0;
50+
pub const ATK_LIVE_POLITE: AtkLive = 1;
51+
pub const ATK_LIVE_ASSERTIVE: AtkLive = 2;
52+
4853
pub type AtkRelationType = c_int;
4954
pub const ATK_RELATION_NULL: AtkRelationType = 0;
5055
pub const ATK_RELATION_CONTROLLED_BY: AtkRelationType = 1;
@@ -1819,6 +1824,13 @@ extern "C" {
18191824
//=========================================================================
18201825
pub fn atk_layer_get_type() -> GType;
18211826

1827+
//=========================================================================
1828+
// AtkLive
1829+
//=========================================================================
1830+
#[cfg(feature = "v2_50")]
1831+
#[cfg_attr(docsrs, doc(cfg(feature = "v2_50")))]
1832+
pub fn atk_live_get_type() -> GType;
1833+
18221834
//=========================================================================
18231835
// AtkRelationType
18241836
//=========================================================================

‎atk/sys/tests/abi.rs

+10
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
323323
alignment: align_of::<AtkLayer>(),
324324
},
325325
),
326+
(
327+
"AtkLive",
328+
Layout {
329+
size: size_of::<AtkLive>(),
330+
alignment: align_of::<AtkLive>(),
331+
},
332+
),
326333
(
327334
"AtkMisc",
328335
Layout {
@@ -653,6 +660,9 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
653660
("(gint) ATK_LAYER_POPUP", "5"),
654661
("(gint) ATK_LAYER_WIDGET", "3"),
655662
("(gint) ATK_LAYER_WINDOW", "7"),
663+
("(gint) ATK_LIVE_ASSERTIVE", "2"),
664+
("(gint) ATK_LIVE_NONE", "0"),
665+
("(gint) ATK_LIVE_POLITE", "1"),
656666
("(gint) ATK_RELATION_CONTROLLED_BY", "1"),
657667
("(gint) ATK_RELATION_CONTROLLER_FOR", "2"),
658668
("(gint) ATK_RELATION_DESCRIBED_BY", "14"),

‎atk/sys/tests/constant.c

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ int main() {
4040
PRINT_CONSTANT((gint) ATK_LAYER_POPUP);
4141
PRINT_CONSTANT((gint) ATK_LAYER_WIDGET);
4242
PRINT_CONSTANT((gint) ATK_LAYER_WINDOW);
43+
PRINT_CONSTANT((gint) ATK_LIVE_ASSERTIVE);
44+
PRINT_CONSTANT((gint) ATK_LIVE_NONE);
45+
PRINT_CONSTANT((gint) ATK_LIVE_POLITE);
4346
PRINT_CONSTANT((gint) ATK_RELATION_CONTROLLED_BY);
4447
PRINT_CONSTANT((gint) ATK_RELATION_CONTROLLER_FOR);
4548
PRINT_CONSTANT((gint) ATK_RELATION_DESCRIBED_BY);

‎atk/sys/tests/layout.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ int main() {
2525
printf("%s;%zu;%zu\n", "AtkKeyEventStruct", sizeof(AtkKeyEventStruct), alignof(AtkKeyEventStruct));
2626
printf("%s;%zu;%zu\n", "AtkKeyEventType", sizeof(AtkKeyEventType), alignof(AtkKeyEventType));
2727
printf("%s;%zu;%zu\n", "AtkLayer", sizeof(AtkLayer), alignof(AtkLayer));
28+
printf("%s;%zu;%zu\n", "AtkLive", sizeof(AtkLive), alignof(AtkLive));
2829
printf("%s;%zu;%zu\n", "AtkMisc", sizeof(AtkMisc), alignof(AtkMisc));
2930
printf("%s;%zu;%zu\n", "AtkMiscClass", sizeof(AtkMiscClass), alignof(AtkMiscClass));
3031
printf("%s;%zu;%zu\n", "AtkNoOpObject", sizeof(AtkNoOpObject), alignof(AtkNoOpObject));

‎atk/sys/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gdk/src/auto/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gdk/sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ rust-version = "1.70"
6868
[package.metadata.docs.rs]
6969
rustdoc-args = ["--cfg", "docsrs"]
7070
features = []
71+
rustc-args = ["--cfg", "docsrs"]
7172

7273
[package.metadata.system-deps.gdk_3_0]
7374
name = "gdk-3.0"

‎gdk/sys/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gdkx11/src/auto/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gdkx11/sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rust-version = "1.70"
1414
[package.metadata.docs.rs]
1515
rustdoc-args = ["--cfg", "docsrs"]
1616
features = []
17+
rustc-args = ["--cfg", "docsrs"]
1718

1819
[package.metadata.system-deps.gdk_x11_3_0]
1920
name = "gdk-x11-3.0"

‎gdkx11/sys/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gir

‎gir-files

‎gtk/src/auto/versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)

‎gtk/sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ rust-version = "1.70"
1515
[package.metadata.docs.rs]
1616
rustdoc-args = ["--cfg", "docsrs"]
1717
features = []
18+
rustc-args = ["--cfg", "docsrs"]
1819

1920
[package.metadata.system-deps."gtk+_3_0"]
2021
name = "gtk+-3.0"

0 commit comments

Comments
 (0)