Commit 804117c4 authored by Owen W. Taylor's avatar Owen W. Taylor

Remove MetaRegion

In many places, MetaRegion was being used entirely internally, rather
than for gtk2/gtk3 compatibility. In these cases, it's simpler to just
depend on cairo-1.10 (for both gtk2 and gtk3) and use cairo_region_t.

The few places where we did need GDK compatibility (GdkEvent.region and
gdk_window_shape_combine_mask) are replaced with a combination of
converting GdkRegion to cairo_region_t and conditional code.

https://bugzilla.gnome.org/show_bug.cgi?id=632474
parent 9a4d1686
......@@ -154,7 +154,7 @@ esac
AM_CONDITIONAL(INSTALL_LIBMUTTER_PRIVATE, test "$with_gtk" = "3.0")
MUTTER_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0"
MUTTER_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"
AC_SUBST(GTK_API_VERSION)
AC_ARG_ENABLE(gconf,
......
......@@ -50,7 +50,6 @@ mutter_SOURCES= \
include/compositor.h \
include/mutter-plugin.h \
include/mutter-window.h \
include/region.h \
include/compositor-mutter.h \
core/constraints.c \
core/constraints.h \
......@@ -147,7 +146,6 @@ libmutter_private_la_SOURCES= \
include/common.h \
ui/preview-widget.c \
ui/preview-widget.h \
include/region.h \
gdk2-drawing-utils.c \
gdk2-drawing-utils.h \
ui/theme-parser.c \
......@@ -187,8 +185,7 @@ libmutterinclude_base_headers = \
# atomnames.h: macros cause problems for scanning process
libmutterinclude_extra_headers = \
ui/preview-widget.h \
include/atomnames.h \
include/region.h
include/atomnames.h
if INSTALL_LIBMUTTER_PRIVATE
libmutterincludedir = $(includedir)/mutter/mutter-private
......
......@@ -68,7 +68,7 @@ struct _MutterShapedTexturePrivate
CoglHandle material;
CoglHandle material_unshaped;
MetaRegion *clip_region;
cairo_region_t *clip_region;
guint mask_width, mask_height;
......@@ -303,7 +303,7 @@ mutter_shaped_texture_paint (ClutterActor *actor)
CoglHandle material;
if (priv->clip_region && meta_region_is_empty (priv->clip_region))
if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
return;
if (!CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR (stex)))
......@@ -386,7 +386,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
if (priv->clip_region)
{
GdkRectangle *rects;
int n_rects;
int i;
......@@ -394,31 +393,27 @@ mutter_shaped_texture_paint (ClutterActor *actor)
* fall back and draw the whole thing */
# define MAX_RECTS 16
/* Would be nice to be able to check the number of rects first */
meta_region_get_rectangles (priv->clip_region, &rects, &n_rects);
if (n_rects > MAX_RECTS)
{
g_free (rects);
/* Fall through to following code */
}
else
n_rects = cairo_region_num_rectangles (priv->clip_region);
if (n_rects <= MAX_RECTS)
{
float coords[8];
float x1, y1, x2, y2;
for (i = 0; i < n_rects; i++)
{
GdkRectangle *rect = &rects[i];
cairo_rectangle_int_t rect;
x1 = rect->x;
y1 = rect->y;
x2 = rect->x + rect->width;
y2 = rect->y + rect->height;
cairo_region_get_rectangle (priv->clip_region, i, &rect);
coords[0] = rect->x / (alloc.x2 - alloc.x1);
coords[1] = rect->y / (alloc.y2 - alloc.y1);
coords[2] = (rect->x + rect->width) / (alloc.x2 - alloc.x1);
coords[3] = (rect->y + rect->height) / (alloc.y2 - alloc.y1);
x1 = rect.x;
y1 = rect.y;
x2 = rect.x + rect.width;
y2 = rect.y + rect.height;
coords[0] = rect.x / (alloc.x2 - alloc.x1);
coords[1] = rect.y / (alloc.y2 - alloc.y1);
coords[2] = (rect.x + rect.width) / (alloc.x2 - alloc.x1);
coords[3] = (rect.y + rect.height) / (alloc.y2 - alloc.y1);
coords[4] = coords[0];
coords[5] = coords[1];
......@@ -429,8 +424,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
&coords[0], 8);
}
g_free (rects);
return;
}
}
......@@ -624,7 +617,7 @@ mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
*/
void
mutter_shaped_texture_set_clip_region (MutterShapedTexture *stex,
MetaRegion *clip_region)
cairo_region_t *clip_region)
{
MutterShapedTexturePrivate *priv;
......@@ -634,7 +627,7 @@ mutter_shaped_texture_set_clip_region (MutterShapedTexture *stex,
if (priv->clip_region)
{
meta_region_destroy (priv->clip_region);
cairo_region_destroy (priv->clip_region);
priv->clip_region = NULL;
}
......
......@@ -33,8 +33,6 @@
#include <clutter/glx/clutter-glx.h>
#endif /* HAVE_GLX_TEXTURE_PIXMAP */
#include "region.h"
G_BEGIN_DECLS
#define MUTTER_TYPE_SHAPED_TEXTURE \
......@@ -101,7 +99,7 @@ void mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
/* Assumes ownership of clip_region */
void mutter_shaped_texture_set_clip_region (MutterShapedTexture *stex,
MetaRegion *clip_region);
cairo_region_t *clip_region);
G_END_DECLS
......
......@@ -7,7 +7,6 @@
#include "mutter-window-private.h"
#include "mutter-window-group.h"
#include "region.h"
struct _MutterWindowGroupClass
{
......@@ -102,8 +101,8 @@ static void
mutter_window_group_paint (ClutterActor *actor)
{
MutterWindowGroup *window_group = MUTTER_WINDOW_GROUP (actor);
MetaRegion *visible_region;
GdkRectangle screen_rect = { 0 };
cairo_region_t *visible_region;
cairo_rectangle_int_t screen_rect = { 0 };
GList *children, *l;
/* We walk the list from top to bottom (opposite of painting order),
......@@ -119,7 +118,7 @@ mutter_window_group_paint (ClutterActor *actor)
* optimization, however.)
*/
meta_screen_get_size (window_group->screen, &screen_rect.width, &screen_rect.height);
visible_region = meta_region_new_from_rectangle (&screen_rect);
visible_region = cairo_region_create_rectangle (&screen_rect);
for (l = children; l; l = l->next)
{
......@@ -135,22 +134,22 @@ mutter_window_group_paint (ClutterActor *actor)
continue;
/* Temporarily move to the coordinate system of the actor */
meta_region_translate (visible_region, - x, - y);
cairo_region_translate (visible_region, - x, - y);
mutter_window_set_visible_region (cw, visible_region);
if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (cw)) == 0xff)
{
MetaRegion *obscured_region = mutter_window_get_obscured_region (cw);
cairo_region_t *obscured_region = mutter_window_get_obscured_region (cw);
if (obscured_region)
meta_region_subtract (visible_region, obscured_region);
cairo_region_subtract (visible_region, obscured_region);
}
mutter_window_set_visible_region_beneath (cw, visible_region);
meta_region_translate (visible_region, x, y);
cairo_region_translate (visible_region, x, y);
}
meta_region_destroy (visible_region);
cairo_region_destroy (visible_region);
CLUTTER_ACTOR_CLASS (mutter_window_group_parent_class)->paint (actor);
......
......@@ -7,7 +7,6 @@
#include <X11/extensions/Xdamage.h>
#include "compositor-mutter.h"
#include "region.h"
MutterWindow *mutter_window_new (MetaWindow *window);
......@@ -38,12 +37,12 @@ void mutter_window_update_opacity (MutterWindow *cw);
void mutter_window_mapped (MutterWindow *cw);
void mutter_window_unmapped (MutterWindow *cw);
MetaRegion *mutter_window_get_obscured_region (MutterWindow *cw);
cairo_region_t *mutter_window_get_obscured_region (MutterWindow *cw);
void mutter_window_set_visible_region (MutterWindow *cw,
MetaRegion *visible_region);
cairo_region_t *visible_region);
void mutter_window_set_visible_region_beneath (MutterWindow *cw,
MetaRegion *beneath_region);
cairo_region_t *beneath_region);
void mutter_window_reset_visible_regions (MutterWindow *cw);
void mutter_window_effect_completed (MutterWindow *actor,
......
......@@ -41,10 +41,10 @@ struct _MutterWindowPrivate
gchar * desc;
/* If the window is shaped, a region that matches the shape */
MetaRegion *shape_region;
cairo_region_t *shape_region;
/* A rectangular region with the unshaped extends of the window
* texture */
MetaRegion *bounding_region;
cairo_region_t *bounding_region;
gint freeze_count;
......@@ -1341,7 +1341,7 @@ mutter_window_clear_shape_region (MutterWindow *self)
if (priv->shape_region)
{
meta_region_destroy (priv->shape_region);
cairo_region_destroy (priv->shape_region);
priv->shape_region = NULL;
}
}
......@@ -1353,7 +1353,7 @@ mutter_window_clear_bounding_region (MutterWindow *self)
if (priv->bounding_region)
{
meta_region_destroy (priv->bounding_region);
cairo_region_destroy (priv->bounding_region);
priv->bounding_region = NULL;
}
}
......@@ -1364,11 +1364,11 @@ mutter_window_update_bounding_region (MutterWindow *self,
int height)
{
MutterWindowPrivate *priv = self->priv;
GdkRectangle bounding_rectangle = { 0, 0, width, height };
cairo_rectangle_int_t bounding_rectangle = { 0, 0, width, height };
mutter_window_clear_bounding_region (self);
priv->bounding_region = meta_region_new_from_rectangle (&bounding_rectangle);
priv->bounding_region = cairo_region_create_rectangle (&bounding_rectangle);
}
static void
......@@ -1381,11 +1381,11 @@ mutter_window_update_shape_region (MutterWindow *self,
mutter_window_clear_shape_region (self);
priv->shape_region = meta_region_new ();
priv->shape_region = cairo_region_create ();
for (i = 0; i < n_rects; i++)
{
GdkRectangle rect = { rects[i].x, rects[i].y, rects[i].width, rects[i].height };
meta_region_union_rectangle (priv->shape_region, &rect);
cairo_rectangle_int_t rect = { rects[i].x, rects[i].y, rects[i].width, rects[i].height };
cairo_region_union_rectangle (priv->shape_region, &rect);
}
}
......@@ -1399,7 +1399,7 @@ mutter_window_update_shape_region (MutterWindow *self,
* Return value: (transfer none): the area obscured by the window,
* %NULL is the same as an empty region.
*/
MetaRegion *
cairo_region_t *
mutter_window_get_obscured_region (MutterWindow *self)
{
MutterWindowPrivate *priv = self->priv;
......@@ -1418,21 +1418,21 @@ mutter_window_get_obscured_region (MutterWindow *self)
#if 0
/* Print out a region; useful for debugging */
static void
dump_region (MetaRegion *region)
dump_region (cairo_region_t *region)
{
GdkRectangle *rects;
int n_rects;
int i;
meta_region_get_rectangles (region, &rects, &n_rects);
n_rects = cairo_region_num_rectangles (region);
g_print ("[");
for (i = 0; i < n_rects; i++)
{
cairo_rectangle_int_t rect;
cairo_region_get_rectangle (region, &rect);
g_print ("+%d+%dx%dx%d ",
rects[i].x, rects[i].y, rects[i].width, rects[i].height);
rect.x, rect.y, rect.width, rect.height);
}
g_print ("]\n");
g_free (rects);
}
#endif
......@@ -1447,11 +1447,11 @@ dump_region (MetaRegion *region)
* This will be set before painting then unset afterwards.
*/
void
mutter_window_set_visible_region (MutterWindow *self,
MetaRegion *visible_region)
mutter_window_set_visible_region (MutterWindow *self,
cairo_region_t *visible_region)
{
MutterWindowPrivate *priv = self->priv;
MetaRegion *texture_clip_region = NULL;
cairo_region_t *texture_clip_region = NULL;
/* Get the area of the window texture that would be drawn if
* we weren't obscured at all
......@@ -1459,21 +1459,21 @@ mutter_window_set_visible_region (MutterWindow *self,
if (priv->shaped)
{
if (priv->shape_region)
texture_clip_region = meta_region_copy (priv->shape_region);
texture_clip_region = cairo_region_copy (priv->shape_region);
}
else
{
if (priv->bounding_region)
texture_clip_region = meta_region_copy (priv->bounding_region);
texture_clip_region = cairo_region_copy (priv->bounding_region);
}
if (!texture_clip_region)
texture_clip_region = meta_region_new ();
texture_clip_region = cairo_region_create ();
/* Then intersect that with the visible region to get the region
* that we actually need to redraw.
*/
meta_region_intersect (texture_clip_region, visible_region);
cairo_region_intersect (texture_clip_region, visible_region);
/* Assumes ownership */
mutter_shaped_texture_set_clip_region (MUTTER_SHAPED_TEXTURE (priv->actor),
......@@ -1493,16 +1493,16 @@ mutter_window_set_visible_region (MutterWindow *self,
* then unset afterwards.
*/
void
mutter_window_set_visible_region_beneath (MutterWindow *self,
MetaRegion *beneath_region)
mutter_window_set_visible_region_beneath (MutterWindow *self,
cairo_region_t *beneath_region)
{
MutterWindowPrivate *priv = self->priv;
if (priv->shadow)
{
GdkRectangle shadow_rect;
cairo_rectangle_int_t shadow_rect;
ClutterActorBox box;
MetaOverlapType overlap;
cairo_region_overlap_t overlap;
/* We could compute an full clip region as we do for the window
* texture, but the shadow is relatively cheap to draw, and
......@@ -1517,10 +1517,10 @@ mutter_window_set_visible_region_beneath (MutterWindow *self,
shadow_rect.width = roundf (box.x2 - box.x1);
shadow_rect.height = roundf (box.y2 - box.y1);
overlap = meta_region_contains_rectangle (beneath_region, &shadow_rect);
overlap = cairo_region_contains_rectangle (beneath_region, &shadow_rect);
tidy_texture_frame_set_needs_paint (TIDY_TEXTURE_FRAME (priv->shadow),
overlap != META_REGION_OVERLAP_OUT);
overlap != CAIRO_REGION_OVERLAP_OUT);
}
}
......
......@@ -880,29 +880,5 @@ meta_later_remove (guint later_id)
}
}
#ifdef USE_CAIRO_REGION
#include "region.h"
void
meta_region_get_rectangles (MetaRegion *region,
GdkRectangle **rectangles,
int *n_rectangles)
{
int n = cairo_region_num_rectangles (region);
if (n_rectangles != NULL)
*n_rectangles = n;
if (rectangles != NULL)
{
int i;
*rectangles = g_new (cairo_rectangle_int_t, n);
for (i = 0; i < n; i++)
cairo_region_get_rectangle (region, i, *rectangles + i);
}
}
#endif
/* eof util.c */
#ifndef META_REGION_H
#define META_REGION_H
#ifndef PACKAGE_NAME
#error "<config.h> must be included before region.h"
#endif
#include <gdk/gdk.h>
#ifdef USE_CAIRO_REGION
#include <cairo.h>
#define MetaRegion cairo_region_t
typedef enum {
META_REGION_OVERLAP_IN = CAIRO_REGION_OVERLAP_IN,
META_REGION_OVERLAP_OUT = CAIRO_REGION_OVERLAP_OUT,
META_REGION_OVERLAP_PART = CAIRO_REGION_OVERLAP_PART
} MetaOverlapType;
#define meta_region_new() cairo_region_create()
#define meta_region_new_from_rectangle(rect) cairo_region_create_rectangle(rect)
#define meta_region_copy(r) cairo_region_copy(r)
#define meta_region_destroy(r) cairo_region_destroy(r)
#define meta_region_is_empty(r) cairo_region_is_empty(r)
#define meta_region_union_rectangle(r, rect) cairo_region_union_rectangle(r, rect)
#define meta_region_subtract(r, other) cairo_region_subtract(r, other)
#define meta_region_translate(r, x, y) cairo_region_translate(r, x, y)
#define meta_region_intersect(r, other) cairo_region_intersect(r, other)
#define meta_region_contains_rectangle(r, rect) cairo_region_contains_rectangle(r, rect)
void meta_region_get_rectangles (MetaRegion *region,
GdkRectangle **rectangles,
int *n_rectangles);
#else
#define MetaRegion GdkRegion
typedef enum {
META_REGION_OVERLAP_IN = GDK_OVERLAP_RECTANGLE_IN,
META_REGION_OVERLAP_OUT = GDK_OVERLAP_RECTANGLE_OUT,
META_REGION_OVERLAP_PART = GDK_OVERLAP_RECTANGLE_PART
} MetaOverlapType;
#define meta_region_new() gdk_region_new()
#define meta_region_new_from_rectangle(rect) gdk_region_rectangle(rect)
#define meta_region_copy(r) gdk_region_copy(r)
#define meta_region_destroy(r) gdk_region_destroy(r)
#define meta_region_is_empty(r) gdk_region_empty(r)
#define meta_region_union_rectangle(r, rect) gdk_region_union_with_rect(r, rect)
#define meta_region_subtract(r, other) gdk_region_subtract(r, other)
#define meta_region_translate(r, x, y) gdk_region_offset(r, x, y)
#define meta_region_intersect(r, other) gdk_region_intersect(r, other)
#define meta_region_contains_rectangle(r, rect) gdk_region_rect_in(r, rect)
#define meta_region_get_rectangles(r, rects, num) gdk_region_get_rectangles(r, rects, num)
#endif /* HAVE_CAIRO_REGION */
#endif /* META_REGION_H */
......@@ -27,7 +27,6 @@
#include <math.h>
#include "boxes.h"
#include "frames.h"
#include "region.h"
#include "util.h"
#include "core.h"
#include "menu.h"
......@@ -300,7 +299,7 @@ meta_frames_finalize (GObject *object)
typedef struct
{
GdkRectangle rect;
cairo_rectangle_int_t rect;
MetaPixmap *pixmap;
} CachedFramePiece;
......@@ -2111,9 +2110,9 @@ setup_bg_cr (cairo_t *cr, GdkWindow *window, int x_offset, int y_offset)
*/
static MetaPixmap *
generate_pixmap (MetaFrames *frames,
MetaUIFrame *frame,
GdkRectangle *rect)
generate_pixmap (MetaFrames *frames,
MetaUIFrame *frame,
cairo_rectangle_int_t *rect)
{
MetaPixmap *result;
cairo_t *cr;
......@@ -2220,11 +2219,12 @@ populate_cache (MetaFrames *frames,
}
static void
clip_to_screen (MetaRegion *region, MetaUIFrame *frame)
clip_to_screen (cairo_region_t *region,
MetaUIFrame *frame)
{
GdkRectangle frame_area;
GdkRectangle screen_area = { 0, 0, 0, 0 };
MetaRegion *tmp_region;
cairo_rectangle_int_t frame_area;
cairo_rectangle_int_t screen_area = { 0, 0, 0, 0 };
cairo_region_t *tmp_region;
/* Chop off stuff outside the screen; this optimization
* is crucial to handle huge client windows,
......@@ -2240,26 +2240,27 @@ clip_to_screen (MetaRegion *region, MetaUIFrame *frame)
META_CORE_GET_SCREEN_HEIGHT, &screen_area.height,
META_CORE_GET_END);
meta_region_translate (region, frame_area.x, frame_area.y);
cairo_region_translate (region, frame_area.x, frame_area.y);
tmp_region = meta_region_new_from_rectangle (&frame_area);
meta_region_intersect (region, tmp_region);
meta_region_destroy (tmp_region);
tmp_region = cairo_region_create_rectangle (&frame_area);
cairo_region_intersect (region, tmp_region);
cairo_region_destroy (tmp_region);
tmp_region = meta_region_new_from_rectangle (&screen_area);
meta_region_intersect (region, tmp_region);
meta_region_destroy (tmp_region);
tmp_region = cairo_region_create_rectangle (&screen_area);
cairo_region_intersect (region, tmp_region);
cairo_region_destroy (tmp_region);
meta_region_translate (region, - frame_area.x, - frame_area.y);
cairo_region_translate (region, - frame_area.x, - frame_area.y);
}
static void
subtract_client_area (MetaRegion *region, MetaUIFrame *frame)
subtract_client_area (cairo_region_t *region,
MetaUIFrame *frame)
{
GdkRectangle area;
cairo_rectangle_int_t area;
MetaFrameFlags flags;
MetaFrameType type;
MetaRegion *tmp_region;
cairo_region_t *tmp_region;
Display *display;
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
......@@ -2274,17 +2275,17 @@ subtract_client_area (MetaRegion *region, MetaUIFrame *frame)
type, frame->text_height, flags,
&area.y, NULL, &area.x, NULL);
tmp_region = meta_region_new_from_rectangle (&area);
meta_region_subtract (region, tmp_region);
meta_region_destroy (tmp_region);
tmp_region = cairo_region_create_rectangle (&area);
cairo_region_subtract (region, tmp_region);
cairo_region_destroy (tmp_region);
}
static void
cached_pixels_draw (CachedPixels *pixels,
cairo_t *cr,
MetaRegion *region)
cached_pixels_draw (CachedPixels *pixels,
cairo_t *cr,
cairo_region_t *region)
{
MetaRegion *region_piece;
cairo_region_t *region_piece;
int i;
for (i = 0; i < 4; i++)
......@@ -2298,9 +2299,9 @@ cached_pixels_draw (CachedPixels *pixels,
piece->rect.x, piece->rect.y);
cairo_paint (cr);
region_piece = meta_region_new_from_rectangle (&piece->rect);
meta_region_subtract (region, region_piece);
meta_region_destroy (region_piece);
region_piece = cairo_region_create_rectangle (&piece->rect);
cairo_region_subtract (region, region_piece);
cairo_region_destroy (region_piece);
}
}
}
......@@ -2313,8 +2314,8 @@ meta_frames_draw (GtkWidget *widget,
MetaUIFrame *frame;
MetaFrames *frames;
CachedPixels *pixels;
MetaRegion *region;
GdkRectangle *areas, clip;
cairo_region_t *region;
cairo_rectangle_int_t clip;
int i, n_areas;
cairo_surface_t *target;
......@@ -2336,7 +2337,7 @@ meta_frames_draw (GtkWidget *widget,
populate_cache (frames, frame);
region = meta_region_new_from_rectangle (&clip);
region = cairo_region_create_rectangle (&clip);
pixels = get_cache (frames, frame);
......@@ -2345,13 +2346,17 @@ meta_frames_draw (GtkWidget *widget,
clip_to_screen (region, frame);
subtract_client_area (region, frame);
meta_region_get_rectangles (region, &areas, &n_areas);
n_areas = cairo_region_num_rectangles (region);
for (i = 0; i < n_areas; i++)
{
cairo_rectangle_int_t area;
cairo_region_get_rectangle (region, i, &area);
cairo_save (cr);
gdk_cairo_rectangle (cr, &areas[i]);
cairo_rectangle (cr, area.x, area.y, area.width, area.height);
cairo_clip (cr);
cairo_push_group (cr);
......@@ -2364,9 +2369,7 @@ meta_frames_draw (GtkWidget *widget,
cairo_restore (cr);
}
g_free (areas);
meta_region_destroy (region);
cairo_region_destroy (region);
return TRUE;
}
......@@ -2378,9 +2381,10 @@ meta_frames_expose_event (GtkWidget *widget,
MetaUIFrame *frame;
MetaFrames *frames;
CachedPixels *pixels;
MetaRegion *region, *area_region;
GdkRectangle *areas;
cairo_region_t *region;
int i, n_areas;
GdkRectangle *event_rectangles;
int n_event_rectangles;
cairo_t *cr;
frames = META_FRAMES (widget);
......@@ -2398,7 +2402,11 @@ meta_frames_expose_event (GtkWidget *widget,
populate_cache (frames, frame);
region = meta_region_copy (event->region);
/* Count on GdkRectangle and cairo_rectangle_int_t being identical */
gdk_region_get_rectangles (event->region, &event_rectangles, &n_event_rectangles);
region = cairo_region_create_rectangles ((cairo_rectangle_int_t *)event_rectangles,
n_event_rectangles);
g_free (event_rectangles);
pixels = get_cache (frames, frame);
......@@ -2409,13 +2417,16 @@ meta_frames_expose_event (GtkWidget *widget,
clip_to_screen (region, frame);
subtract_client_area (region, frame);
meta_region_get_rectangles (region, &areas, &n_areas);
n_areas = cairo_region_num_rectangles (region);
for (i = 0; i < n_areas; i++)
{
area_region = meta_region_new_from_rectangle (&areas[i]);
GdkRectangle area;
gdk_window_begin_paint_region (event->window, area_region);
/* Count on GdkRectangle and cairo_rectangle_int_t being identical */
cairo_region_get_rectangle (region, i, (cairo_rectangle_int_t *)&area);
gdk_window_begin_paint_rect (event->window, &area);
cr = gdk_cairo_create (event->window);
/* no need to clip, begin_paint_region ensures the pixmap
* is only as big as the rect we use. */
......@@ -2424,13 +2435,9 @@ meta_frames_expose_event (GtkWidget *widget,
cairo_destroy (cr);
gdk_window_end_paint (event->window);
meta_region_destroy (area_region);
}
g_free (areas);
meta_region_destroy (region);
cairo_region_destroy (region);
return TRUE;
}
......@@ -2745,7 +2752,7 @@ get_control (MetaFrames *frames,
MetaFrameGeometry fgeom;
MetaFrameFlags flags;
gboolean has_vert, has_horiz;
GdkRectangle client;
cairo_rectangle_int_t client;
meta_frames_calc_geometry (frames, frame, &fgeom);
......
......@@ -487,11 +487,11 @@ meta_preview_get_mini_icon (void)
return default_icon;
}
MetaRegion *
cairo_region_t *
meta_preview_get_clip_region (MetaPreview *preview, gint new_window_width, gint new_window_height)
{
GdkRectangle xrect;
MetaRegion *corners_xregion, *window_xregion;
cairo_rectangle_int_t xrect;
cairo_region_t *corners_xregion, *window_xregion;
gint flags;
MetaFrameLayout *fgeom;
MetaFrameStyle *frame_style;
......@@ -500,14 +500,14 @@ meta_preview_get_clip_region (MetaPreview *preview, gint new_window_width, gint
flags = (META_PREVIEW (preview)->flags);
window_xregion = meta_region_new ();