libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 03:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Fix double tap and right click hold for direct mouse mode

Browse Source 
Also re-work slightly the system for handling the delayed mouse up touch event
This commit is contained in:
antoniou79 2023-08-07 17:25:18 +03:00
parent 3bb60278d6
commit 95f1ca2847
3 changed files with 321 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/platform/android/android.cpp
View File

@ -168,7 +168,6 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) :
_audio_buffer_size(audio_buffer_size),
_screen_changeid(0),
_mixer(0),
_queuedEventTime(0),
_event_queue_lock(0),
_touch_pt_down(),
_touch_pt_scroll(),

30
backends/platform/android/android.h
View File

@ -100,6 +100,32 @@ void *androidGLgetProcAddress(const char *name);
class OSystem_Android : public ModularGraphicsBackend, Common::EventSource {
private:
static const int kQueuedInputEventDelay = 50;
struct EventWithDelay : public Common::Event {
/** The time which the delay starts counting from */
uint32 referTimeMillis;
/** The delay for the event to be handled */
uint32 delayMillis;
/** The connected EventType of the "connected" event that should be handled before this one */
Common::EventType connectedType;
/** A status flag indicating whether the "connected" event was handled */
bool connectedTypeExecuted;
EventWithDelay() : referTimeMillis(0), delayMillis(0), connectedType(Common::EVENT_INVALID), connectedTypeExecuted(false) {
}
void reset() {
referTimeMillis = 0;
delayMillis = 0;
connectedType = Common::EVENT_INVALID;
connectedTypeExecuted = false;
}
};
// passed from the dark side
int _audio_sample_rate;
int _audio_buffer_size;
@ -120,8 +146,7 @@ private:
timeval _startTime;
Common::Queue<Common::Event> _event_queue;
Common::Event _queuedEvent;
uint32 _queuedEventTime;
EventWithDelay _delayedMouseBtnUpEvent;
Common::Mutex *_event_queue_lock;
Common::Point _touch_pt_down, _touch_pt_scroll, _touch_pt_dt, _touch_pt_multi;
@ -183,6 +208,7 @@ public:
void pushEvent(int type, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6);
void pushEvent(const Common::Event &event);
void pushEvent(const Common::Event &event1, const Common::Event &event2);
void pushDelayedMouseBtnUpEvent();
TouchControls &getTouchControls() { return _touchControls; }
void applyTouchSettings(bool _3dMode, bool overlayShown);

671
backends/platform/android/events.cpp
View File

File diff suppressed because it is too large Load Diff