nusb/kb: correct Mod4 scancode (125 → 91, to match what kbdfs has)

[plan9front.git] / sys / src / libmemlayer / draw.c

diff --git a/sys/src/libmemlayer/draw.c b/sys/src/libmemlayer/draw.c
index c352a0b2c3fbceaab100c4d5af5f7ad829dd0921..8b3ec6c85abaea2f4e5806be069b0906895b197b 100644 (file)
--- a/sys/src/libmemlayer/draw.c
+++ b/sys/src/libmemlayer/draw.c
@@ -42,7 +42,7 @@ ldrawop(Memimage *dst, Rectangle screenr, Rectangle clipr, void *etc, int insave
        if(!rectinrect(r, clipr)){
                oclipr = dst->clipr;
                dst->clipr = clipr;
-               ok = drawclip(dst, &r, d->src, &p0, d->mask, &p1, &srcr, &mr);
+               ok = drawclipnorepl(dst, &r, d->src, &p0, d->mask, &p1, &srcr, &mr);
                dst->clipr = oclipr;
                if(!ok)
                        return;
@@ -57,16 +57,11 @@ memdraw(Memimage *dst, Rectangle r, Memimage *src, Point p0, Memimage *mask, Poi
        Rectangle srcr, tr, mr;
        Memlayer *dl, *sl;
 
-       if(drawdebug)
-               iprint("memdraw %p %R %p %P %p %P\n", dst, r, src, p0, mask, p1);
-
        if(mask == nil)
                mask = memopaque;
 
-       if(mask->layer){
-if(drawdebug)  iprint("mask->layer != nil\n");
+       if(mask->layer)
                return; /* too hard, at least for now */
-       }
 
     Top:
        if(dst->layer==nil && src->layer==nil){
@@ -74,10 +69,8 @@ if(drawdebug)        iprint("mask->layer != nil\n");
                return;
        }
 
-       if(drawclip(dst, &r, src, &p0, mask, &p1, &srcr, &mr) == 0){
-if(drawdebug)  iprint("drawclip dstcr %R srccr %R maskcr %R\n", dst->clipr, src->clipr, mask->clipr);
+       if(drawclipnorepl(dst, &r, src, &p0, mask, &p1, &srcr, &mr) == 0)
                return;
-       }
 
        /*
         * Convert to screen coordinates.