Changeset 2bb6d04 in mainline for uspace/lib/draw/include

Timestamp:

2019-06-25T14:58:16Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

aeba767

Parents:

cd9531d3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 12:14:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-25 14:58:16)

Message:

Curb the proliferation of libdraw headers

libdraw provides a lot of ambiguously named headers, which makes it
confusing. This change merges the subdirectories into single headers,
and moves all headers into draw subdirectory, so that it's obvious
at a glance what library the header belongs to.

Compare:

#include <path.h>
#include <source.h>
#include <font/bitmap_backend.h>
#include <font/pcf.h>

vs.

#include <draw/path.h>
#include <draw/source.h>
#include <draw/font.h>

Location:

uspace/lib/draw/include/draw

Files:

• codec.h (moved) (moved from uspace/lib/draw/codec/tga.gz.h ) (2 diffs)
• cursor.h (moved) (moved from uspace/lib/draw/cursor.h ) (1 diff)
• drawctx.h (moved) (moved from uspace/lib/draw/drawctx.h )
• font.h (moved) (moved from uspace/lib/draw/font.h ) (3 diffs)
• gfx.h (moved) (moved from uspace/lib/draw/gfx/font-8x16.h ) (3 diffs)
• path.h (moved) (moved from uspace/lib/draw/path.h )
• source.h (moved) (moved from uspace/lib/draw/source.h )
• surface.h (moved) (moved from uspace/lib/draw/surface.h )

uspace/lib/draw/include/draw/codec.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2014 Martin Decky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -34 +35 @@
  */
 
-#ifndef DRAW_CODEC_TGA_GZ_H_
-#define DRAW_CODEC_TGA_GZ_H_
+#ifndef DRAW_CODEC_H_
+#define DRAW_CODEC_H_
 
 #include <stddef.h>
-#include "../surface.h"
+#include "surface.h"
 
 extern surface_t *decode_tga_gz(void *, size_t, surface_flags_t);
 extern bool encode_tga_gz(surface_t *, void **, size_t *);
+extern surface_t *decode_tga(void *, size_t, surface_flags_t);
+extern bool encode_tga(surface_t *, void **, size_t *);
+extern surface_t *decode_webp(void *, size_t, surface_flags_t);
+extern bool encode_webp(surface_t *, void **, size_t *);
 
 #endif

uspace/lib/draw/include/draw/cursor.h

@@ -58 +58 @@
 } cursor_t;
 
+extern cursor_decoder_t cd_embedded;
+
 extern void cursor_init(cursor_t *, cursor_decoder_type_t, char *);
 extern void cursor_release(cursor_t *);

uspace/lib/draw/include/draw/font.h

@@ -40 +40 @@
 #include <stdint.h>
 
+#include "font.h"
 #include "surface.h"
 #include "source.h"
@@ -108 +109 @@
 } font_t;
 
+typedef struct {
+        errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
+        errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
+        errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
+        void (*release)(void *);
+} bitmap_font_decoder_t;
+
 extern font_t *font_create(font_backend_t *, void *);
 extern errno_t font_get_metrics(font_t *, font_metrics_t *);
@@ -120 +128 @@
     sysarg_t, sysarg_t);
 
+extern errno_t bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
+    font_metrics_t, uint16_t, font_t **);
+extern errno_t embedded_font_create(font_t **, uint16_t points);
+extern errno_t pcf_font_create(font_t **, char *path, uint16_t points);
+
 #endif
 

uspace/lib/draw/include/draw/gfx.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
  *
@@ -33 +34 @@
  */
 
-#ifndef FONT_8X16_H_
-#define FONT_8X16_H_
+#ifndef GFX_H_
+#define GFX_H_
 
 #include <stdint.h>
@@ -40 +41 @@
 #include <stddef.h>
 
+#define CURSOR_WIDTH   11
+#define CURSOR_HEIGHT  18
+
 #define FONT_GLYPHS     2899
 #define FONT_WIDTH      8
 #define FONT_SCANLINES  16
 #define FONT_ASCENDER   12
+
+extern uint8_t cursor_texture[];
+extern uint8_t cursor_mask[];
 
 extern uint16_t fb_font_glyph(const wchar_t, bool *);