From 6bbe03a086a5da3f31912caa45c3bdd299ac299a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 6 Feb 2019 15:29:23 +1000 Subject: [PATCH] Add a bit() macro Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.h | 16 +++++----- src/evdev-tablet-pad.h | 18 +++++------ src/evdev-tablet.h | 22 ++++++------- src/evdev.c | 24 +++++++-------- src/evdev.h | 66 +++++++++++++++++++-------------------- src/libinput-private.h | 16 +++++----- src/libinput-util.h | 1 + src/quirks.c | 30 +++++++++--------- test/litest.h | 68 ++++++++++++++++++++--------------------- 9 files changed, 131 insertions(+), 130 deletions(-) diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h index 61db33a4..2e257ea1 100644 --- a/src/evdev-mt-touchpad.h +++ b/src/evdev-mt-touchpad.h @@ -38,11 +38,11 @@ enum touchpad_event { TOUCHPAD_EVENT_NONE = 0, - TOUCHPAD_EVENT_MOTION = (1 << 0), - TOUCHPAD_EVENT_BUTTON_PRESS = (1 << 1), - TOUCHPAD_EVENT_BUTTON_RELEASE = (1 << 2), - TOUCHPAD_EVENT_OTHERAXIS = (1 << 3), - TOUCHPAD_EVENT_TIMESTAMP = (1 << 4), + TOUCHPAD_EVENT_MOTION = bit(0), + TOUCHPAD_EVENT_BUTTON_PRESS = bit(1), + TOUCHPAD_EVENT_BUTTON_RELEASE = bit(2), + TOUCHPAD_EVENT_OTHERAXIS = bit(3), + TOUCHPAD_EVENT_TIMESTAMP = bit(4), }; enum touch_state { @@ -118,9 +118,9 @@ enum tp_tap_touch_state { /* For edge scrolling, so we only care about right and bottom */ enum tp_edge { - EDGE_NONE = 0, - EDGE_RIGHT = (1 << 0), - EDGE_BOTTOM = (1 << 1), + EDGE_NONE = 0, + EDGE_RIGHT = bit(0), + EDGE_BOTTOM = bit(1), }; enum tp_edge_scroll_touch_state { diff --git a/src/evdev-tablet-pad.h b/src/evdev-tablet-pad.h index a6cddcb8..6208caf8 100644 --- a/src/evdev-tablet-pad.h +++ b/src/evdev-tablet-pad.h @@ -29,18 +29,18 @@ #define LIBINPUT_BUTTONSET_AXIS_NONE 0 enum pad_status { - PAD_NONE = 0, - PAD_AXES_UPDATED = 1 << 0, - PAD_BUTTONS_PRESSED = 1 << 1, - PAD_BUTTONS_RELEASED = 1 << 2, + PAD_NONE = 0, + PAD_AXES_UPDATED = bit(0), + PAD_BUTTONS_PRESSED = bit(1), + PAD_BUTTONS_RELEASED = bit(2), }; enum pad_axes { - PAD_AXIS_NONE = 0, - PAD_AXIS_RING1 = 1 << 0, - PAD_AXIS_RING2 = 1 << 1, - PAD_AXIS_STRIP1 = 1 << 2, - PAD_AXIS_STRIP2 = 1 << 3, + PAD_AXIS_NONE = 0, + PAD_AXIS_RING1 = bit(0), + PAD_AXIS_RING2 = bit(1), + PAD_AXIS_STRIP1 = bit(2), + PAD_AXIS_STRIP2 = bit(3), }; struct button_state { diff --git a/src/evdev-tablet.h b/src/evdev-tablet.h index 89761952..82b908b3 100644 --- a/src/evdev-tablet.h +++ b/src/evdev-tablet.h @@ -34,17 +34,17 @@ #define TABLET_HISTORY_LENGTH 4 enum tablet_status { - TABLET_NONE = 0, - TABLET_AXES_UPDATED = 1 << 0, - TABLET_BUTTONS_PRESSED = 1 << 1, - TABLET_BUTTONS_RELEASED = 1 << 2, - TABLET_TOOL_IN_CONTACT = 1 << 3, - TABLET_TOOL_LEAVING_PROXIMITY = 1 << 4, - TABLET_TOOL_OUT_OF_PROXIMITY = 1 << 5, - TABLET_TOOL_ENTERING_PROXIMITY = 1 << 6, - TABLET_TOOL_ENTERING_CONTACT = 1 << 7, - TABLET_TOOL_LEAVING_CONTACT = 1 << 8, - TABLET_TOOL_OUT_OF_RANGE = 1 << 9, + TABLET_NONE = 0, + TABLET_AXES_UPDATED = bit(0), + TABLET_BUTTONS_PRESSED = bit(1), + TABLET_BUTTONS_RELEASED = bit(2), + TABLET_TOOL_IN_CONTACT = bit(3), + TABLET_TOOL_LEAVING_PROXIMITY = bit(4), + TABLET_TOOL_OUT_OF_PROXIMITY = bit(5), + TABLET_TOOL_ENTERING_PROXIMITY = bit(6), + TABLET_TOOL_ENTERING_CONTACT = bit(7), + TABLET_TOOL_LEAVING_CONTACT = bit(8), + TABLET_TOOL_OUT_OF_RANGE = bit(9), }; struct button_state { diff --git a/src/evdev.c b/src/evdev.c index 4a205705..53efcb2f 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -53,18 +53,18 @@ #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200) enum evdev_device_udev_tags { - EVDEV_UDEV_TAG_INPUT = (1 << 0), - EVDEV_UDEV_TAG_KEYBOARD = (1 << 1), - EVDEV_UDEV_TAG_MOUSE = (1 << 2), - EVDEV_UDEV_TAG_TOUCHPAD = (1 << 3), - EVDEV_UDEV_TAG_TOUCHSCREEN = (1 << 4), - EVDEV_UDEV_TAG_TABLET = (1 << 5), - EVDEV_UDEV_TAG_JOYSTICK = (1 << 6), - EVDEV_UDEV_TAG_ACCELEROMETER = (1 << 7), - EVDEV_UDEV_TAG_TABLET_PAD = (1 << 8), - EVDEV_UDEV_TAG_POINTINGSTICK = (1 << 9), - EVDEV_UDEV_TAG_TRACKBALL = (1 << 10), - EVDEV_UDEV_TAG_SWITCH = (1 << 11), + EVDEV_UDEV_TAG_INPUT = bit(0), + EVDEV_UDEV_TAG_KEYBOARD = bit(1), + EVDEV_UDEV_TAG_MOUSE = bit(2), + EVDEV_UDEV_TAG_TOUCHPAD = bit(3), + EVDEV_UDEV_TAG_TOUCHSCREEN = bit(4), + EVDEV_UDEV_TAG_TABLET = bit(5), + EVDEV_UDEV_TAG_JOYSTICK = bit(6), + EVDEV_UDEV_TAG_ACCELEROMETER = bit(7), + EVDEV_UDEV_TAG_TABLET_PAD = bit(8), + EVDEV_UDEV_TAG_POINTINGSTICK = bit(9), + EVDEV_UDEV_TAG_TRACKBALL = bit(10), + EVDEV_UDEV_TAG_SWITCH = bit(11), }; struct evdev_udev_tag_match { diff --git a/src/evdev.h b/src/evdev.h index 34ee64de..729eccf6 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -43,37 +43,37 @@ enum evdev_event_type { EVDEV_NONE, - EVDEV_ABSOLUTE_TOUCH_DOWN = (1 << 0), - EVDEV_ABSOLUTE_MOTION = (1 << 1), - EVDEV_ABSOLUTE_TOUCH_UP = (1 << 2), - EVDEV_ABSOLUTE_MT = (1 << 3), - EVDEV_WHEEL = (1 << 4), - EVDEV_KEY = (1 << 5), - EVDEV_RELATIVE_MOTION = (1 << 6), - EVDEV_BUTTON = (1 << 7), + EVDEV_ABSOLUTE_TOUCH_DOWN = bit(0), + EVDEV_ABSOLUTE_MOTION = bit(1), + EVDEV_ABSOLUTE_TOUCH_UP = bit(2), + EVDEV_ABSOLUTE_MT = bit(3), + EVDEV_WHEEL = bit(4), + EVDEV_KEY = bit(5), + EVDEV_RELATIVE_MOTION = bit(6), + EVDEV_BUTTON = bit(7), }; enum evdev_device_seat_capability { - EVDEV_DEVICE_POINTER = (1 << 0), - EVDEV_DEVICE_KEYBOARD = (1 << 1), - EVDEV_DEVICE_TOUCH = (1 << 2), - EVDEV_DEVICE_TABLET = (1 << 3), - EVDEV_DEVICE_TABLET_PAD = (1 << 4), - EVDEV_DEVICE_GESTURE = (1 << 5), - EVDEV_DEVICE_SWITCH = (1 << 6), + EVDEV_DEVICE_POINTER = bit(0), + EVDEV_DEVICE_KEYBOARD = bit(1), + EVDEV_DEVICE_TOUCH = bit(2), + EVDEV_DEVICE_TABLET = bit(3), + EVDEV_DEVICE_TABLET_PAD = bit(4), + EVDEV_DEVICE_GESTURE = bit(5), + EVDEV_DEVICE_SWITCH = bit(6), }; enum evdev_device_tags { - EVDEV_TAG_EXTERNAL_MOUSE = (1 << 0), - EVDEV_TAG_INTERNAL_TOUCHPAD = (1 << 1), - EVDEV_TAG_EXTERNAL_TOUCHPAD = (1 << 2), - EVDEV_TAG_TRACKPOINT = (1 << 3), - EVDEV_TAG_KEYBOARD = (1 << 4), - EVDEV_TAG_LID_SWITCH = (1 << 5), - EVDEV_TAG_INTERNAL_KEYBOARD = (1 << 6), - EVDEV_TAG_EXTERNAL_KEYBOARD = (1 << 7), - EVDEV_TAG_TABLET_MODE_SWITCH = (1 << 8), - EVDEV_TAG_TABLET_TOUCHPAD = (1 << 9), + EVDEV_TAG_EXTERNAL_MOUSE = bit(0), + EVDEV_TAG_INTERNAL_TOUCHPAD = bit(1), + EVDEV_TAG_EXTERNAL_TOUCHPAD = bit(2), + EVDEV_TAG_TRACKPOINT = bit(3), + EVDEV_TAG_KEYBOARD = bit(4), + EVDEV_TAG_LID_SWITCH = bit(5), + EVDEV_TAG_INTERNAL_KEYBOARD = bit(6), + EVDEV_TAG_EXTERNAL_KEYBOARD = bit(7), + EVDEV_TAG_TABLET_MODE_SWITCH = bit(8), + EVDEV_TAG_TABLET_TOUCHPAD = bit(9), }; enum evdev_middlebutton_state { @@ -106,16 +106,16 @@ enum evdev_middlebutton_event { */ enum evdev_device_model { EVDEV_MODEL_DEFAULT = 0, - EVDEV_MODEL_WACOM_TOUCHPAD = (1 << 1), - EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 2), - EVDEV_MODEL_LENOVO_T450_TOUCHPAD = (1 << 4), - EVDEV_MODEL_APPLE_TOUCHPAD_ONEBUTTON = (1 << 5), - EVDEV_MODEL_LENOVO_SCROLLPOINT = (1 << 6), + EVDEV_MODEL_WACOM_TOUCHPAD = bit(1), + EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = bit(2), + EVDEV_MODEL_LENOVO_T450_TOUCHPAD = bit(4), + EVDEV_MODEL_APPLE_TOUCHPAD_ONEBUTTON = bit(5), + EVDEV_MODEL_LENOVO_SCROLLPOINT = bit(6), /* udev tags, not true quirks */ - EVDEV_MODEL_TEST_DEVICE = (1 << 20), - EVDEV_MODEL_TRACKBALL = (1 << 21), - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 22), + EVDEV_MODEL_TEST_DEVICE = bit(20), + EVDEV_MODEL_TRACKBALL = bit(21), + EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = bit(22), }; enum evdev_button_scroll_state { diff --git a/src/libinput-private.h b/src/libinput-private.h index c0234a5b..9a0acc54 100644 --- a/src/libinput-private.h +++ b/src/libinput-private.h @@ -751,14 +751,14 @@ length_in_mm(const struct phys_coords mm) } enum directions { - N = 1 << 0, - NE = 1 << 1, - E = 1 << 2, - SE = 1 << 3, - S = 1 << 4, - SW = 1 << 5, - W = 1 << 6, - NW = 1 << 7, + N = bit(0), + NE = bit(1), + E = bit(2), + SE = bit(3), + S = bit(4), + SW = bit(5), + W = bit(6), + NW = bit(7), UNDEFINED_DIRECTION = 0xff }; diff --git a/src/libinput-util.h b/src/libinput-util.h index 850f1cc1..13af4034 100644 --- a/src/libinput-util.h +++ b/src/libinput-util.h @@ -81,6 +81,7 @@ #define CASE_RETURN_STRING(a) case a: return #a +#define bit(x_) (1UL << (x_)) /* * This list data structure is a verbatim copy from wayland-util.h from the * Wayland project; except that wl_ prefix has been removed. diff --git a/src/quirks.c b/src/quirks.c index e62174b1..8336860b 100644 --- a/src/quirks.c +++ b/src/quirks.c @@ -84,14 +84,14 @@ struct property { }; enum match_flags { - M_NAME = (1 << 0), - M_BUS = (1 << 1), - M_VID = (1 << 2), - M_PID = (1 << 3), - M_DMI = (1 << 4), - M_UDEV_TYPE = (1 << 5), - M_DT = (1 << 6), - M_VERSION = (1 << 7), + M_NAME = bit(0), + M_BUS = bit(1), + M_VID = bit(2), + M_PID = bit(3), + M_DMI = bit(4), + M_UDEV_TYPE = bit(5), + M_DT = bit(6), + M_VERSION = bit(7), M_LAST = M_VERSION, }; @@ -106,13 +106,13 @@ enum bustype { }; enum udev_type { - UDEV_MOUSE = (1 << 1), - UDEV_POINTINGSTICK = (1 << 2), - UDEV_TOUCHPAD = (1 << 3), - UDEV_TABLET = (1 << 4), - UDEV_TABLET_PAD = (1 << 5), - UDEV_JOYSTICK = (1 << 6), - UDEV_KEYBOARD = (1 << 7), + UDEV_MOUSE = bit(1), + UDEV_POINTINGSTICK = bit(2), + UDEV_TOUCHPAD = bit(3), + UDEV_TABLET = bit(4), + UDEV_TABLET_PAD = bit(5), + UDEV_JOYSTICK = bit(6), + UDEV_KEYBOARD = bit(7), }; /** diff --git a/test/litest.h b/test/litest.h index 07af2f87..67788012 100644 --- a/test/litest.h +++ b/test/litest.h @@ -295,40 +295,40 @@ enum litest_device_type { }; enum litest_device_feature { - LITEST_DEVICELESS = -2, - LITEST_DISABLE_DEVICE = -1, - LITEST_ANY = 0, - LITEST_TOUCHPAD = 1 << 0, - LITEST_CLICKPAD = 1 << 1, - LITEST_BUTTON = 1 << 2, - LITEST_KEYS = 1 << 3, - LITEST_RELATIVE = 1 << 4, - LITEST_WHEEL = 1 << 5, - LITEST_TOUCH = 1 << 6, - LITEST_SINGLE_TOUCH = 1 << 7, - LITEST_APPLE_CLICKPAD = 1 << 8, - LITEST_TOPBUTTONPAD = 1 << 9, - LITEST_SEMI_MT = 1 << 10, - LITEST_POINTINGSTICK = 1 << 11, - LITEST_FAKE_MT = 1 << 12, - LITEST_ABSOLUTE = 1 << 13, - LITEST_PROTOCOL_A = 1 << 14, - LITEST_HOVER = 1 << 15, - LITEST_ELLIPSE = 1 << 16, - LITEST_TABLET = 1 << 17, - LITEST_DISTANCE = 1 << 18, - LITEST_TOOL_SERIAL = 1 << 19, - LITEST_TILT = 1 << 20, - LITEST_TABLET_PAD = 1 << 21, - LITEST_RING = 1 << 22, - LITEST_STRIP = 1 << 23, - LITEST_TRACKBALL = 1 << 24, - LITEST_LEDS = 1 << 25, - LITEST_SWITCH = 1 << 26, - LITEST_IGNORED = 1 << 27, - LITEST_NO_DEBOUNCE = 1 << 28, - LITEST_TOOL_MOUSE = 1 << 29, - LITEST_DIRECT = 1 << 30, + LITEST_DEVICELESS = -2, + LITEST_DISABLE_DEVICE = -1, + LITEST_ANY = 0, + LITEST_TOUCHPAD = bit(0), + LITEST_CLICKPAD = bit(1), + LITEST_BUTTON = bit(2), + LITEST_KEYS = bit(3), + LITEST_RELATIVE = bit(4), + LITEST_WHEEL = bit(5), + LITEST_TOUCH = bit(6), + LITEST_SINGLE_TOUCH = bit(7), + LITEST_APPLE_CLICKPAD = bit(8), + LITEST_TOPBUTTONPAD = bit(9), + LITEST_SEMI_MT = bit(10), + LITEST_POINTINGSTICK = bit(11), + LITEST_FAKE_MT = bit(12), + LITEST_ABSOLUTE = bit(13), + LITEST_PROTOCOL_A = bit(14), + LITEST_HOVER = bit(15), + LITEST_ELLIPSE = bit(16), + LITEST_TABLET = bit(17), + LITEST_DISTANCE = bit(18), + LITEST_TOOL_SERIAL = bit(19), + LITEST_TILT = bit(20), + LITEST_TABLET_PAD = bit(21), + LITEST_RING = bit(22), + LITEST_STRIP = bit(23), + LITEST_TRACKBALL = bit(24), + LITEST_LEDS = bit(25), + LITEST_SWITCH = bit(26), + LITEST_IGNORED = bit(27), + LITEST_NO_DEBOUNCE = bit(28), + LITEST_TOOL_MOUSE = bit(29), + LITEST_DIRECT = bit(30), }; /* this is a semi-mt device, so we keep track of the touches that the tests