From 2562686eceb43a3d0adfa545a30e6b7aa36c7e43 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Thu, 23 Jun 2016 23:11:56 +0000 Subject: [PATCH] add other functions to wrappers for buf2d, libini git-svn-id: svn://kolibrios.org@6452 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/C_Layer/buf2d/kolibri_buf2d.h | 6 ++++++ contrib/C_Layer/libini/kolibri_libini.h | 3 +++ contrib/C_Layer/libini/loadlibini.asm | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/contrib/C_Layer/buf2d/kolibri_buf2d.h b/contrib/C_Layer/buf2d/kolibri_buf2d.h index b27e459908..1e54c155dd 100644 --- a/contrib/C_Layer/buf2d/kolibri_buf2d.h +++ b/contrib/C_Layer/buf2d/kolibri_buf2d.h @@ -47,6 +47,7 @@ enum BUF2D_OPT_CROP { }; extern void (*buf2d_create_asm)(struct buf2d_struct *) __attribute__((__stdcall__)); +extern void (*buf2d_curve_bezier_asm)(struct buf2d_struct *, unsigned int, unsigned int, unsigned int, unsigned int) __attribute__((__stdcall__)); struct buf2d_struct* buf2d_create(uint16_t tlx, uint16_t tly, unsigned int sizex, unsigned int sizey, unsigned int font_bgcolor, uint8_t color_bit) { @@ -61,6 +62,11 @@ struct buf2d_struct* buf2d_create(uint16_t tlx, uint16_t tly, unsigned int sizex return new_buf2d_struct; } +void buf2d_curve_bezier(struct buf2d_struct *buf, unsigned int p0_x, unsigned int p0_y, unsigned int p1_x, unsigned int p1_y, unsigned int p2_x, unsigned int p2_y, unsigned int color) +{ + buf2d_curve_bezier_asm(buf, (p0_x<<16)+p0_y, (p1_x<<16)+p1_y, (p2_x<<16)+p2_y, color); +} + extern void (*buf2d_draw)(struct buf2d_struct *) __attribute__((__stdcall__)); extern void (*buf2d_clear)(struct buf2d_struct *, unsigned int) __attribute__((__stdcall__)); extern void (*buf2d_delete)(struct buf2d_struct *) __attribute__((__stdcall__)); diff --git a/contrib/C_Layer/libini/kolibri_libini.h b/contrib/C_Layer/libini/kolibri_libini.h index bef2015686..d38f41de56 100644 --- a/contrib/C_Layer/libini/kolibri_libini.h +++ b/contrib/C_Layer/libini/kolibri_libini.h @@ -22,5 +22,8 @@ extern uint32_t (*LIBINI_get_str)(const char*, const char*, const char*, char*, extern uint32_t (*LIBINI_set_str)(const char*, const char*, const char*, const char*, uint32_t) __attribute__((__stdcall__)); extern uint32_t (*LIBINI_get_int)(const char*, const char*, const char*, uint32_t) __attribute__((__stdcall__)); extern uint32_t (*LIBINI_set_int)(const char*, const char*, const char*, uint32_t) __attribute__((__stdcall__)); +extern uint32_t (*LIBINI_get_color)(const char*, const char*, const char*, uint32_t) __attribute__((__stdcall__)); +extern uint32_t (*LIBINI_set_color)(const char*, const char*, const char*, uint32_t) __attribute__((__stdcall__)); +extern uint32_t (*LIBINI_get_shortcut)(const char*, const char*, const char*, uint32_t, const char*, uint32_t) __attribute__((__stdcall__)); #endif /* KOLIBRI_LIBINI_H */ diff --git a/contrib/C_Layer/libini/loadlibini.asm b/contrib/C_Layer/libini/loadlibini.asm index 3c69888bd3..610240ea6b 100644 --- a/contrib/C_Layer/libini/loadlibini.asm +++ b/contrib/C_Layer/libini/loadlibini.asm @@ -40,8 +40,10 @@ import lib_libini, \ LIBINI_get_str , 'ini_get_str' , \ LIBINI_get_int , 'ini_get_int' , \ LIBINI_get_color , 'int_get_color' , \ + LIBINI_get_shortcut , 'int_get_shortcut' , \ LIBINI_set_str , 'ini_set_str' , \ - LIBINI_set_int , 'ini_set_int' + LIBINI_set_int , 'ini_set_int' , \ + LIBINI_set_color , 'ini_set_color' public LIBINI_enum_sections as '_LIBINI_enum_sections' public LIBINI_enum_keys as '_LIBINI_enum_keys'