commit 2afbb6884901a7a9a22c9cb0ca8769aa6271a471
parent 807ff5c2b13d5ec68a72ff5cb1e725a77cdb949b
Author: Chris Guillott <chris@techfo.xyz>
Date: Tue, 21 Nov 2017 10:02:53 -0500
add text align options
Diffstat:
2 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/i3lock.c b/i3lock.c
@@ -93,6 +93,15 @@ bool composite = false;
I picked 32-length char arrays because some people might want really funky time formatters.
Who am I to judge?
*/
+/*
+ * 0 = center
+ * 1 = left
+ * 2 = right
+ */
+int time_align = 0;
+int date_align = 0;
+int layout_align = 0;
+
char time_format[32] = "%H:%M:%S\0";
char date_format[32] = "%A, %m %Y\0";
char time_font[32] = "sans-serif\0";
@@ -1020,6 +1029,10 @@ int main(int argc, char *argv[]) {
{"refresh-rate", required_argument, NULL, 0},
{"composite", no_argument, NULL, 0},
+ {"time-align", required_argument, NULL, 0},
+ {"date-align", required_argument, NULL, 0},
+ {"layout-align", required_argument, NULL, 0},
+
{"timestr", required_argument, NULL, 0},
{"datestr", required_argument, NULL, 0},
{"keylayout", required_argument, NULL, 0},
@@ -1438,6 +1451,21 @@ int main(int argc, char *argv[]) {
ring_width = new_width;
}
}
+ else if (strcmp(longopts[longoptind].name, "time-align") == 0) {
+ int opt = atoi(optarg);
+ if (opt < 0 || opt > 2) opt = 0;
+ time_align = opt;
+ }
+ else if (strcmp(longopts[longoptind].name, "date-align") == 0) {
+ int opt = atoi(optarg);
+ if (opt < 0 || opt > 2) opt = 0;
+ date_align = opt;
+ }
+ else if (strcmp(longopts[longoptind].name, "layout-align") == 0) {
+ int opt = atoi(optarg);
+ if (opt < 0 || opt > 2) opt = 0;
+ layout_align = opt;
+ }
else if (strcmp(longopts[longoptind].name, "force-clock") == 0) {
show_clock = true;
always_show_clock = true;
diff --git a/unlock_indicator.c b/unlock_indicator.c
@@ -89,6 +89,9 @@ extern float refresh_rate;
extern bool show_clock;
extern bool always_show_clock;
extern bool show_indicator;
+extern int time_align;
+extern int date_align;
+extern int layout_align;
extern char time_format[32];
extern char date_format[32];
extern char time_font[32];
@@ -515,7 +518,19 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_source_rgba(time_ctx, (double)time16->red/255, (double)time16->green/255, (double)time16->blue/255, (double)time16->alpha/255);
cairo_text_extents(time_ctx, text, &extents);
- x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+ switch(time_align) {
+ case 1:
+ x = 0;
+ break;
+ case 2:
+ x = CLOCK_WIDTH - ((extents.width) + extents.x_bearing);
+ break;
+ case 0:
+ default:
+ x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+ break;
+ }
+
y = CLOCK_HEIGHT/2;
cairo_move_to(time_ctx, x, y);
@@ -529,9 +544,22 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_font_size(date_ctx, date_size);
cairo_text_extents(date_ctx, date, &extents);
- x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+
+ switch(date_align) {
+ case 1:
+ x = 0;
+ break;
+ case 2:
+ x = CLOCK_WIDTH - ((extents.width) + extents.x_bearing);
+ break;
+ case 0:
+ default:
+ x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+ break;
+ }
+
y = CLOCK_HEIGHT/2;
-
+
cairo_move_to(date_ctx, x, y);
cairo_show_text(date_ctx, date);
cairo_close_path(date_ctx);
@@ -542,9 +570,21 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_font_size(layout_ctx, layout_size);
cairo_text_extents(layout_ctx, layout_text, &extents);
- x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+ switch(layout_align) {
+ case 1:
+ x = 0;
+ break;
+ case 2:
+ x = CLOCK_WIDTH - ((extents.width) + extents.x_bearing);
+ break;
+ case 0:
+ default:
+ x = CLOCK_WIDTH/2 - ((extents.width / 2) + extents.x_bearing);
+ break;
+ }
+
y = CLOCK_HEIGHT/2;
-
+
cairo_move_to(layout_ctx, x, y);
cairo_show_text(layout_ctx, layout_text);
cairo_close_path(layout_ctx);
@@ -627,7 +667,6 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
double date_y = dy;
double layout_x = te_eval(te_layout_x_expr);
double layout_y = te_eval(te_layout_y_expr);
-
cairo_set_source_surface(xcb_ctx, time_output, time_x, time_y);
cairo_rectangle(xcb_ctx, time_x, time_y, CLOCK_WIDTH, CLOCK_HEIGHT);
cairo_fill(xcb_ctx);
@@ -711,7 +750,6 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
double date_y = dy;
double layout_x = te_eval(te_layout_x_expr);
double layout_y = te_eval(te_layout_y_expr);
- DEBUG("Placing time at %f, %f\n", time_x, time_y);
cairo_set_source_surface(xcb_ctx, time_output, time_x, time_y);
cairo_rectangle(xcb_ctx, time_x, time_y, CLOCK_WIDTH, CLOCK_HEIGHT);
cairo_fill(xcb_ctx);
