Emscripten: Partially fixed not removing key event callbacks if hint was used.

The key event callbacks were always removed from the same target although it is
possible to set them to different targets using the hint. This is only a partial
fix because it assumes that the hint is not changed to a different value later.
main
Philipp Wiesemann 2015-03-06 21:26:37 +01:00
parent 483ea8b7b0
commit 1686af726e
1 changed files with 8 additions and 3 deletions

View File

@ -621,10 +621,15 @@ Emscripten_UnregisterEventHandlers(SDL_WindowData *data)
emscripten_set_touchmove_callback("#canvas", NULL, 0, NULL); emscripten_set_touchmove_callback("#canvas", NULL, 0, NULL);
emscripten_set_touchcancel_callback("#canvas", NULL, 0, NULL); emscripten_set_touchcancel_callback("#canvas", NULL, 0, NULL);
emscripten_set_keydown_callback("#window", NULL, 0, NULL); const char *target = SDL_GetHint(SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT);
emscripten_set_keyup_callback("#window", NULL, 0, NULL); if (!target) {
target = "#window";
}
emscripten_set_keypress_callback("#window", NULL, 0, NULL); emscripten_set_keydown_callback(target, NULL, 0, NULL);
emscripten_set_keyup_callback(target, NULL, 0, NULL);
emscripten_set_keypress_callback(target, NULL, 0, NULL);
emscripten_set_fullscreenchange_callback("#document", NULL, 0, NULL); emscripten_set_fullscreenchange_callback("#document", NULL, 0, NULL);