Changeset 16357ec in mainline

Timestamp:

2020-09-25T15:21:09Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

efca2e4

Parents:

453f203b

git-author:

Jiri Svoboda <jiri@…> (2020-09-24 19:20:54)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-25 15:21:09)

Message:

Let font editor save and load typeface files

Location:

uspace/app/fontedit

Files:

• fontedit.c (modified) (9 diffs)
• fontedit.h (modified) (1 diff)

uspace/app/fontedit/fontedit.c

@@ -148 +148 @@
                 printf("Save!\n");
                 (void) gfx_glyph_bmp_save(fedit->gbmp);
-                rc = gfx_typeface_save(fedit->typeface, "/test.tpf");
+                rc = gfx_typeface_save(fedit->typeface, fedit->fname);
                 if (rc != EOK)
                         printf("Error saving typeface.\n");
@@ -426 +426 @@
  *
  * @param display_svc Display service
+ * @param fname Font file to open or @c NULL to create new font
  * @param rfedit Place to store pointer to new font editor
  * @return EOK on success or an error code
  */
-static errno_t font_edit_create(const char *display_svc, font_edit_t **rfedit)
+static errno_t font_edit_create(const char *display_svc, const char *fname,
+    font_edit_t **rfedit)
 {
         canvas_gc_t *cgc = NULL;
@@ -439 +441 @@
         gfx_typeface_t *tface = NULL;
         gfx_font_t *font = NULL;
+        gfx_font_info_t *finfo;
         gfx_font_props_t props;
         gfx_font_metrics_t metrics;
@@ -504 +507 @@
         gc = canvas_gc_get_ctx(cgc);
 
-        rc = gfx_typeface_create(gc, &tface);
-        if (rc != EOK) {
-                printf("Error creating typeface.\n");
-                goto error;
-        }
-
-        gfx_font_props_init(&props);
-        gfx_font_metrics_init(&metrics);
-
-        rc = gfx_font_create(tface, &props, &metrics, &font);
-        if (rc != EOK) {
-                printf("Error creating font.\n");
-                goto error;
-        }
-
-        gfx_glyph_metrics_init(&gmetrics);
-
-        rc = gfx_glyph_create(font, &gmetrics, &glyph);
-        if (rc != EOK) {
-                printf("Error creating glyph.\n");
-                goto error;
-        }
-
-        rc = gfx_glyph_set_pattern(glyph, "A");
-        if (rc != EOK) {
-                printf("Error setting glyph pattern.\n");
-                goto error;
+        if (fname == NULL) {
+                rc = gfx_typeface_create(gc, &tface);
+                if (rc != EOK) {
+                        printf("Error creating typeface.\n");
+                        goto error;
+                }
+
+                gfx_font_props_init(&props);
+                gfx_font_metrics_init(&metrics);
+
+                rc = gfx_font_create(tface, &props, &metrics, &font);
+                if (rc != EOK) {
+                        printf("Error creating font.\n");
+                        goto error;
+                }
+
+                gfx_glyph_metrics_init(&gmetrics);
+
+                rc = gfx_glyph_create(font, &gmetrics, &glyph);
+                if (rc != EOK) {
+                        printf("Error creating glyph.\n");
+                        goto error;
+                }
+
+                rc = gfx_glyph_set_pattern(glyph, "A");
+                if (rc != EOK) {
+                        printf("Error setting glyph pattern.\n");
+                        goto error;
+                }
+        } else {
+                rc = gfx_typeface_open(gc, fname, &tface);
+                if (rc != EOK) {
+                        printf("Error opening typeface '%s.\n",
+                            fname);
+                        goto error;
+                }
+
+                finfo = gfx_typeface_first_font(tface);
+                rc = gfx_font_open(finfo, &font);
+                if (rc != EOK) {
+                        printf("Error opening font.\n");
+                        goto error;
+                }
+
+                glyph = gfx_font_first_glyph(font);
         }
 
@@ -543 +564 @@
         sig_connect(&canvas->keyboard_event, &canvas->widget,
             font_edit_kbd_event);
+
+        if (fname == NULL)
+                fname = "new.tpf";
 
         fedit->cgc = cgc;
@@ -549 +573 @@
         fedit->height = vh;
         fedit->pen_color = 1;
+        fedit->fname = fname;
         fedit->typeface = tface;
         fedit->font = font;
@@ -583 +608 @@
 static void print_syntax(void)
 {
-        printf("Syntax: fontedit [-d <display>]\n");
+        printf("Syntax: fontedit [-d <display>] [<file.tpf>]\n");
 }
 
@@ -590 +615 @@
         errno_t rc;
         const char *display_svc = DISPLAY_DEFAULT;
+        const char *fname = NULL;
         font_edit_t *fedit;
         int i;
@@ -611 +637 @@
         }
 
-        rc = font_edit_create(display_svc, &fedit);
+        /* File name argument? */
+        if (i < argc) {
+                fname = argv[i];
+                ++i;
+        }
+
+        /* Extra arguments? */
+        if (i < argc) {
+                printf("Unexpected argument '%s'.\n", argv[i]);
+                print_syntax();
+                return 1;
+        }
+
+        rc = font_edit_create(display_svc, fname, &fedit);
         if (rc != EOK)
                 return 1;

uspace/app/fontedit/fontedit.h

@@ -54 +54 @@
         /** Pen color (1 = set, 0 = reset) */
         int pen_color;
+        /** File name */
+        const char *fname;
         /** Typeface */
         gfx_typeface_t *typeface;