From 83e44c7d8e6e7d686c9738fa432bb811e9ac74c4 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 26 Aug 2009 22:12:21 +0000 Subject: [PATCH] Sync OpenBSD patchset 298: Make this work when the clock is in small characters as well. Doh. --- clock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clock.c b/clock.c index 3e2bbb7c..50d48bed 100644 --- a/clock.c +++ b/clock.c @@ -1,4 +1,4 @@ -/* $Id: clock.c,v 1.5 2009-08-26 22:11:00 tcunha Exp $ */ +/* $Id: clock.c,v 1.6 2009-08-26 22:12:21 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -112,8 +112,6 @@ clock_draw(struct screen_write_ctx *ctx, u_int colour, int style) strftime(tim, sizeof tim, "%H:%M", localtime(&t)); screen_write_clearscreen(ctx); - memcpy(&gc, &grid_default_cell, sizeof gc); - gc.bg = colour; if (screen_size_x(s) < 6 * strlen(tim) || screen_size_y(s) < 6) { if (screen_size_x(s) >= strlen(tim) && screen_size_y(s) != 0) { @@ -121,6 +119,7 @@ clock_draw(struct screen_write_ctx *ctx, u_int colour, int style) y = screen_size_y(s) / 2; screen_write_cursormove(ctx, x, y); + memcpy(&gc, &grid_default_cell, sizeof gc); gc.fg = colour; screen_write_puts(ctx, &gc, "%s", tim); } @@ -130,6 +129,8 @@ clock_draw(struct screen_write_ctx *ctx, u_int colour, int style) x = (screen_size_x(s) / 2) - 3 * strlen(tim); y = (screen_size_y(s) / 2) - 3; + memcpy(&gc, &grid_default_cell, sizeof gc); + gc.bg = colour; for (ptr = tim; *ptr != '\0'; ptr++) { if (*ptr >= '0' && *ptr <= '9') idx = *ptr - '0';