From 926b96cafbf7176bb39e78d7fa1617f25ddc254f Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Wed, 17 Apr 2019 09:57:28 +0200
Subject: [PATCH] [python/kandinsky] Expose the fill_rect method

Which allows for *much* faster graphics
---
 python/port/genhdr/qstrdefs.in.h               |  1 +
 python/port/mod/kandinsky/modkandinsky.cpp     | 13 +++++++++++++
 python/port/mod/kandinsky/modkandinsky.h       |  1 +
 python/port/mod/kandinsky/modkandinsky_table.c |  2 ++
 4 files changed, 17 insertions(+)

diff --git a/python/port/genhdr/qstrdefs.in.h b/python/port/genhdr/qstrdefs.in.h
index f905e1dea5f..540a17da47d 100644
--- a/python/port/genhdr/qstrdefs.in.h
+++ b/python/port/genhdr/qstrdefs.in.h
@@ -21,6 +21,7 @@ QCFG(BYTES_IN_HASH, (2))
 Q(kandinsky)
 Q(color)
 Q(draw_string)
+Q(fill_rect)
 Q(get_pixel)
 Q(set_pixel)
 
diff --git a/python/port/mod/kandinsky/modkandinsky.cpp b/python/port/mod/kandinsky/modkandinsky.cpp
index db688ae2968..3878f33a38d 100644
--- a/python/port/mod/kandinsky/modkandinsky.cpp
+++ b/python/port/mod/kandinsky/modkandinsky.cpp
@@ -69,3 +69,16 @@ mp_obj_t modkandinsky_draw_string(mp_obj_t text, mp_obj_t x, mp_obj_t y) {
   return mp_const_none;
 }
 
+mp_obj_t modkandinsky_fill_rect(size_t n_args, const mp_obj_t * args) {
+  MicroPython::ExecutionEnvironment::currentExecutionEnvironment()->displaySandbox();
+  KDIonContext::sharedContext()->fillRect(
+    KDRect(
+      mp_obj_get_int(args[0]),
+      mp_obj_get_int(args[1]),
+      mp_obj_get_int(args[2]),
+      mp_obj_get_int(args[3])
+    ),
+    ColorForTuple(args[4])
+  );
+  return mp_const_none;
+}
diff --git a/python/port/mod/kandinsky/modkandinsky.h b/python/port/mod/kandinsky/modkandinsky.h
index c9dc8498997..11bc43b0bb6 100644
--- a/python/port/mod/kandinsky/modkandinsky.h
+++ b/python/port/mod/kandinsky/modkandinsky.h
@@ -4,3 +4,4 @@ mp_obj_t modkandinsky_color(mp_obj_t red, mp_obj_t green, mp_obj_t blue);
 mp_obj_t modkandinsky_get_pixel(mp_obj_t x, mp_obj_t y);
 mp_obj_t modkandinsky_set_pixel(mp_obj_t x, mp_obj_t y, mp_obj_t color);
 mp_obj_t modkandinsky_draw_string(mp_obj_t text, mp_obj_t x, mp_obj_t y);
+mp_obj_t modkandinsky_fill_rect(size_t n_args, const mp_obj_t *args);
diff --git a/python/port/mod/kandinsky/modkandinsky_table.c b/python/port/mod/kandinsky/modkandinsky_table.c
index ee402fd09ed..2a8e19c5c61 100644
--- a/python/port/mod/kandinsky/modkandinsky_table.c
+++ b/python/port/mod/kandinsky/modkandinsky_table.c
@@ -4,6 +4,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(modkandinsky_color_obj, modkandinsky_color);
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(modkandinsky_get_pixel_obj, modkandinsky_get_pixel);
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(modkandinsky_set_pixel_obj, modkandinsky_set_pixel);
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(modkandinsky_draw_string_obj, modkandinsky_draw_string);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modkandinsky_fill_rect_obj, 5, 5, modkandinsky_fill_rect);
 
 STATIC const mp_rom_map_elem_t modkandinsky_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_kandinsky) },
@@ -11,6 +12,7 @@ STATIC const mp_rom_map_elem_t modkandinsky_module_globals_table[] = {
   { MP_ROM_QSTR(MP_QSTR_get_pixel), (mp_obj_t)&modkandinsky_get_pixel_obj },
   { MP_ROM_QSTR(MP_QSTR_set_pixel), (mp_obj_t)&modkandinsky_set_pixel_obj },
   { MP_ROM_QSTR(MP_QSTR_draw_string), (mp_obj_t)&modkandinsky_draw_string_obj },
+  { MP_ROM_QSTR(MP_QSTR_fill_rect), (mp_obj_t)&modkandinsky_fill_rect_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(modkandinsky_module_globals, modkandinsky_module_globals_table);