summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-07-04 16:00:13 -0400
committerLibravatar Drew DeVault <ddevault@vistarmedia.com>2017-07-11 20:08:06 -0400
commitcf4ea4c86b2023e3d1f9fa54b9e1dcf2fc27ef3d (patch)
tree511bae3020cb9a9293feed881b853f5d7828e801 /sway
parentMerge pull request #1256 from lheckemann/doc-png (diff)
downloadsway-cf4ea4c86b2023e3d1f9fa54b9e1dcf2fc27ef3d.tar.gz
sway-cf4ea4c86b2023e3d1f9fa54b9e1dcf2fc27ef3d.tar.zst
sway-cf4ea4c86b2023e3d1f9fa54b9e1dcf2fc27ef3d.zip
Make asciidoc (and man pages) optional
And remove it from the build
Diffstat (limited to 'sway')
-rw-r--r--sway/CMakeLists.txt12
-rw-r--r--sway/handlers.c8
2 files changed, 15 insertions, 5 deletions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 981f8a07..bf0b2e7f 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -93,8 +93,10 @@ endfunction()
93add_config(config config sway) 93add_config(config config sway)
94add_config(00-defaults security.d/00-defaults sway/security.d) 94add_config(00-defaults security.d/00-defaults sway/security.d)
95 95
96add_manpage(sway 1) 96if (A2X_FOUND)
97add_manpage(sway 5) 97 add_manpage(sway 1)
98add_manpage(sway-input 5) 98 add_manpage(sway 5)
99add_manpage(sway-bar 5) 99 add_manpage(sway-input 5)
100add_manpage(sway-security 7) 100 add_manpage(sway-bar 5)
101 add_manpage(sway-security 7)
102endif()
diff --git a/sway/handlers.c b/sway/handlers.c
index 39261e3d..052789ca 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -1084,8 +1084,16 @@ bool handle_pointer_scroll(wlc_handle view, uint32_t time, const struct wlc_modi
1084 return EVENT_PASSTHROUGH; 1084 return EVENT_PASSTHROUGH;
1085} 1085}
1086 1086
1087static void clip_test_cb(void *data, const char *type, int fd) {
1088 const char *str = data;
1089 write(fd, str, strlen(str));
1090 close(fd);
1091}
1092
1087static void handle_wlc_ready(void) { 1093static void handle_wlc_ready(void) {
1088 sway_log(L_DEBUG, "Compositor is ready, executing cmds in queue"); 1094 sway_log(L_DEBUG, "Compositor is ready, executing cmds in queue");
1095 const char *type = "text/plain;charset=utf-8";
1096 wlc_set_selection("test", &type, 1, &clip_test_cb);
1089 // Execute commands until there are none left 1097 // Execute commands until there are none left
1090 config->active = true; 1098 config->active = true;
1091 while (config->cmd_queue->length) { 1099 while (config->cmd_queue->length) {