@kmamal/sdl 0.9.6-0 → 0.10.0
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/README.md +79 -90
- package/package.json +4 -3
- package/scripts/util/common.js +2 -0
- package/src/javascript/audio/audio-instance.js +1 -1
- package/src/javascript/audio/index.js +1 -0
- package/src/javascript/clipboard/index.js +6 -1
- package/src/javascript/controller/controller-instance.js +12 -9
- package/src/javascript/controller/index.js +5 -2
- package/src/javascript/enums.js +0 -8
- package/src/javascript/events/events-via-poll.js +3 -3
- package/src/javascript/events/index.js +57 -55
- package/src/javascript/globals.js +1 -1
- package/src/javascript/joystick/device.js +0 -3
- package/src/javascript/joystick/index.js +5 -2
- package/src/javascript/joystick/joystick-instance.js +23 -13
- package/src/javascript/keyboard/index.js +7 -3
- package/src/javascript/keyboard/key-mapping.js +2 -2
- package/src/javascript/mouse/index.js +2 -2
- package/src/javascript/power/index.js +1 -6
- package/src/javascript/sensor/sensor-instance.js +1 -1
- package/src/javascript/video/index.js +5 -6
- package/src/javascript/video/window.js +1 -1
- package/src/native/audio.cpp +10 -2
- package/src/native/controller.cpp +9 -1
- package/src/native/controller.h +5 -0
- package/src/native/enums.cpp +3 -141
- package/src/native/enums.h +0 -55
- package/src/native/events.cpp +115 -63
- package/src/native/events.h +55 -0
- package/src/native/global.cpp +184 -13
- package/src/native/joystick.cpp +20 -10
- package/src/native/joystick.h +7 -0
- package/src/native/keyboard.cpp +5 -3
- package/src/native/power.cpp +6 -1
- package/src/native/power.h +5 -0
- package/src/native/sensor.cpp +9 -2
- package/src/native/sensor.h +6 -0
- package/src/native/video.cpp +6 -1
- package/src/native/video.h +4 -0
- package/src/native/window.cpp +24 -97
- package/src/native/window.h +1 -0
- package/src/types/index.d.ts +84 -45
- package/scripts/install-deps-mac.sh +0 -2
- package/scripts/install-deps-raspbian.sh +0 -5
- package/scripts/install-deps-ubuntu.sh +0 -5
- package/scripts/release-rpi-qemu.sh +0 -116
- package/scripts/release.mjs +0 -13
- package/scripts/upload-release.mjs +0 -86
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
const Bindings = require('../bindings')
|
|
2
1
|
const Globals = require('../globals')
|
|
3
|
-
const
|
|
2
|
+
const Bindings = require('../bindings')
|
|
4
3
|
const { video: videoModule } = require('../video')
|
|
5
4
|
const { mapping } = require('../keyboard/key-mapping')
|
|
6
5
|
const { joystick: joystickModule } = require('../joystick')
|
|
@@ -73,29 +72,25 @@ const handleEvent = (event) => {
|
|
|
73
72
|
const { family, type } = event
|
|
74
73
|
if (family === undefined || type === undefined) { return }
|
|
75
74
|
delete event.family
|
|
76
|
-
event.type = Enums.eventTypeNames[type]
|
|
77
75
|
|
|
78
76
|
switch (family) {
|
|
79
77
|
// TODO: this also needs a reconcile function
|
|
80
|
-
case
|
|
78
|
+
case 'display': {
|
|
81
79
|
const { displayIndex } = event
|
|
82
80
|
delete event.displayIndex
|
|
83
81
|
|
|
84
82
|
const oldDisplays = Globals.displays
|
|
85
83
|
Globals.displays = Bindings.video_getDisplays()
|
|
86
|
-
for (const display of Globals.displays) {
|
|
87
|
-
display.format = Enums.pixelFormatNames[display.format]
|
|
88
|
-
}
|
|
89
84
|
const newDisplays = Globals.displays
|
|
90
85
|
|
|
91
|
-
event.display = event.type ===
|
|
86
|
+
event.display = event.type === 'displayRemove'
|
|
92
87
|
? oldDisplays[displayIndex]
|
|
93
88
|
: newDisplays[displayIndex]
|
|
94
89
|
|
|
95
90
|
videoModule.emit(event.type, event)
|
|
96
91
|
} break
|
|
97
92
|
|
|
98
|
-
case
|
|
93
|
+
case 'window': {
|
|
99
94
|
const { windowId } = event
|
|
100
95
|
delete event.windowId
|
|
101
96
|
|
|
@@ -103,61 +98,61 @@ const handleEvent = (event) => {
|
|
|
103
98
|
if (!window) { return }
|
|
104
99
|
|
|
105
100
|
switch (type) {
|
|
106
|
-
case
|
|
101
|
+
case 'move': {
|
|
107
102
|
window._x = event.x
|
|
108
103
|
window._y = event.y
|
|
109
104
|
} break
|
|
110
|
-
case
|
|
105
|
+
case 'resize': {
|
|
111
106
|
window._width = event.width
|
|
112
107
|
window._height = event.height
|
|
113
108
|
window._pixelWidth = event.pixelWidth
|
|
114
109
|
window._pixelHeight = event.pixelHeight
|
|
115
110
|
} break
|
|
116
111
|
|
|
117
|
-
case
|
|
112
|
+
case 'show': {
|
|
118
113
|
window._visible = true
|
|
119
114
|
} break
|
|
120
|
-
case
|
|
115
|
+
case 'hide': {
|
|
121
116
|
window._visible = false
|
|
122
117
|
} break
|
|
123
|
-
case
|
|
118
|
+
case 'expose': {
|
|
124
119
|
// Nothing
|
|
125
120
|
} break
|
|
126
121
|
|
|
127
|
-
case
|
|
122
|
+
case 'minimize': {
|
|
128
123
|
window._visible = false
|
|
129
124
|
window._minimized = true
|
|
130
125
|
window._maximized = false
|
|
131
126
|
window._fullscreen = false
|
|
132
127
|
} break
|
|
133
|
-
case
|
|
128
|
+
case 'maximize': {
|
|
134
129
|
window._visible = true
|
|
135
130
|
window._minimized = false
|
|
136
131
|
window._maximized = true
|
|
137
132
|
window._fullscreen = false
|
|
138
133
|
} break
|
|
139
|
-
case
|
|
134
|
+
case 'restore': {
|
|
140
135
|
window._visible = true
|
|
141
136
|
window._minimized = false
|
|
142
137
|
window._maximized = false
|
|
143
138
|
window._fullscreen = false
|
|
144
139
|
} break
|
|
145
140
|
|
|
146
|
-
case
|
|
141
|
+
case 'focus': {
|
|
147
142
|
Globals.windows.focused = window
|
|
148
143
|
} break
|
|
149
|
-
case
|
|
144
|
+
case 'blur': {
|
|
150
145
|
Globals.windows.focused = null
|
|
151
146
|
} break
|
|
152
147
|
|
|
153
|
-
case
|
|
148
|
+
case 'hover': {
|
|
154
149
|
Globals.windows.hovered = window
|
|
155
150
|
} break
|
|
156
|
-
case
|
|
151
|
+
case 'leave': {
|
|
157
152
|
Globals.windows.hovered = null
|
|
158
153
|
} break
|
|
159
154
|
|
|
160
|
-
case
|
|
155
|
+
case 'close': {
|
|
161
156
|
let shouldPrevent = false
|
|
162
157
|
const prevent = () => { shouldPrevent = true }
|
|
163
158
|
const type2 = 'beforeClose'
|
|
@@ -172,7 +167,7 @@ const handleEvent = (event) => {
|
|
|
172
167
|
window.emit(event.type, event)
|
|
173
168
|
} break
|
|
174
169
|
|
|
175
|
-
case
|
|
170
|
+
case 'keyboard': {
|
|
176
171
|
const { windowId } = event
|
|
177
172
|
delete event.windowId
|
|
178
173
|
|
|
@@ -185,9 +180,9 @@ const handleEvent = (event) => {
|
|
|
185
180
|
window.emit(event.type, event)
|
|
186
181
|
} break
|
|
187
182
|
|
|
188
|
-
case
|
|
189
|
-
case
|
|
190
|
-
case
|
|
183
|
+
case 'mouse':
|
|
184
|
+
case 'text':
|
|
185
|
+
case 'drop': {
|
|
191
186
|
const { windowId } = event
|
|
192
187
|
delete event.windowId
|
|
193
188
|
|
|
@@ -197,8 +192,8 @@ const handleEvent = (event) => {
|
|
|
197
192
|
window.emit(event.type, event)
|
|
198
193
|
} break
|
|
199
194
|
|
|
200
|
-
case
|
|
201
|
-
if (type ===
|
|
195
|
+
case 'joystickDevice': {
|
|
196
|
+
if (type === 'deviceRemove') {
|
|
202
197
|
const { joystickId } = event
|
|
203
198
|
delete event.joystickId
|
|
204
199
|
|
|
@@ -248,7 +243,7 @@ const handleEvent = (event) => {
|
|
|
248
243
|
)
|
|
249
244
|
} break
|
|
250
245
|
|
|
251
|
-
case
|
|
246
|
+
case 'joystick': {
|
|
252
247
|
const { joystickId } = event
|
|
253
248
|
delete event.joystickId
|
|
254
249
|
|
|
@@ -256,14 +251,14 @@ const handleEvent = (event) => {
|
|
|
256
251
|
if (!collection) { return }
|
|
257
252
|
|
|
258
253
|
switch (type) {
|
|
259
|
-
case
|
|
254
|
+
case 'axisMotion': {
|
|
260
255
|
for (const joystickInstance of collection) {
|
|
261
256
|
joystickInstance._axes[event.axis] = event.value
|
|
262
257
|
joystickInstance.emit(event.type, event)
|
|
263
258
|
}
|
|
264
259
|
} break
|
|
265
260
|
|
|
266
|
-
case
|
|
261
|
+
case 'ballMotion': {
|
|
267
262
|
for (const joystickInstance of collection) {
|
|
268
263
|
const ball = joystickInstance._balls[event.ball]
|
|
269
264
|
ball.x = event.x
|
|
@@ -272,21 +267,20 @@ const handleEvent = (event) => {
|
|
|
272
267
|
}
|
|
273
268
|
} break
|
|
274
269
|
|
|
275
|
-
case
|
|
270
|
+
case 'buttonDown': {
|
|
276
271
|
for (const joystickInstance of collection) {
|
|
277
272
|
joystickInstance._buttons[event.button] = true
|
|
278
273
|
joystickInstance.emit(event.type, event)
|
|
279
274
|
}
|
|
280
275
|
} break
|
|
281
|
-
case
|
|
276
|
+
case 'buttonUp': {
|
|
282
277
|
for (const joystickInstance of collection) {
|
|
283
278
|
joystickInstance._buttons[event.button] = false
|
|
284
279
|
joystickInstance.emit(event.type, event)
|
|
285
280
|
}
|
|
286
281
|
} break
|
|
287
282
|
|
|
288
|
-
case
|
|
289
|
-
event.value = Enums.hatPositionNames[event.value]
|
|
283
|
+
case 'hatMotion': {
|
|
290
284
|
for (const joystickInstance of collection) {
|
|
291
285
|
joystickInstance._hats[event.hat] = event.value
|
|
292
286
|
joystickInstance.emit(event.type, event)
|
|
@@ -297,7 +291,7 @@ const handleEvent = (event) => {
|
|
|
297
291
|
}
|
|
298
292
|
} break
|
|
299
293
|
|
|
300
|
-
case
|
|
294
|
+
case 'controller': {
|
|
301
295
|
const { controllerId } = event
|
|
302
296
|
delete event.controllerId
|
|
303
297
|
|
|
@@ -305,31 +299,28 @@ const handleEvent = (event) => {
|
|
|
305
299
|
if (!collection) { return }
|
|
306
300
|
|
|
307
301
|
switch (type) {
|
|
308
|
-
case
|
|
309
|
-
event.axis = Enums.controllerAxisNames[event.axis]
|
|
302
|
+
case 'axisMotion': {
|
|
310
303
|
for (const controllerInstance of collection.values()) {
|
|
311
304
|
controllerInstance._axes[event.axis] = event.value
|
|
312
305
|
controllerInstance.emit(event.type, event)
|
|
313
306
|
}
|
|
314
307
|
} break
|
|
315
308
|
|
|
316
|
-
case
|
|
317
|
-
event.button = Enums.controllerButtonNames[event.button]
|
|
309
|
+
case 'buttonDown': {
|
|
318
310
|
for (const controllerInstance of collection.values()) {
|
|
319
311
|
controllerInstance._axes[event.button] = true
|
|
320
312
|
controllerInstance.emit(event.type, event)
|
|
321
313
|
}
|
|
322
314
|
} break
|
|
323
315
|
|
|
324
|
-
case
|
|
325
|
-
event.button = Enums.controllerButtonNames[event.button]
|
|
316
|
+
case 'buttonUp': {
|
|
326
317
|
for (const controllerInstance of collection.values()) {
|
|
327
318
|
controllerInstance._axes[event.button] = true
|
|
328
319
|
controllerInstance.emit(event.type, event)
|
|
329
320
|
}
|
|
330
321
|
} break
|
|
331
322
|
|
|
332
|
-
case
|
|
323
|
+
case 'remap': {
|
|
333
324
|
const { axes, buttons } = event
|
|
334
325
|
delete event.axes
|
|
335
326
|
delete event.buttons
|
|
@@ -345,7 +336,7 @@ const handleEvent = (event) => {
|
|
|
345
336
|
}
|
|
346
337
|
} break
|
|
347
338
|
|
|
348
|
-
case
|
|
339
|
+
case 'sensor': {
|
|
349
340
|
const { sensorId } = event
|
|
350
341
|
delete event.sensorId
|
|
351
342
|
|
|
@@ -353,7 +344,7 @@ const handleEvent = (event) => {
|
|
|
353
344
|
if (!collection) { return }
|
|
354
345
|
|
|
355
346
|
switch (type) {
|
|
356
|
-
case
|
|
347
|
+
case 'update': {
|
|
357
348
|
for (const sensorInstance of collection.values()) {
|
|
358
349
|
sensorInstance.emit(event.type, event)
|
|
359
350
|
}
|
|
@@ -363,11 +354,11 @@ const handleEvent = (event) => {
|
|
|
363
354
|
}
|
|
364
355
|
} break
|
|
365
356
|
|
|
366
|
-
case
|
|
357
|
+
case 'audioDevice': {
|
|
367
358
|
const { isRecorder } = event
|
|
368
359
|
delete event.isRecorder
|
|
369
360
|
|
|
370
|
-
if (type ===
|
|
361
|
+
if (type === 'deviceRemove') {
|
|
371
362
|
const { audioId } = event
|
|
372
363
|
delete event.audioId
|
|
373
364
|
|
|
@@ -390,7 +381,7 @@ const handleEvent = (event) => {
|
|
|
390
381
|
)
|
|
391
382
|
} break
|
|
392
383
|
|
|
393
|
-
case
|
|
384
|
+
case 'clipboard': {
|
|
394
385
|
clipboardModule.emit(event.type, event)
|
|
395
386
|
} break
|
|
396
387
|
|
|
@@ -401,19 +392,30 @@ const handleEvent = (event) => {
|
|
|
401
392
|
|
|
402
393
|
const poll = () => { Bindings.events_poll(handleEvent) }
|
|
403
394
|
|
|
404
|
-
let
|
|
395
|
+
let pollInterval = null
|
|
396
|
+
|
|
397
|
+
const switchToPollingFast = () => {
|
|
398
|
+
clearInterval(pollInterval)
|
|
399
|
+
pollInterval = setInterval(poll, 0)
|
|
400
|
+
}
|
|
405
401
|
|
|
406
|
-
const
|
|
407
|
-
|
|
402
|
+
const switchToPollingSlow = () => {
|
|
403
|
+
clearInterval(pollInterval)
|
|
404
|
+
pollInterval = setInterval(poll, 1e3)
|
|
405
|
+
pollInterval.unref()
|
|
408
406
|
}
|
|
409
407
|
|
|
410
408
|
const stopPolling = () => {
|
|
411
|
-
clearInterval(
|
|
412
|
-
|
|
409
|
+
clearInterval(pollInterval)
|
|
410
|
+
pollInterval = null
|
|
413
411
|
}
|
|
414
412
|
|
|
413
|
+
switchToPollingSlow()
|
|
414
|
+
poll()
|
|
415
|
+
|
|
415
416
|
Globals.events = {
|
|
416
|
-
startPolling,
|
|
417
|
-
stopPolling,
|
|
418
417
|
poll,
|
|
418
|
+
switchToPollingFast,
|
|
419
|
+
switchToPollingSlow,
|
|
420
|
+
stopPolling,
|
|
419
421
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const Bindings = require('../bindings')
|
|
2
1
|
const Globals = require('../globals')
|
|
2
|
+
const Bindings = require('../bindings')
|
|
3
3
|
const { make: makeJoystickDevice } = require('./device')
|
|
4
4
|
const { EventsViaPoll } = require('../events/events-via-poll')
|
|
5
5
|
const { JoystickInstance } = require('./joystick-instance')
|
|
@@ -15,7 +15,10 @@ const validEvents = [ 'deviceAdd', 'deviceRemove' ]
|
|
|
15
15
|
const joystick = new class extends EventsViaPoll {
|
|
16
16
|
constructor () { super(validEvents) }
|
|
17
17
|
|
|
18
|
-
get devices () {
|
|
18
|
+
get devices () {
|
|
19
|
+
Globals.events.poll()
|
|
20
|
+
return Globals.joystickDevices
|
|
21
|
+
}
|
|
19
22
|
|
|
20
23
|
openDevice (device) { return new JoystickInstance(device) }
|
|
21
24
|
}()
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
const Bindings = require('../bindings')
|
|
2
|
-
const Enums = require('../enums')
|
|
3
1
|
const Globals = require('../globals')
|
|
2
|
+
const Bindings = require('../bindings')
|
|
4
3
|
const { EventsViaPoll } = require('../events/events-via-poll')
|
|
5
4
|
|
|
6
5
|
const validEvents = [
|
|
@@ -26,7 +25,7 @@ class JoystickInstance extends EventsViaPoll {
|
|
|
26
25
|
this._axes = result.axes
|
|
27
26
|
this._balls = result.balls
|
|
28
27
|
this._buttons = result.buttons
|
|
29
|
-
this._hats = result.hats
|
|
28
|
+
this._hats = result.hats
|
|
30
29
|
|
|
31
30
|
this._device = device
|
|
32
31
|
|
|
@@ -47,17 +46,28 @@ class JoystickInstance extends EventsViaPoll {
|
|
|
47
46
|
get firmwareVersion () { return this._firmwareVersion }
|
|
48
47
|
get serialNumber () { return this._serialNumber }
|
|
49
48
|
|
|
50
|
-
get axes () {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
get axes () {
|
|
50
|
+
Globals.events.poll() // TODO
|
|
51
|
+
return this._axes
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
get balls () {
|
|
55
|
+
Globals.events.poll() // TODO
|
|
56
|
+
return this._balls
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
get buttons () {
|
|
60
|
+
Globals.events.poll() // TODO
|
|
61
|
+
return this._buttons
|
|
62
|
+
}
|
|
54
63
|
|
|
55
|
-
get
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
return Enums.powerLevelNames[power]
|
|
64
|
+
get hats () {
|
|
65
|
+
Globals.events.poll() // TODO
|
|
66
|
+
return this._hats
|
|
59
67
|
}
|
|
60
68
|
|
|
69
|
+
get power () { return Bindings.joystick_getPower(this._device.id) }
|
|
70
|
+
|
|
61
71
|
setPlayer (player) {
|
|
62
72
|
if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._device.id }) }
|
|
63
73
|
|
|
@@ -97,7 +107,7 @@ class JoystickInstance extends EventsViaPoll {
|
|
|
97
107
|
if (highFreqRumble < 0 || highFreqRumble > 1) { throw Object.assign(new Error("highFreqRumble must be between 0 and 1"), { highFreqRumble }) }
|
|
98
108
|
if (!Number.isFinite(duration)) { throw Object.assign(new Error("duration must be a number"), { duration }) }
|
|
99
109
|
|
|
100
|
-
Globals.events.poll()
|
|
110
|
+
// Globals.events.poll() // Errors if it hasn't been called at least once
|
|
101
111
|
Bindings.joystick_rumble(this._device.id, lowFreqRumble, highFreqRumble, duration)
|
|
102
112
|
clearTimeout(this._rumbleTimeout)
|
|
103
113
|
this._rumbleTimeout = setTimeout(() => { this.stopRumble() }, duration)
|
|
@@ -120,7 +130,7 @@ class JoystickInstance extends EventsViaPoll {
|
|
|
120
130
|
if (rightRumble < 0 || rightRumble > 1) { throw Object.assign(new Error("rightRumble must be between 0 and 1"), { rightRumble }) }
|
|
121
131
|
if (!Number.isFinite(duration)) { throw Object.assign(new Error("duration must be a number"), { duration }) }
|
|
122
132
|
|
|
123
|
-
Globals.events.poll()
|
|
133
|
+
// Globals.events.poll() // Errors if it hasn't been called at least once
|
|
124
134
|
Bindings.joystick_rumbleTriggers(this._device.id, leftRumble, rightRumble, duration)
|
|
125
135
|
clearTimeout(this._rumbleTriggersTimeout)
|
|
126
136
|
this._rumbleTriggersTimeout = setTimeout(() => { this.stopRumble() }, duration)
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
const Globals = require('../globals')
|
|
1
2
|
const Bindings = require('../bindings')
|
|
2
3
|
const Enums = require('../enums')
|
|
3
4
|
const { mapping, reverseMapping } = require('./key-mapping')
|
|
4
5
|
|
|
5
6
|
const keyboard = {
|
|
6
|
-
get SCANCODE () { return Enums.
|
|
7
|
+
get SCANCODE () { return Enums.scancodes },
|
|
7
8
|
|
|
8
9
|
getKey (scancode) {
|
|
9
10
|
if (!Number.isFinite(scancode)) { throw Object.assign(new Error("scancode must be a number"), { scancode }) }
|
|
@@ -19,10 +20,13 @@ const keyboard = {
|
|
|
19
20
|
const _key = reverseMapping[key] ?? (key.length === 1 ? key : null)
|
|
20
21
|
if (_key === null) { throw Object.assign(new Error("invalid key"), { key }) }
|
|
21
22
|
|
|
22
|
-
return Bindings.keyboard_getScancode(_key)
|
|
23
|
+
return Bindings.keyboard_getScancode(_key)
|
|
23
24
|
},
|
|
24
25
|
|
|
25
|
-
getState () {
|
|
26
|
+
getState () {
|
|
27
|
+
Globals.events.poll()
|
|
28
|
+
return Bindings.keyboard_getState()
|
|
29
|
+
},
|
|
26
30
|
}
|
|
27
31
|
|
|
28
32
|
module.exports = { keyboard }
|
|
@@ -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 ===
|
|
214
|
+
if (keyScancode === null) { continue }
|
|
215
215
|
|
|
216
216
|
const existingScancode = Bindings.keyboard_getScancode(existing)
|
|
217
|
-
if (existingScancode ===
|
|
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.
|
|
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.
|
|
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,13 +1,9 @@
|
|
|
1
|
-
const Bindings = require('../bindings')
|
|
2
1
|
const Globals = require('../globals')
|
|
3
|
-
const
|
|
2
|
+
const Bindings = require('../bindings')
|
|
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
7
|
|
|
12
8
|
|
|
13
9
|
const validEvents = [ 'displayAdd', 'displayRemove', 'displayOrient' ]
|
|
@@ -15,7 +11,10 @@ const validEvents = [ 'displayAdd', 'displayRemove', 'displayOrient' ]
|
|
|
15
11
|
const video = new class extends EventsViaPoll {
|
|
16
12
|
constructor () { super(validEvents) }
|
|
17
13
|
|
|
18
|
-
get displays () {
|
|
14
|
+
get displays () {
|
|
15
|
+
Globals.events.poll()
|
|
16
|
+
return Globals.displays
|
|
17
|
+
}
|
|
19
18
|
|
|
20
19
|
get windows () { return [ ...Globals.windows.all.values() ] }
|
|
21
20
|
get focused () { return Globals.windows.focused }
|
package/src/native/audio.cpp
CHANGED
|
@@ -8,9 +8,13 @@
|
|
|
8
8
|
Napi::Array
|
|
9
9
|
audio::_getDevices(Napi::Env &env, bool is_capture)
|
|
10
10
|
{
|
|
11
|
+
const char *error = SDL_GetError();
|
|
12
|
+
if (error != global::no_error) { fprintf(stderr, "SDL silent error: %s\n", error); }
|
|
13
|
+
SDL_ClearError();
|
|
14
|
+
|
|
11
15
|
int num_devices = SDL_GetNumAudioDevices(is_capture ? 1 : 0);
|
|
12
16
|
if (num_devices == -1) {
|
|
13
|
-
|
|
17
|
+
error = SDL_GetError();
|
|
14
18
|
if (error != global::no_error) {
|
|
15
19
|
std::ostringstream message;
|
|
16
20
|
message << "SDL_GetNumAudioDevices(" << is_capture << ") error: " << error;
|
|
@@ -151,8 +155,12 @@ audio::dequeue (const Napi::CallbackInfo &info)
|
|
|
151
155
|
void *dst = info[1].As<Napi::Buffer<char>>().Data();
|
|
152
156
|
int size = info[2].As<Napi::Number>().Int32Value();
|
|
153
157
|
|
|
154
|
-
int num = SDL_DequeueAudio(audio_id, dst, size);
|
|
155
158
|
const char *error = SDL_GetError();
|
|
159
|
+
if (error != global::no_error) { fprintf(stderr, "SDL silent error: %s\n", error); }
|
|
160
|
+
SDL_ClearError();
|
|
161
|
+
|
|
162
|
+
int num = SDL_DequeueAudio(audio_id, dst, size);
|
|
163
|
+
error = SDL_GetError();
|
|
156
164
|
if (error != global::no_error) {
|
|
157
165
|
std::ostringstream message;
|
|
158
166
|
message << "SDL_DequeueAudio(" << audio_id << ") error: " << error;
|
|
@@ -2,13 +2,21 @@
|
|
|
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
|
{
|
|
11
|
-
const char *error;
|
|
17
|
+
const char *error = SDL_GetError();
|
|
18
|
+
if (error != global::no_error) { fprintf(stderr, "SDL silent error: %s\n", error); }
|
|
19
|
+
SDL_ClearError();
|
|
12
20
|
|
|
13
21
|
Napi::Object axes = Napi::Object::New(env);
|
|
14
22
|
axes.Set("leftStickX", Napi::Number::New(env, joystick::mapAxis(SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX))));
|
package/src/native/controller.h
CHANGED
|
@@ -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);
|