From c01d945c998d70a9a43300a60b4cbc08534f5cc5 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 25 Apr 2009 07:53:28 +0000 Subject: [PATCH] missing use of ecore_x_drawable_rectangle_fill() SVN revision: 40360 --- .../ecore/src/lib/ecore_evas/ecore_evas_x.c | 34 +++---------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index d65d9b0131..65e087b760 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -1380,9 +1380,6 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped) { unsigned int foreground; Ecore_X_GC gc; -# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB - xcb_rectangle_t rectangle; -# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */ if (!ee->engine.x.mask) ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1); @@ -1390,18 +1387,8 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped) gc = ecore_x_gc_new(ee->engine.x.mask, ECORE_X_GC_VALUE_MASK_FOREGROUND, &foreground); -# ifdef BUILD_ECORE_EVAS_SOFTWARE_XCB - rectangle.x = 0; - rectangle.y = 0; - rectangle.width = ee->w; - rectangle.height = ee->h; - xcb_poly_fill_rectangle(ecore_x_connection_get(), - ee->engine.x.mask, gc, - 1, &rectangle); -# else - XFillRectangle(ecore_x_display_get(), ee->engine.x.mask, gc, - 0, 0, ee->w, ee->h); -# endif /* ! BUILD_ECORE_EVAS_SOFTWARE_XCB */ + ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc, + 0, 0, ee->w, ee->h); ecore_x_gc_del(gc); einfo->info.mask = ee->engine.x.mask; evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); @@ -1433,9 +1420,6 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped) { unsigned int foreground; Ecore_X_GC gc; -# ifdef BUILD_ECORE_EVAS_XRENDER_XCB - xcb_rectangle_t rectangle; -# endif /* ! BUILD_ECORE_EVAS_XRENDER_XCB */ if (!ee->engine.x.mask) ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1); @@ -1443,18 +1427,8 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped) gc = ecore_x_gc_new(ee->engine.x.mask, ECORE_X_GC_VALUE_MASK_FOREGROUND, &foreground); -# ifdef BUILD_ECORE_EVAS_XRENDER_XCB - rectangle.x = 0; - rectangle.y = 0; - rectangle.width = ee->w; - rectangle.height = ee->h; - xcb_poly_fill_rectangle(ecore_x_connection_get(), - ee->engine.x.mask, gc, - 1, &rectangle); -# else - XFillRectangle(ecore_x_display_get(), ee->engine.x.mask, gc, - 0, 0, ee->w, ee->h); -# endif /* ! BUILD_ECORE_EVAS_XRENDER_XCB */ + ecore_x_drawable_rectangle_fill(ee->engine.x.mask, gc, + 0, 0, ee->w, ee->h); ecore_x_gc_del(gc); einfo->info.mask = ee->engine.x.mask; evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);