@kmamal/sdl 0.11.13 → 1.0.0-3

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 (86) hide show
  1. package/CHANGELOG.md +113 -1
  2. package/README.md +26 -2685
  3. package/binding.gyp +82 -65
  4. package/package.json +17 -11
  5. package/scripts/build-sdl.mjs +15 -7
  6. package/scripts/build.mjs +30 -15
  7. package/scripts/download-release.mjs +9 -6
  8. package/scripts/download-sdl.mjs +9 -6
  9. package/scripts/install.mjs +13 -5
  10. package/scripts/util/common.js +9 -1
  11. package/src/javascript/audio/audio-playback-stream.js +50 -0
  12. package/src/javascript/audio/audio-recording-stream.js +32 -0
  13. package/src/javascript/audio/{audio-instance.js → audio-stream.js} +40 -34
  14. package/src/javascript/audio/device.js +34 -6
  15. package/src/javascript/audio/format-helpers.js +29 -34
  16. package/src/javascript/audio/index.js +37 -26
  17. package/src/javascript/audio/prevent-exit.js +19 -9
  18. package/src/javascript/cleanup.js +19 -10
  19. package/src/javascript/enums.js +5 -0
  20. package/src/javascript/events/events-via-poll.js +25 -7
  21. package/src/javascript/events/index.js +280 -174
  22. package/src/javascript/gamepad/device.js +23 -0
  23. package/src/javascript/gamepad/gamepad-instance.js +211 -0
  24. package/src/javascript/gamepad/index.js +51 -0
  25. package/src/javascript/globals.js +8 -5
  26. package/src/javascript/helpers.js +41 -7
  27. package/src/javascript/index.js +5 -3
  28. package/src/javascript/joystick/device.js +5 -10
  29. package/src/javascript/joystick/index.js +7 -7
  30. package/src/javascript/joystick/joystick-instance.js +81 -42
  31. package/src/javascript/joystick/shared.js +90 -0
  32. package/src/javascript/keyboard/index.js +6 -4
  33. package/src/javascript/keyboard/key-mapping.js +70 -28
  34. package/src/javascript/mouse/index.js +21 -10
  35. package/src/javascript/sensor/devices.js +17 -0
  36. package/src/javascript/sensor/index.js +2 -16
  37. package/src/javascript/sensor/sensor-instance.js +22 -6
  38. package/src/javascript/touch/devices.js +17 -0
  39. package/src/javascript/touch/index.js +3 -7
  40. package/src/javascript/video/format-helpers.js +117 -0
  41. package/src/javascript/video/index.js +44 -5
  42. package/src/javascript/video/window.js +289 -133
  43. package/src/native/audio.cpp +182 -58
  44. package/src/native/audio.h +10 -5
  45. package/src/native/clipboard.cpp +22 -5
  46. package/src/native/cocoa-window.h +1 -0
  47. package/src/native/cocoa-window.mm +1 -1
  48. package/src/native/enums.cpp +91 -58
  49. package/src/native/events.cpp +437 -284
  50. package/src/native/events.h +18 -12
  51. package/src/native/gamepad.cpp +185 -0
  52. package/src/native/gamepad.h +27 -0
  53. package/src/native/global.cpp +173 -167
  54. package/src/native/global.h +0 -2
  55. package/src/native/joystick.cpp +287 -225
  56. package/src/native/joystick.h +7 -6
  57. package/src/native/keyboard.cpp +28 -8
  58. package/src/native/keyboard.h +4 -2
  59. package/src/native/module.cpp +14 -8
  60. package/src/native/mouse.cpp +54 -34
  61. package/src/native/mouse.h +0 -1
  62. package/src/native/power.cpp +10 -4
  63. package/src/native/power.h +1 -1
  64. package/src/native/sensor.cpp +52 -52
  65. package/src/native/sensor.h +1 -1
  66. package/src/native/touch.cpp +45 -24
  67. package/src/native/touch.h +1 -1
  68. package/src/native/video.cpp +115 -75
  69. package/src/native/video.h +5 -2
  70. package/src/native/window.cpp +409 -321
  71. package/src/native/window.h +3 -1
  72. package/src/types/helpers.d.ts +45 -19
  73. package/src/types/index.d.ts +366 -273
  74. package/scripts/util/fetch.js +0 -85
  75. package/src/javascript/audio/audio-playback-instance.js +0 -23
  76. package/src/javascript/audio/audio-recording-instance.js +0 -17
  77. package/src/javascript/controller/controller-instance.js +0 -160
  78. package/src/javascript/controller/device.js +0 -26
  79. package/src/javascript/controller/index.js +0 -33
  80. package/src/javascript/events/reconcile-audio-devices.js +0 -16
  81. package/src/javascript/events/reconcile-displays.js +0 -17
  82. package/src/javascript/events/reconcile-joystick-and-controller-devices.js +0 -40
  83. package/src/javascript/events/reconcile.js +0 -61
  84. package/src/javascript/video/display.js +0 -4
  85. package/src/native/controller.cpp +0 -192
  86. package/src/native/controller.h +0 -26
