pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add fixed font-size option for indicator

Browse Source 
This commit adds a new command line option called --font-size to
specify a fixed font size in the indicator. The default value for
font-size is 0, which means that the text will autoscale. Any other
positive value will result in a fixed text size.
This commit is contained in:
Peter Kasza 2019-05-05 11:29:44 +02:00 committed by Drew DeVault
parent 84bfc6c7ed
commit 183d1bd549
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/swaylock.h
View File

@ -47,6 +47,7 @@ struct swaylock_args {
struct swaylock_colors colors; struct swaylock_colors colors;
enum background_mode mode; enum background_mode mode;
char *font; char *font;
uint32_t font_size;
uint32_t radius; uint32_t radius;
uint32_t thickness; uint32_t thickness;
bool ignore_empty; bool ignore_empty;

10
main.c
View File

@ -504,6 +504,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
LO_CAPS_LOCK_BS_HL_COLOR, LO_CAPS_LOCK_BS_HL_COLOR,
LO_CAPS_LOCK_KEY_HL_COLOR, LO_CAPS_LOCK_KEY_HL_COLOR,
LO_FONT, LO_FONT,
LO_FONT_SIZE,
LO_IND_RADIUS, LO_IND_RADIUS,
LO_IND_THICKNESS, LO_IND_THICKNESS,
LO_INSIDE_COLOR, LO_INSIDE_COLOR,
@ -557,6 +558,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
{"caps-lock-bs-hl-color", required_argument, NULL, LO_CAPS_LOCK_BS_HL_COLOR}, {"caps-lock-bs-hl-color", required_argument, NULL, LO_CAPS_LOCK_BS_HL_COLOR},
{"caps-lock-key-hl-color", required_argument, NULL, LO_CAPS_LOCK_KEY_HL_COLOR}, {"caps-lock-key-hl-color", required_argument, NULL, LO_CAPS_LOCK_KEY_HL_COLOR},
{"font", required_argument, NULL, LO_FONT}, {"font", required_argument, NULL, LO_FONT},
{"font-size", required_argument, NULL, LO_FONT_SIZE},
{"indicator-radius", required_argument, NULL, LO_IND_RADIUS}, {"indicator-radius", required_argument, NULL, LO_IND_RADIUS},
{"indicator-thickness", required_argument, NULL, LO_IND_THICKNESS}, {"indicator-thickness", required_argument, NULL, LO_IND_THICKNESS},
{"inside-color", required_argument, NULL, LO_INSIDE_COLOR}, {"inside-color", required_argument, NULL, LO_INSIDE_COLOR},
@ -632,6 +634,8 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
"Caps Lock is active.\n" "Caps Lock is active.\n"
" --font <font> " " --font <font> "
"Sets the font of the text.\n" "Sets the font of the text.\n"
" --font-size <size> "
"Sets a fixed font size for the indicator text.\n"
" --indicator-radius <radius> " " --indicator-radius <radius> "
"Sets the indicator radius.\n" "Sets the indicator radius.\n"
" --indicator-thickness <thick> " " --indicator-thickness <thick> "
@ -815,6 +819,11 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
state->args.font = strdup(optarg); state->args.font = strdup(optarg);
} }
break; break;
case LO_FONT_SIZE:
if (state) {
state->args.font_size = atoi(optarg);
}
break;
case LO_IND_RADIUS: case LO_IND_RADIUS:
if (state) { if (state) {
state->args.radius = strtol(optarg, NULL, 0); state->args.radius = strtol(optarg, NULL, 0);
@ -1064,6 +1073,7 @@ int main(int argc, char **argv) {
state.args = (struct swaylock_args){ state.args = (struct swaylock_args){
.mode = BACKGROUND_MODE_FILL, .mode = BACKGROUND_MODE_FILL,
.font = strdup("sans-serif"), .font = strdup("sans-serif"),
.font_size = 0,
.radius = 50, .radius = 50,
.thickness = 10, .thickness = 10,
.ignore_empty = false, .ignore_empty = false,

6
render.c
View File

@ -128,7 +128,11 @@ void render_frame(struct swaylock_surface *surface) {
set_color_for_state(cairo, state, &state->args.colors.text); set_color_for_state(cairo, state, &state->args.colors.text);
cairo_select_font_face(cairo, state->args.font, cairo_select_font_face(cairo, state->args.font,
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size(cairo, arc_radius / 3.0f); if (state->args.font_size > 0) {
cairo_set_font_size(cairo, state->args.font_size);
} else {
cairo_set_font_size(cairo, arc_radius / 3.0f);
}
switch (state->auth_state) { switch (state->auth_state) {
case AUTH_STATE_VALIDATING: case AUTH_STATE_VALIDATING:
text = "verifying"; text = "verifying";