Regenerated w/ latest ffi-cdecl version, which finally leaves C99 types

alone.

ffi/fbink_h.lua

@@ -114,69 +114,69 @@ typedef enum {
 typedef struct {
   long int user_hz;
   const char *restrict font_name;
-  unsigned int view_width;
-  unsigned int view_height;
-  unsigned int screen_width;
-  unsigned int screen_height;
-  unsigned int bpp;
+  uint32_t view_width;
+  uint32_t view_height;
+  uint32_t screen_width;
+  uint32_t screen_height;
+  uint32_t bpp;
   char device_name[16];
   char device_codename[16];
   char device_platform[16];
   short unsigned int device_id;
-  unsigned char pen_fg_color;
-  unsigned char pen_bg_color;
+  uint8_t pen_fg_color;
+  uint8_t pen_bg_color;
   short unsigned int screen_dpi;
   short unsigned int font_w;
   short unsigned int font_h;
   short unsigned int max_cols;
   short unsigned int max_rows;
-  unsigned char view_hori_origin;
-  unsigned char view_vert_origin;
-  unsigned char view_vert_offset;
-  unsigned char fontsize_mult;
-  unsigned char glyph_width;
-  unsigned char glyph_height;
-  _Bool is_perfect_fit;
-  _Bool is_kobo_non_mt;
-  unsigned char ntx_boot_rota;
-  unsigned char ntx_rota_quirk;
-  _Bool is_ntx_quirky_landscape;
-  unsigned char current_rota;
-  _Bool can_rotate;
+  uint8_t view_hori_origin;
+  uint8_t view_vert_origin;
+  uint8_t view_vert_offset;
+  uint8_t fontsize_mult;
+  uint8_t glyph_width;
+  uint8_t glyph_height;
+  bool is_perfect_fit;
+  bool is_kobo_non_mt;
+  uint8_t ntx_boot_rota;
+  uint8_t ntx_rota_quirk;
+  bool is_ntx_quirky_landscape;
+  uint8_t current_rota;
+  bool can_rotate;
 } FBInkState;
 typedef struct {
   short int row;
   short int col;
-  unsigned char fontmult;
-  unsigned char fontname;
-  _Bool is_inverted;
-  _Bool is_flashing;
-  _Bool is_cleared;
-  _Bool is_centered;
+  uint8_t fontmult;
+  uint8_t fontname;
+  bool is_inverted;
+  bool is_flashing;
+  bool is_cleared;
+  bool is_centered;
   short int hoffset;
   short int voffset;
-  _Bool is_halfway;
-  _Bool is_padded;
-  _Bool is_rpadded;
-  unsigned char fg_color;
-  unsigned char bg_color;
-  _Bool is_overlay;
-  _Bool is_bgless;
-  _Bool is_fgless;
-  _Bool no_viewport;
-  _Bool is_verbose;
-  _Bool is_quiet;
-  _Bool ignore_alpha;
-  unsigned char halign;
-  unsigned char valign;
+  bool is_halfway;
+  bool is_padded;
+  bool is_rpadded;
+  uint8_t fg_color;
+  uint8_t bg_color;
+  bool is_overlay;
+  bool is_bgless;
+  bool is_fgless;
+  bool no_viewport;
+  bool is_verbose;
+  bool is_quiet;
+  bool ignore_alpha;
+  uint8_t halign;
+  uint8_t valign;
   short int scaled_width;
   short int scaled_height;
-  unsigned char wfm_mode;
-  _Bool is_dithered;
-  _Bool sw_dithering;
-  _Bool is_nightmode;
-  _Bool no_refresh;
-  _Bool to_syslog;
+  uint8_t wfm_mode;
+  bool is_dithered;
+  bool sw_dithering;
+  bool is_nightmode;
+  bool no_refresh;
+  bool to_syslog;
 } FBInkConfig;
 typedef struct {
   struct {
@@ -187,15 +187,15 @@ typedef struct {
   } margins;
   float size_pt;
   short unsigned int size_px;
-  _Bool is_centered;
-  _Bool is_formatted;
-  _Bool compute_only;
-  _Bool no_truncation;
+  bool is_centered;
+  bool is_formatted;
+  bool compute_only;
+  bool no_truncation;
 } FBInkOTConfig;
 typedef struct {
   short unsigned int computed_lines;
   short unsigned int rendered_lines;
-  _Bool truncated;
+  bool truncated;
 } FBInkOTFit;
 typedef struct {
   short unsigned int left;
@@ -208,9 +208,9 @@ typedef struct {
   size_t size;
   FBInkRect area;
   FBInkRect clip;
-  unsigned char rota;
-  unsigned char bpp;
-  _Bool is_full;
+  uint8_t rota;
+  uint8_t bpp;
+  bool is_full;
 } FBInkDump;
 const char *fbink_version(void) __attribute__((const));
 int fbink_open(void);
@@ -223,13 +223,13 @@ int fbink_add_ot_font(const char *, FONT_STYLE_T);
 int fbink_free_ot_fonts(void);
 int fbink_print_ot(int, const char *restrict, const FBInkOTConfig *restrict, const FBInkConfig *restrict, FBInkOTFit *restrict);
 int fbink_printf(int, const FBInkOTConfig *restrict, const FBInkConfig *restrict, const char *, ...);
-int fbink_refresh(int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned char, const FBInkConfig *restrict);
-int fbink_wait_for_submission(int, unsigned int);
-int fbink_wait_for_complete(int, unsigned int);
-unsigned int fbink_get_last_marker(void);
+int fbink_refresh(int, uint32_t, uint32_t, uint32_t, uint32_t, uint8_t, const FBInkConfig *restrict);
+int fbink_wait_for_submission(int, uint32_t);
+int fbink_wait_for_complete(int, uint32_t);
+uint32_t fbink_get_last_marker(void);
 int fbink_reinit(int, const FBInkConfig *restrict);
-int fbink_print_progress_bar(int, unsigned char, const FBInkConfig *restrict);
-int fbink_print_activity_bar(int, unsigned char, const FBInkConfig *restrict);
+int fbink_print_progress_bar(int, uint8_t, const FBInkConfig *restrict);
+int fbink_print_activity_bar(int, uint8_t, const FBInkConfig *restrict);
 int fbink_print_image(int, const char *, short int, short int, const FBInkConfig *restrict);
 int fbink_print_raw_data(int, unsigned char *, const int, const int, const size_t, short int, short int, const FBInkConfig *restrict);
 int fbink_cls(int, const FBInkConfig *restrict);
@@ -238,6 +238,6 @@ int fbink_region_dump(int, short int, short int, short unsigned int, short unsig
 int fbink_restore(int, const FBInkConfig *restrict, const FBInkDump *restrict);
 int fbink_free_dump_data(FBInkDump *restrict);
 FBInkRect fbink_get_last_rect(void);
-int fbink_button_scan(int, _Bool, _Bool);
-int fbink_wait_for_usbms_processing(int, _Bool);
+int fbink_button_scan(int, bool, bool);
+int fbink_wait_for_usbms_processing(int, bool);
 ]]