@@ -4,65 +4,61 @@
4
4
  #include "video.h"
5
5
  #include "touch.h"
6
6
  #include "joystick.h"
7
- #include "controller.h"
7
+ #include "gamepad.h"
8
8
  #include "sensor.h"
9
9
  #include "audio.h"
10
10
  #include "power.h"
11
- #include <SDL.h>
11
+ #include <SDL3/SDL.h>
12
12
  #include <string>
13
13
  #include <sstream>
14
14
  #include <vector>
15
15
 
16
- #if defined(__MACOSX__)
16
+ #if defined(SDL_PLATFORM_MACOS)
17
17
  #include "cocoa-global.h"
18
18
  #endif
19
19
 
20
20
 
21
- static SDL_threadID mainThreadId;
21
+ static SDL_ThreadID mainThreadId;
22
22
 
23
- int filterEvents(void*, SDL_Event *event) {
23
+ bool watchEvents(void*, SDL_Event *event) {
24
24
  if (true
25
- && SDL_ThreadID() == mainThreadId
26
- && event->type == SDL_WINDOWEVENT
25
+ && SDL_GetCurrentThreadID() == mainThreadId
27
26
  && (false
28
- || event->window.event == SDL_WINDOWEVENT_MOVED
29
- || event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED
27
+ || event->type == SDL_EVENT_WINDOW_MOVED
28
+ || event->type == SDL_EVENT_WINDOW_RESIZED
30
29
  )
31
- ) { events::dispatchEvent(*event); }
32
-
33
- return 1;
30
+ ) {
31
+ events::dispatchEventFromWatch(*event);
32
+ }
33
+ return true;
34
34
  }
35
35
 
36
36
 
37
- const char *global::no_error = nullptr;
38
-
39
-
40
37
  Napi::Value
41
38
  global::initialize(const Napi::CallbackInfo &info)
