diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-03-13 10:58:01 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-03-13 10:58:01 +1000 |
| commit | fdc33809de2751c164183df2310a71732be579f3 (patch) | |
| tree | 1851d18edf5bddf60cfa57acffb1ae4d7c0bb5a2 | |
| parent | Disable axis faking and MT event processing on fake MT devices (diff) | |
| download | xf86-input-evdev-fdc33809de2751c164183df2310a71732be579f3.tar.gz xf86-input-evdev-fdc33809de2751c164183df2310a71732be579f3.tar.bz2 xf86-input-evdev-fdc33809de2751c164183df2310a71732be579f3.zip | |
Invert a condition to reduce nesting
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/evdev.c b/src/evdev.c index 639e4a1..360bbb8 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2759,22 +2759,22 @@ static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms) for (button = BTN_MISC; button < BTN_JOYSTICK; button++) { - if (libevdev_has_event_code(pEvdev->dev, EV_KEY, button)) - { - int group = (button % 0x100)/16; - int idx = button - ((button/16) * 16); + int group = (button % 0x100)/16; + int idx = button - ((button/16) * 16); + + if (!libevdev_has_event_code(pEvdev->dev, EV_KEY, button)) + continue; - if (!btn_labels[group][idx]) - continue; + if (!btn_labels[group][idx]) + continue; - atom = XIGetKnownProperty(btn_labels[group][idx]); - if (!atom) - continue; + atom = XIGetKnownProperty(btn_labels[group][idx]); + if (!atom) + continue; - /* Props are 0-indexed, button numbers start with 1 */ - bmap = EvdevUtilButtonEventToButtonNumber(pEvdev, button) - 1; - atoms[bmap] = atom; - } + /* Props are 0-indexed, button numbers start with 1 */ + bmap = EvdevUtilButtonEventToButtonNumber(pEvdev, button) - 1; + atoms[bmap] = atom; } /* wheel buttons, hardcoded anyway */ |