Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        x.c 


Log Message:
Fix shape bug. Update some debug stuff.

===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- x.c 13 May 2006 17:05:00 -0000      1.138
+++ x.c 14 May 2006 10:47:50 -0000      1.139
@@ -1028,10 +1028,11 @@
    if (!xid)
       return;
 
-   if (xid->rects)
+   if (xid->rects || xid->num_rect < 0)
      {
        xid->num_rect = 0;
-       XFree(xid->rects);
+       if (xid->rects)
+          XFree(xid->rects);
        xid->rects = NULL;
        wasshaped = 1;
      }
@@ -1130,7 +1131,7 @@
        XRectangle         *r;
 
 #if DEBUG_SHAPE_OPS
-       Eprintf("EShapeGetRectangles-A %#lx nr=%d\n", win, xid->num_rect);
+       Eprintf("EShapeGetRectangles-A %#lx nr=%d\n", win->xwin, xid->num_rect);
 #endif
        *rn = xid->num_rect;
        *ord = xid->ord;
@@ -1148,7 +1149,7 @@
        XRectangle         *r, *rr;
 
 #if DEBUG_SHAPE_OPS
-       Eprintf("EShapeGetRectangles-B %#lx nr=%d\n", win, xid->num_rect);
+       Eprintf("EShapeGetRectangles-B %#lx nr=%d\n", win->xwin, xid->num_rect);
 #endif
        r = XShapeGetRectangles(disp, win->xwin, dest, rn, ord);
        if (r)
@@ -1231,8 +1232,8 @@
       return 0;
 
 #if DEBUG_SHAPE_PROPAGATE
-   Eprintf("EShapePropagate %#lx %d,%d %dx%d\n", win, xid->x, xid->y, xid->w,
-          xid->h);
+   Eprintf("EShapePropagate %#lx %d,%d %dx%d\n", win->xwin,
+          xid->x, xid->y, xid->w, xid->h);
 #endif
 
    XQueryTree(disp, xid->xwin, &rt, &par, &list, &num);




-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to