add .clang-format and format source code

demos/demo1_app.c

@@ -19,16 +19,16 @@
  *
  */
 
-#include "base/mem.h"
-#include "base/image.h"
-#include "base/utils.h"
-#include "base/label.h"
-#include "base/dialog.h"
 #include "base/button.h"
-#include "base/window.h"
 #include "base/check_button.h"
+#include "base/dialog.h"
+#include "base/image.h"
 #include "base/image_manager.h"
+#include "base/label.h"
+#include "base/mem.h"
 #include "base/progress_bar.h"
+#include "base/utils.h"
+#include "base/window.h"
 
 static ret_t on_inc(void* ctx, event_t* e) {
   widget_t* progress_bar = (widget_t*)ctx;
@@ -130,7 +130,7 @@ ret_t application_init() {
 
   progress_bar = progress_bar_create(win, 10, 80, 168, 30);
   widget_set_value(progress_bar, 40);
-//  progress_bar_set_show_text(progress_bar, TRUE);
+  //  progress_bar_set_show_text(progress_bar, TRUE);
 
   widget_on(ok, EVT_CLICK, on_inc, progress_bar);
   widget_on(cancel, EVT_CLICK, on_dec, progress_bar);

demos/demo1_main.c

@@ -19,23 +19,23 @@
  *
  */
 
-#include "resource.h"
 #include "base/platform.h"
+#include "resource.h"
 
 #ifdef WITH_STM32F103ZE_RAW
-#include "sys.h"
-#include "delay.h"
-#include "usart.h"
-#include "led.h"
 #include "button.h"
-#include "lcd_driver.h"
+#include "delay.h"
+#include "flash.h"
 #include "gui.h"
-#include "tim.h"
+#include "lcd_driver.h"
+#include "led.h"
+#include "main_loop/main_loop_stm32_raw.h"
 #include "rtc.h"
 #include "stdlib.h"
-#include "flash.h"
+#include "sys.h"
+#include "tim.h"
 #include "touch.h"
-#include "main_loop/main_loop_stm32_raw.h"
+#include "usart.h"
 
 static __align(8) uint32_t s_heap_mem[2048];
 #else

src/base/button.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/button.h"
+#include "base/mem.h"
 
 static ret_t button_on_paint_self(widget_t* widget, canvas_t* c) {
   xy_t x = 0;

src/base/canvas.c

@@ -539,13 +539,13 @@ ret_t canvas_test_paint(canvas_t* c, bool_t pressed, xy_t x, xy_t y) {
   canvas_draw_vline(c, 10, 300, 100);
   canvas_draw_text(c, L"abababababa", 10, 15, 110);
 
-	if(pressed) {
-		canvas_set_fill_color(c, fg);
-	} else {
-		canvas_set_fill_color(c, bg);
-	}
+  if (pressed) {
+    canvas_set_fill_color(c, fg);
+  } else {
+    canvas_set_fill_color(c, bg);
+  }
 
-	canvas_fill_rect(c, x, y, 10, 10);
+  canvas_fill_rect(c, x, y, 10, 10);
 
   canvas_end_frame(c);
 

src/base/check_button.c

@@ -19,11 +19,11 @@
  *
  */
 
-#include "base/mem.h"
-#include "base/wstr.h"
 #include "base/check_button.h"
 #include "base/image_manager.h"
+#include "base/mem.h"
 #include "base/widget_vtable.h"
+#include "base/wstr.h"
 
 enum { BORDER = 2 };
 

src/base/dialog.c

@@ -19,11 +19,11 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/dialog.h"
 #include "base/group_box.h"
-#include "base/main_loop.h"
 #include "base/image_manager.h"
+#include "base/main_loop.h"
+#include "base/mem.h"
 #include "base/window_manager.h"
 
 enum { TITLE_H = 32 };

src/base/group_box.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/group_box.h"
+#include "base/mem.h"
 
 static const widget_vtable_t s_group_box_vtable;
 

src/base/image.c

@@ -20,8 +20,8 @@
  */
 
 #include "base/image.h"
-#include "base/mem.h"
 #include "base/image_manager.h"
+#include "base/mem.h"
 
 static ret_t image_on_paint_self(widget_t* widget, canvas_t* c) {
   xy_t x = 0;

src/base/image_manager.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/image_manager.h"
+#include "base/mem.h"
 
 typedef struct _image_item_t {
   const char* name;

src/base/label.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/label.h"
+#include "base/mem.h"
 
 static ret_t label_on_paint_self(widget_t* widget, canvas_t* c) {
   xy_t x = 0;

src/base/mem_test.cc

@@ -1,5 +1,5 @@
-#include <assert.h>
 #include "base/mem.h"
+#include <assert.h>
 
 uint32_t heap[1024];
 

src/base/progress_bar.c

@@ -19,9 +19,9 @@
  *
  */
 
+#include "base/progress_bar.h"
 #include "base/mem.h"
 #include "base/utils.h"
-#include "base/progress_bar.h"
 
 static ret_t progress_bar_on_paint_self(widget_t* widget, canvas_t* c) {
   xy_t x = 0;

src/base/types_def.h

@@ -38,6 +38,8 @@ typedef enum _ret_t {
   RET_FAIL,
   RET_QUIT,
   RET_FOUND,
+  RET_REMOVE,
+  RET_REPEAT,
   RET_NOT_FOUND,
   RET_BAD_PARAMS
 }ret_t;

src/base/utf8.c

@@ -169,8 +169,8 @@ int unichar_to_utf8(wchar_t c, char* outbuf) {
 #define SURROGATE_VALUE(h, l) (((h)-0xd800) * 0x400 + (l)-0xdc00 + 0x10000)
 
 char* utf16_to_utf8(const wchar_t* str, int32_t len, char* utf8, int out_len) {
-  /* This function and g_utf16_to_ucs4 are almost exactly identical - The lines that differ
-   * are marked.
+  /* This function and g_utf16_to_ucs4 are almost exactly identical - The lines
+   * that differ are marked.
    */
   const wchar_t* in;
   char* out;

src/base/window.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/window.h"
+#include "base/mem.h"
 #include "base/window_manager.h"
 
 static ret_t window_on_paint_self(widget_t* widget, canvas_t* c) {

src/base/window_manager.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "base/window_manager.h"
+#include "base/mem.h"
 
 static ret_t on_window_destroy(void* ctx, event_t* e) {
   widget_t* wm = WIDGETP(ctx);

src/image_loader/image_loader_stb.c

@@ -21,9 +21,9 @@
 
 #define STB_IMAGE_IMPLEMENTATION
 
+#include "image_loader/image_loader_stb.h"
 #include "base/mem.h"
 #include "stb/stb_image.h"
-#include "image_loader/image_loader_stb.h"
 
 typedef struct _image_loader_stb_t {
   image_loader_t loader;

src/lcd/lcd_mem.c

@@ -19,8 +19,8 @@
  *
  */
 
-#include "base/mem.h"
 #include "lcd/lcd_mem.h"
+#include "base/mem.h"
 #include "lcd/rgb565.h"
 
 static ret_t lcd_mem_begin_frame(lcd_t* lcd, rect_t* dirty_rect) {

src/lcd/lcd_stm32_raw.c

@@ -19,10 +19,10 @@
  *
  */
 
-#include "base/mem.h"
-#include "base/color.h"
-#include "lcd/rgb565.h"
 #include "lcd/lcd_stm32_raw.h"
+#include "base/color.h"
+#include "base/mem.h"
+#include "lcd/rgb565.h"
 
 static tft_set_window_t set_window_func;
 static tft_write_data_t write_data_func;

src/main_loop/main_loop_stm32_raw.c

@@ -19,22 +19,22 @@
  *
  */
 
-#include "sys.h"
-#include "delay.h"
-#include "usart.h"
-#include "led.h"
-#include "button.h"
-#include "lcd_driver.h"
-#include "gui.h"
-#include "tim.h"
-#include "rtc.h"
-#include "stdlib.h"
-#include "flash.h"
-#include "touch.h"
+#include "main_loop/main_loop_stm32_raw.h"
 #include "base/font_manager.h"
 #include "base/window_manager.h"
+#include "button.h"
+#include "delay.h"
+#include "flash.h"
+#include "gui.h"
 #include "lcd/lcd_stm32_raw.h"
-#include "main_loop/main_loop_stm32_raw.h"
+#include "lcd_driver.h"
+#include "led.h"
+#include "rtc.h"
+#include "stdlib.h"
+#include "sys.h"
+#include "tim.h"
+#include "touch.h"
+#include "usart.h"
 
 typedef struct _main_loop_stm32_raw_t {
   main_loop_t base;
@@ -107,7 +107,7 @@ static ret_t main_loop_stm32_raw_dispatch(main_loop_stm32_raw_t* loop) {
 static ret_t main_loop_stm32_raw_paint(main_loop_stm32_raw_t* loop) {
   canvas_t* c = &(loop->canvas);
 
-  //return canvas_test_paint(c, loop->pressed, loop->touch_x, loop->touch_y);
+  // return canvas_test_paint(c, loop->pressed, loop->touch_x, loop->touch_y);
   return window_manager_paint(loop->wm, c);
 }
 
@@ -164,4 +164,3 @@ main_loop_t* main_loop_stm32_raw_init(int w, int h) {
 }
 
 main_loop_t* default_main_loop() { return &loop.base; }
-

src/platforms/stm32f103ze_raw.c

@@ -19,19 +19,19 @@
  *
  */
 
-#include "sys.h"
-#include "delay.h"
-#include "usart.h"
-#include "led.h"
+#include "base/platform.h"
 #include "button.h"
-#include "lcd_driver.h"
+#include "delay.h"
+#include "flash.h"
 #include "gui.h"
-#include "tim.h"
+#include "lcd_driver.h"
+#include "led.h"
 #include "rtc.h"
 #include "stdlib.h"
-#include "flash.h"
+#include "sys.h"
+#include "tim.h"
 #include "touch.h"
-#include "base/platform.h"
+#include "usart.h"
 
 ret_t platform_init() {
   delay_init();

src/ui_loader/ui_builder_default.c

@@ -19,17 +19,17 @@
  *
  */
 
+#include "base/button.h"
+#include "base/check_button.h"
+#include "base/dialog.h"
+#include "base/enums.h"
+#include "base/group_box.h"
+#include "base/image.h"
+#include "base/label.h"
+#include "base/progress_bar.h"
 #include "base/utf8.h"
 #include "base/value.h"
-#include "base/enums.h"
-#include "base/dialog.h"
 #include "base/window.h"
-#include "base/label.h"
-#include "base/image.h"
-#include "base/button.h"
-#include "base/group_box.h"
-#include "base/check_button.h"
-#include "base/progress_bar.h"
 #include "ui_loader/ui_builder.h"
 
 static ret_t ui_builder_default_on_widget_start(ui_builder_t* b, uint16_t type, xy_t x, xy_t y,

src/ui_loader/ui_builder_writer.c

@@ -19,10 +19,10 @@
  *
  */
 
+#include "base/buffer.h"
+#include "base/enums.h"
 #include "base/utf8.h"
 #include "base/value.h"
-#include "base/enums.h"
-#include "base/buffer.h"
 #include "ui_loader/ui_builder.h"
 #include "ui_loader/ui_loader_default.h"
 

src/ui_loader/ui_loader_default.c

@@ -19,9 +19,9 @@
  *
  */
 
-#include "base/mem.h"
-#include "base/buffer.h"
 #include "ui_loader/ui_loader_default.h"
+#include "base/buffer.h"
+#include "base/mem.h"
 
 ret_t ui_loader_load_default(ui_loader_t* loader, const uint8_t* data, uint32_t size,
                              ui_builder_t* b) {

src/ui_loader/ui_loader_xml.c

@@ -19,10 +19,10 @@
  *
  */
 
-#include "base/mem.h"
-#include "base/enums.h"
-#include "xml/xml_parser.h"
 #include "ui_loader/ui_loader_xml.h"
+#include "base/enums.h"
+#include "base/mem.h"
+#include "xml/xml_parser.h"
 
 typedef struct _xml_builder_t {
   XmlBuilder builder;

src/xml/xml_parser.c

@@ -18,8 +18,8 @@
  * 2018-01-19 Li XianJing <xianjimli@hotmail.com> adapted from ftk.
  *
  */
-#include "base/mem.h"
 #include "xml/xml_parser.h"
+#include "base/mem.h"
 
 #define isspace(c) (c == ' ' || c == '\t' || c == '\r' || c == '\n')
 #define isalpha(c) ((c >= 'a' && c <= 'z') || (c >= 'A' || c <= 'Z'))

tests/button_test.cc

@@ -1,10 +1,10 @@
 #include "base/button.h"
-#include <stdlib.h>
 #include "base/canvas.h"
 #include "base/widget.h"
 #include "font_dummy.h"
-#include "gtest/gtest.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 TEST(Button, basic) {
   value_t v1;

tests/canvas_test.cc

@@ -1,10 +1,10 @@
-#include "base/canvas.h"
-#include <stdlib.h>
 #include "base/array.h"
+#include "base/canvas.h"
 #include "base/font_manager.h"
 #include "font_dummy.h"
-#include "gtest/gtest.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 TEST(Canvas, draw_hline) {
   rect_t r;

tests/emitter_test.cc

@@ -1,8 +1,8 @@
 
-#include "base/emitter.h"
-#include <stdlib.h>
 #include "base/array.h"
+#include "base/emitter.h"
 #include "gtest/gtest.h"
+#include <stdlib.h>
 
 #include <string>
 using std::string;

tests/font_gen_test.cc

@@ -1,14 +1,14 @@
 
-#include "tools/font_gen/font_gen.h"
-#include <stdlib.h>
 #include "base/array.h"
 #include "base/font.h"
 #include "base/mem.h"
 #include "base/widget.h"
 #include "font/font_bitmap.h"
 #include "font/font_stb.h"
-#include "gtest/gtest.h"
 #include "tools/common/utils.h"
+#include "tools/font_gen/font_gen.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 #include <string>
 using std::string;

tests/font_manager_test.cc

@@ -1,11 +1,11 @@
 
-#include "base/font_manager.h"
-#include <stdlib.h>
 #include "base/array.h"
 #include "base/canvas.h"
+#include "base/font_manager.h"
 #include "font_dummy.h"
-#include "gtest/gtest.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 TEST(FontManager, basic) {
   font_manager_t font_manager;

tests/image_manager_test.cc

@@ -1,9 +1,9 @@
 
-#include "base/image_manager.h"
-#include <stdlib.h>
 #include "base/array.h"
-#include "gtest/gtest.h"
+#include "base/image_manager.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 static ret_t dummy_loader_load1(image_loader_t* loader, const char* name, bitmap_t* image) {
   return_value_if_fail(strcmp(name, "11") == 0, RET_FAIL);

tests/label_test.cc

@@ -1,10 +1,10 @@
-#include "base/label.h"
-#include <stdlib.h>
 #include "base/canvas.h"
+#include "base/label.h"
 #include "base/widget.h"
 #include "font_dummy.h"
-#include "gtest/gtest.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 TEST(Label, basic) {
   value_t v1;

tests/main.cc

@@ -27,9 +27,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdio.h>
 #include "base/mem.h"
 #include "gtest/gtest.h"
+#include <stdio.h>
 
 static uint32_t heap[1024 * 1024];
 

tests/theme_gen_test.cc

@@ -1,10 +1,10 @@
 
-#include <stdlib.h>
 #include "base/array.h"
 #include "base/theme.h"
 #include "base/widget.h"
-#include "gtest/gtest.h"
 #include "tools/theme_gen/xml_theme_gen.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 #include <string>
 using std::string;

tests/theme_test.cc

@@ -1,9 +1,9 @@
 
-#include "base/theme.h"
-#include <stdlib.h>
 #include "base/array.h"
-#include "gtest/gtest.h"
+#include "base/theme.h"
 #include "tools/theme_gen/theme_gen.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 #include <string>
 using std::string;

tests/ui_loader_default_test.cc

@@ -1,8 +1,8 @@
-#include "gtest/gtest.h"
 #include "base/dialog.h"
-#include "ui_loader/ui_loader_default.h"
-#include "ui_loader/ui_builder_writer.h"
 #include "ui_loader/ui_builder_default.h"
+#include "ui_loader/ui_builder_writer.h"
+#include "ui_loader/ui_loader_default.h"
+#include "gtest/gtest.h"
 
 TEST(UILoader, basic) {
   uint8_t data[1024];

tests/ui_loader_xml_test.cc

@@ -1,8 +1,8 @@
-#include "gtest/gtest.h"
 #include "base/dialog.h"
-#include "ui_loader/ui_loader_xml.h"
-#include "ui_loader/ui_builder_writer.h"
 #include "ui_loader/ui_builder_default.h"
+#include "ui_loader/ui_builder_writer.h"
+#include "ui_loader/ui_loader_xml.h"
+#include "gtest/gtest.h"
 
 TEST(UILoaderXML, basic) {
   widget_t* ok = NULL;

tests/widget_test.cc

@@ -1,10 +1,10 @@
 
-#include "base/widget.h"
-#include <stdlib.h>
 #include "base/canvas.h"
+#include "base/widget.h"
 #include "font_dummy.h"
-#include "gtest/gtest.h"
 #include "lcd_log.h"
+#include "gtest/gtest.h"
+#include <stdlib.h>
 
 TEST(Widget, moveresize) {
   widget_t w;

tools/common/utils.c

@@ -20,13 +20,13 @@
  */
 
 #include "utils.h"
+#include "base/mem.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "base/mem.h"
 
 char* read_file(const char* file_name, uint32_t* length) {
   struct stat st = {0};

tools/font_gen/font_gen.c

@@ -19,12 +19,12 @@
  *
  */
 
-#include "base/utf8.h"
-#include "base/mem.h"
-#include "common/utils.h"
-#include "font/font_stb.h"
-#include "font/font_bitmap.h"
 #include "font_gen/font_gen.h"
+#include "base/mem.h"
+#include "base/utf8.h"
+#include "common/utils.h"
+#include "font/font_bitmap.h"
+#include "font/font_stb.h"
 
 #define MAX_CHARS 100 * 1024
 #define MAX_BUFF_SIZE 5 * 1024 * 1024

tools/theme_gen/xml_theme_gen.cc

@@ -19,14 +19,14 @@
  *
  */
 
-#include "theme_gen.h"
-#include "base/theme.h"
-#include "base/enums.h"
-#include "base/widget.h"
 #include "xml_theme_gen.h"
-#include "common/utils.h"
-#include "xml/xml_parser.h"
+#include "base/enums.h"
+#include "base/theme.h"
+#include "base/widget.h"
 #include "common/color_parser.h"
+#include "common/utils.h"
+#include "theme_gen.h"
+#include "xml/xml_parser.h"
 
 typedef struct _xml_builder_t {
   XmlBuilder builder;

tools/ui_gen/xml_to_ui.c

@@ -21,8 +21,8 @@
 
 #include "base/mem.h"
 #include "common/utils.h"
-#include "ui_loader/ui_loader_xml.h"
 #include "ui_loader/ui_builder_writer.h"
+#include "ui_loader/ui_loader_xml.h"
 
 int main(int argc, char** argv) {
   uint32_t size = 0;