aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-05-28 12:54:17 +0200
committerDrew DeVault <sir@cmpwn.com>2020-05-28 15:13:05 +0200
commit1a23c1425ff1ee29e3704f6c0ac940b274061cca (patch)
treeb94e7a684e407912d89909ab98966bfd275fb419
parent5e0ef70cc085666d0939aefdf403664c5cd268e5 (diff)
Add comments for missing tablet tool entries
And stop using default cases, so that we know which parts of the code need an update when adding a new enum entry. Closes: https://github.com/swaywm/wlroots/issues/2208
-rw-r--r--backend/wayland/tablet_v2.c6
-rw-r--r--types/tablet_v2/wlr_tablet_v2_tool.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c
index 77d737c5..9801b298 100644
--- a/backend/wayland/tablet_v2.c
+++ b/backend/wayland/tablet_v2.c
@@ -481,8 +481,10 @@ static enum wlr_tablet_tool_type tablet_type_to_wlr_type(enum zwp_tablet_tool_v2
return WLR_TABLET_TOOL_TYPE_MOUSE;
case ZWP_TABLET_TOOL_V2_TYPE_LENS:
return WLR_TABLET_TOOL_TYPE_LENS;
- default:
- break;
+ case ZWP_TABLET_TOOL_V2_TYPE_FINGER:
+ // unused, see:
+ // https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/18
+ abort();
}
abort(); // unreachable
}
diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c
index f9b4b458..041139b5 100644
--- a/types/tablet_v2/wlr_tablet_v2_tool.c
+++ b/types/tablet_v2/wlr_tablet_v2_tool.c
@@ -73,10 +73,12 @@ static enum zwp_tablet_tool_v2_type tablet_type_from_wlr_type(
return ZWP_TABLET_TOOL_V2_TYPE_MOUSE;
case WLR_TABLET_TOOL_TYPE_LENS:
return ZWP_TABLET_TOOL_V2_TYPE_LENS;
- default:
- /* We skip these devices earlier on */
- abort(); // unreachable
+ case WLR_TABLET_TOOL_TYPE_TOTEM:
+ // missing, see:
+ // https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/19
+ abort();
}
+ abort(); // unreachable
}
void destroy_tablet_tool_v2(struct wl_resource *resource) {