Changeset 5fae123 in mainline

Timestamp:

2019-12-10T13:40:06Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5bded44

Parents:

23e86c6

git-author:

Jiri Svoboda <jiri@…> (2019-12-09 18:39:55)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-10 13:40:06)

Message:

KFB needs to translate bitmaps properly when rendering

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (1 diff)
• drv/fb/kfb/port.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -490 +490 @@
 {
         printf("Keyboard event type=%d key=%d\n", event->type, event->key);
-        quit = true;
+        if (event->type == KEY_PRESS)
+                quit = true;
 }
 

uspace/drv/fb/kfb/port.c

@@ -245 +245 @@
         gfx_coord2_t bmdim;
         gfx_coord2_t dim;
-        gfx_coord_t x, y;
+        gfx_coord2_t sp;
+        gfx_coord2_t dp;
+        gfx_coord2_t pos;
         pixelmap_t pbm;
         pixel_t color;
@@ -270 +272 @@
         pbm.data = kfbbm->alloc.pixels;
 
-        for (y = srect.p0.y; y < srect.p1.y; y++) {
-                for (x = srect.p0.x; x < srect.p1.x; x++) {
-                        color = pixelmap_get_pixel(&pbm, x, y);
+        for (pos.y = srect.p0.y; pos.y < srect.p1.y; pos.y++) {
+                for (pos.x = srect.p0.x; pos.x < srect.p1.x; pos.x++) {
+                        gfx_coord2_subtract(&pos, &kfbbm->rect.p0, &sp);
+                        gfx_coord2_add(&pos, &offs, &dp);
+
+                        color = pixelmap_get_pixel(&pbm, sp.x, sp.y);
                         kfb->pixel2visual(kfb->addr +
-                            FB_POS(kfb, x, y), color);
+                            FB_POS(kfb, dp.x, dp.y), color);
                 }
         }