From 783ceb7937c5771322003193e75a1b24e9eb2247 Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Fri, 19 May 2023 01:35:21 -0400 Subject: [PATCH] use config functions --- include/sway/config.h | 2 ++ sway/config.c | 4 ++++ sway/desktop/render.c | 16 ++-------------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/sway/config.h b/include/sway/config.h index 0e56445c..04e2969e 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -767,6 +767,8 @@ int config_get_blur_size(); bool config_should_parameters_blur(); +bool config_should_parameters_shadow(); + /* Global config singleton. */ extern struct sway_config *config; diff --git a/sway/config.c b/sway/config.c index 13aa3089..fbcf94a4 100644 --- a/sway/config.c +++ b/sway/config.c @@ -1101,3 +1101,7 @@ int config_get_blur_size() { bool config_should_parameters_blur() { return config->blur_params.radius > 0 && config->blur_params.num_passes > 0; } + +bool config_should_parameters_shadow() { + return config->shadow_blur_sigma > 0 && config->shadow_color[3] > 0.0; +} diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 0971b843..d2ef8324 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -45,18 +45,6 @@ struct decoration_data get_undecorated_decoration_data() { }; } -int get_blur_size() { - return pow(2, config->blur_params.num_passes) * config->blur_params.radius; -} - -bool should_parameters_blur() { - return config->blur_params.radius > 0 && config->blur_params.num_passes > 0; -} - -bool should_parameters_shadow() { - return config->shadow_blur_sigma > 0 && config->shadow_color[3] > 0.0; -} - // TODO: contribute wlroots function to allow creating an fbox from a box? struct wlr_fbox wlr_fbox_from_wlr_box(struct wlr_box *box) { return (struct wlr_fbox) { @@ -471,7 +459,7 @@ static void render_surface_iterator(struct sway_output *output, */ // render blur - if (deco_data.blur && should_parameters_blur() && !is_subsurface) { + if (deco_data.blur && config_should_parameters_blur() && !is_subsurface) { pixman_region32_t opaque_region; pixman_region32_init(&opaque_region); @@ -523,7 +511,7 @@ static void render_layer_iterator(struct sway_output *output, bool is_subsurface = view ? view->surface != surface : false; // render shadow - if (deco_data.shadow && should_parameters_shadow() && !is_subsurface) { + if (deco_data.shadow && config_should_parameters_shadow() && !is_subsurface) { int corner_radius = deco_data.corner_radius; render_box_shadow(output, output_damage, &dst_box, config->shadow_color, config->shadow_blur_sigma, corner_radius);