PolytreeDE
/
i3lock-color
mirror of https://github.com/Raymo111/i3lock-color.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into refactor-background-drawing

This commit is contained in:
Raymond Li 2021-06-04 18:41:25 -04:00 committed by GitHub
parent 567dd8ea3d c4f4cf6d29
commit ad7b33bd2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
i3lock.c
View File

@ -279,8 +279,7 @@ double bar_step = 15;
double bar_base_height = 25;
double bar_periodic_step = 15;
double max_bar_height = 25;
int bar_count = 0;
int bar_width = 0;
int bar_count = 10;
int bar_orientation = BAR_FLAT;
char bar_base_color[9] = "000000ff";
@ -1548,7 +1547,6 @@ int main(int argc, char *argv[]) {
// bar indicator stuff
{"bar-indicator", no_argument, NULL, 700},
{"bar-direction", required_argument, NULL, 701},
{"bar-width", required_argument, NULL, 702},
{"bar-orientation", required_argument, NULL, 703},
{"bar-step", required_argument, NULL, 704},
{"bar-max-height", required_argument, NULL, 705},
@ -2125,10 +2123,6 @@ int main(int argc, char *argv[]) {
break;
}
break;
case 702:
bar_width = atoi(optarg);
if (bar_width < 1) bar_width = 150;
break;
case 703:
arg = optarg;
if (strcmp(arg, "vertical") == 0)
@ -2323,27 +2317,7 @@ int main(int argc, char *argv[]) {
last_resolution[1] = screen->height_in_pixels;
if (bar_enabled) {
if (bar_count == 0) {
if (bar_width != 0) {
fprintf(stderr, "Warning: bar-width is deprecated, use bar-count instead\n");
int tmp = screen->width_in_pixels;
if (bar_orientation == BAR_VERT) tmp = screen->height_in_pixels;
bar_count = tmp / bar_width;
if (tmp % bar_width != 0) {
++bar_count;
}
} else {
bar_count = 10;
}
} else if (bar_width != 0) {
errx(EXIT_FAILURE, "bar-width and bar-count cannot be used at the same time");
}
if (bar_count >= MIN_BAR_COUNT && bar_count <= MAX_BAR_COUNT) {
bar_heights = (double*) calloc(bar_count, sizeof(double));
} else {
bar_enabled = false;
}
bar_heights = (double*) calloc(bar_count, sizeof(double));
}
xcb_change_window_attributes(conn, screen->root, XCB_CW_EVENT_MASK,