geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emscripten: Pass canvas id to request_pointer_lock 

Fixes pointer lock with DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1
Charlie Birks 2020-04-09 15:01:47 +01:00
parent 287772f5e9
commit babf010c60
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/emscripten/SDL_emscriptenevents.c
View File

@ -363,7 +363,7 @@ Emscripten_HandleMouseButton(int eventType, const EmscriptenMouseEvent *mouseEve
if (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN) { if (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN) {
if (SDL_GetMouse()->relative_mode && !window_data->has_pointer_lock) { if (SDL_GetMouse()->relative_mode && !window_data->has_pointer_lock) {
emscripten_request_pointerlock(NULL, 0); /* try to regrab lost pointer lock. */ emscripten_request_pointerlock(window_data->canvas_id, 0); /* try to regrab lost pointer lock. */
} }
sdl_button_state = SDL_PRESSED; sdl_button_state = SDL_PRESSED;
sdl_event_type = SDL_MOUSEBUTTONDOWN; sdl_event_type = SDL_MOUSEBUTTONDOWN;

13
src/video/emscripten/SDL_emscriptenmouse.c
View File

@ -28,6 +28,7 @@
#include <emscripten/html5.h> #include <emscripten/html5.h>
#include "SDL_emscriptenmouse.h" #include "SDL_emscriptenmouse.h"
#include "SDL_emscriptenvideo.h"
#include "../../events/SDL_mouse_c.h" #include "../../events/SDL_mouse_c.h"
#include "SDL_assert.h" #include "SDL_assert.h"
@ -236,9 +237,19 @@ Emscripten_WarpMouse(SDL_Window* window, int x, int y)
static int static int
Emscripten_SetRelativeMouseMode(SDL_bool enabled) Emscripten_SetRelativeMouseMode(SDL_bool enabled)
{ {
SDL_Window *window;
SDL_WindowData *window_data;
/* TODO: pointer lock isn't actually enabled yet */ /* TODO: pointer lock isn't actually enabled yet */
if(enabled) { if(enabled) {
if(emscripten_request_pointerlock(NULL, 1) >= EMSCRIPTEN_RESULT_SUCCESS) { window = SDL_GetMouseFocus();
if (window == NULL) {
return -1;
}
window_data = (SDL_WindowData *) window->driverdata;
if(emscripten_request_pointerlock(window_data->canvas_id, 1) >= EMSCRIPTEN_RESULT_SUCCESS) {
return 0; return 0;
} }
} else { } else {