From 2d6944dc1481003b4e02e656b2d7a2d4d6db58c6 Mon Sep 17 00:00:00 2001 From: eri Date: Mon, 23 Oct 2023 16:58:47 +0200 Subject: [PATCH] feat: add shadow color for inactive windows (#230) --- README.md | 1 + include/sway/commands.h | 1 + include/sway/config.h | 1 + sway/commands.c | 1 + sway/commands/shadow_color.c | 3 +++ sway/commands/shadow_inactive_color.c | 25 +++++++++++++++++++++++++ sway/config.c | 1 + sway/desktop/render.c | 4 +++- sway/meson.build | 1 + sway/sway.5.scd | 3 +++ 10 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 sway/commands/shadow_inactive_color.c diff --git a/README.md b/README.md index f69e2cb2..7c6938ec 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Sway is an incredible window manager, and certainly one of the most well establi - `shadows_on_csd enable|disable` (**Note**: The shadow might not fit some windows) - `shadow_blur_radius ` - `shadow_color ex, #0000007F` + - `shadow_inactive_color ex, #0000007F` + LayerShell effects (to blur panels / notifications etc): - `layer_effects ` - The current layer namespaces can be shown with `swaymsg -r -t get_outputs | jq '.[0].layer_shell_surfaces | .[] | .namespace'` diff --git a/include/sway/commands.h b/include/sway/commands.h index 920e8596..b4166284 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -192,6 +192,7 @@ sway_cmd cmd_set; sway_cmd cmd_shortcuts_inhibitor; sway_cmd cmd_shadow_blur_radius; sway_cmd cmd_shadow_color; +sway_cmd cmd_shadow_inactive_color; sway_cmd cmd_shadows; sway_cmd cmd_shadows_on_csd; sway_cmd cmd_show_marks; diff --git a/include/sway/config.h b/include/sway/config.h index 04e2969e..9f23bacf 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -492,6 +492,7 @@ struct sway_config { bool shadows_on_csd_enabled; int shadow_blur_sigma; float shadow_color[4]; + float shadow_inactive_color[4]; bool blur_enabled; bool blur_xray; diff --git a/sway/commands.c b/sway/commands.c index 34bb08c3..3927fb2f 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -96,6 +96,7 @@ static const struct cmd_handler handlers[] = { { "set", cmd_set }, { "shadow_blur_radius", cmd_shadow_blur_radius }, { "shadow_color", cmd_shadow_color }, + { "shadow_inactive_color", cmd_shadow_inactive_color }, { "shadows", cmd_shadows }, { "shadows_on_csd", cmd_shadows_on_csd }, { "show_marks", cmd_show_marks }, diff --git a/sway/commands/shadow_color.c b/sway/commands/shadow_color.c index 02952bdd..d7c8fefa 100644 --- a/sway/commands/shadow_color.c +++ b/sway/commands/shadow_color.c @@ -17,6 +17,9 @@ struct cmd_results *cmd_shadow_color(int argc, char **argv) { return cmd_results_new(CMD_INVALID, "Invalid %s color %s", "shadow_color", argv[0]); } + if (memcmp(config->shadow_color, config->shadow_inactive_color, sizeof(config->shadow_color)) == 0) { + color_to_rgba(config->shadow_inactive_color, color); + } color_to_rgba(config->shadow_color, color); arrange_root(); diff --git a/sway/commands/shadow_inactive_color.c b/sway/commands/shadow_inactive_color.c new file mode 100644 index 00000000..6ad207e5 --- /dev/null +++ b/sway/commands/shadow_inactive_color.c @@ -0,0 +1,25 @@ +#include "log.h" +#include "sway/commands.h" +#include "sway/config.h" +#include "sway/output.h" +#include "sway/tree/arrange.h" +#include "sway/tree/container.h" +#include "util.h" + +struct cmd_results *cmd_shadow_inactive_color(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "shadow_inactive_color", EXPECTED_AT_LEAST, 1))) { + return error; + } + + uint32_t color; + if (!parse_color(argv[0], &color)) { + return cmd_results_new(CMD_INVALID, "Invalid %s color %s", + "shadow_inactive_color", argv[0]); + } + color_to_rgba(config->shadow_inactive_color, color); + + arrange_root(); + + return cmd_results_new(CMD_SUCCESS, NULL); +} diff --git a/sway/config.c b/sway/config.c index 82085d03..7cb84496 100644 --- a/sway/config.c +++ b/sway/config.c @@ -352,6 +352,7 @@ static void config_defaults(struct sway_config *config) { config->shadows_on_csd_enabled = false; config->shadow_blur_sigma = 20.0f; color_to_rgba(config->shadow_color, 0x0000007F); + color_to_rgba(config->shadow_inactive_color, 0x0000007F); config->blur_enabled = false; config->blur_xray = false; diff --git a/sway/desktop/render.c b/sway/desktop/render.c index f5f697c4..43abc81c 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -884,7 +884,9 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, scale_box(&box, output_scale); int scaled_corner_radius = deco_data.corner_radius == 0 ? 0 : (deco_data.corner_radius + state->border_thickness) * output_scale; - render_box_shadow(output, damage, &box, config->shadow_color, config->shadow_blur_sigma, + float* shadow_color = view_is_urgent(view) || state->focused ? + config->shadow_color : config->shadow_inactive_color; + render_box_shadow(output, damage, &box, shadow_color, config->shadow_blur_sigma, scaled_corner_radius); } diff --git a/sway/meson.build b/sway/meson.build index 528cdd99..1bc0c19c 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -123,6 +123,7 @@ sway_sources = files( 'commands/set.c', 'commands/shadow_blur_radius.c', 'commands/shadow_color.c', + 'commands/shadow_inactive_color.c', 'commands/shadows.c', 'commands/shadows_on_csd.c', 'commands/show_marks.c', diff --git a/sway/sway.5.scd b/sway/sway.5.scd index a68eee5c..0352b403 100644 --- a/sway/sway.5.scd +++ b/sway/sway.5.scd @@ -686,6 +686,9 @@ The default colors are: *shadow_color* The shadow color. Default color: #0000007F +*shadow_inactive_color* + The shadow color for inactive windows. Default value: *shadow_color* + *blur* enable|disable Sets whether blur should be drawn. Can also be set per window with *for_window*.