@kmamal/sdl 1.0.0-8 → 1.0.0-9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/README.md +2 -2
  3. package/binding.gyp +18 -4
  4. package/package.json +1 -1
  5. package/scripts/build.mjs +3 -1
  6. package/scripts/install.mjs +2 -0
  7. package/scripts/util/common.js +1 -0
  8. package/src/javascript/audio/audio-stream.js +4 -3
  9. package/src/javascript/audio/prevent-exit.js +1 -1
  10. package/src/javascript/events/events-via-poll.js +2 -4
  11. package/src/javascript/events/index.js +14 -1
  12. package/src/javascript/events/try.js +3 -0
  13. package/src/javascript/joystick/joystick-device-instance.js +1 -0
  14. package/src/javascript/validate.js +5 -0
  15. package/src/javascript/video/events.js +3 -3
  16. package/src/javascript/video/window.js +53 -7
  17. package/src/native/audio.cpp +24 -26
  18. package/src/native/audio.h +24 -24
  19. package/src/native/clipboard.h +2 -2
  20. package/src/native/enums.cpp +14 -1
  21. package/src/native/enums.h +1 -1
  22. package/src/native/events.cpp +1 -69
  23. package/src/native/events.h +69 -69
  24. package/src/native/gamepad.cpp +65 -4
  25. package/src/native/gamepad.h +8 -8
  26. package/src/native/global.cpp +11 -273
  27. package/src/native/global.h +9 -9
  28. package/src/native/joystick.cpp +26 -3
  29. package/src/native/joystick.h +13 -13
  30. package/src/native/keyboard.cpp +6 -6
  31. package/src/native/keyboard.h +3 -3
  32. package/src/native/module.cpp +3 -0
  33. package/src/native/mouse.cpp +1 -1
  34. package/src/native/mouse.h +9 -9
  35. package/src/native/packed.cpp +5 -12
  36. package/src/native/packed.h +8 -13
  37. package/src/native/power.cpp +7 -1
  38. package/src/native/power.h +2 -2
  39. package/src/native/sensor.cpp +19 -2
  40. package/src/native/sensor.h +6 -6
  41. package/src/native/testing.cpp +17 -0
  42. package/src/native/testing.h +6 -5
  43. package/src/native/threads.cpp +1 -0
  44. package/src/native/threads.h +13 -13
  45. package/src/native/touch.cpp +7 -2
  46. package/src/native/touch.h +2 -2
  47. package/src/native/video.cpp +68 -5
  48. package/src/native/video.h +5 -5
  49. package/src/native/window.cpp +46 -1
  50. package/src/native/window.h +24 -21
  51. package/src/types/index.d.ts +16 -1
@@ -1,13 +1,7 @@
1
1
  #include "global.h"
2
2
  #include "events.h"
3
3
  #include "keyboard.h"
4
- #include "video.h"
5
- #include "touch.h"
6
- #include "joystick.h"
7
- #include "gamepad.h"
8
- #include "sensor.h"
9
4
  #include "audio.h"
10
- #include "power.h"
11
5
  #include "threads.h"
12
6
  #include <SDL3/SDL.h>
13
7
  #include <string>
@@ -23,7 +17,6 @@
23
17
  static std::atomic<SDL_ThreadID> main_thread_id { 0 };
24
18
  static std::atomic<bool> ready { false };
25
19
  static std::atomic<bool> started { false };
26
- static bool tables_set = false;
27
20
 
