javalsai/lidm
1
0
Fork 0
mirror of https://github.com/javalsai/lidm.git synced 2025-07-05 07:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: support custom format dates

Browse Source
This commit is contained in:
javalsai 2025-06-21 03:10:29 +02:00
parent a129fa0186
commit cd1f44ec41
Signed by: javalsai
SSH Key Fingerprint: SHA256:3G83yKhBUWVABVX/vPWH88xnK4+ptMtHkZGCRXD4Mk8
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/config.h
View File

@ -112,10 +112,11 @@ BUILD(strings, STRINGS, TABLE_STRINGS);
(struct Vector) { \ (struct Vector) { \
0, 0, NULL \ 0, 0, NULL \
} }
#define TABLE_BEHAVIOR(F, name) \ #define TABLE_BEHAVIOR(F, name) \
F(bool, include_defshell, BOOL, true, name) \ F(bool, include_defshell, BOOL, true, name) \
F(struct Vector, source, STRING_ARRAY, NULL_VEC, name) \ F(struct Vector, source, STRING_ARRAY, NULL_VEC, name) \
F(struct Vector, user_source, STRING_ARRAY, NULL_VEC, name) F(struct Vector, user_source, STRING_ARRAY, NULL_VEC, name) \
F(char* NNULLABLE, timefmt, STRING, "%X %x", name)
BUILD(behavior, BEHAVIOR, TABLE_BEHAVIOR); BUILD(behavior, BEHAVIOR, TABLE_BEHAVIOR);

48
src/ui.c
View File

@ -88,17 +88,26 @@ static struct uint_point box_start() {
}; };
} }
#define STRFTIME_PREALLOC 64
#define TM_YEAR_EPOCH 1900 #define TM_YEAR_EPOCH 1900
static char* fmt_time() { static char* fmt_time(const char* fmt) {
time_t tme = time(NULL); time_t tme = time(NULL);
struct tm tm = *localtime(&tme); struct tm tm = *localtime(&tme);
// TODO: use strftime and a cfg template string size_t alloc_size = STRFTIME_PREALLOC;
char* buf; char* buf = malloc(alloc_size);
asprintf(&buf, "%d-%02d-%02d %02d:%02d:%02d", tm.tm_year + TM_YEAR_EPOCH, if (!buf) return NULL;
tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); while (true) {
if (strftime(buf, alloc_size, fmt, &tm) != 0) return buf;
return buf; alloc_size *= 2;
char* nbuf = realloc(buf, alloc_size);
if (!nbuf) {
free(buf);
return NULL;
}
buf = nbuf;
}
} }
void ui_update_cursor_focus() { void ui_update_cursor_focus() {
@ -194,7 +203,7 @@ int load(struct Vector* users, struct Vector* sessions) {
if (hostname != unknown_str) free(hostname); if (hostname != unknown_str) free(hostname);
// put date // put date
char* fmtd_time = fmt_time(); char* fmtd_time = fmt_time(g_config->behavior.timefmt);
printf("\x1b[%d;%dH\x1b[%sm%s\x1b[%sm", BOXSTART.y + HEAD_ROW, printf("\x1b[%d;%dH\x1b[%sm%s\x1b[%sm", BOXSTART.y + HEAD_ROW,
BOXSTART.x + BOX_WIDTH - 1 - BOX_HMARGIN - (uint)utf8len(fmtd_time), BOXSTART.x + BOX_WIDTH - 1 - BOX_HMARGIN - (uint)utf8len(fmtd_time),
g_config->colors.e_date, fmtd_time, g_config->colors.fg); g_config->colors.e_date, fmtd_time, g_config->colors.fg);
@ -271,8 +280,8 @@ u_char get_render_pos_offset(struct opts_field* self, u_char maxlen) {
return pos - ofield_display_cursor_col(self, maxlen); return pos - ofield_display_cursor_col(self, maxlen);
} }
static void print_session(struct uint_point origin, struct session session, void print_session(struct uint_point origin, struct session session,
bool multiple) { bool multiple) {
clean_line(origin, SESSION_ROW); clean_line(origin, SESSION_ROW);
const char* NNULLABLE session_type; const char* NNULLABLE session_type;
@ -320,8 +329,7 @@ static void print_session(struct uint_point origin, struct session session,
} }
} }
static void print_user(struct uint_point origin, struct user user, void print_user(struct uint_point origin, struct user user, bool multiple) {
bool multiple) {
clean_line(origin, USER_ROW); clean_line(origin, USER_ROW);
printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm", printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + VALUES_COL - VALUES_SEPR - 1 - (ulong)(origin.x + VALUES_COL - VALUES_SEPR - 1 -
@ -348,8 +356,8 @@ static void print_user(struct uint_point origin, struct user user,
} }
} }
static char passwd_prompt[VALUE_MAXLEN + 1]; void print_passwd(struct uint_point origin, uint length, bool err) {
static void print_passwd(struct uint_point origin, uint length, bool err) { char passwd_prompt[VALUE_MAXLEN + 1];
clean_line(origin, PASSWD_ROW); clean_line(origin, PASSWD_ROW);
printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm", printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + VALUES_COL - VALUES_SEPR - (ulong)(origin.x + VALUES_COL - VALUES_SEPR -
@ -406,11 +414,15 @@ static void print_box() {
} }
static void print_footer() { static void print_footer() {
size_t bsize = snprintf( size_t bsize = utf8len(g_config->strings.f_poweroff) +
NULL, 0, "%s %s %s %s %s %s", g_config->strings.f_poweroff, utf8len(KEY_NAMES[g_config->functions.poweroff]) +
KEY_NAMES[g_config->functions.poweroff], g_config->strings.f_reboot, utf8len(g_config->strings.f_reboot) +
KEY_NAMES[g_config->functions.reboot], g_config->strings.f_refresh, utf8len(KEY_NAMES[g_config->functions.reboot]) +
KEY_NAMES[g_config->functions.refresh]); utf8len(g_config->strings.f_refresh) +
utf8len(KEY_NAMES[g_config->functions.refresh]);
bsize += 2 * 2 + // 2 wide separators between 3 items
3 * 1; // 3 thin separators inside every item
uint row = window.ws_row - 1; uint row = window.ws_row - 1;
uint col = window.ws_col - 2 - bsize; uint col = window.ws_col - 2 - bsize;

3
themes/default.ini
View File

@ -36,9 +36,12 @@ e_passwd = "password"
s_wayland = "wayland" s_wayland = "wayland"
s_xorg = "xorg" s_xorg = "xorg"
s_shell = "shell" s_shell = "shell"
opts_pre = "< "
opts_post = " >"
[behavior] [behavior]
include_defshell = true include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env" source = "/etc/lidm.env"
source = "/etc/locale.conf" source = "/etc/locale.conf"
user_source = ".lidm.env" user_source = ".lidm.env"