@kmamal/sdl 0.11.10 → 0.11.12

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.
package/binding.gyp CHANGED
@@ -10,6 +10,7 @@
10
10
  'src/native/window.cpp',
11
11
  'src/native/keyboard.cpp',
12
12
  'src/native/mouse.cpp',
13
+ 'src/native/touch.cpp',
13
14
  'src/native/joystick.cpp',
14
15
  'src/native/controller.cpp',
15
16
  'src/native/sensor.cpp',
package/package.json CHANGED
@@ -1,10 +1,11 @@
1
1
  {
2
- "version": "0.11.10",
2
+ "version": "0.11.12",
3
3
  "name": "@kmamal/sdl",
4
4
  "description": "SDL bindings for Node.js",
5
5
  "keywords": [
6
6
  "sdl",
7
7
  "sdl2",
8
+ "game",
8
9
  "gui",
9
10
  "desktop",
10
11
  "canvas",
@@ -14,9 +15,10 @@
14
15
  "window",
15
16
  "screen",
16
17
  "video",
17
- "input",
18
- "mouse",
19
18
  "keyboard",
19
+ "mouse",
20
+ "touch",
21
+ "multitouch",
20
22
  "joystick",
21
23
  "controller",
22
24
  "gamepad",
@@ -26,10 +28,12 @@
26
28
  "speaker",
27
29
  "microphone",
28
30
  "mic",
31
+ "sensor",
32
+ "accelerometer",
33
+ "gyroscope",
29
34
  "clipboard",
30
35
  "power",
31
- "battery",
32
- "game"
36
+ "battery"
33
37
  ],
34
38
  "license": "MIT",
35
39
  "repository": {
@@ -63,11 +67,11 @@
63
67
  "tar": "^7.4.3"
64
68
  },
65
69
  "devDependencies": {
66
- "@kmamal/evdev": "^0.0.2",
67
- "@kmamal/testing": "^0.0.31",
68
- "@types/node": "^22.13.5",
69
- "node-addon-api": "^8.3.1",
70
- "node-gyp": "^11.1.0"
70
+ "@kmamal/evdev": "^0.0.6",
71
+ "@kmamal/testing": "^0.0.33",
72
+ "@types/node": "^24.1.0",
73
+ "node-addon-api": "^8.5.0",
74
+ "node-gyp": "^11.2.0"
71
75
  },
72
76
  "config": {
73
77
  "sdl": {
@@ -6,6 +6,8 @@ const validEvents = [
6
6
  'axisMotion',
7
7
  'buttonDown',
8
8
  'buttonUp',
9
+ 'powerUpdate',
10
+ 'steamHandleUpdate',
9
11
  'remap',
10
12
  'close',
11
13
  ]
@@ -24,6 +26,7 @@ class ControllerInstance extends EventsViaPoll {
24
26
  this._hasRumble = result.hasRumble
25
27
  this._hasRumbleTriggers = result.hasRumbleTriggers
26
28
  this._steamHandle = result.steamHandle
29
+ this._power = result.power
27
30
  this._axes = result.axes
28
31
  this._buttons = result.buttons
29
32
 
@@ -57,7 +60,7 @@ class ControllerInstance extends EventsViaPoll {
57
60
  return this._buttons
58
61
  }
59
62
 
60
- get power () { return Bindings.joystick_getPower(this._device.id) }
63
+ get power () { return this._power }
61
64
 
62
65
  setPlayer (player) {
63
66
  if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._device.id }) }
@@ -2,6 +2,7 @@ const Globals = require('../globals')
2
2
  const Bindings = require('../bindings')
3
3
  const { video: videoModule } = require('../video')
4
4
  const { reconcileDisplays } = require('./reconcile-displays')
5
+ const { keyboard: keyboardModule } = require('../keyboard')
5
6
  const { mapping } = require('../keyboard/key-mapping')
6
7
  const { reconcileAudioDevices } = require('./reconcile-audio-devices')
7
8
  const { reconcileJoystickAndControllerDevices } = require('./reconcile-joystick-and-controller-devices')
@@ -141,6 +142,10 @@ const handleEvent = (event) => {
141
142
  window.emit(type, event)
142
143
  } break
143
144
 
145
+ case 'keymap': {
146
+ keyboardModule.emit(type, event)
147
+ } break
148
+
144
149
  case 'keyboard': {
145
150
  const { windowId } = event
146
151
  delete event.windowId
@@ -166,6 +171,26 @@ const handleEvent = (event) => {
166
171
  window.emit(type, event)
167
172
  } break
168
173
 
174
+ case 'touch': {
175
+ const { touchId } = event
176
+ delete event.touchId
177
+
178
+ let device = Globals.touchState.devices.find(({ id }) => id === touchId)
179
+ if (device === undefined) {
180
+ Globals.touchDevices = Bindings.touch_getDevices()
181
+ device = Globals.touchState.devices.find(({ id }) => id === touchId)
182
+ }
183
+
184
+ const { windowId } = event
185
+ delete event.windowId
186
+
187
+ const window = Globals.windows.all.get(windowId)
188
+ if (!window) { return }
189
+
190
+ event.device = device
191
+ window.emit(type, event)
192
+ } break
193
+
169
194
  case 'joystickDevice': {
170
195
  if (type === 'deviceRemove') {
171
196
  const { joystickId } = event
@@ -238,6 +263,21 @@ const handleEvent = (event) => {
238
263
  }
239
264
  } break
240
265
 
266
+ case 'powerUpdate': {
267
+ for (const joystickInstance of collection) {
268
+ joystickInstance._power = event.power
269
+ joystickInstance.emit(type, event)
270
+ }
271
+
272
+ const otherCollection = Globals.controllerInstances.byId.get(joystickId)
273
+ if (!otherCollection) { break }
274
+
275
+ for (const controllerInstance of otherCollection) {
276
+ controllerInstance._power = event.power
277
+ controllerInstance.emit(type, event)
278
+ }
279
+ } break
280
+
241
281
  // No default
242
282
  }
243
283
  } break
@@ -271,6 +311,13 @@ const handleEvent = (event) => {
271
311
  }
272
312
  } break
273
313
 
314
+ case 'steamHandleUpdate': {
315
+ for (const controllerInstance of collection.values()) {
316
+ controllerInstance._steamHandle = event.steamHandle
317
+ controllerInstance.emit(type, event)
318
+ }
319
+ } break
320
+
274
321
  case 'remap': {
275
322
  const { axes, buttons } = event
276
323
  delete event.axes
@@ -6,6 +6,7 @@ module.exports = {
6
6
  focused: null,
7
7
  hovered: null,
8
8
  },
9
+ touchDevices: null,
9
10
  joystickDevices: [],
10
11
  joystickInstances: {
11
12
  all: new Set(),
@@ -8,6 +8,7 @@ const info = Bindings.global_initialize()
8
8
  const { video } = require('./video')
9
9
  const { keyboard } = require('./keyboard')
10
10
  const { mouse } = require('./mouse')
11
+ const { touch } = require('./touch')
11
12
  const { joystick } = require('./joystick')
12
13
  const { controller } = require('./controller')
13
14
  const { sensor } = require('./sensor')
@@ -23,6 +24,7 @@ module.exports = {
23
24
  video,
24
25
  keyboard,
25
26
  mouse,
27
+ touch,
26
28
  joystick,
27
29
  controller,
28
30
  sensor,
@@ -8,6 +8,7 @@ const validEvents = [
8
8
  'buttonDown',
9
9
  'buttonUp',
10
10
  'hatMotion',
11
+ 'powerUpdate',
11
12
  'close',
12
13
  ]
13
14
 
@@ -28,6 +29,7 @@ class JoystickInstance extends EventsViaPoll {
28
29
  this._balls = result.balls
29
30
  this._buttons = result.buttons
30
31
  this._hats = result.hats
32
+ this._power = result.power
31
33
 
32
34
  this._device = device
33
35
 
@@ -68,7 +70,7 @@ class JoystickInstance extends EventsViaPoll {
68
70
  return this._hats
69
71
  }
70
72
 
71
- get power () { return Bindings.joystick_getPower(this._device.id) }
73
+ get power () { return this._power }
72
74
 
73
75
  setPlayer (player) {
74
76
  if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._device.id }) }
@@ -1,10 +1,15 @@
1
1
  const Globals = require('../globals')
2
2
  const Bindings = require('../bindings')
3
3
  const Enums = require('../enums')
4
+ const { EventsViaPoll } = require('../events/events-via-poll')
4
5
  const { mapping, reverseMapping } = require('./key-mapping')
5
6
 
6
- const keyboard = {
7
- get SCANCODE () { return Enums.scancodes },
7
+ const validEvents = [ 'keymapChange' ]
8
+
9
+ const keyboard = new class extends EventsViaPoll {
10
+ constructor () { super(validEvents) }
11
+
12
+ get SCANCODE () { return Enums.scancodes }
8
13
 
9
14
  getKey (scancode) {
10
15
  if (!Number.isInteger(scancode)) { throw Object.assign(new Error("scancode must be an integer"), { scancode }) }
@@ -12,7 +17,7 @@ const keyboard = {
12
17
 
13
18
  const _key = Bindings.keyboard_getKey(scancode)
14
19
  return mapping[_key] ?? (_key?.length === 1 ? _key : null)
15
- },
20
+ }
16
21
 
17
22
  getScancode (key) {
18
23
  if (typeof key !== 'string') { throw Object.assign(new Error("key must be a string"), { key }) }
@@ -21,12 +26,12 @@ const keyboard = {
21
26
  if (_key === null) { throw Object.assign(new Error("invalid key"), { key }) }
22
27
 
23
28
  return Bindings.keyboard_getScancode(_key)
24
- },
29
+ }
25
30
 
26
31
  getState () {
27
32
  Globals.events.poll()
28
33
  return Bindings.keyboard_getState()
29
- },
30
- }
34
+ }
35
+ }()
31
36
 
32
37
  module.exports = { keyboard }
@@ -0,0 +1,15 @@
1
+ const Globals = require('../globals')
2
+ const Bindings = require('../bindings')
3
+
4
+
5
+ Globals.touchDevices = Bindings.touch_getDevices()
6
+
7
+
8
+ const touch = {
9
+ get devices () {
10
+ Globals.events.poll()
11
+ return Globals.touchDevices
12
+ },
13
+ }
14
+
15
+ module.exports = { touch }
@@ -26,6 +26,9 @@ const validEvents = [
26
26
  'mouseButtonUp',
27
27
  'mouseMove',
28
28
  'mouseWheel',
29
+ 'fingerDown',
30
+ 'fingerUp',
31
+ 'fingerMove',
29
32
  'dropBegin',
30
33
  'dropText',
31
34
  'dropFile',
@@ -29,6 +29,15 @@ controller::mapAxisValue (SDL_GameController *controller, SDL_GameControllerAxis
29
29
  return value / range;
30
30
  }
31
31
 
32
+ Napi::Value
33
+ controller::getSteamHandle (Napi::Env &env, SDL_GameController *controller)
34
+ {
35
+ Uint64 _steam_handle = SDL_GameControllerGetSteamHandle(controller);
36
+ return _steam_handle != 0
37
+ ? Napi::Buffer<Uint64>::Copy(env, &_steam_handle, 1)
38
+ : env.Null();
39
+ }
40
+
32
41
  void
33
42
  controller::getState (Napi::Env &env, SDL_GameController *controller, Napi::Object dst)
34
43
  {
@@ -132,7 +141,7 @@ controller::open (const Napi::CallbackInfo &info)
132
141
  int _firmware_version = SDL_GameControllerGetFirmwareVersion(controller);
133
142
  Napi::Value firmware_version = _firmware_version != 0
134
143
  ? Napi::Number::New(env, _firmware_version)
135
- : env.Null() ;
144
+ : env.Null();
136
145
 
137
146
  const char *_serial_number = SDL_GameControllerGetSerial(controller);
138
147
  Napi::Value serial_number = _serial_number != nullptr
@@ -143,10 +152,10 @@ controller::open (const Napi::CallbackInfo &info)
143
152
  bool has_rumble = SDL_GameControllerHasRumble(controller);
144
153
  bool has_rumble_triggers = SDL_GameControllerHasRumbleTriggers(controller);
145
154
 
146
- Uint64 _steam_handle = SDL_GameControllerGetSteamHandle(controller);
147
- Napi::Value steam_handle = _steam_handle != 0
148
- ? Napi::Buffer<Uint64>::Copy(env, &_steam_handle, 1)
149
- : env.Null();
155
+ Napi::Value steam_handle = getSteamHandle(env, controller);
156
+
157
+ SDL_Joystick *joystick = SDL_GameControllerGetJoystick(controller);
158
+ Napi::Value power = joystick::getPowerLevel(env, joystick);
150
159
 
151
160
  Napi::Object result = Napi::Object::New(env);
152
161
  result.Set("firmwareVersion", firmware_version);
@@ -155,6 +164,7 @@ controller::open (const Napi::CallbackInfo &info)
155
164
  result.Set("hasRumble", has_rumble);
156
165
  result.Set("hasRumbleTriggers", has_rumble_triggers);
157
166
  result.Set("steamHandle", steam_handle);
167
+ result.Set("power", power);
158
168
 
159
169
  controller::getState(env, controller, result);
160
170
 
@@ -15,6 +15,7 @@ namespace controller {
15
15
  double mapAxis (SDL_GameController *controller, SDL_GameControllerAxis axis);
16
16
  double mapAxisValue (SDL_GameController *controller, SDL_GameControllerAxis axis, int value);
17
17
  void getState (Napi::Env &env, SDL_GameController *controller, Napi::Object dst);
18
+ Napi::Value getSteamHandle(Napi::Env &env, SDL_GameController *controller);
18
19
 
19
20
  Napi::Value addMappings(const Napi::CallbackInfo &info);
20
21
  Napi::Value open(const Napi::CallbackInfo &info);
@@ -14,9 +14,11 @@ std::string events::families::APP;
14
14
  std::string events::families::DISPLAY;
15
15
  std::string events::families::WINDOW;
16
16
  std::string events::families::DROP;
17
+ std::string events::families::KEYMAP;
17
18
  std::string events::families::KEYBOARD;
18
19
  std::string events::families::TEXT;
19
20
  std::string events::families::MOUSE;
21
+ std::string events::families::TOUCH;
20
22
  std::string events::families::JOYSTICK_DEVICE;
21
23
  std::string events::families::JOYSTICK;
22
24
  std::string events::families::CONTROLLER;
@@ -54,6 +56,10 @@ std::string events::types::DROP_COMPLETE;
54
56
  std::string events::types::DROP_FILE;
55
57
  std::string events::types::DROP_TEXT;
56
58
  std::string events::types::CLOSE;
59
+ std::string events::types::KEYMAP_CHANGE;
60
+ std::string events::types::FINGER_DOWN;
61
+ std::string events::types::FINGER_UP;
62
+ std::string events::types::FINGER_MOVE;
57
63
  std::string events::types::DEVICE_ADD;
58
64
  std::string events::types::DEVICE_REMOVE;
59
65
  std::string events::types::AXIS_MOTION;
@@ -61,6 +67,8 @@ std::string events::types::BUTTON_DOWN;
61
67
  std::string events::types::BUTTON_UP;
62
68
  std::string events::types::BALL_MOTION;
63
69
  std::string events::types::HAT_MOTION;
70
+ std::string events::types::POWER_UPDATE;
71
+ std::string events::types::STEAM_HANDLE_UPDATE;
64
72
  std::string events::types::REMAP;
65
73
  std::string events::types::UPDATE;
66
74
 
@@ -237,7 +245,13 @@ events::dispatchEvent(const SDL_Event &event)
237
245
  packed.Set("type", events::types::TEXT_INPUT);
238
246
  packed.Set("windowId", event.text.windowID);
239
247
  packed.Set("text", event.text.text);
240
- break ;
248
+ break;
249
+ }
250
+
251
+ case SDL_KEYMAPCHANGED: {
252
+ packed.Set("family", events::families::KEYMAP);
253
+ packed.Set("type", events::types::KEYMAP_CHANGE);
254
+ break;
241
255
  }
242
256
 
243
257
  case SDL_MOUSEMOTION: {
@@ -282,6 +296,36 @@ events::dispatchEvent(const SDL_Event &event)
282
296
  break;
283
297
  }
284
298
 
299
+ case SDL_FINGERUP:
300
+ case SDL_FINGERDOWN: {
301
+ packed.Set("family", events::families::TOUCH);
302
+ packed.Set("type", event.type == SDL_FINGERUP
303
+ ? events::types::FINGER_UP
304
+ : events::types::FINGER_DOWN);
305
+ packed.Set("windowId", event.tfinger.windowID);
306
+ packed.Set("mouse", event.tfinger.touchId == SDL_MOUSE_TOUCHID);
307
+ packed.Set("touchId", event.tfinger.touchId);
308
+ packed.Set("fingerId", event.tfinger.fingerId);
309
+ packed.Set("x", event.tfinger.x);
310
+ packed.Set("y", event.tfinger.y);
311
+ packed.Set("pressure", event.tfinger.pressure);
312
+ break;
313
+ }
314
+ case SDL_FINGERMOTION: {
315
+ packed.Set("family", events::families::TOUCH);
316
+ packed.Set("type", events::types::FINGER_MOVE);
317
+ packed.Set("windowId", event.tfinger.windowID);
318
+ packed.Set("mouse", event.tfinger.touchId == SDL_MOUSE_TOUCHID);
319
+ packed.Set("touchId", event.tfinger.touchId);
320
+ packed.Set("fingerId", event.tfinger.fingerId);
321
+ packed.Set("x", event.tfinger.x);
322
+ packed.Set("y", event.tfinger.y);
323
+ packed.Set("dx", event.tfinger.dx);
324
+ packed.Set("dy", event.tfinger.dy);
325
+ packed.Set("pressure", event.tfinger.pressure);
326
+ break;
327
+ }
328
+
285
329
  case SDL_JOYDEVICEADDED: {
286
330
  packed.Set("family", events::families::JOYSTICK_DEVICE);
287
331
  packed.Set("type", events::types::DEVICE_ADD);
@@ -312,7 +356,7 @@ events::dispatchEvent(const SDL_Event &event)
312
356
  packed.Set("joystickId", joystick_id);
313
357
  packed.Set("axis", event.jaxis.axis);
314
358
  packed.Set("value", joystick::mapAxisValue(joystick, event.jaxis.axis, event.jaxis.value));
315
- break ;
359
+ break;
316
360
  }
317
361
  case SDL_JOYBALLMOTION: {
318
362
  packed.Set("family", events::families::JOYSTICK);
@@ -321,7 +365,7 @@ events::dispatchEvent(const SDL_Event &event)
321
365
  packed.Set("ball", event.jball.ball);
322
366
  packed.Set("x", event.jball.xrel);
323
367
  packed.Set("y", event.jball.yrel);
324
- break ;
368
+ break;
325
369
  }
326
370
  case SDL_JOYBUTTONDOWN:
327
371
  case SDL_JOYBUTTONUP: {
@@ -334,7 +378,7 @@ events::dispatchEvent(const SDL_Event &event)
334
378
  );
335
379
  packed.Set("joystickId", event.jbutton.which);
336
380
  packed.Set("button", event.jbutton.button);
337
- break ;
381
+ break;
338
382
  }
339
383
  case SDL_JOYHATMOTION: {
340
384
  packed.Set("family", events::families::JOYSTICK);
@@ -342,7 +386,33 @@ events::dispatchEvent(const SDL_Event &event)
342
386
  packed.Set("joystickId", event.jhat.which);
343
387
  packed.Set("hat", event.jhat.hat);
344
388
  packed.Set("value", joystick::hat_positions[event.jhat.value]);
345
- break ;
389
+ break;
390
+ }
391
+
392
+ case SDL_JOYBATTERYUPDATED: {
393
+ packed.Set("family", events::families::JOYSTICK);
394
+ packed.Set("type", events::types::POWER_UPDATE);
395
+ packed.Set("joystickId", event.jbattery.which);
396
+ packed.Set("power", joystick::mapPowerLevel(env, event.jbattery.level));
397
+ break;
398
+ }
399
+
400
+ case SDL_CONTROLLERSTEAMHANDLEUPDATED: {
401
+ packed.Set("family", events::families::CONTROLLER);
402
+ packed.Set("type", events::types::REMAP);
403
+
404
+ SDL_JoystickID controller_id = event.cdevice.which;
405
+ SDL_GameController *controller = SDL_GameControllerFromInstanceID(controller_id);
406
+ if (controller == nullptr) {
407
+ std::ostringstream message;
408
+ message << "SDL_GameControllerFromInstanceID(" << controller_id << ") error: " << SDL_GetError();
409
+ SDL_ClearError();
410
+ throw Napi::Error::New(env, message.str());
411
+ }
412
+
413
+ packed.Set("controllerId", controller_id);
414
+ packed.Set("steamHandle", controller::getSteamHandle(env, controller));
415
+ break;
346
416
  }
347
417
 
348
418
  case SDL_CONTROLLERDEVICEREMAPPED: {
@@ -428,30 +498,6 @@ events::dispatchEvent(const SDL_Event &event)
428
498
  packed.Set("type", events::types::UPDATE);
429
499
  break;
430
500
  }
431
-
432
- // case SDL_FINGERUP:
433
- // case SDL_FINGERDOWN: {
434
- // SET_STRING(object, "type", event.type == SDL_FINGERUP
435
- // ? "fingerUp"
436
- // : "fingerDown");
437
- // packed.Set("touch_id", event.tfinger.touchId);
438
- // packed.Set("finger_id", event.tfinger.fingerId);
439
- // packed.Set("pressure", event.tfinger.pressure);
440
- // packed.Set("x", event.tfinger.x);
441
- // packed.Set("y", event.tfinger.y);
442
- // break;
443
- // }
444
- // case SDL_FINGERMOTION: {
445
- // SET_STRING(object, "type", "fingerMotion");
446
- // packed.Set("touch_id", event.tfinger.touchId);
447
- // packed.Set("finger_id", event.tfinger.fingerId);
448
- // packed.Set("pressure", event.tfinger.pressure);
449
- // packed.Set("x", event.tfinger.x);
450
- // packed.Set("y", event.tfinger.y);
451
- // packed.Set("dx", event.tfinger.dx);
452
- // packed.Set("dy", event.tfinger.dy);
453
- // break;
454
- // }
455
501
  }
456
502
 
457
503
  poll_callback->Call(poll_env->Global(), { packed });
@@ -12,9 +12,11 @@ namespace events {
12
12
  extern std::string DISPLAY;
13
13
  extern std::string WINDOW;
14
14
  extern std::string DROP;
15
+ extern std::string KEYMAP;
15
16
  extern std::string KEYBOARD;
16
17
  extern std::string TEXT;
17
18
  extern std::string MOUSE;
19
+ extern std::string TOUCH;
18
20
  extern std::string JOYSTICK_DEVICE;
19
21
  extern std::string JOYSTICK;
20
22
  extern std::string CONTROLLER;
@@ -54,6 +56,10 @@ namespace events {
54
56
  extern std::string DROP_FILE;
55
57
  extern std::string DROP_TEXT;
56
58
  extern std::string CLOSE;
59
+ extern std::string KEYMAP_CHANGE;
60
+ extern std::string FINGER_DOWN;
61
+ extern std::string FINGER_UP;
62
+ extern std::string FINGER_MOVE;
57
63
  extern std::string DEVICE_ADD;
58
64
  extern std::string DEVICE_REMOVE;
59
65
  extern std::string AXIS_MOTION;
@@ -61,6 +67,8 @@ namespace events {
61
67
  extern std::string BUTTON_UP;
62
68
  extern std::string BALL_MOTION;
63
69
  extern std::string HAT_MOTION;
70
+ extern std::string POWER_UPDATE;
71
+ extern std::string STEAM_HANDLE_UPDATE;
64
72
  extern std::string REMAP;
65
73
  extern std::string UPDATE;
66
74
  };
@@ -2,6 +2,7 @@
2
2
  #include "events.h"
3
3
  #include "keyboard.h"
4
4
  #include "video.h"
5
+ #include "touch.h"
5
6
  #include "joystick.h"
6
7
  #include "controller.h"
7
8
  #include "sensor.h"
@@ -45,9 +46,11 @@ global::initialize(const Napi::CallbackInfo &info)
45
46
  events::families::DISPLAY = "display";
46
47
  events::families::WINDOW = "window";
47
48
  events::families::DROP = "drop";
49
+ events::families::KEYMAP = "keymap";
48
50
  events::families::KEYBOARD = "keyboard";
49
51
  events::families::TEXT = "text";
50
52
  events::families::MOUSE = "mouse";
53
+ events::families::TOUCH = "touch";
51
54
  events::families::JOYSTICK_DEVICE = "joystickDevice";
52
55
  events::families::JOYSTICK = "joystick";
53
56
  events::families::CONTROLLER = "controller";
@@ -85,6 +88,10 @@ global::initialize(const Napi::CallbackInfo &info)
85
88
  events::types::DROP_FILE = "dropFile";
86
89
  events::types::DROP_TEXT = "dropText";
87
90
  events::types::CLOSE = "close";
91
+ events::types::KEYMAP_CHANGE = "keymapChange";
92
+ events::types::FINGER_DOWN = "fingerDown";
93
+ events::types::FINGER_UP = "fingerUp";
94
+ events::types::FINGER_MOVE = "fingerMove";
88
95
  events::types::DEVICE_ADD = "deviceAdd";
89
96
  events::types::DEVICE_REMOVE = "deviceRemove";
90
97
  events::types::AXIS_MOTION = "axisMotion";
@@ -92,6 +99,8 @@ global::initialize(const Napi::CallbackInfo &info)
92
99
  events::types::BUTTON_UP = "buttonUp";
93
100
  events::types::BALL_MOTION = "ballMotion";
94
101
  events::types::HAT_MOTION = "hatMotion";
102
+ events::types::POWER_UPDATE = "powerUpdate";
103
+ events::types::STEAM_HANDLE_UPDATE = "steamHandleUpdate";
95
104
  events::types::REMAP = "remap";
96
105
  events::types::UPDATE = "update";
97
106
 
@@ -138,6 +147,11 @@ global::initialize(const Napi::CallbackInfo &info)
138
147
  video::formats[SDL_PIXELFORMAT_NV12] = "nv12";
139
148
  video::formats[SDL_PIXELFORMAT_NV21] = "nv21";
140
149
 
150
+ // touch::device_types[SDL_TOUCH_DEVICE_INVALID] = nullptr;
151
+ touch::device_types[SDL_TOUCH_DEVICE_DIRECT] = "direct";
152
+ touch::device_types[SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE] = "indirectAbsolute";
153
+ touch::device_types[SDL_TOUCH_DEVICE_INDIRECT_RELATIVE] = "indirectRelative";
154
+
141
155
  // joystick::types[SDL_JOYSTICK_TYPE_UNKNOWN] = nullptr;
142
156
  joystick::types[SDL_JOYSTICK_TYPE_GAMECONTROLLER] = "gamecontroller";
143
157
  joystick::types[SDL_JOYSTICK_TYPE_WHEEL] = "wheel";
@@ -85,9 +85,9 @@ joystick::_getDevices (Napi::Env &env)
85
85
  ? Napi::Number::New(env, _product)
86
86
  : env.Null();
87
87
 
88
- int _Version = SDL_JoystickGetDeviceProductVersion(i);
89
- Napi::Value version = _Version != 0
90
- ? Napi::Number::New(env, _Version)
88
+ int _version = SDL_JoystickGetDeviceProductVersion(i);
89
+ Napi::Value version = _version != 0
90
+ ? Napi::Number::New(env, _version)
91
91
  : env.Null();
92
92
 
93
93
  int _player = SDL_JoystickGetDevicePlayerIndex(i);
@@ -146,6 +146,21 @@ joystick::_getDevices (Napi::Env &env)
146
146
  return devices;
147
147
  }
148
148
 
149
+ Napi::Value
150
+ joystick::getPowerLevel (Napi::Env &env, SDL_Joystick *joystick)
151
+ {
152
+ SDL_JoystickPowerLevel power = SDL_JoystickCurrentPowerLevel(joystick);
153
+ return mapPowerLevel(env, power);
154
+ }
155
+
156
+ Napi::Value
157
+ joystick::mapPowerLevel (Napi::Env &env, SDL_JoystickPowerLevel power)
158
+ {
159
+ return power != SDL_JOYSTICK_POWER_UNKNOWN
160
+ ? Napi::String::New(env, joystick::power_levels[power])
161
+ : env.Null();
162
+ }
163
+
149
164
 
150
165
  Napi::Value
151
166
  joystick::getDevices(const Napi::CallbackInfo &info)
@@ -267,6 +282,8 @@ joystick::open (const Napi::CallbackInfo &info)
267
282
  hats.Set(i, joystick::hat_positions[hat_position]);
268
283
  }
269
284
 
285
+ Napi::Value power = getPowerLevel(env, joystick);
286
+
270
287
  Napi::Object result = Napi::Object::New(env);
271
288
  result.Set("firmwareVersion", firmware_version);
272
289
  result.Set("serialNumber", serial_number);
@@ -277,31 +294,11 @@ joystick::open (const Napi::CallbackInfo &info)
277
294
  result.Set("balls", balls);
278
295
  result.Set("buttons", buttons);
279
296
  result.Set("hats", hats);
297
+ result.Set("power", power);
280
298
 
281
299
  return result;
282
300
  }
283
301
 
284
- Napi::Value
285
- joystick::getPower (const Napi::CallbackInfo &info)
286
- {
287
- Napi::Env env = info.Env();
288
-
289
- int joystick_id = info[0].As<Napi::Number>().Int32Value();
290
-
291
- SDL_Joystick *joystick = SDL_JoystickFromInstanceID(joystick_id);
292
- if (joystick == nullptr) {
293
- std::ostringstream message;
294
- message << "SDL_JoystickFromInstanceID(" << joystick_id << ") error: " << SDL_GetError();
295
- SDL_ClearError();
296
- throw Napi::Error::New(env, message.str());
297
- }
298
-
299
- SDL_JoystickPowerLevel power_level = SDL_JoystickCurrentPowerLevel(joystick);
300
- if (power_level == SDL_JOYSTICK_POWER_UNKNOWN) { return env.Null(); }
301
-
302
- return Napi::String::New(env, joystick::power_levels[power_level]);
303
- }
304
-
305
302
  Napi::Value
306
303
  joystick::rumble (const Napi::CallbackInfo &info)
307
304
  {