Move global event handlers to SDL_VideoInit

Temdog007 · slouken · commit d6d2c958a4d1 · 2025-04-04T10:21:12.000-07:00
Moved the event handlers from SDL_CreateWindow to SDL_VideoInit
emscripten_set_mouseup_callback
emscripten_set_focus_callback
emscripten_set_blur_callback
emscripten_set_pointerlockchange_callback
emscripten_set_fullscreenchange_callback
emscripten_set_resize_callback
diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c
@@ -260,6 +260,35 @@ static SDL_Scancode Emscripten_MapScanCode(const char *code)
     return SDL_SCANCODE_UNKNOWN;
 }
 
+static SDL_Window *Emscripten_GetFocusedWindow(SDL_VideoDevice *device)
+{
+    SDL_Window *window;
+    for (window = device->windows; window; window = window->next) {
+        SDL_WindowData *wdata = window->internal;
+
+        const int focused = MAIN_THREAD_EM_ASM_INT({
+            var id = UTF8ToString($0);
+            try
+            {
+                var canvas = document.querySelector(id);
+                if (canvas) {
+                    return canvas === document.activeElement;
+                }
+            }
+            catch (e)
+            {
+                // querySelector throws if not a valid selector
+            }
+            return false;
+        }, wdata->canvas_id);
+
+        if (focused) {
+            break;
+        }
+    }
+    return window;
+}
+
 static EM_BOOL Emscripten_HandlePointerLockChange(int eventType, const EmscriptenPointerlockChangeEvent *changeEvent, void *userData)
 {
     SDL_WindowData *window_data = (SDL_WindowData *)userData;
@@ -268,6 +297,19 @@ static EM_BOOL Emscripten_HandlePointerLockChange(int eventType, const Emscripte
     return 0;
 }
 
+static EM_BOOL Emscripten_HandlePointerLockChangeGlobal(int eventType, const EmscriptenPointerlockChangeEvent *changeEvent, void *userData)
+{
+    SDL_VideoDevice *device = userData;
+    bool prevent_default = false;
+    SDL_Window *window;
+
+    for (window = device->windows; window; window = window->next) {
+        prevent_default |= Emscripten_HandlePointerLockChange(eventType, changeEvent, window->internal);
+    }
+
+    return prevent_default;
+}
+
 static EM_BOOL Emscripten_HandleMouseMove(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
 {
     SDL_WindowData *window_data = userData;
@@ -355,6 +397,19 @@ static EM_BOOL Emscripten_HandleMouseButton(int eventType, const EmscriptenMouse
     return prevent_default;
 }
 
+static EM_BOOL Emscripten_HandleMouseButtonGlobal(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
+{
+    SDL_VideoDevice *device = userData;
+    bool prevent_default = false;
+    SDL_Window *window;
+
+    for (window = device->windows; window; window = window->next) {
+        prevent_default |= Emscripten_HandleMouseButton(eventType, mouseEvent, window->internal);
+    }
+
+    return prevent_default;
+}
+
 static EM_BOOL Emscripten_HandleMouseFocus(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
 {
     SDL_WindowData *window_data = userData;
@@ -410,9 +465,11 @@ static EM_BOOL Emscripten_HandleWheel(int eventType, const EmscriptenWheelEvent
     return SDL_EventEnabled(SDL_EVENT_MOUSE_WHEEL);
 }
 
-static EM_BOOL Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, void *userData)
+static EM_BOOL Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *focusEvent, void *userData)
 {
-    SDL_WindowData *window_data = userData;
+    SDL_VideoDevice *device = userData;
+    SDL_Window *window = Emscripten_GetFocusedWindow(device);
+
     SDL_EventType sdl_event_type;
 
     /* If the user switches away while keys are pressed (such as
@@ -422,7 +479,7 @@ static EM_BOOL Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent
     }
 
     sdl_event_type = (eventType == EMSCRIPTEN_EVENT_FOCUS) ? SDL_EVENT_WINDOW_FOCUS_GAINED : SDL_EVENT_WINDOW_FOCUS_LOST;
-    SDL_SetKeyboardFocus(sdl_event_type == SDL_EVENT_WINDOW_FOCUS_GAINED ? window_data->window : NULL);
+    SDL_SetKeyboardFocus(sdl_event_type == SDL_EVENT_WINDOW_FOCUS_GAINED ? window : NULL);
     return SDL_EventEnabled(sdl_event_type);
 }
 
@@ -610,6 +667,16 @@ static EM_BOOL Emscripten_HandleFullscreenChange(int eventType, const Emscripten
     return 0;
 }
 
+static EM_BOOL Emscripten_HandleFullscreenChangeGlobal(int eventType, const EmscriptenFullscreenChangeEvent *fullscreenChangeEvent, void *userData)
+{
+    SDL_VideoDevice *device = userData;
+    SDL_Window *window = Emscripten_GetFocusedWindow(device);
+    if (window) {
+        return Emscripten_HandleFullscreenChange(eventType, fullscreenChangeEvent, window->internal);
+    }
+    return EM_FALSE;
+}
+
 static EM_BOOL Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData)
 {
     SDL_WindowData *window_data = userData;
@@ -653,6 +720,19 @@ static EM_BOOL Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *u
     return 0;
 }
 
+static EM_BOOL Emscripten_HandleResizeGlobal(int eventType, const EmscriptenUiEvent *uiEvent, void *userData)
+{
+    SDL_VideoDevice *device = userData;
+    bool prevent_default = false;
+    SDL_Window *window;
+
+    for (window = device->windows; window; window = window->next) {
+        prevent_default |= Emscripten_HandleResize(eventType, uiEvent, window->internal);
+    }
+
+    return prevent_default;
+}
+
 EM_BOOL
 Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData)
 {
@@ -1020,6 +1100,34 @@ static const char *Emscripten_GetKeyboardTargetElement(const char *target)
     return target;
 }
 
+void Emscripten_RegisterGlobalEventHandlers(SDL_VideoDevice *device)
+{
+    emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, device, 0, Emscripten_HandleMouseButtonGlobal);
+
+    emscripten_set_focus_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, device, 0, Emscripten_HandleFocus);
+    emscripten_set_blur_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, device, 0, Emscripten_HandleFocus);
+
+    emscripten_set_pointerlockchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, device, 0, Emscripten_HandlePointerLockChangeGlobal);
+
+    emscripten_set_fullscreenchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, device, 0, Emscripten_HandleFullscreenChangeGlobal);
+
+    emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, device, 0, Emscripten_HandleResizeGlobal);
+}
+
+void Emscripten_UnregisterGlobalEventHandlers(SDL_VideoDevice *device)
+{
+    emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
+
+    emscripten_set_focus_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
+    emscripten_set_blur_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
+
+    emscripten_set_pointerlockchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
+
+    emscripten_set_fullscreenchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
+
+    emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
+}
+
 void Emscripten_RegisterEventHandlers(SDL_WindowData *data)
 {
     const char *keyElement;
@@ -1028,36 +1136,26 @@ void Emscripten_RegisterEventHandlers(SDL_WindowData *data)
     emscripten_set_mousemove_callback(data->canvas_id, data, 0, Emscripten_HandleMouseMove);
 
     emscripten_set_mousedown_callback(data->canvas_id, data, 0, Emscripten_HandleMouseButton);
-    emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, data, 0, Emscripten_HandleMouseButton);
 
     emscripten_set_mouseenter_callback(data->canvas_id, data, 0, Emscripten_HandleMouseFocus);
     emscripten_set_mouseleave_callback(data->canvas_id, data, 0, Emscripten_HandleMouseFocus);
 
     emscripten_set_wheel_callback(data->canvas_id, data, 0, Emscripten_HandleWheel);
 
-    emscripten_set_focus_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, data, 0, Emscripten_HandleFocus);
-    emscripten_set_blur_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, data, 0, Emscripten_HandleFocus);
-
     emscripten_set_orientationchange_callback(data, 0, Emscripten_HandleOrientationChange);
 
     emscripten_set_touchstart_callback(data->canvas_id, data, 0, Emscripten_HandleTouch);
     emscripten_set_touchend_callback(data->canvas_id, data, 0, Emscripten_HandleTouch);
     emscripten_set_touchmove_callback(data->canvas_id, data, 0, Emscripten_HandleTouch);
     emscripten_set_touchcancel_callback(data->canvas_id, data, 0, Emscripten_HandleTouch);
 
-    emscripten_set_pointerlockchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, data, 0, Emscripten_HandlePointerLockChange);
-
     keyElement = Emscripten_GetKeyboardTargetElement(data->keyboard_element);
     if (keyElement) {
         emscripten_set_keydown_callback(keyElement, data, 0, Emscripten_HandleKey);
         emscripten_set_keyup_callback(keyElement, data, 0, Emscripten_HandleKey);
         emscripten_set_keypress_callback(keyElement, data, 0, Emscripten_HandleKeyPress);
     }
 
-    emscripten_set_fullscreenchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, data, 0, Emscripten_HandleFullscreenChange);
-
-    emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, data, 0, Emscripten_HandleResize);
-
     emscripten_set_visibilitychange_callback(data, 0, Emscripten_HandleVisibilityChange);
 
     emscripten_set_beforeunload_callback(data, Emscripten_HandleBeforeUnload);
@@ -1085,36 +1183,26 @@ void Emscripten_UnregisterEventHandlers(SDL_WindowData *data)
     emscripten_set_mousemove_callback(data->canvas_id, NULL, 0, NULL);
 
     emscripten_set_mousedown_callback(data->canvas_id, NULL, 0, NULL);
-    emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
 
     emscripten_set_mouseenter_callback(data->canvas_id, NULL, 0, NULL);
     emscripten_set_mouseleave_callback(data->canvas_id, NULL, 0, NULL);
 
     emscripten_set_wheel_callback(data->canvas_id, NULL, 0, NULL);
 
-    emscripten_set_focus_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
-    emscripten_set_blur_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
-
     emscripten_set_orientationchange_callback(NULL, 0, NULL);
 
     emscripten_set_touchstart_callback(data->canvas_id, NULL, 0, NULL);
     emscripten_set_touchend_callback(data->canvas_id, NULL, 0, NULL);
     emscripten_set_touchmove_callback(data->canvas_id, NULL, 0, NULL);
     emscripten_set_touchcancel_callback(data->canvas_id, NULL, 0, NULL);
 
-    emscripten_set_pointerlockchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
-
     keyElement = Emscripten_GetKeyboardTargetElement(data->keyboard_element);
     if (keyElement) {
         emscripten_set_keydown_callback(keyElement, NULL, 0, NULL);
         emscripten_set_keyup_callback(keyElement, NULL, 0, NULL);
         emscripten_set_keypress_callback(keyElement, NULL, 0, NULL);
     }
 
-    emscripten_set_fullscreenchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, NULL, 0, NULL);
-
-    emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 0, NULL);
-
     emscripten_set_visibilitychange_callback(NULL, 0, NULL);
 
     emscripten_set_beforeunload_callback(NULL, NULL);
diff --git a/src/video/emscripten/SDL_emscriptenevents.h b/src/video/emscripten/SDL_emscriptenevents.h
@@ -24,6 +24,8 @@
 
 #include "SDL_emscriptenvideo.h"
 
+extern void Emscripten_RegisterGlobalEventHandlers(SDL_VideoDevice *device);
+extern void Emscripten_UnregisterGlobalEventHandlers(SDL_VideoDevice *device);
 extern void Emscripten_RegisterEventHandlers(SDL_WindowData *data);
 extern void Emscripten_UnregisterEventHandlers(SDL_WindowData *data);
 extern EM_BOOL Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData);
diff --git a/src/video/emscripten/SDL_emscriptenvideo.c b/src/video/emscripten/SDL_emscriptenvideo.c
@@ -390,6 +390,8 @@ bool Emscripten_VideoInit(SDL_VideoDevice *_this)
     SDL_AddKeyboard(SDL_DEFAULT_KEYBOARD_ID, NULL, false);
     SDL_AddMouse(SDL_DEFAULT_MOUSE_ID, NULL, false);
 
+    Emscripten_RegisterGlobalEventHandlers(_this);
+
     // We're done!
     return true;
 }
@@ -402,6 +404,7 @@ static bool Emscripten_SetDisplayMode(SDL_VideoDevice *_this, SDL_VideoDisplay *
 
 static void Emscripten_VideoQuit(SDL_VideoDevice *_this)
 {
+    Emscripten_UnregisterGlobalEventHandlers(_this);
     Emscripten_QuitMouse();
     Emscripten_UnlistenSystemTheme();
     pumpevents_has_run = false;

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,8 @@ bool Emscripten_VideoInit(SDL_VideoDevice *_this)`
`390`	`390`	`SDL_AddKeyboard(SDL_DEFAULT_KEYBOARD_ID, NULL, false);`
`391`	`391`	`SDL_AddMouse(SDL_DEFAULT_MOUSE_ID, NULL, false);`
`392`	`392`
	`393`	`+ Emscripten_RegisterGlobalEventHandlers(_this);`
	`394`	`+`
`393`	`395`	`// We're done!`
`394`	`396`	`return true;`
`395`	`397`	`}`
`@@ -402,6 +404,7 @@ static bool Emscripten_SetDisplayMode(SDL_VideoDevice _this, SDL_VideoDisplay `
`402`	`404`
`403`	`405`	`static void Emscripten_VideoQuit(SDL_VideoDevice *_this)`
`404`	`406`	`{`
	`407`	`+ Emscripten_UnregisterGlobalEventHandlers(_this);`
`405`	`408`	`Emscripten_QuitMouse();`
`406`	`409`	`Emscripten_UnlistenSystemTheme();`
`407`	`410`	`pumpevents_has_run = false;`