Skip to content

Remove references to mozRequestPointerLock and friends. NFC #24603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove references to mozRequestPointerLock and friends. NFC #24603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/lib/libbrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,32 +146,14 @@ var LibraryBrowser = {

function pointerLockChange() {
var canvas = Browser.getCanvas();
Browser.pointerLock = document['pointerLockElement'] === canvas ||
document['mozPointerLockElement'] === canvas ||
document['webkitPointerLockElement'] === canvas ||
document['msPointerLockElement'] === canvas;
Browser.pointerLock = document.pointerLockElement === canvas;
}
var canvas = Browser.getCanvas();
if (canvas) {
// forced aspect ratio can be enabled by defining 'forcedAspectRatio' on Module
// Module['forcedAspectRatio'] = 4 / 3;

canvas.requestPointerLock = canvas['requestPointerLock'] ||
canvas['mozRequestPointerLock'] ||
canvas['webkitRequestPointerLock'] ||
canvas['msRequestPointerLock'] ||
(() => {});
canvas.exitPointerLock = document['exitPointerLock'] ||
document['mozExitPointerLock'] ||
document['webkitExitPointerLock'] ||
document['msExitPointerLock'] ||
(() => {}); // no-op if function does not exist
canvas.exitPointerLock = canvas.exitPointerLock.bind(document);

document.addEventListener('pointerlockchange', pointerLockChange, false);
document.addEventListener('mozpointerlockchange', pointerLockChange, false);
document.addEventListener('webkitpointerlockchange', pointerLockChange, false);
document.addEventListener('mspointerlockchange', pointerLockChange, false);

if (Module['elementPointerLock']) {
canvas.addEventListener("click", (ev) => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libglfw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ var LibraryGLFW = {
case 0x00034001: { // GLFW_CURSOR_NORMAL
win.inputModes[mode] = value;
canvas.removeEventListener('click', GLFW.onClickRequestPointerLock, true);
canvas.exitPointerLock();
document.exitPointerLock();
break;
}
case 0x00034002: { // GLFW_CURSOR_HIDDEN
Expand Down
19 changes: 4 additions & 15 deletions src/lib/libhtml5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,7 +1543,7 @@ var LibraryHTML5 = {

$fillPointerlockChangeEventData__deps: ['$JSEvents', '$stringToUTF8'],
$fillPointerlockChangeEventData: (eventStruct) => {
var pointerLockElement = document.pointerLockElement || document.mozPointerLockElement || document.webkitPointerLockElement || document.msPointerLockElement;
var pointerLockElement = document.pointerLockElement;
var isPointerlocked = !!pointerLockElement;
#if !SAFE_HEAP
// Assigning a boolean to HEAP32 with expected type coercion.
Expand Down Expand Up @@ -1595,10 +1595,8 @@ var LibraryHTML5 = {
'$specialHTMLTargets'
#endif
],
emscripten_set_pointerlockchange_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
emscripten_set_pointerlockchange_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
if (!document || !document.body || (!document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock)) {
if (!document.body?.requestPointerLock) {
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
}

Expand All @@ -1608,9 +1606,6 @@ var LibraryHTML5 = {
target = target ? findEventTarget(target) : specialHTMLTargets[{{{ cDefs.EMSCRIPTEN_EVENT_TARGET_DOCUMENT }}}]; // Pointer lock change events need to be captured from 'document' by default instead of 'window'
#endif
if (!target) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
registerPointerlockChangeEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKCHANGE }}}, "mozpointerlockchange", targetThread);
registerPointerlockChangeEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKCHANGE }}}, "webkitpointerlockchange", targetThread);
registerPointerlockChangeEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKCHANGE }}}, "mspointerlockchange", targetThread);
return registerPointerlockChangeEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKCHANGE }}}, "pointerlockchange", targetThread);
},

Expand Down Expand Up @@ -1644,10 +1639,8 @@ var LibraryHTML5 = {
'$specialHTMLTargets'
#endif
],
emscripten_set_pointerlockerror_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
emscripten_set_pointerlockerror_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
if (!document || !document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock) {
if (!document.body?.requestPointerLock) {
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
}

Expand All @@ -1658,18 +1651,14 @@ var LibraryHTML5 = {
#endif

if (!target) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
registerPointerlockErrorEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKERROR }}}, "mozpointerlockerror", targetThread);
registerPointerlockErrorEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKERROR }}}, "webkitpointerlockerror", targetThread);
registerPointerlockErrorEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKERROR }}}, "mspointerlockerror", targetThread);
return registerPointerlockErrorEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_POINTERLOCKERROR }}}, "pointerlockerror", targetThread);
},

emscripten_get_pointerlock_status__proxy: 'sync',
emscripten_get_pointerlock_status__deps: ['$fillPointerlockChangeEventData'],
emscripten_get_pointerlock_status__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
emscripten_get_pointerlock_status: (pointerlockStatus) => {
if (pointerlockStatus) fillPointerlockChangeEventData(pointerlockStatus);
if (!document.body || (!document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock)) {
if (!document.body?.requestPointerLock) {
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
}
return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libsdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ var LibrarySDL = {
// else return SDL_ENABLE to indicate the failure
return 1;
case 1: // SDL_ENABLE
Browser.getCanvas().exitPointerLock();
document.exitPointerLock();
return 1;
case -1: // SDL_QUERY
return !Browser.pointerLock;
Expand Down
3 changes: 2 additions & 1 deletion src/proxyWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ document.createElement = (what) => {
right: canvas.boundingClientRect.right
});
canvas.style = new PropertyBag();
canvas.exitPointerLock = () => {};

canvas.width_ ||= 0;
canvas.height_ ||= 0;
Expand Down Expand Up @@ -284,6 +283,8 @@ document.styleSheets = [{

document.URL = 'http://worker.not.yet.ready.wait.for.window.onload?fake';

document.exitPointerLock = () => {};

function Audio() {
warnOnce('faking Audio elements, no actual sound will play');
}
Expand Down