@kmamal/sdl 0.9.6-0 → 0.9.6-1

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.
@@ -3,7 +3,7 @@ const Enums = require('../enums')
3
3
  const { mapping, reverseMapping } = require('./key-mapping')
4
4
 
5
5
  const keyboard = {
6
- get SCANCODE () { return Enums.scancode },
6
+ get SCANCODE () { return Enums.scancodes },
7
7
 
8
8
  getKey (scancode) {
9
9
  if (!Number.isFinite(scancode)) { throw Object.assign(new Error("scancode must be a number"), { scancode }) }
@@ -19,7 +19,7 @@ const keyboard = {
19
19
  const _key = reverseMapping[key] ?? (key.length === 1 ? key : null)
20
20
  if (_key === null) { throw Object.assign(new Error("invalid key"), { key }) }
21
21
 
22
- return Bindings.keyboard_getScancode(_key) || null
22
+ return Bindings.keyboard_getScancode(_key)
23
23
  },
24
24
 
25
25
  getState () { return Bindings.keyboard_getState() },
@@ -211,10 +211,10 @@ for (const [ key, value ] of Object.entries(mapping)) {
211
211
  if (existing === undefined) { break maybeSkip }
212
212
 
213
213
  const keyScancode = Bindings.keyboard_getScancode(key)
214
- if (keyScancode === 0) { continue }
214
+ if (keyScancode === null) { continue }
215
215
 
216
216
  const existingScancode = Bindings.keyboard_getScancode(existing)
217
- if (existingScancode === 0) { break maybeSkip }
217
+ if (existingScancode === null) { break maybeSkip }
218
218
 
219
219
  if (existingScancode < keyScancode) { continue }
220
220
  }
@@ -2,7 +2,7 @@ const Bindings = require('../bindings')
2
2
  const Enums = require('../enums')
3
3
 
4
4
  const mouse = {
5
- get BUTTON () { return Enums.button },
5
+ get BUTTON () { return Enums.mouseButtons },
6
6
 
7
7
  getButton (button) {
8
8
  if (!Number.isFinite(button)) { throw Object.assign(new Error("button must be a number"), { button }) }
@@ -23,7 +23,7 @@ const mouse = {
23
23
  setCursor (cursor) {
24
24
  if (typeof cursor !== 'string') { throw Object.assign(new Error("cursor must be a string"), { cursor }) }
25
25
 
26
- const _cursor = Enums.cursor[cursor]
26
+ const _cursor = Enums.cursors[cursor]
27
27
  if (_cursor === undefined) { throw Object.assign(new Error("invalid cursor"), { cursor }) }
28
28
 
29
29
  Bindings.mouse_setCursor(_cursor)
@@ -1,12 +1,7 @@
1
1
  const Bindings = require('../bindings')
2
- const Enums = require('../enums')
3
2
 
4
3
  const power = {
5
- get info () {
6
- const info = Bindings.power_getInfo()
7
- info.state = Enums.powerStateNames[info.state]
8
- return info
9
- },
4
+ get info () { return Bindings.power_getInfo() },
10
5
  }
11
6
 
12
7
  module.exports = { power }
@@ -1,14 +1,9 @@
1
1
  const Bindings = require('../bindings')
2
2
  const Globals = require('../globals')
3
- const Enums = require('../enums')
4
3
  const { EventsViaPoll } = require('../events/events-via-poll')
5
4
  const { Window } = require('./window')
6
5
 
7
6
  Globals.displays = Bindings.video_getDisplays()
8
- for (const display of Globals.displays) {
9
- display.format = Enums.pixelFormatNames[display.format]
10
- }
11
-
12
7
 
13
8
  const validEvents = [ 'displayAdd', 'displayRemove', 'displayOrient' ]
14
9
 
@@ -2,9 +2,15 @@
2
2
  #include "joystick.h"
3
3
  #include "global.h"
4
4
  #include <SDL.h>
5
+ #include <map>
5
6
  #include <string>
6
7
  #include <sstream>
7
8
 
9
+
10
+ std::map<SDL_GameControllerAxis, std::string> controller::axes;
11
+ std::map<SDL_GameControllerButton, std::string> controller::buttons;
12
+
13
+
8
14
  void
9
15
  controller::getState (Napi::Env &env, SDL_GameController *controller, Napi::Object dst)
10
16
  {
@@ -3,9 +3,14 @@
3
3
 
4
4
  #include <napi.h>
5
5
  #include <SDL.h>
6
+ #include <map>
7
+ #include <string>
6
8
 
7
9
  namespace controller {
8
10
 
11
+ extern std::map<SDL_GameControllerAxis, std::string> axes;
12
+ extern std::map<SDL_GameControllerButton, std::string> buttons;
13
+
9
14
  void getState (Napi::Env &env, SDL_GameController *controller, Napi::Object dst);
10
15
 
11
16
  Napi::Value addMappings(const Napi::CallbackInfo &info);
@@ -6,58 +6,6 @@ enums::get(const Napi::CallbackInfo &info)
6
6
  {
7
7
  Napi::Env env = info.Env();
8
8
 
9
- Napi::Object event_families = Napi::Object::New(env);
10
- event_families.Set("display", Napi::Number::New(env, (int) EventFamily::DISPLAY));
11
- event_families.Set("window", Napi::Number::New(env, (int) EventFamily::WINDOW));
12
- event_families.Set("keyboard", Napi::Number::New(env, (int) EventFamily::KEYBOARD));
13
- event_families.Set("mouse", Napi::Number::New(env, (int) EventFamily::MOUSE));
14
- event_families.Set("text", Napi::Number::New(env, (int) EventFamily::TEXT));
15
- event_families.Set("drop", Napi::Number::New(env, (int) EventFamily::DROP));
16
- event_families.Set("joystickDevice", Napi::Number::New(env, (int) EventFamily::JOYSTICK_DEVICE));
17
- event_families.Set("joystick", Napi::Number::New(env, (int) EventFamily::JOYSTICK));
18
- event_families.Set("controller", Napi::Number::New(env, (int) EventFamily::CONTROLLER));
19
- event_families.Set("audioDevice", Napi::Number::New(env, (int) EventFamily::AUDIO_DEVICE));
20
- event_families.Set("clipboard", Napi::Number::New(env, (int) EventFamily::CLIPBOARD));
21
-
22
- Napi::Object event_types = Napi::Object::New(env);
23
- event_types.Set("quit", Napi::Number::New(env, (int) EventType::QUIT));
24
- event_types.Set("displayAdd", Napi::Number::New(env, (int) EventType::DISPLAY_ADD));
25
- event_types.Set("displayRemove", Napi::Number::New(env, (int) EventType::DISPLAY_REMOVE));
26
- event_types.Set("displayOrient", Napi::Number::New(env, (int) EventType::DISPLAY_ORIENT));
27
- event_types.Set("show", Napi::Number::New(env, (int) EventType::SHOW));
28
- event_types.Set("hide", Napi::Number::New(env, (int) EventType::HIDE));
29
- event_types.Set("expose", Napi::Number::New(env, (int) EventType::EXPOSE));
30
- event_types.Set("move", Napi::Number::New(env, (int) EventType::MOVE));
31
- event_types.Set("resize", Napi::Number::New(env, (int) EventType::RESIZE));
32
- event_types.Set("minimize", Napi::Number::New(env, (int) EventType::MINIMIZE));
33
- event_types.Set("maximize", Napi::Number::New(env, (int) EventType::MAXIMIZE));
34
- event_types.Set("restore", Napi::Number::New(env, (int) EventType::RESTORE));
35
- event_types.Set("focus", Napi::Number::New(env, (int) EventType::FOCUS));
36
- event_types.Set("blur", Napi::Number::New(env, (int) EventType::BLUR));
37
- event_types.Set("hover", Napi::Number::New(env, (int) EventType::HOVER));
38
- event_types.Set("leave", Napi::Number::New(env, (int) EventType::LEAVE));
39
- event_types.Set("close", Napi::Number::New(env, (int) EventType::CLOSE));
40
- event_types.Set("dropBegin", Napi::Number::New(env, (int) EventType::DROP_BEGIN));
41
- event_types.Set("dropComplete", Napi::Number::New(env, (int) EventType::DROP_COMPLETE));
42
- event_types.Set("dropFile", Napi::Number::New(env, (int) EventType::DROP_FILE));
43
- event_types.Set("dropText", Napi::Number::New(env, (int) EventType::DROP_TEXT));
44
- event_types.Set("keyDown", Napi::Number::New(env, (int) EventType::KEY_DOWN));
45
- event_types.Set("keyUp", Napi::Number::New(env, (int) EventType::KEY_UP));
46
- event_types.Set("textInput", Napi::Number::New(env, (int) EventType::TEXT_INPUT));
47
- event_types.Set("mouseMove", Napi::Number::New(env, (int) EventType::MOUSE_MOVE));
48
- event_types.Set("mouseButtonDown", Napi::Number::New(env, (int) EventType::MOUSE_BUTTON_DOWN));
49
- event_types.Set("mouseButtonUp", Napi::Number::New(env, (int) EventType::MOUSE_BUTTON_UP));
50
- event_types.Set("mouseWheel", Napi::Number::New(env, (int) EventType::MOUSE_WHEEL));
51
- event_types.Set("deviceAdd", Napi::Number::New(env, (int) EventType::DEVICE_ADD));
52
- event_types.Set("deviceRemove", Napi::Number::New(env, (int) EventType::DEVICE_REMOVE));
53
- event_types.Set("axisMotion", Napi::Number::New(env, (int) EventType::AXIS_MOTION));
54
- event_types.Set("ballMotion", Napi::Number::New(env, (int) EventType::BALL_MOTION));
55
- event_types.Set("buttonDown", Napi::Number::New(env, (int) EventType::BUTTON_DOWN));
56
- event_types.Set("buttonUp", Napi::Number::New(env, (int) EventType::BUTTON_UP));
57
- event_types.Set("hatMotion", Napi::Number::New(env, (int) EventType::HAT_MOTION));
58
- event_types.Set("remap", Napi::Number::New(env, (int) EventType::REMAP));
59
- event_types.Set("update", Napi::Number::New(env, (int) EventType::UPDATE));
60
-
61
9
  Napi::Object pixel_formats = Napi::Object::New(env);
62
10
  pixel_formats.Set("rgb332", Napi::Number::New(env, SDL_PIXELFORMAT_RGB332));
63
11
  pixel_formats.Set("rgb444", Napi::Number::New(env, SDL_PIXELFORMAT_RGB444));
@@ -380,98 +328,12 @@ enums::get(const Napi::CallbackInfo &info)
380
328
  cursors.Set("no", Napi::Number::New(env, SDL_SYSTEM_CURSOR_NO));
381
329
  cursors.Set("hand", Napi::Number::New(env, SDL_SYSTEM_CURSOR_HAND));
382
330
 
383
- Napi::Object hat_positions = Napi::Object::New(env);
384
- hat_positions.Set("centered", Napi::Number::New(env, SDL_HAT_CENTERED));
385
- hat_positions.Set("up", Napi::Number::New(env, SDL_HAT_UP));
386
- hat_positions.Set("right", Napi::Number::New(env, SDL_HAT_RIGHT));
387
- hat_positions.Set("down", Napi::Number::New(env, SDL_HAT_DOWN));
388
- hat_positions.Set("left", Napi::Number::New(env, SDL_HAT_LEFT));
389
- hat_positions.Set("rightup", Napi::Number::New(env, SDL_HAT_RIGHTUP));
390
- hat_positions.Set("rightdown", Napi::Number::New(env, SDL_HAT_RIGHTDOWN));
391
- hat_positions.Set("leftup", Napi::Number::New(env, SDL_HAT_LEFTUP));
392
- hat_positions.Set("leftdown", Napi::Number::New(env, SDL_HAT_LEFTDOWN));
393
-
394
- Napi::Object power_levels = Napi::Object::New(env);
395
- // power_levels.Set("unknown", Napi::Number::New(env, SDL_JOYSTICK_POWER_UNKNOWN)); // js will use null here
396
- power_levels.Set("empty", Napi::Number::New(env, SDL_JOYSTICK_POWER_EMPTY));
397
- power_levels.Set("low", Napi::Number::New(env, SDL_JOYSTICK_POWER_LOW));
398
- power_levels.Set("medium", Napi::Number::New(env, SDL_JOYSTICK_POWER_MEDIUM));
399
- power_levels.Set("full", Napi::Number::New(env, SDL_JOYSTICK_POWER_FULL));
400
- power_levels.Set("wired", Napi::Number::New(env, SDL_JOYSTICK_POWER_WIRED));
401
- power_levels.Set("max", Napi::Number::New(env, SDL_JOYSTICK_POWER_MAX));
402
-
403
- Napi::Object joystick_types = Napi::Object::New(env);
404
- // joystick_types.Set("unknown", Napi::Number::New(env, SDL_JOYSTICK_TYPE_UNKNOWN)); // This is an error case
405
- joystick_types.Set("gamecontroller", Napi::Number::New(env, SDL_JOYSTICK_TYPE_GAMECONTROLLER));
406
- joystick_types.Set("wheel", Napi::Number::New(env, SDL_JOYSTICK_TYPE_WHEEL));
407
- joystick_types.Set("arcadestick", Napi::Number::New(env, SDL_JOYSTICK_TYPE_ARCADE_STICK));
408
- joystick_types.Set("flightstick", Napi::Number::New(env, SDL_JOYSTICK_TYPE_FLIGHT_STICK));
409
- joystick_types.Set("dancepad", Napi::Number::New(env, SDL_JOYSTICK_TYPE_DANCE_PAD));
410
- joystick_types.Set("guitar", Napi::Number::New(env, SDL_JOYSTICK_TYPE_GUITAR));
411
- joystick_types.Set("drumkit", Napi::Number::New(env, SDL_JOYSTICK_TYPE_DRUM_KIT));
412
- joystick_types.Set("arcadepad", Napi::Number::New(env, SDL_JOYSTICK_TYPE_ARCADE_PAD));
413
- joystick_types.Set("throttle", Napi::Number::New(env, SDL_JOYSTICK_TYPE_THROTTLE));
414
-
415
- Napi::Object controller_axes = Napi::Object::New(env);
416
- controller_axes.Set("leftStickX", Napi::Number::New(env, SDL_CONTROLLER_AXIS_LEFTX));
417
- controller_axes.Set("leftStickY", Napi::Number::New(env, SDL_CONTROLLER_AXIS_LEFTY));
418
- controller_axes.Set("rightStickX", Napi::Number::New(env, SDL_CONTROLLER_AXIS_RIGHTX));
419
- controller_axes.Set("rightStickY", Napi::Number::New(env, SDL_CONTROLLER_AXIS_RIGHTY));
420
- controller_axes.Set("leftTrigger", Napi::Number::New(env, SDL_CONTROLLER_AXIS_TRIGGERLEFT));
421
- controller_axes.Set("rightTrigger", Napi::Number::New(env, SDL_CONTROLLER_AXIS_TRIGGERRIGHT));
422
-
423
- Napi::Object controller_buttons = Napi::Object::New(env);
424
- controller_buttons.Set("dpadLeft", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_DPAD_LEFT));
425
- controller_buttons.Set("dpadRight", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_DPAD_RIGHT));
426
- controller_buttons.Set("dpadUp", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_DPAD_UP));
427
- controller_buttons.Set("dpadDown", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_DPAD_DOWN));
428
- controller_buttons.Set("a", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_A));
429
- controller_buttons.Set("b", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_B));
430
- controller_buttons.Set("x", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_X));
431
- controller_buttons.Set("y", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_Y));
432
- controller_buttons.Set("guide", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_GUIDE));
433
- controller_buttons.Set("back", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_BACK));
434
- controller_buttons.Set("start", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_START));
435
- controller_buttons.Set("leftStick", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_LEFTSTICK));
436
- controller_buttons.Set("rightStick", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_RIGHTSTICK));
437
- controller_buttons.Set("leftShoulder", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_LEFTSHOULDER));
438
- controller_buttons.Set("rightShoulder", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER));
439
- controller_buttons.Set("paddle1", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_PADDLE1));
440
- controller_buttons.Set("paddle2", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_PADDLE2));
441
- controller_buttons.Set("paddle3", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_PADDLE3));
442
- controller_buttons.Set("paddle4", Napi::Number::New(env, SDL_CONTROLLER_BUTTON_PADDLE4));
443
-
444
- Napi::Object sensor_types = Napi::Object::New(env);
445
- sensor_types.Set("unknown", Napi::Number::New(env, SDL_SENSOR_UNKNOWN));
446
- sensor_types.Set("accelerometer", Napi::Number::New(env, SDL_SENSOR_ACCEL));
447
- sensor_types.Set("gyroscope", Napi::Number::New(env, SDL_SENSOR_GYRO));
448
- sensor_types.Set("accelerometerLeft", Napi::Number::New(env, SDL_SENSOR_ACCEL_L));
449
- sensor_types.Set("gyroscopeLeft", Napi::Number::New(env, SDL_SENSOR_GYRO_L));
450
- sensor_types.Set("accelerometerRight", Napi::Number::New(env, SDL_SENSOR_ACCEL_R));
451
- sensor_types.Set("gyroscopeRight", Napi::Number::New(env, SDL_SENSOR_GYRO_R));
452
-
453
- Napi::Object power_states = Napi::Object::New(env);
454
- power_states.Set("unknown", Napi::Number::New(env, SDL_POWERSTATE_UNKNOWN));
455
- power_states.Set("noBattery", Napi::Number::New(env, SDL_POWERSTATE_NO_BATTERY));
456
- power_states.Set("battery", Napi::Number::New(env, SDL_POWERSTATE_ON_BATTERY));
457
- power_states.Set("charging", Napi::Number::New(env, SDL_POWERSTATE_CHARGING));
458
- power_states.Set("charged", Napi::Number::New(env, SDL_POWERSTATE_CHARGED));
459
-
460
331
  Napi::Object all = Napi::Object::New(env);