42
39
  {
43
40
  Napi::Env env = info.Env();
44
41
 
45
- events::families::APP = "app";
46
- events::families::DISPLAY = "display";
47
- events::families::WINDOW = "window";
48
- events::families::DROP = "drop";
49
- events::families::KEYMAP = "keymap";
50
- events::families::KEYBOARD = "keyboard";
51
- events::families::TEXT = "text";
52
- events::families::MOUSE = "mouse";
53
- events::families::TOUCH = "touch";
54
- events::families::JOYSTICK_DEVICE = "joystickDevice";
55
- events::families::JOYSTICK = "joystick";
56
- events::families::CONTROLLER = "controller";
57
- events::families::SENSOR = "sensor";
58
- events::families::AUDIO_DEVICE = "audioDevice";
59
- events::families::CLIPBOARD = "clipboard";
42
+ events::targets::APP = "app";
43
+ events::targets::VIDEO = "video";
44
+ events::targets::WINDOW = "window";
45
+ events::targets::KEYBOARD = "keyboard";
46
+ events::targets::JOYSTICK = "joystick";
47
+ events::targets::GAMEPAD = "gamepad";
48
+ events::targets::SENSOR = "sensor";
49
+ events::targets::CLIPBOARD = "clipboard";
50
+ events::targets::JOYSTICK_DEVICE = "joystickDevice";
51
+ events::targets::GAMEPAD_DEVICE = "gamepadDevice";
52
+ events::targets::AUDIO_DEVICE = "audioDevice";
60
53
 
61
54
  events::types::QUIT = "quit";
62
55
  events::types::DISPLAY_ADD = "displayAdd";
63
56
  events::types::DISPLAY_REMOVE = "displayRemove";
64
57
  events::types::DISPLAY_ORIENT = "displayOrient";
65
58
  events::types::DISPLAY_MOVE = "displayMove";
59
+ events::types::DISPLAY_SCALE = "displayScaleChange";
60
+ events::types::DISPLAY_MODE = "displayModeChange";
61
+ events::types::DISPLAY_USABLE = "displayUsableChange";
66
62
  events::types::DISPLAY_CHANGE = "displayChange";
67
63
  events::types::SHOW = "show";
68
64
  events::types::HIDE = "hide";
@@ -72,6 +68,8 @@ global::initialize(const Napi::CallbackInfo &info)
72
68
  events::types::MINIMIZE = "minimize";
73
69
  events::types::MAXIMIZE = "maximize";
74
70
  events::types::RESTORE = "restore";
71
+ events::types::ENTER_FULLSCREEN = "enterFullscreen";
72
+ events::types::LEAVE_FULLSCREEN = "leaveFullscreen";
75
73
  events::types::FOCUS = "focus";
76
74
  events::types::BLUR = "blur";
77
75
  events::types::HOVER = "hover";
@@ -88,12 +86,15 @@ global::initialize(const Napi::CallbackInfo &info)
88
86
  events::types::DROP_FILE = "dropFile";
89
87
  events::types::DROP_TEXT = "dropText";
90
88
  events::types::CLOSE = "close";
89
+ events::types::RENDER_DEVICE_LOST = "renderDeviceLost";
91
90
  events::types::KEYMAP_CHANGE = "keymapChange";
92
91
  events::types::FINGER_DOWN = "fingerDown";
93
92
  events::types::FINGER_UP = "fingerUp";
94
93
  events::types::FINGER_MOVE = "fingerMove";
94
+ events::types::FINGER_CANCEL = "fingerCancel";
95
95
  events::types::DEVICE_ADD = "deviceAdd";
96
96
  events::types::DEVICE_REMOVE = "deviceRemove";
97
+ events::types::DEVICE_FORMAT_CHANGE = "deviceFormatChange";
97
98
  events::types::AXIS_MOTION = "axisMotion";
98
99
  events::types::BUTTON_DOWN = "buttonDown";
99
100
  events::types::BUTTON_UP = "buttonUp";
@@ -111,9 +112,10 @@ global::initialize(const Napi::CallbackInfo &info)
111
112
  video::orientations[SDL_ORIENTATION_PORTRAIT_FLIPPED] = "portraitFlipped";
112
113
 
113
114
  video::formats[SDL_PIXELFORMAT_RGB332] = "rgb332";
114
- video::formats[SDL_PIXELFORMAT_RGB444] = "rgb444";
115
- video::formats[SDL_PIXELFORMAT_RGB555] = "rgb555";
116
- video::formats[SDL_PIXELFORMAT_BGR555] = "bgr555";
115
+ video::formats[SDL_PIXELFORMAT_XRGB4444] = "xrgb4444";
116
+ video::formats[SDL_PIXELFORMAT_XBGR4444] = "xbgr4444";
117
+ video::formats[SDL_PIXELFORMAT_XRGB1555] = "xrgb1555";
118
+ video::formats[SDL_PIXELFORMAT_XBGR1555] = "xbgr1555";
117
119
  video::formats[SDL_PIXELFORMAT_ARGB4444] = "argb4444";
118
120
  video::formats[SDL_PIXELFORMAT_RGBA4444] = "rgba4444";
119
121
  video::formats[SDL_PIXELFORMAT_ABGR4444] = "abgr4444";
@@ -126,19 +128,36 @@ global::initialize(const Napi::CallbackInfo &info)
126
128
  video::formats[SDL_PIXELFORMAT_BGR565] = "bgr565";
127
129
  video::formats[SDL_PIXELFORMAT_RGB24] = "rgb24";
128
130
  video::formats[SDL_PIXELFORMAT_BGR24] = "bgr24";
129
- video::formats[SDL_PIXELFORMAT_RGB888] = "rgb888";
131
+ video::formats[SDL_PIXELFORMAT_XRGB8888] = "xrgb8888";
130
132
  video::formats[SDL_PIXELFORMAT_RGBX8888] = "rgbx8888";
131
- video::formats[SDL_PIXELFORMAT_BGR888] = "bgr888";
133
+ video::formats[SDL_PIXELFORMAT_XBGR8888] = "xbgr8888";
132
134
  video::formats[SDL_PIXELFORMAT_BGRX8888] = "bgrx8888";
133
135
  video::formats[SDL_PIXELFORMAT_ARGB8888] = "argb8888";
134
136
  video::formats[SDL_PIXELFORMAT_RGBA8888] = "rgba8888";
135
137
  video::formats[SDL_PIXELFORMAT_ABGR8888] = "abgr8888";
136
138
  video::formats[SDL_PIXELFORMAT_BGRA8888] = "bgra8888";
137
139
  video::formats[SDL_PIXELFORMAT_ARGB2101010] = "argb2101010";
138
- video::formats[SDL_PIXELFORMAT_RGBA32] = "rgba32";
139
- video::formats[SDL_PIXELFORMAT_ARGB32] = "argb32";
140
- video::formats[SDL_PIXELFORMAT_BGRA32] = "bgra32";
141
- video::formats[SDL_PIXELFORMAT_ABGR32] = "abgr32";
140
+ video::formats[SDL_PIXELFORMAT_XRGB2101010] = "xrgb2101010";
141
+ video::formats[SDL_PIXELFORMAT_XBGR2101010] = "xbgr2101010";
142
+ video::formats[SDL_PIXELFORMAT_ABGR2101010] = "abgr2101010";
143
+ video::formats[SDL_PIXELFORMAT_RGB48] = "rgb48";
144
+ video::formats[SDL_PIXELFORMAT_BGR48] = "bgr48";
145
+ video::formats[SDL_PIXELFORMAT_RGBA64] = "rgba64";
146
+ video::formats[SDL_PIXELFORMAT_ARGB64] = "argb64";
147
+ video::formats[SDL_PIXELFORMAT_BGRA64] = "bgra64";
148
+ video::formats[SDL_PIXELFORMAT_ABGR64] = "abgr64";
149
+ video::formats[SDL_PIXELFORMAT_RGB48_FLOAT] = "rgb48f";
150
+ video::formats[SDL_PIXELFORMAT_BGR48_FLOAT] = "bgr48f";
151
+ video::formats[SDL_PIXELFORMAT_RGBA64_FLOAT] = "rgba64f";
152
+ video::formats[SDL_PIXELFORMAT_ARGB64_FLOAT] = "argb64f";
153
+ video::formats[SDL_PIXELFORMAT_BGRA64_FLOAT] = "bgra64f";
154
+ video::formats[SDL_PIXELFORMAT_ABGR64_FLOAT] = "abgr64f";
155
+ video::formats[SDL_PIXELFORMAT_RGB96_FLOAT] = "rgb96f";
156
+ video::formats[SDL_PIXELFORMAT_BGR96_FLOAT] = "bgr96f";
157
+ video::formats[SDL_PIXELFORMAT_RGBA128_FLOAT] = "rgba128f";
158
+ video::formats[SDL_PIXELFORMAT_ARGB128_FLOAT] = "argb128f";
159
+ video::formats[SDL_PIXELFORMAT_BGRA128_FLOAT] = "bgra128f";
160
+ video::formats[SDL_PIXELFORMAT_ABGR128_FLOAT] = "abgr128f";
142
161
  video::formats[SDL_PIXELFORMAT_YV12] = "yv12";
143
162
  video::formats[SDL_PIXELFORMAT_IYUV] = "iyuv";
144
163
  video::formats[SDL_PIXELFORMAT_YUY2] = "yuy2";
@@ -146,6 +165,7 @@ global::initialize(const Napi::CallbackInfo &info)
146
165
  video::formats[SDL_PIXELFORMAT_YVYU] = "yvyu";
147
166
  video::formats[SDL_PIXELFORMAT_NV12] = "nv12";
148
167
  video::formats[SDL_PIXELFORMAT_NV21] = "nv21";
168
+ video::formats[SDL_PIXELFORMAT_P010] = "p010";
149
169
 
150
170
  // touch::device_types[SDL_TOUCH_DEVICE_INVALID] = nullptr;
151
171
  touch::device_types[SDL_TOUCH_DEVICE_DIRECT] = "direct";
@@ -153,75 +173,82 @@ global::initialize(const Napi::CallbackInfo &info)
153
173
  touch::device_types[SDL_TOUCH_DEVICE_INDIRECT_RELATIVE] = "indirectRelative";
154
174
 
155
175
  // joystick::types[SDL_JOYSTICK_TYPE_UNKNOWN] = nullptr;
156
- joystick::types[SDL_JOYSTICK_TYPE_GAMECONTROLLER] = "gamecontroller";
176
+ joystick::types[SDL_JOYSTICK_TYPE_GAMEPAD] = "gamepad";
157
177
  joystick::types[SDL_JOYSTICK_TYPE_WHEEL] = "wheel";
158
- joystick::types[SDL_JOYSTICK_TYPE_ARCADE_STICK] = "arcadestick";
159
- joystick::types[SDL_JOYSTICK_TYPE_FLIGHT_STICK] = "flightstick";
160
- joystick::types[SDL_JOYSTICK_TYPE_DANCE_PAD] = "dancepad";
178
+ joystick::types[SDL_JOYSTICK_TYPE_ARCADE_STICK] = "arcadeStick";
179
+ joystick::types[SDL_JOYSTICK_TYPE_FLIGHT_STICK] = "flightStick";
180
+ joystick::types[SDL_JOYSTICK_TYPE_DANCE_PAD] = "dancePad";
161
181
  joystick::types[SDL_JOYSTICK_TYPE_GUITAR] = "guitar";
162
- joystick::types[SDL_JOYSTICK_TYPE_DRUM_KIT] = "drumkit";
163
- joystick::types[SDL_JOYSTICK_TYPE_ARCADE_PAD] = "arcadepad";
182
+ joystick::types[SDL_JOYSTICK_TYPE_DRUM_KIT] = "drumKit";
183
+ joystick::types[SDL_JOYSTICK_TYPE_ARCADE_PAD] = "arcadePad";
164
184
  joystick::types[SDL_JOYSTICK_TYPE_THROTTLE] = "throttle";
165
185
 
166
- // joystick::power_levels[SDL_JOYSTICK_POWER_UNKNOWN] = nullptr;
167
- joystick::power_levels[SDL_JOYSTICK_POWER_EMPTY] = "empty";
168
- joystick::power_levels[SDL_JOYSTICK_POWER_LOW] = "low";
169
- joystick::power_levels[SDL_JOYSTICK_POWER_MEDIUM] = "medium";
170
- joystick::power_levels[SDL_JOYSTICK_POWER_FULL] = "full";
171
- joystick::power_levels[SDL_JOYSTICK_POWER_WIRED] = "wired";
172
- joystick::power_levels[SDL_JOYSTICK_POWER_MAX] = "max";
173
-
174
186
  joystick::hat_positions[SDL_HAT_CENTERED] = "centered";
175
187
  joystick::hat_positions[SDL_HAT_UP] = "up";
176
188
  joystick::hat_positions[SDL_HAT_RIGHT] = "right";
177
189
  joystick::hat_positions[SDL_HAT_DOWN] = "down";
178
190
  joystick::hat_positions[SDL_HAT_LEFT] = "left";
179
- joystick::hat_positions[SDL_HAT_RIGHTUP] = "rightup";
180
- joystick::hat_positions[SDL_HAT_RIGHTDOWN] = "rightdown";
181
- joystick::hat_positions[SDL_HAT_LEFTUP] = "leftup";
182
- joystick::hat_positions[SDL_HAT_LEFTDOWN] = "leftdown";
183
-
184
- // controller::types[SDL_CONTROLLER_TYPE_UNKNOWN] = nullptr;
185
- controller::types[SDL_CONTROLLER_TYPE_XBOX360] = "xbox360";
186
- controller::types[SDL_CONTROLLER_TYPE_XBOXONE] = "xboxOne";
187
- controller::types[SDL_CONTROLLER_TYPE_PS3] = "ps3";
188
- controller::types[SDL_CONTROLLER_TYPE_PS4] = "ps4";
189
- controller::types[SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO] = "nintendoSwitchPro";
190
- controller::types[SDL_CONTROLLER_TYPE_VIRTUAL] = "virtual";
191
- controller::types[SDL_CONTROLLER_TYPE_PS5] = "ps5";
192
- controller::types[SDL_CONTROLLER_TYPE_AMAZON_LUNA] = "amazonLuna";
193
- controller::types[SDL_CONTROLLER_TYPE_GOOGLE_STADIA] = "googleStadia";
194
- controller::types[SDL_CONTROLLER_TYPE_NVIDIA_SHIELD] = "nvidiaShield";
195
- controller::types[SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT] = "nintendoSwitchJoyconLeft";
196
- controller::types[SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT] = "nintendoSwitchJoyconRight";
197
- controller::types[SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR] = "nintendoSwitchJoyconPair";
198
-
199
- controller::axes[SDL_CONTROLLER_AXIS_LEFTX] = "leftStickX";
200
- controller::axes[SDL_CONTROLLER_AXIS_LEFTY] = "leftStickY";
201
- controller::axes[SDL_CONTROLLER_AXIS_RIGHTX] = "rightStickX";
202
- controller::axes[SDL_CONTROLLER_AXIS_RIGHTY] = "rightStickY";
203
- controller::axes[SDL_CONTROLLER_AXIS_TRIGGERLEFT] = "leftTrigger";
204
- controller::axes[SDL_CONTROLLER_AXIS_TRIGGERRIGHT] = "rightTrigger";
205
-
206
- controller::buttons[SDL_CONTROLLER_BUTTON_DPAD_LEFT] = "dpadLeft";
207
- controller::buttons[SDL_CONTROLLER_BUTTON_DPAD_RIGHT] = "dpadRight";
208
- controller::buttons[SDL_CONTROLLER_BUTTON_DPAD_UP] = "dpadUp";
209
- controller::buttons[SDL_CONTROLLER_BUTTON_DPAD_DOWN] = "dpadDown";
210
- controller::buttons[SDL_CONTROLLER_BUTTON_A] = "a";
211
- controller::buttons[SDL_CONTROLLER_BUTTON_B] = "b";
212
- controller::buttons[SDL_CONTROLLER_BUTTON_X] = "x";
213
- controller::buttons[SDL_CONTROLLER_BUTTON_Y] = "y";
214
- controller::buttons[SDL_CONTROLLER_BUTTON_GUIDE] = "guide";
215
- controller::buttons[SDL_CONTROLLER_BUTTON_BACK] = "back";
216
- controller::buttons[SDL_CONTROLLER_BUTTON_START] = "start";
217
- controller::buttons[SDL_CONTROLLER_BUTTON_LEFTSTICK] = "leftStick";
218
- controller::buttons[SDL_CONTROLLER_BUTTON_RIGHTSTICK] = "rightStick";
219
- controller::buttons[SDL_CONTROLLER_BUTTON_LEFTSHOULDER] = "leftShoulder";
220
- controller::buttons[SDL_CONTROLLER_BUTTON_RIGHTSHOULDER] = "rightShoulder";
221
- controller::buttons[SDL_CONTROLLER_BUTTON_PADDLE1] = "paddle1";
222
- controller::buttons[SDL_CONTROLLER_BUTTON_PADDLE2] = "paddle2";
223
- controller::buttons[SDL_CONTROLLER_BUTTON_PADDLE3] = "paddle3";
224
- controller::buttons[SDL_CONTROLLER_BUTTON_PADDLE4] = "paddle4";
191
+ joystick::hat_positions[SDL_HAT_RIGHTUP] = "rightUp";
192
+ joystick::hat_positions[SDL_HAT_RIGHTDOWN] = "rightDown";
193
+ joystick::hat_positions[SDL_HAT_LEFTUP] = "leftUp";
194
+ joystick::hat_positions[SDL_HAT_LEFTDOWN] = "leftDown";
195
+
196
+ // gamepad::types[SDL_GAMEPAD_TYPE_UNKNOWN] = nullptr;
197
+ gamepad::types[SDL_GAMEPAD_TYPE_STANDARD] = "standard";
198
+ gamepad::types[SDL_GAMEPAD_TYPE_XBOX360] = "xbox360";
199
+ gamepad::types[SDL_GAMEPAD_TYPE_XBOXONE] = "xboxOne";
200
+ gamepad::types[SDL_GAMEPAD_TYPE_PS3] = "ps3";
201
+ gamepad::types[SDL_GAMEPAD_TYPE_PS4] = "ps4";
202
+ gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO] = "nintendoSwitchPro";
203
+ gamepad::types[SDL_GAMEPAD_TYPE_PS5] = "ps5";
204
+ gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT] = "nintendoSwitchJoyconLeft";
205
+ gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT] = "nintendoSwitchJoyconRight";
206
+ gamepad::types[SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_PAIR] = "nintendoSwitchJoyconPair";
207
+ gamepad::types[SDL_GAMEPAD_TYPE_GAMECUBE] = "gamecube";
208
+
209
+ gamepad::axes[SDL_GAMEPAD_AXIS_LEFTX] = "leftStickX";
210
+ gamepad::axes[SDL_GAMEPAD_AXIS_LEFTY] = "leftStickY";
211
+ gamepad::axes[SDL_GAMEPAD_AXIS_RIGHTX] = "rightStickX";
212
+ gamepad::axes[SDL_GAMEPAD_AXIS_RIGHTY] = "rightStickY";
213
+ gamepad::axes[SDL_GAMEPAD_AXIS_LEFT_TRIGGER] = "leftTrigger";
214
+ gamepad::axes[SDL_GAMEPAD_AXIS_RIGHT_TRIGGER] = "rightTrigger";
215
+
216
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_LEFT] = "dpadLeft";
217
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_RIGHT] = "dpadRight";
218
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_UP] = "dpadUp";
219
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_DPAD_DOWN] = "dpadDown";
220
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_SOUTH] = "south";
221
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_EAST] = "east";
222
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_WEST] = "west";
223
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_NORTH] = "north";
224
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_GUIDE] = "guide";
225
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_BACK] = "back";
226
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_START] = "start";
227
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_STICK] = "leftStick";
228
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_STICK] = "rightStick";
229
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_SHOULDER] = "leftShoulder";
230
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER] = "rightShoulder";
231
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1] = "rightPaddle1";
232
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_PADDLE1] = "leftPaddle1";
233
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2] = "rightPaddle2";
234
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_LEFT_PADDLE2] = "leftPaddle2";
235
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC1] = "misc1";
236
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC2] = "misc2";
237
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC3] = "misc3";
238
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC4] = "misc4";
239
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC5] = "misc5";
240
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_MISC6] = "misc6";
241
+ gamepad::buttons[SDL_GAMEPAD_BUTTON_TOUCHPAD] = "touchpad";
242
+
243
+ // gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_UNKNOWN] = nullptr;
244
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_A] = "a";
245
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_B] = "b";
246
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_X] = "x";
247
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_Y] = "y";
248
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_CROSS] = "cross";
249
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_CIRCLE] = "circle";
250
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_SQUARE] = "square";
251
+ gamepad::button_labels[SDL_GAMEPAD_BUTTON_LABEL_TRIANGLE] = "triangle";
225
252
 
