diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:57:00 +0200 |
| commit | a9bafe967a7a664c43dec4aeb64a6f6e0f284e05 (patch) | |
| tree | 653c43a63b70c47278367ad2a4e92640a6669b44 /src/Box.c | |
| parent | 55778740c211992cc86ea87588ab62c6750f36d1 (diff) | |
| parent | ab841afa5cb39058d9ab2cebb67cfe6369443f6e (diff) | |
Update upstream source from tag 'upstream/0.28.3'
Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7
Diffstat (limited to 'src/Box.c')
| -rw-r--r-- | src/Box.c | 1937 |
1 files changed, 918 insertions, 1019 deletions
@@ -1,4 +1,4 @@ -/* Box.c generated by valac 0.36.6, the Vala compiler +/* Box.c generated by valac 0.40.4, the Vala compiler * generated from Box.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -69,54 +70,122 @@ struct _Dimensions { GType box_location_get_type (void) G_GNUC_CONST; GType box_complements_get_type (void) G_GNUC_CONST; -BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement); +BoxComplements box_complements_derive (gboolean horizontal_complement, + gboolean vertical_complement); GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); #define BOX_HAND_GRENADES 12 -void box_init (Box *self, gint left, gint top, gint right, gint bottom); -void box_from_rectangle (GdkRectangle* rect, Box* result); -void box_from_allocation (GtkAllocation* alloc, Box* result); -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result); -void box_from_center (GdkPoint* center, gint width, gint height, Box* result); +void box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom); +void box_from_rectangle (GdkRectangle* rect, + Box* result); +void box_from_allocation (GtkAllocation* alloc, + Box* result); +void box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result); +void box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result); gint box_get_width (Box *self); gint box_get_height (Box *self); gboolean box_is_valid (Box *self); -gboolean box_equals (Box *self, Box* box); -void box_adjust_width (Box *self, gint width); -void box_adjust_height (Box *self, gint height); +gboolean box_equals (Box *self, + Box* box); +void box_adjust_width (Box *self, + gint width); +void box_adjust_height (Box *self, + gint height); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -void box_get_scaled (Box *self, Dimensions* scaled, Box* result); -void box_get_dimensions (Box *self, Dimensions* result); -void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio); -void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result); -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result); -void dimensions_init (Dimensions *self, gint width, gint height); -void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right); -void box_get_rectangle (Box *self, GdkRectangle* result); -void box_get_center (Box *self, GdkPoint* result); -void box_rotate_clockwise (Box *self, Dimensions* space, Box* result); -void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result); -void box_flip_left_to_right (Box *self, Dimensions* space, Box* result); -void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result); -gboolean box_intersects (Box *self, Box* compare); -void box_get_reduced (Box *self, gint amount, Box* result); -void box_get_expanded (Box *self, gint amount, Box* result); -gboolean box_contains (Box *self, GdkPoint* point); -BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged); -BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal_this, Box* vertical_this, Box* horizontal_shifted, Box* vertical_shifted); -void box_rubber_band (Box *self, GdkPoint* point, Box* result); +void box_get_scaled (Box *self, + Dimensions* scaled, + Box* result); +void box_get_dimensions (Box *self, + Dimensions* result); +void dimensions_get_scale_ratios (Dimensions *self, + Dimensions* scaled, + gdouble* width_ratio, + gdouble* height_ratio); +void box_get_scaled_similar (Box *self, + Dimensions* original, + Dimensions* scaled, + Box* result); +void box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void box_get_points (Box *self, + GdkPoint* top_left, + GdkPoint* bottom_right); +void box_get_rectangle (Box *self, + GdkRectangle* result); +void box_get_center (Box *self, + GdkPoint* result); +void box_rotate_clockwise (Box *self, + Dimensions* space, + Box* result); +void box_rotate_counterclockwise (Box *self, + Dimensions* space, + Box* result); +void box_flip_left_to_right (Box *self, + Dimensions* space, + Box* result); +void box_flip_top_to_bottom (Box *self, + Dimensions* space, + Box* result); +gboolean box_intersects (Box *self, + Box* compare); +void box_get_reduced (Box *self, + gint amount, + Box* result); +void box_get_expanded (Box *self, + gint amount, + Box* result); +gboolean box_contains (Box *self, + GdkPoint* point); +BoxComplements box_resized_complements (Box *self, + Box* resized, + Box* horizontal, + gboolean* horizontal_enlarged, + Box* vertical, + gboolean* vertical_enlarged); +BoxComplements box_shifted_complements (Box *self, + Box* shifted, + Box* horizontal_this, + Box* vertical_this, + Box* horizontal_shifted, + Box* vertical_shifted); +void box_rubber_band (Box *self, + GdkPoint* point, + Box* result); gchar* box_to_string (Box *self); gchar* dimensions_to_string (Dimensions *self); -static gboolean box_in_zone (gdouble pos, gint zone); -static gboolean box_in_between (gdouble pos, gint top, gint bottom); -static gboolean box_near_in_between (gdouble pos, gint top, gint bottom); -BoxLocation box_approx_location (Box *self, gint x, gint y); - - -GType box_location_get_type (void) { +static gboolean box_in_zone (gdouble pos, + gint zone); +static gboolean box_in_between (gdouble pos, + gint top, + gint bottom); +static gboolean box_near_in_between (gdouble pos, + gint top, + gint bottom); +BoxLocation box_approx_location (Box *self, + gint x, + gint y); + + +GType +box_location_get_type (void) +{ static volatile gsize box_location_type_id__volatile = 0; if (g_once_init_enter (&box_location_type_id__volatile)) { static const GEnumValue values[] = {{BOX_LOCATION_OUTSIDE, "BOX_LOCATION_OUTSIDE", "outside"}, {BOX_LOCATION_INSIDE, "BOX_LOCATION_INSIDE", "inside"}, {BOX_LOCATION_TOP_SIDE, "BOX_LOCATION_TOP_SIDE", "top-side"}, {BOX_LOCATION_LEFT_SIDE, "BOX_LOCATION_LEFT_SIDE", "left-side"}, {BOX_LOCATION_RIGHT_SIDE, "BOX_LOCATION_RIGHT_SIDE", "right-side"}, {BOX_LOCATION_BOTTOM_SIDE, "BOX_LOCATION_BOTTOM_SIDE", "bottom-side"}, {BOX_LOCATION_TOP_LEFT, "BOX_LOCATION_TOP_LEFT", "top-left"}, {BOX_LOCATION_BOTTOM_LEFT, "BOX_LOCATION_BOTTOM_LEFT", "bottom-left"}, {BOX_LOCATION_TOP_RIGHT, "BOX_LOCATION_TOP_RIGHT", "top-right"}, {BOX_LOCATION_BOTTOM_RIGHT, "BOX_LOCATION_BOTTOM_RIGHT", "bottom-right"}, {0, NULL, NULL}}; @@ -128,25 +197,21 @@ GType box_location_get_type (void) { } -BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean vertical_complement) { +BoxComplements +box_complements_derive (gboolean horizontal_complement, + gboolean vertical_complement) +{ BoxComplements result = 0; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = horizontal_complement; + if (horizontal_complement) { #line 27 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp1_) { -#line 140 "Box.c" - gboolean _tmp2_; -#line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = vertical_complement; -#line 27 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = _tmp2_; -#line 146 "Box.c" + _tmp0_ = vertical_complement; +#line 211 "Box.c" } else { #line 27 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 150 "Box.c" +#line 215 "Box.c" } #line 27 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp0_) { @@ -154,29 +219,23 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean result = BOX_COMPLEMENTS_BOTH; #line 28 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 158 "Box.c" +#line 223 "Box.c" } else { - gboolean _tmp3_; -#line 29 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = horizontal_complement; #line 29 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp3_) { + if (horizontal_complement) { #line 30 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_COMPLEMENTS_HORIZONTAL; #line 30 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 169 "Box.c" +#line 231 "Box.c" } else { - gboolean _tmp4_; #line 31 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = vertical_complement; -#line 31 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_) { + if (vertical_complement) { #line 32 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_COMPLEMENTS_VERTICAL; #line 32 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 180 "Box.c" +#line 239 "Box.c" } } } @@ -184,11 +243,13 @@ BoxComplements box_complements_derive (gboolean horizontal_complement, gboolean result = BOX_COMPLEMENTS_NONE; #line 34 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 188 "Box.c" +#line 247 "Box.c" } -GType box_complements_get_type (void) { +GType +box_complements_get_type (void) +{ static volatile gsize box_complements_type_id__volatile = 0; if (g_once_init_enter (&box_complements_type_id__volatile)) { static const GEnumValue values[] = {{BOX_COMPLEMENTS_NONE, "BOX_COMPLEMENTS_NONE", "none"}, {BOX_COMPLEMENTS_VERTICAL, "BOX_COMPLEMENTS_VERTICAL", "vertical"}, {BOX_COMPLEMENTS_HORIZONTAL, "BOX_COMPLEMENTS_HORIZONTAL", "horizontal"}, {BOX_COMPLEMENTS_BOTH, "BOX_COMPLEMENTS_BOTH", "both"}, {0, NULL, NULL}}; @@ -200,82 +261,47 @@ GType box_complements_get_type (void) { } -void box_init (Box *self, gint left, gint top, gint right, gint bottom) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp7_; - gint _tmp8_; - gint _tmp10_; - gint _tmp11_; - gint _tmp12_; - gint _tmp13_; +void +box_init (Box *self, + gint left, + gint top, + gint right, + gint bottom) +{ #line 46 "/home/jens/Source/shotwell/src/Box.vala" memset (self, 0, sizeof (Box)); #line 48 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = left; -#line 48 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = CLAMP (_tmp0_, 0, G_MAXINT); -#line 48 "/home/jens/Source/shotwell/src/Box.vala" - left = _tmp1_; -#line 49 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = top; + left = CLAMP (left, 0, G_MAXINT); #line 49 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = CLAMP (_tmp2_, 0, G_MAXINT); -#line 49 "/home/jens/Source/shotwell/src/Box.vala" - top = _tmp3_; -#line 53 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = right; -#line 53 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = left; + top = CLAMP (top, 0, G_MAXINT); #line 53 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_ <= _tmp5_) { -#line 237 "Box.c" - gint _tmp6_; -#line 54 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = left; + if (right <= left) { #line 54 "/home/jens/Source/shotwell/src/Box.vala" - right = _tmp6_ + 1; -#line 243 "Box.c" + right = left + 1; +#line 282 "Box.c" } #line 56 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = bottom; -#line 56 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = top; -#line 56 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp7_ <= _tmp8_) { -#line 251 "Box.c" - gint _tmp9_; -#line 57 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = top; + if (bottom <= top) { #line 57 "/home/jens/Source/shotwell/src/Box.vala" - bottom = _tmp9_ + 1; -#line 257 "Box.c" + bottom = top + 1; +#line 288 "Box.c" } #line 59 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = left; -#line 59 "/home/jens/Source/shotwell/src/Box.vala" - (*self).left = _tmp10_; + (*self).left = left; #line 60 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = top; -#line 60 "/home/jens/Source/shotwell/src/Box.vala" - (*self).top = _tmp11_; -#line 61 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = right; + (*self).top = top; #line 61 "/home/jens/Source/shotwell/src/Box.vala" - (*self).right = _tmp12_; -#line 62 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = bottom; + (*self).right = right; #line 62 "/home/jens/Source/shotwell/src/Box.vala" - (*self).bottom = _tmp13_; -#line 275 "Box.c" + (*self).bottom = bottom; +#line 298 "Box.c" } -void box_from_rectangle (GdkRectangle* rect, Box* result) { +void +box_from_rectangle (GdkRectangle* rect, + Box* result) +{ GdkRectangle _tmp0_; gint _tmp1_; GdkRectangle _tmp2_; @@ -321,11 +347,14 @@ void box_from_rectangle (GdkRectangle* rect, Box* result) { *result = _tmp12_; #line 66 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 325 "Box.c" +#line 351 "Box.c" } -void box_from_allocation (GtkAllocation* alloc, Box* result) { +void +box_from_allocation (GtkAllocation* alloc, + Box* result) +{ GtkAllocation _tmp0_; gint _tmp1_; GtkAllocation _tmp2_; @@ -371,32 +400,32 @@ void box_from_allocation (GtkAllocation* alloc, Box* result) { *result = _tmp12_; #line 70 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 375 "Box.c" +#line 404 "Box.c" } -void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) { +void +box_from_points (GdkPoint* corner1, + GdkPoint* corner2, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; GdkPoint _tmp2_; gint _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_; - gint _tmp6_; - GdkPoint _tmp7_; - gint _tmp8_; + GdkPoint _tmp4_; + gint _tmp5_; + GdkPoint _tmp6_; + gint _tmp7_; + GdkPoint _tmp8_; gint _tmp9_; GdkPoint _tmp10_; gint _tmp11_; GdkPoint _tmp12_; gint _tmp13_; - gint _tmp14_; - GdkPoint _tmp15_; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + GdkPoint _tmp14_; + gint _tmp15_; + Box _tmp16_ = {0}; #line 75 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (corner1 != NULL); #line 75 "/home/jens/Source/shotwell/src/Box.vala" @@ -410,61 +439,54 @@ void box_from_points (GdkPoint* corner1, GdkPoint* corner2, Box* result) { #line 76 "/home/jens/Source/shotwell/src/Box.vala" _tmp3_ = _tmp2_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = MIN (_tmp1_, _tmp3_); + _tmp4_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *corner1; + _tmp5_ = _tmp4_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.y; + _tmp6_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = *corner2; + _tmp7_ = _tmp6_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = _tmp7_.y; + _tmp8_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = MIN (_tmp6_, _tmp8_); + _tmp9_ = _tmp8_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = *corner1; + _tmp10_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" _tmp11_ = _tmp10_.x; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = *corner2; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = _tmp12_.x; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = MAX (_tmp11_, _tmp13_); -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = *corner1; -#line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = _tmp15_.y; + _tmp12_ = *corner1; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = *corner2; + _tmp13_ = _tmp12_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = _tmp17_.y; + _tmp14_ = *corner2; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = MAX (_tmp16_, _tmp18_); + _tmp15_ = _tmp14_.y; #line 76 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp20_, _tmp4_, _tmp9_, _tmp14_, _tmp19_); + box_init (&_tmp16_, MIN (_tmp1_, _tmp3_), MIN (_tmp5_, _tmp7_), MAX (_tmp9_, _tmp11_), MAX (_tmp13_, _tmp15_)); #line 76 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp20_; + *result = _tmp16_; #line 76 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 451 "Box.c" +#line 472 "Box.c" } -void box_from_center (GdkPoint* center, gint width, gint height, Box* result) { +void +box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; - gint _tmp2_; - GdkPoint _tmp3_; - gint _tmp4_; + GdkPoint _tmp2_; + gint _tmp3_; + GdkPoint _tmp4_; gint _tmp5_; GdkPoint _tmp6_; gint _tmp7_; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - gint _tmp11_; - Box _tmp12_ = {0}; + Box _tmp8_ = {0}; #line 80 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (center != NULL); #line 81 "/home/jens/Source/shotwell/src/Box.vala" @@ -472,36 +494,30 @@ void box_from_center (GdkPoint* center, gint width, gint height, Box* result) { #line 81 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp0_.x; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = width; + _tmp2_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = *center; + _tmp3_ = _tmp2_.y; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = _tmp3_.y; + _tmp4_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = height; + _tmp5_ = _tmp4_.x; #line 81 "/home/jens/Source/shotwell/src/Box.vala" _tmp6_ = *center; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = _tmp6_.x; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = width; + _tmp7_ = _tmp6_.y; #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *center; + box_init (&_tmp8_, _tmp1_ - (width / 2), _tmp3_ - (height / 2), _tmp5_ + (width / 2), _tmp7_ + (height / 2)); #line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.y; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = height; -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp12_, _tmp1_ - (_tmp2_ / 2), _tmp4_ - (_tmp5_ / 2), _tmp7_ + (_tmp8_ / 2), _tmp10_ + (_tmp11_ / 2)); -#line 81 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp12_; + *result = _tmp8_; #line 81 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 501 "Box.c" +#line 515 "Box.c" } -gint box_get_width (Box *self) { +gint +box_get_width (Box *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; @@ -521,11 +537,13 @@ gint box_get_width (Box *self) { result = (_tmp2_ - _tmp3_) + 1; #line 88 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 525 "Box.c" +#line 541 "Box.c" } -gint box_get_height (Box *self) { +gint +box_get_height (Box *self) +{ gint result = 0; gint _tmp0_; gint _tmp1_; @@ -545,11 +563,13 @@ gint box_get_height (Box *self) { result = (_tmp2_ - _tmp3_) + 1; #line 94 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 549 "Box.c" +#line 567 "Box.c" } -gboolean box_is_valid (Box *self) { +gboolean +box_is_valid (Box *self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -559,21 +579,21 @@ gboolean box_is_valid (Box *self) { _tmp3_ = (*self).left; #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp3_ >= 0) { -#line 563 "Box.c" +#line 583 "Box.c" gint _tmp4_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp4_ = (*self).top; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp4_ >= 0; -#line 569 "Box.c" +#line 589 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 573 "Box.c" +#line 593 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 577 "Box.c" +#line 597 "Box.c" gint _tmp5_; gint _tmp6_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" @@ -582,15 +602,15 @@ gboolean box_is_valid (Box *self) { _tmp6_ = (*self).left; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp5_ >= _tmp6_; -#line 586 "Box.c" +#line 606 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 590 "Box.c" +#line 610 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 594 "Box.c" +#line 614 "Box.c" gint _tmp7_; gint _tmp8_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" @@ -599,21 +619,24 @@ gboolean box_is_valid (Box *self) { _tmp8_ = (*self).top; #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp7_ >= _tmp8_; -#line 603 "Box.c" +#line 623 "Box.c" } else { #line 98 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 607 "Box.c" +#line 627 "Box.c" } #line 98 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 98 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 613 "Box.c" +#line 633 "Box.c" } -gboolean box_equals (Box *self, Box* box) { +gboolean +box_equals (Box *self, + Box* box) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -631,7 +654,7 @@ gboolean box_equals (Box *self, Box* box) { _tmp5_ = _tmp4_.left; #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp3_ == _tmp5_) { -#line 635 "Box.c" +#line 658 "Box.c" gint _tmp6_; Box _tmp7_; gint _tmp8_; @@ -643,15 +666,15 @@ gboolean box_equals (Box *self, Box* box) { _tmp8_ = _tmp7_.top; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp6_ == _tmp8_; -#line 647 "Box.c" +#line 670 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 651 "Box.c" +#line 674 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 655 "Box.c" +#line 678 "Box.c" gint _tmp9_; Box _tmp10_; gint _tmp11_; @@ -663,15 +686,15 @@ gboolean box_equals (Box *self, Box* box) { _tmp11_ = _tmp10_.right; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp9_ == _tmp11_; -#line 667 "Box.c" +#line 690 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 671 "Box.c" +#line 694 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 675 "Box.c" +#line 698 "Box.c" gint _tmp12_; Box _tmp13_; gint _tmp14_; @@ -683,26 +706,27 @@ gboolean box_equals (Box *self, Box* box) { _tmp14_ = _tmp13_.bottom; #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp12_ == _tmp14_; -#line 687 "Box.c" +#line 710 "Box.c" } else { #line 102 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 691 "Box.c" +#line 714 "Box.c" } #line 102 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 102 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 697 "Box.c" +#line 720 "Box.c" } -void box_adjust_width (Box *self, gint width) { +void +box_adjust_width (Box *self, + gint width) +{ gint center_x = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 107 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 107 "/home/jens/Source/shotwell/src/Box.vala" @@ -710,23 +734,20 @@ void box_adjust_width (Box *self, gint width) { #line 107 "/home/jens/Source/shotwell/src/Box.vala" center_x = (_tmp0_ + _tmp1_) / 2; #line 108 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = width; -#line 108 "/home/jens/Source/shotwell/src/Box.vala" - (*self).left = center_x - (_tmp2_ / 2); -#line 109 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = width; + (*self).left = center_x - (width / 2); #line 109 "/home/jens/Source/shotwell/src/Box.vala" - (*self).right = center_x + (_tmp3_ / 2); -#line 721 "Box.c" + (*self).right = center_x + (width / 2); +#line 741 "Box.c" } -void box_adjust_height (Box *self, gint height) { +void +box_adjust_height (Box *self, + gint height) +{ gint center_y = 0; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 114 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).top; #line 114 "/home/jens/Source/shotwell/src/Box.vala" @@ -734,18 +755,18 @@ void box_adjust_height (Box *self, gint height) { #line 114 "/home/jens/Source/shotwell/src/Box.vala" center_y = (_tmp0_ + _tmp1_) / 2; #line 115 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = height; -#line 115 "/home/jens/Source/shotwell/src/Box.vala" - (*self).top = center_y - (_tmp2_ / 2); -#line 116 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = height; + (*self).top = center_y - (height / 2); #line 116 "/home/jens/Source/shotwell/src/Box.vala" - (*self).bottom = center_y + (_tmp3_ / 2); -#line 745 "Box.c" + (*self).bottom = center_y + (height / 2); +#line 762 "Box.c" } -void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { +void +box_get_scaled (Box *self, + Dimensions* scaled, + Box* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_ = {0}; @@ -755,28 +776,25 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { gint l = 0; gint _tmp4_; gdouble _tmp5_; - gdouble _tmp6_; gint t = 0; - gint _tmp7_; - gdouble _tmp8_; - gdouble _tmp9_; + gint _tmp6_; + gdouble _tmp7_; gint r = 0; + gint _tmp8_; + Dimensions _tmp9_; gint _tmp10_; - Dimensions _tmp11_; - gint _tmp12_; gint b = 0; + gint _tmp11_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; - gint _tmp15_; Box box = {0}; + gint _tmp14_; + gint _tmp15_; gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gboolean _tmp20_ = FALSE; - gint _tmp21_; - Dimensions _tmp22_; - gint _tmp23_; + gboolean _tmp18_ = FALSE; + Dimensions _tmp19_; + gint _tmp20_; #line 119 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (scaled != NULL); #line 121 "/home/jens/Source/shotwell/src/Box.vala" @@ -794,79 +812,75 @@ void box_get_scaled (Box *self, Dimensions* scaled, Box* result) { #line 123 "/home/jens/Source/shotwell/src/Box.vala" _tmp5_ = x_scale; #line 123 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = round (((gdouble) _tmp4_) * _tmp5_); -#line 123 "/home/jens/Source/shotwell/src/Box.vala" - l = (gint) _tmp6_; -#line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = (*self).top; + l = (gint) round (((gdouble) _tmp4_) * _tmp5_); #line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = y_scale; + _tmp6_ = (*self).top; #line 124 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = round (((gdouble) _tmp7_) * _tmp8_); + _tmp7_ = y_scale; #line 124 "/home/jens/Source/shotwell/src/Box.vala" - t = (gint) _tmp9_; + t = (gint) round (((gdouble) _tmp6_) * _tmp7_); #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = l; + _tmp8_ = l; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = *scaled; + _tmp9_ = *scaled; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = _tmp11_.width; + _tmp10_ = _tmp9_.width; #line 127 "/home/jens/Source/shotwell/src/Box.vala" - r = (_tmp10_ + _tmp12_) - 1; + r = (_tmp8_ + _tmp10_) - 1; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = t; + _tmp11_ = t; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = *scaled; + _tmp12_ = *scaled; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = _tmp14_.height; + _tmp13_ = _tmp12_.height; #line 128 "/home/jens/Source/shotwell/src/Box.vala" - b = (_tmp13_ + _tmp15_) - 1; + b = (_tmp11_ + _tmp13_) - 1; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = l; + _tmp14_ = l; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = t; + _tmp15_ = t; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = r; + _tmp16_ = r; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = b; + _tmp17_ = b; #line 130 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&box, _tmp16_, _tmp17_, _tmp18_, _tmp19_); -#line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = box_get_width (&box); + box_init (&box, _tmp14_, _tmp15_, _tmp16_, _tmp17_); #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = *scaled; + _tmp19_ = *scaled; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = _tmp22_.width; + _tmp20_ = _tmp19_.width; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp21_ == _tmp23_) { + if (box_get_width (&box) == _tmp20_) { #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = TRUE; -#line 845 "Box.c" + _tmp18_ = TRUE; +#line 857 "Box.c" } else { - gint _tmp24_; - Dimensions _tmp25_; - gint _tmp26_; -#line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = box_get_height (&box); + Dimensions _tmp21_; + gint _tmp22_; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = *scaled; + _tmp21_ = *scaled; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = _tmp25_.height; + _tmp22_ = _tmp21_.height; #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = _tmp24_ == _tmp26_; -#line 858 "Box.c" + _tmp18_ = box_get_height (&box) == _tmp22_; +#line 867 "Box.c" } #line 131 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp20_, "box.get_width() == scaled.width || box.get_height() == scaled.height"); + _vala_assert (_tmp18_, "box.get_width() == scaled.width || box.get_height() == scaled.height"); #line 133 "/home/jens/Source/shotwell/src/Box.vala" *result = box; #line 133 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 866 "Box.c" +#line 875 "Box.c" } -void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result) { +void +box_get_scaled_similar (Box *self, + Dimensions* original, + Dimensions* scaled, + Box* result) +{ gdouble x_scale = 0.0; gdouble y_scale = 0.0; Dimensions _tmp0_; @@ -875,30 +889,26 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled gint l = 0; gint _tmp3_; gdouble _tmp4_; - gdouble _tmp5_; gint t = 0; - gint _tmp6_; - gdouble _tmp7_; - gdouble _tmp8_; + gint _tmp5_; + gdouble _tmp6_; gint r = 0; + gint _tmp7_; + gdouble _tmp8_; + gint b = 0; gint _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; - gint b = 0; - gint _tmp12_; - gdouble _tmp13_; - gdouble _tmp14_; - gint _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; - gint _tmp20_; - Dimensions _tmp21_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; + gint _tmp21_; gint _tmp22_; - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; - Box _tmp29_ = {0}; + gint _tmp23_; + gint _tmp24_; + Box _tmp25_ = {0}; #line 136 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (original != NULL); #line 136 "/home/jens/Source/shotwell/src/Box.vala" @@ -916,144 +926,130 @@ void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled #line 140 "/home/jens/Source/shotwell/src/Box.vala" _tmp4_ = x_scale; #line 140 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = round (((gdouble) _tmp3_) * _tmp4_); -#line 140 "/home/jens/Source/shotwell/src/Box.vala" - l = (gint) _tmp5_; + l = (gint) round (((gdouble) _tmp3_) * _tmp4_); #line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).top; -#line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = y_scale; + _tmp5_ = (*self).top; #line 141 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = round (((gdouble) _tmp6_) * _tmp7_); + _tmp6_ = y_scale; #line 141 "/home/jens/Source/shotwell/src/Box.vala" - t = (gint) _tmp8_; -#line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = (*self).right; + t = (gint) round (((gdouble) _tmp5_) * _tmp6_); #line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = x_scale; + _tmp7_ = (*self).right; #line 142 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = round (((gdouble) _tmp9_) * _tmp10_); + _tmp8_ = x_scale; #line 142 "/home/jens/Source/shotwell/src/Box.vala" - r = (gint) _tmp11_; + r = (gint) round (((gdouble) _tmp7_) * _tmp8_); #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).bottom; + _tmp9_ = (*self).bottom; #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = y_scale; + _tmp10_ = y_scale; #line 143 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = round (((gdouble) _tmp12_) * _tmp13_); -#line 143 "/home/jens/Source/shotwell/src/Box.vala" - b = (gint) _tmp14_; + b = (gint) round (((gdouble) _tmp9_) * _tmp10_); #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = r; + _tmp11_ = r; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = *scaled; + _tmp12_ = *scaled; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = _tmp16_.width; + _tmp13_ = _tmp12_.width; #line 146 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp15_ >= _tmp17_) { -#line 955 "Box.c" - Dimensions _tmp18_; - gint _tmp19_; + if (_tmp11_ >= _tmp13_) { +#line 957 "Box.c" + Dimensions _tmp14_; + gint _tmp15_; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = *scaled; + _tmp14_ = *scaled; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp18_.width; + _tmp15_ = _tmp14_.width; #line 147 "/home/jens/Source/shotwell/src/Box.vala" - r = _tmp19_ - 1; -#line 964 "Box.c" + r = _tmp15_ - 1; +#line 966 "Box.c" } #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = b; + _tmp16_ = b; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = *scaled; + _tmp17_ = *scaled; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = _tmp21_.height; + _tmp18_ = _tmp17_.height; #line 149 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp20_ >= _tmp22_) { -#line 974 "Box.c" - Dimensions _tmp23_; - gint _tmp24_; + if (_tmp16_ >= _tmp18_) { +#line 976 "Box.c" + Dimensions _tmp19_; + gint _tmp20_; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = *scaled; + _tmp19_ = *scaled; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = _tmp23_.height; + _tmp20_ = _tmp19_.height; #line 150 "/home/jens/Source/shotwell/src/Box.vala" - b = _tmp24_ - 1; -#line 983 "Box.c" + b = _tmp20_ - 1; +#line 985 "Box.c" } #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = l; + _tmp21_ = l; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = t; + _tmp22_ = t; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = r; + _tmp23_ = r; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = b; + _tmp24_ = b; #line 152 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp29_, _tmp25_, _tmp26_, _tmp27_, _tmp28_); + box_init (&_tmp25_, _tmp21_, _tmp22_, _tmp23_, _tmp24_); #line 152 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp29_; + *result = _tmp25_; #line 152 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 999 "Box.c" +#line 1001 "Box.c" } -void box_get_offset (Box *self, gint xofs, gint yofs, Box* result) { +void +box_get_offset (Box *self, + gint xofs, + gint yofs, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 156 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = xofs; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = yofs; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = xofs; + _tmp1_ = (*self).top; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = yofs; + _tmp3_ = (*self).bottom; #line 156 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ + _tmp1_, _tmp2_ + _tmp3_, _tmp4_ + _tmp5_, _tmp6_ + _tmp7_); + box_init (&_tmp4_, _tmp0_ + xofs, _tmp1_ + yofs, _tmp2_ + xofs, _tmp3_ + yofs); #line 156 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 156 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1035 "Box.c" +#line 1030 "Box.c" } -void box_get_dimensions (Box *self, Dimensions* result) { - gint _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; -#line 160 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = box_get_width (&(*self)); -#line 160 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = box_get_height (&(*self)); +void +box_get_dimensions (Box *self, + Dimensions* result) +{ + Dimensions _tmp0_ = {0}; #line 160 "/home/jens/Source/shotwell/src/Box.vala" - dimensions_init (&_tmp2_, _tmp0_, _tmp1_); + dimensions_init (&_tmp0_, box_get_width (&(*self)), box_get_height (&(*self))); #line 160 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp2_; + *result = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1053 "Box.c" +#line 1045 "Box.c" } -void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) { +void +box_get_points (Box *self, + GdkPoint* top_left, + GdkPoint* bottom_right) +{ GdkPoint _vala_top_left = {0}; GdkPoint _vala_bottom_right = {0}; gint _tmp0_; @@ -1086,23 +1082,24 @@ void box_get_points (Box *self, GdkPoint* top_left, GdkPoint* bottom_right) { if (top_left) { #line 163 "/home/jens/Source/shotwell/src/Box.vala" *top_left = _vala_top_left; -#line 1090 "Box.c" +#line 1086 "Box.c" } #line 163 "/home/jens/Source/shotwell/src/Box.vala" if (bottom_right) { #line 163 "/home/jens/Source/shotwell/src/Box.vala" *bottom_right = _vala_bottom_right; -#line 1096 "Box.c" +#line 1092 "Box.c" } } -void box_get_rectangle (Box *self, GdkRectangle* result) { +void +box_get_rectangle (Box *self, + GdkRectangle* result) +{ GdkRectangle rect = {0}; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint _tmp3_; #line 169 "/home/jens/Source/shotwell/src/Box.vala" memset (&rect, 0, sizeof (GdkRectangle)); #line 170 "/home/jens/Source/shotwell/src/Box.vala" @@ -1114,22 +1111,21 @@ void box_get_rectangle (Box *self, GdkRectangle* result) { #line 171 "/home/jens/Source/shotwell/src/Box.vala" rect.y = _tmp1_; #line 172 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = box_get_width (&(*self)); -#line 172 "/home/jens/Source/shotwell/src/Box.vala" - rect.width = _tmp2_; + rect.width = box_get_width (&(*self)); #line 173 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_get_height (&(*self)); -#line 173 "/home/jens/Source/shotwell/src/Box.vala" - rect.height = _tmp3_; + rect.height = box_get_height (&(*self)); #line 175 "/home/jens/Source/shotwell/src/Box.vala" *result = rect; #line 175 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1129 "Box.c" +#line 1122 "Box.c" } -void box_get_center (Box *self, GdkPoint* result) { +void +box_get_center (Box *self, + GdkPoint* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1151,11 +1147,15 @@ void box_get_center (Box *self, GdkPoint* result) { *result = _tmp4_; #line 179 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1155 "Box.c" +#line 1151 "Box.c" } -void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) { +void +box_rotate_clockwise (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1205,7 +1205,11 @@ void box_rotate_clockwise (Box *self, Dimensions* space, Box* result) { } -void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) { +void +box_rotate_counterclockwise (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; gint _tmp0_; gint t = 0; @@ -1251,11 +1255,15 @@ void box_rotate_counterclockwise (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 197 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1255 "Box.c" +#line 1259 "Box.c" } -void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) { +void +box_flip_left_to_right (Box *self, + Dimensions* space, + Box* result) +{ gint l = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1295,11 +1303,15 @@ void box_flip_left_to_right (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 204 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1299 "Box.c" +#line 1307 "Box.c" } -void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) { +void +box_flip_top_to_bottom (Box *self, + Dimensions* space, + Box* result) +{ gint t = 0; Dimensions _tmp0_; gint _tmp1_; @@ -1339,35 +1351,34 @@ void box_flip_top_to_bottom (Box *self, Dimensions* space, Box* result) { *result = _tmp8_; #line 211 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1343 "Box.c" +#line 1355 "Box.c" } -gboolean box_intersects (Box *self, Box* compare) { +gboolean +box_intersects (Box *self, + Box* compare) +{ gboolean result = FALSE; gint left_intersect = 0; gint _tmp0_; Box _tmp1_; gint _tmp2_; - gint _tmp3_; gint top_intersect = 0; - gint _tmp4_; - Box _tmp5_; - gint _tmp6_; - gint _tmp7_; + gint _tmp3_; + Box _tmp4_; + gint _tmp5_; gint right_intersect = 0; + gint _tmp6_; + Box _tmp7_; gint _tmp8_; - Box _tmp9_; - gint _tmp10_; - gint _tmp11_; gint bottom_intersect = 0; - gint _tmp12_; - Box _tmp13_; + gint _tmp9_; + Box _tmp10_; + gint _tmp11_; + gboolean _tmp12_ = FALSE; + gint _tmp13_; gint _tmp14_; - gint _tmp15_; - gboolean _tmp16_ = FALSE; - gint _tmp17_; - gint _tmp18_; #line 214 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (compare != NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/Box.vala" @@ -1377,141 +1388,120 @@ gboolean box_intersects (Box *self, Box* compare) { #line 215 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp1_.left; #line 215 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = MAX (_tmp0_, _tmp2_); -#line 215 "/home/jens/Source/shotwell/src/Box.vala" - left_intersect = _tmp3_; + left_intersect = MAX (_tmp0_, _tmp2_); #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).top; -#line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *compare; + _tmp3_ = (*self).top; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.top; + _tmp4_ = *compare; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = MAX (_tmp4_, _tmp6_); + _tmp5_ = _tmp4_.top; #line 216 "/home/jens/Source/shotwell/src/Box.vala" - top_intersect = _tmp7_; -#line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = (*self).right; + top_intersect = MAX (_tmp3_, _tmp5_); #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *compare; + _tmp6_ = (*self).right; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.right; + _tmp7_ = *compare; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = MIN (_tmp8_, _tmp10_); + _tmp8_ = _tmp7_.right; #line 217 "/home/jens/Source/shotwell/src/Box.vala" - right_intersect = _tmp11_; + right_intersect = MIN (_tmp6_, _tmp8_); #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).bottom; + _tmp9_ = (*self).bottom; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = *compare; + _tmp10_ = *compare; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = _tmp13_.bottom; + _tmp11_ = _tmp10_.bottom; #line 218 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = MIN (_tmp12_, _tmp14_); -#line 218 "/home/jens/Source/shotwell/src/Box.vala" - bottom_intersect = _tmp15_; + bottom_intersect = MIN (_tmp9_, _tmp11_); #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = right_intersect; + _tmp13_ = right_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = left_intersect; + _tmp14_ = left_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp17_ >= _tmp18_) { -#line 1420 "Box.c" - gint _tmp19_; - gint _tmp20_; + if (_tmp13_ >= _tmp14_) { +#line 1423 "Box.c" + gint _tmp15_; + gint _tmp16_; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = bottom_intersect; + _tmp15_ = bottom_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = top_intersect; + _tmp16_ = top_intersect; #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = _tmp19_ >= _tmp20_; -#line 1429 "Box.c" + _tmp12_ = _tmp15_ >= _tmp16_; +#line 1432 "Box.c" } else { #line 220 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = FALSE; -#line 1433 "Box.c" + _tmp12_ = FALSE; +#line 1436 "Box.c" } #line 220 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp16_; + result = _tmp12_; #line 220 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1439 "Box.c" +#line 1442 "Box.c" } -void box_get_reduced (Box *self, gint amount, Box* result) { +void +box_get_reduced (Box *self, + gint amount, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 224 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = amount; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = amount; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = amount; + _tmp1_ = (*self).top; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = amount; + _tmp3_ = (*self).bottom; #line 224 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ + _tmp1_, _tmp2_ + _tmp3_, _tmp4_ - _tmp5_, _tmp6_ - _tmp7_); + box_init (&_tmp4_, _tmp0_ + amount, _tmp1_ + amount, _tmp2_ - amount, _tmp3_ - amount); #line 224 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 224 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1475 "Box.c" +#line 1470 "Box.c" } -void box_get_expanded (Box *self, gint amount, Box* result) { +void +box_get_expanded (Box *self, + gint amount, + Box* result) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - Box _tmp8_ = {0}; + Box _tmp4_ = {0}; #line 228 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = (*self).left; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = amount; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).top; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = amount; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = (*self).right; -#line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = amount; + _tmp1_ = (*self).top; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).right; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = amount; + _tmp3_ = (*self).bottom; #line 228 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp8_, _tmp0_ - _tmp1_, _tmp2_ - _tmp3_, _tmp4_ + _tmp5_, _tmp6_ + _tmp7_); + box_init (&_tmp4_, _tmp0_ - amount, _tmp1_ - amount, _tmp2_ + amount, _tmp3_ + amount); #line 228 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp8_; + *result = _tmp4_; #line 228 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 1511 "Box.c" +#line 1498 "Box.c" } -gboolean box_contains (Box *self, GdkPoint* point) { +gboolean +box_contains (Box *self, + GdkPoint* point) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; @@ -1529,7 +1519,7 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp5_ = (*self).left; #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp4_ >= _tmp5_) { -#line 1533 "Box.c" +#line 1523 "Box.c" GdkPoint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -1541,15 +1531,15 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp8_ = (*self).right; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = _tmp7_ <= _tmp8_; -#line 1545 "Box.c" +#line 1535 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp2_ = FALSE; -#line 1549 "Box.c" +#line 1539 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp2_) { -#line 1553 "Box.c" +#line 1543 "Box.c" GdkPoint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -1561,15 +1551,15 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp11_ = (*self).top; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = _tmp10_ >= _tmp11_; -#line 1565 "Box.c" +#line 1555 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp1_ = FALSE; -#line 1569 "Box.c" +#line 1559 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_) { -#line 1573 "Box.c" +#line 1563 "Box.c" GdkPoint _tmp12_; gint _tmp13_; gint _tmp14_; @@ -1581,21 +1571,28 @@ gboolean box_contains (Box *self, GdkPoint* point) { _tmp14_ = (*self).bottom; #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = _tmp13_ <= _tmp14_; -#line 1585 "Box.c" +#line 1575 "Box.c" } else { #line 232 "/home/jens/Source/shotwell/src/Box.vala" _tmp0_ = FALSE; -#line 1589 "Box.c" +#line 1579 "Box.c" } #line 232 "/home/jens/Source/shotwell/src/Box.vala" result = _tmp0_; #line 232 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1595 "Box.c" +#line 1585 "Box.c" } -BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged) { +BoxComplements +box_resized_complements (Box *self, + Box* resized, + Box* horizontal, + gboolean* horizontal_enlarged, + Box* vertical, + gboolean* vertical_enlarged) +{ Box _vala_horizontal = {0}; gboolean _vala_horizontal_enlarged = FALSE; Box _vala_vertical = {0}; @@ -1611,7 +1608,6 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal gint _tmp38_; gboolean _tmp72_; gboolean _tmp73_; - BoxComplements _tmp74_; #line 238 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (resized != NULL, 0); #line 241 "/home/jens/Source/shotwell/src/Box.vala" @@ -1624,7 +1620,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp2_ = (*self).top; #line 242 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp1_ < _tmp2_) { -#line 1628 "Box.c" +#line 1624 "Box.c" Box _tmp3_; gint _tmp4_; Box _tmp5_; @@ -1650,7 +1646,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp4_, _tmp6_, _tmp8_, _tmp9_); #line 245 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = TRUE; -#line 1654 "Box.c" +#line 1650 "Box.c" } else { Box _tmp10_; gint _tmp11_; @@ -1663,7 +1659,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp12_ = (*self).top; #line 246 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp11_ > _tmp12_) { -#line 1667 "Box.c" +#line 1663 "Box.c" gint _tmp13_; gint _tmp14_; gint _tmp15_; @@ -1683,7 +1679,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp13_, _tmp14_, _tmp15_, _tmp17_); #line 249 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = FALSE; -#line 1687 "Box.c" +#line 1683 "Box.c" } else { Box _tmp18_; gint _tmp19_; @@ -1696,7 +1692,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp20_ = (*self).bottom; #line 250 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp19_ < _tmp20_) { -#line 1700 "Box.c" +#line 1696 "Box.c" gint _tmp21_; Box _tmp22_; gint _tmp23_; @@ -1716,7 +1712,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp21_, _tmp23_, _tmp24_, _tmp25_); #line 253 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = FALSE; -#line 1720 "Box.c" +#line 1716 "Box.c" } else { Box _tmp26_; gint _tmp27_; @@ -1729,7 +1725,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp28_ = (*self).bottom; #line 254 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp27_ > _tmp28_) { -#line 1733 "Box.c" +#line 1729 "Box.c" Box _tmp29_; gint _tmp30_; gint _tmp31_; @@ -1755,7 +1751,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_horizontal, _tmp30_, _tmp31_, _tmp33_, _tmp35_); #line 257 "/home/jens/Source/shotwell/src/Box.vala" _vala_horizontal_enlarged = TRUE; -#line 1759 "Box.c" +#line 1755 "Box.c" } else { #line 259 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_horizontal, 0, 0, 0, 0); @@ -1763,7 +1759,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _vala_horizontal_enlarged = FALSE; #line 261 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = FALSE; -#line 1767 "Box.c" +#line 1763 "Box.c" } } } @@ -1778,7 +1774,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp38_ = (*self).left; #line 265 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp37_ < _tmp38_) { -#line 1782 "Box.c" +#line 1778 "Box.c" Box _tmp39_; gint _tmp40_; Box _tmp41_; @@ -1804,7 +1800,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp40_, _tmp42_, _tmp43_, _tmp45_); #line 268 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = TRUE; -#line 1808 "Box.c" +#line 1804 "Box.c" } else { Box _tmp46_; gint _tmp47_; @@ -1817,7 +1813,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp48_ = (*self).left; #line 269 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp47_ > _tmp48_) { -#line 1821 "Box.c" +#line 1817 "Box.c" gint _tmp49_; gint _tmp50_; Box _tmp51_; @@ -1837,7 +1833,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp49_, _tmp50_, _tmp52_, _tmp53_); #line 272 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = FALSE; -#line 1841 "Box.c" +#line 1837 "Box.c" } else { Box _tmp54_; gint _tmp55_; @@ -1850,7 +1846,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp56_ = (*self).right; #line 273 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp55_ < _tmp56_) { -#line 1854 "Box.c" +#line 1850 "Box.c" Box _tmp57_; gint _tmp58_; gint _tmp59_; @@ -1870,7 +1866,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp58_, _tmp59_, _tmp60_, _tmp61_); #line 276 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = FALSE; -#line 1874 "Box.c" +#line 1870 "Box.c" } else { Box _tmp62_; gint _tmp63_; @@ -1883,7 +1879,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _tmp64_ = (*self).right; #line 277 "/home/jens/Source/shotwell/src/Box.vala" if (_tmp63_ > _tmp64_) { -#line 1887 "Box.c" +#line 1883 "Box.c" gint _tmp65_; Box _tmp66_; gint _tmp67_; @@ -1909,7 +1905,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal box_init (&_vala_vertical, _tmp65_, _tmp67_, _tmp69_, _tmp71_); #line 280 "/home/jens/Source/shotwell/src/Box.vala" _vala_vertical_enlarged = TRUE; -#line 1913 "Box.c" +#line 1909 "Box.c" } else { #line 282 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_vertical, 0, 0, 0, 0); @@ -1917,7 +1913,7 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal _vala_vertical_enlarged = FALSE; #line 284 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = FALSE; -#line 1921 "Box.c" +#line 1917 "Box.c" } } } @@ -1927,223 +1923,215 @@ BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal #line 287 "/home/jens/Source/shotwell/src/Box.vala" _tmp73_ = vertical_complement; #line 287 "/home/jens/Source/shotwell/src/Box.vala" - _tmp74_ = box_complements_derive (_tmp72_, _tmp73_); -#line 287 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp74_; + result = box_complements_derive (_tmp72_, _tmp73_); #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *horizontal = _vala_horizontal; -#line 1938 "Box.c" +#line 1932 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_enlarged) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_enlarged = _vala_horizontal_enlarged; -#line 1944 "Box.c" +#line 1938 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (vertical) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *vertical = _vala_vertical; -#line 1950 "Box.c" +#line 1944 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_enlarged) { #line 287 "/home/jens/Source/shotwell/src/Box.vala" *vertical_enlarged = _vala_vertical_enlarged; -#line 1956 "Box.c" +#line 1950 "Box.c" } #line 287 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 1960 "Box.c" +#line 1954 "Box.c" } -BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal_this, Box* vertical_this, Box* horizontal_shifted, Box* vertical_shifted) { +BoxComplements +box_shifted_complements (Box *self, + Box* shifted, + Box* horizontal_this, + Box* vertical_this, + Box* horizontal_shifted, + Box* vertical_shifted) +{ Box _vala_horizontal_this = {0}; Box _vala_vertical_this = {0}; Box _vala_horizontal_shifted = {0}; Box _vala_vertical_shifted = {0}; BoxComplements result = 0; - gint _tmp0_; - gint _tmp1_; + gboolean horizontal_complement = FALSE; + gboolean _tmp0_ = FALSE; + Box _tmp1_; gint _tmp2_; gint _tmp3_; - gboolean horizontal_complement = FALSE; - gboolean _tmp4_ = FALSE; - Box _tmp5_; - gint _tmp6_; - gint _tmp7_; gboolean vertical_complement = FALSE; - gboolean _tmp42_ = FALSE; - Box _tmp43_; - gint _tmp44_; - gint _tmp45_; - gboolean _tmp80_; - gboolean _tmp81_; - BoxComplements _tmp82_; + gboolean _tmp38_ = FALSE; + Box _tmp39_; + gint _tmp40_; + gint _tmp41_; + gboolean _tmp76_; + gboolean _tmp77_; #line 293 "/home/jens/Source/shotwell/src/Box.vala" g_return_val_if_fail (shifted != NULL, 0); #line 295 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = box_get_width (&(*self)); -#line 295 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = box_get_width (shifted); -#line 295 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp0_ == _tmp1_, "get_width() == shifted.get_width()"); -#line 296 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = box_get_height (&(*self)); + _vala_assert (box_get_width (&(*self)) == box_get_width (shifted), "get_width() == shifted.get_width()"); #line 296 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_get_height (shifted); -#line 296 "/home/jens/Source/shotwell/src/Box.vala" - _vala_assert (_tmp2_ == _tmp3_, "get_height() == shifted.get_height()"); + _vala_assert (box_get_height (&(*self)) == box_get_height (shifted), "get_height() == shifted.get_height()"); #line 298 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = TRUE; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = *shifted; + _tmp1_ = *shifted; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = _tmp5_.top; + _tmp2_ = _tmp1_.top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = (*self).top; + _tmp3_ = (*self).top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp6_ < _tmp7_) { -#line 2011 "Box.c" - Box _tmp8_; - gint _tmp9_; - gint _tmp10_; + if (_tmp2_ < _tmp3_) { +#line 1999 "Box.c" + Box _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = *shifted; + _tmp4_ = *shifted; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = _tmp8_.bottom; + _tmp5_ = _tmp4_.bottom; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = (*self).top; + _tmp6_ = (*self).top; #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = _tmp9_ > _tmp10_; -#line 2023 "Box.c" + _tmp0_ = _tmp5_ > _tmp6_; +#line 2011 "Box.c" } else { #line 299 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = FALSE; -#line 2027 "Box.c" + _tmp0_ = FALSE; +#line 2015 "Box.c" } #line 299 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_) { -#line 2031 "Box.c" + if (_tmp0_) { +#line 2019 "Box.c" + gint _tmp7_; + Box _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _tmp11_; Box _tmp12_; gint _tmp13_; - gint _tmp14_; + Box _tmp14_; gint _tmp15_; Box _tmp16_; gint _tmp17_; - Box _tmp18_; - gint _tmp19_; - Box _tmp20_; - gint _tmp21_; - gint _tmp22_; + gint _tmp18_; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = (*self).left; + _tmp7_ = (*self).left; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = *shifted; + _tmp8_ = *shifted; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = _tmp12_.bottom; + _tmp9_ = _tmp8_.bottom; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = (*self).right; + _tmp10_ = (*self).right; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = (*self).bottom; + _tmp11_ = (*self).bottom; #line 301 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_this, _tmp11_, _tmp13_, _tmp14_, _tmp15_); + box_init (&_vala_horizontal_this, _tmp7_, _tmp9_, _tmp10_, _tmp11_); #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = *shifted; + _tmp12_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = _tmp16_.left; + _tmp13_ = _tmp12_.left; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = *shifted; + _tmp14_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp18_.top; + _tmp15_ = _tmp14_.top; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = *shifted; + _tmp16_ = *shifted; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = _tmp20_.right; + _tmp17_ = _tmp16_.right; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = (*self).top; + _tmp18_ = (*self).top; #line 302 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_shifted, _tmp17_, _tmp19_, _tmp21_, _tmp22_); -#line 2072 "Box.c" + box_init (&_vala_horizontal_shifted, _tmp13_, _tmp15_, _tmp17_, _tmp18_); +#line 2060 "Box.c" } else { - gboolean _tmp23_ = FALSE; - Box _tmp24_; - gint _tmp25_; - gint _tmp26_; + gboolean _tmp19_ = FALSE; + Box _tmp20_; + gint _tmp21_; + gint _tmp22_; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = *shifted; + _tmp20_ = *shifted; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = _tmp24_.top; + _tmp21_ = _tmp20_.top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = (*self).top; + _tmp22_ = (*self).top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp25_ > _tmp26_) { -#line 2086 "Box.c" - Box _tmp27_; - gint _tmp28_; - gint _tmp29_; + if (_tmp21_ > _tmp22_) { +#line 2074 "Box.c" + Box _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = *shifted; + _tmp23_ = *shifted; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = _tmp27_.top; + _tmp24_ = _tmp23_.top; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp29_ = (*self).bottom; + _tmp25_ = (*self).bottom; #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = _tmp28_ < _tmp29_; -#line 2098 "Box.c" + _tmp19_ = _tmp24_ < _tmp25_; +#line 2086 "Box.c" } else { #line 303 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = FALSE; -#line 2102 "Box.c" + _tmp19_ = FALSE; +#line 2090 "Box.c" } #line 303 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp23_) { -#line 2106 "Box.c" + if (_tmp19_) { +#line 2094 "Box.c" + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; + Box _tmp29_; gint _tmp30_; - gint _tmp31_; + Box _tmp31_; gint _tmp32_; - Box _tmp33_; - gint _tmp34_; - Box _tmp35_; - gint _tmp36_; + gint _tmp33_; + Box _tmp34_; + gint _tmp35_; + Box _tmp36_; gint _tmp37_; - Box _tmp38_; - gint _tmp39_; - Box _tmp40_; - gint _tmp41_; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = (*self).left; + _tmp26_ = (*self).left; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp31_ = (*self).top; + _tmp27_ = (*self).top; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp32_ = (*self).right; + _tmp28_ = (*self).right; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp33_ = *shifted; + _tmp29_ = *shifted; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - _tmp34_ = _tmp33_.top; + _tmp30_ = _tmp29_.top; #line 305 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_this, _tmp30_, _tmp31_, _tmp32_, _tmp34_); + box_init (&_vala_horizontal_this, _tmp26_, _tmp27_, _tmp28_, _tmp30_); #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = *shifted; + _tmp31_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp36_ = _tmp35_.left; + _tmp32_ = _tmp31_.left; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp37_ = (*self).bottom; + _tmp33_ = (*self).bottom; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp38_ = *shifted; + _tmp34_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp39_ = _tmp38_.right; + _tmp35_ = _tmp34_.right; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = *shifted; + _tmp36_ = *shifted; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - _tmp41_ = _tmp40_.bottom; + _tmp37_ = _tmp36_.bottom; #line 306 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_horizontal_shifted, _tmp36_, _tmp37_, _tmp39_, _tmp41_); -#line 2147 "Box.c" + box_init (&_vala_horizontal_shifted, _tmp32_, _tmp33_, _tmp35_, _tmp37_); +#line 2135 "Box.c" } else { #line 309 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_horizontal_this, 0, 0, 0, 0); @@ -2151,156 +2139,156 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal box_init (&_vala_horizontal_shifted, 0, 0, 0, 0); #line 311 "/home/jens/Source/shotwell/src/Box.vala" horizontal_complement = FALSE; -#line 2155 "Box.c" +#line 2143 "Box.c" } } #line 314 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = TRUE; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp43_ = *shifted; + _tmp39_ = *shifted; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp44_ = _tmp43_.left; + _tmp40_ = _tmp39_.left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp45_ = (*self).left; + _tmp41_ = (*self).left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp44_ < _tmp45_) { -#line 2168 "Box.c" - Box _tmp46_; - gint _tmp47_; - gint _tmp48_; + if (_tmp40_ < _tmp41_) { +#line 2156 "Box.c" + Box _tmp42_; + gint _tmp43_; + gint _tmp44_; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp46_ = *shifted; + _tmp42_ = *shifted; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp47_ = _tmp46_.right; + _tmp43_ = _tmp42_.right; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp48_ = (*self).left; + _tmp44_ = (*self).left; #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = _tmp47_ > _tmp48_; -#line 2180 "Box.c" + _tmp38_ = _tmp43_ > _tmp44_; +#line 2168 "Box.c" } else { #line 315 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = FALSE; -#line 2184 "Box.c" + _tmp38_ = FALSE; +#line 2172 "Box.c" } #line 315 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp42_) { -#line 2188 "Box.c" - Box _tmp49_; - gint _tmp50_; + if (_tmp38_) { +#line 2176 "Box.c" + Box _tmp45_; + gint _tmp46_; + gint _tmp47_; + gint _tmp48_; + gint _tmp49_; + Box _tmp50_; gint _tmp51_; - gint _tmp52_; + Box _tmp52_; gint _tmp53_; - Box _tmp54_; - gint _tmp55_; - Box _tmp56_; - gint _tmp57_; - gint _tmp58_; - Box _tmp59_; - gint _tmp60_; + gint _tmp54_; + Box _tmp55_; + gint _tmp56_; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp49_ = *shifted; + _tmp45_ = *shifted; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp50_ = _tmp49_.right; + _tmp46_ = _tmp45_.right; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp51_ = (*self).top; + _tmp47_ = (*self).top; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp52_ = (*self).right; + _tmp48_ = (*self).right; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - _tmp53_ = (*self).bottom; + _tmp49_ = (*self).bottom; #line 317 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_this, _tmp50_, _tmp51_, _tmp52_, _tmp53_); + box_init (&_vala_vertical_this, _tmp46_, _tmp47_, _tmp48_, _tmp49_); #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp54_ = *shifted; + _tmp50_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp55_ = _tmp54_.left; + _tmp51_ = _tmp50_.left; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp56_ = *shifted; + _tmp52_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp57_ = _tmp56_.top; + _tmp53_ = _tmp52_.top; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp58_ = (*self).left; + _tmp54_ = (*self).left; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp59_ = *shifted; + _tmp55_ = *shifted; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - _tmp60_ = _tmp59_.bottom; + _tmp56_ = _tmp55_.bottom; #line 318 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_shifted, _tmp55_, _tmp57_, _tmp58_, _tmp60_); -#line 2229 "Box.c" + box_init (&_vala_vertical_shifted, _tmp51_, _tmp53_, _tmp54_, _tmp56_); +#line 2217 "Box.c" } else { - gboolean _tmp61_ = FALSE; - Box _tmp62_; - gint _tmp63_; - gint _tmp64_; + gboolean _tmp57_ = FALSE; + Box _tmp58_; + gint _tmp59_; + gint _tmp60_; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp62_ = *shifted; + _tmp58_ = *shifted; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp63_ = _tmp62_.left; + _tmp59_ = _tmp58_.left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp64_ = (*self).left; + _tmp60_ = (*self).left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp63_ > _tmp64_) { -#line 2243 "Box.c" - Box _tmp65_; - gint _tmp66_; - gint _tmp67_; + if (_tmp59_ > _tmp60_) { +#line 2231 "Box.c" + Box _tmp61_; + gint _tmp62_; + gint _tmp63_; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp65_ = *shifted; + _tmp61_ = *shifted; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp66_ = _tmp65_.left; + _tmp62_ = _tmp61_.left; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp67_ = (*self).right; + _tmp63_ = (*self).right; #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp61_ = _tmp66_ < _tmp67_; -#line 2255 "Box.c" + _tmp57_ = _tmp62_ < _tmp63_; +#line 2243 "Box.c" } else { #line 319 "/home/jens/Source/shotwell/src/Box.vala" - _tmp61_ = FALSE; -#line 2259 "Box.c" + _tmp57_ = FALSE; +#line 2247 "Box.c" } #line 319 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp61_) { -#line 2263 "Box.c" + if (_tmp57_) { +#line 2251 "Box.c" + gint _tmp64_; + gint _tmp65_; + Box _tmp66_; + gint _tmp67_; gint _tmp68_; gint _tmp69_; Box _tmp70_; gint _tmp71_; - gint _tmp72_; + Box _tmp72_; gint _tmp73_; Box _tmp74_; gint _tmp75_; - Box _tmp76_; - gint _tmp77_; - Box _tmp78_; - gint _tmp79_; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp68_ = (*self).left; + _tmp64_ = (*self).left; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp69_ = (*self).top; + _tmp65_ = (*self).top; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp70_ = *shifted; + _tmp66_ = *shifted; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp71_ = _tmp70_.left; + _tmp67_ = _tmp66_.left; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - _tmp72_ = (*self).bottom; + _tmp68_ = (*self).bottom; #line 321 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_this, _tmp68_, _tmp69_, _tmp71_, _tmp72_); + box_init (&_vala_vertical_this, _tmp64_, _tmp65_, _tmp67_, _tmp68_); #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp73_ = (*self).right; + _tmp69_ = (*self).right; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp74_ = *shifted; + _tmp70_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp75_ = _tmp74_.top; + _tmp71_ = _tmp70_.top; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp76_ = *shifted; + _tmp72_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp77_ = _tmp76_.right; + _tmp73_ = _tmp72_.right; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp78_ = *shifted; + _tmp74_ = *shifted; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - _tmp79_ = _tmp78_.bottom; + _tmp75_ = _tmp74_.bottom; #line 322 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_vala_vertical_shifted, _tmp73_, _tmp75_, _tmp77_, _tmp79_); -#line 2304 "Box.c" + box_init (&_vala_vertical_shifted, _tmp69_, _tmp71_, _tmp73_, _tmp75_); +#line 2292 "Box.c" } else { #line 325 "/home/jens/Source/shotwell/src/Box.vala" box_init (&_vala_vertical_this, 0, 0, 0, 0); @@ -2308,48 +2296,50 @@ BoxComplements box_shifted_complements (Box *self, Box* shifted, Box* horizontal box_init (&_vala_vertical_shifted, 0, 0, 0, 0); #line 327 "/home/jens/Source/shotwell/src/Box.vala" vertical_complement = FALSE; -#line 2312 "Box.c" +#line 2300 "Box.c" } } #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp80_ = horizontal_complement; + _tmp76_ = horizontal_complement; #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp81_ = vertical_complement; + _tmp77_ = vertical_complement; #line 330 "/home/jens/Source/shotwell/src/Box.vala" - _tmp82_ = box_complements_derive (_tmp80_, _tmp81_); -#line 330 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp82_; + result = box_complements_derive (_tmp76_, _tmp77_); #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_this) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_this = _vala_horizontal_this; -#line 2327 "Box.c" +#line 2313 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_this) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *vertical_this = _vala_vertical_this; -#line 2333 "Box.c" +#line 2319 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (horizontal_shifted) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *horizontal_shifted = _vala_horizontal_shifted; -#line 2339 "Box.c" +#line 2325 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" if (vertical_shifted) { #line 330 "/home/jens/Source/shotwell/src/Box.vala" *vertical_shifted = _vala_vertical_shifted; -#line 2345 "Box.c" +#line 2331 "Box.c" } #line 330 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2349 "Box.c" +#line 2335 "Box.c" } -void box_rubber_band (Box *self, GdkPoint* point, Box* result) { +void +box_rubber_band (Box *self, + GdkPoint* point, + Box* result) +{ GdkPoint _tmp0_; gint _tmp1_; GdkPoint _tmp2_; @@ -2358,23 +2348,19 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) { gint _tmp4_; GdkPoint _tmp5_; gint _tmp6_; - gint _tmp7_; gint b = 0; - gint _tmp8_; - GdkPoint _tmp9_; - gint _tmp10_; - gint _tmp11_; + gint _tmp7_; + GdkPoint _tmp8_; + gint _tmp9_; gint l = 0; + gint _tmp10_; + GdkPoint _tmp11_; gint _tmp12_; - GdkPoint _tmp13_; - gint _tmp14_; - gint _tmp15_; gint r = 0; - gint _tmp16_; - GdkPoint _tmp17_; - gint _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + gint _tmp13_; + GdkPoint _tmp14_; + gint _tmp15_; + Box _tmp16_ = {0}; #line 333 "/home/jens/Source/shotwell/src/Box.vala" g_return_if_fail (point != NULL); #line 334 "/home/jens/Source/shotwell/src/Box.vala" @@ -2396,50 +2382,44 @@ void box_rubber_band (Box *self, GdkPoint* point, Box* result) { #line 337 "/home/jens/Source/shotwell/src/Box.vala" _tmp6_ = _tmp5_.y; #line 337 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = MIN (_tmp4_, _tmp6_); -#line 337 "/home/jens/Source/shotwell/src/Box.vala" - t = _tmp7_; -#line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = (*self).bottom; + t = MIN (_tmp4_, _tmp6_); #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = *point; + _tmp7_ = (*self).bottom; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = _tmp9_.y; + _tmp8_ = *point; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = MAX (_tmp8_, _tmp10_); + _tmp9_ = _tmp8_.y; #line 338 "/home/jens/Source/shotwell/src/Box.vala" - b = _tmp11_; + b = MAX (_tmp7_, _tmp9_); #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = (*self).left; -#line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = *point; + _tmp10_ = (*self).left; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = _tmp13_.x; + _tmp11_ = *point; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = MIN (_tmp12_, _tmp14_); + _tmp12_ = _tmp11_.x; #line 339 "/home/jens/Source/shotwell/src/Box.vala" - l = _tmp15_; + l = MIN (_tmp10_, _tmp12_); #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = (*self).right; + _tmp13_ = (*self).right; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = *point; + _tmp14_ = *point; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = _tmp17_.x; + _tmp15_ = _tmp14_.x; #line 340 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = MAX (_tmp16_, _tmp18_); -#line 340 "/home/jens/Source/shotwell/src/Box.vala" - r = _tmp19_; + r = MAX (_tmp13_, _tmp15_); #line 342 "/home/jens/Source/shotwell/src/Box.vala" - box_init (&_tmp20_, l, t, r, b); + box_init (&_tmp16_, l, t, r, b); #line 342 "/home/jens/Source/shotwell/src/Box.vala" - *result = _tmp20_; + *result = _tmp16_; #line 342 "/home/jens/Source/shotwell/src/Box.vala" return; -#line 2439 "Box.c" +#line 2417 "Box.c" } -gchar* box_to_string (Box *self) { +gchar* +box_to_string (Box *self) +{ gchar* result = NULL; gint _tmp0_; gint _tmp1_; @@ -2474,413 +2454,326 @@ gchar* box_to_string (Box *self) { result = _tmp8_; #line 346 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2478 "Box.c" +#line 2458 "Box.c" } -static gboolean box_in_zone (gdouble pos, gint zone) { +static gboolean +box_in_zone (gdouble pos, + gint zone) +{ gboolean result = FALSE; gint top_zone = 0; - gint _tmp0_; gint bottom_zone = 0; - gint _tmp1_; - gdouble _tmp2_; - gboolean _tmp3_; #line 350 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = zone; -#line 350 "/home/jens/Source/shotwell/src/Box.vala" - top_zone = _tmp0_ - BOX_HAND_GRENADES; -#line 351 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = zone; + top_zone = zone - BOX_HAND_GRENADES; #line 351 "/home/jens/Source/shotwell/src/Box.vala" - bottom_zone = _tmp1_ + BOX_HAND_GRENADES; -#line 353 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = pos; + bottom_zone = zone + BOX_HAND_GRENADES; #line 353 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_in_between (_tmp2_, top_zone, bottom_zone); -#line 353 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp3_; + result = box_in_between (pos, top_zone, bottom_zone); #line 353 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2506 "Box.c" +#line 2477 "Box.c" } -static gboolean box_in_between (gdouble pos, gint top, gint bottom) { +static gboolean +box_in_between (gdouble pos, + gint top, + gint bottom) +{ gboolean result = FALSE; gint ipos = 0; - gdouble _tmp0_; - gboolean _tmp1_ = FALSE; - gint _tmp2_; - gint _tmp3_; -#line 357 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = pos; + gboolean _tmp0_ = FALSE; + gint _tmp1_; #line 357 "/home/jens/Source/shotwell/src/Box.vala" - ipos = (gint) _tmp0_; + ipos = (gint) pos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = ipos; + _tmp1_ = ipos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = top; + if (_tmp1_ > top) { +#line 2496 "Box.c" + gint _tmp2_; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp2_ > _tmp3_) { -#line 2527 "Box.c" - gint _tmp4_; - gint _tmp5_; + _tmp2_ = ipos; #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = ipos; -#line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = bottom; -#line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = _tmp4_ < _tmp5_; -#line 2536 "Box.c" + _tmp0_ = _tmp2_ < bottom; +#line 2502 "Box.c" } else { #line 359 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = FALSE; -#line 2540 "Box.c" + _tmp0_ = FALSE; +#line 2506 "Box.c" } #line 359 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp1_; + result = _tmp0_; #line 359 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2546 "Box.c" +#line 2512 "Box.c" } -static gboolean box_near_in_between (gdouble pos, gint top, gint bottom) { +static gboolean +box_near_in_between (gdouble pos, + gint top, + gint bottom) +{ gboolean result = FALSE; gint ipos = 0; - gdouble _tmp0_; gint top_zone = 0; - gint _tmp1_; gint bottom_zone = 0; + gboolean _tmp0_ = FALSE; + gint _tmp1_; gint _tmp2_; - gboolean _tmp3_ = FALSE; - gint _tmp4_; - gint _tmp5_; -#line 363 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = pos; #line 363 "/home/jens/Source/shotwell/src/Box.vala" - ipos = (gint) _tmp0_; + ipos = (gint) pos; #line 364 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = top; -#line 364 "/home/jens/Source/shotwell/src/Box.vala" - top_zone = _tmp1_ - BOX_HAND_GRENADES; -#line 365 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = bottom; + top_zone = top - BOX_HAND_GRENADES; #line 365 "/home/jens/Source/shotwell/src/Box.vala" - bottom_zone = _tmp2_ + BOX_HAND_GRENADES; + bottom_zone = bottom + BOX_HAND_GRENADES; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = ipos; + _tmp1_ = ipos; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = top_zone; + _tmp2_ = top_zone; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp4_ > _tmp5_) { -#line 2579 "Box.c" - gint _tmp6_; - gint _tmp7_; + if (_tmp1_ > _tmp2_) { +#line 2540 "Box.c" + gint _tmp3_; + gint _tmp4_; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = ipos; + _tmp3_ = ipos; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = bottom_zone; + _tmp4_ = bottom_zone; #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = _tmp6_ < _tmp7_; -#line 2588 "Box.c" + _tmp0_ = _tmp3_ < _tmp4_; +#line 2549 "Box.c" } else { #line 367 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = FALSE; -#line 2592 "Box.c" + _tmp0_ = FALSE; +#line 2553 "Box.c" } #line 367 "/home/jens/Source/shotwell/src/Box.vala" - result = _tmp3_; + result = _tmp0_; #line 367 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2598 "Box.c" +#line 2559 "Box.c" } -BoxLocation box_approx_location (Box *self, gint x, gint y) { +BoxLocation +box_approx_location (Box *self, + gint x, + gint y) +{ BoxLocation result = 0; gboolean near_width = FALSE; gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gboolean _tmp3_; gboolean near_height = FALSE; - gint _tmp4_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_ = FALSE; gint _tmp5_; - gint _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_ = FALSE; - gint _tmp9_; - gint _tmp10_; - gboolean _tmp11_; -#line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp0_ = x; -#line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp1_ = (*self).left; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp2_ = (*self).right; + _tmp0_ = (*self).left; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - _tmp3_ = box_near_in_between ((gdouble) _tmp0_, _tmp1_, _tmp2_); + _tmp1_ = (*self).right; #line 371 "/home/jens/Source/shotwell/src/Box.vala" - near_width = _tmp3_; -#line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp4_ = y; + near_width = box_near_in_between ((gdouble) x, _tmp0_, _tmp1_); #line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp5_ = (*self).top; -#line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp6_ = (*self).bottom; + _tmp2_ = (*self).top; #line 372 "/home/jens/Source/shotwell/src/Box.vala" - _tmp7_ = box_near_in_between ((gdouble) _tmp4_, _tmp5_, _tmp6_); + _tmp3_ = (*self).bottom; #line 372 "/home/jens/Source/shotwell/src/Box.vala" - near_height = _tmp7_; -#line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp9_ = x; -#line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp10_ = (*self).left; + near_height = box_near_in_between ((gdouble) y, _tmp2_, _tmp3_); #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp11_ = box_in_zone ((gdouble) _tmp9_, _tmp10_); + _tmp5_ = (*self).left; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp11_) { -#line 2646 "Box.c" - gboolean _tmp12_; + if (box_in_zone ((gdouble) x, _tmp5_)) { +#line 2593 "Box.c" + gboolean _tmp6_; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp12_ = near_height; + _tmp6_ = near_height; #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = _tmp12_; -#line 2652 "Box.c" + _tmp4_ = _tmp6_; +#line 2599 "Box.c" } else { #line 374 "/home/jens/Source/shotwell/src/Box.vala" - _tmp8_ = FALSE; -#line 2656 "Box.c" + _tmp4_ = FALSE; +#line 2603 "Box.c" } #line 374 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp8_) { -#line 2660 "Box.c" - gint _tmp13_; - gint _tmp14_; - gboolean _tmp15_; -#line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp13_ = y; -#line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp14_ = (*self).top; + if (_tmp4_) { +#line 2607 "Box.c" + gint _tmp7_; #line 375 "/home/jens/Source/shotwell/src/Box.vala" - _tmp15_ = box_in_zone ((gdouble) _tmp13_, _tmp14_); + _tmp7_ = (*self).top; #line 375 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp15_) { + if (box_in_zone ((gdouble) y, _tmp7_)) { #line 376 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_LEFT; #line 376 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2676 "Box.c" +#line 2617 "Box.c" } else { - gint _tmp16_; - gint _tmp17_; - gboolean _tmp18_; + gint _tmp8_; #line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp16_ = y; + _tmp8_ = (*self).bottom; #line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp17_ = (*self).bottom; -#line 377 "/home/jens/Source/shotwell/src/Box.vala" - _tmp18_ = box_in_zone ((gdouble) _tmp16_, _tmp17_); -#line 377 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp18_) { + if (box_in_zone ((gdouble) y, _tmp8_)) { #line 378 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_LEFT; #line 378 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2693 "Box.c" +#line 2628 "Box.c" } else { #line 380 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_LEFT_SIDE; #line 380 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2699 "Box.c" +#line 2634 "Box.c" } } } else { - gboolean _tmp19_ = FALSE; - gint _tmp20_; - gint _tmp21_; - gboolean _tmp22_; -#line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp20_ = x; -#line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp21_ = (*self).right; + gboolean _tmp9_ = FALSE; + gint _tmp10_; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp22_ = box_in_zone ((gdouble) _tmp20_, _tmp21_); + _tmp10_ = (*self).right; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp22_) { -#line 2715 "Box.c" - gboolean _tmp23_; + if (box_in_zone ((gdouble) x, _tmp10_)) { +#line 2644 "Box.c" + gboolean _tmp11_; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp23_ = near_height; + _tmp11_ = near_height; #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = _tmp23_; -#line 2721 "Box.c" + _tmp9_ = _tmp11_; +#line 2650 "Box.c" } else { #line 382 "/home/jens/Source/shotwell/src/Box.vala" - _tmp19_ = FALSE; -#line 2725 "Box.c" + _tmp9_ = FALSE; +#line 2654 "Box.c" } #line 382 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp19_) { -#line 2729 "Box.c" - gint _tmp24_; - gint _tmp25_; - gboolean _tmp26_; + if (_tmp9_) { +#line 2658 "Box.c" + gint _tmp12_; #line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp24_ = y; + _tmp12_ = (*self).top; #line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp25_ = (*self).top; -#line 383 "/home/jens/Source/shotwell/src/Box.vala" - _tmp26_ = box_in_zone ((gdouble) _tmp24_, _tmp25_); -#line 383 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp26_) { + if (box_in_zone ((gdouble) y, _tmp12_)) { #line 384 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_RIGHT; #line 384 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2745 "Box.c" +#line 2668 "Box.c" } else { - gint _tmp27_; - gint _tmp28_; - gboolean _tmp29_; -#line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp27_ = y; + gint _tmp13_; #line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp28_ = (*self).bottom; + _tmp13_ = (*self).bottom; #line 385 "/home/jens/Source/shotwell/src/Box.vala" - _tmp29_ = box_in_zone ((gdouble) _tmp27_, _tmp28_); -#line 385 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp29_) { + if (box_in_zone ((gdouble) y, _tmp13_)) { #line 386 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_RIGHT; #line 386 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2762 "Box.c" +#line 2679 "Box.c" } else { #line 388 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_RIGHT_SIDE; #line 388 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2768 "Box.c" +#line 2685 "Box.c" } } } else { - gboolean _tmp30_ = FALSE; - gint _tmp31_; - gint _tmp32_; - gboolean _tmp33_; -#line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp31_ = y; -#line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp32_ = (*self).top; + gboolean _tmp14_ = FALSE; + gint _tmp15_; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp33_ = box_in_zone ((gdouble) _tmp31_, _tmp32_); + _tmp15_ = (*self).top; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp33_) { -#line 2784 "Box.c" - gboolean _tmp34_; + if (box_in_zone ((gdouble) y, _tmp15_)) { +#line 2695 "Box.c" + gboolean _tmp16_; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp34_ = near_width; + _tmp16_ = near_width; #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = _tmp34_; -#line 2790 "Box.c" + _tmp14_ = _tmp16_; +#line 2701 "Box.c" } else { #line 390 "/home/jens/Source/shotwell/src/Box.vala" - _tmp30_ = FALSE; -#line 2794 "Box.c" + _tmp14_ = FALSE; +#line 2705 "Box.c" } #line 390 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp30_) { + if (_tmp14_) { #line 392 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_TOP_SIDE; #line 392 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2802 "Box.c" +#line 2713 "Box.c" } else { - gboolean _tmp35_ = FALSE; - gint _tmp36_; - gint _tmp37_; - gboolean _tmp38_; -#line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp36_ = y; + gboolean _tmp17_ = FALSE; + gint _tmp18_; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp37_ = (*self).bottom; + _tmp18_ = (*self).bottom; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp38_ = box_in_zone ((gdouble) _tmp36_, _tmp37_); -#line 393 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp38_) { -#line 2816 "Box.c" - gboolean _tmp39_; + if (box_in_zone ((gdouble) y, _tmp18_)) { +#line 2721 "Box.c" + gboolean _tmp19_; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp39_ = near_width; + _tmp19_ = near_width; #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = _tmp39_; -#line 2822 "Box.c" + _tmp17_ = _tmp19_; +#line 2727 "Box.c" } else { #line 393 "/home/jens/Source/shotwell/src/Box.vala" - _tmp35_ = FALSE; -#line 2826 "Box.c" + _tmp17_ = FALSE; +#line 2731 "Box.c" } #line 393 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp35_) { + if (_tmp17_) { #line 395 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_BOTTOM_SIDE; #line 395 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2834 "Box.c" +#line 2739 "Box.c" } else { - gboolean _tmp40_ = FALSE; - gint _tmp41_; - gint _tmp42_; - gint _tmp43_; - gboolean _tmp44_; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp41_ = x; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp42_ = (*self).left; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp43_ = (*self).right; -#line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp44_ = box_in_between ((gdouble) _tmp41_, _tmp42_, _tmp43_); + gboolean _tmp20_ = FALSE; + gint _tmp21_; + gint _tmp22_; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp44_) { -#line 2851 "Box.c" - gint _tmp45_; - gint _tmp46_; - gint _tmp47_; - gboolean _tmp48_; + _tmp21_ = (*self).left; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp45_ = y; + _tmp22_ = (*self).right; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp46_ = (*self).top; + if (box_in_between ((gdouble) x, _tmp21_, _tmp22_)) { +#line 2750 "Box.c" + gint _tmp23_; + gint _tmp24_; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp47_ = (*self).bottom; + _tmp23_ = (*self).top; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp48_ = box_in_between ((gdouble) _tmp45_, _tmp46_, _tmp47_); + _tmp24_ = (*self).bottom; #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = _tmp48_; -#line 2866 "Box.c" + _tmp20_ = box_in_between ((gdouble) y, _tmp23_, _tmp24_); +#line 2759 "Box.c" } else { #line 396 "/home/jens/Source/shotwell/src/Box.vala" - _tmp40_ = FALSE; -#line 2870 "Box.c" + _tmp20_ = FALSE; +#line 2763 "Box.c" } #line 396 "/home/jens/Source/shotwell/src/Box.vala" - if (_tmp40_) { + if (_tmp20_) { #line 397 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_INSIDE; #line 397 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2878 "Box.c" +#line 2771 "Box.c" } else { #line 399 "/home/jens/Source/shotwell/src/Box.vala" result = BOX_LOCATION_OUTSIDE; #line 399 "/home/jens/Source/shotwell/src/Box.vala" return result; -#line 2884 "Box.c" +#line 2777 "Box.c" } } } @@ -2889,7 +2782,9 @@ BoxLocation box_approx_location (Box *self, gint x, gint y) { } -Box* box_dup (const Box* self) { +Box* +box_dup (const Box* self) +{ Box* dup; #line 38 "/home/jens/Source/shotwell/src/Box.vala" dup = g_new0 (Box, 1); @@ -2897,18 +2792,22 @@ Box* box_dup (const Box* self) { memcpy (dup, self, sizeof (Box)); #line 38 "/home/jens/Source/shotwell/src/Box.vala" return dup; -#line 2901 "Box.c" +#line 2796 "Box.c" } -void box_free (Box* self) { +void +box_free (Box* self) +{ #line 38 "/home/jens/Source/shotwell/src/Box.vala" g_free (self); -#line 2908 "Box.c" +#line 2805 "Box.c" } -GType box_get_type (void) { +GType +box_get_type (void) +{ static volatile gsize box_type_id__volatile = 0; if (g_once_init_enter (&box_type_id__volatile)) { GType box_type_id; |