We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Only prevent the default browser event handling when the specific event types aren't disabled by the user

0023-Only-prevent-the-default-browser-event-handling-when-t.txt (text/plain), 5.00 KB, created by Charlie Birks on 2016-04-12 15:29:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Birks

Created: 2016-04-12 15:29:43 UTC

Size: 5.00 KB

patch

obsolete

># HG changeset patch
># User Jonas Platte <mail@jonasplatte.de>
>
>Only prevent the default browser event handling when the specific event types aren't disabled by the user
>
>---
> src/video/emscripten/SDL_emscriptenevents.c | 45 ++++++++++++++++++++---------
> 1 file changed, 31 insertions(+), 14 deletions(-)
>
>diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c
>index f4a1daa..5858a6b 100644
>--- a/src/video/emscripten/SDL_emscriptenevents.c
>+++ b/src/video/emscripten/SDL_emscriptenevents.c
>@@ -350,8 +350,10 @@ Emscripten_HandleMouseButton(int eventType, const EmscriptenMouseEvent *mouseEve
>         default:
>             return 0;
>     }
>-    SDL_SendMouseButton(window_data->window, 0, eventType == EMSCRIPTEN_EVENT_MOUSEDOWN ? SDL_PRESSED : SDL_RELEASED, sdl_button);
>-    return 1;
>+
>+    SDL_EventType sdl_event_type = (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN ? SDL_PRESSED : SDL_RELEASED);
>+    SDL_SendMouseButton(window_data->window, 0, sdl_event_type, sdl_button);
>+    return SDL_GetEventState(sdl_event_type) == SDL_ENABLE;
> }
> 
> EM_BOOL
>@@ -377,7 +379,7 @@ Emscripten_HandleMouseFocus(int eventType, const EmscriptenMouseEvent *mouseEven
>     }
> 
>     SDL_SetMouseFocus(eventType == EMSCRIPTEN_EVENT_MOUSEENTER ? window_data->window : NULL);
>-    return 1;
>+    return SDL_GetEventState(SDL_WINDOWEVENT) == SDL_ENABLE;
> }
> 
> EM_BOOL
>@@ -385,7 +387,7 @@ Emscripten_HandleWheel(int eventType, const EmscriptenWheelEvent *wheelEvent, vo
> {
>     SDL_WindowData *window_data = userData;
>     SDL_SendMouseWheel(window_data->window, 0, wheelEvent->deltaX, -wheelEvent->deltaY, SDL_MOUSEWHEEL_NORMAL);
>-    return 1;
>+    return SDL_GetEventState(SDL_MOUSEWHEEL) == SDL_ENABLE;
> }
> 
> EM_BOOL
>@@ -397,8 +399,10 @@ Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, vo
>     if (eventType == EMSCRIPTEN_EVENT_BLUR) {
>         SDL_ResetKeyboard();
>     }
>+
>+
>     SDL_SendWindowEvent(window_data->window, eventType == EMSCRIPTEN_EVENT_FOCUS ? SDL_WINDOWEVENT_FOCUS_GAINED : SDL_WINDOWEVENT_FOCUS_LOST, 0, 0);
>-    return 1;
>+    return SDL_GetEventState(SDL_WINDOWEVENT) == SDL_ENABLE;
> }
> 
> EM_BOOL
>@@ -415,6 +419,8 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
> 
>     emscripten_get_element_css_size(NULL, &client_w, &client_h);
> 
>+    int preventDefault = 0;
>+
>     for (i = 0; i < touchEvent->numTouches; i++) {
>         SDL_FingerID id;
>         float x, y;
>@@ -428,15 +434,23 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
> 
>         if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE) {
>             SDL_SendTouchMotion(deviceId, id, x, y, 1.0f);
>+            if (!preventDefault && SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
>+                preventDefault = 1;
>+            }
>         } else if (eventType == EMSCRIPTEN_EVENT_TOUCHSTART) {
>             SDL_SendTouch(deviceId, id, SDL_TRUE, x, y, 1.0f);
>+            if (!preventDefault && SDL_GetEventState(SDL_FINGERDOWN) == SDL_ENABLE) {
>+                preventDefault = 1;
>+            }
>         } else {
>             SDL_SendTouch(deviceId, id, SDL_FALSE, x, y, 1.0f);
>+            if (!preventDefault && SDL_GetEventState(SDL_FINGERUP) == SDL_ENABLE) {
>+                preventDefault = 1;
>+            }
>         }
>     }
> 
>-
>-    return 1;
>+    return preventDefault;
> }
> 
> EM_BOOL
>@@ -466,16 +480,19 @@ Emscripten_HandleKey(int eventType, const EmscriptenKeyboardEvent *keyEvent, voi
>                         break;
>                 }
>             }
>-            SDL_SendKeyboardKey(eventType == EMSCRIPTEN_EVENT_KEYDOWN ?
>-                                SDL_PRESSED : SDL_RELEASED, scancode);
>+            SDL_SendKeyboardKey(eventType == EMSCRIPTEN_EVENT_KEYDOWN ? SDL_PRESSED : SDL_RELEASED, scancode);
>         }
>     }
> 
>-    /* if we prevent keydown, we won't get keypress
>-     * also we need to ALWAYS prevent backspace and tab otherwise chrome takes action and does bad navigation UX
>+    SDL_bool prevent_default = SDL_GetEventState(eventType == EMSCRIPTEN_EVENT_KEYDOWN ? SDL_KEYDOWN : SDL_KEYUP) == SDL_ENABLE;
>+
>+    /* if TEXTINPUT events are enabled we can't prevent keydown or we won't get keypress
>+     * we need to ALWAYS prevent backspace and tab otherwise chrome takes action and does bad navigation UX
>      */
>-    return SDL_GetEventState(SDL_TEXTINPUT) != SDL_ENABLE || eventType != EMSCRIPTEN_EVENT_KEYDOWN
>-            || keyEvent->keyCode == 8 /* backspace */ || keyEvent->keyCode == 9 /* tab */;
>+    if (eventType == EMSCRIPTEN_EVENT_KEYDOWN && SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE && keyEvent->keyCode != 8 /* backspace */ && keyEvent->keyCode != 9 /* tab */)
>+        prevent_default = SDL_FALSE;
>+
>+    return prevent_default;
> }
> 
> EM_BOOL
>@@ -485,7 +502,7 @@ Emscripten_HandleKeyPress(int eventType, const EmscriptenKeyboardEvent *keyEvent
>     if (Emscripten_ConvertUTF32toUTF8(keyEvent->charCode, text)) {
>         SDL_SendKeyboardText(text);
>     }
>-    return 1;
>+    return SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE;
> }
> 
> EM_BOOL
>

Actions: View | Diff

Attachments on bug 3229: 2410 | 2411 | 2412 | 2413 | 2414 | 2415 | 2416 | 2417 | 2418 | 2419 | 2420 | 2421 | 2422 | 2423 | 2424 | 2425 | 2426 | 2427 | 2428 | 2429 | 2430 | 2431 | 2432

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.