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

mtk: Move Rectangle constructors from Meta

Browse Source 
Also rename the rect constructor from mtk_rect to mtk_rectangle_new so
it is detected as a proper constructor instead of a random function by
g-ir-scanner

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3128>
This commit is contained in:
Bilal Elmoussaoui 2023-07-20 00:37:59 +02:00
parent 565acaed9c
commit af7c7befd8
10 changed files with 141 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mtk/mtk/mtk-rectangle.c
View File

@ -37,6 +37,32 @@ mtk_rectangle_free (MtkRectangle *rect)
G_DEFINE_BOXED_TYPE (MtkRectangle, mtk_rectangle, G_DEFINE_BOXED_TYPE (MtkRectangle, mtk_rectangle,
mtk_rectangle_copy, mtk_rectangle_free); mtk_rectangle_copy, mtk_rectangle_free);
/**
* mtk_rectangle_new:
* @x: X coordinate of the top left corner
* @y: Y coordinate of the top left corner
* @width: Width of the rectangle
* @height: Height of the rectangle
*
* Creates a new rectangle
*/
MtkRectangle *
mtk_rectangle_new (int x,
int y,
int width,
int height)
{
MtkRectangle *rect;
rect = g_new0 (MtkRectangle, 1);
rect->x = x;
rect->y = y;
rect->width = width;
rect->height = height;
return rect;
}
/** /**
* mtk_rectangle_equal: * mtk_rectangle_equal:
* @src1: The first rectangle * @src1: The first rectangle

15
mtk/mtk/mtk-rectangle.h
View File

@ -55,6 +55,14 @@ typedef struct _MtkRectangle MtkRectangle;
typedef cairo_rectangle_int_t MtkRectangle; typedef cairo_rectangle_int_t MtkRectangle;
#endif #endif
#define MTK_RECTANGLE_INIT(_x, _y, _width, _height) \
(MtkRectangle) { \
.x = (_x), \
.y = (_y), \
.width = (_width), \
.height = (_height) \
}
MTK_EXPORT MTK_EXPORT
GType mtk_rectangle_get_type (void); GType mtk_rectangle_get_type (void);
@ -64,6 +72,13 @@ MtkRectangle * mtk_rectangle_copy (const MtkRectangle *rect);
MTK_EXPORT MTK_EXPORT
void mtk_rectangle_free (MtkRectangle *rect); void mtk_rectangle_free (MtkRectangle *rect);
/* Function to make initializing a rect with a single line of code easy */
MTK_EXPORT
MtkRectangle * mtk_rectangle_new (int x,
int y,
int width,
int height);
MTK_EXPORT MTK_EXPORT
gboolean mtk_rectangle_equal (const MtkRectangle *src1, gboolean mtk_rectangle_equal (const MtkRectangle *src1,
const MtkRectangle *src2); const MtkRectangle *src2);

2
src/compositor/edge-resistance.c
View File

@ -617,7 +617,7 @@ apply_edge_resistance_to_each_side (MetaEdgeResistanceData *edge_data,
} }
/* Determine whether anything changed, and save the changes */ /* Determine whether anything changed, and save the changes */
modified_rect = meta_rect (new_left, modified_rect = MTK_RECTANGLE_INIT (new_left,
new_top, new_top,
new_right - new_left, new_right - new_left,
new_bottom - new_top); new_bottom - new_top);

16
src/core/boxes.c
View File

