Touch: Multitouch scrolling

Each finger is emitting scroll events at their own position, enabling scrolling multiple widgets at the same time.

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ui/touch.c b/src/ui/touch.c
index 40e5c5d0..88746bed 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -80,6 +80,7 @@ iLocalDef void pushPos_Touch_(iTouch *d, const iFloat3 pos, uint32_t time) {
 struct Impl_Momentum {
     iWidget *affinity;
     uint32_t releaseTime;
+    iFloat3 pos;
     iFloat3 velocity;
     iFloat3 accum;
 };
@@ -226,6 +227,7 @@ static void update_TouchState_(void *ptr) {
             const iInt2 pixels = initF3_I2(mom->accum);
             if (pixels.x || pixels.y) {
                 subv_F3(&mom->accum, initI2_F3(pixels));
+                dispatchMotion_Touch_(mom->pos, 0);
                 dispatchEvent_Widget(mom->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                     .type = SDL_MOUSEWHEEL,
                     .timestamp = nowTime,
@@ -474,6 +476,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
 //                   pixels.y, y_F3(amount), y_F3(touch->accum));
             if (pixels.x || pixels.y) {
                 setFocus_Widget(NULL);
+                dispatchMotion_Touch_(touch->pos[0], 0);
                 dispatchEvent_Widget(touch->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                     .type = SDL_MOUSEWHEEL,
                     .timestamp = SDL_GetTicks(),
@@ -551,6 +554,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                     iMomentum mom = {
                         .affinity = touch->affinity,
                         .releaseTime = nowTime,
+                        .pos = touch->pos[0],
                         .velocity = velocity
                     };
                     if (isEmpty_Array(d->moms)) {
@@ -569,3 +573,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
     }
     return iTrue;
 }
+
+size_t numFingers_Touch(void) {
+    return size_Array(touchState_()->touches);
+}
diff --git a/src/ui/touch.h b/src/ui/touch.h
index 39a059da..19a927ab 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -30,3 +30,5 @@ iDeclareType(Widget)
 iBool   processEvent_Touch      (const SDL_Event *);
 void    update_Touch            (void);
 void    widgetDestroyed_Touch   (iWidget *widget);
+
+size_t  numFingers_Touch        (void);