[planner: 12/61] eel-canvas-rect: Drop unused HAVE_RENDER code paths




commit b56235d00d7f67a6f34022e6fbde102f088cc778
Author: Mart Raudsepp <leio gentoo org>
Date:   Sat Mar 7 00:02:31 2020 +0200

    eel-canvas-rect: Drop unused HAVE_RENDER code paths
    
    This may have been useful, but doesn't fit a port to cairo and gtk3.

 src/eel-canvas-rect.c | 81 ---------------------------------------------------
 1 file changed, 81 deletions(-)
---
diff --git a/src/eel-canvas-rect.c b/src/eel-canvas-rect.c
index 8e6b7a02..f6aecb6f 100644
--- a/src/eel-canvas-rect.c
+++ b/src/eel-canvas-rect.c
@@ -31,11 +31,6 @@
 #include <glib.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
 
-/* FIXME: check for this in configure and use it. */
-#ifdef HAVE_RENDER
-#include <X11/extensions/Xrender.h>
-#endif
-
 /*
  * name                        type            read/write      description
  * ------------------------------------------------------------------------------------------
@@ -73,11 +68,6 @@ struct EelCanvasRectDetails {
        ArtDRect last_outline_update_rect;
        GdkGC *fill_gc;         /* GC for fill, lazily allocated */
        GdkGC *outline_gc;      /* GC for outline */
-
-#ifdef HAVE_RENDER
-       gboolean use_render;
-       XRenderPictFormat *format;
-#endif
 };
 
 
@@ -363,31 +353,8 @@ eel_canvas_rect_realize (GnomeCanvasItem *item)
 {
        EelCanvasRect *rect = EEL_CANVAS_RECT (item);
 
-#ifdef HAVE_RENDER
-       EelCanvasRectDetails *details;
-       int event_base, error_base;
-
-       details = rect->details;
-#endif
-
        eel_canvas_rect_update_outline_gc (rect, TRUE);
 
-#ifdef HAVE_RENDER
-       details->use_render = XRenderQueryExtension (gdk_display, &event_base, &error_base);
-
-       if (details->use_render) {
-               Display *dpy;
-               GdkVisual *gdk_visual;
-               Visual *visual;
-
-               dpy = gdk_x11_drawable_get_xdisplay (GTK_WIDGET (item->canvas)->window);
-               gdk_visual = gtk_widget_get_visual (GTK_WIDGET (item->canvas));
-               visual = gdk_x11_visual_get_xvisual (gdk_visual);
-
-               details->format = XRenderFindVisualFormat (dpy, visual);
-       }
-#endif
-
        if (GNOME_CANVAS_ITEM_CLASS (eel_canvas_rect_parent_class)->realize) {
                GNOME_CANVAS_ITEM_CLASS (eel_canvas_rect_parent_class)->realize (item);
        }
@@ -482,58 +449,10 @@ render_rect_alpha (EelCanvasRect *rect,
        int rowstride, i;
        guchar r, g, b, a;
 
-#ifdef HAVE_RENDER
-       EelCanvasRectDetails *details;
-#endif
-
        if (width <= 0 || height <= 0 ) {
                return;
        }
 
-       r = (rgba >> 24) & 0xff;
-       g = (rgba >> 16) & 0xff;
-       b = (rgba >> 8) & 0xff;
-       a = (rgba >> 0) & 0xff;
-
-#ifdef HAVE_RENDER
-       details = rect->details;
-
-       if (details->use_render) {
-               Display *dpy;
-               Picture  pict;
-               XRenderPictureAttributes attributes;
-               XRenderColor color;
-
-               dpy = gdk_x11_drawable_get_xdisplay (drawable);
-
-               pict = XRenderCreatePicture (dpy,
-                                            gdk_x11_drawable_get_xid (drawable),
-                                            details->format,
-                                            0,
-                                            &attributes);
-
-
-               /* Convert to premultiplied alpha: */
-               r = r * a / 255;
-               g = g * a / 255;
-               b = b * a / 255;
-
-               color.red = (r << 8) + r;
-               color.green = (g << 8) + g;
-               color.blue = (b << 8) + b;
-               color.alpha = (a << 8) + a;
-
-               XRenderFillRectangle (dpy,
-                                     PictOpOver,
-                                     pict,
-                                     &color,
-                                     x, y,
-                                     width, height);
-               XRenderFreePicture (dpy, pict);
-
-               return;
-       }
-#endif
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
        data = gdk_pixbuf_get_pixels (pixbuf);
        rowstride = gdk_pixbuf_get_rowstride (pixbuf);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]