Replace fallthrough comments with __attribute__((fallthrough))

This has recently been endorsed by the linux kernel, it should be good
enough for us.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c
index 71e610f07f802f9952efcdbbaba03e5f044e0ead..b702a1d1a893dd349f9a6db92b188a9b45a78065 100644 (file)
--- a/src/evdev-fallback.c
+++ b/src/evdev-fallback.c
@@ -121,7 +121,7 @@ post_trackpoint_scroll(struct evdev_device *device,
                return true;
        case BUTTONSCROLL_READY:
                device->scroll.button_scroll_state = BUTTONSCROLL_SCROLLING;
-               /* fallthrough */
+               _fallthrough_;
        case BUTTONSCROLL_SCROLLING:
                evdev_post_scroll(device, time,
                                  LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,

diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 3974dbf6c30802194396dccb6a422ddedcf918a9..159ed685fc585e178ba442b0acd7a1c16ad04e1a 100644 (file)
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -1249,19 +1249,19 @@ tp_post_clickpadbutton_buttons(struct tp_dispatch *tp, uint64_t time)
                                break;
                        case BUTTON_EVENT_IN_TOP_L:
                                is_top = 1;
-                               /* fallthrough */
+                               _fallthrough_;
                        case BUTTON_EVENT_IN_BOTTOM_L:
                                area |= LEFT;
                                break;
                        case BUTTON_EVENT_IN_TOP_M:
                                is_top = 1;
-                               /* fallthrough */
+                               _fallthrough_;
                        case BUTTON_EVENT_IN_BOTTOM_M:
                                area |= MIDDLE;
                                break;
                        case BUTTON_EVENT_IN_TOP_R:
                                is_top = 1;
-                               /* fallthrough */
+                               _fallthrough_;
                        case BUTTON_EVENT_IN_BOTTOM_R:
                                area |= RIGHT;
                                break;

diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
index c17d7f594a9947c5dfac306f1ab9835186a7f9cc..d63cc74401d6330c2b6731ec5a2d0e03d8f2469a 100644 (file)
--- a/src/evdev-mt-touchpad-edge-scroll.c
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -404,7 +404,7 @@ tp_edge_scroll_handle_state(struct tp_dispatch *tp, uint64_t time)
                                        "touch %d: unexpected state %d\n",
                                        t->index,
                                        t->state);
-                       /* fallthrough */
+                       _fallthrough_;
                case TOUCH_END:
                        tp_edge_scroll_handle_event(tp,
                                                    t,

diff --git a/src/util-macros.h b/src/util-macros.h
index 785c25bcc8e2144cd77e559983a933672ccbe262..978d0f393579c18a12bac6e59a67d044dc363c28 100644 (file)
--- a/src/util-macros.h
+++ b/src/util-macros.h
@@ -57,3 +57,5 @@
 
 
 #define CASE_RETURN_STRING(a) case a: return #a
+
+#define _fallthrough_ __attribute__((fallthrough))

diff --git a/test/test-gestures.c b/test/test-gestures.c
index 0a5566ad289691b19a042db4e552ee8fd93b0eda..660a08a61dfead0076065e30866449c1eec42330 100644 (file)
--- a/test/test-gestures.c
+++ b/test/test-gestures.c
@@ -823,13 +823,13 @@ test_gesture_hold(int nfingers)
        switch (nfingers) {
        case 4:
                litest_touch_down(dev, 3, 70, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -850,13 +850,13 @@ test_gesture_hold(int nfingers)
        switch (nfingers) {
        case 4:
                litest_touch_up(dev, 3);
-               /* fallthrough */
+               _fallthrough_;
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -888,13 +888,13 @@ test_gesture_hold_cancel(int nfingers)
        switch (nfingers) {
        case 4:
                litest_touch_down(dev, 3, 70, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1655,10 +1655,10 @@ START_TEST(gestures_hold_once_tap_n_drag)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1669,10 +1669,10 @@ START_TEST(gestures_hold_once_tap_n_drag)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;

diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c
index 666e2b95409d6d34cdeca2d4ab1a0bc07020a098..b3ff6eca2514a1e0b2d5a5982f6e5dc4a8ccc996 100644 (file)
--- a/test/test-touchpad-buttons.c
+++ b/test/test-touchpad-buttons.c
@@ -963,11 +963,11 @@ START_TEST(touchpad_clickfinger_click_drag)
                case 3:
                        if (nslots >= nfingers)
                                litest_touch_move(dev, 2, 60, 50 + i);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        if (nslots >= nfingers)
                                litest_touch_move(dev, 1, 50, 50 + i);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_move(dev, 0, 40, 50 + i);
                        break;

diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c
index 64be3b369ced1235b81f8cb60b1ed4460830cbf5..b9d57ce873ed47d9cfe3fbb42077d2e01e53254d 100644 (file)
--- a/test/test-touchpad-tap.c
+++ b/test/test-touchpad-tap.c
@@ -110,10 +110,10 @@ START_TEST(touchpad_doubletap)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -122,10 +122,10 @@ START_TEST(touchpad_doubletap)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -135,10 +135,10 @@ START_TEST(touchpad_doubletap)
        switch (nfingers2) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -147,10 +147,10 @@ START_TEST(touchpad_doubletap)
        switch (nfingers2) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -236,10 +236,10 @@ START_TEST(touchpad_multitap)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -247,10 +247,10 @@ START_TEST(touchpad_multitap)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -326,10 +326,10 @@ START_TEST(touchpad_multitap_n_drag_move)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -337,10 +337,10 @@ START_TEST(touchpad_multitap_n_drag_move)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -438,10 +438,10 @@ START_TEST(touchpad_multitap_n_drag_2fg)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -449,10 +449,10 @@ START_TEST(touchpad_multitap_n_drag_2fg)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -552,10 +552,10 @@ START_TEST(touchpad_multitap_n_drag_click)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -563,10 +563,10 @@ START_TEST(touchpad_multitap_n_drag_click)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -653,10 +653,10 @@ START_TEST(touchpad_multitap_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -665,10 +665,10 @@ START_TEST(touchpad_multitap_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -743,10 +743,10 @@ START_TEST(touchpad_multitap_n_drag_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -755,10 +755,10 @@ START_TEST(touchpad_multitap_n_drag_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -857,10 +857,10 @@ START_TEST(touchpad_multitap_n_drag_high_delay)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -871,10 +871,10 @@ START_TEST(touchpad_multitap_n_drag_high_delay)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -950,10 +950,10 @@ START_TEST(touchpad_multitap_n_drag_tap)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -962,10 +962,10 @@ START_TEST(touchpad_multitap_n_drag_tap)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -1065,10 +1065,10 @@ START_TEST(touchpad_multitap_n_drag_tap_click)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -1077,10 +1077,10 @@ START_TEST(touchpad_multitap_n_drag_tap_click)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -1186,10 +1186,10 @@ START_TEST(touchpad_tap_n_drag)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1197,10 +1197,10 @@ START_TEST(touchpad_tap_n_drag)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1268,10 +1268,10 @@ START_TEST(touchpad_tap_n_drag_draglock)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1279,10 +1279,10 @@ START_TEST(touchpad_tap_n_drag_draglock)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1353,10 +1353,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1364,10 +1364,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1396,10 +1396,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap)
        switch (nfingers2) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1407,10 +1407,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap)
        switch (nfingers2) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1456,10 +1456,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap_click)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1467,10 +1467,10 @@ START_TEST(touchpad_tap_n_drag_draglock_tap_click)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1541,10 +1541,10 @@ START_TEST(touchpad_tap_n_drag_draglock_timeout)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1552,10 +1552,10 @@ START_TEST(touchpad_tap_n_drag_draglock_timeout)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1620,10 +1620,10 @@ START_TEST(touchpad_tap_n_drag_2fg)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1631,10 +1631,10 @@ START_TEST(touchpad_tap_n_drag_2fg)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1699,10 +1699,10 @@ START_TEST(touchpad_tap_n_drag_2fg_scroll)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1710,10 +1710,10 @@ START_TEST(touchpad_tap_n_drag_2fg_scroll)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1779,10 +1779,10 @@ START_TEST(touchpad_tap_n_drag_draglock_2fg_scroll)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1790,10 +1790,10 @@ START_TEST(touchpad_tap_n_drag_draglock_2fg_scroll)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1870,7 +1870,7 @@ START_TEST(touchpad_tap_n_drag_3fg_btntool)
                break;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1880,10 +1880,10 @@ START_TEST(touchpad_tap_n_drag_3fg_btntool)
                litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0);
                litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1);
                litest_event(dev, EV_SYN, SYN_REPORT, 0);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -1961,10 +1961,10 @@ START_TEST(touchpad_tap_n_drag_3fg)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -1972,10 +1972,10 @@ START_TEST(touchpad_tap_n_drag_3fg)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -2047,10 +2047,10 @@ START_TEST(touchpad_tap_n_drag_3fg_swipe)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -2058,10 +2058,10 @@ START_TEST(touchpad_tap_n_drag_3fg_swipe)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -2139,10 +2139,10 @@ START_TEST(touchpad_tap_n_drag_draglock_3fg_swipe)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -2150,10 +2150,10 @@ START_TEST(touchpad_tap_n_drag_draglock_3fg_swipe)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -2665,10 +2665,10 @@ START_TEST(touchpad_double_tap_click)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -2676,10 +2676,10 @@ START_TEST(touchpad_double_tap_click)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -2741,10 +2741,10 @@ START_TEST(touchpad_tap_n_drag_click)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -2752,10 +2752,10 @@ START_TEST(touchpad_tap_n_drag_click)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -3433,16 +3433,16 @@ START_TEST(touchpad_move_after_touch)
        switch(nfingers) {
        case 5:
                litest_touch_down(dev, 4, 70, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 4:
                litest_touch_down(dev, 3, 70, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -3465,16 +3465,16 @@ START_TEST(touchpad_move_after_touch)
        switch(nfingers) {
        case 5:
                litest_touch_up(dev, 4);
-               /* fallthrough */
+               _fallthrough_;
        case 4:
                litest_touch_up(dev, 3);
-               /* fallthrough */
+               _fallthrough_;
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -3909,10 +3909,10 @@ START_TEST(touchpad_drag_disabled)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -3921,10 +3921,10 @@ START_TEST(touchpad_drag_disabled)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -3984,10 +3984,10 @@ START_TEST(touchpad_drag_disabled_immediate)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -3997,10 +3997,10 @@ START_TEST(touchpad_drag_disabled_immediate)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -4065,10 +4065,10 @@ START_TEST(touchpad_drag_disabled_multitap_no_drag)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -4076,10 +4076,10 @@ START_TEST(touchpad_drag_disabled_multitap_no_drag)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -4346,10 +4346,10 @@ START_TEST(touchpad_tap_palm_on_tapped)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -4357,10 +4357,10 @@ START_TEST(touchpad_tap_palm_on_tapped)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -4428,10 +4428,10 @@ START_TEST(touchpad_tap_palm_on_tapped_palm_down)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -4439,10 +4439,10 @@ START_TEST(touchpad_tap_palm_on_tapped_palm_down)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -4528,10 +4528,10 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -4539,10 +4539,10 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -4561,10 +4561,10 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap)
        switch (nfingers2) {
        case 3:
                litest_touch_down(dev, 3, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 2, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 1, 40, 30);
                break;
@@ -4572,10 +4572,10 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap)
        switch (nfingers2) {
        case 3:
                litest_touch_up(dev, 3);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 1);
                break;
@@ -4641,10 +4641,10 @@ START_TEST(touchpad_tap_palm_on_drag)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -4652,10 +4652,10 @@ START_TEST(touchpad_tap_palm_on_drag)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -4726,10 +4726,10 @@ START_TEST(touchpad_tap_palm_on_drag_2fg)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -4737,10 +4737,10 @@ START_TEST(touchpad_tap_palm_on_drag_2fg)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -5039,10 +5039,10 @@ START_TEST(touchpad_tap_palm_after_tap)
        switch (nfingers) {
        case 3:
                litest_touch_down(dev, 2, 60, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_down(dev, 1, 50, 30);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_down(dev, 0, 40, 30);
                break;
@@ -5050,10 +5050,10 @@ START_TEST(touchpad_tap_palm_after_tap)
        switch (nfingers) {
        case 3:
                litest_touch_up(dev, 2);
-               /* fallthrough */
+               _fallthrough_;
        case 2:
                litest_touch_up(dev, 1);
-               /* fallthrough */
+               _fallthrough_;
        case 1:
                litest_touch_up(dev, 0);
                break;
@@ -5121,10 +5121,10 @@ START_TEST(touchpad_tap_palm_multitap)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -5132,10 +5132,10 @@ START_TEST(touchpad_tap_palm_multitap)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -5207,10 +5207,10 @@ START_TEST(touchpad_tap_palm_multitap_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -5218,10 +5218,10 @@ START_TEST(touchpad_tap_palm_multitap_timeout)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -5292,10 +5292,10 @@ START_TEST(touchpad_tap_palm_multitap_down_again)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -5303,10 +5303,10 @@ START_TEST(touchpad_tap_palm_multitap_down_again)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;
@@ -5325,10 +5325,10 @@ START_TEST(touchpad_tap_palm_multitap_down_again)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 3, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 2, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 1, 40, 30);
                        break;
@@ -5336,10 +5336,10 @@ START_TEST(touchpad_tap_palm_multitap_down_again)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 3);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 1);
                        break;
@@ -5408,10 +5408,10 @@ START_TEST(touchpad_tap_palm_multitap_click)
                switch (nfingers) {
                case 3:
                        litest_touch_down(dev, 2, 60, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_down(dev, 1, 50, 30);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_down(dev, 0, 40, 30);
                        break;
@@ -5419,10 +5419,10 @@ START_TEST(touchpad_tap_palm_multitap_click)
                switch (nfingers) {
                case 3:
                        litest_touch_up(dev, 2);
-                       /* fallthrough */
+                       _fallthrough_;
                case 2:
                        litest_touch_up(dev, 1);
-                       /* fallthrough */
+                       _fallthrough_;
                case 1:
                        litest_touch_up(dev, 0);
                        break;

diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c
index 1b93bd1d2f42035a207c19ae72d0c0a6629e2b0a..54b9d07359d77d666ad48060922ca72cae5dda8c 100644 (file)
--- a/tools/libinput-debug-gui.c
+++ b/tools/libinput-debug-gui.c
@@ -1407,7 +1407,7 @@ handle_event_tablet(struct libinput_event *ev, struct window *w)
                        w->tool.y_up = y;
                        w->tool.is_down = false;
                }
-               /* fallthrough */
+               _fallthrough_;
        case LIBINPUT_EVENT_TABLET_TOOL_AXIS:
                w->tool.x = x;
                w->tool.y = y;