@kmamal/sdl 0.11.13 → 1.0.0-2
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/CHANGELOG.md +249 -0
- package/README.md +26 -2685
- package/binding.gyp +82 -65
- package/package.json +17 -11
- package/scripts/build-sdl.mjs +15 -7
- package/scripts/build.mjs +30 -15
- package/scripts/download-release.mjs +9 -6
- package/scripts/download-sdl.mjs +9 -6
- package/scripts/install.mjs +13 -5
- package/scripts/util/common.js +9 -1
- package/src/javascript/audio/audio-playback-stream.js +50 -0
- package/src/javascript/audio/audio-recording-stream.js +32 -0
- package/src/javascript/audio/{audio-instance.js → audio-stream.js} +35 -32
- package/src/javascript/audio/device.js +34 -6
- package/src/javascript/audio/format-helpers.js +26 -35
- package/src/javascript/audio/index.js +37 -26
- package/src/javascript/audio/prevent-exit.js +19 -9
- package/src/javascript/cleanup.js +19 -10
- package/src/javascript/enums.js +5 -0
- package/src/javascript/events/events-via-poll.js +25 -7
- package/src/javascript/events/index.js +274 -175
- package/src/javascript/gamepad/device.js +23 -0
- package/src/javascript/gamepad/gamepad-instance.js +209 -0
- package/src/javascript/gamepad/index.js +51 -0
- package/src/javascript/globals.js +8 -5
- package/src/javascript/helpers.js +34 -7
- package/src/javascript/index.js +5 -3
- package/src/javascript/joystick/device.js +5 -10
- package/src/javascript/joystick/index.js +7 -7
- package/src/javascript/joystick/joystick-instance.js +79 -42
- package/src/javascript/joystick/shared.js +88 -0
- package/src/javascript/keyboard/index.js +6 -4
- package/src/javascript/keyboard/key-mapping.js +70 -28
- package/src/javascript/mouse/index.js +21 -10
- package/src/javascript/sensor/devices.js +17 -0
- package/src/javascript/sensor/index.js +2 -16
- package/src/javascript/sensor/sensor-instance.js +20 -6
- package/src/javascript/touch/devices.js +17 -0
- package/src/javascript/touch/index.js +3 -7
- package/src/javascript/video/format-helpers.js +99 -0
- package/src/javascript/video/index.js +37 -5
- package/src/javascript/video/window.js +280 -134
- package/src/native/audio.cpp +182 -58
- package/src/native/audio.h +10 -5
- package/src/native/clipboard.cpp +22 -5
- package/src/native/cocoa-window.h +1 -0
- package/src/native/cocoa-window.mm +1 -1
- package/src/native/enums.cpp +91 -58
- package/src/native/events.cpp +437 -284
- package/src/native/events.h +18 -12
- package/src/native/gamepad.cpp +185 -0
- package/src/native/gamepad.h +27 -0
- package/src/native/global.cpp +173 -167
- package/src/native/global.h +0 -2
- package/src/native/joystick.cpp +287 -225
- package/src/native/joystick.h +7 -6
- package/src/native/keyboard.cpp +28 -8
- package/src/native/keyboard.h +4 -2
- package/src/native/module.cpp +14 -8
- package/src/native/mouse.cpp +54 -34
- package/src/native/mouse.h +0 -1
- package/src/native/power.cpp +10 -4
- package/src/native/power.h +1 -1
- package/src/native/sensor.cpp +52 -52
- package/src/native/sensor.h +1 -1
- package/src/native/touch.cpp +45 -24
- package/src/native/touch.h +1 -1
- package/src/native/video.cpp +115 -75
- package/src/native/video.h +5 -2
- package/src/native/window.cpp +406 -318
- package/src/native/window.h +3 -1
- package/src/types/helpers.d.ts +44 -19
- package/src/types/index.d.ts +343 -255
- package/scripts/util/fetch.js +0 -85
- package/src/javascript/audio/audio-playback-instance.js +0 -23
- package/src/javascript/audio/audio-recording-instance.js +0 -17
- package/src/javascript/controller/controller-instance.js +0 -160
- package/src/javascript/controller/device.js +0 -26
- package/src/javascript/controller/index.js +0 -33
- package/src/javascript/events/reconcile-audio-devices.js +0 -16
- package/src/javascript/events/reconcile-displays.js +0 -17
- package/src/javascript/events/reconcile-joystick-and-controller-devices.js +0 -40
- package/src/javascript/events/reconcile.js +0 -61
- package/src/javascript/video/display.js +0 -4
- package/src/native/controller.cpp +0 -192
- package/src/native/controller.h +0 -26
|
@@ -1,74 +1,123 @@
|
|
|
1
1
|
const Globals = require('../globals')
|
|
2
2
|
const Bindings = require('../bindings')
|
|
3
3
|
const { video: videoModule } = require('../video')
|
|
4
|
-
const { reconcileDisplays } = require('./reconcile-displays')
|
|
5
4
|
const { keyboard: keyboardModule } = require('../keyboard')
|
|
6
|
-
const { mapping } = require('../keyboard/key-mapping')
|
|
7
|
-
const {
|
|
8
|
-
const {
|
|
5
|
+
const { mapping, isCharacter } = require('../keyboard/key-mapping')
|
|
6
|
+
const { joystick: joystickModule } = require('../joystick')
|
|
7
|
+
const { make: makeJoystickDevice } = require('../joystick/device')
|
|
8
|
+
const { gamepad: gamepadModule } = require('../gamepad')
|
|
9
|
+
const { make: makeGamepadDevice, filter: filterGamepadDevice } = require('../gamepad/device')
|
|
10
|
+
const { audio: audioModule } = require('../audio')
|
|
11
|
+
const { make: makeAudioDevice, update: updateAudioDevice } = require('../audio/device')
|
|
9
12
|
const { clipboard: clipboardModule } = require('../clipboard')
|
|
13
|
+
const { refreshDevices: refreshTouchDevices } = require('../touch/devices')
|
|
10
14
|
|
|
11
15
|
|
|
16
|
+
const tryEmit = (emitter, type, event) => {
|
|
17
|
+
try {
|
|
18
|
+
try { emitter.emit(type, event) }
|
|
19
|
+
catch (error) { emitter.emit('error', error) }
|
|
20
|
+
}
|
|
21
|
+
catch (error) { process.nextTick(() => { throw error }) }
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const tryCall = (fn) => {
|
|
25
|
+
try { fn() }
|
|
26
|
+
catch (error) { process.nextTick(() => { throw error }) }
|
|
27
|
+
}
|
|
28
|
+
|
|
12
29
|
const handleEvent = (event) => {
|
|
13
|
-
const {
|
|
14
|
-
|
|
15
|
-
delete event.
|
|
30
|
+
const { target, targetId, type } = event
|
|
31
|
+
delete event.target
|
|
32
|
+
delete event.targetId
|
|
16
33
|
|
|
17
|
-
switch (
|
|
34
|
+
switch (target) {
|
|
18
35
|
case 'app': {
|
|
19
36
|
if (type !== 'quit') { return }
|
|
20
37
|
|
|
21
38
|
for (const window of Globals.windows.all.values()) {
|
|
22
|
-
window.destroyGently()
|
|
39
|
+
tryCall(() => { window.destroyGently() })
|
|
23
40
|
}
|
|
24
41
|
} break
|
|
25
42
|
|
|
26
|
-
|
|
27
|
-
case 'display': {
|
|
28
|
-
const { displayIndex } = event
|
|
29
|
-
delete event.displayIndex
|
|
30
|
-
|
|
43
|
+
case 'video': {
|
|
31
44
|
switch (type) {
|
|
32
|
-
case 'displayAdd':
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
const { displays } = event
|
|
36
|
-
delete event.displays
|
|
45
|
+
case 'displayAdd': {
|
|
46
|
+
const { display } = event
|
|
47
|
+
delete event.display
|
|
37
48
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
49
|
+
if (Globals.displays.some((a) => a.id === display.id)) { return }
|
|
50
|
+
Globals.displays.push(display)
|
|
51
|
+
event.device = display
|
|
52
|
+
} break
|
|
53
|
+
|
|
54
|
+
case 'displayRemove': {
|
|
55
|
+
const { displayId } = event
|
|
56
|
+
delete event.displayId
|
|
57
|
+
|
|
58
|
+
const index = Globals.displays.findIndex((a) => a.id === displayId)
|
|
59
|
+
if (index === -1) { return }
|
|
60
|
+
event.device = Globals.displays[index]
|
|
61
|
+
Globals.displays.splice(index, 1)
|
|
62
|
+
} break
|
|
41
63
|
|
|
42
64
|
case 'displayOrient': {
|
|
43
|
-
const
|
|
65
|
+
const { displayId } = event
|
|
66
|
+
delete event.displayId
|
|
67
|
+
|
|
68
|
+
const display = Globals.displays.find((a) => a.id === displayId)
|
|
69
|
+
if (!display) { return }
|
|
70
|
+
|
|
44
71
|
display.orientation = event.orientation
|
|
72
|
+
event.device = display
|
|
45
73
|
} break
|
|
46
74
|
|
|
47
75
|
case 'displayMove': {
|
|
48
|
-
const { geometryX, geometryY, usableX, usableY } = event
|
|
76
|
+
const { displayId, geometryX, geometryY, usableX, usableY } = event
|
|
77
|
+
delete event.displayId
|
|
49
78
|
delete event.geometryX
|
|
50
79
|
delete event.geometryY
|
|
51
80
|
delete event.usableX
|
|
52
81
|
delete event.usableY
|
|
53
82
|
|
|
54
|
-
const display = Globals.displays
|
|
83
|
+
const display = Globals.displays.find((a) => a.id === displayId)
|
|
84
|
+
if (!display) { return }
|
|
85
|
+
|
|
55
86
|
display.geometry.x = geometryX
|
|
56
87
|
display.geometry.y = geometryY
|
|
57
88
|
display.usable.x = usableX
|
|
58
89
|
display.usable.y = usableY
|
|
90
|
+
event.device = display
|
|
91
|
+
} break
|
|
92
|
+
|
|
93
|
+
case 'displayScaleChange':
|
|
94
|
+
case 'displayModeChange':
|
|
95
|
+
case 'displayUsableChange': {
|
|
96
|
+
const { displayId, display: fresh } = event
|
|
97
|
+
delete event.displayId
|
|
98
|
+
delete event.display
|
|
99
|
+
|
|
100
|
+
const display = Globals.displays.find((a) => a.id === displayId)
|
|
101
|
+
if (!display) { return }
|
|
102
|
+
|
|
103
|
+
Object.assign(display, fresh)
|
|
104
|
+
event.device = display
|
|
105
|
+
if (type === 'displayScaleChange') { event.scale = display.scale }
|
|
106
|
+
if (type === 'displayModeChange') {
|
|
107
|
+
event.format = display.format
|
|
108
|
+
event.frequency = display.frequency
|
|
109
|
+
event.geometry = display.geometry
|
|
110
|
+
}
|
|
59
111
|
} break
|
|
60
112
|
|
|
61
113
|
// No default
|
|
62
114
|
}
|
|
63
115
|
|
|
64
|
-
videoModule
|
|
116
|
+
tryEmit(videoModule, type, event)
|
|
65
117
|
} break
|
|
66
118
|
|
|
67
119
|
case 'window': {
|
|
68
|
-
const
|
|
69
|
-
delete event.windowId
|
|
70
|
-
|
|
71
|
-
const window = Globals.windows.all.get(windowId)
|
|
120
|
+
const window = Globals.windows.all.get(targetId)
|
|
72
121
|
if (!window) { return }
|
|
73
122
|
|
|
74
123
|
switch (type) {
|
|
@@ -77,14 +126,20 @@ const handleEvent = (event) => {
|
|
|
77
126
|
window._y = event.y
|
|
78
127
|
} break
|
|
79
128
|
case 'resize': {
|
|
129
|
+
if (
|
|
130
|
+
window._width === event.width
|
|
131
|
+
&& window._height === event.height
|
|
132
|
+
&& window._pixelWidth === event.pixelWidth
|
|
133
|
+
&& window._pixelHeight === event.pixelHeight
|
|
134
|
+
) { return }
|
|
80
135
|
window._width = event.width
|
|
81
136
|
window._height = event.height
|
|
82
137
|
window._pixelWidth = event.pixelWidth
|
|
83
138
|
window._pixelHeight = event.pixelHeight
|
|
84
139
|
} break
|
|
85
140
|
case 'displayChange': {
|
|
86
|
-
window.
|
|
87
|
-
delete event.
|
|
141
|
+
window._displayId = event.displayId
|
|
142
|
+
delete event.displayId
|
|
88
143
|
event.display = window.display
|
|
89
144
|
} break
|
|
90
145
|
|
|
@@ -99,234 +154,250 @@ const handleEvent = (event) => {
|
|
|
99
154
|
} break
|
|
100
155
|
|
|
101
156
|
case 'minimize': {
|
|
102
|
-
window._visible = false
|
|
103
157
|
window._minimized = true
|
|
104
158
|
window._maximized = false
|
|
105
|
-
window._fullscreen = false
|
|
106
159
|
} break
|
|
107
160
|
case 'maximize': {
|
|
108
|
-
window._visible = true
|
|
109
161
|
window._minimized = false
|
|
110
162
|
window._maximized = true
|
|
111
|
-
window._fullscreen = false
|
|
112
163
|
} break
|
|
113
164
|
case 'restore': {
|
|
114
|
-
window._visible = true
|
|
115
165
|
window._minimized = false
|
|
116
166
|
window._maximized = false
|
|
117
|
-
window._fullscreen = false
|
|
118
167
|
} break
|
|
119
168
|
|
|
169
|
+
case 'enterFullscreen': {
|
|
170
|
+
window._fullscreen = true
|
|
171
|
+
return
|
|
172
|
+
}
|
|
173
|
+
case 'leaveFullscreen': {
|
|
174
|
+
window._fullscreen = false
|
|
175
|
+
return
|
|
176
|
+
}
|
|
177
|
+
|
|
120
178
|
case 'focus': {
|
|
121
179
|
Globals.windows.focused = window
|
|
122
180
|
} break
|
|
123
181
|
case 'blur': {
|
|
124
|
-
Globals.windows.focused = null
|
|
182
|
+
if (Globals.windows.focused === window) { Globals.windows.focused = null }
|
|
125
183
|
} break
|
|
126
184
|
|
|
127
185
|
case 'hover': {
|
|
128
186
|
Globals.windows.hovered = window
|
|
129
187
|
} break
|
|
130
188
|
case 'leave': {
|
|
131
|
-
Globals.windows.hovered = null
|
|
189
|
+
if (Globals.windows.hovered === window) { Globals.windows.hovered = null }
|
|
132
190
|
} break
|
|
133
191
|
|
|
134
192
|
case 'close': {
|
|
135
|
-
window.destroyGently()
|
|
193
|
+
tryCall(() => { window.destroyGently() })
|
|
136
194
|
return
|
|
137
195
|
}
|
|
138
196
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
} break
|
|
148
|
-
|
|
149
|
-
case 'keyboard': {
|
|
150
|
-
const { windowId } = event
|
|
151
|
-
delete event.windowId
|
|
152
|
-
|
|
153
|
-
const window = Globals.windows.all.get(windowId)
|
|
154
|
-
if (!window) { return }
|
|
155
|
-
|
|
156
|
-
const { key } = event
|
|
157
|
-
event.key = mapping[key] ?? (key?.length === 1 ? key : null)
|
|
158
|
-
|
|
159
|
-
window.emit(type, event)
|
|
160
|
-
} break
|
|
161
|
-
|
|
162
|
-
case 'mouse':
|
|
163
|
-
case 'text':
|
|
164
|
-
case 'drop': {
|
|
165
|
-
const { windowId } = event
|
|
166
|
-
delete event.windowId
|
|
197
|
+
case 'renderDeviceLost': {
|
|
198
|
+
tryCall(() => {
|
|
199
|
+
const result = Bindings.window_setAcceleratedAndVsync(window._id, window._accelerated, window._vsync)
|
|
200
|
+
window._accelerated = result.accelerated
|
|
201
|
+
window._vsync = result.vsync
|
|
202
|
+
})
|
|
203
|
+
return
|
|
204
|
+
}
|
|
167
205
|
|
|
168
|
-
|
|
169
|
-
|
|
206
|
+
case 'keyDown':
|
|
207
|
+
case 'keyUp': {
|
|
208
|
+
const { key } = event
|
|
209
|
+
event.key = mapping[key] ?? (isCharacter(key) ? key : null)
|
|
210
|
+
} break
|
|
170
211
|
|
|
171
|
-
|
|
172
|
-
|
|
212
|
+
case 'fingerDown':
|
|
213
|
+
case 'fingerUp':
|
|
214
|
+
case 'fingerMove':
|
|
215
|
+
case 'fingerCancel': {
|
|
216
|
+
const { touchId } = event
|
|
217
|
+
delete event.touchId
|
|
218
|
+
|
|
219
|
+
// Events synthesized from the mouse or pen have null touch device
|
|
220
|
+
let device = null
|
|
221
|
+
if (!event.mouse && !event.pen) {
|
|
222
|
+
device = Globals.touchDevices.find(({ id }) => id === touchId)
|
|
223
|
+
if (!device) {
|
|
224
|
+
try { refreshTouchDevices() }
|
|
225
|
+
catch (_) { return }
|
|
226
|
+
device = Globals.touchDevices.find(({ id }) => id === touchId)
|
|
227
|
+
if (!device) { return }
|
|
228
|
+
}
|
|
229
|
+
}
|
|
173
230
|
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
delete event.touchId
|
|
231
|
+
event.device = device
|
|
232
|
+
} break
|
|
177
233
|
|
|
178
|
-
|
|
179
|
-
if (device === undefined) {
|
|
180
|
-
Globals.touchDevices = Bindings.touch_getDevices()
|
|
181
|
-
device = Globals.touchState.devices.find(({ id }) => id === touchId)
|
|
234
|
+
// No default
|
|
182
235
|
}
|
|
183
236
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
const window = Globals.windows.all.get(windowId)
|
|
188
|
-
if (!window) { return }
|
|
237
|
+
tryEmit(window, type, event)
|
|
238
|
+
} break
|
|
189
239
|
|
|
190
|
-
|
|
191
|
-
|
|
240
|
+
case 'keyboard': {
|
|
241
|
+
tryEmit(keyboardModule, type, event)
|
|
192
242
|
} break
|
|
193
243
|
|
|
194
|
-
case '
|
|
195
|
-
|
|
196
|
-
const { joystickId } = event
|
|
197
|
-
delete event.joystickId
|
|
244
|
+
case 'joystick': {
|
|
245
|
+
const collection = Globals.joystickInstances.byId.get(targetId)
|
|
198
246
|
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
for (const joystickInstance of collection
|
|
203
|
-
joystickInstance.
|
|
247
|
+
// Battery updates arrive as joystick events but also concern gamepads
|
|
248
|
+
if (type === 'powerUpdate') {
|
|
249
|
+
if (collection) {
|
|
250
|
+
for (const joystickInstance of collection) {
|
|
251
|
+
joystickInstance._power = event.power
|
|
252
|
+
tryEmit(joystickInstance, type, event)
|
|
204
253
|
}
|
|
205
254
|
}
|
|
206
255
|
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
256
|
+
const otherCollection = Globals.gamepadInstances.byId.get(targetId)
|
|
257
|
+
if (!otherCollection) { return }
|
|
258
|
+
|
|
259
|
+
for (const gamepadInstance of otherCollection) {
|
|
260
|
+
gamepadInstance._power = event.power
|
|
261
|
+
tryEmit(gamepadInstance, type, event)
|
|
213
262
|
}
|
|
263
|
+
return
|
|
214
264
|
}
|
|
215
265
|
|
|
216
|
-
const { devices } = event
|
|
217
|
-
delete event.devices
|
|
218
|
-
|
|
219
|
-
reconcileJoystickAndControllerDevices(devices)
|
|
220
|
-
} break
|
|
221
|
-
|
|
222
|
-
case 'joystick': {
|
|
223
|
-
const { joystickId } = event
|
|
224
|
-
delete event.joystickId
|
|
225
|
-
|
|
226
|
-
const collection = Globals.joystickInstances.byId.get(joystickId)
|
|
227
266
|
if (!collection) { return }
|
|
228
267
|
|
|
229
268
|
switch (type) {
|
|
230
269
|
case 'axisMotion': {
|
|
231
270
|
for (const joystickInstance of collection) {
|
|
232
271
|
joystickInstance._axes[event.axis] = event.value
|
|
233
|
-
joystickInstance
|
|
272
|
+
tryEmit(joystickInstance, type, event)
|
|
234
273
|
}
|
|
235
274
|
} break
|
|
236
275
|
|
|
237
276
|
case 'ballMotion': {
|
|
238
277
|
for (const joystickInstance of collection) {
|
|
239
278
|
const ball = joystickInstance._balls[event.ball]
|
|
240
|
-
ball.x
|
|
241
|
-
ball.y
|
|
242
|
-
|
|
279
|
+
ball.x += event.dx
|
|
280
|
+
ball.y += event.dy
|
|
281
|
+
// Each instance accumulates its own x and y, so each gets its own copy of the event
|
|
282
|
+
tryEmit(joystickInstance, type, { ...event, x: ball.x, y: ball.y })
|
|
243
283
|
}
|
|
244
284
|
} break
|
|
245
285
|
|
|
246
286
|
case 'buttonDown': {
|
|
247
287
|
for (const joystickInstance of collection) {
|
|
248
288
|
joystickInstance._buttons[event.button] = true
|
|
249
|
-
joystickInstance
|
|
289
|
+
tryEmit(joystickInstance, type, event)
|
|
250
290
|
}
|
|
251
291
|
} break
|
|
252
292
|
case 'buttonUp': {
|
|
253
293
|
for (const joystickInstance of collection) {
|
|
254
294
|
joystickInstance._buttons[event.button] = false
|
|
255
|
-
joystickInstance
|
|
295
|
+
tryEmit(joystickInstance, type, event)
|
|
256
296
|
}
|
|
257
297
|
} break
|
|
258
298
|
|
|
259
299
|
case 'hatMotion': {
|
|
260
300
|
for (const joystickInstance of collection) {
|
|
261
301
|
joystickInstance._hats[event.hat] = event.value
|
|
262
|
-
joystickInstance
|
|
302
|
+
tryEmit(joystickInstance, type, event)
|
|
263
303
|
}
|
|
264
304
|
} break
|
|
265
305
|
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
306
|
+
// No default
|
|
307
|
+
}
|
|
308
|
+
} break
|
|
309
|
+
|
|
310
|
+
case 'joystickDevice':
|
|
311
|
+
case 'gamepadDevice': {
|
|
312
|
+
const isGamepad = target === 'gamepadDevice'
|
|
313
|
+
const emitter = isGamepad ? gamepadModule : joystickModule
|
|
314
|
+
const list = isGamepad ? Globals.gamepadDevices : Globals.joystickDevices
|
|
315
|
+
|
|
316
|
+
switch (type) {
|
|
317
|
+
case 'deviceAdd': {
|
|
318
|
+
const { device } = event
|
|
319
|
+
delete event.device
|
|
320
|
+
|
|
321
|
+
if (isGamepad && !filterGamepadDevice(device)) { return }
|
|
322
|
+
if (list.some((a) => a.id === device.id)) { return }
|
|
323
|
+
|
|
324
|
+
const made = isGamepad ? makeGamepadDevice(device) : makeJoystickDevice(device)
|
|
325
|
+
list.push(made)
|
|
326
|
+
event.device = made
|
|
327
|
+
} break
|
|
271
328
|
|
|
272
|
-
|
|
273
|
-
|
|
329
|
+
case 'deviceRemove': {
|
|
330
|
+
const { deviceId } = event
|
|
331
|
+
delete event.deviceId
|
|
274
332
|
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
333
|
+
const instances = isGamepad ? Globals.gamepadInstances : Globals.joystickInstances
|
|
334
|
+
const collection = instances.byId.get(deviceId)
|
|
335
|
+
if (collection) {
|
|
336
|
+
for (const instance of collection.values()) {
|
|
337
|
+
tryCall(() => { instance.close() })
|
|
338
|
+
}
|
|
278
339
|
}
|
|
340
|
+
|
|
341
|
+
const index = list.findIndex((a) => a.id === deviceId)
|
|
342
|
+
if (index === -1) { return }
|
|
343
|
+
event.device = list[index]
|
|
344
|
+
list.splice(index, 1)
|
|
279
345
|
} break
|
|
280
346
|
|
|
281
347
|
// No default
|
|
282
348
|
}
|
|
283
|
-
} break
|
|
284
349
|
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
delete event.controllerId
|
|
350
|
+
tryEmit(emitter, type, event)
|
|
351
|
+
} break
|
|
288
352
|
|
|
289
|
-
|
|
353
|
+
case 'gamepad': {
|
|
354
|
+
const collection = Globals.gamepadInstances.byId.get(targetId)
|
|
290
355
|
if (!collection) { return }
|
|
291
356
|
|
|
292
357
|
switch (type) {
|
|
293
358
|
case 'axisMotion': {
|
|
294
|
-
for (const
|
|
295
|
-
|
|
296
|
-
|
|
359
|
+
for (const gamepadInstance of collection) {
|
|
360
|
+
gamepadInstance._axes[event.axis] = event.value
|
|
361
|
+
tryEmit(gamepadInstance, type, event)
|
|
297
362
|
}
|
|
298
363
|
} break
|
|
299
364
|
|
|
300
365
|
case 'buttonDown': {
|
|
301
|
-
for (const
|
|
302
|
-
|
|
303
|
-
|
|
366
|
+
for (const gamepadInstance of collection) {
|
|
367
|
+
gamepadInstance._buttons[event.button] = true
|
|
368
|
+
tryEmit(gamepadInstance, type, event)
|
|
304
369
|
}
|
|
305
370
|
} break
|
|
306
371
|
|
|
307
372
|
case 'buttonUp': {
|
|
308
|
-
for (const
|
|
309
|
-
|
|
310
|
-
|
|
373
|
+
for (const gamepadInstance of collection) {
|
|
374
|
+
gamepadInstance._buttons[event.button] = false
|
|
375
|
+
tryEmit(gamepadInstance, type, event)
|
|
311
376
|
}
|
|
312
377
|
} break
|
|
313
378
|
|
|
314
379
|
case 'steamHandleUpdate': {
|
|
315
|
-
for (const
|
|
316
|
-
|
|
317
|
-
|
|
380
|
+
for (const gamepadInstance of collection) {
|
|
381
|
+
gamepadInstance._steamHandle = event.steamHandle
|
|
382
|
+
tryEmit(gamepadInstance, type, event)
|
|
318
383
|
}
|
|
319
384
|
} break
|
|
320
385
|
|
|
321
386
|
case 'remap': {
|
|
322
|
-
const { axes, buttons } = event
|
|
387
|
+
const { device, axes, buttons, buttonLabels } = event
|
|
388
|
+
delete event.device
|
|
323
389
|
delete event.axes
|
|
324
390
|
delete event.buttons
|
|
391
|
+
delete event.buttonLabels
|
|
392
|
+
|
|
393
|
+
const gamepadDevice = Globals.gamepadDevices.find(({ id }) => id === targetId)
|
|
394
|
+
if (gamepadDevice) { Object.assign(gamepadDevice, makeGamepadDevice(device)) }
|
|
325
395
|
|
|
326
|
-
for (const
|
|
327
|
-
Object.assign(
|
|
328
|
-
Object.assign(
|
|
329
|
-
|
|
396
|
+
for (const gamepadInstance of collection) {
|
|
397
|
+
Object.assign(gamepadInstance._axes, axes)
|
|
398
|
+
Object.assign(gamepadInstance._buttons, buttons)
|
|
399
|
+
Object.assign(gamepadInstance._buttonLabels, buttonLabels)
|
|
400
|
+
tryEmit(gamepadInstance, type, event)
|
|
330
401
|
}
|
|
331
402
|
} break
|
|
332
403
|
|
|
@@ -335,16 +406,13 @@ const handleEvent = (event) => {
|
|
|
335
406
|
} break
|
|
336
407
|
|
|
337
408
|
case 'sensor': {
|
|
338
|
-
const
|
|
339
|
-
delete event.sensorId
|
|
340
|
-
|
|
341
|
-
const collection = Globals.sensorInstances.byId.get(sensorId)
|
|
409
|
+
const collection = Globals.sensorInstances.byId.get(targetId)
|
|
342
410
|
if (!collection) { return }
|
|
343
411
|
|
|
344
412
|
switch (type) {
|
|
345
413
|
case 'update': {
|
|
346
|
-
for (const sensorInstance of collection
|
|
347
|
-
sensorInstance
|
|
414
|
+
for (const sensorInstance of collection) {
|
|
415
|
+
tryEmit(sensorInstance, type, event)
|
|
348
416
|
}
|
|
349
417
|
} break
|
|
350
418
|
|
|
@@ -356,22 +424,55 @@ const handleEvent = (event) => {
|
|
|
356
424
|
const { audioDeviceType } = event
|
|
357
425
|
delete event.audioDeviceType
|
|
358
426
|
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
delete event.audioId
|
|
427
|
+
const list = Globals.audioDevices[audioDeviceType]
|
|
428
|
+
const emitter = audioModule[audioDeviceType]
|
|
362
429
|
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
430
|
+
switch (type) {
|
|
431
|
+
case 'deviceAdd': {
|
|
432
|
+
const { device } = event
|
|
433
|
+
delete event.device
|
|
434
|
+
|
|
435
|
+
if (list.some((a) => a.id === device.id)) { return }
|
|
436
|
+
const made = makeAudioDevice(device)
|
|
437
|
+
list.push(made)
|
|
438
|
+
event.device = made
|
|
439
|
+
updateAudioDevice(list[0])
|
|
440
|
+
} break
|
|
441
|
+
|
|
442
|
+
case 'deviceRemove': {
|
|
443
|
+
const { deviceId } = event
|
|
444
|
+
delete event.deviceId
|
|
445
|
+
|
|
446
|
+
const index = list.findIndex((a) => a.id === deviceId)
|
|
447
|
+
if (index === -1) { return }
|
|
448
|
+
const device = list[index]
|
|
449
|
+
list.splice(index, 1)
|
|
366
450
|
|
|
367
|
-
|
|
368
|
-
|
|
451
|
+
for (const stream of [ ...Globals.audioStreams.values() ]) {
|
|
452
|
+
if (stream.device === device) {
|
|
453
|
+
tryCall(() => { stream.close() })
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
updateAudioDevice(list[0])
|
|
457
|
+
|
|
458
|
+
event.device = device
|
|
459
|
+
} break
|
|
369
460
|
|
|
370
|
-
|
|
461
|
+
case 'deviceFormatChange': {
|
|
462
|
+
const { deviceId } = event
|
|
463
|
+
const device = Globals.audioStreams.get(deviceId)?.device
|
|
464
|
+
?? list.find((a) => a.id === deviceId)
|
|
465
|
+
if (device) { updateAudioDevice(device) }
|
|
466
|
+
} return
|
|
467
|
+
|
|
468
|
+
// No default
|
|
469
|
+
}
|
|
470
|
+
|
|
471
|
+
tryEmit(emitter, type, event)
|
|
371
472
|
} break
|
|
372
473
|
|
|
373
474
|
case 'clipboard': {
|
|
374
|
-
clipboardModule
|
|
475
|
+
tryEmit(clipboardModule, type, event)
|
|
375
476
|
} break
|
|
376
477
|
|
|
377
478
|
// No default
|
|
@@ -384,10 +485,8 @@ let polling = false
|
|
|
384
485
|
const poll = () => {
|
|
385
486
|
if (polling) { return }
|
|
386
487
|
polling = true
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
polling = false
|
|
488
|
+
try { Bindings.events_poll(handleEvent) }
|
|
489
|
+
finally { polling = false }
|
|
391
490
|
}
|
|
392
491
|
|
|
393
492
|
let pollInterval = null
|
|
@@ -408,12 +507,12 @@ const stopPolling = () => {
|
|
|
408
507
|
pollInterval = null
|
|
409
508
|
}
|
|
410
509
|
|
|
411
|
-
switchToPollingSlow()
|
|
412
|
-
poll()
|
|
413
|
-
|
|
414
510
|
Globals.events = {
|
|
415
511
|
poll,
|
|
416
512
|
switchToPollingFast,
|
|
417
513
|
switchToPollingSlow,
|
|
418
514
|
stopPolling,
|
|
419
515
|
}
|
|
516
|
+
|
|
517
|
+
switchToPollingSlow()
|
|
518
|
+
poll()
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
|
|
2
|
+
const make = (device) => {
|
|
3
|
+
const {
|
|
4
|
+
isGamepad,
|
|
5
|
+
gamepadMapping,
|
|
6
|
+
gamepadName,
|
|
7
|
+
gamepadType,
|
|
8
|
+
...rest
|
|
9
|
+
} = device
|
|
10
|
+
return {
|
|
11
|
+
...rest,
|
|
12
|
+
mapping: gamepadMapping,
|
|
13
|
+
name: gamepadName ?? rest.name,
|
|
14
|
+
type: gamepadType,
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const filter = (device) => device.isGamepad
|
|
19
|
+
|
|
20
|
+
module.exports = {
|
|
21
|
+
make,
|
|
22
|
+
filter,
|
|
23
|
+
}
|