Changeset 7e38970d in mainline for uspace/lib/gfxfont/include/gfx/typeface.h

Timestamp:

2020-12-07T00:08:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/gfxfont/include/gfx/typeface.h (moved) (moved from uspace/lib/gui/grid.h ) (2 diffs)

uspace/lib/gfxfont/include/gfx/typeface.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup gui
+/** @addtogroup libgfxfont
  * @{
  */
 /**
- * @file
+ * @file Typeface
  */
 
-#ifndef GUI_GRID_H_
-#define GUI_GRID_H_
+#ifndef _GFX_TYPEFACE_H
+#define _GFX_TYPEFACE_H
 
+#include <errno.h>
 #include <stddef.h>
-#include <io/pixel.h>
-#include "widget.h"
+#include <types/gfx/context.h>
+#include <types/gfx/font.h>
+#include <types/gfx/glyph.h>
+#include <types/gfx/typeface.h>
 
-typedef struct {
-        widget_t *widget;
-        size_t cols;
-        size_t rows;
-} grid_cell_t;
-
-typedef struct grid {
-        widget_t widget;
-        pixel_t background;
-        size_t cols;
-        size_t rows;
-        grid_cell_t *layout;
-        bool (*add)(struct grid *, widget_t *, size_t, size_t, size_t, size_t);
-} grid_t;
-
-extern bool init_grid(grid_t *, widget_t *, const void *, size_t, size_t,
-    pixel_t);
-extern grid_t *create_grid(widget_t *, const void *, size_t, size_t, pixel_t);
-extern void deinit_grid(grid_t *);
+extern errno_t gfx_typeface_create(gfx_context_t *, gfx_typeface_t **);
+extern void gfx_typeface_destroy(gfx_typeface_t *);
+extern gfx_font_info_t *gfx_typeface_first_font(gfx_typeface_t *);
+extern gfx_font_info_t *gfx_typeface_next_font(gfx_font_info_t *);
+extern errno_t gfx_typeface_open(gfx_context_t *, const char *,
+    gfx_typeface_t **);
+extern errno_t gfx_typeface_save(gfx_typeface_t *, const char *);
 
 #endif