nwlink 0.0.17 → 1.0.0

package/README.md

@@ -13,7 +13,7 @@ source emsdk/emsdk_env.sh
 rm -rf build
 mkdir build
 cd build
-SFLAGS="-Os -flto -sENVIRONMENT=web,node -sALLOW_MEMORY_GROWTH -sMODULARIZE -sEXPORTED_RUNTIME_METHODS=['FS']"
+SFLAGS="-Os -flto -sENVIRONMENT=web,node -sALLOW_MEMORY_GROWTH -sMODULARIZE -sEXPORTED_RUNTIME_METHODS=['FS'] -sNODEJS_CATCH_EXIT=0 -sNODEJS_CATCH_REJECTION=0"
 emconfigure ../configure \
   --host=wasm32 \
   --target=arm-none-eabi \

package/dist/eadk/eadk.h

@@ -31,7 +31,8 @@ typedef struct {
 
 #define EADK_SCREEN_WIDTH 320
 #define EADK_SCREEN_HEIGHT 240
-static const eadk_rect_t eadk_screen_rect = {0, 0, EADK_SCREEN_WIDTH, EADK_SCREEN_HEIGHT};
+static const eadk_rect_t eadk_screen_rect = {0, 0, EADK_SCREEN_WIDTH,
+                                             EADK_SCREEN_HEIGHT};
 
 typedef uint64_t eadk_keyboard_state_t;
 typedef enum {
@@ -83,23 +84,41 @@ typedef enum {
   eadk_key_exe = 52
 } eadk_key_t;
 
+#if PLATFORM_DEVICE
 eadk_keyboard_state_t eadk_keyboard_scan();
-static inline bool eadk_keyboard_key_down(eadk_keyboard_state_t state, eadk_key_t key) {
-  return (state>>(uint8_t)key) & 1;
+#else
+/* Returning a 64 bit value with emscripten would require WASM_BIGINT that
+ * causes some issue when the external app use a libc. */
+void _eadk_keyboard_scan_do_scan();
+uint32_t _eadk_keyboard_scan_low();
+uint32_t _eadk_keyboard_scan_high();
+
+static inline eadk_keyboard_state_t eadk_keyboard_scan() {
+  _eadk_keyboard_scan_do_scan();
+  uint64_t state = _eadk_keyboard_scan_high();
+  state <<= 32;
+  state |= _eadk_keyboard_scan_low();
+  return state;
+}
+#endif
+
+static inline bool eadk_keyboard_key_down(eadk_keyboard_state_t state,
+                                          eadk_key_t key) {
+  return (state >> (uint8_t)key) & 1;
 }
 
 typedef uint16_t eadk_event_t;
 enum {
   eadk_event_left = 0,
   eadk_event_up = 1,
-  eadk_event_down  = 2,
+  eadk_event_down = 2,
   eadk_event_right = 3,
-  eadk_event_ok    = 4,
-  eadk_event_back  = 5,
+  eadk_event_ok = 4,
+  eadk_event_back = 5,
   eadk_event_shift = 12,
   eadk_event_alpha = 13,
-  eadk_event_xnt   = 14,
-  eadk_event_var   = 15,
+  eadk_event_xnt = 14,
+  eadk_event_var = 15,
   eadk_event_toolbox = 16,
   eadk_event_backspace = 17,
   eadk_event_exp = 18,
@@ -124,7 +143,7 @@ enum {
   eadk_event_six = 38,
   eadk_event_multiplication = 39,
   eadk_event_division = 40,
-  eadk_event_one  = 42,
+  eadk_event_one = 42,
   eadk_event_two = 43,
   eadk_event_three = 44,
   eadk_event_plus = 45,
@@ -134,9 +153,9 @@ enum {
   eadk_event_ee = 50,
   eadk_event_ans = 51,
   eadk_event_exe = 52,
-  eadk_event_shift_left  = 54,
-  eadk_event_shift_up    = 55,
-  eadk_event_shift_down  = 56,
+  eadk_event_shift_left = 54,
+  eadk_event_shift_up = 55,
+  eadk_event_shift_down = 56,
   eadk_event_shift_right = 57,
   eadk_event_alpha_lock = 67,
   eadk_event_cut = 68,
@@ -216,7 +235,7 @@ enum {
   eadk_event_upper_z = 207,
 };
 
-eadk_event_t eadk_event_get(int32_t * timeout);
+eadk_event_t eadk_event_get(int32_t* timeout);
 
 // Backlight
 
@@ -231,21 +250,36 @@ float eadk_battery_voltage();
 
 // Display
 
-void eadk_display_push_rect(eadk_rect_t rect, const eadk_color_t * pixels);
+void eadk_display_push_rect(eadk_rect_t rect, const eadk_color_t* pixels);
 void eadk_display_push_rect_uniform(eadk_rect_t rect, eadk_color_t color);
-void eadk_display_pull_rect(eadk_rect_t rect, eadk_color_t * pixels);
+void eadk_display_pull_rect(eadk_rect_t rect, eadk_color_t* pixels);
 bool eadk_display_wait_for_vblank();
-void eadk_display_draw_string(const char * text, eadk_point_t point, bool large_font, eadk_color_t text_color, eadk_color_t background_color);
+void eadk_display_draw_string(const char* text, eadk_point_t point,
+                              bool large_font, eadk_color_t text_color,
+                              eadk_color_t background_color);
 
 // Timing
 
 void eadk_timing_usleep(uint32_t us);
 void eadk_timing_msleep(uint32_t ms);
+
+#if PLATFORM_DEVICE
 uint64_t eadk_timing_millis();
+#else
+uint32_t _eadk_timing_millis_low();
+uint32_t _eadk_timing_millis_high();
+
+static inline uint64_t eadk_timing_millis() {
+  uint64_t millis = _eadk_timing_millis_high();
+  millis <<= 32;
+  millis |= _eadk_timing_millis_low();
+  return millis;
+}
+#endif
 
 // External data
 
-extern const char * eadk_external_data;
+extern const char* eadk_external_data;
 extern size_t eadk_external_data_size;
 
 // Misc