@ -134,18 +134,6 @@ meta_rectangle_edge_list_to_string (GList *edge_list,
return output; return output;
} }
MetaRectangle
meta_rect (int x, int y, int width, int height)
{
MetaRectangle temporary;
temporary.x = x;
temporary.y = y;
temporary.width = width;
temporary.height = height;
return temporary;
}
int int
meta_rectangle_area (const MetaRectangle *rect) meta_rectangle_area (const MetaRectangle *rect)
{ {
@ -1839,7 +1827,7 @@ meta_rectangle_find_nonintersected_monitor_edges (
*/ */
MetaEdge *new_edge = g_new (MetaEdge, 1); MetaEdge *new_edge = g_new (MetaEdge, 1);
new_edge->rect = meta_rect (x, y, width, height); new_edge->rect = MTK_RECTANGLE_INIT (x, y, width, height);
new_edge->side_type = side_type; new_edge->side_type = side_type;
new_edge->edge_type = META_EDGE_MONITOR; new_edge->edge_type = META_EDGE_MONITOR;
@ -1882,7 +1870,7 @@ meta_rectangle_find_nonintersected_monitor_edges (
*/ */
MetaEdge *new_edge = g_new (MetaEdge, 1); MetaEdge *new_edge = g_new (MetaEdge, 1);
new_edge->rect = meta_rect (x, y, width, height); new_edge->rect = MTK_RECTANGLE_INIT (x, y, width, height);
new_edge->side_type = side_type; new_edge->side_type = side_type;
new_edge->edge_type = META_EDGE_MONITOR; new_edge->edge_type = META_EDGE_MONITOR;

4
src/core/workspace.c
View File

@ -903,7 +903,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
*/ */
work_area = display_rect; /* start with the screen */ work_area = display_rect; /* start with the screen */
if (workspace->screen_region == NULL) if (workspace->screen_region == NULL)
work_area = meta_rect (0, 0, -1, -1); work_area = MTK_RECTANGLE_INIT (0, 0, -1, -1);
else else
meta_rectangle_clip_to_region (workspace->screen_region, meta_rectangle_clip_to_region (workspace->screen_region,
FIXED_DIRECTION_NONE, FIXED_DIRECTION_NONE,
@ -970,7 +970,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
/* FIXME: constraints.c untested with this, but it might be nice for /* FIXME: constraints.c untested with this, but it might be nice for
* a screen reader or magnifier. * a screen reader or magnifier.
*/ */
work_area = meta_rect (work_area.x, work_area.y, -1, -1); work_area = MTK_RECTANGLE_INIT (work_area.x, work_area.y, -1, -1);
else else
meta_rectangle_clip_to_region (data->logical_monitor_region, meta_rectangle_clip_to_region (data->logical_monitor_region,
FIXED_DIRECTION_NONE, FIXED_DIRECTION_NONE,

12
src/meta/boxes.h
View File

@ -53,14 +53,6 @@ typedef struct _MetaRectangle MetaRectangle;
typedef cairo_rectangle_int_t MetaRectangle; typedef cairo_rectangle_int_t MetaRectangle;
#endif #endif
#define META_RECTANGLE_INIT(_x, _y, _width, _height) \
(MetaRectangle) { \
.x = (_x), \
.y = (_y), \
.width = (_width), \
.height = (_height) \
}
/** /**
* MetaStrut: * MetaStrut:
* @rect: #MetaRectangle the #MetaStrut is on * @rect: #MetaRectangle the #MetaStrut is on
@ -109,10 +101,6 @@ MetaRectangle *meta_rectangle_copy (const MetaRectangle *rect);
META_EXPORT META_EXPORT
void meta_rectangle_free (MetaRectangle *rect); void meta_rectangle_free (MetaRectangle *rect);
/* Function to make initializing a rect with a single line of code easy */
META_EXPORT
MetaRectangle meta_rect (int x, int y, int width, int height);
/* Basic comparison functions */ /* Basic comparison functions */
META_EXPORT META_EXPORT
int meta_rectangle_area (const MetaRectangle *rect); int meta_rectangle_area (const MetaRectangle *rect);

179
src/tests/boxes-tests.c
View File

@ -49,25 +49,12 @@ get_random_rect (MetaRectangle *rect)
rect->height = rand () % 1200 + 1; rect->height = rand () % 1200 + 1;
} }
static MetaRectangle*
new_meta_rect (int x, int y, int width, int height)
{
MetaRectangle *temporary;
temporary = g_new (MetaRectangle, 1);
temporary->x = x;
temporary->y = y;
temporary->width = width;
temporary->height = height;
return temporary;
}
static MetaStrut* static MetaStrut*
new_meta_strut (int x, int y, int width, int height, int side) new_meta_strut (int x, int y, int width, int height, int side)
{ {
MetaStrut *temporary; MetaStrut *temporary;
temporary = g_new (MetaStrut, 1); temporary = g_new (MetaStrut, 1);
temporary->rect = meta_rect(x, y, width, height); temporary->rect = MTK_RECTANGLE_INIT (x, y, width, height);
temporary->side = side; temporary->side = side;
return temporary; return temporary;
@ -108,7 +95,7 @@ test_init_rect (void)
{ {
MetaRectangle rect; MetaRectangle rect;
rect = META_RECTANGLE_INIT (1, 2, 3, 4); rect = MTK_RECTANGLE_INIT (1, 2, 3, 4);
g_assert_cmpint (rect.x, ==, 1); g_assert_cmpint (rect.x, ==, 1);
g_assert_cmpint (rect.y, ==, 2); g_assert_cmpint (rect.y, ==, 2);
g_assert_cmpint (rect.width, ==, 3); g_assert_cmpint (rect.width, ==, 3);
@ -126,7 +113,7 @@ test_area (void)
g_assert (meta_rectangle_area (&temp) == temp.width * temp.height); g_assert (meta_rectangle_area (&temp) == temp.width * temp.height);
} }
temp = meta_rect (0, 0, 5, 7); temp = MTK_RECTANGLE_INIT (0, 0, 5, 7);
g_assert (meta_rectangle_area (&temp) == 35); g_assert (meta_rectangle_area (&temp) == 35);
} }
@ -142,7 +129,7 @@ test_intersect (void)
MetaRectangle temp2; MetaRectangle temp2;
mtk_rectangle_intersect (&a, &b, &temp); mtk_rectangle_intersect (&a, &b, &temp);
temp2 = meta_rect (100, 200, 10, 2); temp2 = MTK_RECTANGLE_INIT (100, 200, 10, 2);
g_assert (mtk_rectangle_equal (&temp, &temp2)); g_assert (mtk_rectangle_equal (&temp, &temp2));
g_assert (meta_rectangle_area (&temp) == 20); g_assert (meta_rectangle_area (&temp) == 20);
@ -187,8 +174,8 @@ test_overlap_funcs (void)
meta_rectangle_vert_overlap (&temp1, &temp2))); meta_rectangle_vert_overlap (&temp1, &temp2)));
} }
temp1 = meta_rect ( 0, 0, 10, 10); temp1 = MTK_RECTANGLE_INIT ( 0, 0, 10, 10);
temp2 = meta_rect (20, 0, 10, 5); temp2 = MTK_RECTANGLE_INIT (20, 0, 10, 5);
g_assert (!meta_rectangle_overlap (&temp1, &temp2)); g_assert (!meta_rectangle_overlap (&temp1, &temp2));
g_assert (!meta_rectangle_horiz_overlap (&temp1, &temp2)); g_assert (!meta_rectangle_horiz_overlap (&temp1, &temp2));
g_assert ( meta_rectangle_vert_overlap (&temp1, &temp2)); g_assert ( meta_rectangle_vert_overlap (&temp1, &temp2));
@ -220,9 +207,9 @@ test_basic_fitting (void)
meta_rectangle_could_fit_rect (&temp2, &temp1) == TRUE); meta_rectangle_could_fit_rect (&temp2, &temp1) == TRUE);
} }
temp1 = meta_rect ( 0, 0, 10, 10); temp1 = MTK_RECTANGLE_INIT ( 0, 0, 10, 10);
temp2 = meta_rect ( 5, 5, 5, 5); temp2 = MTK_RECTANGLE_INIT ( 5, 5, 5, 5);
temp3 = meta_rect ( 8, 2, 3, 7); temp3 = MTK_RECTANGLE_INIT ( 8, 2, 3, 7);
g_assert ( meta_rectangle_contains_rect (&temp1, &temp2)); g_assert ( meta_rectangle_contains_rect (&temp1, &temp2));
g_assert (!meta_rectangle_contains_rect (&temp2, &temp1)); g_assert (!meta_rectangle_contains_rect (&temp2, &temp1));
g_assert (!meta_rectangle_contains_rect (&temp1, &temp3)); g_assert (!meta_rectangle_contains_rect (&temp1, &temp3));
@ -289,7 +276,7 @@ get_screen_region (int which)
GSList *struts; GSList *struts;
MetaRectangle basic_rect; MetaRectangle basic_rect;
basic_rect = meta_rect (0, 0, 1600, 1200); basic_rect = MTK_RECTANGLE_INIT (0, 0, 1600, 1200);
ret = NULL; ret = NULL;
struts = get_strut_list (which); struts = get_strut_list (which);
@ -306,7 +293,7 @@ get_screen_edges (int which)
GSList *struts; GSList *struts;
MetaRectangle basic_rect; MetaRectangle basic_rect;
basic_rect = meta_rect (0, 0, 1600, 1200); basic_rect = MTK_RECTANGLE_INIT (0, 0, 1600, 1200);
ret = NULL; ret = NULL;
struts = get_strut_list (which); struts = get_strut_list (which);
@ -328,20 +315,20 @@ get_monitor_edges (int which_monitor_set, int which_strut_set)
switch (which_monitor_set) switch (which_monitor_set)
{ {
case 0: case 0:
xins = g_list_prepend (xins, new_meta_rect ( 0, 0, 1600, 1200)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 0, 1600, 1200));
break; break;
case 1: case 1:
xins = g_list_prepend (xins, new_meta_rect ( 0, 0, 800, 1200)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 0, 800, 1200));
xins = g_list_prepend (xins, new_meta_rect (800, 0, 800, 1200)); xins = g_list_prepend (xins, mtk_rectangle_new (800, 0, 800, 1200));
break; break;
case 2: case 2:
xins = g_list_prepend (xins, new_meta_rect ( 0, 0, 1600, 600)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 0, 1600, 600));
xins = g_list_prepend (xins, new_meta_rect ( 0, 600, 1600, 600)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 600, 1600, 600));
break; break;
case 3: case 3:
xins = g_list_prepend (xins, new_meta_rect ( 0, 0, 1600, 600)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 0, 1600, 600));
xins = g_list_prepend (xins, new_meta_rect ( 0, 600, 800, 600)); xins = g_list_prepend (xins, mtk_rectangle_new ( 0, 600, 800, 600));
xins = g_list_prepend (xins, new_meta_rect (800, 600, 800, 600)); xins = g_list_prepend (xins, mtk_rectangle_new (800, 600, 800, 600));
break; break;
} }
@ -590,7 +577,7 @@ test_regions_okay (void)
/*************************************************************/ /*************************************************************/
region = get_screen_region (0); region = get_screen_region (0);
tmp = NULL; tmp = NULL;
tmp = g_list_prepend (tmp, new_meta_rect (0, 0, 1600, 1200)); tmp = g_list_prepend (tmp, mtk_rectangle_new (0, 0, 1600, 1200));
verify_lists_are_equal (region, tmp); verify_lists_are_equal (region, tmp);
meta_rectangle_free_list_and_elements (tmp); meta_rectangle_free_list_and_elements (tmp);
meta_rectangle_free_list_and_elements (region); meta_rectangle_free_list_and_elements (region);
@ -600,8 +587,8 @@ test_regions_okay (void)
/*************************************************************/ /*************************************************************/
region = get_screen_region (1); region = get_screen_region (1);
tmp = NULL; tmp = NULL;
tmp = g_list_prepend (tmp, new_meta_rect (0, 20, 400, 1180)); tmp = g_list_prepend (tmp, mtk_rectangle_new (0, 20, 400, 1180));
tmp = g_list_prepend (tmp, new_meta_rect (0, 20, 1600, 1140)); tmp = g_list_prepend (tmp, mtk_rectangle_new (0, 20, 1600, 1140));
verify_lists_are_equal (region, tmp); verify_lists_are_equal (region, tmp);
meta_rectangle_free_list_and_elements (tmp); meta_rectangle_free_list_and_elements (tmp);
meta_rectangle_free_list_and_elements (region); meta_rectangle_free_list_and_elements (region);
@ -611,11 +598,11 @@ test_regions_okay (void)
/*************************************************************/ /*************************************************************/
region = get_screen_region (2); region = get_screen_region (2);
tmp = NULL; tmp = NULL;
tmp = g_list_prepend (tmp, new_meta_rect ( 0, 20, 300, 1180)); tmp = g_list_prepend (tmp, mtk_rectangle_new ( 0, 20, 300, 1180));
tmp = g_list_prepend (tmp, new_meta_rect ( 450, 20, 350, 1180)); tmp = g_list_prepend (tmp, mtk_rectangle_new ( 450, 20, 350, 1180));
tmp = g_list_prepend (tmp, new_meta_rect (1200, 20, 400, 1180)); tmp = g_list_prepend (tmp, mtk_rectangle_new (1200, 20, 400, 1180));
tmp = g_list_prepend (tmp, new_meta_rect ( 0, 20, 800, 1130)); tmp = g_list_prepend (tmp, mtk_rectangle_new ( 0, 20, 800, 1130));
tmp = g_list_prepend (tmp, new_meta_rect ( 0, 20, 1600, 1080)); tmp = g_list_prepend (tmp, mtk_rectangle_new ( 0, 20, 1600, 1080));
verify_lists_are_equal (region, tmp); verify_lists_are_equal (region, tmp);
meta_rectangle_free_list_and_elements (tmp); meta_rectangle_free_list_and_elements (tmp);
meta_rectangle_free_list_and_elements (region); meta_rectangle_free_list_and_elements (region);
@ -625,9 +612,9 @@ test_regions_okay (void)
/*************************************************************/ /*************************************************************/
region = get_screen_region (3); region = get_screen_region (3);
tmp = NULL; tmp = NULL;
tmp = g_list_prepend (tmp, new_meta_rect ( 0, 20, 300, 1180)); /* 354000 */ tmp = g_list_prepend (tmp, mtk_rectangle_new ( 0, 20, 300, 1180)); /* 354000 */
tmp = g_list_prepend (tmp, new_meta_rect ( 380, 20, 1220, 1180)); /* 377600 */ tmp = g_list_prepend (tmp, mtk_rectangle_new ( 380, 20, 1220, 1180)); /* 377600 */
tmp = g_list_prepend (tmp, new_meta_rect ( 0, 20, 1600, 1130)); /* 791000 */ tmp = g_list_prepend (tmp, mtk_rectangle_new ( 0, 20, 1600, 1130)); /* 791000 */
#if 0 #if 0
printf ("Got to here...\n"); printf ("Got to here...\n");
char region_list[(RECT_LENGTH+2) * g_list_length (region)]; char region_list[(RECT_LENGTH+2) * g_list_length (region)];
@ -645,7 +632,7 @@ test_regions_okay (void)
/*************************************************************/ /*************************************************************/
region = get_screen_region (4); region = get_screen_region (4);
tmp = NULL; tmp = NULL;
tmp = g_list_prepend (tmp, new_meta_rect ( 800, 20, 800, 1180)); tmp = g_list_prepend (tmp, mtk_rectangle_new ( 800, 20, 800, 1180));
verify_lists_are_equal (region, tmp); verify_lists_are_equal (region, tmp);
meta_rectangle_free_list_and_elements (tmp); meta_rectangle_free_list_and_elements (tmp);
meta_rectangle_free_list_and_elements (region); meta_rectangle_free_list_and_elements (region);
@ -685,22 +672,22 @@ test_region_fitting (void)
/* Do some manual tests too */ /* Do some manual tests too */
region = get_screen_region (1); region = get_screen_region (1);
rect = meta_rect (50, 50, 400, 400); rect = MTK_RECTANGLE_INIT (50, 50, 400, 400);
g_assert (meta_rectangle_could_fit_in_region (region, &rect)); g_assert (meta_rectangle_could_fit_in_region (region, &rect));
g_assert (meta_rectangle_contained_in_region (region, &rect)); g_assert (meta_rectangle_contained_in_region (region, &rect));
rect = meta_rect (250, 0, 500, 1150); rect = MTK_RECTANGLE_INIT (250, 0, 500, 1150);
g_assert (!meta_rectangle_could_fit_in_region (region, &rect)); g_assert (!meta_rectangle_could_fit_in_region (region, &rect));
g_assert (!meta_rectangle_contained_in_region (region, &rect)); g_assert (!meta_rectangle_contained_in_region (region, &rect));
rect = meta_rect (250, 0, 400, 400); rect = MTK_RECTANGLE_INIT (250, 0, 400, 400);
g_assert (meta_rectangle_could_fit_in_region (region, &rect)); g_assert (meta_rectangle_could_fit_in_region (region, &rect));
g_assert (!meta_rectangle_contained_in_region (region, &rect)); g_assert (!meta_rectangle_contained_in_region (region, &rect));
meta_rectangle_free_list_and_elements (region); meta_rectangle_free_list_and_elements (region);
region = get_screen_region (2); region = get_screen_region (2);
rect = meta_rect (1000, 50, 600, 1100); rect = MTK_RECTANGLE_INIT (1000, 50, 600, 1100);
g_assert (meta_rectangle_could_fit_in_region (region, &rect)); g_assert (meta_rectangle_could_fit_in_region (region, &rect));
g_assert (!meta_rectangle_contained_in_region (region, &rect)); g_assert (!meta_rectangle_contained_in_region (region, &rect));
@ -737,21 +724,21 @@ test_clamping_to_region (void)
/* Do some manual tests too */ /* Do some manual tests too */
region = get_screen_region (1); region = get_screen_region (1);
rect = meta_rect (50, 50, 10000, 10000); rect = MTK_RECTANGLE_INIT (50, 50, 10000, 10000);
meta_rectangle_clamp_to_fit_into_region (region, meta_rectangle_clamp_to_fit_into_region (region,
fixed_directions, fixed_directions,
&rect, &rect,
&min_size); &min_size);
g_assert (rect.width == 1600 && rect.height == 1140); g_assert (rect.width == 1600 && rect.height == 1140);
rect = meta_rect (275, -50, 410, 10000); rect = MTK_RECTANGLE_INIT (275, -50, 410, 10000);
meta_rectangle_clamp_to_fit_into_region (region, meta_rectangle_clamp_to_fit_into_region (region,
fixed_directions, fixed_directions,
&rect, &rect,
&min_size); &min_size);
g_assert (rect.width == 400 && rect.height == 1180); g_assert (rect.width == 400 && rect.height == 1180);
rect = meta_rect (50, 50, 10000, 10000); rect = MTK_RECTANGLE_INIT (50, 50, 10000, 10000);
min_size.height = 1170; min_size.height = 1170;
meta_rectangle_clamp_to_fit_into_region (region, meta_rectangle_clamp_to_fit_into_region (region,
fixed_directions, fixed_directions,
@ -759,7 +746,7 @@ test_clamping_to_region (void)
&min_size); &min_size);
g_assert (rect.width == 400 && rect.height == 1180); g_assert (rect.width == 400 && rect.height == 1180);
rect = meta_rect (50, 50, 10000, 10000); rect = MTK_RECTANGLE_INIT (50, 50, 10000, 10000);
min_size.width = 600; min_size.height = 1170; min_size.width = 600; min_size.height = 1170;
g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING, g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING,
@ -772,7 +759,7 @@ test_clamping_to_region (void)
g_assert (rect.width == 600 && rect.height == 1170); g_assert (rect.width == 600 && rect.height == 1170);
rect = meta_rect (350, 50, 100, 1100); rect = MTK_RECTANGLE_INIT (350, 50, 100, 1100);
min_size.width = 1; min_size.height = 1; min_size.width = 1; min_size.height = 1;
fixed_directions = FIXED_DIRECTION_X; fixed_directions = FIXED_DIRECTION_X;
meta_rectangle_clamp_to_fit_into_region (region, meta_rectangle_clamp_to_fit_into_region (region,
@ -781,7 +768,7 @@ test_clamping_to_region (void)
&min_size); &min_size);
g_assert (rect.width == 100 && rect.height == 1100); g_assert (rect.width == 100 && rect.height == 1100);
rect = meta_rect (300, 70, 500, 1100); rect = MTK_RECTANGLE_INIT (300, 70, 500, 1100);
min_size.width = 1; min_size.height = 1; min_size.width = 1; min_size.height = 1;
fixed_directions = FIXED_DIRECTION_Y; fixed_directions = FIXED_DIRECTION_Y;
meta_rectangle_clamp_to_fit_into_region (region, meta_rectangle_clamp_to_fit_into_region (region,
@ -790,7 +777,7 @@ test_clamping_to_region (void)
&min_size); &min_size);
g_assert (rect.width == 400 && rect.height == 1100); g_assert (rect.width == 400 && rect.height == 1100);
rect = meta_rect (300, 70, 999999, 999999); rect = MTK_RECTANGLE_INIT (300, 70, 999999, 999999);
min_size.width = 100; min_size.height = 200; min_size.width = 100; min_size.height = 200;
fixed_directions = FIXED_DIRECTION_Y; fixed_directions = FIXED_DIRECTION_Y;
@ -851,35 +838,35 @@ test_clipping_to_region (void)
/* Do some manual tests too */ /* Do some manual tests too */
region = get_screen_region (2); region = get_screen_region (2);
rect = meta_rect (-50, -10, 10000, 10000); rect = MTK_RECTANGLE_INIT (-50, -10, 10000, 10000);
meta_rectangle_clip_to_region (region, meta_rectangle_clip_to_region (region,
fixed_directions, fixed_directions,
&rect); &rect);
g_assert (mtk_rectangle_equal (region->data, &rect)); g_assert (mtk_rectangle_equal (region->data, &rect));
rect = meta_rect (300, 1000, 400, 200); rect = MTK_RECTANGLE_INIT (300, 1000, 400, 200);
temp = meta_rect (300, 1000, 400, 150); temp = MTK_RECTANGLE_INIT (300, 1000, 400, 150);
meta_rectangle_clip_to_region (region, meta_rectangle_clip_to_region (region,
fixed_directions, fixed_directions,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (400, 1000, 300, 200); rect = MTK_RECTANGLE_INIT (400, 1000, 300, 200);
temp = meta_rect (450, 1000, 250, 200); temp = MTK_RECTANGLE_INIT (450, 1000, 250, 200);
meta_rectangle_clip_to_region (region, meta_rectangle_clip_to_region (region,
fixed_directions, fixed_directions,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (400, 1000, 300, 200); rect = MTK_RECTANGLE_INIT (400, 1000, 300, 200);
temp = meta_rect (400, 1000, 300, 150); temp = MTK_RECTANGLE_INIT (400, 1000, 300, 150);
meta_rectangle_clip_to_region (region, meta_rectangle_clip_to_region (region,
FIXED_DIRECTION_X, FIXED_DIRECTION_X,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (400, 1000, 300, 200); rect = MTK_RECTANGLE_INIT (400, 1000, 300, 200);
temp = meta_rect (400, 1000, 300, 150); temp = MTK_RECTANGLE_INIT (400, 1000, 300, 150);
meta_rectangle_clip_to_region (region, meta_rectangle_clip_to_region (region,
FIXED_DIRECTION_X, FIXED_DIRECTION_X,
&rect); &rect);
@ -911,43 +898,43 @@ test_shoving_into_region (void)
/* Do some manual tests too */ /* Do some manual tests too */
region = get_screen_region (2); region = get_screen_region (2);
rect = meta_rect (300, 1000, 400, 200); rect = MTK_RECTANGLE_INIT (300, 1000, 400, 200);
temp = meta_rect (300, 950, 400, 200); temp = MTK_RECTANGLE_INIT (300, 950, 400, 200);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
fixed_directions, fixed_directions,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (425, 1000, 300, 200); rect = MTK_RECTANGLE_INIT (425, 1000, 300, 200);
temp = meta_rect (450, 1000, 300, 200); temp = MTK_RECTANGLE_INIT (450, 1000, 300, 200);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
fixed_directions, fixed_directions,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (425, 1000, 300, 200); rect = MTK_RECTANGLE_INIT (425, 1000, 300, 200);
temp = meta_rect (425, 950, 300, 200); temp = MTK_RECTANGLE_INIT (425, 950, 300, 200);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
FIXED_DIRECTION_X, FIXED_DIRECTION_X,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 300, 1000, 400, 200); rect = MTK_RECTANGLE_INIT ( 300, 1000, 400, 200);
temp = meta_rect (1200, 1000, 400, 200); temp = MTK_RECTANGLE_INIT (1200, 1000, 400, 200);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
FIXED_DIRECTION_Y, FIXED_DIRECTION_Y,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 800, 1150, 400, 50); /* Completely "offscreen" :) */ rect = MTK_RECTANGLE_INIT ( 800, 1150, 400, 50); /* Completely "offscreen" :) */
temp = meta_rect ( 800, 1050, 400, 50); temp = MTK_RECTANGLE_INIT ( 800, 1050, 400, 50);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
0, 0,
&rect); &rect);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (-1000, 0, 400, 150); /* Offscreen in 2 directions */ rect = MTK_RECTANGLE_INIT (-1000, 0, 400, 150); /* Offscreen in 2 directions */
temp = meta_rect ( 0, 20, 400, 150); temp = MTK_RECTANGLE_INIT ( 0, 20, 400, 150);
meta_rectangle_shove_into_region (region, meta_rectangle_shove_into_region (region,
0, 0,
&rect); &rect);
@ -1229,8 +1216,8 @@ test_gravity_resize (void)
rect.x = -500; /* Some random amount not equal to oldrect.x to ensure that rect.x = -500; /* Some random amount not equal to oldrect.x to ensure that
* the resize is done with respect to oldrect instead of rect * the resize is done with respect to oldrect instead of rect
*/ */
oldrect = meta_rect ( 50, 300, 250, 400); oldrect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect ( 50, 300, 20, 5); temp = MTK_RECTANGLE_INIT ( 50, 300, 20, 5);
meta_rectangle_resize_with_gravity (&oldrect, meta_rectangle_resize_with_gravity (&oldrect,
&rect, &rect,
META_GRAVITY_NORTH_WEST, META_GRAVITY_NORTH_WEST,
@ -1238,8 +1225,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 50, 300, 250, 400); rect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect (165, 300, 20, 5); temp = MTK_RECTANGLE_INIT (165, 300, 20, 5);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_NORTH, META_GRAVITY_NORTH,
@ -1247,8 +1234,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 50, 300, 250, 400); rect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect (280, 300, 20, 5); temp = MTK_RECTANGLE_INIT (280, 300, 20, 5);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_NORTH_EAST, META_GRAVITY_NORTH_EAST,
@ -1256,8 +1243,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 50, 300, 250, 400); rect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect ( 50, 695, 50, 5); temp = MTK_RECTANGLE_INIT ( 50, 695, 50, 5);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_SOUTH_WEST, META_GRAVITY_SOUTH_WEST,
@ -1265,8 +1252,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 50, 300, 250, 400); rect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect (150, 695, 50, 5); temp = MTK_RECTANGLE_INIT (150, 695, 50, 5);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_SOUTH, META_GRAVITY_SOUTH,
@ -1274,8 +1261,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 50, 300, 250, 400); rect = MTK_RECTANGLE_INIT ( 50, 300, 250, 400);
temp = meta_rect (250, 695, 50, 5); temp = MTK_RECTANGLE_INIT (250, 695, 50, 5);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_SOUTH_EAST, META_GRAVITY_SOUTH_EAST,
@ -1283,8 +1270,8 @@ test_gravity_resize (void)
5); 5);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (167, 738, 237, 843); rect = MTK_RECTANGLE_INIT (167, 738, 237, 843);
temp = meta_rect (167, 1113, 832, 93); temp = MTK_RECTANGLE_INIT (167, 1113, 832, 93);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_WEST, META_GRAVITY_WEST,
@ -1292,8 +1279,8 @@ test_gravity_resize (void)
93); 93);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect ( 167, 738, 237, 843); rect = MTK_RECTANGLE_INIT ( 167, 738, 237, 843);
temp = meta_rect (-131, 1113, 833, 93); temp = MTK_RECTANGLE_INIT (-131, 1113, 833, 93);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_CENTER, META_GRAVITY_CENTER,
@ -1301,8 +1288,8 @@ test_gravity_resize (void)
93); 93);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (300, 1000, 400, 200); rect = MTK_RECTANGLE_INIT (300, 1000, 400, 200);
temp = meta_rect (270, 994, 430, 212); temp = MTK_RECTANGLE_INIT (270, 994, 430, 212);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_EAST, META_GRAVITY_EAST,
@ -1310,8 +1297,8 @@ test_gravity_resize (void)
211); 211);
g_assert (mtk_rectangle_equal (&rect, &temp)); g_assert (mtk_rectangle_equal (&rect, &temp));
rect = meta_rect (300, 1000, 400, 200); rect = MTK_RECTANGLE_INIT (300, 1000, 400, 200);
temp = meta_rect (300, 1000, 430, 211); temp = MTK_RECTANGLE_INIT (300, 1000, 430, 211);
meta_rectangle_resize_with_gravity (&rect, meta_rectangle_resize_with_gravity (&rect,
&rect, &rect,
META_GRAVITY_STATIC, META_GRAVITY_STATIC,

2
src/tests/meta-kms-test-utils.c
View File

@ -124,7 +124,7 @@ meta_get_mode_fixed_rect_16 (MetaKmsMode *mode)
MetaRectangle MetaRectangle
meta_get_mode_rect (MetaKmsMode *mode) meta_get_mode_rect (MetaKmsMode *mode)
{ {
return META_RECTANGLE_INIT (0, 0, return MTK_RECTANGLE_INIT (0, 0,
meta_kms_mode_get_width (mode), meta_kms_mode_get_width (mode),
meta_kms_mode_get_height (mode)); meta_kms_mode_get_height (mode));
} }

2
src/tests/native-kms-device.c
View File

@ -536,7 +536,7 @@ meta_test_kms_device_discard_disabled (void)
META_FIXED_16_RECTANGLE_INIT_INT (0, 0, META_FIXED_16_RECTANGLE_INIT_INT (0, 0,
cursor_width, cursor_width,
cursor_width), cursor_width),
META_RECTANGLE_INIT (10, 10, MTK_RECTANGLE_INIT (10, 10,
cursor_width, cursor_width,
cursor_width), cursor_width),
META_KMS_ASSIGN_PLANE_FLAG_NONE); META_KMS_ASSIGN_PLANE_FLAG_NONE);