461
- all.Set("eventFamily", event_families);
462
- all.Set("eventType", event_types);
463
332
  all.Set("pixelFormat", pixel_formats);
464
333
  all.Set("audioFormat", audio_formats);
465
- all.Set("scancode", scancodes);
466
- all.Set("button", mouse_buttons);
467
- all.Set("cursor", cursors);
468
- all.Set("hatPosition", hat_positions);
469
- all.Set("powerLevel", power_levels);
470
- all.Set("joystickType", joystick_types);
471
- all.Set("controllerAxis", controller_axes);
472
- all.Set("controllerButton", controller_buttons);
473
- all.Set("sensorType", sensor_types);
474
- all.Set("powerState", power_states);
334
+ all.Set("scancodes", scancodes);
335
+ all.Set("mouseButtons", mouse_buttons);
336
+ all.Set("cursors", cursors);
475
337
 
476
338
  return all;
477
339
  }
@@ -5,61 +5,6 @@
5
5
 
6
6
  namespace enums {
7
7
 
8
- enum class EventFamily {
9
- DISPLAY,
10
- WINDOW,
11
- KEYBOARD,
12
- MOUSE,
13
- TEXT,
14
- DROP,
15
- JOYSTICK_DEVICE,
16
- JOYSTICK,
17
- CONTROLLER,
18
- SENSOR,
19
- AUDIO_DEVICE,
20
- CLIPBOARD,
21
- };
22
-
23
- enum class EventType {
24
- QUIT,
25
- DISPLAY_ADD,
26
- DISPLAY_REMOVE,
27
- DISPLAY_ORIENT,
28
- SHOW,
29
- HIDE,
30
- EXPOSE,
31
- MOVE,
32
- RESIZE,
33
- MINIMIZE,
34
- MAXIMIZE,
35
- RESTORE,
36
- FOCUS,
37
- BLUR,
38
- HOVER,
39
- LEAVE,
40
- CLOSE,
41
- DROP_BEGIN,
42
- DROP_COMPLETE,
43
- DROP_FILE,
44
- DROP_TEXT,
45
- KEY_DOWN,
46
- KEY_UP,
47
- TEXT_INPUT,
48
- MOUSE_MOVE,
49
- MOUSE_BUTTON_DOWN,
50
- MOUSE_BUTTON_UP,
51
- MOUSE_WHEEL,
52
- DEVICE_ADD,
53
- DEVICE_REMOVE,
54
- AXIS_MOTION,
55
- BALL_MOTION,
56
- BUTTON_DOWN,
57
- BUTTON_UP,
58
- HAT_MOTION,
59
- REMAP,
60
- UPDATE,
61
- };
62
-
63
8
  Napi::Value get(const Napi::CallbackInfo &info);
64
9
 
65
10
  }; // namespace enums