Changeset c6c39d4f in mainline

Timestamp:

2014-08-31T08:25:54Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8d3512f1

Parents:

794e368

Message:

Add a decoder for X11 pcf fonts.

Location:

uspace

Files:

• app/fontviewer/fontviewer.c (modified) (4 diffs)
• app/init/init.c (modified) (1 diff)
• lib/draw/Makefile (modified) (1 diff)
• lib/draw/font/pcf.c (added)
• lib/draw/font/pcf.h (added)

uspace/app/fontviewer/fontviewer.c

@@ -47 +47 @@
 #include <drawctx.h>
 #include <font/embedded.h>
+#include <font/pcf.h>
 #include <stdarg.h>
 #include <io/verify.h>
@@ -61 +62 @@
 uint16_t points = 16;
 bool show_metrics = true;
+char *font_path = NULL;
 
 static int draw(void);
@@ -105 +107 @@
 static int create_font(font_t **font, uint16_t points)
 {
-        return embedded_font_create(font, points);
+        if (font_path == NULL) {
+                return embedded_font_create(font, points);
+        }
+        
+        return pcf_font_create(font, font_path, points);
 }
 
@@ -248 +254 @@
         
         if (argc < 3) {
-                printf("No image files specified.\n");
-                return 1;
+                font_path = NULL;
+        }
+        else {
+                font_path = argv[2];
         }
         

uspace/app/init/init.c

@@ -356 +356 @@
                 gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
                 gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
-                task_spawnl(NULL, NULL, "/app/fontviewer", "/app/fontviewer", "comp:0/winreg", "/cu12.pcf", NULL);
         }
         

uspace/lib/draw/Makefile

@@ -38 +38 @@
         font/embedded.c \
         font/bitmap_backend.c \
+        font/pcf.c \
         gfx/font-8x16.c \
         gfx/cursor-11x18.c \