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

chore: remove config inconsistencies

Browse Source
This commit is contained in:
javalsai 2024-09-05 21:20:09 +02:00
parent dbbab78e23
commit 2284ab017d
Signed by: javalsai
SSH Key Fingerprint: SHA256:3G83yKhBUWVABVX/vPWH88xnK4+ptMtHkZGCRXD4Mk8
13 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/man/lidm-config.5
View File

@ -27,11 +27,9 @@ All keys under this section are always wrapped inside ansi sequences (\fB\\x1b[.
\fBcolors.bd, colors.fg, colors.err\fP
Background, foreground and error escape sequences. \fB'fg'\fP is also used as reset sequence, so it must remove effects used in other keys (such as bold, underline...) \fBWITHOUT\fP using the \fB'0'\fP sequence, as that would remove the background color.
.TP
\fBcolors.s_wl, colors.s_xorg, colors.s_shell\fP
\fBcolors.s_wayland, colors.s_xorg, colors.s_shell\fP
Coloring for sessions of such types (Wayland, X.org, Shells)
.TP
\fBcolors.f_other\fP
This was going to be used for session of other type I think, but is currently unused, however it still needs to be specified.
.TP
\fBcolors.e_hostname, colors.e_date, colors.e_box\fP
Coloring for the hostname, date and box elements.
@ -68,7 +66,7 @@ Text displayed to name such functions.
\fBstrings.e_user, strings.e_passwd\fP
Text to display for these element headers.
.TP
\fBstrings.s_xorg, strings.s_wayland, strings.s_shell\fP
\fBstrings.s_wayland, strings.s_xorg, strings.s_shell\fP
Text to display as the header for such sessions.
.SS Behavior

5
include/config.h
View File

@ -14,10 +14,9 @@ struct theme_colors {
char *bg;
char *fg;
char *err;
char *s_wl;
char *s_wayland;
char *s_xorg;
char *s_shell;
char *f_other;
char *e_hostname;
char *e_date;
char *e_box;
@ -57,8 +56,8 @@ struct strings {
char *f_refresh;
char *e_user;
char *e_passwd;
char *s_xorg;
char *s_wayland;
char *s_xorg;
char *s_shell;
};

10
src/config.c
View File

@ -51,14 +51,12 @@ u_char config_line_handler(char *k, char *v) {
__config->theme.colors.fg = v;
else if (strcmp(k, "colors.err") == 0)
__config->theme.colors.err = v;
else if (strcmp(k, "colors.s_wl") == 0)
__config->theme.colors.s_wl = v;
else if (strcmp(k, "colors.s_wayland") == 0)
__config->theme.colors.s_wayland = v;
else if (strcmp(k, "colors.s_xorg") == 0)
__config->theme.colors.s_xorg = v;
else if (strcmp(k, "colors.s_shell") == 0)
__config->theme.colors.s_shell = v;
else if (strcmp(k, "colors.f_other") == 0)
__config->theme.colors.f_other = v;
else if (strcmp(k, "colors.e_hostname") == 0)
__config->theme.colors.e_hostname = v;
else if (strcmp(k, "colors.e_date") == 0)
@ -103,10 +101,10 @@ u_char config_line_handler(char *k, char *v) {
__config->strings.e_user = v;
else if (strcmp(k, "strings.e_passwd") == 0)
__config->strings.e_passwd = v;
else if (strcmp(k, "strings.s_xorg") == 0)
__config->strings.s_xorg = v;
else if (strcmp(k, "strings.s_wayland") == 0)
__config->strings.s_wayland = v;
else if (strcmp(k, "strings.s_xorg") == 0)
__config->strings.s_xorg = v;
else if (strcmp(k, "strings.s_shell") == 0)
__config->strings.s_shell = v;
else if (strcmp(k, "behavior.include_defshell") == 0)

2
src/ui.c
View File

@ -438,7 +438,7 @@ static void print_session(struct uint_point origin, struct session session,
if (session.type == XORG) {
session_color = theme.colors.s_xorg;
} else if (session.type == WAYLAND) {
session_color = theme.colors.s_wl;
session_color = theme.colors.s_wayland;
} else {
session_color = theme.colors.s_shell;
}

5
themes/cherry.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;77;33;55
colors.fg = 22;3;24;38;2;245;245;245
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 32
colors.f_other = 38;2;255;64;64
colors.e_hostname = 1;23;38;5;197
colors.e_date = 31
colors.e_box = 31
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true

5
themes/default.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;38;28;28
colors.fg = 22;24;38;2;245;245;245
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 38;2;34;140;34
colors.f_other = 38;2;255;64;64
colors.e_hostname = 38;2;255;64;64
colors.e_date = 38;2;144;144;144
colors.e_box = 38;2;122;122;122
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true

5
themes/nature.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;15;22;15
colors.fg = 22;23;24;38;2;245;245;245
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 32
colors.f_other = 38;2;255;64;64
colors.e_hostname = 38;5;28
colors.e_date = 32
colors.e_box = 32
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true

5
themes/nord.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;19;19;22
colors.fg = 22;24;38;2;245;245;245
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 32
colors.f_other = 38;2;255;64;64
colors.e_hostname = 34
colors.e_date = 38;2;66;66;88
colors.e_box = 38;2;122;122;122
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true

5
themes/old-blue-thick.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;0;0;255
colors.fg = 22;24;39;48;2;0;0;255
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 38;2;34;140;34
colors.f_other = 38;2;255;64;64
colors.e_hostname = 38;2;255;64;64
colors.e_date = 38;2;144;144;144
colors.e_box = 34
@ -27,7 +26,7 @@ strings.f_reboot = rewoot
strings.f_refresh = rewresh
strings.e_user = wuser
strings.e_passwd = passwd
strings.s_xorg = xworg
strings.s_wayland = waywand
strings.s_xorg = xworg
strings.s_shell = swell
behavior.include_defshell = true

5
themes/old-blue.ini
View File

@ -1,10 +1,9 @@
colors.bg = 48;2;0;0;255
colors.fg = 22;24;39;48;2;0;0;255
colors.err = 1;31
colors.s_wl = 38;2;255;174;66
colors.s_wayland = 38;2;255;174;66
colors.s_xorg = 38;2;37;175;255
colors.s_shell = 38;2;34;140;34
colors.f_other = 38;2;255;64;64
colors.e_hostname = 38;2;255;64;64
colors.e_date = 38;2;144;144;144
colors.e_box = 34
@ -27,7 +26,7 @@ strings.f_reboot = rewoot
strings.f_refresh = rewresh
strings.e_user = wuser
strings.e_passwd = passwd
strings.s_xorg = xworg
strings.s_wayland = waywand
strings.s_xorg = xworg
strings.s_shell = swell
behavior.include_defshell = true

5
themes/pure-tastelessness.ini
View File

@ -1,10 +1,9 @@
colors.bg = -
colors.fg = 24;39m[?25l[-
colors.err = -
colors.s_wl = -
colors.s_wayland = -
colors.s_xorg = -
colors.s_shell = -
colors.f_other = -
colors.e_hostname = 30
colors.e_date = 30
colors.e_box = -
@ -27,7 +26,7 @@ strings.f_reboot = -
strings.f_refresh = -
strings.e_user = -
strings.e_passwd = -
strings.s_xorg = -
strings.s_wayland = -
strings.s_xorg = -
strings.s_shell = -
behavior.include_defshell = false

5
themes/tasteless.ini
View File

@ -1,10 +1,9 @@
colors.bg = -
colors.fg = 24
colors.err = -
colors.s_wl = -
colors.s_wayland = -
colors.s_xorg = -
colors.s_shell = -
colors.f_other = -
colors.e_hostname = -
colors.e_date = -
colors.e_box = -
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true

5
themes/tastelessness.ini
View File

@ -1,10 +1,9 @@
colors.bg = -
colors.fg = 24;39m[?25l[-
colors.err = -
colors.s_wl = -
colors.s_wayland = -
colors.s_xorg = -
colors.s_shell = -
colors.f_other = -
colors.e_hostname = -
colors.e_date = 30
colors.e_box = -
@ -27,7 +26,7 @@ strings.f_reboot = reboot
strings.f_refresh = refresh
strings.e_user = user
strings.e_passwd = password
strings.s_xorg = xorg
strings.s_wayland = wayland
strings.s_xorg = xorg
strings.s_shell = shell
behavior.include_defshell = true