Changeset 67b05ff in mainline for uspace/srv/hid/fb

Timestamp:

2011-08-10T18:34:23Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c6f08726

Parents:

62e29ae

Message:

cherrypick from fb server rewrite: store images as Truevision TGA (instead of PPM) and use a library to decode them into image maps

Location:

uspace/srv/hid/fb

Files:

• Makefile (modified) (1 diff)
• fb.c (modified) (1 diff)
• ppm.c (modified) (2 diffs)

uspace/srv/hid/fb/Makefile

@@ -86 +86 @@
 endif
 
-EXTRA_CFLAGS += -D$(UARCH)
+LIBS = $(LIBIMGMAP_PREFIX)/libimgmap.a
+EXTRA_CFLAGS += -I$(LIBIMGMAP_PREFIX) -D$(UARCH)
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/hid/fb/fb.c

@@ -1095 +1095 @@
                         shm = dest;
                         
-                        if (shm[0] != 'P')
+                        if ((shm[0] != 'P') || (shm[0] != 'I'))
                                 return false;
                         

uspace/srv/hid/fb/ppm.c

@@ -29 +29 @@
 #include <sys/types.h>
 #include <errno.h>
+#include <imgmap.h>
 
 #include "ppm.h"
@@ -94 +95 @@
         unsigned int coef;
         
+        /*
+         * This is temporary hack to draw
+         * image maps within the original code base.
+         * This will be completely rewritten in the
+         * new framebuffer server.
+         */
+        if (data[0] == 'I') {
+                imgmap_t *img = (imgmap_t *) data;
+                
+                if (img->visual != VISUAL_BGR_8_8_8)
+                        return EINVAL;
+                
+                data = img->data;
+                
+                for (sysarg_t y = 0; y < img->height; y++) {
+                        for (sysarg_t x = 0; x < img->width; x++) {
+                                if ((x > maxwidth) || (y > maxheight)) {
+                                        data += 3;
+                                        continue;
+                                }
+                                
+                                color = (data[2] << 16) + (data[1] << 8) + data[0];
+                                
+                                (*putpixel)(vport, sx + x, sy + y, color);
+                                data += 3;
+                        }
+                }
+                
+                return 0;
+        }
+        
         /* Read magic */
         if ((data[0] != 'P') || (data[1] != '6'))