226
253
  // sensor::types[SDL_SENSOR_UNKNOWN] = nullptr;
227
254
  sensor::types[SDL_SENSOR_ACCEL] = "accelerometer";
@@ -242,6 +269,15 @@ global::initialize(const Napi::CallbackInfo &info)
242
269
  audio::device_types[true] = "recording";
243
270
  audio::device_types[false] = "playback";
244
271
 
272
+ audio::formats[SDL_AUDIO_S8] = "s8";
273
+ audio::formats[SDL_AUDIO_U8] = "u8";
274
+ audio::formats[SDL_AUDIO_S16LE] = "s16le";
275
+ audio::formats[SDL_AUDIO_S16BE] = "s16be";
276
+ audio::formats[SDL_AUDIO_S32LE] = "s32le";
277
+ audio::formats[SDL_AUDIO_S32BE] = "s32be";
278
+ audio::formats[SDL_AUDIO_F32LE] = "f32le";
279
+ audio::formats[SDL_AUDIO_F32BE] = "f32be";
280
+
245
281
  // power::states[SDL_POWERSTATE_UNKNOWN] = nullptr;
246
282
  power::states[SDL_POWERSTATE_NO_BATTERY] = "noBattery";
247
283
  power::states[SDL_POWERSTATE_ON_BATTERY] = "battery";
