From b9b6172194de411c2c68e81c427a79b0a1227e3e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 25 Nov 2019 08:27:39 -0800 Subject: [PATCH] input: Make use of timeval portable for 64bit time_t This patch avoids using time field of input_event structure which is not available on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new and keeps old input.h implementation functional as well. See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 --- .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 3555763b89..e7dc57c027 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -58,6 +58,11 @@ #include #endif +#ifndef input_event_sec +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#endif + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") @@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); struct ::input_event led_ie; - ::gettimeofday(&led_ie.time, 0); + struct timeval tval; + ::gettimeofday(&tval, 0); + led_ie.input_event_sec = tval.tv_sec; + led_ie.input_event_usec = tval.tv_usec; led_ie.type = EV_LED; led_ie.code = led; led_ie.value = state; diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index 78728ef4ce..1d65f9b9f7 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -58,6 +58,11 @@ #include #endif +#ifndef input_event_sec +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#endif + #include #if QT_CONFIG(mtdev) @@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) // update timestamps m_lastTimeStamp = m_timeStamp; - m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; + m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; m_lastTouchPoints = m_touchPoints; m_touchPoints.clear();