diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-04-14 10:44:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-14 10:44:30 -0400 |
commit | 4b3e533a5946c0cb8f3f80421918ff809e4059a3 (patch) | |
tree | 28d91462686a2d97b5f83ea0c80ce5873ab909af | |
parent | a25a2f40ce207ea39cf693fe5ee12c621ae06ae7 (diff) | |
parent | 6079e6f7e5818f7789ffbc4b50ed541a864a84bd (diff) |
Merge pull request #1171 from JerziKaminsky/misc_fixes
Misc fixes
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | sway/ipc-json.c | 4 | ||||
-rw-r--r-- | sway/sway-bar.5.txt | 8 |
3 files changed, 8 insertions, 5 deletions
@@ -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 fba489d7..4c4484e8 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(); diff --git a/sway/sway-bar.5.txt b/sway/sway-bar.5.txt index a404acd0..5a52e7db 100644 --- a/sway/sway-bar.5.txt +++ b/sway/sway-bar.5.txt @@ -50,17 +50,17 @@ Commands **wrap_scroll** <yes|no>:: Enables or disables wrapping when scrolling through workspaces with the - scroll wheel. Default is no. + scroll wheel. Default is _no_. **workspace_buttons** <yes|no>:: - 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** <yes|no>:: 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** <yes|no>:: - Enable or disable binding mode indicator. It's enabled by default. + Enable or disable binding mode indicator. Default is _yes_. **height** <height>:: Sets the height of the bar. Default height will match the font size. |