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

Added option to adjust ring position via CLI arguments and the config file

Browse Source
This commit is contained in:
Matt Della 2019-11-27 16:43:16 -08:00 committed by Drew DeVault
parent 426e1ce93d
commit a7404e1096
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/swaylock.h
View File

@ -50,6 +50,10 @@ struct swaylock_args {
uint32_t font_size; uint32_t font_size;
uint32_t radius; uint32_t radius;
uint32_t thickness; uint32_t thickness;
uint32_t indicator_x_position;
uint32_t indicator_y_position;
bool override_indicator_x_position;
bool override_indicator_y_position;
bool ignore_empty; bool ignore_empty;
bool show_indicator; bool show_indicator;
bool show_caps_lock_text; bool show_caps_lock_text;

24
main.c
View File

@ -509,6 +509,8 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
LO_FONT_SIZE, LO_FONT_SIZE,
LO_IND_IDLE_VISIBLE, LO_IND_IDLE_VISIBLE,
LO_IND_RADIUS, LO_IND_RADIUS,
LO_IND_X_POSITION,
LO_IND_Y_POSITION,
LO_IND_THICKNESS, LO_IND_THICKNESS,
LO_INSIDE_COLOR, LO_INSIDE_COLOR,
LO_INSIDE_CLEAR_COLOR, LO_INSIDE_CLEAR_COLOR,
@ -564,6 +566,8 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
{"indicator-idle-visible", no_argument, NULL, LO_IND_IDLE_VISIBLE}, {"indicator-idle-visible", no_argument, NULL, LO_IND_IDLE_VISIBLE},
{"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},
{"indicator-x-position", required_argument, NULL, LO_IND_X_POSITION},
{"indicator-y-position", required_argument, NULL, LO_IND_Y_POSITION},
{"inside-color", required_argument, NULL, LO_INSIDE_COLOR}, {"inside-color", required_argument, NULL, LO_INSIDE_COLOR},
{"inside-clear-color", required_argument, NULL, LO_INSIDE_CLEAR_COLOR}, {"inside-clear-color", required_argument, NULL, LO_INSIDE_CLEAR_COLOR},
{"inside-caps-lock-color", required_argument, NULL, LO_INSIDE_CAPS_LOCK_COLOR}, {"inside-caps-lock-color", required_argument, NULL, LO_INSIDE_CAPS_LOCK_COLOR},
@ -645,6 +649,10 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
"Sets the indicator radius.\n" "Sets the indicator radius.\n"
" --indicator-thickness <thick> " " --indicator-thickness <thick> "
"Sets the indicator thickness.\n" "Sets the indicator thickness.\n"
" --indicator-x-position <x> "
"Sets the horizontal position of the indicator.\n"
" --indicator-y-position <y> "
"Sets the vertical position of the indicator.\n"
" --inside-color <color> " " --inside-color <color> "
"Sets the color of the inside of the indicator.\n" "Sets the color of the inside of the indicator.\n"
" --inside-clear-color <color> " " --inside-clear-color <color> "
@ -844,6 +852,18 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
state->args.thickness = strtol(optarg, NULL, 0); state->args.thickness = strtol(optarg, NULL, 0);
} }
break; break;
case LO_IND_X_POSITION:
if (state) {
state->args.override_indicator_x_position = true;
state->args.indicator_x_position = atoi(optarg);
}
break;
case LO_IND_Y_POSITION:
if (state) {
state->args.override_indicator_y_position = true;
state->args.indicator_y_position = atoi(optarg);
}
break;
case LO_INSIDE_COLOR: case LO_INSIDE_COLOR:
if (state) { if (state) {
state->args.colors.inside.input = parse_color(optarg); state->args.colors.inside.input = parse_color(optarg);
@ -1087,6 +1107,10 @@ int main(int argc, char **argv) {
.font_size = 0, .font_size = 0,
.radius = 50, .radius = 50,
.thickness = 10, .thickness = 10,
.indicator_x_position = 0,
.indicator_y_position = 0,
.override_indicator_x_position = false,
.override_indicator_y_position = false,
.ignore_empty = false, .ignore_empty = false,
.show_indicator = true, .show_indicator = true,
.show_caps_lock_indicator = false, .show_caps_lock_indicator = false,

24
render.c
View File

@ -80,10 +80,26 @@ void render_frame(struct swaylock_surface *surface) {
int new_width = buffer_diameter; int new_width = buffer_diameter;
int new_height = buffer_diameter; int new_height = buffer_diameter;
int subsurf_xpos = surface->width / 2 - int subsurf_xpos;
buffer_width / (2 * surface->scale) + 2 / surface->scale; int subsurf_ypos;
int subsurf_ypos = surface->height / 2 -
(state->args.radius + state->args.thickness); // Center the indicator unless overridden by the user
if (state->args.override_indicator_x_position) {
subsurf_xpos = state->args.indicator_x_position -
buffer_width / (2 * surface->scale) + 2 / surface->scale;
} else {
subsurf_xpos = surface->width / 2 -
buffer_width / (2 * surface->scale) + 2 / surface->scale;
}
if (state->args.override_indicator_y_position) {
subsurf_ypos = state->args.indicator_y_position -
(state->args.radius + state->args.thickness);
} else {
subsurf_ypos = surface->height / 2 -
(state->args.radius + state->args.thickness);
}
wl_subsurface_set_position(surface->subsurface, subsurf_xpos, subsurf_ypos); wl_subsurface_set_position(surface->subsurface, subsurf_xpos, subsurf_ypos);
surface->current_buffer = get_next_buffer(state->shm, surface->current_buffer = get_next_buffer(state->shm,