Changeset 07bd231e in mainline

Timestamp:

2007-05-04T14:03:26Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4f42d52

Parents:

ea63704

Message:

copy proper portion of viewport on screen border
(fixes ticket #34)

File:

• uspace/fb/fb.c (modified) (2 diffs)

uspace/fb/fb.c

@@ -834 +834 @@
 {
         int y;
-        int rowsize;
-        int tmp;
+        int tmp, srcrowsize;
+        int realwidth, realheight, realrowsize;
         int width = vport->width;
         int height = vport->height;
@@ -841 +841 @@
         if (width + vport->x > screen.xres)
                 width = screen.xres - vport->x;
-        if (height + vport->y  > screen.yres)
+        if (height + vport->y > screen.yres)
                 height = screen.yres - vport->y;
-
-        rowsize = width * screen.pixelbytes;
-
-        for (y = 0; y < height; y++) {
+        
+        realwidth = pmap->width <= width ? pmap->width : width;
+        realheight = pmap->height <= height ? pmap->height : height;
+
+        srcrowsize = vport->width * screen.pixelbytes;
+        realrowsize = realwidth * screen.pixelbytes;
+        
+        for (y = 0; y < realheight; y++) {
                 tmp = (vport->y + y) * screen.scanline +
                         vport->x * screen.pixelbytes;
-                memcpy(pmap->data + rowsize * y, screen.fbaddress + tmp,
-                        rowsize); 
+                memcpy(pmap->data + srcrowsize * y, screen.fbaddress + tmp,
+                        realrowsize); 
         }
 }