From b463fb8adc18f128d5af46096d002f7f6d6c9dfe Mon Sep 17 00:00:00 2001 From: Jerzi Kaminsky Date: Wed, 12 Apr 2017 20:13:22 +0300 Subject: [PATCH 1/2] Remain compat with libinput < 1.7.0 --- README.md | 1 + sway/ipc-json.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 616da6657..dc39bf91c 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Install dependencies: * [wlc](https://github.com/Cloudef/wlc) * wayland * xwayland +* libinput >= 1.6.0 * libcap * asciidoc * pcre diff --git a/sway/ipc-json.c b/sway/ipc-json.c index fba489d7f..4c4484e8a 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -284,7 +284,9 @@ json_object *ipc_json_describe_input(struct libinput_device *device) { { LIBINPUT_DEVICE_CAP_TABLET_TOOL, "tablet_tool", NULL }, { LIBINPUT_DEVICE_CAP_TABLET_PAD, "tablet_pad", NULL }, { LIBINPUT_DEVICE_CAP_GESTURE, "gesture", NULL }, - { LIBINPUT_DEVICE_CAP_SWITCH, "switch", NULL } +#ifdef LIBINPUT_DEVICE_CAP_SWITCH // libinput 1.7.0+ + { LIBINPUT_DEVICE_CAP_SWITCH, "switch", NULL }, +#endif }; json_object *_caps = json_object_new_array(); From 6079e6f7e5818f7789ffbc4b50ed541a864a84bd Mon Sep 17 00:00:00 2001 From: Jerzi Kaminsky Date: Wed, 12 Apr 2017 20:20:53 +0300 Subject: [PATCH 2/2] Fix style in sway-bar(5) manpage --- sway/sway-bar.5.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sway/sway-bar.5.txt b/sway/sway-bar.5.txt index a404acd06..5a52e7db6 100644 --- a/sway/sway-bar.5.txt +++ b/sway/sway-bar.5.txt @@ -50,17 +50,17 @@ Commands **wrap_scroll** :: Enables or disables wrapping when scrolling through workspaces with the - scroll wheel. Default is no. + scroll wheel. Default is _no_. **workspace_buttons** :: - Enables or disables workspace buttons on the bar. Default is yes. + Enables or disables workspace buttons on the bar. Default is _yes_. **strip_workspace_numbers** :: If set to _yes_, then workspace numbers will be omitted from the workspace - button and only the custom name will be shown. + button and only the custom name will be shown. Default is _no_. **binding_mode_indicator** :: - Enable or disable binding mode indicator. It's enabled by default. + Enable or disable binding mode indicator. Default is _yes_. **height** :: Sets the height of the bar. Default height will match the font size.