Skip to content

core: Do not abort on overflowing window positions in edge resistance #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArekMiszcz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

core: Do not abort on overflowing window positions in edge resistance #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/core/boxes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,19 @@ add_edges (GList *cur_edges,
/* Remove any part of old_edge that intersects remove and add any resulting
* edges to cur_list. Return cur_list when finished.
*/
static GList *
keep_unsplit_edge (GList *cur_list,
const MetaEdge *old_edge)
{
MetaEdge *copy;

g_warning_once ("split_edge: edge and removal rectangle do not overlap, keeping the edge unsplit");

copy = g_new (MetaEdge, 1);
*copy = *old_edge;
return g_list_prepend (cur_list, copy);
}

static GList*
split_edge (GList *cur_list,
const MetaEdge *old_edge,
Expand All @@ -1645,7 +1658,8 @@ split_edge (GList *cur_list,
{
case META_SIDE_LEFT:
case META_SIDE_RIGHT:
g_assert (meta_rectangle_vert_overlap (&old_edge->rect, &remove->rect));
if (!meta_rectangle_vert_overlap (&old_edge->rect, &remove->rect))
return keep_unsplit_edge (cur_list, old_edge);
if (BOX_TOP (old_edge->rect) < BOX_TOP (remove->rect))
{
temp_edge = g_new (MetaEdge, 1);
Expand All @@ -1666,7 +1680,8 @@ split_edge (GList *cur_list,
break;
case META_SIDE_TOP:
case META_SIDE_BOTTOM:
g_assert (meta_rectangle_horiz_overlap (&old_edge->rect, &remove->rect));
if (!meta_rectangle_horiz_overlap (&old_edge->rect, &remove->rect))
return keep_unsplit_edge (cur_list, old_edge);
if (BOX_LEFT (old_edge->rect) < BOX_LEFT (remove->rect))
{
temp_edge = g_new (MetaEdge, 1);
Expand Down
25 changes: 19 additions & 6 deletions src/core/edge-resistance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,28 @@
#include "core/meta-workspace-manager-private.h"
#include "core/workspace-private.h"

static gboolean
frame_rect_in_sane_range (MetaWindow *window)
{
MetaRectangle rect;

meta_window_get_frame_rect (window, &rect);

return rect.width >= 0 && rect.height >= 0 &&
ABS ((gint64) rect.x) + rect.width <= G_MAXINT / 2 &&
ABS ((gint64) rect.y) + rect.height <= G_MAXINT / 2;
}

/* A simple macro for whether a given window's edges are potentially
* relevant for resistance/snapping during a move/resize operation
*/
#define WINDOW_EDGES_RELEVANT(window, display) \
meta_window_should_be_showing (window) && \
window != display->grab_window && \
window->type != META_WINDOW_DESKTOP && \
window->type != META_WINDOW_MENU && \
window->type != META_WINDOW_SPLASHSCREEN
#define WINDOW_EDGES_RELEVANT(window, display) \
meta_window_should_be_showing (window) && \
window != display->grab_window && \
window->type != META_WINDOW_DESKTOP && \
window->type != META_WINDOW_MENU && \
window->type != META_WINDOW_SPLASHSCREEN && \
frame_rect_in_sane_range (window)

struct ResistanceDataForAnEdge
{
Expand Down