commit c4f4cf6d29ad38d7bdc0543fdb97d5284a8b6e86
parent 9fc20b87b5967a83e3df93a41e0102868ef39bdb
Author: Rio6 <rio.liu@r26.me>
Date: Fri, 4 Jun 2021 15:41:13 -0700
Remove deprecated bar-width option (#226)
* remove deprecated bar-width option
* restore default bar-count
Diffstat:
| M | i3lock.c | | | 30 | ++---------------------------- |
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/i3lock.c b/i3lock.c
@@ -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,
