Skip to content

Emscripten: Allow for Multiple Windows #12575

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 22 commits into
base: main
Choose a base branch
from
+815 −79
Open

Emscripten: Allow for Multiple Windows #12575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1e17c7c
Remove singletons from Emscripten code
Temdog007 Apr 3, 2025
e267153
Fully implement multiple windows on Emscripten
Temdog007 Mar 22, 2025
f720b37
Fix ifdefs
Temdog007 Mar 29, 2025
53b1023
Update scale test to make windows have unique displays
Temdog007 Mar 29, 2025
1a305a0
Implement Sync Window on Emscripten
Temdog007 Mar 31, 2025
3f35dfd
Fix detecting when window should be centered
Temdog007 Mar 31, 2025
13cd243
Add multi window test
Temdog007 Mar 31, 2025
1ffd936
Improve multi window test
Temdog007 Mar 31, 2025
83ceceb
Ensure window title doesn't get updated by other windows
Temdog007 Mar 31, 2025
7139ab8
Update multi window to use if SDL_GetWindowPosition
Temdog007 Mar 31, 2025
0c1a3d8
Update src/video/emscripten/SDL_emscriptenvideo.c
Temdog007 Apr 3, 2025
a2c6003
Update
Temdog007 Apr 3, 2025
7de2942
Move mainWindow from static to SDL_VideoData
Temdog007 Apr 3, 2025
4298ac3
Fix names
Temdog007 Apr 4, 2025
0e13233
Fix warnings for Windows build
Temdog007 Apr 5, 2025
80dfd8c
Ensure Sync Window updates position and size
Temdog007 Apr 7, 2025
87c7507
Improve multi window test
Temdog007 Apr 7, 2025
f271ee2
Remove unneeded comment
Temdog007 Apr 8, 2025
f0e57a4
Add popup support for Emscripten
Temdog007 Apr 8, 2025
ae9e44d
Ensure window position and size is sync'd when browser window is resized
Temdog007 Apr 8, 2025
4276bc0
Fix error on windows build
Temdog007 Apr 8, 2025
3b11a2b
Ensure the actual style is modified in SDL_SetWindowPosition
Temdog007 Apr 9, 2025
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
10 changes: 9 additions & 1 deletion src/test/SDL_test_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,13 +1395,21 @@ bool SDLTest_CommonInit(SDLTest_CommonState *state)
}
}

props = SDL_CreateProperties();
if (state->num_windows > 1) {
(void)SDL_snprintf(title, SDL_arraysize(title), "%s %d",
state->window_title, i + 1);
#ifdef SDL_PLATFORM_EMSCRIPTEN
if (i != 0) {
char id[64];
SDL_snprintf(id, sizeof(id), "#canvas%d", i + 1);
SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_CANVAS_ID_STRING, id);
SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_KEYBOARD_ELEMENT_STRING, id);
}
#endif
} else {
SDL_strlcpy(title, state->window_title, SDL_arraysize(title));
}
props = SDL_CreateProperties();
SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, title);
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_X_NUMBER, r.x);
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_Y_NUMBER, r.y);
Expand Down
21 changes: 19 additions & 2 deletions src/video/SDL_video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,6 +2563,15 @@ SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, w);
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, h);
SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER, flags);
#ifdef SDL_PLATFORM_EMSCRIPTEN
// Must ensure that popup windows have a unique canvas_id
const char* canvas_id = SDL_GetStringProperty(props, SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_CANVAS_ID_STRING, "");
if (!canvas_id || !*canvas_id) {
char new_canvas_id[64];
SDL_snprintf(new_canvas_id, sizeof(new_canvas_id), "#popup%u", props);
SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_CANVAS_ID_STRING, new_canvas_id);
}
#endif
window = SDL_CreateWindowWithProperties(props);
SDL_DestroyProperties(props);
return window;
Expand All @@ -2578,6 +2587,14 @@ bool SDL_RecreateWindow(SDL_Window *window, SDL_WindowFlags flags)
bool need_vulkan_load = false;
SDL_WindowFlags graphics_flags;

#ifdef SDL_PLATFORM_EMSCRIPTEN
// Don't actually recreate the window in Emscripten because the SDL_WindowData's
// canvas_id and keyboard_element would be lost if destroyed
const bool recreate_window = false;
#else
const bool recreate_window = true;
#endif

