Changeset a728ed3 in mainline

Timestamp:

2008-12-22T22:13:11Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

d410328

Parents:

2d32081

Message:

When scrolling viewport, do not redraw glyphs. Instead use a (not very smart) blit.

File:

• uspace/srv/fb/fb.c (modified) (3 diffs)

uspace/srv/fb/fb.c

@@ -272 +272 @@
 
 
-/** Clear viewport
+/** Clear viewport.
  *
  * @param vport Viewport to clear
@@ -283 +283 @@
 }
 
-/** Scroll viewport by given number of lines
+/** Scroll viewport by the specified number of lines.
  *
  * @param vport Viewport to scroll
@@ -291 +291 @@
 static void vport_scroll(viewport_t *vport, int lines)
 {
-        unsigned int row, col;
+        /*
+         * Scroll backbuffer.
+         */
 
         if (lines > 0) {
-                memcpy(vport->backbuf, vport->backbuf + vport->cols * lines,
+                memmove(vport->backbuf, vport->backbuf + vport->cols * lines,
                     vport->cols * (vport->rows - lines));
                 memset(&vport->backbuf[BB_POS(vport, 0, vport->rows - lines)],
                     0, vport->cols * lines);
         } else {
-                memcpy(vport->backbuf - vport->cols * lines, vport->backbuf,
+                memmove(vport->backbuf - vport->cols * lines, vport->backbuf,
                     vport->cols * (vport->rows + lines));
                 memset(vport->backbuf, 0, - vport->cols * lines);
         }
 
-        for (row = 0; row < vport->rows; row++) {
-                for (col = 0; col < vport->cols; col++) {
-                        draw_glyph(vport, false, col, row);
-                }
-        }
+        /* 
+         * Scroll pixels.
+         */
+
+        unsigned int dist, height, alines;
+        unsigned int y, ry;
+        uint8_t *sp, *dp;
+
+        alines = lines > 0 ? lines : -lines;
+        dist = alines * FONT_SCANLINES;
+        height = (vport->rows - alines) * FONT_SCANLINES;
+
+        if (lines > 0) {
+                dp = &screen.fb_addr[FB_POS(vport->x, vport->y + 0)];
+                sp = &screen.fb_addr[FB_POS(vport->x, vport->y + dist)];
+                ry = height;
+        } else {
+                dp = &screen.fb_addr[FB_POS(vport->x, vport->y + dist)];
+                sp = &screen.fb_addr[FB_POS(vport->x, vport->y + 0)];
+                ry = 0;
+        }
+
+        /* Move pixels line by line. */
+        for (y = 0; y < height; y++) {
+                memcpy(dp, sp, vport->cols * FONT_WIDTH
+                    * screen.pixelbytes);
+
+                sp += screen.scanline;
+                dp += screen.scanline;
+        }
+
+        /* Fill emptied area with background color. */
+        draw_filled_rect(vport->x, vport->y + ry,
+            vport->x + COL2X(vport->cols), vport->y + ry + dist,
+            vport->style.bg_color);
 }