Changeset 15d0046 in mainline for uspace/lib/draw/font/bitmap_backend.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/lib/draw/font/bitmap_backend.h (moved) (moved from kernel/arch/mips64/include/arch/arch.h ) (2 diffs)

uspace/lib/draw/font/bitmap_backend.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2014 Martin Sucha
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup draw
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef KERN_mips64_ARCH_H_
-#define KERN_mips64_ARCH_H_
+#ifndef DRAW_FONT_BITMAP_BACKEND_H_
+#define DRAW_FONT_BITMAP_BACKEND_H_
 
-#include <typedefs.h>
+#include <sys/types.h>
 
-#define TASKMAP_MAX_RECORDS        32
-#define CPUMAP_MAX_RECORDS         32
-#define BOOTINFO_TASK_NAME_BUFLEN  32
-
-extern size_t cpu_count;
+#include "../font.h"
+#include "../surface.h"
+#include "../source.h"
 
 typedef struct {
-        void *addr;
-        size_t size;
-        char name[BOOTINFO_TASK_NAME_BUFLEN];
-} utask_t;
+        int (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
+        int (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
+        int (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
+        void (*release)(void *);
+} bitmap_font_decoder_t;
 
-typedef struct {
-        uint32_t cpumap;
-        size_t cnt;
-        utask_t tasks[TASKMAP_MAX_RECORDS];
-} bootinfo_t;
-
-extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
+extern int bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
+    font_metrics_t, uint16_t, font_t **);
 
 #endif