28
21
  struct InitRequest {
29
22
  SDL_InitFlags flags;
@@ -38,26 +31,26 @@ static std::vector<InitRequest *> pending_requests;
38
31
 
39
32
  // Recursive because watchEvents holds this lock while dispatching window events to JS, and the handlers re-enter it through the wrappers.
40
33
  std::recursive_mutex &
41
- global::lock()
34
+ global::lock ()
42
35
  {
43
36
  static std::recursive_mutex mutex;
44
37
  return mutex;
45
38
  }
46
39
 
47
40
  bool
48
- global::isReady()
41
+ global::isReady ()
49
42
  {
50
43
  return ready.load(std::memory_order_acquire);
51
44
  }
52
45
 
53
46
  bool
54
- global::isMainThread()
47
+ global::isMainThread ()
55
48
  {
56
49
  return ready.load(std::memory_order_acquire) && SDL_GetCurrentThreadID() == main_thread_id.load(std::memory_order_acquire);
57
50
  }
58
51
 
59
52
  void
60
- global::assertReady(Napi::Env &env)
53
+ global::assertReady (Napi::Env &env)
61
54
  {
62
55
  if (ready.load(std::memory_order_acquire)) { return; }
63
56
 
@@ -88,265 +81,9 @@ watchEvents (void *, SDL_Event *event)
88
81
  }
89
82
 
90
83
 
91
- static void
92
- _setTables ()
93
- {
94
- if (tables_set) { return; }
95
- tables_set = true;
96
-
97
- events::targets::APP = "app";
98
- events::targets::VIDEO = "video";
99
- events::targets::WINDOW = "window";
100
- events::targets::KEYBOARD = "keyboard";
101
- events::targets::JOYSTICK = "joystick";
102
- events::targets::GAMEPAD = "gamepad";
103
- events::targets::SENSOR = "sensor";
104
- events::targets::CLIPBOARD = "clipboard";
105
- events::targets::JOYSTICK_DEVICE = "joystickDevice";
106
- events::targets::GAMEPAD_DEVICE = "gamepadDevice";
107
- events::targets::AUDIO_DEVICE = "audioDevice";
108
- events::targets::CHANGE = "change";
109
-
110
- events::types::QUIT = "quit";
111
- events::types::DISPLAY_ADD = "displayAdd";
112
- events::types::DISPLAY_REMOVE = "displayRemove";
113
- events::types::DISPLAY_ORIENT = "displayOrient";
114
- events::types::DISPLAY_MOVE = "displayMove";
115
- events::types::DISPLAY_SCALE = "displayScaleChange";
116
- events::types::DISPLAY_MODE = "displayModeChange";
117
- events::types::DISPLAY_USABLE = "displayUsableChange";
118
- events::types::DISPLAY_CHANGE = "displayChange";
119
- events::types::SHOW = "show";
120
- events::types::HIDE = "hide";
121
- events::types::EXPOSE = "expose";
122
- events::types::MOVE = "move";
123
- events::types::RESIZE = "resize";
124
- events::types::MINIMIZE = "minimize";
125
- events::types::MAXIMIZE = "maximize";
126
- events::types::RESTORE = "restore";
127
- events::types::ENTER_FULLSCREEN = "enterFullscreen";
128
- events::types::LEAVE_FULLSCREEN = "leaveFullscreen";
129
- events::types::FOCUS = "focus";
130
- events::types::BLUR = "blur";
131
- events::types::HOVER = "hover";
132
- events::types::LEAVE = "leave";
133
- events::types::KEY_DOWN = "keyDown";
134
- events::types::KEY_UP = "keyUp";
135
- events::types::TEXT_INPUT = "textInput";
136
- events::types::MOUSE_MOVE = "mouseMove";
137
- events::types::MOUSE_BUTTON_DOWN = "mouseButtonDown";
138
- events::types::MOUSE_BUTTON_UP = "mouseButtonUp";
139
- events::types::MOUSE_WHEEL = "mouseWheel";
140
- events::types::DROP_BEGIN = "dropBegin";
141
- events::types::DROP_COMPLETE = "dropComplete";
142
- events::types::DROP_FILE = "dropFile";
143
- events::types::DROP_TEXT = "dropText";
144
- events::types::CLOSE = "close";
145
- events::types::RENDER_DEVICE_LOST = "renderDeviceLost";
146
- events::types::KEYMAP_CHANGE = "keymapChange";
147
- events::types::FINGER_DOWN = "fingerDown";
148
- events::types::FINGER_UP = "fingerUp";
149
- events::types::FINGER_MOVE = "fingerMove";
150
- events::types::FINGER_CANCEL = "fingerCancel";
151
- events::types::DEVICE_ADD = "deviceAdd";
152
- events::types::DEVICE_REMOVE = "deviceRemove";
153
- events::types::DEVICE_FORMAT_CHANGE = "deviceFormatChange";
154
- events::types::AXIS_MOTION = "axisMotion";
155
- events::types::BUTTON_DOWN = "buttonDown";
156
- events::types::BUTTON_UP = "buttonUp";
157
- events::types::BALL_MOTION = "ballMotion";
158
- events::types::HAT_MOTION = "hatMotion";
159
- events::types::POWER_UPDATE = "powerUpdate";
160
- events::types::STEAM_HANDLE_UPDATE = "steamHandleUpdate";
161
- events::types::REMAP = "remap";
162
- events::types::UPDATE = "update";
163
-
164
- // video::orientations[SDL_ORIENTATION_UNKNOWN] = nullptr;
165
- video::orientations[SDL_ORIENTATION_LANDSCAPE] = "landscape";
166
- video::orientations[SDL_ORIENTATION_LANDSCAPE_FLIPPED] = "landscapeFlipped";
167
- video::orientations[SDL_ORIENTATION_PORTRAIT] = "portrait";
168
- video::orientations[SDL_ORIENTATION_PORTRAIT_FLIPPED] = "portraitFlipped";
169
-
170
- video::formats[SDL_PIXELFORMAT_RGB332] = "rgb332";
171
- video::formats[SDL_PIXELFORMAT_XRGB4444] = "xrgb4444";
172
- video::formats[SDL_PIXELFORMAT_XBGR4444] = "xbgr4444";
173
- video::formats[SDL_PIXELFORMAT_XRGB1555] = "xrgb1555";
174
- video::formats[SDL_PIXELFORMAT_XBGR1555] = "xbgr1555";
175
- video::formats[SDL_PIXELFORMAT_ARGB4444] = "argb4444";
176
- video::formats[SDL_PIXELFORMAT_RGBA4444] = "rgba4444";
177
- video::formats[SDL_PIXELFORMAT_ABGR4444] = "abgr4444";
178
- video::formats[SDL_PIXELFORMAT_BGRA4444] = "bgra4444";
179
- video::formats[SDL_PIXELFORMAT_ARGB1555] = "argb1555";
180
- video::formats[SDL_PIXELFORMAT_RGBA5551] = "rgba5551";
181
- video::formats[SDL_PIXELFORMAT_ABGR1555] = "abgr1555";
182
- video::formats[SDL_PIXELFORMAT_BGRA5551] = "bgra5551";
183
- video::formats[SDL_PIXELFORMAT_RGB565] = "rgb565";
184
- video::formats[SDL_PIXELFORMAT_BGR565] = "bgr565";
185
- video::formats[SDL_PIXELFORMAT_RGB24] = "rgb24";
186
- video::formats[SDL_PIXELFORMAT_BGR24] = "bgr24";
187
- video::formats[SDL_PIXELFORMAT_XRGB8888] = "xrgb8888";
188
- video::formats[SDL_PIXELFORMAT_RGBX8888] = "rgbx8888";
189
- video::formats[SDL_PIXELFORMAT_XBGR8888] = "xbgr8888";
190
- video::formats[SDL_PIXELFORMAT_BGRX8888] = "bgrx8888";
191
- video::formats[SDL_PIXELFORMAT_ARGB8888] = "argb8888";
192
- video::formats[SDL_PIXELFORMAT_RGBA8888] = "rgba8888";
193
- video::formats[SDL_PIXELFORMAT_ABGR8888] = "abgr8888";
194
- video::formats[SDL_PIXELFORMAT_BGRA8888] = "bgra8888";
195
- video::formats[SDL_PIXELFORMAT_ARGB2101010] = "argb2101010";
196
- video::formats[SDL_PIXELFORMAT_XRGB2101010] = "xrgb2101010";
197
- video::formats[SDL_PIXELFORMAT_XBGR2101010] = "xbgr2101010";
198
- video::formats[SDL_PIXELFORMAT_ABGR2101010] = "abgr2101010";
199
- video::formats[SDL_PIXELFORMAT_RGB48] = "rgb48";
200
- video::formats[SDL_PIXELFORMAT_BGR48] = "bgr48";
201
- video::formats[SDL_PIXELFORMAT_RGBA64] = "rgba64";
202
- video::formats[SDL_PIXELFORMAT_ARGB64] = "argb64";
203
- video::formats[SDL_PIXELFORMAT_BGRA64] = "bgra64";
204
- video::formats[SDL_PIXELFORMAT_ABGR64] = "abgr64";
205
- video::formats[SDL_PIXELFORMAT_RGB48_FLOAT] = "rgb48f";
206
- video::formats[SDL_PIXELFORMAT_BGR48_FLOAT] = "bgr48f";
207
- video::formats[SDL_PIXELFORMAT_RGBA64_FLOAT] = "rgba64f";
208
- video::formats[SDL_PIXELFORMAT_ARGB64_FLOAT] = "argb64f";
209
- video::formats[SDL_PIXELFORMAT_BGRA64_FLOAT] = "bgra64f";
210
- video::formats[SDL_PIXELFORMAT_ABGR64_FLOAT] = "abgr64f";
211
- video::formats[SDL_PIXELFORMAT_RGB96_FLOAT] = "rgb96f";
212
- video::formats[SDL_PIXELFORMAT_BGR96_FLOAT] = "bgr96f";
213
- video::formats[SDL_PIXELFORMAT_RGBA128_FLOAT] = "rgba128f";
214
- video::formats[SDL_PIXELFORMAT_ARGB128_FLOAT] = "argb128f";
215
- video::formats[SDL_PIXELFORMAT_BGRA128_FLOAT] = "bgra128f";
216
- video::formats[SDL_PIXELFORMAT_ABGR128_FLOAT] = "abgr128f";
217
- video::formats[SDL_PIXELFORMAT_YV12] = "yv12";
218
- video::formats[SDL_PIXELFORMAT_IYUV] = "iyuv";
219
- video::formats[SDL_PIXELFORMAT_YUY2] = "yuy2";
220
- video::formats[SDL_PIXELFORMAT_UYVY] = "uyvy";
221
- video::formats[SDL_PIXELFORMAT_YVYU] = "yvyu";
222
- video::formats[SDL_PIXELFORMAT_NV12] = "nv12";
223
- video::formats[SDL_PIXELFORMAT_NV21] = "nv21";
224
- video::formats[SDL_PIXELFORMAT_P010] = "p010";
225
-
226
- // touch::device_types[SDL_TOUCH_DEVICE_INVALID] = nullptr;
227
- touch::device_types[SDL_TOUCH_DEVICE_DIRECT] = "direct";
228
- touch::device_types[SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE] = "indirectAbsolute";
229
- touch::device_types[SDL_TOUCH_DEVICE_INDIRECT_RELATIVE] = "indirectRelative";
230
-
231
- // joystick::types[SDL_JOYSTICK_TYPE_UNKNOWN] = nullptr;
232
- joystick::types[SDL_JOYSTICK_TYPE_GAMEPAD] = "gamepad";
233
- joystick::types[SDL_JOYSTICK_TYPE_WHEEL] = "wheel";
234
- joystick::types[SDL_JOYSTICK_TYPE_ARCADE_STICK] = "arcadeStick";
235
- joystick::types[SDL_JOYSTICK_TYPE_FLIGHT_STICK] = "flightStick";
236
- joystick::types[SDL_JOYSTICK_TYPE_DANCE_PAD] = "dancePad";
237
- joystick::types[SDL_JOYSTICK_TYPE_GUITAR] = "guitar";
238
- joystick::types[SDL_JOYSTICK_TYPE_DRUM_KIT] = "drumKit";
239
- joystick::types[SDL_JOYSTICK_TYPE_ARCADE_PAD] = "arcadePad";
240
- joystick::types[SDL_JOYSTICK_TYPE_THROTTLE] = "throttle";
241
-
242
- joystick::hat_positions[SDL_HAT_CENTERED] = "centered";
243
- joystick::hat_positions[SDL_HAT_UP] = "up";
244
- joystick::hat_positions[SDL_HAT_RIGHT] = "right";
245
- joystick::hat_positions[SDL_HAT_DOWN] = "down";
246
- joystick::hat_positions[SDL_HAT_LEFT] = "left";
247
- joystick::hat_positions[SDL_HAT_RIGHTUP] = "rightUp";
248
- joystick::hat_positions[SDL_HAT_RIGHTDOWN] = "rightDown";
249
- joystick::hat_positions[SDL_HAT_LEFTUP] = "leftUp";
250
- joystick::hat_positions[SDL_HAT_LEFTDOWN] = "leftDown";
251
-
252
- // gamepad::types[SDL_GAMEPAD_TYPE_UNKNOWN] = nullptr;
253
- gamepad::types[SDL_GAMEPAD_TYPE_STANDARD] = "standard";
254
- gamepad::types[SDL_GAMEPAD_TYPE_XBOX360] = "xbox360";
255
- gamepad::types[SDL_GAMEPAD_TYPE_XBOXONE] = "xboxOne";
256
- gamepad::types[SDL_GAMEPAD_TYPE_PS3] = "ps3";
257
- gamepad::types[SDL_GAMEPAD_TYPE_PS4] = "ps4";
258
- gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO] = "nintendoSwitchPro";
259
- gamepad::types[SDL_GAMEPAD_TYPE_PS5] = "ps5";
260
- gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT] = "nintendoSwitchJoyconLeft";
261
- gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT] = "nintendoSwitchJoyconRight";
262
- gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_PAIR] = "nintendoSwitchJoyconPair";
263
- gamepad::types[SDL_GAMEPAD_TYPE_GAMECUBE] = "gamecube";
264
- gamepad::types[SDL_GAMEPAD_TYPE_STEAM] = "steam";
265
-
266
- gamepad::axes[SDL_GAMEPAD_AXIS_LEFTX] = "leftStickX";
267
- gamepad::axes[SDL_GAMEPAD_AXIS_LEFTY] = "leftStickY";
268
- gamepad::axes[SDL_GAMEPAD_AXIS_RIGHTX] = "rightStickX";
269
- gamepad::axes[SDL_GAMEPAD_AXIS_RIGHTY] = "rightStickY";
270
- gamepad::axes[SDL_GAMEPAD_AXIS_LEFT_TRIGGER] = "leftTrigger";
271
- gamepad::axes[SDL_GAMEPAD_AXIS_RIGHT_TRIGGER] = "rightTrigger";
272
-
273
- gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_LEFT] = "dpadLeft";
274
- gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_RIGHT] = "dpadRight";
275
- gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_UP] = "dpadUp";
276
- gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_DOWN] = "dpadDown";
277
- gamepad::buttons[SDL_GAMEPAD_BUTTON_SOUTH] = "south";
278
- gamepad::buttons[SDL_GAMEPAD_BUTTON_EAST] = "east";
279
- gamepad::buttons[SDL_GAMEPAD_BUTTON_WEST] = "west";
280
- gamepad::buttons[SDL_GAMEPAD_BUTTON_NORTH] = "north";
281
- gamepad::buttons[SDL_GAMEPAD_BUTTON_GUIDE] = "guide";
282
- gamepad::buttons[SDL_GAMEPAD_BUTTON_BACK] = "back";
283
- gamepad::buttons[SDL_GAMEPAD_BUTTON_START] = "start";
284
- gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_STICK] = "leftStick";
285
- gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_STICK] = "rightStick";
286
- gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_SHOULDER] = "leftShoulder";
287
- gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER] = "rightShoulder";
288
- gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1] = "rightPaddle1";
289
- gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_PADDLE1] = "leftPaddle1";
290
- gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2] = "rightPaddle2";
291
- gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_PADDLE2] = "leftPaddle2";
292
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC1] = "misc1";
293
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC2] = "misc2";
294
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC3] = "misc3";
295
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC4] = "misc4";
296
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC5] = "misc5";
297
- gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC6] = "misc6";
298
- gamepad::buttons[SDL_GAMEPAD_BUTTON_TOUCHPAD] = "touchpad";
299
-
300
- // gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_UNKNOWN] = nullptr;
301
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_A] = "a";
302
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_B] = "b";
303
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_X] = "x";
304
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_Y] = "y";
305
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_CROSS] = "cross";
306
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_CIRCLE] = "circle";
307
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_SQUARE] = "square";
308
- gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_TRIANGLE] = "triangle";
309
-
310
- // sensor::types[SDL_SENSOR_UNKNOWN] = nullptr;
311
- sensor::types[SDL_SENSOR_ACCEL] = "accelerometer";
312
- sensor::types[SDL_SENSOR_GYRO] = "gyroscope";
313
- sensor::types[SDL_SENSOR_ACCEL_L] = "accelerometer";
314
- sensor::types[SDL_SENSOR_GYRO_L] = "gyroscope";
315
- sensor::types[SDL_SENSOR_ACCEL_R] = "accelerometer";
316
- sensor::types[SDL_SENSOR_GYRO_R] = "gyroscope";
317
-
318
- // sensor::sides[SDL_SENSOR_UNKNOWN] = nullptr;
319
- // sensor::sides[SDL_SENSOR_ACCEL] = nullptr;
320
- // sensor::sides[SDL_SENSOR_GYRO] = nullptr;
321
- sensor::sides[SDL_SENSOR_ACCEL_L] = "left";
322
- sensor::sides[SDL_SENSOR_GYRO_L] = "left";
323
- sensor::sides[SDL_SENSOR_ACCEL_R] = "right";
324
- sensor::sides[SDL_SENSOR_GYRO_R] = "right";
325
-
326
- audio::device_types[true] = "recording";
327
- audio::device_types[false] = "playback";
328
-
329
- audio::formats[SDL_AUDIO_S8] = "s8";
330
- audio::formats[SDL_AUDIO_U8] = "u8";
331
- audio::formats[SDL_AUDIO_S16LE] = "s16le";
332
- audio::formats[SDL_AUDIO_S16BE] = "s16be";
333
- audio::formats[SDL_AUDIO_S32LE] = "s32le";
334
- audio::formats[SDL_AUDIO_S32BE] = "s32be";
335
- audio::formats[SDL_AUDIO_F32LE] = "f32le";
336
- audio::formats[SDL_AUDIO_F32BE] = "f32be";
337
-
338
- // power::states[SDL_POWERSTATE_UNKNOWN] = nullptr;
339
- power::states[SDL_POWERSTATE_NO_BATTERY] = "noBattery";
340
- power::states[SDL_POWERSTATE_ON_BATTERY] = "battery";
341
- power::states[SDL_POWERSTATE_CHARGING] = "charging";
342
- power::states[SDL_POWERSTATE_CHARGED] = "charged";
343
- }
344
-
345
84
  static void
