From ebe36f9605d87a095beaaec3dcf7179cd55c5d27 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Tue, 17 Oct 2006 11:52:59 +0000
Subject: Make use of the ZPixmap format instead of XYPixmap when dealing with
 X Images.

---
 generic/Icon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'generic')

diff --git a/generic/Icon.c b/generic/Icon.c
index ab99429..9c0df1c 100644
--- a/generic/Icon.c
+++ b/generic/Icon.c
@@ -456,7 +456,7 @@ Draw(ZnItem     item)
       mask_gc = XCreateGC(wi->dpy, mask, 0, NULL);
       gc = XCreateGC(wi->dpy, drw, 0, NULL);
       dest_mask = XCreateImage(wi->dpy, Tk_Visual(wi->win), 1,
-                             XYPixmap, 0, NULL, dest_im_width, dest_im_height,
+                             ZPixmap, 0, NULL, dest_im_width, dest_im_height,
                              8, 0);
       dest_mask->data = ZnMalloc(dest_mask->bytes_per_line * dest_mask->height);
       memset(dest_mask->data, 0, dest_mask->bytes_per_line * dest_mask->height);
@@ -491,7 +491,7 @@ Draw(ZnItem     item)
       TkSetRegion(wi->dpy, mask_gc, clip);
       XFillRectangle(wi->dpy, mask, mask_gc, 0, 0, w, h);
   
-      src_mask = XGetImage(wi->dpy, mask, 0, 0, w, h, 1, XYPixmap);
+      src_mask = XGetImage(wi->dpy, mask, 0, 0, w, h, 1, ZPixmap);
       src_im = XGetImage(wi->dpy, pixmap, 0, 0, w, h, ~0L, ZPixmap);
 
       box[0] = icon->dev[0];
@@ -586,7 +586,7 @@ Draw(ZnItem     item)
       XSetForeground(wi->dpy, gc, 0);
       XFillRectangle(wi->dpy, drw, gc, 0, 0, max_width, max_height);
       dest_im = XCreateImage(wi->dpy, Tk_Visual(wi->win), 1,
-                             XYPixmap, 0, NULL, dest_im_width, dest_im_height,
+                             ZPixmap, 0, NULL, dest_im_width, dest_im_height,
                              8, 0);
       dest_im->data = ZnMalloc(dest_im->bytes_per_line * dest_im->height);
       memset(dest_im->data, 0, dest_im->bytes_per_line * dest_im->height);
@@ -600,7 +600,7 @@ Draw(ZnItem     item)
       XChangeGC(wi->dpy, gc, gc_mask, &values);
       XFillRectangle(wi->dpy, drw, gc, 0, 0, w, h);
 
-      src_im = XGetImage(wi->dpy, drw, 0, 0, w, h, 1, XYPixmap);
+      src_im = XGetImage(wi->dpy, drw, 0, 0, w, h, 1, ZPixmap);
 
       box[0] = icon->dev[0];
       box[1] = icon->dev[1];
-- 
cgit v1.1