6
src/tests/native-kms-updates.c
View File

@ -184,7 +184,7 @@ meta_test_kms_update_plane_assignments (void)
cursor_plane, cursor_plane,
cursor_buffer, cursor_buffer,
META_FIXED_16_RECTANGLE_INIT_INT (0, 0, 64, 64), META_FIXED_16_RECTANGLE_INIT_INT (0, 0, 64, 64),
META_RECTANGLE_INIT (24, 48, 64, 64), MTK_RECTANGLE_INIT (24, 48, 64, 64),
META_KMS_ASSIGN_PLANE_FLAG_NONE); META_KMS_ASSIGN_PLANE_FLAG_NONE);
g_assert_nonnull (cursor_plane_assignment); g_assert_nonnull (cursor_plane_assignment);
g_assert_cmpint (cursor_plane_assignment->src_rect.x, ==, 0); g_assert_cmpint (cursor_plane_assignment->src_rect.x, ==, 0);
@ -493,7 +493,7 @@ meta_test_kms_update_merge (void)
cursor_buffer1, cursor_buffer1,
META_FIXED_16_RECTANGLE_INIT_INT (0, 0, META_FIXED_16_RECTANGLE_INIT_INT (0, 0,
64, 64), 64, 64),
META_RECTANGLE_INIT (24, 48, 64, 64), MTK_RECTANGLE_INIT (24, 48, 64, 64),
META_KMS_ASSIGN_PLANE_FLAG_NONE); META_KMS_ASSIGN_PLANE_FLAG_NONE);
meta_kms_plane_assignment_set_cursor_hotspot (cursor_plane_assignment, meta_kms_plane_assignment_set_cursor_hotspot (cursor_plane_assignment,
10, 11); 10, 11);
@ -529,7 +529,7 @@ meta_test_kms_update_merge (void)
cursor_buffer2, cursor_buffer2,
META_FIXED_16_RECTANGLE_INIT_INT (0, 0, META_FIXED_16_RECTANGLE_INIT_INT (0, 0,
64, 64), 64, 64),
META_RECTANGLE_INIT (32, 56, 64, 64), MTK_RECTANGLE_INIT (32, 56, 64, 64),
META_KMS_ASSIGN_PLANE_FLAG_NONE); META_KMS_ASSIGN_PLANE_FLAG_NONE);
meta_kms_plane_assignment_set_cursor_hotspot (cursor_plane_assignment, meta_kms_plane_assignment_set_cursor_hotspot (cursor_plane_assignment,
9, 7); 9, 7);