346
85
  _start (Napi::Env &env)
347
86
  {
348
- _setTables();
349
-
350
87
  SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "0");
351
88
  SDL_SetHint(SDL_HINT_QUIT_ON_LAST_WINDOW_CLOSE, "0");
352
89
 
@@ -374,7 +111,7 @@ _start (Napi::Env &env)
374
111
 
375
112
 
376
113
  Napi::Value
377
- global::initialize(const Napi::CallbackInfo &info)
114
+ global::initialize (const Napi::CallbackInfo &info)
378
115
  {
379
116
  Napi::Env env = info.Env();
380
117
 
@@ -383,7 +120,6 @@ global::initialize(const Napi::CallbackInfo &info)
383
120
  std::lock_guard<std::recursive_mutex> guard(global::lock());
384
121
 
385
122
  if (is_main && !ready.load(std::memory_order_acquire)) { _start(env); }
386
- else { _setTables(); }
387
123
 
388
124
  int sdl_compile_version = SDL_VERSION;
389
125
 
@@ -420,6 +156,8 @@ global::initialize(const Napi::CallbackInfo &info)
420
156
  }
421
157
 
422
158
 
159
+ // Only the main thread must initializes SDL and polls for events.
160
+ // On macOS the Cocoa backend refuses any other thread.
423
161
  static bool
