Generate fundamental types code using gir #780

bilelmoussaoui · 2021-12-29T13:13:56Z

Still needs a bit of cleanup & figure out how to handle the builder pattern, but in general it drops a bunch of manual code and that makes me happy :)

Except ExpressionWatch as it has it's get_type function exposed as part of the API only in 4.2 which can't be handled automatically until we drop support for 4.0

bilelmoussaoui · 2021-12-29T15:00:09Z

gdk4/src/auto/event.rs

+                axis_use.into_glib(),
+                value.as_mut_ptr(),
+            ));
+            let value = value.assume_init();


This is very bad, gir should assume_init only if ret.

bilelmoussaoui · 2021-12-29T16:14:54Z

Before merging this, we need to check the functions signatures one by one to ensure everything is properly generated & fix whatever needed.

bilelmoussaoui · 2021-12-30T17:02:18Z

So I did a 1:1 check (manual implementations we had vs auto-generated ones):

Here are a couple of things i noticed

gtk_property_expression_get_expression -> nullable : fixed upstream, see https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4304
gsk_container_node_get_child -> assert n_children < i # fixed in the latest commit
gsk_gl_shader_node_get_child -> assert n_children < i # fixed in the latest commit

Those that were not nullable in the manual bindings but are in the auto-generated ones. There are a ton of others that should really not be nullable because the constructor doesn't take a nullable variant and are nullable because of #68. So for those I would rather leave them as is for now and tackle the issue on #68

gsk_border_node_get_outline -> not nullable
gsk_conic_gradient_node_get_center -> not nullable
gdk_event_get_event_sequence -> not nullable
gsk_linear_gradient_node_get_end -> not nullable
gsk_linear_gradient_node_get_start -> not nullable

And add an assertion that idx < n_children

gdk4/Gir.toml

gdk4/src/auto/event.rs

gdk4/src/auto/key_event.rs

gdk4/src/auto/motion_event.rs

gsk4/Gir.toml

gsk4/src/auto/cairo_node.rs

gsk4/src/auto/color_node.rs

gsk4/src/auto/debug_node.rs

sdroege · 2022-01-01T10:19:22Z

Generally looks good to me otherwise

sdroege · 2022-01-01T10:33:02Z

There are a ton of others that should really not be nullable because the constructor doesn't take a nullable variant and are nullable because of #68. So for those I would rather leave them as is for now and tackle the issue on #68

You can configure the return type to be not nullable in the Gir.toml for the time being.

bilelmoussaoui · 2022-01-01T10:48:41Z

There are a ton of others that should really not be nullable because the constructor doesn't take a nullable variant and are nullable because of #68. So for those I would rather leave them as is for now and tackle the issue on #68

You can configure the return type to be not nullable in the Gir.toml for the time being.

Sure, but most of them were like that. I plan to tackle the nullability issue just after getting those two PR merged so it's fine I guess

sdroege · 2022-01-01T11:42:17Z

Sure, but most of them were like that. I plan to tackle the nullability issue just after getting those two PR merged so it's fine I guess

Ok, let's make sure to fix that before the release though.

bilelmoussaoui · 2022-01-01T11:47:20Z

Sure, but most of them were like that. I plan to tackle the nullability issue just after getting those two PR merged so it's fine I guess

Ok, let's make sure to fix that before the release though.

Sure thing

bilelmoussaoui · 2022-01-01T12:13:23Z

Will merge this & rebase the other one once the gir fix lands

bilelmoussaoui added 3 commits December 29, 2021 13:42

gdk: make use of the new fundamental types auto generation

fc1fd08

gdk: drop the manual implementations

e10e793

gsk: use the new fundamentals support in gir

133d375

bilelmoussaoui force-pushed the bilelmoussaoui/fundemantal-types branch 8 times, most recently from 01b4a85 to d6d395e Compare December 29, 2021 15:08

bilelmoussaoui added 2 commits December 29, 2021 16:29

gsk: drop the manual implementations

59b348d

gtk: drop manual implementations

30a1603

bilelmoussaoui force-pushed the bilelmoussaoui/fundemantal-types branch from d6d395e to 0dc3ded Compare December 29, 2021 15:29

bilelmoussaoui added 3 commits December 29, 2021 17:01

gtk: migrate expressions to be automatically generated

6ed9f9c

Except ExpressionWatch as it has it's get_type function exposed as part of the API only in 4.2 which can't be handled automatically until we drop support for 4.0

gsk: automatically implement Renderer functions

55e0bc8

drop more manual functions

b18ce64

bilelmoussaoui force-pushed the bilelmoussaoui/fundemantal-types branch from 0dc3ded to ce907e5 Compare December 29, 2021 16:01

bilelmoussaoui commented Dec 29, 2021

View reviewed changes

bilelmoussaoui mentioned this pull request Dec 29, 2021

auto-generate slice of copy types functions #781

Merged

bilelmoussaoui force-pushed the bilelmoussaoui/fundemantal-types branch from 25cdcca to 331f860 Compare December 30, 2021 17:39

bilelmoussaoui added 2 commits December 30, 2021 18:45

gtk: regen with fixed builder pattern for fundamental types

e64006d

gsk: manually implement get_child functions

012aa6b

And add an assertion that idx < n_children

bilelmoussaoui force-pushed the bilelmoussaoui/fundemantal-types branch from 331f860 to 012aa6b Compare December 30, 2021 17:45