// ensure no more than one of these flags is set
graphics_flags = flags & (SDL_WINDOW_OPENGL | SDL_WINDOW_METAL | SDL_WINDOW_VULKAN);
if (graphics_flags & (graphics_flags - 1)) {
Expand Down Expand Up @@ -2646,7 +2663,7 @@ bool SDL_RecreateWindow(SDL_Window *window, SDL_WindowFlags flags)
SDL_Vulkan_UnloadLibrary();
}

if (_this->DestroyWindow && !(flags & SDL_WINDOW_EXTERNAL)) {
if (recreate_window && _this->DestroyWindow && !(flags & SDL_WINDOW_EXTERNAL)) {
_this->DestroyWindow(_this, window);
}

Expand Down Expand Up @@ -2676,7 +2693,7 @@ bool SDL_RecreateWindow(SDL_Window *window, SDL_WindowFlags flags)
window->w = window->windowed.w = window->floating.w;
window->h = window->windowed.h = window->floating.h;

if (!_this->CreateSDLWindow(_this, window, 0)) {
if (recreate_window && !_this->CreateSDLWindow(_this, window, 0)) {
if (loaded_opengl) {
SDL_GL_UnloadLibrary();
window->flags &= ~SDL_WINDOW_OPENGL;
Expand Down
152 changes: 104 additions & 48 deletions src/video/emscripten/SDL_emscriptenevents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,9 @@ static EM_BOOL Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *u
}
}

// Always re-sync the window when the browser window changes size
SDL_SyncWindow(window_data->window);

if (!(window_data->window->flags & SDL_WINDOW_FULLSCREEN)) {
// this will only work if the canvas size is set through css
if (window_data->window->flags & SDL_WINDOW_RESIZABLE) {
Expand Down Expand Up @@ -874,14 +877,26 @@ EMSCRIPTEN_KEEPALIVE void Emscripten_HandlePointerGeneric(SDL_WindowData *window
static void Emscripten_set_pointer_event_callbacks(SDL_WindowData *data)
{
MAIN_THREAD_EM_ASM({
var target = document.querySelector(UTF8ToString($1));
var id = UTF8ToString($1);
var target = document.querySelector(id);
if (target) {
var data = $0;

if (typeof(Module['SDL3']) === 'undefined') {
if (!Module['SDL3']) {
Module['SDL3'] = {};
}

var SDL3 = Module['SDL3'];
if (!SDL3['window_data']) {
SDL3['window_data'] = {};
}

var window_datas = SDL3['window_data'];
if (!window_datas[id]) {
window_datas[id] = {};
}

var window_data = window_datas[id];

var makePointerEventCStruct = function(event) {
var ptr = 0;
Expand All @@ -907,42 +922,45 @@ static void Emscripten_set_pointer_event_callbacks(SDL_WindowData *data)
return ptr;
};

SDL3.eventHandlerPointerEnter = function(event) {
window_data.eventHandlerPointerEnter = function(event) {
var d = makePointerEventCStruct(event); if (d != 0) { _Emscripten_HandlePointerEnter(data, d); _SDL_free(d); }
};
target.addEventListener("pointerenter", SDL3.eventHandlerPointerEnter);
target.addEventListener("pointerenter", window_data.eventHandlerPointerEnter);

SDL3.eventHandlerPointerLeave = function(event) {
window_data.eventHandlerPointerLeave = function(event) {
var d = makePointerEventCStruct(event); if (d != 0) { _Emscripten_HandlePointerLeave(data, d); _SDL_free(d); }
};
target.addEventListener("pointerleave", SDL3.eventHandlerPointerLeave);
target.addEventListener("pointercancel", SDL3.eventHandlerPointerLeave); // catch this, just in case.
target.addEventListener("pointerleave", window_data.eventHandlerPointerLeave);
target.addEventListener("pointercancel", window_data.eventHandlerPointerLeave); // catch this, just in case.

SDL3.eventHandlerPointerGeneric = function(event) {
window_data.eventHandlerPointerGeneric = function(event) {
var d = makePointerEventCStruct(event); if (d != 0) { _Emscripten_HandlePointerGeneric(data, d); _SDL_free(d); }
};
target.addEventListener("pointerdown", SDL3.eventHandlerPointerGeneric);
target.addEventListener("pointerup", SDL3.eventHandlerPointerGeneric);
target.addEventListener("pointermove", SDL3.eventHandlerPointerGeneric);
target.addEventListener("pointerdown", window_data.eventHandlerPointerGeneric);
target.addEventListener("pointerup", window_data.eventHandlerPointerGeneric);
target.addEventListener("pointermove", window_data.eventHandlerPointerGeneric);
}
}, data, data->canvas_id, sizeof (Emscripten_PointerEvent));
}

static void Emscripten_unset_pointer_event_callbacks(SDL_WindowData *data)
{
MAIN_THREAD_EM_ASM({
var target = document.querySelector(UTF8ToString($0));
var id = UTF8ToString($0);
var target = document.querySelector(id);
if (target) {
var SDL3 = Module['SDL3'];
target.removeEventListener("pointerenter", SDL3.eventHandlerPointerEnter);
target.removeEventListener("pointerleave", SDL3.eventHandlerPointerLeave);
target.removeEventListener("pointercancel", SDL3.eventHandlerPointerLeave);
target.removeEventListener("pointerdown", SDL3.eventHandlerPointerGeneric);
target.removeEventListener("pointerup", SDL3.eventHandlerPointerGeneric);
target.removeEventListener("pointermove", SDL3.eventHandlerPointerGeneric);
SDL3.eventHandlerPointerEnter = undefined;
SDL3.eventHandlerPointerLeave = undefined;
SDL3.eventHandlerPointerGeneric = undefined;
var window_datas = SDL3['window_data'];
var window_data = window_datas[id];
target.removeEventListener("pointerenter", window_data.eventHandlerPointerEnter);
target.removeEventListener("pointerleave", window_data.eventHandlerPointerLeave);
target.removeEventListener("pointercancel", window_data.eventHandlerPointerLeave);
target.removeEventListener("pointerdown", window_data.eventHandlerPointerGeneric);
target.removeEventListener("pointerup", window_data.eventHandlerPointerGeneric);
target.removeEventListener("pointermove", window_data.eventHandlerPointerGeneric);
window_data.eventHandlerPointerEnter = undefined;
window_data.eventHandlerPointerLeave = undefined;
window_data.eventHandlerPointerGeneric = undefined;
}
}, data->canvas_id);
}
Expand Down Expand Up @@ -979,14 +997,26 @@ EM_JS_DEPS(dragndrop, "$writeArrayToMemory");
static void Emscripten_set_drag_event_callbacks(SDL_WindowData *data)
{
MAIN_THREAD_EM_ASM({
var target = document.querySelector(UTF8ToString($1));
var id = UTF8ToString($1);
var target = document.querySelector(id);
if (target) {
var data = $0;

if (typeof(Module['SDL3']) === 'undefined') {
if (!Module['SDL3']) {
Module['SDL3'] = {};
}

var SDL3 = Module['SDL3'];
if (!SDL3['window_data']) {
SDL3['window_data'] = {};
}

var window_datas = SDL3['window_data'];
if (!window_datas[id]) {
window_datas[id] = {};
}

var window_data = window_datas[id];

var makeDropEventCStruct = function(event) {
var ptr = 0;
Expand All @@ -1000,15 +1030,27 @@ static void Emscripten_set_drag_event_callbacks(SDL_WindowData *data)
return ptr;
};

SDL3.eventHandlerDropDragover = function(event) {
window_data.eventHandlerDropDragover = function(event) {
event.preventDefault();
var d = makeDropEventCStruct(event); if (d != 0) { _Emscripten_SendDragEvent(data, d); _SDL_free(d); }
};
target.addEventListener("dragover", SDL3.eventHandlerDropDragover);
target.addEventListener("dragover", window_data.eventHandlerDropDragover);

SDL3.drop_count = 0;
FS.mkdir("/tmp/filedrop");
SDL3.eventHandlerDropDrop = function(event) {
window_data.drop_count = 0;
function safeCreateDir(dir){
try
{
FS.mkdir(dir)
}
catch(e)
{
// Throws if the directory already exists
}
}
safeCreateDir("/tmp/filedrop");
safeCreateDir(`/tmp/filedrop/${id}/`);

window_data.eventHandlerDropDrop = function(event) {
event.preventDefault();
if (event.dataTransfer.types.includes("text/plain")) {
let plain_text = stringToNewUTF8(event.dataTransfer.getData("text/plain"));
Expand All @@ -1020,8 +1062,8 @@ static void Emscripten_set_drag_event_callbacks(SDL_WindowData *data)
const file_reader = new FileReader();
file_reader.readAsArrayBuffer(file);
file_reader.onload = function(event) {
const fs_dropdir = `/tmp/filedrop/${SDL3.drop_count}`;
SDL3.drop_count += 1;
const fs_dropdir = `/tmp/filedrop/${id}/${window_data.drop_count}`;
window_data.drop_count += 1;

const fs_filepath = `${fs_dropdir}/${file.name}`;
const c_fs_filepath = stringToNewUTF8(fs_filepath);
Expand All @@ -1040,29 +1082,44 @@ static void Emscripten_set_drag_event_callbacks(SDL_WindowData *data)
}
_Emscripten_SendDragCompleteEvent(data);
};
target.addEventListener("drop", SDL3.eventHandlerDropDrop);
target.addEventListener("drop", window_data.eventHandlerDropDrop);

SDL3.eventHandlerDropDragend = function(event) {
window_data.eventHandlerDropDragend = function(event) {
event.preventDefault();
_Emscripten_SendDragCompleteEvent(data);
};
target.addEventListener("dragend", SDL3.eventHandlerDropDragend);
target.addEventListener("dragleave", SDL3.eventHandlerDropDragend);
target.addEventListener("dragend", window_data.eventHandlerDropDragend);
target.addEventListener("dragleave", window_data.eventHandlerDropDragend);
}
}, data, data->canvas_id, sizeof (Emscripten_DropEvent));
}

static void Emscripten_unset_drag_event_callbacks(SDL_WindowData *data)
{
MAIN_THREAD_EM_ASM({
var target = document.querySelector(UTF8ToString($0));
var id = UTF8ToString($0);
var target = document.querySelector(id);
if (target) {
var SDL3 = Module['SDL3'];
target.removeEventListener("dragleave", SDL3.eventHandlerDropDragend);
target.removeEventListener("dragend", SDL3.eventHandlerDropDragend);
target.removeEventListener("drop", SDL3.eventHandlerDropDrop);
SDL3.drop_count = undefined;
var window_datas = SDL3['window_data'];
var window_data = window_datas[id];
target.removeEventListener("dragleave", window_data.eventHandlerDropDragend);
target.removeEventListener("dragend", window_data.eventHandlerDropDragend);
target.removeEventListener("drop", window_data.eventHandlerDropDrop);
window_data.drop_count = undefined;

function safeRemoveDir(path) {
try
{
FS.rmdir(path);
}
catch(e)
{
// Throws if directory doesn't exist
}
}

const path = `/tmp/filedrop/${id}/`;
function recursive_remove(dirpath) {
FS.readdir(dirpath).forEach((filename) => {
const p = `${dirpath}/${filename}`;
Expand All @@ -1073,14 +1130,14 @@ static void Emscripten_unset_drag_event_callbacks(SDL_WindowData *data)
recursive_remove(p);
}
});
FS.rmdir(dirpath);
}("/tmp/filedrop");

FS.rmdir("/tmp/filedrop");
target.removeEventListener("dragover", SDL3.eventHandlerDropDragover);
SDL3.eventHandlerDropDragover = undefined;
SDL3.eventHandlerDropDrop = undefined;
SDL3.eventHandlerDropDragend = undefined;
safeRemoveDir(dirpath);
}(path);

safeRemoveDir(path);
target.removeEventListener("dragover", window_data.eventHandlerDropDragover);
window_data.eventHandlerDropDragover = undefined;
window_data.eventHandlerDropDrop = undefined;
window_data.eventHandlerDropDragend = undefined;
}
}, data->canvas_id);
}
Expand Down Expand Up @@ -1132,7 +1189,6 @@ void Emscripten_RegisterEventHandlers(SDL_WindowData *data)
{
const char *keyElement;

// There is only one window and that window is the canvas
emscripten_set_mousemove_callback(data->canvas_id, data, 0, Emscripten_HandleMouseMove);

emscripten_set_mousedown_callback(data->canvas_id, data, 0, Emscripten_HandleMouseButton);
Expand Down
Loading
Loading