From f2c209c299889ad965ac995049704b1c46176c6d Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Tue, 1 May 2018 15:40:28 +0200 Subject: [PATCH 01/15] Install swaybar and swaybg under /usr/lib/sway --- swaybar/meson.build | 3 ++- swaybg/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/swaybar/meson.build b/swaybar/meson.build index d65edb11e..f115ffa29 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -24,5 +24,6 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true + install: true, + install_dir: 'usr/lib/sway' ) diff --git a/swaybg/meson.build b/swaybg/meson.build index 8704de6d3..c1bb7d180 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -14,5 +14,6 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true + install: true, + install_dir: 'usr/lib/sway' ) From 7709340727fe2834f87b43aeeaef878694d5acd6 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Tue, 1 May 2018 16:17:10 +0200 Subject: [PATCH 02/15] exec_always: Search for executables in /usr/lib/sway --- sway/commands/exec_always.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index af4e4965a..af4bd7399 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -51,7 +51,41 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((pid = fork()) == 0) { // Fork child process again setsid(); + if ((*child = fork()) == 0) { + // Acquire the current PATH + char *path = getenv("PATH"); + const char *extra_path = ":/usr/lib/sway"; + const size_t extra_size = sizeof("/usr/lib/sway") + 1; + + if (!path) { + size_t n = confstr(_CS_PATH, NULL, 0); + path = malloc(n + extra_size); + if (!path) { + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); + } + confstr(_CS_PATH, path, n); + + } else { + size_t n = strlen(path) + 1; + char *tmp = malloc(n + extra_size); + if (!tmp) { + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); + } + + strncpy(tmp, path, n); + path = tmp; + } + + // Append /usr/lib/sway to PATH + strcat(path, extra_path); + if (!setenv("PATH", path, 1)) { + free(path); + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH"); + } + free(path); + + // Execute the command execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL); // Not reached } From 1670b46bf6e56d37e69ab0fa32c6799e83397020 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Tue, 1 May 2018 16:49:15 +0200 Subject: [PATCH 03/15] Make the LIBDIR path configurable --- meson.build | 7 +++++++ meson_options.txt | 1 + sway/commands/exec_always.c | 4 ++-- swaybar/meson.build | 2 +- swaybg/meson.build | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bf266e5f9..57dbea02e 100644 --- a/meson.build +++ b/meson.build @@ -19,6 +19,13 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') +instlibdir = get_option('instlibdir') + +if instlibdir == '' + instlibdir = join_paths(prefix, 'lib/sway') +endif +add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') + jsonc = dependency('json-c', version: '>=0.13') pcre = dependency('libpcre') diff --git a/meson_options.txt b/meson_options.txt index 541ccf138..6c3dcd584 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index af4bd7399..3f3a7940a 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":/usr/lib/sway"; - const size_t extra_size = sizeof("/usr/lib/sway") + 1; + const char *extra_path = ":" INSTLIBDIR; + const size_t extra_size = sizeof(INSTLIBDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index f115ffa29..ad7ed5fe1 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -25,5 +25,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: 'usr/lib/sway' + install_dir: instlibdir ) diff --git a/swaybg/meson.build b/swaybg/meson.build index c1bb7d180..e994da8fd 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -15,5 +15,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: 'usr/lib/sway' + install_dir: instlibdir ) From 830c4ef74c00dbe448da46cdbc576178abc5728e Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Tue, 1 May 2018 20:47:55 +0200 Subject: [PATCH 04/15] Meson: Replace option `instlibdir` with `libexecdir` Derive a value from it, called `rundir` rather than writing join_paths(libexecdir, 'sway') all over the place. --- meson.build | 9 +++++---- meson_options.txt | 1 - sway/commands/exec_always.c | 4 ++-- swaybar/meson.build | 2 +- swaybg/meson.build | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 57dbea02e..bd20ca993 100644 --- a/meson.build +++ b/meson.build @@ -19,12 +19,13 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') -instlibdir = get_option('instlibdir') +libexecdir = get_option('libexecdir') -if instlibdir == '' - instlibdir = join_paths(prefix, 'lib/sway') +if libexecdir == '' + libexecdir = 'lib' endif -add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') +sway_libexecdir = join_paths(prefix, libexecdir, 'sway') +add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') jsonc = dependency('json-c', version: '>=0.13') diff --git a/meson_options.txt b/meson_options.txt index 6c3dcd584..541ccf138 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 3f3a7940a..aaee940ba 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" INSTLIBDIR; - const size_t extra_size = sizeof(INSTLIBDIR) + 1; + const char *extra_path = ":" SWAY_LIBEXECDIR; + const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index ad7ed5fe1..41c81a88c 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -25,5 +25,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: sway_libexecdir ) diff --git a/swaybg/meson.build b/swaybg/meson.build index e994da8fd..716178d2b 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -15,5 +15,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: sway_libexecdir ) From 177c67e6b89404d9d477b82c00c1353cd4696096 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Wed, 2 May 2018 12:33:16 +0200 Subject: [PATCH 05/15] command/exec_always: Use wlr_log for logging errors in the child process --- sway/commands/exec_always.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index aaee940ba..b30786405 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -11,6 +11,7 @@ #include "log.h" #include "stringop.h" + struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *error = NULL; if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); @@ -62,7 +63,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { size_t n = confstr(_CS_PATH, NULL, 0); path = malloc(n + extra_size); if (!path) { - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); + wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); + exit(EXIT_FAILURE); } confstr(_CS_PATH, path, n); @@ -70,7 +72,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { size_t n = strlen(path) + 1; char *tmp = malloc(n + extra_size); if (!tmp) { - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); + wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); + exit(EXIT_FAILURE); } strncpy(tmp, path, n); @@ -81,7 +84,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { strcat(path, extra_path); if (!setenv("PATH", path, 1)) { free(path); - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH"); + wlr_log(L_ERROR, "exec_always: Unable to set PATH"); + exit(EXIT_FAILURE); } free(path); From b4249166f309a46c15dd3a5734594aee961b723b Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Sat, 5 May 2018 17:05:27 +0200 Subject: [PATCH 06/15] security.d: Update install paths for swaybar and swaybg --- meson.build | 1 + security.d/00-defaults.in | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index bd20ca993..e40dc33c7 100644 --- a/meson.build +++ b/meson.build @@ -121,6 +121,7 @@ config = configuration_data() config.set('sysconfdir', join_paths(prefix, sysconfdir)) config.set('datadir', join_paths(prefix, datadir)) config.set('prefix', prefix) +config.set('sway_libexecdir', sway_libexecdir) configure_file( configuration: config, diff --git a/security.d/00-defaults.in b/security.d/00-defaults.in index e46264773..b5ae11492 100644 --- a/security.d/00-defaults.in +++ b/security.d/00-defaults.in @@ -11,9 +11,9 @@ # Configures enabled compositor features for specific programs permit * fullscreen keyboard mouse permit @prefix@/bin/swaylock lock -permit @prefix@/bin/swaybg background permit @prefix@/bin/swaygrab screenshot -permit @prefix@/bin/swaybar panel +permit @sway_libexecdir@/swaybg background +permit @sway_libexecdir@/swaybar panel # Configures enabled IPC features for specific programs ipc @prefix@/bin/swaymsg { @@ -24,7 +24,7 @@ ipc @prefix@/bin/swaymsg { } } -ipc @prefix@/bin/swaybar { +ipc @sway_libexecdir@/swaybar { bar-config enabled outputs enabled workspaces enabled From cb2a3e90360ed852f3ee46dfef3d28e69f4c3346 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Sat, 5 May 2018 20:40:34 +0200 Subject: [PATCH 07/15] swaymsg: Fix spelling in error message --- swaymsg/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swaymsg/main.c b/swaymsg/main.c index c9be3a864..7e3622d97 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -32,7 +32,7 @@ static void pretty_print_cmd(json_object *r) { if (!success(r, true)) { json_object *error; if (!json_object_object_get_ex(r, "error", &error)) { - printf("An unknkown error occured"); + printf("An unknkown error occurred"); } else { printf("Error: %s\n", json_object_get_string(error)); } From 1daf69477e1a7c36a8a57ccc4d7fe6cf70736a88 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 6 May 2018 08:16:34 +1000 Subject: [PATCH 08/15] Fix PATH setenv() in exec_always --- sway/commands/exec_always.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index b30786405..f631d7d8a 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -82,7 +82,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { // Append /usr/lib/sway to PATH strcat(path, extra_path); - if (!setenv("PATH", path, 1)) { + if (setenv("PATH", path, 1) == -1) { free(path); wlr_log(L_ERROR, "exec_always: Unable to set PATH"); exit(EXIT_FAILURE); From 556ff5f50efe7372f0147339d6c26ed7008acfd2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 5 May 2018 12:53:49 +1000 Subject: [PATCH 09/15] Implement pango support Implements support for the pango: prefix in the font command. Closes #1903. --- include/sway/config.h | 1 + sway/commands/font.c | 11 ++++++++++- sway/tree/container.c | 7 ++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/sway/config.h b/include/sway/config.h index fa40ef4e4..a0e7e81f1 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -305,6 +305,7 @@ struct sway_config { enum sway_container_layout default_layout; char *font; size_t font_height; + bool pango_markup; // Flags bool focus_follows_mouse; diff --git a/sway/commands/font.c b/sway/commands/font.c index 8e0b51e39..3071ccd81 100644 --- a/sway/commands/font.c +++ b/sway/commands/font.c @@ -12,7 +12,16 @@ struct cmd_results *cmd_font(int argc, char **argv) { } char *font = join_args(argv, argc); free(config->font); - config->font = strdup(font); + + if (strncmp(font, "pango:", 6) == 0) { + config->pango_markup = true; + config->font = strdup(font + 6); + } else { + config->pango_markup = false; + config->font = strdup(font); + } + + free(font); config_update_font_height(true); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/tree/container.c b/sway/tree/container.c index e1be32d15..38db29c2f 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -580,7 +580,7 @@ static void update_title_texture(struct sway_container *con, int height = config->font_height * scale; cairo_t *c = cairo_create(NULL); - get_text_size(c, config->font, &width, NULL, scale, false, + get_text_size(c, config->font, &width, NULL, scale, config->pango_markup, "%s", con->formatted_title); cairo_destroy(c); @@ -596,7 +596,8 @@ static void update_title_texture(struct sway_container *con, class->text[2], class->text[3]); cairo_move_to(cairo, 0, 0); - pango_printf(cairo, config->font, scale, false, "%s", con->formatted_title); + pango_printf(cairo, config->font, scale, config->pango_markup, + "%s", con->formatted_title); cairo_surface_flush(surface); unsigned char *data = cairo_image_surface_get_data(surface); @@ -628,7 +629,7 @@ void container_calculate_title_height(struct sway_container *container) { } cairo_t *cairo = cairo_create(NULL); int height; - get_text_size(cairo, config->font, NULL, &height, 1, false, + get_text_size(cairo, config->font, NULL, &height, 1, config->pango_markup, "%s", container->formatted_title); cairo_destroy(cairo); container->title_height = height; From ac903c87522ce47acbbce82f015720554b5f5dab Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:12 +0100 Subject: [PATCH 10/15] Revert "security.d: Update install paths for swaybar and swaybg" This reverts commit b4249166f309a46c15dd3a5734594aee961b723b. --- meson.build | 1 - security.d/00-defaults.in | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e40dc33c7..bd20ca993 100644 --- a/meson.build +++ b/meson.build @@ -121,7 +121,6 @@ config = configuration_data() config.set('sysconfdir', join_paths(prefix, sysconfdir)) config.set('datadir', join_paths(prefix, datadir)) config.set('prefix', prefix) -config.set('sway_libexecdir', sway_libexecdir) configure_file( configuration: config, diff --git a/security.d/00-defaults.in b/security.d/00-defaults.in index b5ae11492..e46264773 100644 --- a/security.d/00-defaults.in +++ b/security.d/00-defaults.in @@ -11,9 +11,9 @@ # Configures enabled compositor features for specific programs permit * fullscreen keyboard mouse permit @prefix@/bin/swaylock lock +permit @prefix@/bin/swaybg background permit @prefix@/bin/swaygrab screenshot -permit @sway_libexecdir@/swaybg background -permit @sway_libexecdir@/swaybar panel +permit @prefix@/bin/swaybar panel # Configures enabled IPC features for specific programs ipc @prefix@/bin/swaymsg { @@ -24,7 +24,7 @@ ipc @prefix@/bin/swaymsg { } } -ipc @sway_libexecdir@/swaybar { +ipc @prefix@/bin/swaybar { bar-config enabled outputs enabled workspaces enabled From cf602687c6c77b3292370d0639ab5080b7fd611b Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:29 +0100 Subject: [PATCH 11/15] Revert "command/exec_always: Use wlr_log for logging errors in the child process" This reverts commit 177c67e6b89404d9d477b82c00c1353cd4696096. --- sway/commands/exec_always.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index f631d7d8a..1d95dc967 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -11,7 +11,6 @@ #include "log.h" #include "stringop.h" - struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *error = NULL; if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); @@ -63,8 +62,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { size_t n = confstr(_CS_PATH, NULL, 0); path = malloc(n + extra_size); if (!path) { - wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); - exit(EXIT_FAILURE); + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); } confstr(_CS_PATH, path, n); @@ -72,8 +70,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { size_t n = strlen(path) + 1; char *tmp = malloc(n + extra_size); if (!tmp) { - wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); - exit(EXIT_FAILURE); + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); } strncpy(tmp, path, n); @@ -84,8 +81,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { strcat(path, extra_path); if (setenv("PATH", path, 1) == -1) { free(path); - wlr_log(L_ERROR, "exec_always: Unable to set PATH"); - exit(EXIT_FAILURE); + return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH"); } free(path); From 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:43 +0100 Subject: [PATCH 12/15] Revert "Meson: Replace option `instlibdir` with `libexecdir`" This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e. --- meson.build | 9 ++++----- meson_options.txt | 1 + sway/commands/exec_always.c | 4 ++-- swaybar/meson.build | 2 +- swaybg/meson.build | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index bd20ca993..57dbea02e 100644 --- a/meson.build +++ b/meson.build @@ -19,13 +19,12 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') -libexecdir = get_option('libexecdir') +instlibdir = get_option('instlibdir') -if libexecdir == '' - libexecdir = 'lib' +if instlibdir == '' + instlibdir = join_paths(prefix, 'lib/sway') endif -sway_libexecdir = join_paths(prefix, libexecdir, 'sway') -add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') +add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') jsonc = dependency('json-c', version: '>=0.13') diff --git a/meson_options.txt b/meson_options.txt index 541ccf138..6c3dcd584 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 1d95dc967..8483cf26a 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" SWAY_LIBEXECDIR; - const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1; + const char *extra_path = ":" INSTLIBDIR; + const size_t extra_size = sizeof(INSTLIBDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index 41c81a88c..ad7ed5fe1 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -25,5 +25,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: sway_libexecdir + install_dir: instlibdir ) diff --git a/swaybg/meson.build b/swaybg/meson.build index 716178d2b..e994da8fd 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -15,5 +15,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: sway_libexecdir + install_dir: instlibdir ) From 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:52 +0100 Subject: [PATCH 13/15] Revert "Make the LIBDIR path configurable" This reverts commit 1670b46bf6e56d37e69ab0fa32c6799e83397020. --- meson.build | 7 ------- meson_options.txt | 1 - sway/commands/exec_always.c | 4 ++-- swaybar/meson.build | 2 +- swaybg/meson.build | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 57dbea02e..bf266e5f9 100644 --- a/meson.build +++ b/meson.build @@ -19,13 +19,6 @@ is_freebsd = host_machine.system().startswith('freebsd') datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') prefix = get_option('prefix') -instlibdir = get_option('instlibdir') - -if instlibdir == '' - instlibdir = join_paths(prefix, 'lib/sway') -endif -add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') - jsonc = dependency('json-c', version: '>=0.13') pcre = dependency('libpcre') diff --git a/meson_options.txt b/meson_options.txt index 6c3dcd584..541ccf138 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 8483cf26a..16bbcb612 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" INSTLIBDIR; - const size_t extra_size = sizeof(INSTLIBDIR) + 1; + const char *extra_path = ":/usr/lib/sway"; + const size_t extra_size = sizeof("/usr/lib/sway") + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); diff --git a/swaybar/meson.build b/swaybar/meson.build index ad7ed5fe1..f115ffa29 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -25,5 +25,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: 'usr/lib/sway' ) diff --git a/swaybg/meson.build b/swaybg/meson.build index e994da8fd..c1bb7d180 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -15,5 +15,5 @@ executable( ], link_with: [lib_sway_common, lib_sway_client], install: true, - install_dir: instlibdir + install_dir: 'usr/lib/sway' ) From b592351eeff55a0a95f9b65d403fcfda9cf02957 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:20:49 +0100 Subject: [PATCH 14/15] Revert "exec_always: Search for executables in /usr/lib/sway" This reverts commit 7709340727fe2834f87b43aeeaef878694d5acd6. --- sway/commands/exec_always.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 16bbcb612..af4e4965a 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -51,41 +51,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((pid = fork()) == 0) { // Fork child process again setsid(); - if ((*child = fork()) == 0) { - // Acquire the current PATH - char *path = getenv("PATH"); - const char *extra_path = ":/usr/lib/sway"; - const size_t extra_size = sizeof("/usr/lib/sway") + 1; - - if (!path) { - size_t n = confstr(_CS_PATH, NULL, 0); - path = malloc(n + extra_size); - if (!path) { - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); - } - confstr(_CS_PATH, path, n); - - } else { - size_t n = strlen(path) + 1; - char *tmp = malloc(n + extra_size); - if (!tmp) { - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH"); - } - - strncpy(tmp, path, n); - path = tmp; - } - - // Append /usr/lib/sway to PATH - strcat(path, extra_path); - if (setenv("PATH", path, 1) == -1) { - free(path); - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH"); - } - free(path); - - // Execute the command execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL); // Not reached } From 3b6629af3c268fd0dd6f42feaf3429bb25cfcb6f Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:20:57 +0100 Subject: [PATCH 15/15] Revert "Install swaybar and swaybg under /usr/lib/sway" This reverts commit f2c209c299889ad965ac995049704b1c46176c6d. --- swaybar/meson.build | 3 +-- swaybg/meson.build | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/swaybar/meson.build b/swaybar/meson.build index f115ffa29..d65edb11e 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -24,6 +24,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true, - install_dir: 'usr/lib/sway' + install: true ) diff --git a/swaybg/meson.build b/swaybg/meson.build index c1bb7d180..8704de6d3 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -14,6 +14,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install: true, - install_dir: 'usr/lib/sway' + install: true )