@@ -252,66 +288,52 @@ global::initialize(const Napi::CallbackInfo &info)
252
288
  Napi::Object initialized = Napi::Object::New(env);
253
289
 
254
290
  SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "0");
291
+ SDL_SetHint(SDL_HINT_QUIT_ON_LAST_WINDOW_CLOSE, "0");
255
292
 
256
- if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0) {
293
+ if (!SDL_InitSubSystem(SDL_INIT_EVENTS)) {
257
294
  std::ostringstream message;
258
295
  message << "SDL_Init() error: " << SDL_GetError();
259
296
  SDL_ClearError();
260
297
  throw Napi::Error::New(env, message.str());
261
298
  }
262
299
 
263
- SDL_version sdl_compile_version;
264
- SDL_VERSION(&sdl_compile_version);
300
+ int sdl_compile_version = SDL_VERSION;
265
301
 
266
302
  Napi::Object compile_version = Napi::Object::New(env);
267
- compile_version.Set("major", sdl_compile_version.major);
268
- compile_version.Set("minor", sdl_compile_version.minor);
269
- compile_version.Set("patch", sdl_compile_version.patch);
303
+ compile_version.Set("major", SDL_VERSIONNUM_MAJOR(sdl_compile_version));
304
+ compile_version.Set("minor", SDL_VERSIONNUM_MINOR(sdl_compile_version));
305
+ compile_version.Set("patch", SDL_VERSIONNUM_MICRO(sdl_compile_version));
270
306
 
271
- SDL_version sdl_runtime_version;
272
- SDL_GetVersion(&sdl_runtime_version);
307
+ int sdl_runtime_version = SDL_GetVersion();
273
308
 
274
309
  Napi::Object runtime_version = Napi::Object::New(env);
275
- runtime_version.Set("major", sdl_runtime_version.major);
276
- runtime_version.Set("minor", sdl_runtime_version.minor);
277
- runtime_version.Set("patch", sdl_runtime_version.patch);
310
+ runtime_version.Set("major", SDL_VERSIONNUM_MAJOR(sdl_runtime_version));
311
+ runtime_version.Set("minor", SDL_VERSIONNUM_MINOR(sdl_runtime_version));
312
+ runtime_version.Set("patch", SDL_VERSIONNUM_MICRO(sdl_runtime_version));
278
313
 
279
314
  Napi::Object versions = Napi::Object::New(env);
280
315
  versions.Set("compile", compile_version);
281
316
  versions.Set("runtime", runtime_version);
282
317
 
283
- const char *platform = SDL_GetPlatform();
318
+ const char *platform_name = SDL_GetPlatform();
319
+ Napi::Value platform;
320
+ if (SDL_strncmp(platform_name, "Unknown", 7) == 0) {
321
+ platform = env.Null();
322
+ }
323
+ else {
324
+ platform = Napi::String::New(env, platform_name);
325
+ }
284
326
 
285
327
  Napi::Array all_video_drivers = Napi::Array::New(env);
286
328
 
287
329
  int num_video_drivers = SDL_GetNumVideoDrivers();
288
- if (num_video_drivers < 0) {
289
- std::ostringstream message;
290
- message << "SDL_GetNumVideoDrivers() error: " << SDL_GetError();
291
- SDL_ClearError();
292
- throw Napi::Error::New(env, message.str());
293
- }
294
330
  for (int i = 0; i < num_video_drivers; i ++) {
295
- const char *name = SDL_GetVideoDriver(i);
296
- if(name == nullptr) {
297
- std::ostringstream message;
298
- message << "SDL_GetVideoDriver(" << i << ") error: " << SDL_GetError();
299
- SDL_ClearError();
300
- throw Napi::Error::New(env, message.str());
301
- }
302
- all_video_drivers.Set(all_video_drivers.Length(), name);
331
+ all_video_drivers.Set(i, SDL_GetVideoDriver(i));
303
332
  }
304
333
 
305
334
  Napi::Value current_video_driver;
306
- if (SDL_InitSubSystem(SDL_INIT_VIDEO) == 0) {
307
- const char *name = SDL_GetCurrentVideoDriver();
308
- if(name == nullptr) {
309
- std::ostringstream message;
310
- message << "SDL_GetCurrentVideoDriver() error: " << SDL_GetError();
311
- SDL_ClearError();
312
- throw Napi::Error::New(env, message.str());
313
- }
314
- current_video_driver = Napi::String::New(env, name);
335
+ if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
336
+ current_video_driver = Napi::String::New(env, SDL_GetCurrentVideoDriver());
315
337
  initialized.Set("video", true);
316
338
  }
317
339
  else {
@@ -326,34 +348,13 @@ global::initialize(const Napi::CallbackInfo &info)
326
348
  Napi::Array all_audio_drivers = Napi::Array::New(env);
327
349
 
328
350
  int num_audio_drivers = SDL_GetNumAudioDrivers();
329
- if (num_audio_drivers < 0) {
330
- std::ostringstream message;
331
- message << "SDL_GetNumAudioDrivers() error: " << SDL_GetError();
332
- SDL_ClearError();
333
- throw Napi::Error::New(env, message.str());
334
- }
335
-
336
351
  for (int i = 0; i < num_audio_drivers; i ++) {
337
- const char *name = SDL_GetAudioDriver(i);
338
- if(name == nullptr) {
339
- std::ostringstream message;
340
- message << "SDL_GetAudioDriver(" << i << ") error: " << SDL_GetError();
341
- SDL_ClearError();
342
- throw Napi::Error::New(env, message.str());
343
- }
344
- all_audio_drivers.Set(all_audio_drivers.Length(), name);
352
+ all_audio_drivers.Set(i, SDL_GetAudioDriver(i));
345
353
  }
346
354
 
347
355
  Napi::Value current_audio_driver;
348
- if (SDL_InitSubSystem(SDL_INIT_AUDIO) == 0) {
349
- const char *name = SDL_GetCurrentAudioDriver();
350
- if(name == nullptr) {
351
- std::ostringstream message;
352
- message << "SDL_GetCurrentAudioDriver() error: " << SDL_GetError();
353
- SDL_ClearError();
354
- throw Napi::Error::New(env, message.str());
355
- }
356
- current_audio_driver = Napi::String::New(env, name);
356
+ if (SDL_InitSubSystem(SDL_INIT_AUDIO)) {
357
+ current_audio_driver = Napi::String::New(env, SDL_GetCurrentAudioDriver());
357
358
  initialized.Set("audio", true);
358
359
  }
359
360
  else {
@@ -369,24 +370,29 @@ global::initialize(const Napi::CallbackInfo &info)
369
370
  drivers.Set("video", video_drivers);
370
371
  drivers.Set("audio", audio_drivers);
371
372
 
372
- initialized.Set("joystick", SDL_InitSubSystem(SDL_INIT_JOYSTICK) == 0);
373
- initialized.Set("controller", SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == 0);
374
- initialized.Set("haptic", SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0);
375
- initialized.Set("sensor", SDL_InitSubSystem(SDL_INIT_SENSOR) == 0);
373
+ initialized.Set("joystick", SDL_InitSubSystem(SDL_INIT_JOYSTICK));
374
+ initialized.Set("gamepad", SDL_InitSubSystem(SDL_INIT_GAMEPAD));
375
+ initialized.Set("haptic", SDL_InitSubSystem(SDL_INIT_HAPTIC));
376
+ initialized.Set("sensor", SDL_InitSubSystem(SDL_INIT_SENSOR));
376
377
 
378
+ // Drop errors from optional subsystems that failed to initialize
377
379
  SDL_ClearError();
378
- global::no_error = SDL_GetError();
379
380
 
380
- mainThreadId = SDL_ThreadID();
381
- SDL_SetEventFilter(filterEvents, nullptr);
381
+ mainThreadId = SDL_GetCurrentThreadID();
382
+ if (!SDL_AddEventWatch(watchEvents, nullptr)) {
383
+ std::ostringstream message;
384
+ message << "SDL_AddEventWatch() error: " << SDL_GetError();
385
+ SDL_ClearError();
386
+ throw Napi::Error::New(env, message.str());
387
+ }
382
388
 
383
389
  keyboard::keys = SDL_GetKeyboardState(&keyboard::num_keys);
384
- SDL_StartTextInput(); // TODO
385
390
 
386
- #if defined(__MACOSX__)
391
+ #if defined(SDL_PLATFORM_MACOS)
387
392
  reenableInertialScrolling();
388
393
  #endif
389
394
 
395
+
390
396
  SDL_memset(&joystick::zero_guid, 0, sizeof(joystick::zero_guid));
391
397
 
392
398
  Napi::Object result = Napi::Object::New(env);
@@ -5,8 +5,6 @@
5
5
 
6
6
  namespace global {
7
7
 
8
- extern const char *no_error;
9
-
10
8
  Napi::Value initialize(const Napi::CallbackInfo &info);
11
9
  Napi::Value cleanup(const Napi::CallbackInfo &info);
12
10