Changeset 7e38970d in mainline for uspace/lib/ui/include/types/ui/cursor.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/ui/include/types/ui/cursor.h (moved) (moved from uspace/lib/draw/include/draw/gfx.h ) (3 diffs)

uspace/lib/ui/include/types/ui/cursor.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Martin Decky
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libui
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef GFX_H_
-#define GFX_H_
+#ifndef _LIBUI_TYPES_CURSOR_H_
+#define _LIBUI_TYPES_CURSOR_H_
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <uchar.h>
+/** Stock cursor types */
+typedef enum {
+        /** Standard arrow */
+        ui_curs_arrow,
+        /** Double arrow pointing up and down */
+        ui_curs_size_ud,
+        /** Double arrow pointing left and right */
+        ui_curs_size_lr,
+        /** Double arrow pointing up-left and down-right */
+        ui_curs_size_uldr,
+        /** Double arrow pointing up-right nad down-left */
+        ui_curs_size_urdl
+} ui_stock_cursor_t;
 
-#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 char32_t, bool *);
-extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
+enum {
+        /** Number of stock cursor types */
+        ui_curs_limit = ui_curs_size_urdl + 1
+};
 
 #endif