aboutsummaryrefslogtreecommitdiff
path: root/subprojects/d2tk/d2tk
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2019-07-19 16:24:23 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2019-07-19 16:24:23 +0200
commitf0bf08fa367ccf8ba995ee63846ac5b0148b6dd1 (patch)
tree789007cbf2dacee3d0b061827c93aa561176c674 /subprojects/d2tk/d2tk
parentee86ca69533bab6fdcf2e542670423772e6ab833 (diff)
parent47aa369d0e0788ef069d7bb5448e467d64f393eb (diff)
downloadtracker.lv2-f0bf08fa367ccf8ba995ee63846ac5b0148b6dd1.tar.xz
Merge commit '47aa369d0e0788ef069d7bb5448e467d64f393eb'
Diffstat (limited to 'subprojects/d2tk/d2tk')
-rw-r--r--subprojects/d2tk/d2tk/base.h20
-rw-r--r--subprojects/d2tk/d2tk/core.h6
2 files changed, 22 insertions, 4 deletions
diff --git a/subprojects/d2tk/d2tk/base.h b/subprojects/d2tk/d2tk/base.h
index 2d4774f..547749b 100644
--- a/subprojects/d2tk/d2tk/base.h
+++ b/subprojects/d2tk/d2tk/base.h
@@ -221,7 +221,7 @@ d2tk_scrollbar_get_rect(d2tk_scrollbar_t *scrollbar);
D2TK_API d2tk_pane_t *
d2tk_pane_begin(d2tk_base_t *base, const d2tk_rect_t *rect, d2tk_id_t id,
- d2tk_flag_t flags, float fmin, float fmax, d2tk_pane_t *pane);
+ d2tk_flag_t flags, float fmin, float fmax, float fstep, d2tk_pane_t *pane);
D2TK_API bool
d2tk_pane_not_end(d2tk_pane_t *pane);
@@ -238,9 +238,9 @@ d2tk_pane_get_index(d2tk_pane_t *pane);
D2TK_API const d2tk_rect_t *
d2tk_pane_get_rect(d2tk_pane_t *pane);
-#define D2TK_BASE_PANE(BASE, RECT, ID, FLAGS, FMIN, FMAX, PANE) \
+#define D2TK_BASE_PANE(BASE, RECT, ID, FLAGS, FMIN, FMAX, FSTEP, PANE) \
for(d2tk_pane_t *(PANE) = d2tk_pane_begin((BASE), (RECT), \
- (ID), (FLAGS), (FMIN), (FMAX), alloca(d2tk_pane_sz)); \
+ (ID), (FLAGS), (FMIN), (FMAX), (FSTEP), alloca(d2tk_pane_sz)); \
d2tk_pane_not_end((PANE)); \
(PANE) = d2tk_pane_next((PANE)))
@@ -382,6 +382,14 @@ d2tk_base_toggle(d2tk_base_t *base, d2tk_id_t id, const d2tk_rect_t *rect,
#define d2tk_base_toggle_is_changed(...) \
d2tk_state_is_changed(d2tk_base_toggle(__VA_ARGS__))
+D2TK_API void
+d2tk_base_image(d2tk_base_t *base, ssize_t path_len, const char *path,
+ const d2tk_rect_t *rect, d2tk_align_t align);
+
+D2TK_API void
+d2tk_base_bitmap(d2tk_base_t *base, uint32_t w, uint32_t h, uint32_t stride,
+ const uint32_t *argb, const d2tk_rect_t *rect, d2tk_align_t align);
+
D2TK_API d2tk_state_t
d2tk_base_meter(d2tk_base_t *base, d2tk_id_t id, const d2tk_rect_t *rect,
const int32_t *value);
@@ -480,6 +488,12 @@ D2TK_API void
d2tk_flowmatrix_set_dst(d2tk_flowmatrix_t *flowmatrix, d2tk_id_t id,
const d2tk_pos_t *pos);
+D2TK_API d2tk_id_t
+d2tk_flowmatrix_get_src(d2tk_flowmatrix_t *flowmatrix, d2tk_pos_t *pos);
+
+D2TK_API d2tk_id_t
+d2tk_flowmatrix_get_dst(d2tk_flowmatrix_t *flowmatrix, d2tk_pos_t *pos);
+
D2TK_API d2tk_flowmatrix_node_t *
d2tk_flowmatrix_node_begin(d2tk_base_t *base, d2tk_flowmatrix_t *flowmatrix,
d2tk_pos_t *pos, d2tk_flowmatrix_node_t *node);
diff --git a/subprojects/d2tk/d2tk/core.h b/subprojects/d2tk/d2tk/core.h
index 1fec3f2..586de73 100644
--- a/subprojects/d2tk/d2tk/core.h
+++ b/subprojects/d2tk/d2tk/core.h
@@ -169,10 +169,14 @@ d2tk_core_text(d2tk_core_t *core, const d2tk_rect_t *rect, size_t sz,
const char *text, d2tk_align_t align);
D2TK_API void
-d2tk_core_image(d2tk_core_t *core, d2tk_rect_t *rect, size_t sz,
+d2tk_core_image(d2tk_core_t *core, const d2tk_rect_t *rect, size_t sz,
const char *path, d2tk_align_t align);
D2TK_API void
+d2tk_core_bitmap(d2tk_core_t *core, const d2tk_rect_t *rect, uint32_t w,
+ uint32_t h, uint32_t stride, const uint32_t *argb, d2tk_align_t align);
+
+D2TK_API void
d2tk_core_stroke_width(d2tk_core_t *core, d2tk_coord_t width);
D2TK_API void