diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2013-04-11 21:52:18 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2013-04-11 21:52:18 +0000 |
commit | 7f9b225cc269211b86a4c4d2168146c217d63118 (patch) | |
tree | f37737f75081824502d3dd12a47ad67883f06ced /clock.c | |
parent | cbee283c26968304b473e2191d2bb5f52208b58d (diff) |
Call setlocale(LC_TIME) at startup.
Diffstat (limited to 'clock.c')
-rw-r--r-- | clock.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -103,13 +103,20 @@ clock_draw(struct screen_write_ctx *ctx, int colour, int style) struct grid_cell gc; char tim[64], *ptr; time_t t; + struct tm *tm; u_int i, j, x, y, idx; t = time(NULL); - if (style == 0) - strftime(tim, sizeof tim, "%l:%M %p", localtime(&t)); - else - strftime(tim, sizeof tim, "%H:%M", localtime(&t)); + tm = localtime(&t); + if (style == 0) { + strftime(tim, sizeof tim, "%l:%M ", localtime(&t)); + if (tm->tm_hour >= 12) + strlcat(tim, "PM", sizeof tim); + else + strlcat(tim, "AM", sizeof tim); + } else + strftime(tim, sizeof tim, "%H:%M", tm); + screen_write_clearscreen(ctx); |