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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Decky
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libui
  * @{
  */
 /**
- * @file
+ * @file Window decoration
  */
 
-#ifndef DRAW_SURFACE_H_
-#define DRAW_SURFACE_H_
+#ifndef _UI_TYPES_WDECOR_H
+#define _UI_TYPES_WDECOR_H
 
-#include <stdbool.h>
-#include <io/pixelmap.h>
+#include <gfx/coord.h>
+#include <types/ui/cursor.h>
 
-struct surface;
-typedef struct surface surface_t;
+struct ui_wdecor;
+typedef struct ui_wdecor ui_wdecor_t;
 
-typedef sysarg_t surface_coord_t;
+/** Window decoration style */
+typedef enum {
+        /** No style bits */
+        ui_wds_none = 0x0,
+        /** Window has a frame */
+        ui_wds_frame = 0x1,
+        /** Window has a title bar */
+        ui_wds_titlebar = 0x2,
+        /** Window has a close button */
+        ui_wds_close_btn = 0x4,
+        /** Window is resizable */
+        ui_wds_resizable = 0x8,
+        /** Window is decorated (default decoration) */
+        ui_wds_decorated = ui_wds_frame | ui_wds_titlebar | ui_wds_close_btn
+} ui_wdecor_style_t;
 
+/** Window resize type */
 typedef enum {
-        SURFACE_FLAG_NONE = 0,
-        SURFACE_FLAG_SHARED = 1
-} surface_flags_t;
+        ui_wr_none = 0,
 
-extern surface_t *surface_create(surface_coord_t, surface_coord_t, pixel_t *, surface_flags_t);
-extern void surface_destroy(surface_t *);
+        ui_wr_top = 0x1,
+        ui_wr_left = 0x2,
+        ui_wr_bottom = 0x4,
+        ui_wr_right = 0x8,
 
-extern bool surface_is_shared(surface_t *);
-extern pixel_t *surface_direct_access(surface_t *);
-extern pixelmap_t *surface_pixmap_access(surface_t *);
-extern void surface_get_resolution(surface_t *, surface_coord_t *, surface_coord_t *);
-extern void surface_get_damaged_region(surface_t *, surface_coord_t *, surface_coord_t *,
-    surface_coord_t *, surface_coord_t *);
-extern void surface_add_damaged_region(surface_t *, surface_coord_t, surface_coord_t,
-    surface_coord_t, surface_coord_t);
-extern void surface_reset_damaged_region(surface_t *);
+        ui_wr_top_left = ui_wr_top | ui_wr_left,
+        ui_wr_bottom_left = ui_wr_bottom | ui_wr_left,
+        ui_wr_bottom_right = ui_wr_bottom | ui_wr_right,
+        ui_wr_top_right = ui_wr_top | ui_wr_right
+} ui_wdecor_rsztype_t;
 
-extern void surface_put_pixel(surface_t *, surface_coord_t, surface_coord_t, pixel_t);
-extern pixel_t surface_get_pixel(surface_t *, surface_coord_t, surface_coord_t);
+/** Window decoration callbacks */
+typedef struct ui_wdecor_cb {
+        void (*close)(ui_wdecor_t *, void *);
+        void (*move)(ui_wdecor_t *, void *, gfx_coord2_t *);
+        void (*resize)(ui_wdecor_t *, void *, ui_wdecor_rsztype_t,
+            gfx_coord2_t *);
+        void (*set_cursor)(ui_wdecor_t *, void *, ui_stock_cursor_t);
+} ui_wdecor_cb_t;
 
 #endif