Changeset 7e38970d in mainline for uspace/lib/gfxfont/private/glyph_bmp.h

Timestamp:

2020-12-07T00:08:37Z (4 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/private/glyph_bmp.h (moved) (moved from uspace/lib/gui/button.h ) (2 diffs)

uspace/lib/gfxfont/private/glyph_bmp.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup gui
+/** @addtogroup libgfxfont
  * @{
  */
 /**
- * @file
+ * @file Glyph structure
+ *
  */
 
-#ifndef GUI_BUTTON_H_
-#define GUI_BUTTON_H_
+#ifndef _GFX_PRIVATE_GLYPH_BMP_H
+#define _GFX_PRIVATE_GLYPH_BMP_H
 
-#include <stdint.h>
-#include <io/pixel.h>
+#include <gfx/coord.h>
+#include <types/gfx/glyph_bmp.h>
 
-#include <draw/source.h>
-#include <draw/font.h>
+/** Glyph bitmap
+ *
+ * Glyph bitmap open for editing. This is used to edit glyph bitmap.
+ * Updating the entire font bitmap whenever the glyph is resized could
+ * be costly. This allows to postpone the update until we are done editing.
+ *
+ * This is private to libgfxfont.
+ */
+struct gfx_glyph_bmp {
+        /** Containing glyph */
+        struct gfx_glyph *glyph;
+        /** Rectangle covered by bitmap */
+        gfx_rect_t rect;
+        /** Pixel array */
+        int *pixels;
+};
 
-#include "connection.h"
-#include "widget.h"
-
-typedef struct button {
-        widget_t widget;
-        source_t background;
-        source_t foreground;
-        source_t text;
-        char *caption;
-        font_t *font;
-        signal_t clicked;
-} button_t;
-
-extern bool init_button(button_t *, widget_t *, const void *, const char *,
-    uint16_t, pixel_t, pixel_t, pixel_t);
-extern button_t *create_button(widget_t *, const void *, const char *, uint16_t,
-    pixel_t, pixel_t, pixel_t);
-extern void deinit_button(button_t *);
+extern void gfx_glyph_bmp_find_used_rect(gfx_glyph_bmp_t *, gfx_rect_t *);
 
 #endif