424
162
  _initSubsystem (SDL_InitFlags flags, std::string &error)
425
163
  {
@@ -452,7 +190,7 @@ _failInitRequests ()
452
190
  }
453
191
 
454
192
  void
455
- global::processInitRequests()
193
+ global::processInitRequests ()
456
194
  {
457
195
  std::vector<InitRequest *> batch;
458
196
  {
@@ -482,7 +220,7 @@ global::processInitRequests()
482
220
 
483
221
 
484
222
  Napi::Value
485
- global::initSubsystem(const Napi::CallbackInfo &info)
223
+ global::initSubsystem (const Napi::CallbackInfo &info)
486
224
  {
487
225
  Napi::Env env = info.Env();
488
226
 
@@ -526,7 +264,7 @@ global::initSubsystem(const Napi::CallbackInfo &info)
526
264
 
527
265
 
528
266
  void
529
- global::teardown()
267
+ global::teardown ()
530
268
  {
531
269
  std::lock_guard<std::recursive_mutex> guard(global::lock());
532
270
 
@@ -540,7 +278,7 @@ global::teardown()
540
278
  }
541
279
 
542
280
  Napi::Value
543
- global::cleanup(const Napi::CallbackInfo &info)
281
+ global::cleanup (const Napi::CallbackInfo &info)
544
282
  {
545
283
  Napi::Env env = info.Env();
546
284
 
@@ -48,16 +48,16 @@ namespace global {
48
48
  template <typename T> using SdlPtr = std::unique_ptr<T, SdlFree>;
49
49
  template <typename T> using SdlArray = std::unique_ptr<T[], SdlFree>;
50
50
 
51
- std::recursive_mutex &lock();
52
- void assertReady(Napi::Env &env);
53
- bool isReady();
54
- bool isMainThread();
55
- void processInitRequests();
56
- void teardown();
51
+ std::recursive_mutex &lock ();
52
+ void assertReady (Napi::Env &env);
53
+ bool isReady ();
54
+ bool isMainThread ();
55
+ void processInitRequests ();
56
+ void teardown ();
57
57
 
58
- Napi::Value initialize(const Napi::CallbackInfo &info);
59
- Napi::Value initSubsystem(const Napi::CallbackInfo &info);
60
- Napi::Value cleanup(const Napi::CallbackInfo &info);
58
+ Napi::Value initialize (const Napi::CallbackInfo &info);
59
+ Napi::Value initSubsystem (const Napi::CallbackInfo &info);
60
+ Napi::Value cleanup (const Napi::CallbackInfo &info);
61
61
 
62
62
  }; // namespace global
63
63
 
@@ -9,8 +9,31 @@
9
9
  #include <cmath>
10
10
 
11
11
 
12
- std::map<Uint8, packed::Str> joystick::hat_positions;
13
- std::map<SDL_JoystickType, packed::Str> joystick::types;
12
+ const std::map<Uint8, packed::Str> joystick::hat_positions {
13
+ { SDL_HAT_CENTERED, "centered" },
14
+ { SDL_HAT_UP, "up" },
15
+ { SDL_HAT_RIGHT, "right" },
16
+ { SDL_HAT_DOWN, "down" },
17
+ { SDL_HAT_LEFT, "left" },
18
+ { SDL_HAT_RIGHTUP, "rightUp" },
19
+ { SDL_HAT_RIGHTDOWN, "rightDown" },
20
+ { SDL_HAT_LEFTUP, "leftUp" },
21
+ { SDL_HAT_LEFTDOWN, "leftDown" },
22
+ };
23
+
24
+ const std::map<SDL_JoystickType, packed::Str> joystick::types {
25
+ // { SDL_JOYSTICK_TYPE_UNKNOWN, nullptr },
26
+ { SDL_JOYSTICK_TYPE_GAMEPAD, "gamepad" },
27
+ { SDL_JOYSTICK_TYPE_WHEEL, "wheel" },
28
+ { SDL_JOYSTICK_TYPE_ARCADE_STICK, "arcadeStick" },
29
+ { SDL_JOYSTICK_TYPE_FLIGHT_STICK, "flightStick" },
30
+ { SDL_JOYSTICK_TYPE_DANCE_PAD, "dancePad" },
31
+ { SDL_JOYSTICK_TYPE_GUITAR, "guitar" },
32
+ { SDL_JOYSTICK_TYPE_DRUM_KIT, "drumKit" },
33
+ { SDL_JOYSTICK_TYPE_ARCADE_PAD, "arcadePad" },
34
+ { SDL_JOYSTICK_TYPE_THROTTLE, "throttle" },
35
+ };
36
+
14
37
  SDL_GUID joystick::zero_guid;
15
38
 
16
39
  double
@@ -206,7 +229,7 @@ joystick::mapPowerInfo (SDL_PowerState _state, int _percent)
206
229
 
207
230
 
208
231
  Napi::Value
209
- joystick::getDevices(const Napi::CallbackInfo &info)
232
+ joystick::getDevices (const Napi::CallbackInfo &info)
210
233
  {
211
234
  Napi::Env env = info.Env();
212
235
 
@@ -13,26 +13,26 @@ namespace joystick {
13
13
  ~JoysticksLock () { SDL_UnlockJoysticks(); }
14
14
  };
15
15
 
16
- extern std::map<SDL_JoystickType, packed::Str> types;
17
- extern std::map<Uint8, packed::Str> hat_positions;
16
+ extern const std::map<SDL_JoystickType, packed::Str> types;
17
+ extern const std::map<Uint8, packed::Str> hat_positions;
18
18
  extern SDL_GUID zero_guid;
19
19
 
20
20
  double mapAxis (SDL_Joystick *joystick, int axis);
21
21
  double mapAxisValue (int value);
22
22
  packed::Value _getDevice (SDL_JoystickID id);
23
23
  Napi::Array _getDevices (Napi::Env &env);
24
- packed::Value getPowerInfo(SDL_Joystick *joystick);
24
+ packed::Value getPowerInfo (SDL_Joystick *joystick);
25
25
  const char *getState (SDL_Joystick *joystick, packed::Value &dst);
26
- packed::Value mapPowerInfo(SDL_PowerState state, int percent);
27
-
28
- Napi::Value getDevices(const Napi::CallbackInfo &info);
29
- Napi::Value open(const Napi::CallbackInfo &info);
30
- Napi::Value getCapabilities(const Napi::CallbackInfo &info);
31
- Napi::Value setLed(const Napi::CallbackInfo &info);
32
- Napi::Value setPlayer(const Napi::CallbackInfo &info);
33
- Napi::Value rumble(const Napi::CallbackInfo &info);
34
- Napi::Value rumbleTriggers(const Napi::CallbackInfo &info);
35
- Napi::Value close(const Napi::CallbackInfo &info);
26
+ packed::Value mapPowerInfo (SDL_PowerState state, int percent);
27
+
28
+ Napi::Value getDevices (const Napi::CallbackInfo &info);
29
+ Napi::Value open (const Napi::CallbackInfo &info);
30
+ Napi::Value getCapabilities (const Napi::CallbackInfo &info);
31
+ Napi::Value setLed (const Napi::CallbackInfo &info);
32
+ Napi::Value setPlayer (const Napi::CallbackInfo &info);
33
+ Napi::Value rumble (const Napi::CallbackInfo &info);
34
+ Napi::Value rumbleTriggers (const Napi::CallbackInfo &info);
35
+ Napi::Value close (const Napi::CallbackInfo &info);
36
36
 
37
37
  }; // namespace joystick
38
38
 
@@ -7,7 +7,7 @@ const bool *keyboard::keys;
7
7
 
8
8
 
9
9
  packed::Value
10
- keyboard::packKey(SDL_Keycode keycode)
10
+ keyboard::packKey (SDL_Keycode keycode)
11
11
  {
12
12
  bool is_masked = (keycode & (SDLK_SCANCODE_MASK | SDLK_EXTENDED_MASK)) != 0;
13
13
 
@@ -40,7 +40,7 @@ keyboard::packKey(SDL_Keycode keycode)
40
40
  }
41
41
 
42
42
  Napi::Value
43
- keyboard::getKey(const Napi::CallbackInfo &info)
43
+ keyboard::getKey (const Napi::CallbackInfo &info)
44
44
  {
45
45
  Napi::Env env = info.Env();
46
46
 
@@ -51,7 +51,7 @@ keyboard::getKey(const Napi::CallbackInfo &info)
51
51
  }
52
52
 
53
53
  static bool
54
- isKeypad(int scancode)
54
+ isKeypad (int scancode)
55
55
  {
56
56
  return (scancode >= SDL_SCANCODE_KP_DIVIDE && scancode <= SDL_SCANCODE_KP_PERIOD)
57
57
  || scancode == SDL_SCANCODE_KP_EQUALS
@@ -61,7 +61,7 @@ isKeypad(int scancode)
61
61
  }
62
62
 
63
63
  static int
64
- findScancode(SDL_Keycode keycode)
64
+ findScancode (SDL_Keycode keycode)
65
65
  {
66
66
  for (int i = 1; i < SDL_SCANCODE_COUNT; i++) {
67
67
  if (isKeypad(i)) { continue; }
@@ -71,7 +71,7 @@ findScancode(SDL_Keycode keycode)
71
71
  }
72
72
 
73
73
  Napi::Value
74
- keyboard::getScancode(const Napi::CallbackInfo &info)
74
+ keyboard::getScancode (const Napi::CallbackInfo &info)
75
75
  {
76
76
  Napi::Env env = info.Env();
77
77
 
@@ -102,7 +102,7 @@ keyboard::getScancode(const Napi::CallbackInfo &info)
102
102
  }
103
103
 
104
104
  Napi::Value
105
- keyboard::getState(const Napi::CallbackInfo &info)
105
+ keyboard::getState (const Napi::CallbackInfo &info)
106
106
  {
107
107
  Napi::Env env = info.Env();
108
108
 
@@ -12,9 +12,9 @@ namespace keyboard {
12
12
 
13
13
  packed::Value packKey (SDL_Keycode keycode);
14
14
 
15
- Napi::Value getKey(const Napi::CallbackInfo &info);
16
- Napi::Value getScancode(const Napi::CallbackInfo &info);
17
- Napi::Value getState(const Napi::CallbackInfo &info);
15
+ Napi::Value getKey (const Napi::CallbackInfo &info);
16
+ Napi::Value getScancode (const Napi::CallbackInfo &info);
17
+ Napi::Value getState (const Napi::CallbackInfo &info);
18
18
 
19
19
  }; // namespace keyboard
20
20
 
@@ -56,6 +56,8 @@ init (Napi::Env env, Napi::Object exports)
56
56
  exports.Set("window_render", Napi::Function::New<window::render>(env));
57
57
  exports.Set("window_setIcon", Napi::Function::New<window::setIcon>(env));
58
58
  exports.Set("window_flash", Napi::Function::New<window::flash>(env));
59
+ exports.Set("window_registerHitTestHandler", Napi::Function::New<window::registerHitTestHandler>(env));
60
+ exports.Set("window_setHitTest", Napi::Function::New<window::setHitTest>(env));
59
61
  exports.Set("window_destroy", Napi::Function::New<window::destroy>(env));
60
62
 
61
63
  exports.Set("keyboard_getKey", Napi::Function::New<keyboard::getKey>(env));
@@ -116,6 +118,7 @@ init (Napi::Env env, Napi::Object exports)
116
118
  exports.Set("testing_setVirtualJoystickButton", Napi::Function::New<testing::setVirtualJoystickButton>(env));
117
119
  exports.Set("testing_detachVirtualJoystick", Napi::Function::New<testing::detachVirtualJoystick>(env));
118
120
  exports.Set("testing_pushAudioDeviceEvent", Napi::Function::New<testing::pushAudioDeviceEvent>(env));
121
+ exports.Set("testing_hitTest", Napi::Function::New<testing::hitTest>(env));
119
122
 
120
123
  exports.Set("power_getInfo", Napi::Function::New<power::getInfo>(env));
121
124
 
@@ -81,7 +81,7 @@ mouse::setCursor (const Napi::CallbackInfo &info)
81
81
  }
82
82
 
83
83
  Napi::Value
84
- mouse::resetCursor(const Napi::CallbackInfo &info)
84
+ mouse::resetCursor (const Napi::CallbackInfo &info)
85
85
  {
86
86
  Napi::Env env = info.Env();
87
87
 
@@ -5,15 +5,15 @@
5
5
 
6
6
  namespace mouse {
7
7
 
8
- Napi::Value getButton(const Napi::CallbackInfo &info);
9
- Napi::Value getPosition(const Napi::CallbackInfo &info);
10
- Napi::Value setPosition(const Napi::CallbackInfo &info);
11
- Napi::Value setCursor(const Napi::CallbackInfo &info);
12
- Napi::Value resetCursor(const Napi::CallbackInfo &info);
13
- Napi::Value setCursorImage(const Napi::CallbackInfo &info);
14
- Napi::Value showCursor(const Napi::CallbackInfo &info);
15
- Napi::Value redrawCursor(const Napi::CallbackInfo &info);
16
- Napi::Value capture(const Napi::CallbackInfo &info);
8
+ Napi::Value getButton (const Napi::CallbackInfo &info);
9
+ Napi::Value getPosition (const Napi::CallbackInfo &info);
10
+ Napi::Value setPosition (const Napi::CallbackInfo &info);
11
+ Napi::Value setCursor (const Napi::CallbackInfo &info);
12
+ Napi::Value resetCursor (const Napi::CallbackInfo &info);
13
+ Napi::Value setCursorImage (const Napi::CallbackInfo &info);
14
+ Napi::Value showCursor (const Napi::CallbackInfo &info);
15
+ Napi::Value redrawCursor (const Napi::CallbackInfo &info);
16
+ Napi::Value capture (const Napi::CallbackInfo &info);
17
17
 
18
18
  }; // namespace mouse
19
19
 
@@ -10,10 +10,10 @@ Overload(Fs...) -> Overload<Fs...>;
10
10
 
11
11
 
12
12
  packed::Value
13
- packed::Value::ref (const Str &value)
13
+ packed::Value::ref (Str value)
14
14
  {
15
15
  Value result;
16
- result.data.emplace<const std::string *>(&value.str());
16
+ result.data.emplace<const char *>(value.c_str());
17
17
  return result;
18
18
  }
19
19
 
@@ -51,19 +51,12 @@ packed::Value::get (const char *key) const
51
51
  packed::Value &
52
52
  packed::Value::set (const char *key, Value value)
53
53
  {
54
- Object &members = std::get<Object>(data);
55
- for (Member &member : members) {
56
- if (std::strcmp(member.key, key) == 0) {
57
- member.value = std::move(value);
58
- return *this;
59
- }
60
- }
61
- members.push_back({ key, std::move(value) });
54
+ std::get<Object>(data).push_back({ key, std::move(value) });
62
55
  return *this;
63
56
  }
64
57
 
65
58
  packed::Value &
66
- packed::Value::set (const Str &key, Value value)
59
+ packed::Value::set (Str key, Value value)
67
60
  {
68
61
  return set(key.c_str(), std::move(value));
69
62
  }
@@ -86,7 +79,7 @@ packed::Value::toNapi (Napi::Env env) const
86
79
  [&](double value) -> Napi::Value { return Napi::Number::New(env, value); },
87
80
  [&](int64_t value) -> Napi::Value { return Napi::BigInt::New(env, value); },
88
81
  [&](uint64_t value) -> Napi::Value { return Napi::BigInt::New(env, value); },
89
- [&](const std::string *value) -> Napi::Value { return Napi::String::New(env, *value); },
82
+ [&](const char *value) -> Napi::Value { return Napi::String::New(env, value); },
90
83
  [&](const std::string &value) -> Napi::Value { return Napi::String::New(env, value); },
91
84
  [&](const Object &members) -> Napi::Value {
92
85
  Napi::Object object = Napi::Object::New(env);