aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/swaylock/swaylock.h3
-rw-r--r--swaylock/main.c27
-rw-r--r--swaylock/swaylock.1.txt8
3 files changed, 28 insertions, 10 deletions
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index 06533108..eeed094e 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -56,6 +56,9 @@ struct lock_config {
struct lock_colors validating;
struct lock_colors invalid;
} colors;
+
+ int radius;
+ int thickness;
};
void render(struct render_data* render_data, struct lock_config *config);
diff --git a/swaylock/main.c b/swaylock/main.c
index 47592409..e624df46 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -81,6 +81,9 @@ struct lock_config *init_config() {
config->colors.invalid.inner_ring = 0xFA0000BF;
config->colors.invalid.outer_ring = 0x7D3300FF;
+ config->radius = 50;
+ config->thickness = 10;
+
return config;
}
@@ -383,6 +386,8 @@ int main(int argc, char **argv) {
{"separatorcolor", required_argument, NULL, 0},
{"keyhlcolor", required_argument, NULL, 0},
{"bshlcolor", required_argument, NULL, 0},
+ {"indicator-radius", required_argument, NULL, 0},
+ {"indicator-thickness", required_argument, NULL, 0},
{0, 0, 0, 0}
};
@@ -509,6 +514,10 @@ int main(int argc, char **argv) {
config->colors.input_cursor = parse_color(optarg);
} else if (strcmp(long_options[option_index].name, "bshlcolor") == 0) {
config->colors.backspace_cursor = parse_color(optarg);
+ } else if (strcmp(long_options[option_index].name, "indicator-radius") == 0) {
+ config->radius = atoi(optarg);
+ } else if (strcmp(long_options[option_index].name, "indicator-thickness") == 0) {
+ config->thickness = atoi(optarg);
}
break;
default:
@@ -678,16 +687,14 @@ void render(struct render_data *render_data, struct lock_config *config) {
cairo_identity_matrix(window->cairo);
// Draw specific values (copied from i3)
- const int ARC_RADIUS = 50;
- const int ARC_THICKNESS = 10;
const float TYPE_INDICATOR_RANGE = M_PI / 3.0f;
const float TYPE_INDICATOR_BORDER_THICKNESS = M_PI / 128.0f;
// Add visual indicator
if (show_indicator && render_data->auth_state != AUTH_STATE_IDLE) {
// Draw circle
- cairo_set_line_width(window->cairo, ARC_THICKNESS);
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS, 0, 2 * M_PI);
+ cairo_set_line_width(window->cairo, config->thickness);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, 0, 2 * M_PI);
switch (render_data->auth_state) {
case AUTH_STATE_INPUT:
case AUTH_STATE_BACKSPACE: {
@@ -715,7 +722,7 @@ void render(struct render_data *render_data, struct lock_config *config) {
char *text = NULL;
cairo_set_source_u32(window->cairo, config->colors.text);
cairo_select_font_face(window->cairo, config->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
- cairo_set_font_size(window->cairo, ARC_RADIUS/3.0f);
+ cairo_set_font_size(window->cairo, config->radius/3.0f);
switch (render_data->auth_state) {
case AUTH_STATE_VALIDATING:
text = "verifying";
@@ -744,7 +751,7 @@ void render(struct render_data *render_data, struct lock_config *config) {
if (render_data->auth_state == AUTH_STATE_INPUT || render_data->auth_state == AUTH_STATE_BACKSPACE) {
static double highlight_start = 0;
highlight_start += (rand() % (int)(M_PI * 100)) / 100.0 + M_PI * 0.5;
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS, highlight_start, highlight_start + TYPE_INDICATOR_RANGE);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start, highlight_start + TYPE_INDICATOR_RANGE);
if (render_data->auth_state == AUTH_STATE_INPUT) {
cairo_set_source_u32(window->cairo, config->colors.input_cursor);
} else {
@@ -754,10 +761,10 @@ void render(struct render_data *render_data, struct lock_config *config) {
// Draw borders
cairo_set_source_u32(window->cairo, config->colors.separator);
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS, highlight_start, highlight_start + TYPE_INDICATOR_BORDER_THICKNESS);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start, highlight_start + TYPE_INDICATOR_BORDER_THICKNESS);
cairo_stroke(window->cairo);
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS, highlight_start + TYPE_INDICATOR_RANGE, (highlight_start + TYPE_INDICATOR_RANGE) + TYPE_INDICATOR_BORDER_THICKNESS);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start + TYPE_INDICATOR_RANGE, (highlight_start + TYPE_INDICATOR_RANGE) + TYPE_INDICATOR_BORDER_THICKNESS);
cairo_stroke(window->cairo);
}
@@ -793,9 +800,9 @@ void render(struct render_data *render_data, struct lock_config *config) {
}
// Draw inner + outer border of the circle
cairo_set_line_width(window->cairo, 2.0);
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS - ARC_THICKNESS/2, 0, 2*M_PI);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius - config->thickness/2, 0, 2*M_PI);
cairo_stroke(window->cairo);
- cairo_arc(window->cairo, wwidth/2, wheight/2, ARC_RADIUS + ARC_THICKNESS/2, 0, 2*M_PI);
+ cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius + config->thickness/2, 0, 2*M_PI);
cairo_stroke(window->cairo);
}
window_render(window);
diff --git a/swaylock/swaylock.1.txt b/swaylock/swaylock.1.txt
index 0e503f29..4c462794 100644
--- a/swaylock/swaylock.1.txt
+++ b/swaylock/swaylock.1.txt
@@ -95,6 +95,14 @@ Appearance
*--textcolor* <rrggbb[aa]>::
Sets the color of the text inside the indicator.
+*--indicator-radius* <radius>::
+ Sets the radius of the indicator to _radius_ pixels. The default value is
+ 50.
+
+*--indicator-thickness* <thickness>::
+ Sets the thickness of the indicator to _thickness_ pixels. The default value
+ is 10.
+
Authors
-------
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 06:48:45 +0000