brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

constraints: Make current placement rule stack allocated

Browse Source 
We're not going to keep it past the function scope, so no reason to put
it on the heap. We also didn't free it, so this'll fix a memory leak.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/653
This commit is contained in:
Jonas Ådahl 2018-10-20 15:46:37 +02:00
parent 76abe87090
commit 71a62bb18f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/constraints.c
View File

@ -787,7 +787,7 @@ constrain_custom_rule (MetaWindow *window,
MetaPlacementRule *placement_rule; MetaPlacementRule *placement_rule;
MetaRectangle intersection; MetaRectangle intersection;
gboolean constraint_satisfied; gboolean constraint_satisfied;
MetaPlacementRule *current_rule; MetaPlacementRule current_rule;
MetaWindow *parent; MetaWindow *parent;
MetaRectangle parent_rect; MetaRectangle parent_rect;
@ -820,25 +820,24 @@ constrain_custom_rule (MetaWindow *window,
if (check_only) if (check_only)
return constraint_satisfied; return constraint_satisfied;
current_rule = g_new0 (MetaPlacementRule, 1); current_rule = *placement_rule;
*current_rule = *placement_rule;
if (constraint_satisfied) if (constraint_satisfied)
goto done; goto done;
if (info->current.width != intersection.width && if (info->current.width != intersection.width &&
(current_rule->constraint_adjustment & (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_X)) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_X))
{ {
try_flip_window_position (window, info, current_rule, try_flip_window_position (window, info, &current_rule,
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_X, META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_X,
&info->current, &intersection); &info->current, &intersection);
} }
if (info->current.height != intersection.height && if (info->current.height != intersection.height &&
(current_rule->constraint_adjustment & (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_Y)) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_Y))
{ {
try_flip_window_position (window, info, current_rule, try_flip_window_position (window, info, &current_rule,
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_Y, META_PLACEMENT_CONSTRAINT_ADJUSTMENT_FLIP_Y,
&info->current, &intersection); &info->current, &intersection);
} }
@ -852,7 +851,7 @@ constrain_custom_rule (MetaWindow *window,
if (constraint_satisfied) if (constraint_satisfied)
goto done; goto done;
if (current_rule->constraint_adjustment & if (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_SLIDE_X) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_SLIDE_X)
{ {
if (info->current.x != intersection.x) if (info->current.x != intersection.x)
@ -860,7 +859,7 @@ constrain_custom_rule (MetaWindow *window,
else if (info->current.width != intersection.width) else if (info->current.width != intersection.width)
info->current.x -= info->current.width - intersection.width; info->current.x -= info->current.width - intersection.width;
} }
if (current_rule->constraint_adjustment & if (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_SLIDE_Y) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_SLIDE_Y)
{ {
if (info->current.y != intersection.y) if (info->current.y != intersection.y)
@ -878,13 +877,13 @@ constrain_custom_rule (MetaWindow *window,
if (constraint_satisfied) if (constraint_satisfied)
goto done; goto done;
if (current_rule->constraint_adjustment & if (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_RESIZE_X) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_RESIZE_X)
{ {
info->current.x = intersection.x; info->current.x = intersection.x;
info->current.width = intersection.width; info->current.width = intersection.width;
} }
if (current_rule->constraint_adjustment & if (current_rule.constraint_adjustment &
META_PLACEMENT_CONSTRAINT_ADJUSTMENT_RESIZE_Y) META_PLACEMENT_CONSTRAINT_ADJUSTMENT_RESIZE_Y)
{ {
info->current.y = intersection.y; info->current.y = intersection.y;