diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-21 10:22:31 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-31 14:56:46 +1000 |
commit | bcb4fa9c00a6447d5e4b089293fb912b99c615cc (patch) | |
tree | b51bdff87ce4956565473e6047a827b42c67bc56 | |
parent | a46f3a60785a07c2dec9b62c425d732d20a4c9f8 (diff) |
Namespace the SetTimer frontend hook
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | src/synaptics-x11.c | 2 | ||||
-rw-r--r-- | src/synaptics.c | 2 | ||||
-rw-r--r-- | src/synaptics.h | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/synaptics-x11.c b/src/synaptics-x11.c index 3be03b5..4555f46 100644 --- a/src/synaptics-x11.c +++ b/src/synaptics-x11.c @@ -111,7 +111,7 @@ X11TimerFunc(OsTimerPtr timer, CARD32 now, pointer arg) } void -SetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay) +SynapticsSetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay) { struct SynapticsX11 *x11 = priv->frontend_data; x11->timer = TimerSet(x11->timer, 0, delay, X11TimerFunc, x11->pInfo); diff --git a/src/synaptics.c b/src/synaptics.c index f499d1c..36d26ca 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -803,7 +803,7 @@ SynapticsReadInput(SynapticsPrivate *priv) if (newDelay){ unsigned int now = SynapticsGetCurrentMillis(); priv->timer_time = now; - SetTimer(priv, now, delay); + SynapticsSetTimer(priv, now, delay); } } diff --git a/src/synaptics.h b/src/synaptics.h index 4edc725..56ae966 100644 --- a/src/synaptics.h +++ b/src/synaptics.h @@ -64,7 +64,12 @@ Bool SynapticsInitDevice(SynapticsPrivate *priv); * Implemented-by: core */ void SynapticsCloseDevice(SynapticsPrivate *priv); -void SetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay); +/** + * Set a timer to be called delay milliseconds after now. That timer should + * call the SynapticsTimerFunc when it fires. + * Implemented-by: frontend + */ +void SynapticsSetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay); void CalculateScalingCoeffs(SynapticsPrivate * priv); Bool QueryHardware(SynapticsPrivate *priv); struct SynapticsProtocolOperations* GetDeviceProtocolOps(SynapticsPrivate *priv, |