X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=4c9ecc8b569b0629a879f0e41746c163f299d343;hp=75e32c717c3a82ff48c8797f4b59bad65db6b868;hb=a8816d6e5319f9ec26a45346b08250f61e95c011;hpb=e5367ee42312c8835125438511d8479aa2daa094 diff --git a/src/events.c b/src/events.c index 75e32c71..4c9ecc8b 100644 --- a/src/events.c +++ b/src/events.c @@ -160,7 +160,15 @@ void EventLoop(void) case EVENT_MOTIONNOTIFY: HandleMotionEvent((MotionEvent *) &event); break; - + +#if defined(TARGET_SDL2) + case EVENT_FINGERPRESS: + case EVENT_FINGERRELEASE: + case EVENT_FINGERMOTION: + HandleFingerEvent((FingerEvent *) &event); + break; +#endif + case EVENT_KEYPRESS: case EVENT_KEYRELEASE: HandleKeyEvent((KeyEvent *) &event); @@ -377,6 +385,33 @@ void HandleMotionEvent(MotionEvent *event) HandleButton(event->x, event->y, button_status, button_status); } +#if defined(TARGET_SDL2) +void HandleFingerEvent(FingerEvent *event) +{ + // #if DEBUG_EVENTS + Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", + (event->type == EVENT_FINGERPRESS ? "pressed" : + event->type == EVENT_FINGERRELEASE ? "released" : "moved"), + event->touchId, + event->fingerId, + event->x, event->y, + event->dx, event->dy, + event->pressure); + // #endif + +#if 1 + CloseAllAndExit(0); +#else + if (event->type == EVENT_FINGERPRESS) + button_status = event->button; + else + button_status = MB_RELEASED; + + HandleButton(event->x, event->y, button_status, event->button); +#endif +} +#endif + void HandleKeyEvent(KeyEvent *event) { int key_status = (event->type==EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED);