Skip to content

Commit 3edfb79

Browse files
PandorasFoxPandorasFox
committed
move timed redraws into own thread; make bar prettier
1 parent e69147d commit 3edfb79

File tree

2 files changed

+90
-57
lines changed

2 files changed

+90
-57
lines changed

‎i3lock.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ bool tile = false;
180180
bool ignore_empty_password = false;
181181
bool skip_repeated_empty_password = false;
182182

183+
// for the rendering thread, so we can clean it up
184+
pthread_t draw_thread;
183185

184186
#define BAR_VERT 0
185187
#define BAR_FLAT 1
@@ -194,7 +196,7 @@ int num_bars = 0;
194196
int bar_width = 15;
195197
int bar_orientation = BAR_FLAT;
196198

197-
char bar_base_color[9] = "00000033";
199+
char bar_base_color[9] = "000000ff";
198200
char bar_expr[32] = "0\0";
199201
bool bar_bidirectional = false;
200202

@@ -1526,8 +1528,8 @@ int main(int argc, char *argv[]) {
15261528
bar_bidirectional = true;
15271529
}
15281530
else if (strcmp(longopts[longoptind].name, "bar-width") == 0) {
1529-
int width = atoi(optarg);
1530-
if (width < 1) width = 15;
1531+
bar_width = atoi(optarg);
1532+
if (bar_width < 1) bar_width = 15;
15311533
// num_bars and bar_heights* initialized later when we grab display info
15321534
}
15331535
else if (strcmp(longopts[longoptind].name, "bar-orientation") == 0) {
@@ -1817,7 +1819,6 @@ int main(int argc, char *argv[]) {
18171819
// boy i sure hope this doesnt change in the future
18181820
#define NANOSECONDS_IN_SECOND 1000000000
18191821
if (show_clock || bar_enabled) {
1820-
pthread_t draw_thread;
18211822
struct timespec ts;
18221823
double s;
18231824
double ns = modf(refresh_rate, &s);

‎unlock_indicator.c

+85-53
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
480480
/* After the user pressed any valid key or the backspace key, we
481481
* highlight a random part of the unlock indicator to confirm this
482482
* keypress. */
483-
//TODO: figure out what to do with the bar indicator for this
484483
if (unlock_state == STATE_KEY_ACTIVE ||
485484
unlock_state == STATE_BACKSPACE_ACTIVE) {
486485
if (bar_enabled) {
@@ -489,7 +488,10 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
489488
int index = rand() % num_bars;
490489
bar_heights[index] = max_bar_height;
491490
for(int i = 0; i < ((max_bar_height / bar_step) + 1); ++i) {
492-
int low_ind = (index - i) % num_bars;
491+
int low_ind = index - i;
492+
while (low_ind < 0) {
493+
low_ind += num_bars;
494+
}
493495
int high_ind = (index + i) % num_bars;
494496
int tmp_height = max_bar_height - (bar_step * i);
495497
if (tmp_height < 0) tmp_height = 0;
@@ -499,43 +501,44 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
499501
bar_heights[high_ind] = tmp_height;
500502
if (tmp_height == 0) break;
501503
}
502-
}
503-
cairo_set_line_width(ctx, RING_WIDTH);
504-
cairo_new_sub_path(ctx);
505-
double highlight_start = (rand() % (int)(2 * M_PI * 100)) / 100.0;
506-
cairo_arc(ctx,
507-
BUTTON_CENTER /* x */,
508-
BUTTON_CENTER /* y */,
509-
BUTTON_RADIUS /* radius */,
510-
highlight_start,
511-
highlight_start + (M_PI / 3.0));
512-
if (unlock_state == STATE_KEY_ACTIVE) {
513-
/* For normal keys, we use a lighter green. */ //lol no
514-
cairo_set_source_rgba(ctx, keyhl16.red, keyhl16.green, keyhl16.blue, keyhl16.alpha);
515504
} else {
516-
/* For backspace, we use red. */ //lol no
517-
cairo_set_source_rgba(ctx, bshl16.red, bshl16.green, bshl16.blue, bshl16.alpha);
518-
}
505+
cairo_set_line_width(ctx, RING_WIDTH);
506+
cairo_new_sub_path(ctx);
507+
double highlight_start = (rand() % (int)(2 * M_PI * 100)) / 100.0;
508+
cairo_arc(ctx,
509+
BUTTON_CENTER /* x */,
510+
BUTTON_CENTER /* y */,
511+
BUTTON_RADIUS /* radius */,
512+
highlight_start,
513+
highlight_start + (M_PI / 3.0));
514+
if (unlock_state == STATE_KEY_ACTIVE) {
515+
/* For normal keys, we use a lighter green. */ //lol no
516+
cairo_set_source_rgba(ctx, keyhl16.red, keyhl16.green, keyhl16.blue, keyhl16.alpha);
517+
} else {
518+
/* For backspace, we use red. */ //lol no
519+
cairo_set_source_rgba(ctx, bshl16.red, bshl16.green, bshl16.blue, bshl16.alpha);
520+
}
519521

520-
cairo_stroke(ctx);
521-
522-
/* Draw two little separators for the highlighted part of the
523-
* unlock indicator. */
524-
cairo_set_source_rgba(ctx, sep16.red, sep16.green, sep16.blue, sep16.alpha);
525-
cairo_arc(ctx,
526-
BUTTON_CENTER /* x */,
527-
BUTTON_CENTER /* y */,
528-
BUTTON_RADIUS /* radius */,
529-
highlight_start /* start */,
530-
highlight_start + (M_PI / 128.0) /* end */);
531-
cairo_stroke(ctx);
532-
cairo_arc(ctx,
533-
BUTTON_CENTER /* x */,
534-
BUTTON_CENTER /* y */,
535-
BUTTON_RADIUS /* radius */,
536-
(highlight_start + (M_PI / 3.0)) - (M_PI / 128.0) /* start */,
537-
highlight_start + (M_PI / 3.0) /* end */);
538-
cairo_stroke(ctx);
522+
cairo_stroke(ctx);
523+
524+
/* Draw two little separators for the highlighted part of the
525+
* unlock indicator. */
526+
cairo_set_source_rgba(ctx, sep16.red, sep16.green, sep16.blue, sep16.alpha);
527+
cairo_arc(ctx,
528+
BUTTON_CENTER /* x */,
529+
BUTTON_CENTER /* y */,
530+
BUTTON_RADIUS /* radius */,
531+
highlight_start /* start */,
532+
highlight_start + (M_PI / 128.0) /* end */);
533+
cairo_stroke(ctx);
534+
cairo_arc(ctx,
535+
BUTTON_CENTER /* x */,
536+
BUTTON_CENTER /* y */,
537+
BUTTON_RADIUS /* radius */,
538+
(highlight_start + (M_PI / 3.0)) - (M_PI / 128.0) /* start */,
539+
highlight_start + (M_PI / 3.0) /* end */);
540+
cairo_stroke(ctx);
541+
}
539542
}
540543
}
541544

@@ -671,7 +674,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
671674
te_expr *te_layout_y_expr = te_compile(layout_y_expr, vars, NUM_VARS, &te_y_err);
672675
te_expr *te_bar_expr = te_compile(bar_expr, vars, NUM_VARS, &te_x_err);
673676

674-
if (xr_screens > 0) {
677+
if (xr_screens > 0 && !bar_enabled) {
675678
/* Composite the unlock indicator in the middle of each screen. */
676679
// excuse me, just gonna hack something in right here
677680
if (screen_number != -1 && screen_number < xr_screens) {
@@ -768,7 +771,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
768771
}
769772
}
770773
}
771-
} else {
774+
} else if (!bar_enabled) {
772775
/* We have no information about the screen sizes/positions, so we just
773776
* place the unlock indicator in the middle of the X root window and
774777
* hope for the best. */
@@ -802,43 +805,60 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
802805
cairo_rectangle(xcb_ctx, layout_x, layout_y, CLOCK_WIDTH, CLOCK_HEIGHT);
803806
cairo_fill(xcb_ctx);
804807
}
805-
}
806-
// oh boy, here we go!
807-
// this really needs to be broken into functions or something :D
808-
double bar_offset = te_eval(te_bar_expr);
809-
if (bar_enabled) {
808+
} else {
809+
// oh boy, here we go!
810+
// TODO: get this to play nicely with multiple monitors
811+
// ideally it'd intelligently span both monitors
812+
double bar_offset = te_eval(te_bar_expr);
810813
double x, y, width, height;
811814
double back_x = 0, back_y = 0, back_x2 = 0, back_y2 = 0, back_width = 0, back_height = 0;
812815
for(int i = 0; i < num_bars; ++i) {
813816
double cur_bar_height = bar_heights[i];
814817

815818
if (cur_bar_height > 0) {
816-
cairo_set_source_rgba(bar_ctx, keyhl16.red, keyhl16.green, keyhl16.blue, keyhl16.alpha);
819+
if (unlock_state == STATE_BACKSPACE_ACTIVE) {
820+
cairo_set_source_rgba(bar_ctx, bshl16.red, bshl16.green, bshl16.blue, bshl16.alpha);
821+
} else {
822+
cairo_set_source_rgba(bar_ctx, keyhl16.red, keyhl16.green, keyhl16.blue, keyhl16.alpha);
823+
}
817824
} else {
818-
cairo_set_source_rgba(bar_ctx, bar16.red, bar16.green, bar16.blue, bar16.alpha);
825+
DEBUG("auth state is now %d\n", auth_state);
826+
switch (auth_state) {
827+
case STATE_AUTH_VERIFY:
828+
case STATE_AUTH_LOCK:
829+
cairo_set_source_rgba(bar_ctx, insidever16.red, insidever16.green, insidever16.blue, insidever16.alpha);
830+
break;
831+
case STATE_AUTH_WRONG:
832+
case STATE_I3LOCK_LOCK_FAILED:
833+
cairo_set_source_rgba(bar_ctx, insidewrong16.red, insidewrong16.green, insidewrong16.blue, insidewrong16.alpha);
834+
break;
835+
default:
836+
cairo_set_source_rgba(bar_ctx, bar16.red, bar16.green, bar16.blue, bar16.alpha);
837+
break;
838+
}
819839
}
820840

821841
if (bar_orientation == BAR_VERT) {
822-
width = (cur_bar_height < 0 ? bar_base_height : cur_bar_height);
842+
width = (cur_bar_height <= 0 ? bar_base_height : cur_bar_height);
823843
height = bar_width;
824844
x = bar_offset;
825845
y = i * bar_width;
826846
if (bar_bidirectional) {
827-
width = (cur_bar_height < 0 ? bar_base_height : cur_bar_height) * 2;
847+
width = (cur_bar_height <= 0 ? bar_base_height : cur_bar_height) * 2;
828848
x = bar_offset - (width / 2) + (bar_base_height / 2);
829849
}
830850
} else {
831851
width = bar_width;
832-
height = (cur_bar_height < 0 ? bar_base_height : cur_bar_height);
852+
height = (cur_bar_height <= 0 ? bar_base_height : cur_bar_height);
833853
x = i * bar_width;
834854
y = bar_offset;
835855
if (bar_bidirectional) {
836-
height = (cur_bar_height < 0 ? bar_base_height : cur_bar_height) * 2;
856+
height = (cur_bar_height <= 0 ? bar_base_height : cur_bar_height) * 2;
837857
y = bar_offset - (height / 2) + (bar_base_height / 2);
838858
}
839859
}
840860

841-
if (cur_bar_height < bar_base_height) {
861+
if (cur_bar_height < bar_base_height && cur_bar_height > 0) {
842862
if (bar_orientation == BAR_VERT) {
843863
back_x = bar_offset + cur_bar_height;
844864
back_y = y;
@@ -863,12 +883,23 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
863883
}
864884
}
865885
}
866-
867886
cairo_rectangle(bar_ctx, x, y, width, height);
868887
cairo_fill(bar_ctx);
869888
if ((bar_bidirectional && ((cur_bar_height * 2) < bar_base_height))
870889
|| (!bar_bidirectional && (cur_bar_height < bar_base_height))) {
871-
cairo_set_source_rgba(bar_ctx, bar16.red, bar16.green, bar16.blue, bar16.alpha);
890+
switch (auth_state) {
891+
case STATE_AUTH_VERIFY:
892+
case STATE_AUTH_LOCK:
893+
cairo_set_source_rgba(bar_ctx, insidever16.red, insidever16.green, insidever16.blue, insidever16.alpha);
894+
break;
895+
case STATE_AUTH_WRONG:
896+
case STATE_I3LOCK_LOCK_FAILED:
897+
cairo_set_source_rgba(bar_ctx, insidewrong16.red, insidewrong16.green, insidewrong16.blue, insidewrong16.alpha);
898+
break;
899+
default:
900+
cairo_set_source_rgba(bar_ctx, bar16.red, bar16.green, bar16.blue, bar16.alpha);
901+
break;
902+
}
872903
cairo_rectangle(bar_ctx, back_x, back_y, back_width, back_height);
873904
if (bar_bidirectional) {
874905
cairo_rectangle(bar_ctx, back_x2, back_y2, back_width, back_height);
@@ -893,6 +924,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
893924
te_free(te_date_y_expr);
894925
te_free(te_layout_x_expr);
895926
te_free(te_layout_y_expr);
927+
te_free(te_bar_expr);
896928

897929
cairo_surface_destroy(xcb_output);
898930
cairo_surface_destroy(time_output);

0 commit comments

Comments
 (0)