mlow/mpd_control
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add -p/--padding option

Browse Source
This commit is contained in:
Matt Low 2019-10-18 01:15:39 +04:00
parent 2424a92e4c
commit 9ceaa0045e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mpd_control.c
View File

@ -18,6 +18,7 @@ static struct argp_option options[] = {
{ "interval", 'i', "interval", 0, "How frequently to update the status line (in seconds). Default: 1"}, { "interval", 'i', "interval", 0, "How frequently to update the status line (in seconds). Default: 1"},
{ "length", 'l', "length", 0, "The length of the shown song label (in characters). Default: 25"}, { "length", 'l', "length", 0, "The length of the shown song label (in characters). Default: 25"},
{ "step", 's', "step", 0, "How many characters to step the label while scrolling. Default: 3"}, { "step", 's', "step", 0, "How many characters to step the label while scrolling. Default: 3"},
{ "padding", 'p', "padding", 0, "The characters to append to the label while scrolling. Default: \" | \""},
{ 0 } { 0 }
}; };
@ -25,6 +26,7 @@ struct arguments {
float interval; float interval;
int length; int length;
int step; int step;
char* padding;
}; };
static struct arguments arguments; static struct arguments arguments;
@ -55,6 +57,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
return EINVAL; return EINVAL;
} }
arguments->step = s; break; arguments->step = s; break;
case 'p': arguments->padding = arg;
case ARGP_KEY_ARG: return 0; case ARGP_KEY_ARG: return 0;
default: return ARGP_ERR_UNKNOWN; default: return ARGP_ERR_UNKNOWN;
} }
@ -200,7 +203,7 @@ print_status(struct mpd_connection *conn, struct worker_state *state)
// ... and the padded label (if the full label is long enough) ... // ... and the padded label (if the full label is long enough) ...
if (state->full_label_length > arguments.length) { if (state->full_label_length > arguments.length) {
sprintf(state->padded_label, "%s | ", state->full_label); sprintf(state->padded_label, "%s%s", state->full_label, arguments.padding);
state->padded_label_length = g_utf8_strlen(state->padded_label, -1); state->padded_label_length = g_utf8_strlen(state->padded_label, -1);
} }
// ... and reset the scroll index // ... and reset the scroll index
@ -293,6 +296,7 @@ int main(int argc, char *argv[]) {
arguments.interval = 1.0f; arguments.interval = 1.0f;
arguments.length = 25; arguments.length = 25;
arguments.step = 3; arguments.step = 3;
arguments.padding = " | ";
argp_parse(&argp, argc, argv, 0, 0, &arguments); argp_parse(&argp, argc, argv, 0, 0, &arguments);