From a82aa2a20d865dd65f2ea9b9efb15d72ab7638a0 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 9 Oct 2017 12:03:32 -0400 Subject: Fix use-after free introduced by cbe7364 --- sway/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/container.c b/sway/container.c index 718608ff..829fde69 100644 --- a/sway/container.c +++ b/sway/container.c @@ -516,10 +516,10 @@ swayc_t *destroy_view(swayc_t *view) { return NULL; } sway_log(L_DEBUG, "Destroying view '%p'", view); + swayc_t *parent = view->parent; free_swayc(view); // Destroy empty containers - swayc_t *parent = view->parent; if (parent && parent->type == C_CONTAINER) { return destroy_container(parent); } -- cgit v1.2.3-54-g00ecf From 758c60e8366931906fdb61a1a6879441db20362d Mon Sep 17 00:00:00 2001 From: madblobfish Date: Fri, 13 Oct 2017 01:10:32 +0200 Subject: fintune swaymsg manpage Added a hint where to find the commands. Also indicate that command is itself not a command, --- swaymsg/swaymsg.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swaymsg/swaymsg.1.txt b/swaymsg/swaymsg.1.txt index 27813588..abc517c8 100644 --- a/swaymsg/swaymsg.1.txt +++ b/swaymsg/swaymsg.1.txt @@ -39,9 +39,11 @@ Options IPC Message Types ----------------- -*command*:: +**:: The message is a sway command (the same commands you can bind to keybindings in your sway config file). It will be executed immediately. + + + See **sway**(5) for a list of commands. *get_workspaces*:: Gets a JSON-encoded list of workspaces and their status. -- cgit v1.2.3-54-g00ecf From 03f8a8ae05dd79d2e8dee8ec7a70d10af34f9b80 Mon Sep 17 00:00:00 2001 From: David Zero Date: Thu, 12 Oct 2017 22:56:22 -0700 Subject: Update man 5 page Changes 'orientation' to 'default_orientation' to match commands.c --- sway/sway.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sway/sway.5.txt b/sway/sway.5.txt index 3b0cd531..731394dd 100644 --- a/sway/sway.5.txt +++ b/sway/sway.5.txt @@ -36,13 +36,13 @@ The following commands may only be used in the configuration file. + See **sway-bar**(5) for details. +**default_orientation** :: + Sets the default container layout for tiled containers. + **set** :: Sets variable $name to _value_. You can use the new variable in the arguments of future commands. -**orientation** :: - Sets the default container layout for tiled containers. - The following commands cannot be used directly in the configuration file. They are expected to be used with **bindsym** or at runtime through **swaymsg**(1). -- cgit v1.2.3-54-g00ecf From 2588dede77303010ebfd14d8882eed4bcb656a1a Mon Sep 17 00:00:00 2001 From: Johannes Lundberg Date: Sat, 14 Oct 2017 19:09:48 +0200 Subject: Change install folder for man pages --- CMake/Manpage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/Manpage.cmake b/CMake/Manpage.cmake index cc04d710..bbd6f2dc 100644 --- a/CMake/Manpage.cmake +++ b/CMake/Manpage.cmake @@ -26,7 +26,7 @@ if (A2X_FOUND) install( FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section} - DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/man/man${section} + DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man${section} COMPONENT documentation ) endfunction() -- cgit v1.2.3-54-g00ecf From 5a63f0f57b056a92dcc9c596d7c4856322df52d0 Mon Sep 17 00:00:00 2001 From: Johannes Lundberg Date: Sat, 14 Oct 2017 19:39:15 +0200 Subject: Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration. --- sway/ipc-server.c | 4 ++++ swaybar/status_line.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 4ce2b7eb..b560b930 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -1,6 +1,10 @@ // See https://i3wm.org/docs/ipc.html for protocol information +#ifndef __FreeBSD__ +// Any value will hide SOCK_CLOEXEC on FreeBSD (__BSD_VISIBLE=0) #define _XOPEN_SOURCE 700 +#endif + #include #include #include diff --git a/swaybar/status_line.c b/swaybar/status_line.c index e0564c26..cc324fdb 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 700 #include #include #include -- cgit v1.2.3-54-g00ecf From 93fe8ae705544ac6f9b08dcfe384074762995bed Mon Sep 17 00:00:00 2001 From: madblobfish Date: Sat, 14 Oct 2017 21:39:53 +0200 Subject: Various manpage edits Fix some spelling mistakes, missing punctuation and made some paragraphs more clear. --- sway/sway-bar.5.txt | 10 +++++----- sway/sway-input.5.txt | 6 +++--- sway/sway-security.7.txt | 19 +++++++++---------- sway/sway.1.txt | 23 +++++++++++++---------- sway/sway.5.txt | 32 ++++++++++++++++---------------- 5 files changed, 46 insertions(+), 44 deletions(-) diff --git a/sway/sway-bar.5.txt b/sway/sway-bar.5.txt index 29487662..99238952 100644 --- a/sway/sway-bar.5.txt +++ b/sway/sway-bar.5.txt @@ -11,8 +11,8 @@ sway-bar - bar configuration file and commands Description ----------- -Sway allows for configuration of swaybar within the sway configuation file. -Swaybar commands must be used inside a _bar { }_ block in the config. +Sway allows configuring swaybar in the sway configuration file. +Swaybar commands must be used inside a _bar { }_ block in the config file. Commands @@ -77,15 +77,15 @@ codes in this manner. **activate_button**