From d6ff9e53cf724460b6f827edf40d698d35ffa2f7 Mon Sep 17 00:00:00 2001 From: C. McEnroe Date: Wed, 27 Jan 2021 14:18:20 -0500 Subject: Change default timestamp format to %X This respects the user's locale settings. --- ui.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ui.c') diff --git a/ui.c b/ui.c index 5997571..da40dc0 100644 --- a/ui.c +++ b/ui.c @@ -69,11 +69,6 @@ enum { #define RIGHT (COLS - 1) #define MAIN_LINES (LINES - StatusLines - InputLines) -struct Time uiTime = { - .format = "%T", - .width = 8, -}; - static WINDOW *status; static WINDOW *main; static WINDOW *input; @@ -232,6 +227,8 @@ static const char *ExitFocusMode = "\33[?1004l"; static const char *EnterPasteMode = "\33[?2004h"; static const char *ExitPasteMode = "\33[?2004l"; +struct Time uiTime = { .format = "%X" }; + static void errExit(void) { putp(ExitFocusMode); putp(ExitPasteMode); @@ -239,6 +236,13 @@ static void errExit(void) { } void uiInitEarly(void) { + char buf[TimeCap]; + struct tm *time = localtime(&(time_t) { -22100400 }); + uiTime.width = strftime(buf, sizeof(buf), uiTime.format, time); + if (!uiTime.width) { + errx(EX_CONFIG, "invalid timestamp format: %s", uiTime.format); + } + initscr(); cbreak(); noecho(); -- cgit 1.4.1-2-gfad0