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] patch to add the new hint support

SDL_HINT_SIMULATE_INPUT_EVENTS.patch (text/plain), 6.51 KB, created by john on 2013-02-16 10:40:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: john

Created: 2013-02-16 10:40:38 UTC

Size: 6.51 KB

patch

obsolete

>diff --git a/include/SDL_hints.h b/include/SDL_hints.h
>index 6352bad..07c919c 100644
>--- a/include/SDL_hints.h
>+++ b/include/SDL_hints.h
>@@ -214,7 +214,18 @@ extern "C" {
>  */
> #define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST"
> 
>-
>+/**
>+ *  \brief  Whether SDL will simulate input events in addition to expected events.
>+ *
>+ *  This variable can be set to the following values:
>+ *    "0"       - Disable simulated events.
>+ *    "1"       - Enable simulated events.
>+ *
>+ *  Simulation is enabled by default. On some platforms, applications may receive
>+ *  simulated mouse events in addition to touch events. This hint exists for applications that handle touch events
>+ *  as well as mouse events.
>+ */
>+#define SDL_HINT_SIMULATE_INPUT_EVENTS      "SDL_SIMULATE_INPUT_EVENTS"
> 
> /**
>  *  \brief  An enumeration of hint priorities
>diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
>index 7105325..806f3cf 100644
>--- a/src/events/SDL_mouse.c
>+++ b/src/events/SDL_mouse.c
>@@ -23,6 +23,8 @@
> /* General mouse handling code for SDL */
> 
> #include "SDL_assert.h"
>+#include "SDL_hints.h"
>+#include "../SDL_hints_c.h"
> #include "SDL_events.h"
> #include "SDL_events_c.h"
> #include "default_cursor.h"
>@@ -33,6 +35,12 @@
> /* The mouse state */
> static SDL_Mouse SDL_mouse;
> 
>+static void
>+SDL_SimulateInputEventsChanged(const char *name, const char *oldValue, const char *newValue)
>+{
>+    /* awkward negation here is to support the public API default (simulation enabled) and the default hint value (NULL). */
>+    SDL_GetMouse()->suppress_simulated_events = (newValue != NULL && newValue[0] != '1');
>+}
> 
> /* Public functions */
> int
>@@ -41,6 +49,11 @@ SDL_MouseInit(void)
>     SDL_Mouse *mouse = SDL_GetMouse();
> 
>     mouse->cursor_shown = SDL_TRUE;
>+    SDL_SetHintWithPriority(SDL_HINT_SIMULATE_INPUT_EVENTS, "1", SDL_HINT_DEFAULT);
>+    SDL_RegisterHintChangedCb(SDL_HINT_SIMULATE_INPUT_EVENTS, &SDL_SimulateInputEventsChanged);
>+    SDL_SimulateInputEventsChanged(SDL_HINT_SIMULATE_INPUT_EVENTS,
>+            SDL_GetHint(SDL_HINT_SIMULATE_INPUT_EVENTS),
>+            SDL_GetHint(SDL_HINT_SIMULATE_INPUT_EVENTS));
> 
>     return (0);
> }
>diff --git a/src/events/SDL_mouse_c.h b/src/events/SDL_mouse_c.h
>index 4918aea..6d459f3 100644
>--- a/src/events/SDL_mouse_c.h
>+++ b/src/events/SDL_mouse_c.h
>@@ -70,6 +70,7 @@ typedef struct
>     SDL_Cursor *def_cursor;
>     SDL_Cursor *cur_cursor;
>     SDL_bool cursor_shown;
>+    SDL_bool suppress_simulated_events;
> } SDL_Mouse;
> 
> 
>diff --git a/src/video/android/SDL_androidtouch.c b/src/video/android/SDL_androidtouch.c
>index 645a907..411d6d2 100644
>--- a/src/video/android/SDL_androidtouch.c
>+++ b/src/video/android/SDL_androidtouch.c
>@@ -88,11 +88,13 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
>             if (!leftFingerDown) {
>                 Android_GetWindowCoordinates(x, y, &window_x, &window_y);
> 
>-                /* send moved event */
>-                SDL_SendMouseMotion(NULL, 0, window_x, window_y);
>+                if (!SDL_GetMouse()->suppress_simulated_events) {
>+                    /* send moved event */
>+                    SDL_SendMouseMotion(NULL, 0, window_x, window_y);
> 
>-                /* send mouse down event */
>-                SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
>+                    /* send mouse down event */
>+                    SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
>+                }
> 
>                 leftFingerDown = fingerId;
>             }
>@@ -102,16 +104,21 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
>             if (!leftFingerDown) {
>                 Android_GetWindowCoordinates(x, y, &window_x, &window_y);
> 
>-                /* send moved event */
>-                SDL_SendMouseMotion(NULL, 0, window_x, window_y);
>+                if (!SDL_GetMouse()->suppress_simulated_events) {
>+                    /* send moved event */
>+                    SDL_SendMouseMotion(NULL, 0, window_x, window_y);
>+                }
>             }
>             SDL_SendTouchMotion(touchDeviceId, fingerId, SDL_FALSE, x, y, p);
>             break;
>         case ACTION_UP:
>         case ACTION_POINTER_1_UP:
>             if (fingerId == leftFingerDown) {
>-                /* send mouse up */
>-                SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
>+
>+                if (!SDL_GetMouse()->suppress_simulated_events) {
>+                    /* send mouse up */
>+                    SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
>+                }
>                 leftFingerDown = 0;
>             }
>             SDL_SendFingerDown(touchDeviceId, fingerId, SDL_FALSE, x, y, p);
>diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
>index 254a961..65a229b 100644
>--- a/src/video/uikit/SDL_uikitview.m
>+++ b/src/video/uikit/SDL_uikitview.m
>@@ -103,11 +103,13 @@
>         if (!leftFingerDown) {
>             CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
> 
>-            /* send moved event */
>-            SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
>+            if (!SDL_GetMouse()->suppress_simulated_events) {
>+                /* send moved event */
>+                SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
> 
>-            /* send mouse down event */
>-            SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
>+                /* send mouse down event */
>+                SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
>+            }
> 
>             leftFingerDown = (SDL_FingerID)touch;
>         }
>@@ -143,8 +145,11 @@
> 
>     while(touch) {
>         if ((SDL_FingerID)touch == leftFingerDown) {
>-            /* send mouse up */
>-            SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
>+
>+            if (!SDL_GetMouse()->suppress_simulated_events) {
>+                /* send mouse up */
>+                SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
>+            }
>             leftFingerDown = 0;
>         }
> 
>@@ -188,8 +193,10 @@
>         if ((SDL_FingerID)touch == leftFingerDown) {
>             CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
> 
>-            /* send moved event */
>-            SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
>+            if (!SDL_GetMouse()->suppress_simulated_events) {
>+                /* send moved event */
>+                SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
>+            }
>         }
> 
>         CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];

Actions: View | Diff

Attachments on bug 1713: 1044

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.