From 81a8ddb4a768bee3a4b304716fa4cfead49a2761 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 9 Jun 2011 20:03:08 +0100 Subject: Scroll: Clarify rep_buttons assignment Instead of a combined variable declaration with two ternary expressions using raw hex values, expand it to have two genuine if statements, setting with a more clear bitshift. Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer --- src/synaptics.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/synaptics.c b/src/synaptics.c index d7e13f0..9e0470e 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -2445,8 +2445,12 @@ repeat_scrollbuttons(const InputInfoPtr pInfo, SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private); SynapticsParameters *para = &priv->synpara; int repeat_delay, timeleft; - int rep_buttons = ((para->updown_button_repeat ? 0x18 : 0) | - (para->leftright_button_repeat ? 0x60 : 0)); + int rep_buttons = 0; + + if (para->updown_button_repeat) + rep_buttons |= (1 << (4 - 1)) | (1 << (5 - 1)); + if (para->leftright_button_repeat) + rep_buttons |= (1 << (6 - 1)) | (1 << (7 - 1)); /* Handle auto repeat buttons */ repeat_delay = clamp(para->scroll_button_repeat, SBR_MIN, SBR_MAX); -- cgit v1.2.3