Skip to content

Commit a467e79

Browse files
committed
Resync w/ FBInk 1.21.0
1 parent 63ddc21 commit a467e79

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

ffi/fbink_h.lua

+13-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ typedef enum {
4444
CENTER = 1,
4545
EDGE = 2,
4646
} ALIGN_INDEX_T;
47+
typedef enum {
48+
NO_PADDING = 0,
49+
HORI_PADDING = 1,
50+
VERT_PADDING = 2,
51+
FULL_PADDING = 3,
52+
} PADDING_INDEX_T;
4753
typedef enum {
4854
FG_BLACK = 0,
4955
FG_GRAY1 = 1,
@@ -97,13 +103,16 @@ typedef enum {
97103
WFM_GCK16 = 13,
98104
WFM_GLKW16 = 14,
99105
WFM_INIT = 15,
106+
WFM_UNKNOWN = 16,
107+
WFM_INIT2 = 17,
100108
} WFM_MODE_INDEX_T;
101109
typedef enum {
102110
HWD_PASSTHROUGH = 0,
103111
HWD_FLOYD_STEINBERG = 1,
104112
HWD_ATKINSON = 2,
105113
HWD_ORDERED = 3,
106114
HWD_QUANT_ONLY = 4,
115+
HWD_LEGACY = 255,
107116
} HW_DITHER_INDEX_T;
108117
typedef enum {
109118
NTX_ROTA_STRAIGHT = 0,
@@ -172,7 +181,7 @@ typedef struct {
172181
short int scaled_width;
173182
short int scaled_height;
174183
uint8_t wfm_mode;
175-
bool is_dithered;
184+
uint8_t dithering_mode;
176185
bool sw_dithering;
177186
bool is_nightmode;
178187
bool no_refresh;
@@ -188,6 +197,7 @@ typedef struct {
188197
float size_pt;
189198
short unsigned int size_px;
190199
bool is_centered;
200+
uint8_t padding;
191201
bool is_formatted;
192202
bool compute_only;
193203
bool no_truncation;
@@ -223,7 +233,7 @@ int fbink_add_ot_font(const char *, FONT_STYLE_T);
223233
int fbink_free_ot_fonts(void);
224234
int fbink_print_ot(int, const char *restrict, const FBInkOTConfig *restrict, const FBInkConfig *restrict, FBInkOTFit *restrict);
225235
int fbink_printf(int, const FBInkOTConfig *restrict, const FBInkConfig *restrict, const char *, ...);
226-
int fbink_refresh(int, uint32_t, uint32_t, uint32_t, uint32_t, uint8_t, const FBInkConfig *restrict);
236+
int fbink_refresh(int, uint32_t, uint32_t, uint32_t, uint32_t, const FBInkConfig *restrict);
227237
int fbink_wait_for_submission(int, uint32_t);
228238
int fbink_wait_for_complete(int, uint32_t);
229239
uint32_t fbink_get_last_marker(void);
@@ -232,7 +242,7 @@ int fbink_print_progress_bar(int, uint8_t, const FBInkConfig *restrict);
232242
int fbink_print_activity_bar(int, uint8_t, const FBInkConfig *restrict);
233243
int fbink_print_image(int, const char *, short int, short int, const FBInkConfig *restrict);
234244
int fbink_print_raw_data(int, unsigned char *, const int, const int, const size_t, short int, short int, const FBInkConfig *restrict);
235-
int fbink_cls(int, const FBInkConfig *restrict);
245+
int fbink_cls(int, const FBInkConfig *restrict, const FBInkRect *restrict);
236246
int fbink_dump(int, FBInkDump *restrict);
237247
int fbink_region_dump(int, short int, short int, short unsigned int, short unsigned int, const FBInkConfig *restrict, FBInkDump *restrict);
238248
int fbink_restore(int, const FBInkConfig *restrict, const FBInkDump *restrict);

0 commit comments

Comments
 (0)