[gtk+/rendering-cleanup: 100/124] gdk: Draw redirected windows using Cairo
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 100/124] gdk: Draw redirected windows using Cairo
- Date: Thu, 22 Jul 2010 02:07:03 +0000 (UTC)
commit 812fae6ac4d9705aa1cce52d39bdc570700b191c
Author: Benjamin Otte <otte redhat com>
Date: Tue Jul 20 02:19:29 2010 +0200
gdk: Draw redirected windows using Cairo
gdk/gdkwindow.c | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 3519f1f..91854a3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3087,7 +3087,6 @@ gdk_window_end_paint (GdkWindow *window)
GdkWindowObject *private = (GdkWindowObject *)window;
GdkWindowObject *composited;
GdkWindowPaint *paint;
- GdkGC *tmp_gc;
GdkRectangle clip_box;
cairo_region_t *full_clip;
@@ -3118,8 +3117,6 @@ gdk_window_end_paint (GdkWindow *window)
cairo_region_get_extents (paint->region, &clip_box);
- tmp_gc = _gdk_drawable_get_scratch_gc (window, FALSE);
-
if (!paint->uses_implicit)
{
cairo_t *cr;
@@ -3143,27 +3140,22 @@ gdk_window_end_paint (GdkWindow *window)
{
int x_offset, y_offset;
cairo_region_t *region;
+ cairo_t *cr;
/* TODO: Should also use paint->region for clipping */
region = setup_redirect_clip (window, &x_offset, &y_offset);
- gdk_gc_set_clip_region (tmp_gc, region); /* This resets clip origin! */
- /* offset clip and tiles from window coords to pixmaps coords */
- gdk_gc_offset (tmp_gc, -x_offset, -y_offset);
+ cr = gdk_cairo_create (private->redirect->pixmap);
- gdk_draw_drawable (private->redirect->pixmap, tmp_gc, paint->pixmap,
- clip_box.x - paint->x_offset,
- clip_box.y - paint->y_offset,
- clip_box.x + x_offset,
- clip_box.y + y_offset,
- clip_box.width, clip_box.height);
+ cairo_translate (cr, x_offset, y_offset);
+ gdk_cairo_set_source_pixmap (cr, paint->pixmap, 0, 0);
+ gdk_cairo_region (cr, region);
+ cairo_fill (cr);
+ cairo_destroy (cr);
cairo_region_destroy (region);
}
- /* Reset clip region of the cached GdkGC */
- gdk_gc_set_clip_region (tmp_gc, NULL);
-
cairo_surface_destroy (paint->surface);
g_object_unref (paint->pixmap);
cairo_region_destroy (paint->region);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]