Compare commits

...

97 Commits

Author SHA1 Message Date
92d3351292
Merge pull request #50 from rmntgx/master
fix: do not overwrite theme
2025-07-03 20:36:51 +02:00
bae810eb99
Merge pull request #47 from javalsai/actions/update-aur-1.1.1
[AUR update]: Bump to 1.1.1
2025-07-01 01:56:05 +02:00
GitHub Actions
4c955053e8 Update AUR pkgs to v1.1.1 2025-06-30 23:55:37 +00:00
3bfc2f52f3
Merge pull request #46 from javalsai/fix-45
fix #45
2025-07-01 01:53:22 +02:00
59acddf652
dev: add debug utils folder 2025-07-01 01:26:35 +02:00
6c6769b2b3
chore: clean some auth logic 2025-07-01 01:16:08 +02:00
99e27dd0c0
fix(likely): #45 2025-07-01 01:09:49 +02:00
4b6d113bdb
Merge pull request #44 from javalsai/actions/update-aur-1.1.0
[AUR update]: Bump to 1.1.0
2025-06-29 19:05:26 +02:00
GitHub Actions
4fa400eb06 Update AUR pkgs to v1.1.0 2025-06-29 17:01:11 +00:00
11e9257c4a
Merge pull request #43 from javalsai/improvements
fix: broken cfg parser (blame 8403bfc2)
2025-06-29 18:57:49 +02:00
7d7cf10600
Merge pull request #42 from rmntgx/save-last-selection
Save last selection
2025-06-29 18:55:44 +02:00
64e088884d
fix: broken cfg parser (blame 8403bfc2) 2025-06-29 18:51:53 +02:00
bceb13b844
feat: save user and session as strings 2025-06-29 18:50:35 +02:00
rmntgx
f0e962ad50 fix: create directory 2025-06-29 11:51:42 +05:00
rmntgx
16d1325f96 style: formatting and linter satisfaction 2025-06-29 10:56:31 +05:00
rmntgx
1714b477ad fix: compilation error after rebase 2025-06-29 10:24:58 +05:00
rmntgx
a08ffa5a75 fix: simplified code 2025-06-29 10:20:01 +05:00
rmntgx
4a83e5d825 feature: saving previous selection 2025-06-29 10:20:00 +05:00
rmntgx
d9a1bb1e68 fix: made it simplier 2025-06-25 18:05:50 +05:00
rmntgx
8d24924e59 fix: do not overwrite theme 2025-07-02 14:18:46 +05:00
4361e1d9a2
Merge pull request #40 from javalsai/actions/update-aur-1.0.0
[AUR update]: Bump to 1.0.0
2025-06-22 21:32:19 +02:00
GitHub Actions
3d2e5c1a18 Update AUR pkgs to v1.0.0 2025-06-22 19:14:16 +00:00
2b1e4691b8
Merge pull request #38 from javalsai/improvements
improvements: #33 mainly
2025-06-22 21:10:30 +02:00
52c9c9e03b
docs: add guide on project structure and conventions 2025-06-22 01:41:32 +02:00
18fb1417f5
docs(man&md): update config manpages and md on service files 2025-06-22 01:05:27 +02:00
b2d25198e0
chore: handle all posible malloc failures 2025-06-22 00:32:35 +02:00
6ddbb407da
fix(ui): custom input not taking all width 2025-06-21 05:25:03 +02:00
8403bfc26c
fix: strlcpy usage & changes 2025-06-21 05:16:07 +02:00
002788c693
Merge branch 'master' into improvements 2025-06-21 05:15:47 +02:00
e5c1dd5973
fix(ci): bash error lol 2025-06-21 05:15:26 +02:00
b10d4373d6
fix(ci): print stderr on make failure 2025-06-21 04:37:58 +02:00
24431383a2
chore: update themes 2025-06-21 04:29:56 +02:00
55e58b46d9
fix(ui): some missing utf8 support 2025-06-21 04:21:10 +02:00
cd1f44ec41
feat: support custom format dates 2025-06-21 03:10:29 +02:00
a129fa0186
fix(typo): readme 2025-06-21 03:02:45 +02:00
1645c082bc
docs: formalize README 2025-06-21 02:17:36 +02:00
7a92035930
docs: clean up contribution guide 2025-06-21 01:41:05 +02:00
ecfd413108
dev: add make script for pre-commit'ing 2025-06-21 01:30:01 +02:00
938166366f
lint: fix code for clang-tidy 2025-06-21 01:29:43 +02:00
6d30e889d5
fix: language & format 2025-06-21 00:54:36 +02:00
e7ef64cd16
feat: ithnk full utf8 support & ui 100% consistent 2025-06-21 00:52:30 +02:00
787b412005
feat: utf8 support & partial ui.c refactor 2025-06-20 21:31:49 +02:00
d5688f5c5c
typo: Chang -> Clang 2025-06-14 00:25:01 +02:00
7ab0bc31a7
rn: valgrind-out.txt
how did the rebase make it to master ;(
2025-06-14 00:23:26 +02:00
f8ccc43794
Merge branch 'master' into improvements 2025-06-14 00:22:22 +02:00
f9cf8665b2
fix: hopefully fix actions (again Xth time) 2025-06-14 00:19:14 +02:00
fc4367b6f7
fix: grammer and shecks
(get it, shell + checks = SHecks, k i'll stop)
2025-06-14 00:08:55 +02:00
2796078186
media: update theme screenshots and gif 2025-06-13 15:42:02 +02:00
891d6f4783
feat: add scripts to view themes and take their screenshots 2025-06-13 15:40:05 +02:00
7d92c4dd2c
style(themes): renew themes to new format and fix stuff 2025-06-13 14:28:46 +02:00
5174f0b2bf
feat: modernize config
- config now is more toml like
- no need to declare all fields, it implements defaults
- no yanderedev code, introspection babbyyy 😎
- desktop and config files parser semi-unification
- misc tweaks all over (mainly allocation failures handling)
2025-06-13 14:05:19 +02:00
3480393a66
docs(man): add LIDM_LOG to manpages 2025-06-12 14:02:25 +02:00
a95f71f7a5
dev: start to implement logger in some places 2025-06-11 17:15:30 +02:00
c88bdaea06
fix: no human users found 2025-06-11 17:04:42 +02:00
7db89e973d
debug: add a logging module 2025-06-11 16:47:16 +02:00
90c0903f25
Merge branch 'master' into improvements 2025-06-11 16:20:31 +02:00
cbb3aa3910
dev: remove strcln in favor of strdup 2025-06-11 16:17:00 +02:00
aa1cafe743
lint: satisfy linter on users & better malloc handling 2025-06-11 16:11:24 +02:00
2bdb57390d
lint: satisfy some nullability annotations 2025-06-11 14:40:21 +02:00
4e18df55bf
dev: add valgrind-out.txt to .gitignore 2025-06-10 23:45:27 +02:00
bb1ca09fd8
lint(format): change format rules a bit 2025-06-10 23:44:40 +02:00
22c3f7c896
feat|perf: generic&efficient desktop&config parser 2025-06-10 23:44:09 +02:00
rmntgx
d13ebfff4e
fix: removed unnecessary libraries 2025-06-10 23:35:35 +02:00
a846c1b4c9
lint(tidy): some clang-tidy work 2025-06-10 23:32:55 +02:00
da9118346b
feat: add config open error guide message 2025-06-10 21:44:44 +02:00
6975c265f0
feat: add config open error guide message 2025-06-08 13:50:28 +02:00
511d35a7c0
Merge pull request #36 from rmntgx/master
fix: removed unnecessary libraries
2025-06-08 13:50:04 +02:00
d36ef22c9a
fix: hopefully fix actions 2025-06-08 13:36:28 +02:00
rmntgx
5263c48fe0 fix: removed unnecessary libraries 2025-06-07 12:12:04 +05:00
230c8558a7
Merge pull request #30 from rmntgx/code-formatting
Address code formatting rules
2025-06-06 20:51:51 +02:00
7d76687833
lint: apply new style 2025-06-06 20:46:55 +02:00
d6a348c543
Merge branch 'master' into code-formatting 2025-06-06 20:44:39 +02:00
93f007691e
fix(aur): package testing script 2025-06-06 20:27:01 +02:00
bc8b1104c0
Merge pull request #35 from javalsai/actions/update-aur-0.2.2
[AUR update]: Bump to 0.2.2
2025-06-06 20:15:55 +02:00
2f370ab996
fix: workflow runs on PRs (again) 2025-06-06 20:13:19 +02:00
ec00e51696
fix: workflow runs on PRs 2025-06-06 20:10:22 +02:00
GitHub Actions
abad515963 Update AUR pkgs to v0.2.2 2025-06-06 17:48:47 +00:00
b22ae6b2cc
fix: memory leaks 2025-06-06 19:40:38 +02:00
04a102a7bb
perf: better and efficient vec impl 2025-06-06 19:39:44 +02:00
dc6424979e
fix: address mem issues 2025-06-06 18:12:45 +02:00
82e92df95c
fix(aur): v0.2.1 checksums on the srcfile (again x2) 2025-06-06 17:05:14 +02:00
f2dbeb0236
Merge pull request #34 from AliensInc/master
Fixes the first two lines in the sha256sum

> *Why dont the checks runnnnnnnnnnnn*
2025-06-06 16:58:48 +02:00
Basher52
d72643c030 Fixes the first two lines in the sha256sum 2025-05-27 21:35:05 +02:00
rmntgx
15c7ec3c59
Merge branch 'javalsai:master' into code-formatting 2025-05-20 22:25:19 +05:00
f7139b16b5
Merge pull request #32 from rmntgx/memory-fixes
fix: memory leaks and memory access errors
2025-05-20 17:02:24 +02:00
rmntgx
ee6565d5b4 fix: memory leaks and memory access errors 2025-05-20 19:42:24 +05:00
rmntgx
0b02a2cef2 format: satisfy linter 2025-05-17 21:56:27 +00:00
rmntgx
44d7836955 fix: fixed file extension in CONTRIBUTING.md 2025-05-17 21:53:22 +00:00
620d861d8c
fix(aur): lidm-bin@0.2.1 checksums 2025-03-22 18:27:15 +01:00
e879561cbd
Merge pull request #28 from javalsai/actions/update-aur-0.2.1
[AUR update]: Bump to 0.2.1
2025-03-22 18:01:24 +01:00
GitHub Actions
eecfd7ac4c Update AUR pkgs to v0.2.1 2025-03-22 16:54:29 +00:00
e2014f46a9
Merge pull request #27 from Antiz96/do_not_compress_man_page
Don't compress man page(s) in Makefile

*idk why checks didn't run though, but whatever*
2025-03-22 17:42:05 +01:00
Robin Candau
5d298ea6d8
Don't compress man page(s) in Makefile
Compressing man pages is a distribution / user preference that should be handled on the packaging side of things.

Indeed, compressing man pages by default imposes a compression algorithm / level whereas most package managers handle that already and eventually allow users to choose or customize them if wanted.

Additionally, it can lead to unexpected side effects. For instance, gzip is recording timestamps in metadata by default, which prevents [reproducible builds](https://reproducible-builds.org/):

```
==> ERROR: Package is not reproducible
--- lidm-0.2.0-1-any.pkg.tar.zst
+++ ./build/lidm-0.2.0-1-any.pkg.tar.zst
├── lidm-0.2.0-1-any.pkg.tar
│ ├── file list
│ │ @@ -1,9 +1,9 @@
│ │  -rw-r--r--   0 root         (0) root         (0)     5391 2025-03-10 12:01:53.000000 .BUILDINFO
│ │ --rw-r--r--   0 root         (0) root         (0)      488 2025-03-10 12:01:53.000000 .MTREE
│ │ +-rw-r--r--   0 root         (0) root         (0)      492 2025-03-10 12:01:53.000000 .MTREE
│ │  -rw-r--r--   0 root         (0) root         (0)      427 2025-03-10 12:01:53.000000 .PKGINFO
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 2025-03-10 12:01:53.000000 etc/
│ │  -rw-r--r--   0 root         (0) root         (0)      930 2025-03-10 12:01:53.000000 etc/lidm.ini
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 2025-03-10 12:01:53.000000 usr/
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 2025-03-10 12:01:53.000000 usr/bin/
│ │  -rwxr-xr-x   0 root         (0) root         (0)    39656 2025-03-10 12:01:53.000000 usr/bin/lidm
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 2025-03-10 12:01:53.000000 usr/share/
│ ├── .MTREE
│ │ ├── .MTREE-content
│ │ │ @@ -7,10 +7,10 @@
│ │ │  /set mode=755
│ │ │  ./usr time=1741608113.0 type=dir
│ │ │  ./usr/bin time=1741608113.0 type=dir
│ │ │  ./usr/bin/lidm time=1741608113.0 size=39656 sha256digest=1a27eef50f6caf35d408f7650c362dea788c7a00a2736f0ec4c94ecd38ae6c6f
│ │ │  ./usr/share time=1741608113.0 type=dir
│ │ │  ./usr/share/man time=1741608113.0 type=dir
│ │ │  ./usr/share/man/man1 time=1741608113.0 type=dir
│ │ │ -./usr/share/man/man1/lidm.1.gz time=1741608113.0 mode=644 size=615 sha256digest=7babc0d1e7d84c3ff18db5ea327313cdbe2ba1117c33d733622a916dfd9d8d0e
│ │ │ +./usr/share/man/man1/lidm.1.gz time=1741608113.0 mode=644 size=615 sha256digest=497e49b75ab0d2c3f3edb70967bf189724990c46df23492738254395ec835d8c
│ │ │  ./usr/share/man/man5 time=1741608113.0 type=dir
│ │ │ -./usr/share/man/man5/lidm-config.5.gz time=1741608113.0 mode=644 size=1374 sha256digest=d0b54c3117c417dfdc43a7629f26cf4c64235742f698a0498722a03a4d1c25c2
│ │ │ +./usr/share/man/man5/lidm-config.5.gz time=1741608113.0 mode=644 size=1374 sha256digest=4e16649cb31029b039a594ffa2f2d4d8a624917aaacc865836c5c2d2a92cd3e4
│ ├── usr/share/man/man1/lidm.1.gz
│ │ ├── filetype from file(1)
│ │ │ @@ -1 +1 @@
│ │ │ -gzip compressed data, was "lidm.1", last modified: Mon Mar 10 12:01:59 2025, from Unix
│ │ │ +gzip compressed data, was "lidm.1", last modified: Mon Mar 10 12:15:51 2025, from Unix
│ ├── usr/share/man/man5/lidm-config.5.gz
│ │ ├── filetype from file(1)
│ │ │ @@ -1 +1 @@
│ │ │ -gzip compressed data, was "lidm-config.5", last modified: Mon Mar 10 12:01:59 2025, from Unix
│ │ │ +gzip compressed data, was "lidm-config.5", last modified: Mon Mar 10 12:15:51 2025, from Unix
```

See https://cmpct.info/~sam/blog/posts/automatic-manpage-compression/ for detailed rational.
2025-03-10 13:16:07 +01:00
b003909c3e
ci(aur pkgs): fix file checksums generation 2024-12-26 17:06:15 +01:00
47b212019a
package[aur]: update aur packages to v0.2.0 2024-12-26 16:47:37 +01:00
255256bb27
oopise: delete accidentally commited binaries
(cant force push, now I detached head and had to clone separately)
2024-12-25 23:03:39 +01:00
874f6f98f1
fix(ci): reallow nobody account 2024-12-25 22:52:26 +01:00
75 changed files with 2663 additions and 1354 deletions

View File

@ -1,2 +1,8 @@
BasedOnStyle: LLVM BasedOnStyle: Chromium
IndentWidth: 2 IndentWidth: 2
SpacesBeforeTrailingComments: 1
AllowShortIfStatementsOnASingleLine: WithoutElse
AlignAfterOpenBracket: Align
BinPackParameters: true
AllowAllParametersOfDeclarationOnNextLine: true

47
.clang-tidy Normal file
View File

@ -0,0 +1,47 @@
Checks: >
clang-analyzer-*,
-clang-analyzer-security.insecureAPI.str*,
-clang-analyzer-security.insecureAPI.mem*,
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
bugprone-*,
-bugprone-easily-swappable-parameters,
-bugprone-signal-handler,
cert-*,
-cert-msc54-cpp,
-cert-sig30-c,
modernize-*,
-modernize-macro-to-enum,
performance-*,
portability-*,
readability-*,
-readability-braces-around-statements,
WarningsAsErrors: ''
HeaderFilterRegex: '.*'
FormatStyle: file
CheckOptions:
- key: readability-magic-numbers.IgnoredIntegerValues
value: '0;1;2;3;10;255'
# - key: readability-magic-numbers.IgnoredValues
# value: '0;1;2;3;10;255'
- key: readability-identifier-naming.VariableCase
value: lower_case
- key: readability-identifier-naming.ConstantParameterCase
value: UPPER_CASE
- key: readability-identifier-naming.ConstantCase
value: "UPPER_CASE"
- key: readability-identifier-length.VariableThreshold
value: '2'
- key: readability-identifier-length.ParameterThreshold
value: '2'
- key: readability-identifier-length.LocalConstantThreshold
value: '2'
- key: readability-identifier-length.MemberThreshold
value: '2'
- key: readability-identifier-length.MinimumParameterNameLength
value: '2'
- key: readability-identifier-length.MinimumVariableNameLength
value: '2'

View File

@ -34,7 +34,7 @@ jobs:
- run: find . -type f -name '*.sh' -not -path './assets/pkg/aur/*/src/*' | xargs shellcheck - run: find . -type f -name '*.sh' -not -path './assets/pkg/aur/*/src/*' | xargs shellcheck
clangcheck: clangcheck:
name: Chang Check name: Clang Check
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
@ -55,13 +55,20 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: myrotvorets/set-commit-status-action@master
if: inputs.set-statuses
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
description: ${{ steps.build.outputs.DESCR }}
context: Build for amd64
- uses: awalsh128/cache-apt-pkgs-action@latest - uses: awalsh128/cache-apt-pkgs-action@latest
with: with:
packages: "libpam0g-dev" packages: "libpam0g-dev"
version: 1.0 version: 1.0
- id: build - id: build
run: | run: |
make -j$(nproc) 2> /tmp/stderr make -j$(nproc) 2> /tmp/stderr || (ERR=$?; cat /tmp/stderr >&2; exit $ERR)
cat /tmp/stderr >&2 cat /tmp/stderr >&2
HSIZE="$(stat --printf="%s" lidm | numfmt --to=iec-i)B" HSIZE="$(stat --printf="%s" lidm | numfmt --to=iec-i)B"
@ -92,6 +99,13 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: myrotvorets/set-commit-status-action@master
if: inputs.set-statuses
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
description: ${{ steps.build.outputs.DESCR }}
context: Build for i386
- uses: awalsh128/cache-apt-pkgs-action@latest - uses: awalsh128/cache-apt-pkgs-action@latest
with: with:
packages: "libpam0g-dev gcc-multilib" packages: "libpam0g-dev gcc-multilib"
@ -103,7 +117,7 @@ jobs:
- id: build - id: build
run: | run: |
make -j$(nproc) CFLAGS="-O3 -Wall -m32" 2> /tmp/stderr make -j$(nproc) CFLAGS="-O3 -Wall -m32" 2> /tmp/stderr || (ERR=$?; cat /tmp/stderr >&2; exit $ERR)
cat /tmp/stderr >&2 cat /tmp/stderr >&2
HSIZE="$(stat --printf="%s" lidm | numfmt --to=iec-i)B" HSIZE="$(stat --printf="%s" lidm | numfmt --to=iec-i)B"
@ -133,18 +147,23 @@ jobs:
needs: [spellcheck, shellcheck, clangcheck] needs: [spellcheck, shellcheck, clangcheck]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: myrotvorets/set-commit-status-action@master
if: inputs.set-statuses
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
description: ${{ steps.status.outputs.DESCR }}
context: Build for aarch64
- uses: uraimo/run-on-arch-action@v2 - uses: uraimo/run-on-arch-action@v2
with: with:
arch: none arch: aarch64
distro: none distro: ubuntu22.04
base_image: '--platform=linux/aarch64 ubuntu:22.04'
githubToken: ${{ github.token }} githubToken: ${{ github.token }}
install: | install: |
apt-get update && \ apt-get update && \
apt-get install -y make gcc libpam0g-dev apt-get install -y make gcc libpam0g-dev
run: | run: |
make -j$(nproc) 2> /tmp/stderr make -j$(nproc) 2> /tmp/stderr || (ERR=$?; cat /tmp/stderr >&2; exit $ERR)
cat /tmp/stderr >&2 cat /tmp/stderr >&2
mv lidm lidm-aarch64 mv lidm lidm-aarch64
@ -178,18 +197,23 @@ jobs:
needs: [spellcheck, shellcheck, clangcheck] needs: [spellcheck, shellcheck, clangcheck]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: myrotvorets/set-commit-status-action@master
if: inputs.set-statuses
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
description: ${{ steps.status.outputs.DESCR }}
context: Build for armv7
- uses: uraimo/run-on-arch-action@v2 - uses: uraimo/run-on-arch-action@v2
with: with:
arch: none arch: armv7
distro: none distro: ubuntu22.04
base_image: '--platform=linux/arm/v7 ubuntu:22.04'
githubToken: ${{ github.token }} githubToken: ${{ github.token }}
install: | install: |
apt-get update && \ apt-get update && \
apt-get install -y make gcc libpam0g-dev apt-get install -y make gcc libpam0g-dev
run: | run: |
make -j$(nproc) 2> /tmp/stderr make -j$(nproc) 2> /tmp/stderr || (ERR=$?; cat /tmp/stderr >&2; exit $ERR)
cat /tmp/stderr >&2 cat /tmp/stderr >&2
mv lidm lidm-armv7 mv lidm lidm-armv7
@ -223,18 +247,23 @@ jobs:
needs: [spellcheck, shellcheck, clangcheck] needs: [spellcheck, shellcheck, clangcheck]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: myrotvorets/set-commit-status-action@master
if: inputs.set-statuses
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: pending
description: ${{ steps.status.outputs.DESCR }}
context: Build for riscv64
- uses: uraimo/run-on-arch-action@v2 - uses: uraimo/run-on-arch-action@v2
with: with:
arch: none arch: riscv64
distro: none distro: ubuntu22.04
base_image: '--platform=linux/riscv64 riscv64/ubuntu:22.04'
githubToken: ${{ github.token }} githubToken: ${{ github.token }}
install: | install: |
apt-get update && \ apt-get update && \
apt-get install -y make gcc libpam0g-dev apt-get install -y make gcc libpam0g-dev
run: | run: |
make -j$(nproc) 2> /tmp/stderr make -j$(nproc) 2> /tmp/stderr || (ERR=$?; cat /tmp/stderr >&2; exit $ERR)
cat /tmp/stderr >&2 cat /tmp/stderr >&2
mv lidm lidm-riscv64 mv lidm lidm-riscv64

View File

@ -48,6 +48,9 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: | - run: |
chage -E -1 nobody
passwd -u nobody
cd "assets/pkg/aur" cd "assets/pkg/aur"
chown nobody:nobody . -R chown nobody:nobody . -R
su - -s /bin/bash nobody -c "$PWD/update-pkgs.sh ${{ inputs.version }}" su - -s /bin/bash nobody -c "$PWD/update-pkgs.sh ${{ inputs.version }}"

View File

@ -1,7 +1,12 @@
# Kinda based by https://github.com/myrotvorets/set-commit-status-action/actions/runs/12344741285/workflow
name: Push Checks name: Push Checks
on: on:
push push:
branches:
- master
pull_request:
workflow_dispatch:
jobs: jobs:
check-and-build: check-and-build:

2
.gitignore vendored
View File

@ -3,6 +3,8 @@ dist/
/compile_commands.json /compile_commands.json
.cache/ .cache/
# just in case, i dont wanna rebase ever again
valgrind-out.txt
# nix build result # nix build result
result result

View File

@ -10,12 +10,12 @@ CFLAGS?=-O3 -Wall
_CFLAGS=-I$(DIR) _CFLAGS=-I$(DIR)
ALLFLAGS=$(CFLAGS) -I$(IDIR) ALLFLAGS=$(CFLAGS) -I$(IDIR)
LIBS=-lm -lpam -lpam_misc LIBS=-lpam
_DEPS = util.h ui.h config.h auth.h efield.h keys.h users.h sessions.h chvt.h _DEPS = log.h util.h ui.h ui_state.h config.h desktop.h auth.h ofield.h efield.h keys.h users.h sessions.h chvt.h macros.h launch_state.h
DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS)) DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
_OBJ = main.o util.o ui.o config.o auth.o efield.o users.o sessions.o chvt.o _OBJ = main.o log.o util.o ui.o ui_state.o config.o desktop.o auth.o ofield.o efield.o users.o sessions.o chvt.o launch_state.o
OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ)) OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
$(ODIR)/%.o: $(CDIR)/%.c $(DEPS) $(ODIR)/%.o: $(CDIR)/%.c $(DEPS)
@ -33,10 +33,9 @@ clean:
install: lidm install: lidm
mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/share/man/man{1,5} mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/share/man/man{1,5}
install -Dm755 ./lidm ${DESTDIR}${PREFIX}/bin/ install -Dm755 ./lidm ${DESTDIR}${PREFIX}/bin/
install -Dm644 ./themes/default.ini ${DESTDIR}/etc/lidm.ini [ -f ${DESTDIR}/etc/lidm.ini ] || install -Dm644 ./themes/default.ini ${DESTDIR}/etc/lidm.ini
install -Dm644 ./assets/man/lidm.1 ${DESTDIR}${PREFIX}/share/man/man1/ install -Dm644 ./assets/man/lidm.1 ${DESTDIR}${PREFIX}/share/man/man1/
install -Dm644 ./assets/man/lidm-config.5 ${DESTDIR}${PREFIX}/share/man/man5/ install -Dm644 ./assets/man/lidm-config.5 ${DESTDIR}${PREFIX}/share/man/man5/
gzip -f ${DESTDIR}${PREFIX}/share/man/man{1/lidm.1,5/lidm-config.5}
uninstall: uninstall:
rm -rf ${DESTDIR}${PREFIX}/bin/lidm ${DESTDIR}/etc/lidm.ini rm -rf ${DESTDIR}${PREFIX}/bin/lidm ${DESTDIR}/etc/lidm.ini
@ -73,3 +72,9 @@ install-service-openrc:
install-service-s6: install-service-s6:
rsync -a --no-owner --no-group ./assets/services/s6/. /etc/s6/sv/lidm rsync -a --no-owner --no-group ./assets/services/s6/. /etc/s6/sv/lidm
@printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'" @printf '\x1b[1m%s\x1b[0m\n\n' " don't forget to run 's6-service add default lidm' and 's6-db-reload'"
pre-commit:
codespell
find . -type f -name '*.sh' -not -path './assets/pkg/aur/*/src/*' | xargs shellcheck
clang-format -i $$(git ls-files "*.c" "*.h")
clang-tidy -p . $$(git ls-files "*.c" "*.h")

115
README.md
View File

@ -4,9 +4,9 @@
# LiDM # LiDM
LiDM is a really light UI portion a unix [login manager](https://en.wikipedia.org/wiki/Login_manager) made in C, highly customizable and held together by hopes and prayers 🙏. LiDM is a really light unix [login manager](https://en.wikipedia.org/wiki/Login_manager) made in C, highly customizable and held together by hopes and prayers 🙏.
LiDM is like any [X Display Manager](https://en.wikipedia.org/wiki/X_display_manager) you have seen such as SDDM or GDM but without using X org graphics, instead being a purely [text based interface](https://en.wikipedia.org/wiki/Text-based_user_interface). LiDM is like any [Display Manager](https://en.wikipedia.org/wiki/X_display_manager) you have seen such as SDDM or GDM but without using any X.org graphics at all. Instead being a purely [text based interface](https://en.wikipedia.org/wiki/Text-based_user_interface) inside your terminal/TTY.
![demo gif](assets/media/lidm.gif) ![demo gif](assets/media/lidm.gif)
@ -16,43 +16,27 @@ LiDM is like any [X Display Manager](https://en.wikipedia.org/wiki/X_display_man
## Features ## Features
* Builds **FAST**. * Simple as C, you only need a C compiler and standard unix libraries to build this.
* `a32e4a5`:
* `2.830s`: laptop, -O3, -j2, `AMD E-450 APU with Radeon(tm) HD Graphics`
* `0.172s`: desktop, -O3, -j12, `AMD Ryzen 5 5600G with Radeon Graphics`
* `663427e`:
* `0.085s`: desktop, -O0, `AMD Ryzen 5 5600G with Radeon Graphics`
* `0.009s`: desktop, -O0, CC=tcc, `AMD Ryzen 5 5600G with Radeon Graphics`
* Works everywhere you can get gcc to compile.
* Fast and possibly efficient.
* Fully customizable, from strings, including action keys, to colors (I hope you know ansi escape codes) * Fully customizable, from strings, including action keys, to colors (I hope you know ansi escape codes)
* Automatically detects xorg and wayland sessions, plus allowing to launch the default user shell (if enabled in config) * Automatically detects xorg and wayland sessions, plus allowing to launch the default user shell (if enabled in config)
* Starts with many init systems (systemd, dinit, runit, openrc and s6). * Starts with many init systems (systemd, dinit, runit, openrc and s6).
## WIP
* Desktop's file `TryExec` key.
* Save last selection.
* Show/hide passwd switch.
* Long sessions, strings, usernames, passwords... they will just overflow or fuck your terminal, I know it and I don't know if I'll fix it.
* UTF characters or any multi-byte character, not yet supported properly, everything treats characters as a single byte, some chars might work or not depending on the context, but it's not designed to.
# Index # Index
- [LiDM](#lidm) * [LiDM](#lidm)
- [Features](#features) * [Features](#features)
- [WIP](#wip) * [WIP](#wip)
- [Index](#index) * [Index](#index)
- [Ideology](#ideology) * [Ideology](#ideology)
- [Usage](#usage) * [Usage](#usage)
- [Arguments](#arguments) * [Arguments](#arguments)
- [Program](#program) * [Program](#program)
- [Requirements](#requirements) * [Requirements](#requirements)
- [Installation](#installation) * [Installation](#installation)
- [Configuring](#configuring) * [Configuring](#configuring)
- [Contributing](#contributing) * [Contributing](#contributing)
- [Backstory](#backstory) * [Inspiration](#inspiration)
- [Contributors](#contributors) * [Contributors](#contributors)
# Ideology # Ideology
@ -66,66 +50,73 @@ We all know that the most important thing in a project is the ideology of the au
### Arguments ### Arguments
If a single argument is provided (don't even do `--` or standard parsing...), it passes that argument to `chvt` on startup, used (at least) by most service files. If a single argument is provided (don't even do `--` or standard unix parsing...), it switches to said tty number at startup. Used (at least) by most service files.
### Program ### Program
On top of pure intuition: Base (mostly intuitive):
* You can change focus of session/user/passwd with up/down arrows. * Use arrow keys to navigate the inputs and type over any of them to override the default value.
* In case arrow keys do nothing on the focused input (Either is empty text or doesn't have more options), it tries to change session and if there's only one session it changes user. * Enter will just attempt to login.
* Typing anything will allow to put a custom user or shell command too, you can use arrow keys to move. * If you are focused on an edited input, horizontal arrow keys will attempt to move across the text just as expected.
* ESC and then left/right arrows will force to change the option of the focused input, useful if you're editing the current input and arrow keys just move.
* Editing a predefined option on a user or a shell session, will put you in edit mode preserving the original value, other cases start from scratch. On top of that:
* Using the horizontal arrow keys if the focused input is not in text mode or the movement would overflow the input. It will try to change in such direction the option of session or the user.
* Pressing <kbd>ESC</kbd> and then horizontal arrows will force to change the option of the focused input even if it's in edit mode.
* Editing an option on a user or a shell session will put you in edit mode appending after the original value.
# Requirements # Requirements
* A computer with unix based system.
* That system should have the resources necessary for this program to make sense (Sessions, users...).
* A compiler (optional, you can compile by hand, but I doubt you want to see the code).
* Make (Also optional, but does things automatically, make sure `gcc` and `mkdir -p` work as expected). * Make (Also optional, but does things automatically, make sure `gcc` and `mkdir -p` work as expected).
* PAM, used for user authentication, just what `login` or `su` use internally. Don't worry, it's surely pre-installed. * A compiler like `cc`, `gcc` or `clang`. Make sure to use the desired `CC=<compiler>` on the `make` command.
* PAM library, used for user authentication, just what `login` or `su` use internally. Don't worry, it's surely pre-installed.
# Installation # Installation
Check the [installation guide](./INSTALL.md) to use your preferred installation source. Check the [installation guide](INSTALL.md) to use your preferred installation source.
# Configuring # Configuring
Copy any `.ini` file from [`themes/`](./themes/) (`default.ini` will always be updated) to `/etc/lidm.ini` and/or configure it to your liking. Also, don't place empty lines (for now). You can also set `LIDM_CONF` environment variable to specify a config path. Copy any `.ini` file from [`themes/`](./themes/) (`default.ini` will always be updated) to `/etc/lidm.ini` and/or configure it to your liking. You can also set `LIDM_CONF` environment variable to specify a config path.
Configured colors are just gonna be put inside `\x1b[...m`, ofc you can add an 'm' to break this and this can f\*ck up really bad or even make some nice UI effect possible, you should also be able to embed the `\x1b` byte in the config as I won't parse escape codes, I think that the parser is just gonna grab anything in the config file from the space after the `=` (yes, I'ma enforce that space, get good taste if you don't like it) until the newline, you can put any abomination in there. But please, keep in mind this might break easily. The format attempts to mimic the TOML format. Escape sequences like `\x1b` are allowed as well as comments and empty lines.
The default fg style should disable decorators set up in other elements (cursive, underline... it's just adding 20 to the number btw, so if cursive is 4 (iirc), disabling it is 24). Colors are gonna be put inside `\x1b[...m`, if you don't know what this is check [an ANSI table](https://gist.github.com/JBlond/2fea43a3049b38287e5e9cefc87b2124). Mind that `\x1b` is the same as `\e`, `\033` and several other representations.
> [!NOTE]
> The default `fg` style should disable decorators set up in other elements (cursive, underline...). It's just adding 20 to the number, so if an underline is 4, disabling it is done with 24.
> [!TIP] > [!TIP]
> If you don't like seeing an element, you can change the fg color of it to be the same as the bg, making it invisible. > If you don't like seeing an element, you can change the fg color of it to be the same as the bg, making it invisible.
# Contributing # Contributing
If you want to contribute check the [CONTRIBUTING.md](docs/CONTRIBUTING.md) If you want to contribute check the [contribution guide](docs/CONTRIBUTING.md).
# Backstory # Inspiration
Summer travelling to visit family with an old laptop that barely supports x86\_64, and ly recently added some avx2 instructions I think (invalid op codes), manually building (any previous commit too) didn't work because of something in the `build.zig` file, so out of boredom I decided to craft up my own simple display manager on the only language this thing can handle... **C** (I hate this and reserve the right for the rust rewrite, actually solid). This project was started after facing some issues building [ly](https://github.com/fairyglade/ly) on an ancient laptop, the UI is heavily inspired by it.
I spedrun it in roughly 3 days and I'm bad af in C, so this is spaghetti code on **another** level. I think it doesn't do almost anything unsafe, I mean, I didn't check allocations and it's capable of reallocating memory until your username uses all memory, crashing the system due to a off-by-one error, but pretty consistent otherwise (probably). For this reason the project's philosophy is to be simple and minimal, such that even prehistoric hardware is capable of running it.
The name is just ly but changing "y" with "i", that had a reason but forgot it, (maybe the i in *simple*), so I remembered this sh\*tty laptop with a lid, this thing is also a display manager (dm, ly command is also `ly-dm`), so just did lidm due to all that. I forgot what exactly the name came from, but it surely was a mix of a few things so:
* Obviously it's inspired by `ly`. `ly-dm` leads to "lydm".
* Wow make "lydm" simple with a "y" → "i" transformation.
* Associate it with the "i" in s**i**mple and other display managers like **Li**ghtDM.
* And the **la**ptop this project started in has a **lid**.
# Contributors # Contributors
[![GitHub Contributors](https://contrib.rocks/image?repo=javalsai/lidm\&max=20)](https://github.com/javalsai/lidm/graphs/contributors) [![GitHub Contributors](https://contrib.rocks/image?repo=javalsai/lidm\&max=20)](https://github.com/javalsai/lidm/graphs/contributors)
* KillerTofus, [made the AUR package](https://github.com/javalsai/lidm/pull/2)! Saved me from reading the Arch Wiki 💀. [killertofus](https://github.com/killertofus), [deadvey](https://github.com/deadvey), [grialion](https://github.com/grialion/), cerealexperiments\_, [antiz96](https://github.com/Antiz96), [rmntgx](https://github.com/rmntgx) and [more...](https://github.com/javalsai/lidm/graphs/contributors)
* DeaDvey, the most awesomest of all, did some pretty HARDCORE gramer checking. (and trolling, he wrote that, 33 commits of just readme changes ffs)
* grialion, made a simple C implementation of `chvt` instead of insecurely relying on `kbd utils`'s command.
* cerealexperiments\_, found a missing newline (had the guts to read the source code, crazy ik)
* ChatGPT, in times of slow laptops where pages take ages to load, a single tab connected to a bunch of burning cloud GPUs feeding corporate hype is all you need to get quick answers for your questions, as long as you know how to filter AI crap ofc.
* [My lack of gf](https://www.instagram.com/reel/C8sa3Gltmtq), can't imagine this project being possible if somebody actually cared about me daily.
--- With their big or small contributions, every commit has helped in its own way and encouraged me to keep putting my soul into this.
🌟 Finally, consider starring this repo or... 🔪 ***
![star-history](https://api.star-history.com/svg?repos=javalsai/lidm&type=Date) 🌟 Finally, consider starring this repo [or...](https://www.reddit.com/r/github/comments/1l2mchg/is_this_allowed) 🔪
![star-history](https://api.star-history.com/svg?repos=javalsai/lidm\&type=Date)

View File

@ -10,76 +10,96 @@ lidm-config \- Configuration file syntax for lidm
\fB\fI/etc/lidm.ini\fP \fB\fI/etc/lidm.ini\fP
.SH THEMES
There are themes you can take as reference or simply copy in \fBthemes/\fP, no need to tackle the config yourself. It's good to give this a read however.
.SH DESCRIPTION .SH DESCRIPTION
The \fI/etc/lidm.ini\fP file specifies all the configuration for lidm, including theme colors. The \fI/etc/lidm.ini\fP file specifies all the configuration for lidm, including theme colors. It's also possible to override this path with the \fILIDM_CONF\fP environment variable.
The config parser is very primitive still, so the file only consists of \fBkey/value\fP pairs separated by \fB' = '\fP (yes, the surrounding spaces are necessary). It will also not warn if the config is invalid. The configuration aims to mimic a toml syntax but it's not 100% compatible with it. It's grouped in tables and takes key/value pairs parsed in different modes depndending on the type. Comments and empty lines are allowed as well as surrounding whitespace at the edges of the line and the equals sign.
You can't escape characters with \fB'\\'\fP, but the program reads until the end of line, so you can put any raw bytes there. Values can be of these types:
.TP
\fBSTRING\fP
Needs to be quoted with double quotes, allows basic character escaping with a backslash as well as bytes of the form \fB\\xHH\fP, please don't put a nullbyte.
.TP
\fBBOOL\fP
Either \fBtrue\fP or \fBfalse\fP, no quoting.
.TP
\fBKEY\fP
Represents a keyboard key, must be unquoted, possible values are enumerated in \fBinclude/keys.h\fP.
.TP
\fBSTRING_ARRAY\fP
A list of strings, especified as a normal string, but reassigning to the same variable will append to that list.
.SH KEYS .SH KEYS
Similar keys are grouped together to keep this as short as possible. In case anything here is outdated, all the config structure is defined in \fBinclude/config.h\fP, you can also find the default values there. This reference is separated by tables.
.SS Colors .SS colors
All keys under this section are always wrapped inside ansi sequences (\fB\\x1b[...m\fP). All these values are of type \fBSTRING\fP.
.TP .TP
\fBcolors.bd, colors.fg, colors.err\fP \fBbd, fg, 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. 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 .TP
\fBcolors.s_wayland, colors.s_xorg, colors.s_shell\fP \fBs_wayland, s_xorg, s_shell\fP
Coloring for sessions of such types (Wayland, X.org, Shells) Coloring for sessions of such types (Wayland, X.org, Shells)
.TP .TP
.TP \fBe_hostname, e_date, e_box\fP
\fBcolors.e_hostname, colors.e_date, colors.e_box\fP
Coloring for the hostname, date and box elements. Coloring for the hostname, date and box elements.
.TP .TP
\fBcolors.e_header\fP \fB.e_header\fP
Coloring for heading elements (left column) Coloring for heading elements (left column)
.TP .TP
\fBcolors.e_user, colors.e_passwd, colors.e_badpasswd\fP \fBe_user, e_passwd, e_badpasswd\fP
Coloring for the user element, password and bad padssword. Coloring for the user element, password and bad padssword.
.TP .TP
\fBcolors.e_key\fP \fBe_key\fP
Coloring for key elements (eg: F1, F2, CTRL...) Coloring for key elements (eg: F1, F2, CTRL...)
.SS .SS chars
Single characters used for some elements (can be longer than a character, but it will likely break UI) Single characters used for some elements (could be longer than a character, but it will likely break UI code assumptions), these are also of type \fBSTRING\fP.
.TP .TP
\fBchars.hb, chars.vb\fP \fBhb, vb\fP
Character for the horizontal bar (hb) and vertical bar (vb). Character for the horizontal bar (hb) and vertical bar (vb).
.TP .TP
\fBchars.ctl, chars.ctr, chars.cbl, chars.cbr\fP \fBctl, ctr, cbl, cbr\fP
Characters for the corners of the box (ctl = corner top left, cbr = corner bottom right) Characters for the corners of the box (ctl = corner top left, cbr = corner bottom right)
.SS Functions .SS functions
All these are of type \fBKEY\fP.
.TP .TP
\fBfunctions.poweroff, functions.reboot, functions.refresh\fP \fBpoweroff, reboot, refresh\fP
Function key to use for such action. Function key to use for such action.
.SS String .SS strings
Strings to use for some elements. Display strings to use for some elements.
.TP .TP
\fBstrings.f_poweroff, strings.f_reboot, strings.f_refresh\fP \fBf_poweroff, f_reboot, f_refresh\fP
Text displayed to name such functions. Text displayed to name such functions at the bottom of the screen.
.TP .TP
\fBstrings.e_user, strings.e_passwd\fP \fBe_user, e_passwd\fP
Text to display for these element headers. Text to display for these element headers.
.TP .TP
\fBstrings.s_wayland, strings.s_xorg, strings.s_shell\fP \fBs_wayland, s_xorg, s_shell\fP
Text to display as the header for such sessions. Text to display as the header for such sessions.
.TP
\fBopts_pre, opts_post\fP
To be used for items with multiple options on the left and right sides \fB"< "\fP and \fB" >"\fP.
.SS Behavior .SS behavior
Other miscellaneous behavior strings, of mixed types
.TP .TP
\fBbehavior.include_defshell\fP \fBinclude_defshell\fP
"true"/"false" (invalid input defaults to false), if true, includes the user default shell as a session to launch Type \fBBOOL\fP, specifies if the default user shel should be included as a session.
.TP .TP
\fBbehavior.source\fP \fBsource, user_source\fP
Specify paths to source on login, simple KEY=VALUE format with comments (#) or empty'ish lines, quoting or escape sequences not supported yet. It is NOT an array, but you rather assign to it multiple times. Types \fBSTRING_ARRAY\fP. Specify paths to source on login if they exist, simple KEY=VALUE format with comments (#) or empty'ish lines, quoting or escape sequences not supported yet. \fBuser_source\fP paths are relative to user home.
.TP .TP
\fBbehavior.user_source\fP \fBtimefmt\fP
Same as \fIbehavior.source\fP but relative to user home (if present). Specify the time format string to be displayed. Check \fBstrftime (3)\fP to know the possible formatting variables.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR lidm (1) .BR lidm (1)
.BR strftime (3)

View File

@ -23,6 +23,9 @@ TTY to switch to, does not mean that it will run in it.
.TP .TP
\fBLIDM_CONF\fP \fBLIDM_CONF\fP
Specify the config to use other than \fI/etc/lidm.ini\fP Specify the config to use other than \fI/etc/lidm.ini\fP
.TP
\fBLIDM_LOG\fP
Optionally, a path to output misc logs and potential silent failures.
.SH FILES .SH FILES
.TP .TP

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 205 KiB

View File

@ -1,21 +1,20 @@
pkgbase = lidm-bin pkgbase = lidm-bin
pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary) pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
pkgver = 0.1.0 pkgver = 1.1.1
pkgrel = 1 pkgrel = 1
url = https://github.com/javalsai/lidm url = https://github.com/javalsai/lidm
arch = x86_64 arch = x86_64
license = GPL license = GPL
makedepends = gzip
depends = pam depends = pam
provides = lidm provides = lidm
conflicts = lidm conflicts = lidm
source = lidm::https://github.com/javalsai/lidm/releases/download/v0.1.0/lidm-amd64 source = lidm::https://github.com/javalsai/lidm/releases/download/v1.1.1/lidm-amd64
source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v0.1.0/themes/default.ini source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/themes/default.ini
source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v0.1.0/assets/man/lidm.1 source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/assets/man/lidm.1
source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v0.1.0/assets/man/lidm-config.5 source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/assets/man/lidm-config.5
sha256sums = b5d1dbdaa6b78da57be69ce5e2cc3366717a045de3cb316e66c1c3f36b796ee0 sha256sums = c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf
sha256sums = 27db9b0cd2da80c0c60dcb13dfad0f9d65e7dddbb7b344b859803b9ac3943cd7 sha256sums = a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542
sha256sums = a6807a55ff72ec5a5678583156b3efd0d367f0bcb79854094132771f0cb86bce sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8
sha256sums = c44f78940212b946e157eac02e159b215376d291d11adfe4925b594405ad85da sha256sums = 5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f
pkgname = lidm-bin pkgname = lidm-bin

View File

@ -1,10 +1,9 @@
# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
# Maintainer: javalsai <javalsai@proton.me> # Maintainer: javalsai <javalsai@proton.me>
pkgname=lidm-bin pkgname=lidm-bin
pkgver=0.1.0 pkgver=1.1.1
pkgrel=1 pkgrel=1
depends=('pam') depends=('pam')
makedepends=('gzip')
pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)" pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
arch=('x86_64') arch=('x86_64')
url="https://github.com/javalsai/lidm" url="https://github.com/javalsai/lidm"
@ -17,15 +16,14 @@ source=(
"lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1" "lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
"lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5" "lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
) )
sha256sums=('b5d1dbdaa6b78da57be69ce5e2cc3366717a045de3cb316e66c1c3f36b796ee0' sha256sums=('c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf'
'27db9b0cd2da80c0c60dcb13dfad0f9d65e7dddbb7b344b859803b9ac3943cd7' 'a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542'
'a6807a55ff72ec5a5678583156b3efd0d367f0bcb79854094132771f0cb86bce' '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8'
'c44f78940212b946e157eac02e159b215376d291d11adfe4925b594405ad85da') '5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f')
package() { package() {
install -Dm755 lidm "${pkgdir}/usr/bin/lidm" install -Dm755 lidm "${pkgdir}/usr/bin/lidm"
install -Dm644 default-theme.ini "${pkgdir}/etc/lidm.ini" install -Dm644 default-theme.ini "${pkgdir}/etc/lidm.ini"
install -Dm644 lidm.1 "${pkgdir}/usr/share/man/man1/lidm.1" install -Dm644 lidm.1 "${pkgdir}/usr/share/man/man1/lidm.1"
install -Dm644 lidm-config.5 "${pkgdir}/usr/share/man/man5/lidm-config.5" install -Dm644 lidm-config.5 "${pkgdir}/usr/share/man/man5/lidm-config.5"
gzip -f "${pkgdir}"/usr/share/man/man{1/lidm.1,5/lidm-config.5}
} }

View File

@ -1,7 +1,7 @@
# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
# Maintainer: javalsai <javalsai@proton.me> # Maintainer: javalsai <javalsai@proton.me>
pkgname=lidm-git pkgname=lidm-git
pkgver=0.1.0.r0.g8071694 pkgver=1.1.1.r0.g3bfc2f5
pkgrel=1 pkgrel=1
depends=('pam') depends=('pam')
makedepends=('git' 'make' 'gcc') makedepends=('git' 'make' 'gcc')

View File

@ -1,15 +1,14 @@
pkgbase = lidm pkgbase = lidm
pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag) pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
pkgver = 0.1.0 pkgver = 1.1.1
pkgrel = 2 pkgrel = 1
url = https://github.com/javalsai/lidm url = https://github.com/javalsai/lidm
arch = any arch = any
license = GPL license = GPL
makedepends = git makedepends = git
makedepends = gcc makedepends = gcc
makedepends = gzip
depends = pam depends = pam
source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v0.1.0.tar.gz source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.1.1.tar.gz
sha256sums = de1981603f3fa54caacfcd68cc07d650c186990175baf210ba5275d6450e5030 sha256sums = 915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479
pkgname = lidm pkgname = lidm

View File

@ -1,16 +1,16 @@
# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
# Maintainer: javalsai <javalsai@proton.me> # Maintainer: javalsai <javalsai@proton.me>
pkgname=lidm pkgname=lidm
pkgver=0.1.0 pkgver=1.1.1
pkgrel=2 pkgrel=1
depends=('pam') depends=('pam')
makedepends=('git' 'gcc' 'gzip') makedepends=('git' 'gcc')
pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)" pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)"
arch=('any') arch=('any')
url="https://github.com/javalsai/lidm" url="https://github.com/javalsai/lidm"
license=('GPL') license=('GPL')
source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz") source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
sha256sums=('de1981603f3fa54caacfcd68cc07d650c186990175baf210ba5275d6450e5030') sha256sums=('915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479')
build() { build() {
tar -xzf "tarball.tar.gz" tar -xzf "tarball.tar.gz"

View File

@ -5,8 +5,14 @@ MYSELF=$(realpath "$0")
MYDIR=$(dirname "$MYSELF") MYDIR=$(dirname "$MYSELF")
for pkg in "$MYDIR"/*/; do for pkg in "$MYDIR"/*/; do
cd "$pkg"
printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg" printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
cd "$pkg"
# shellcheck disable=SC1091
source "PKGBUILD"
for source in "${source[@]}"; do
awk -F'::' '{print $1}' <<<"$source" | xargs rm -rf
done
rm -rf ./*.{gz,zst} src pkg rm -rf ./*.{gz,zst} src pkg
makepkg -f . makepkg -f .

View File

@ -16,6 +16,13 @@ for pkg in "$MYDIR"/lidm{,-bin}/; do
printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg" printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD
sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD
grep 'source = ' <.SRCINFO | awk -F'= |::' '{print $2}' | \
while read -r srcfile; do
printf "\x1b[31mDeleting '%s'\x1b[0m\n" "$srcfile"
rm -f "$srcfile"
done
updpkgsums updpkgsums
makepkg --printsrcinfo | tee .SRCINFO makepkg --printsrcinfo | tee .SRCINFO
echo echo

View File

@ -8,6 +8,9 @@ There's make scripts to automatically copy the service files to the proper locat
The manual steps for installation are: The manual steps for installation are:
> [!IMPORTANT]
> If you think this should be packaged too, there's [a discussion](https://github.com/javalsai/lidm/discussions/39) to talk about this.
## Systemd ## Systemd
* Copy `systemd.service` to `/etc/systemd/system/lidm.service` * Copy `systemd.service` to `/etc/systemd/system/lidm.service`
@ -35,5 +38,5 @@ The manual steps for installation are:
* Add the service with `s6-service add default lidm` * Add the service with `s6-service add default lidm`
* Reload the database with `s6-db-reload` (you might have to run this every time the service file changes) * Reload the database with `s6-db-reload` (you might have to run this every time the service file changes)
> \[!WARNING] > [!WARNING]
> Make sure to disable any other service that might run on tty7, such us lightdm or most display managers out there. > Make sure to disable any other service that might run on tty7, such us lightdm or most display managers out there.

3
debug/README.md Normal file
View File

@ -0,0 +1,3 @@
# Debug
This folder contains debug utils like gdb scripts. They are not guaranteed to work but can ease some tasks when debugging.

59
debug/debug.gdb Normal file
View File

@ -0,0 +1,59 @@
# this just meant to run in another term, is probably better to attach to another already running window
set inferior-tty /dev/pts/7
set pagination off
break *(read_press + 62)
define fake_read
set *((char*) $rsi) = $al
set $rax = 1
jump *(read_press + 67)
end
break *(read_press + 108)
define fake_magic_cont
set $eax = 1
jump *(read_press + 113)
end
define fake_magic_end
set $eax = 0
jump *(read_press + 113)
end
run
set $al = 0x1b
fake_read
fake_magic_cont
set $al = '['
fake_read
fake_magic_cont
set $al = 'D'
fake_read
fake_magic_end
set $al = 'p'
fake_read
fake_magic_end
set $al = 'a'
fake_read
fake_magic_end
set $al = 's'
fake_read
fake_magic_end
set $al = 's'
fake_read
fake_magic_end
set $al = 'w'
fake_read
fake_magic_end
set $al = 'd'
fake_read
fake_magic_end
set $al = '\n'
fake_read
fake_magic_end

View File

@ -2,38 +2,46 @@
Contributions are welcome! Here's how you can help: Contributions are welcome! Here's how you can help:
- [Contributing code](#code) * [Contributing code](#code)
- [Reporting issues](#issues) * [Reporting issues](#issues)
* [Other](#other)
## Code ## Code
For small fixes or incremental improvements simply fork the repo and follow the process below. For larger changes submit an [RFC:](RFC.md) For small fixes or incremental improvements simply fork the repo and follow the process below.
1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork. 1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork.
2. Start coding! 2. Start coding! (it might be helpful to read a [quide on the project structure and conventions](structure.md) before this)
- Configure clangd LSP by generating `compile_commands.json` (e.g. `bear -- make` or `compiledb make`) * Configure clangd LSP by generating `compile_commands.json` (e.g. `bear -- make` or `compiledb make`)
- Implement your feature. * Implement your feature.
- Check your code works as expected. * Check your code works as expected.
- Run the code formatter: `clang-format -i $(git ls-files "*.cpp" "*.h")` * Run the code formatter: `clang-format -i $(git ls-files "*.c" "*.h")`
* Run the code linter: `clang-tidy -p . $(git ls-files "*.c" "*.h")`. Some checks are pretty pedantic, feel free to ignore or debate some of the rules.
* If you prefer, you can run `make pre-commit` to run several code style checks like the avobe along a few extra stuff.
3. Commit your changes to a new branch (not `master`, one change per branch) and push it: 3. Commit your changes to a new branch (not `master`, one change per branch) and push it:
- Commit messages should: * Commit messages should:
- Header line: explain the commit in one line (use the imperative) * Header line: explain the commit in one line (use the imperative) ("feat" for features, "fix", "style", "chore", "docs", etc)
- Be descriptive. * Be descriptive.
- Have a first line with less than *80 characters* and have a second line that is *empty* if you want to add a description. * Don't make the title too long and add commit descriptions if you think the changes need it.
* e.g. "feat: add support for X", "fix(config): config parser segfaulting", "docs(typo): fix a typo in README.md"
4. Once you are happy with your changes, submit a pull request. 4. Once you are happy with your changes, submit a pull request.
- Open the pull request. * Open the pull request.
- Add a short description explaining briefly what you've done (or if it's a work-in-progress - what you need to do) * Add a short description explaining what you've done (or if it's a work-in-progress - what you need to do)
## Issues ## Issues
1. Do a quick search on GitHub to check if the issue has already been reported. 1. Do a quick search on GitHub to check if the issue has already been reported.
2. [Open an issue](https://github.com//javalsai/lidm/issues/new) and describe the issue you are having - you could include: 2. [Open an issue](https://github.com//javalsai/lidm/issues/new) and describe the issue you are having - you could include:
- Screenshots. * Screenshots.
- Ways to reproduce the issue. * Ways to reproduce the issue.
- Your lidm version. * Your lidm version.
- Your platform (e.g. arch linux or Ubuntu 15.04 x64) * Your platform (e.g. arch linux or Ubuntu 15.04 x64) and init system if you know.
After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue. After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue.
## Other
If you are unsure what category your contribution falls under, feel free to [open an issue](https://github.com//javalsai/lidm/issues/new) or [a discussion](https://github.com//javalsai/lidm/discussions/new) to talk about it.

89
docs/structure.md Normal file
View File

@ -0,0 +1,89 @@
# Introduction
This file aims to explain the basic project structure and some code conventions
and patterns used for contributors. If you plan on contributing a considerable
amount of code, please read this thoroughly to keep the project behavior
consistent.
Even if your changes are not very related to the code, this guide can help to
understand how they can be related to the rest of the project and what side
changes it can require.
# Structure
The file structure is very simple, you have `.c` files in `src/` with their
header `.h` counterpart in `include/`, they are listed in the `Makefile` and
built all together on the same layer.
Each file contains functions aimed to provide some specialized behavior, they
tend to follow a common prefix (like `vec_` for vector functions) to avoid name
collisions with themselves.
## Important Files
The `main.c` of course provides the entry point of the program, then each file
has special functionality, but a special one is `util.h`, is linked with almost
every file and provides some shared utilities to dealing with UTF-8, dynamic
Vectors and other stuff.
`log.c` is also an important file as it provides logging utilities for
debugging, there's no need to deal with it's initialization, it behaves just
like standard printing utilities but integrated into the configured logfile.
# Debugging
The log module can be easily used by just setting up the `LIDM_LOG`
environmental variable to the logs output path.
# Header Files
But what if you create a new file? It's important that the definitions are only
evaluated once by the compiler, even if they are included by several files. For
this, you can use this simple trick (assume this is for a file named
`mylib.h`):
```h
#ifndef MYLIBH_
#define MYLIBH_
// library contents
// ...
#endif
```
It's also a good idea to include brief comments above functions if it's not
evident what they do and name all parameters.
# Nullability Checks
Nullability checks are not really enforced in the code but it's never a bad
idea to include them, however, `gcc` doesn't support them under certain
conditions.
For this you can use `NULLABLE`, `NNULLABLE` and `UNULLABLE` macros from
`"macros.h"` to conditionally include `_Nullable`, `_Nonnull` and
`_Null-unspecified` respectively.
# Handling & Support
Every function should properly handle allocation failures (avoid them with
stack arrays where possible), support UTF-8 strings, use the `log` module
instead of printing to stdout (messing with the state of the ui) and free all
lost memory (if it can be lost before reaching the final stage where it execs
another program, I'm fine with not freeing memory still reachable at the end).
# Code format, style and linting
Be reasonable and follow `clang-format` and `clang-tidy` rules. `clang-tidy`
can be quite pedantic with the current primitive rules, so feel free to use
`LINTIGNORE` or discuss if said rule should be enforced in first place.
Also avoid grammar typos and for shell scripts use `shellcheck`, you can run
this checks with `make pre-commit` if you have the required tools.
# Documentation
Please, also check if there's documentation related to the feature/changes you
are implementing, could be on markdown or manpages, if there is and you have
some spare time, it's really helpful to update it; although not enforced.

View File

@ -1,11 +1,12 @@
#ifndef _AUTHH_ #ifndef AUTHH_
#define _AUTHH_ #define AUTHH_
#include <stdbool.h> #include <stdbool.h>
#include "config.h" #include "config.h"
#include "sessions.h" #include "sessions.h"
bool launch(char *user, char *passwd, struct session session, void (*cb)(void), struct behavior* behavior); bool launch(char* user, char* passwd, struct session session, void (*cb)(void),
struct config* config);
#endif #endif

View File

@ -1,5 +1,5 @@
#ifndef _CHVTH_ #ifndef CHVTH_
#define _CHVTH_ #define CHVTH_
#include <fcntl.h> #include <fcntl.h>
#include <linux/kd.h> #include <linux/kd.h>

View File

@ -1,82 +1,163 @@
#ifndef _CONFIGH_ #ifndef CONFIGH_
#define _CONFIGH_ #define CONFIGH_
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stddef.h>
#include "keys.h" #include "keys.h"
#include "macros.h"
#include "util.h" #include "util.h"
enum introspection_type {
STRING,
BOOL,
KEY,
STRING_ARRAY,
};
static const char* NNULLABLE const INTROS_TYS_NAMES[] = {
[STRING] = "STRING",
[BOOL] = "BOOL",
[KEY] = "KEY",
[STRING_ARRAY] = "STRING_ARRAY",
};
struct introspection_item {
char* NNULLABLE name;
size_t offset;
enum introspection_type typ;
};
#define INTROS_ITEM(key, table, ty) \
{ \
.name = #key, \
.offset = offsetof(table, key), \
.typ = (ty), \
}
#define STRUCT_BUILDER(cty, name, ty, def, tname) cty name;
#define DEFAULT_BUILDER(cty, name, ty, def, tname) .name = (def),
#define INTROS_BUILDER(cty, name, ty, def, tname) \
INTROS_ITEM(name, struct table_##tname, ty),
#define BUILD_TABLE(table, TABLE) \
struct table_##table { \
TABLE(STRUCT_BUILDER, table) \
}
#define BUILD_DEFAULT(utable, table, TABLE) \
static const struct table_##table DEFAULT_TABLE_##utable = { \
TABLE(DEFAULT_BUILDER, table)}
#define BUILD_INTROS(utable, table, TABLE) \
static const struct introspection_item INTROS_TABLE_##utable[] = { \
TABLE(INTROS_BUILDER, table)}
#define BUILD(table, utable, TABLE) \
BUILD_TABLE(table, TABLE); \
BUILD_DEFAULT(utable, table, TABLE); \
BUILD_INTROS(utable, table, TABLE);
// should be ansi escape codes under \x1b[...m // should be ansi escape codes under \x1b[...m
// if not prepared accordingly, it might break // if not prepared accordingly, it might break
struct theme_colors { #define TABLE_COLORS(F, name) \
char *bg; F(char* NNULLABLE, bg, STRING, "48;2;38;28;28", name) \
char *fg; F(char* NNULLABLE, fg, STRING, "22;24;38;2;245;245;245", name) \
char *err; F(char* NNULLABLE, err, STRING, "1;31", name) \
char *s_wayland; F(char* NNULLABLE, s_wayland, STRING, "38;2;255;174;66", name) \
char *s_xorg; F(char* NNULLABLE, s_xorg, STRING, "38;2;37;175;255", name) \
char *s_shell; F(char* NNULLABLE, s_shell, STRING, "38;2;34;140;34", name) \
char *e_hostname; F(char* NNULLABLE, e_hostname, STRING, "38;2;255;64;64", name) \
char *e_date; F(char* NNULLABLE, e_date, STRING, "38;2;144;144;144", name) \
char *e_box; F(char* NNULLABLE, e_box, STRING, "38;2;122;122;122", name) \
char *e_header; F(char* NNULLABLE, e_header, STRING, "4;38;2;0;255;0", name) \
char *e_user; F(char* NNULLABLE, e_user, STRING, "36", name) \
char *e_passwd; F(char* NNULLABLE, e_passwd, STRING, "4;38;2;245;245;205", name) \
char *e_badpasswd; F(char* NNULLABLE, e_badpasswd, STRING, "3;4;31", name) \
char *e_key; F(char* NNULLABLE, e_key, STRING, "38;2;255;174;66", name)
};
BUILD(colors, COLORS, TABLE_COLORS);
// even if they're multiple bytes long // even if they're multiple bytes long
// they should only take up 1 char size on display // they should only take up 1 char size on display
struct theme_chars { #define TABLE_CHARS(F, name) \
char *hb; F(char* NNULLABLE, hb, STRING, "", name) \
char *vb; F(char* NNULLABLE, vb, STRING, "", name) \
F(char* NNULLABLE, ctl, STRING, "", name) \
F(char* NNULLABLE, ctr, STRING, "", name) \
F(char* NNULLABLE, cbl, STRING, "", name) \
F(char* NNULLABLE, cbr, STRING, "", name)
char *ctl; BUILD(chars, CHARS, TABLE_CHARS);
char *ctr;
char *cbl;
char *cbr;
};
struct theme { #define TABLE_FUNCTIONS(F, name) \
struct theme_colors colors; F(enum keys, poweroff, KEY, F1, name) \
struct theme_chars chars; F(enum keys, reboot, KEY, F2, name) \
}; F(enum keys, refresh, KEY, F5, name)
struct functions { BUILD(functions, FUNCTIONS, TABLE_FUNCTIONS);
enum keys poweroff;
enum keys reboot;
enum keys refresh;
};
struct strings { #define TABLE_STRINGS(F, name) \
char *f_poweroff; F(char* NNULLABLE, f_poweroff, STRING, "poweroff", name) \
char *f_reboot; F(char* NNULLABLE, f_reboot, STRING, "reboot", name) \
char *f_refresh; F(char* NNULLABLE, f_refresh, STRING, "refresh", name) \
char *e_user; F(char* NNULLABLE, e_user, STRING, "user", name) \
char *e_passwd; F(char* NNULLABLE, e_passwd, STRING, "password", name) \
char *s_wayland; F(char* NNULLABLE, s_wayland, STRING, "wayland", name) \
char *s_xorg; F(char* NNULLABLE, s_xorg, STRING, "xorg", name) \
char *s_shell; F(char* NNULLABLE, s_shell, STRING, "shell", name) \
}; F(char* NNULLABLE, opts_pre, STRING, "< ", name) \
F(char* NNULLABLE, opts_post, STRING, " >", name)
struct behavior { BUILD(strings, STRINGS, TABLE_STRINGS);
bool include_defshell;
struct Vector source;
struct Vector user_source;
};
#define NULL_VEC \
(struct Vector) { \
0, 0, NULL \
}
#define TABLE_BEHAVIOR(F, name) \
F(bool, include_defshell, BOOL, true, name) \
F(struct Vector, 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);
//// CONFIG
struct config { struct config {
struct theme theme; struct table_colors colors;
struct functions functions; struct table_chars chars;
struct strings strings; struct table_functions functions;
struct behavior behavior; struct table_strings strings;
struct table_behavior behavior;
}; };
bool line_parser( static const struct config DEFAULT_CONFIG = {
FILE *fd, ssize_t *blksize, .colors = DEFAULT_TABLE_COLORS,
u_char (*cb)(char *key, .chars = DEFAULT_TABLE_CHARS,
char *value)); // might use this for parsing .desktop files too .functions = DEFAULT_TABLE_FUNCTIONS,
struct config *parse_config(char *path); .strings = DEFAULT_TABLE_STRINGS,
.behavior = DEFAULT_TABLE_BEHAVIOR,
};
struct introspection_table {
char* NNULLABLE tname;
size_t offset;
const struct introspection_item* NNULLABLE intros;
size_t len;
};
static const struct introspection_table CONFIG_INSTROSPECTION[] = {
{"colors", offsetof(struct config, colors), INTROS_TABLE_COLORS,
sizeof(INTROS_TABLE_COLORS) / sizeof(INTROS_TABLE_COLORS[0])},
{"chars", offsetof(struct config, chars), INTROS_TABLE_CHARS,
sizeof(INTROS_TABLE_CHARS) / sizeof(INTROS_TABLE_CHARS[0])},
{"functions", offsetof(struct config, functions), INTROS_TABLE_FUNCTIONS,
sizeof(INTROS_TABLE_FUNCTIONS) / sizeof(INTROS_TABLE_FUNCTIONS[0])},
{"strings", offsetof(struct config, strings), INTROS_TABLE_STRINGS,
sizeof(INTROS_TABLE_STRINGS) / sizeof(INTROS_TABLE_STRINGS[0])},
{"behavior", offsetof(struct config, behavior), INTROS_TABLE_BEHAVIOR,
sizeof(INTROS_TABLE_BEHAVIOR) / sizeof(INTROS_TABLE_BEHAVIOR[0])},
};
//// FUNCTIONS
int parse_config(struct config* NNULLABLE config, char* NNULLABLE path);
#endif #endif

20
include/desktop.h Normal file
View File

@ -0,0 +1,20 @@
#ifndef DESKTOPH_
#define DESKTOPH_
#include <stdbool.h>
#include <stdio.h>
#include "macros.h"
struct status {
bool finish;
int ret;
};
int read_desktop(FILE* NNULLABLE fd, void* UNULLABLE ctx,
struct status (*NNULLABLE cb)(void* UNULLABLE ctx,
char* NULLABLE table,
char* NNULLABLE key,
char* NNULLABLE value));
#endif

View File

@ -1,18 +1,18 @@
#ifndef _EFIELDH_ #ifndef EFIELDH_
#define _EFIELDH_ #define EFIELDH_
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
// holds also the max string buffer in itself, not dynamic
struct editable_field { struct editable_field {
u_char length;
u_char pos; u_char pos;
char content[255]; char content[255];
}; };
struct editable_field field_new(char *); struct editable_field efield_new(char* content);
void field_trim(struct editable_field *, u_char); void efield_trim(struct editable_field* self, u_char pos);
void field_update(struct editable_field *, char *); void efield_update(struct editable_field* self, char* update);
bool field_seek(struct editable_field *, char); bool efield_seek(struct editable_field* self, char seek);
#endif #endif

View File

@ -1,5 +1,5 @@
#ifndef _KEYSH_ #ifndef KEYSH_
#define _KEYSH_ #define KEYSH_
#include <stdlib.h> #include <stdlib.h>
@ -34,7 +34,7 @@ enum keys {
PAGE_DOWN, PAGE_DOWN,
}; };
static const char *const key_names[] = { static const char* const KEY_NAMES[] = {
[ESC] = "ESC", [ESC] = "ESC",
[F1] = "F1", [F1] = "F1",
[F2] = "F2", [F2] = "F2",
@ -70,7 +70,7 @@ struct key_mapping {
const char* sequences[3]; const char* sequences[3];
}; };
static const struct key_mapping key_mappings[] = { static const struct key_mapping KEY_MAPPINGS[] = {
{ESC, {"\x1b", NULL}}, {ESC, {"\x1b", NULL}},
{F1, {"\x1bOP", "\x1b[[A", NULL}}, {F1, {"\x1bOP", "\x1b[[A", NULL}},
{F2, {"\x1bOQ", "\x1b[[B", NULL}}, {F2, {"\x1bOQ", "\x1b[[B", NULL}},

17
include/launch_state.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef LAUNCHSTATEH_
#define LAUNCHSTATEH_
#include <stdbool.h>
#include <sys/stat.h>
#include "macros.h"
struct LaunchState {
char* NNULLABLE username;
char* NNULLABLE session_opt;
};
int read_launch_state(struct LaunchState* NNULLABLE state);
bool write_launch_state(struct LaunchState state);
#endif

12
include/log.h Normal file
View File

@ -0,0 +1,12 @@
#ifndef LOGH_
#define LOGH_
#include <stdio.h>
void log_init(FILE* fd);
void log_puts(const char* msg);
void log_printf(const char* fmt, ...);
// NOLINTNEXTLINE(readability-identifier-length)
void log_perror(const char* s);
#endif

25
include/macros.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef MACROSH_
#define MACROSH_
// Do we just replace the compiler with clang??
#if defined(__clang__)
#define NULLABLE _Nullable
#else
#define NULLABLE
#endif
#if defined(__clang__)
#define NNULLABLE _Nonnull
#else
#define NNULLABLE
#endif
#if defined(__clang__)
#define UNULLABLE _Null_unspecified
#else
#define UNULLABLE
#endif
#define LEN(X) (sizeof(X) / sizeof((X)[0]))
#endif

23
include/ofield.h Normal file
View File

@ -0,0 +1,23 @@
#ifndef OFIELD_
#define OFIELD_
#include <stddef.h>
#include "efield.h"
// related vector is external, indexing at 1, 0 means empty and hence points to
// the editable_field
struct opts_field {
size_t opts;
size_t current_opt;
struct editable_field efield;
};
struct opts_field ofield_new(size_t opts);
void ofield_toedit(struct opts_field* self, char* init);
void ofield_kbd_type(struct opts_field* self, char* typed, char* empty_default);
bool ofield_opts_seek(struct opts_field* self, char seek);
bool ofield_seek(struct opts_field* self, char seek);
u_char ofield_display_cursor_col(struct opts_field* self, u_char maxlen);
#endif

View File

@ -1,8 +1,9 @@
#ifndef _SESSIONSH_ #ifndef SESSIONSH_
#define _SESSIONSH_ #define SESSIONSH_
#include <sys/types.h> #include <sys/types.h>
#include "macros.h"
#include "util.h" #include "util.h"
enum session_type { enum session_type {
@ -12,9 +13,9 @@ enum session_type {
}; };
struct session { struct session {
char *name; char* NNULLABLE name;
char *exec; char* NNULLABLE exec;
char *tryexec; char* NULLABLE tryexec;
enum session_type type; enum session_type type;
}; };

View File

@ -1,12 +1,55 @@
#ifndef _UIH_ #ifndef UIH_
#define _UIH_ #define UIH_
#include "config.h" #include "config.h"
#include "ofield.h"
#include "util.h" #include "util.h"
void setup(struct config); // [box_start]
// ↓
// 0 [┌]───────────────────────────────────────────────┐
// 1 │ │
// 2 │ the-art 2025-06-20 21:40:44 │
// 3 │ | │
// 4 │ | │
// 5 │ xorg < Default > | │
// 6 │ | │
// 7 │ user javalsai | │
// 8 │ | │
// 9 │ password ________________________________ │
// 10 │ | | │
// 11 └────────────────────────────────────────────────┘
// 01234567890123456789012345678901234567890123456789
// 00000000001111111111222222222233333333334444444444
// |--| | ↑ |--|[BOX_HMARGIN]
// [BOX_HMARGIN] [VALUES_COL] |
// |---|[VALUES_SEPR] |
// |--------------------------------|[VALUE_MAXLEN]
#define HEAD_ROW 2
#define SESSION_ROW 5
#define USER_ROW 7
#define PASSWD_ROW 9
#define BOX_WIDTH 50
#define BOX_HEIGHT 12
#define BOX_HMARGIN 2
#define VALUES_COL 15
#define VALUES_SEPR 3
#define VALUE_MAXLEN (BOX_WIDTH - VALUES_COL + 1 - BOX_HMARGIN - 2)
enum input { SESSION, USER, PASSWD };
extern const u_char INPUTS_N;
void setup(struct config* config);
int load(struct Vector* users, struct Vector* sessions); int load(struct Vector* users, struct Vector* sessions);
void print_err(const char *); void print_err(const char* /*msg*/);
void print_errno(const char *); void print_errno(const char* /*descr*/);
void ui_update_field(enum input focused_input);
void ui_update_ffield();
void ui_update_ofield(struct opts_field* self);
void ui_update_cursor_focus();
#endif #endif

29
include/ui_state.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef UISTATEH_
#define UISTATEH_
#include <stddef.h>
#include "macros.h"
#include "ui.h"
extern enum input focused_input;
extern struct opts_field of_session;
extern struct opts_field of_user;
extern struct opts_field of_passwd;
extern struct Vector* UNULLABLE gusers;
extern struct Vector* UNULLABLE gsessions;
struct opts_field* NNULLABLE get_opts_field(enum input from);
struct opts_field* NNULLABLE get_opts_ffield();
struct user st_user();
struct session st_session(bool include_defshell);
void st_ch_focus(char direction);
void st_ch_of_opts(char direction);
void st_ch_ef_col(char direction);
void st_kbd_type(char* NNULLABLE text, bool cfg_include_defshell);
#endif

View File

@ -1,5 +1,5 @@
#ifndef _USERSH_ #ifndef USERSH_
#define _USERSH_ #define USERSH_
#include <sys/types.h> #include <sys/types.h>

View File

@ -1,31 +1,40 @@
#ifndef _UTILH_ #ifndef UTILH_
#define _UTILH_ #define UTILH_
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include "keys.h" #include "keys.h"
enum keys find_keyname(char *); int find_keyname(enum keys* at, const char* name);
enum keys find_ansi(char *); enum keys find_ansi(const char* seq);
void read_press(u_char *, char *); void read_press(u_char* length, char* out);
void strcln(char **dest, const char *source);
bool utf8_iscont(char byte);
size_t utf8len(const char* str);
size_t utf8len_until(const char* str, const char* until);
const char* utf8back(const char* str);
const char* utf8seek(const char* str);
const char* utf8seekn(const char* str, size_t n);
struct Vector { struct Vector {
uint32_t length; uint32_t length;
uint32_t alloc_len; uint32_t capacity;
uint16_t alloc_size;
void** pages; void** pages;
}; };
struct Vector vec_new(); extern const struct Vector VEC_NEW;
int vec_push(struct Vector*, void* item); int vec_resize(struct Vector* self, size_t size);
void vec_free(struct Vector*); int vec_reserve(struct Vector* self, size_t size);
void vec_clear(struct Vector*); int vec_reserve_exact(struct Vector* self, size_t size);
void vec_reset(struct Vector*); int vec_push(struct Vector* self, void* item);
void* vec_pop(struct Vector*); // won't free it, nor shrink vec list space void vec_free(struct Vector* self);
void* vec_get(struct Vector*, size_t index); void vec_clear(struct Vector* self);
void vec_reset(struct Vector* self);
void* vec_pop(struct Vector* self); // won't free it, nor shrink vec list space
void* vec_get(struct Vector* self, size_t index);
#endif #endif

View File

@ -19,6 +19,9 @@ int pam_conversation(int num_msg, const struct pam_message **msg,
struct pam_response** resp, void* appdata_ptr) { struct pam_response** resp, void* appdata_ptr) {
struct pam_response* reply = struct pam_response* reply =
(struct pam_response*)malloc(sizeof(struct pam_response) * num_msg); (struct pam_response*)malloc(sizeof(struct pam_response) * num_msg);
if (!reply) {
return PAM_BUF_ERR;
}
for (size_t i = 0; i < num_msg; i++) { for (size_t i = 0; i < num_msg; i++) {
reply[i].resp = NULL; reply[i].resp = NULL;
reply[i].resp_retcode = 0; reply[i].resp_retcode = 0;
@ -39,7 +42,9 @@ int pam_conversation(int num_msg, const struct pam_message **msg,
return NULL; \ return NULL; \
} }
void clear_screen() { printf("\x1b[H\x1b[J"); } void clear_screen() {
printf("\x1b[H\x1b[J");
}
pam_handle_t* get_pamh(char* user, char* passwd) { pam_handle_t* get_pamh(char* user, char* passwd) {
pam_handle_t* pamh = NULL; pam_handle_t* pamh = NULL;
@ -64,18 +69,15 @@ void *shmalloc(size_t size) {
void sourceFileTry(char* file) { void sourceFileTry(char* file) {
FILE* file2source = fopen(file, "r"); FILE* file2source = fopen(file, "r");
if (file2source == NULL) if (file2source == NULL) return;
return;
char* line = NULL; char* line = NULL;
size_t len = 0; size_t len = 0;
ssize_t read; ssize_t read;
while ((read = getline(&line, &len, file2source)) != -1) { while ((read = getline(&line, &len, file2source)) != -1) {
if (read == 0 || (read > 0 && *line == '#')) if (read == 0 || (read > 0 && *line == '#')) continue;
continue; if (line[read - 1] == '\n') line[read - 1] = '\0';
if (line[read - 1] == '\n')
line[read - 1] = '\0';
/* printf("Retrieved line of length %zu:\n", read); */ /* printf("Retrieved line of length %zu:\n", read); */
/* printf("%s\n", line); */ /* printf("%s\n", line); */
@ -89,15 +91,13 @@ void sourceFileTry(char *file) {
} }
} }
if (line) if (line) free(line);
free(line); (void)fclose(file2source);
fclose(file2source);
} }
void moarEnv(char* user, struct session session, struct passwd* pw, void moarEnv(char* user, struct session session, struct passwd* pw,
struct behavior *behavior) { struct config* config) {
if (chdir(pw->pw_dir) == -1) if (chdir(pw->pw_dir) == -1) print_errno("can't chdir to user home");
print_errno("can't chdir to user home");
setenv("HOME", pw->pw_dir, true); setenv("HOME", pw->pw_dir, true);
setenv("USER", pw->pw_name, true); setenv("USER", pw->pw_name, true);
@ -108,37 +108,39 @@ void moarEnv(char *user, struct session session, struct passwd *pw,
// PATH? // PATH?
char *xdg_session_type; char* xdg_session_type = "unknown";
if (session.type == SHELL) if (session.type == SHELL) xdg_session_type = "tty";
xdg_session_type = "tty"; if (session.type == XORG) xdg_session_type = "x11";
if (session.type == XORG) if (session.type == WAYLAND) xdg_session_type = "wayland";
xdg_session_type = "x11";
if (session.type == WAYLAND)
xdg_session_type = "wayland";
setenv("XDG_SESSION_TYPE", xdg_session_type, true); setenv("XDG_SESSION_TYPE", xdg_session_type, true);
printf("\n\n\n\n\x1b[1m"); printf("\n\n\n\n\x1b[1m");
for (size_t i = 0; i < behavior->source.length; i++) { for (size_t i = 0; i < config->behavior.source.length; i++) {
/* printf("DEBUG(source)!!!! %d %s\n", i, (char*)vec_get(&behavior->source, /* printf("DEBUG(source)!!!! %d %s\n", i, (char*)vec_get(&behavior->source,
* i)); */ * i)); */
sourceFileTry((char *)vec_get(&behavior->source, i)); sourceFileTry((char*)vec_get(&config->behavior.source, i));
} }
/* printf("\n"); */ /* printf("\n"); */
if (pw->pw_dir) {
uint home_len = strlen(pw->pw_dir);
for (size_t i = 0; i < behavior->user_source.length; i++) {
char *file2sourcepath = (char *)vec_get(&behavior->user_source, i);
char *newbuf =
malloc(home_len + strlen(file2sourcepath) + 2); // nullbyte and slash
if (newbuf == NULL)
continue; // can't bother
strcpy(newbuf, pw->pw_dir);
newbuf[home_len] = '/'; // assume pw_dir doesn't start with '/' :P
strcpy(&newbuf[home_len + 1], file2sourcepath);
/* printf("DEBUG(user_source)!!!! %d %s\n", i, newbuf); */ if (pw->pw_dir) {
sourceFileTry(newbuf); const char* home = pw->pw_dir;
free(newbuf); size_t home_len = strlen(home);
for (size_t i = 0; i < config->behavior.user_source.length; i++) {
const char* filename = (char*)vec_get(&config->behavior.user_source, i);
size_t filename_len = strlen(filename);
size_t path_len = home_len + 1 + filename_len + 1; // nullbyte and slash
char* path = malloc(path_len);
if (!path) continue; // can't bother
memcpy(path, home, home_len);
path[home_len] = '/'; // assume pw_dir doesn't start with '/' :P
memcpy(&path[home_len + 1], filename, filename_len);
path[path_len - 1] = '\0';
sourceFileTry(path);
free(path);
} }
} }
@ -153,8 +155,9 @@ void moarEnv(char *user, struct session session, struct passwd *pw,
/*setenv("XDG_SEAT", "seat0", true);*/ /*setenv("XDG_SEAT", "seat0", true);*/
} }
// NOLINTBEGIN(readability-function-cognitive-complexity)
bool launch(char* user, char* passwd, struct session session, void (*cb)(void), bool launch(char* user, char* passwd, struct session session, void (*cb)(void),
struct behavior *behavior) { struct config* config) {
struct passwd* pw = getpwnam(user); struct passwd* pw = getpwnam(user);
if (pw == NULL) { if (pw == NULL) {
print_err("could not get user info"); print_err("could not get user info");
@ -176,10 +179,10 @@ bool launch(char *user, char *passwd, struct session session, void (*cb)(void),
uint pid = fork(); uint pid = fork();
if (pid == 0) { // child if (pid == 0) { // child
char *TERM = NULL; char* term = NULL;
char *_GETTERM = getenv("TERM"); char* getterm = getenv("TERM");
if (_GETTERM != NULL) // TODO: handle malloc error
strcln(&TERM, _GETTERM); if (getterm != NULL) term = strdup(getterm);
if (clearenv() != 0) { if (clearenv() != 0) {
print_errno("clearenv"); print_errno("clearenv");
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
@ -195,13 +198,13 @@ bool launch(char *user, char *passwd, struct session session, void (*cb)(void),
} }
// FIXME: path hotfix // FIXME: path hotfix
putenv("PATH=/bin:/usr/bin"); putenv("PATH=/bin:/usr/bin");
if (TERM != NULL) { if (term != NULL) {
setenv("TERM", TERM, true); setenv("TERM", term, true);
free(TERM); free(term);
} }
free(envlist); free((void*)envlist);
moarEnv(user, session, pw, behavior); moarEnv(user, session, pw, config);
// TODO: chown stdin to user // TODO: chown stdin to user
// does it inherit stdin from parent and // does it inherit stdin from parent and
@ -222,37 +225,37 @@ bool launch(char *user, char *passwd, struct session session, void (*cb)(void),
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
if (cb != NULL) if (cb != NULL) cb();
cb();
*reach_session = true; *reach_session = true;
// TODO: these will be different due to TryExec // TODO: these will be different due to TryExec
// and, Exec/TryExec might contain spaces as args // and, Exec/TryExec might contain spaces as args
printf("\x1b[0m"); printf("\x1b[0m");
// NOLINTNEXTLINE(bugprone-branch-clone)
if (session.type == SHELL) { if (session.type == SHELL) {
clear_screen(); clear_screen();
fflush(stdout); (void)fflush(stdout);
execlp(session.exec, session.exec, NULL); execlp(session.exec, session.exec, NULL);
} else if (session.type == XORG || session.type == WAYLAND) { } else if (session.type == XORG || session.type == WAYLAND) {
clear_screen(); clear_screen();
fflush(stdout); (void)fflush(stdout);
execlp(session.exec, session.exec, NULL); execlp(session.exec, session.exec, NULL);
} }
perror("execl error"); perror("execl error");
fprintf(stderr, "failure calling session\n"); (void)fputs("failure calling session\n", stderr);
} else { } else {
waitpid(pid, NULL, 0); __pid_t child_pid = (__pid_t)pid;
waitpid(child_pid, NULL, 0);
pam_setcred(pamh, PAM_DELETE_CRED); pam_setcred(pamh, PAM_DELETE_CRED);
pam_close_session(pamh, 0); pam_close_session(pamh, 0);
pam_end(pamh, PAM_SUCCESS); pam_end(pamh, PAM_SUCCESS);
if (*reach_session == false) { if (*reach_session == false) return false;
return false;
} else
exit(0); exit(0);
} }
return true; return true;
} }
// NOLINTEND(readability-function-cognitive-complexity)

View File

@ -11,26 +11,29 @@ static char *vterms[] = {"/dev/tty", "/dev/tty0", "/dev/vc/0", "/dev/systty",
int chvt_str(char* str) { int chvt_str(char* str) {
char* err; char* err;
errno = 0; errno = 0;
// NOLINTNEXTLINE(readability-identifier-length)
long i = strtol(str, &err, 10); long i = strtol(str, &err, 10);
if (errno) { if (errno) {
perror("strol"); perror("strol");
return -1; return -1;
} }
// I'm not gonna elaborate on this.... // I'm not gonna elaborate on this....
if (i > INT_MAX || i < INT_MIN || *err) if (i > INT_MAX || i < INT_MIN || *err) return -1;
return -1;
return chvt((int)i); return chvt((int)i);
} }
int chvt(int n) { int chvt(int n) {
fprintf(stderr, "activating vt %d\n", n); // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
(void)fprintf(stderr, "activating vt %d\n", n);
// NOLINTNEXTLINE(readability-identifier-length)
char c = 0; char c = 0;
for (size_t i = 0; i < sizeof(vterms) / sizeof(vterms[0]); i++) { for (size_t i = 0; i < sizeof(vterms) / sizeof(vterms[0]); i++) {
int fd = open(vterms[i], O_RDWR); int fd = open(vterms[i], O_RDWR);
if (fd >= 0 && isatty(fd) && ioctl(fd, KDGKBTYPE, &c) == 0 && c < 3) { if (fd >= 0 && isatty(fd) && ioctl(fd, KDGKBTYPE, &c) == 0 && c < 3) {
if (ioctl(fd, VT_ACTIVATE, n) < 0 || ioctl(fd, VT_WAITACTIVE, n) < 0) { if (ioctl(fd, VT_ACTIVATE, n) < 0 || ioctl(fd, VT_WAITACTIVE, n) < 0) {
fprintf(stderr, "Couldn't activate vt %d\n", n); // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
(void)fprintf(stderr, "Couldn't activate vt %d\n", n);
return -1; return -1;
} }
return 0; return 0;
@ -38,6 +41,7 @@ int chvt(int n) {
close(fd); close(fd);
} }
fprintf(stderr, "Couldn't get a file descriptor referring to the console.\n"); (void)fputs("Couldn't get a file descriptor referring to the console.\n",
stderr);
return -1; return -1;
} }

View File

@ -1,143 +1,241 @@
#include <linux/fs.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h>
#include "config.h" #include "config.h"
#include "desktop.h"
#include "log.h"
#include "util.h" #include "util.h"
bool line_parser(FILE *fd, ssize_t *blksize, #define UPPER_HALF_BYTE 4
u_char (*cb)(char *key, char *value)) { int parse_hex(char* _at, char x1, char x2) {
size_t opt_size = 4096; // make linter happy
if (blksize != NULL) u_char* at = (u_char*)_at;
opt_size = *blksize;
while (true) { *at = 0;
size_t alloc_size = opt_size;
char *buf = malloc(alloc_size); if ('0' <= x1 && x1 <= '9') {
if (buf == NULL) *at += (x1 - '0') << UPPER_HALF_BYTE;
return false; } else if ('A' <= x1 && x1 <= 'F') {
ssize_t read_size = getline(&buf, &alloc_size, fd); *at += (x1 - 'A' + 10) << UPPER_HALF_BYTE;
if (read_size == -1) { } else if ('a' <= x1 && x1 <= 'f') {
free(buf); *at += (x1 - 'a' + 10) << UPPER_HALF_BYTE;
} else {
return -1;
}
if ('0' <= x2 && x2 <= '9') {
*at += (x2 - '0');
} else if ('A' <= x2 && x2 <= 'F') {
*at += (x2 - 'A' + 10);
} else if ('a' <= x2 && x2 <= 'f') {
*at += (x2 - 'a' + 10);
} else {
return -1;
}
return 0;
}
struct parser_error {
const char* NULLABLE msg;
size_t col;
};
#define FAIL(str) \
return (struct parser_error) { \
str, p - raw \
}
#define NOFAIL return (struct parser_error){NULL, 0}
struct parser_error parse_str_inplace(char* raw) {
// reader pointer
char* p = raw; // NOLINT(readability-identifier-length)
if (*p != '"') FAIL("Strign not quoted");
p++;
// writer iterator, by nature will always be under the reader
size_t i = 0; // NOLINT(readability-identifier-length)
while (*p != '\0') {
if (*p == '"') {
if (p[1] == '\0') {
raw[i] = '\0';
NOFAIL;
}
FAIL("String finished but there's content after");
}
if (*p == '\\') {
p++;
if (*p == '\0') break;
switch (*p) {
case '\\':
raw[i++] = '\\';
break;
case 't':
raw[i++] = '\t';
break;
case 'n':
raw[i++] = '\n';
break;
case '\"':
raw[i++] = '\"';
break;
case '\'':
raw[i++] = '\'';
break;
case 'x':
if (p[1] == '\0' || p[2] == '\0') goto unfinished;
if (parse_hex(&raw[i++], p[1], p[2]) != 0)
FAIL("Invalid hex escape sequence");
p += 2;
break;
default:
FAIL("Invalid escape variant");
}
} else
raw[i++] = *p;
p++;
}
unfinished:
FAIL("Unfinished string");
}
#undef FAIL
#undef NOFAIL
#define FAIL(str) return (struct parser_error){str, 0}
#define NOFAIL return (struct parser_error){NULL, 0}
union typ_ptr {
char** string;
bool* boolean;
enum keys* key;
struct Vector* vec;
uintptr_t ptr;
};
struct parser_error parse_key(enum introspection_type typ, union typ_ptr at,
char* key, size_t offset) {
char* aux_str = NULL;
struct parser_error aux_err;
switch (typ) {
case STRING:
aux_str = strdup(key);
if (!aux_str) FAIL("allocation failure");
aux_err = parse_str_inplace(aux_str);
if (aux_err.msg) {
free(aux_str);
return aux_err;
}
// FIXME: it be broken, prob the ptr arithmetic or smth, we mem leak
// instead 😎 If the ptr is not the default it means it was prev
// allocated, we should free if (*(char**)((uintptr_t)(&default_config) +
// offset) != *at.string) {
// free(*at.string);
// }
*at.string = aux_str;
break;
case BOOL:
if (strcmp(key, "true") == 0)
*at.boolean = true;
else if (strcmp(key, "false") == 0)
*at.boolean = false;
else {
FAIL("Invalid key value, wasn't 'true' nor 'false'");
}
break;
case KEY:
// NOLINTNEXTLINE(performance-no-int-to-ptr)
if (find_keyname(at.key, key) != 0) {
FAIL("Keyboard KEY name not found");
}
break;
case STRING_ARRAY:
aux_str = strdup(key);
if (!aux_str) FAIL("allocation failure");
aux_err = parse_str_inplace(aux_str);
if (aux_err.msg) {
free(aux_str);
return aux_err;
}
vec_push(at.vec, aux_str);
break; break;
} }
uint read; NOFAIL;
char *key = malloc(read_size);
if (key == NULL) {
free(buf);
return false;
} }
if ((read = sscanf(buf, "%[^ ] = %[^\n]\n", key, buf)) != 0) { #undef FAIL
u_char ret = cb(key, buf); #undef NOFAIL
if (ret & 0b0100)
free(key); // NOLINTBEGIN(readability-identifier-length,readability-function-cognitive-complexity)
if (ret & 0b0010) struct status config_line_handler(void* _config, char* table, char* k,
free(buf); char* v) {
if (ret & 0b1000) struct config* config = (struct config*)_config;
return false; struct status ret = {.finish = false};
if (ret & 0b0001)
const struct introspection_table* this_intros_table = NULL;
for (size_t i = 0; i < LEN(CONFIG_INSTROSPECTION); i++) {
if (table == NULL) {
if (table != CONFIG_INSTROSPECTION[i].tname) continue;
} else if (strcmp(CONFIG_INSTROSPECTION[i].tname, table) != 0)
continue;
this_intros_table = &CONFIG_INSTROSPECTION[i];
break; break;
} }
if (this_intros_table == NULL) {
log_printf("[E] table '%s' is not part of the config\n", table);
return ret;
} }
return true; const struct introspection_item* this_intros_key = NULL;
for (size_t i = 0; i < this_intros_table->len; i++) {
if (strcmp(this_intros_table->intros[i].name, k) != 0) continue;
this_intros_key = &this_intros_table->intros[i];
break;
}
if (this_intros_key == NULL) {
log_printf("[E] key '%s' is not part of the table '%s' in config\n", k,
table);
return ret;
} }
struct config *__config; size_t offset = this_intros_table->offset + this_intros_key->offset;
u_char config_line_handler(char *k, char *v) { union typ_ptr k_addr = {.ptr = (uintptr_t)config + offset};
if (strcmp(k, "colors.bg") == 0)
__config->theme.colors.bg = v; struct parser_error err = parse_key(this_intros_key->typ, k_addr, v, offset);
else if (strcmp(k, "colors.fg") == 0) if (err.msg != NULL) {
__config->theme.colors.fg = v; log_printf("[E] cfg parser, failed to parse [%s.%s] (%s): %s\n", table, k,
else if (strcmp(k, "colors.err") == 0) INTROS_TYS_NAMES[this_intros_key->typ], err.msg);
__config->theme.colors.err = v; log_printf("%s\n%*c^\n", v, err.col);
else if (strcmp(k, "colors.s_wayland") == 0) return ret;
__config->theme.colors.s_wayland = v; }
else if (strcmp(k, "colors.s_xorg") == 0)
__config->theme.colors.s_xorg = v; if (this_intros_key->typ == STRING)
else if (strcmp(k, "colors.s_shell") == 0) log_printf("[I] cfg parsed [%s.%s] (%s)\n", table, k, *k_addr.string);
__config->theme.colors.s_shell = v;
else if (strcmp(k, "colors.e_hostname") == 0)
__config->theme.colors.e_hostname = v;
else if (strcmp(k, "colors.e_date") == 0)
__config->theme.colors.e_date = v;
else if (strcmp(k, "colors.e_box") == 0)
__config->theme.colors.e_box = v;
else if (strcmp(k, "colors.e_header") == 0)
__config->theme.colors.e_header = v;
else if (strcmp(k, "colors.e_user") == 0)
__config->theme.colors.e_user = v;
else if (strcmp(k, "colors.e_passwd") == 0)
__config->theme.colors.e_passwd = v;
else if (strcmp(k, "colors.e_badpasswd") == 0)
__config->theme.colors.e_badpasswd = v;
else if (strcmp(k, "colors.e_key") == 0)
__config->theme.colors.e_key = v;
else if (strcmp(k, "chars.hb") == 0)
__config->theme.chars.hb = v;
else if (strcmp(k, "chars.vb") == 0)
__config->theme.chars.vb = v;
else if (strcmp(k, "chars.ctl") == 0)
__config->theme.chars.ctl = v;
else if (strcmp(k, "chars.ctr") == 0)
__config->theme.chars.ctr = v;
else if (strcmp(k, "chars.cbl") == 0)
__config->theme.chars.cbl = v;
else if (strcmp(k, "chars.cbr") == 0)
__config->theme.chars.cbr = v;
else if (strcmp(k, "functions.poweroff") == 0)
__config->functions.poweroff = find_keyname(v);
else if (strcmp(k, "functions.reboot") == 0)
__config->functions.reboot = find_keyname(v);
else if (strcmp(k, "functions.refresh") == 0)
__config->functions.refresh = find_keyname(v);
else if (strcmp(k, "strings.f_poweroff") == 0)
__config->strings.f_poweroff = v;
else if (strcmp(k, "strings.f_reboot") == 0)
__config->strings.f_reboot = v;
else if (strcmp(k, "strings.f_refresh") == 0)
__config->strings.f_refresh = v;
else if (strcmp(k, "strings.e_user") == 0)
__config->strings.e_user = v;
else if (strcmp(k, "strings.e_passwd") == 0)
__config->strings.e_passwd = 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)
__config->behavior.include_defshell = strcmp(v, "true") == 0;
else if (strcmp(k, "behavior.source") == 0)
vec_push(&__config->behavior.source, v);
else if (strcmp(k, "behavior.user_source") == 0)
vec_push(&__config->behavior.user_source, v);
else else
return 0b1111; log_printf("[I] cfg parsed [%s.%s]\n", table, k);
return 0b100; return ret;
} }
// NOLINTEND(readability-identifier-length,readability-function-cognitive-complexity)
struct config *parse_config(char *path) { int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
struct stat sb;
FILE* fd = fopen(path, "r"); FILE* fd = fopen(path, "r");
if (fd == NULL || (stat(path, &sb) == -1)) { if (fd == NULL) {
perror("fopen"); perror("fopen");
return NULL; (void)fputs(
"Please place a config file at /etc/lidm.ini or set the LIDM_CONF "
"env variable",
stderr);
return -1;
} }
__config = malloc(sizeof(struct config)); bool ret = read_desktop(fd, config, config_line_handler);
__config->behavior.source = vec_new(); (void)fclose(fd);
__config->behavior.user_source = vec_new();
if (__config == NULL) if (!ret) return -1;
return NULL; return 0;
bool ret = line_parser(fd, (ssize_t *)&sb.st_blksize, config_line_handler);
if (!ret) {
free(__config);
return NULL;
}
return __config;
} }

85
src/desktop.c Normal file
View File

@ -0,0 +1,85 @@
// NOLINTBEGIN(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,readability-function-cognitive-complexity)
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "desktop.h"
char* trim_str(char* str) {
while (*str == ' ' || *str == '\t')
str++;
size_t i = strlen(str); // NOLINT(readability-identifier-length)
while (i > 0) {
if (str[i - 1] != ' ' && str[i - 1] != '\t' && str[i - 1] != '\n') break;
i--;
}
str[i] = '\0';
return str;
}
int read_desktop(FILE* fd, void* ctx,
struct status (*cb)(void* ctx, char* table, char* key,
char* value)) {
char* table_name = NULL;
bool ret = -1;
char* buf = NULL;
size_t alloc_size = 0;
size_t read_size;
while ((read_size = getline(&buf, &alloc_size, fd)) > 0) {
ret = 0;
char* buf_start = trim_str(buf);
size_t indent_size = buf_start - buf;
if (read_size - indent_size < 1) continue;
if (*buf_start == '#') continue;
if (*buf_start == '[' && buf_start[strlen(buf_start) - 1] == ']') {
if (table_name != NULL) free(table_name);
buf_start[strlen(buf_start) - 1] = '\0';
table_name = strdup(buf_start + 1);
if (table_name == NULL) {
ret = -1;
break;
}
} else {
// Find '='
size_t eq_idx = 0;
while (buf_start[eq_idx] != '\0') {
if (buf_start[eq_idx] == '=') break;
eq_idx++;
}
// impossible with a min len of 1 (empty line)
if (eq_idx == 0) continue;
// Check its not end
if (buf_start[eq_idx] != '=') {
ret = -1;
break;
}
// Key & Value
char* key = buf_start;
buf_start[eq_idx] = '\0'; // the equal
key = trim_str(key);
char* value = &buf_start[eq_idx + 1];
buf_start[read_size - 1] = '\0'; // the newline
value = trim_str(value);
// Callback
struct status cb_ret = cb(ctx, table_name, key, value);
if (cb_ret.finish) {
ret = cb_ret.ret;
break;
}
}
}
if (table_name != NULL) free(table_name);
if (buf != NULL) free(buf);
return ret;
}
// NOLINTEND(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,readability-function-cognitive-complexity)

View File

@ -2,77 +2,83 @@
#include "efield.h" #include "efield.h"
#include "ui.h" #include "ui.h"
#include "util.h"
struct editable_field field_new(char *content) { // NOLINTBEGIN(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
struct editable_field __efield;
struct editable_field efield_new(char* content) {
struct editable_field efield;
if (content != NULL) { if (content != NULL) {
__efield.length = __efield.pos = strlen(content); efield.pos = strlen(content);
memcpy(__efield.content, content, __efield.length); memcpy(efield.content, content, strlen(content) + 1);
} else { } else {
field_trim(&__efield, 0); efield_trim(&efield, 0);
}
__efield.content[__efield.length] = '\0';
return __efield;
} }
void field_trim(struct editable_field *field, u_char pos) { return efield;
field->length = field->pos = pos;
field->content[field->length] = '\0';
} }
void field_update(struct editable_field *field, char *update) { void efield_trim(struct editable_field* self, u_char pos) {
self->pos = pos;
self->content[pos + 1] = '\0';
}
#define BACKSPACE_CODE 127
void efield_update(struct editable_field* self, char* update) {
u_char insert_len = strlen(update); u_char insert_len = strlen(update);
if (insert_len == 0) if (insert_len == 0) return;
return;
if (self->pos > strlen(self->content))
self->pos = strlen(self->content); // WTF tho
if (field->pos > field->length)
field->pos = field->length; // WTF
if (insert_len == 1) { if (insert_len == 1) {
// backspace // backspace
if (*update == 127) { if (*update == BACKSPACE_CODE) {
if (field->pos == 0) if (self->pos == 0) return;
return; char* curr = &self->content[self->pos];
if (field->pos < field->length) { char* prev = (char*)utf8back(curr);
memmove(&field->content[field->pos - 1], &field->content[field->pos], memmove(prev, curr, strlen(self->content) - self->pos + 1);
field->length - field->pos);
} self->pos -= curr - prev;
(field->pos)--;
(field->length)--;
field->content[field->length] = '\0';
return; return;
} }
// TODO: Del
} }
// append // append
if (field->length + field->pos >= 255) { if (strlen(update) + self->pos + 1 >= 255) {
print_err("field too long"); print_err("field too long");
} }
if (field->pos < field->length) {
// move with immediate buffer
memmove(&field->content[field->pos + insert_len],
&field->content[field->pos], field->length - field->pos);
}
memcpy(&field->content[field->pos], update, insert_len);
field->pos += insert_len; // move the after pos, including nullbyte
field->length += insert_len; memmove(&self->content[self->pos + insert_len], &self->content[self->pos],
field->content[field->length] = '\0'; strlen(self->content) - self->pos + 1);
memcpy(&self->content[self->pos], update, insert_len);
self->pos += insert_len;
} }
// returns bool depending if it was able to "use" the seek // returns bool depending if it was able to "use" the seek
bool field_seek(struct editable_field *field, char seek) { bool efield_seek(struct editable_field* self, char seek) {
if (field->length == 0) if (*self->content == '\0') return false;
return false; if (seek == 0) return false;
if (seek < 0 && -seek > field->pos) u_char count = seek < 0 ? -seek : seek;
field->pos = 0; char* ptr = &self->content[self->pos];
else if (seek > 0 && 255 - field->pos < seek) char* start = ptr;
field->pos = 255;
else
field->pos += seek;
if (field->pos > field->length) while (count-- > 0) {
field->pos = field->length; if (seek < 0) {
if (ptr == self->content) break;
return true; ptr = (char*)utf8back(ptr);
} else {
if (*ptr == '\0') break;
ptr = (char*)utf8seek(ptr);
} }
}
self->pos = (u_char)(ptr - self->content);
return ptr != start;
}
// NOLINTEND(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)

52
src/launch_state.c Normal file
View File

@ -0,0 +1,52 @@
// Small file for saving last selection
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "launch_state.h"
#define STATE_DIR "/var/lib/lidm"
#define STATE_FILE "/var/lib/lidm/state"
#define RWXR_X___ 0750
int read_launch_state(struct LaunchState* NNULLABLE state) {
FILE* state_fd = fopen(STATE_FILE, "r");
if (state_fd == NULL) return -1;
*state = (struct LaunchState){
.username = NULL,
.session_opt = NULL,
};
size_t num = 0;
if (getline(&state->username, &num, state_fd) < 0) goto fail;
state->username[strcspn(state->username, "\n")] = 0;
num = 0;
if (getline(&state->session_opt, &num, state_fd) < 0) {
free(state->session_opt);
goto fail;
}
state->session_opt[strcspn(state->session_opt, "\n")] = 0;
(void)fclose(state_fd);
return 0;
fail:
(void)fclose(state_fd);
return -1;
}
bool write_launch_state(struct LaunchState state) {
FILE* state_fd = fopen(STATE_FILE, "w");
if (state_fd == NULL) {
if (mkdir(STATE_DIR, RWXR_X___) == -1) return false;
state_fd = fopen(STATE_FILE, "w");
if (state_fd == NULL) return false;
}
(void)fprintf(state_fd, "%s\n%s\n", state.username, state.session_opt);
(void)fclose(state_fd);
return true;
}

38
src/log.c Normal file
View File

@ -0,0 +1,38 @@
#include <errno.h>
#include <stdarg.h>
#include <string.h>
#include "log.h"
static FILE* logger_out = NULL;
void log_init(FILE* fd) {
if (logger_out) (void)fclose(logger_out);
logger_out = fd;
}
void log_puts(const char* msg) {
if (!logger_out) return;
(void)fputs(msg, logger_out);
}
void log_printf(const char* fmt, ...) {
if (!logger_out) return;
va_list args;
va_start(args, fmt);
(void)vfprintf(logger_out, fmt, args);
va_end(args);
}
// NOLINTNEXTLINE(readability-identifier-length)
void log_perror(const char* s) {
if (!logger_out) return;
if (s)
(void)fprintf(logger_out, "%s: %s", s, strerror(errno));
else
(void)fprintf(logger_out, "%s", strerror(errno));
}

View File

@ -1,33 +1,47 @@
#include <pwd.h> #include <pwd.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "chvt.h" #include "chvt.h"
#include "config.h" #include "config.h"
#include "log.h"
#include "sessions.h" #include "sessions.h"
#include "ui.h" #include "ui.h"
#include "users.h" #include "users.h"
#include "util.h" #include "util.h"
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if (argc == 2) // Logger
chvt_str(argv[1]); char* log_output = getenv("LIDM_LOG");
if (log_output) {
FILE* log_fd = fopen(log_output, "w");
if (!log_fd) {
perror("fopen");
(void)fputs("failed to open logfile in write mode", stderr);
return -1;
}
log_init(log_fd);
}
// Chvt
if (argc == 2) chvt_str(argv[1]);
struct config config = DEFAULT_CONFIG;
char* conf_override = getenv("LIDM_CONF"); char* conf_override = getenv("LIDM_CONF");
struct config *config = char* conf_path = conf_override ? conf_override : "/etc/lidm.ini";
parse_config(conf_override == NULL ? "/etc/lidm.ini" : conf_override); if (parse_config(&config, conf_path) != 0) {
if (config == NULL) { (void)fputs("error parsing config\n", stderr);
fprintf(stderr, "error parsing config\n");
return 1; return 1;
} }
setup(*config); setup(&config);
struct Vector users = get_human_users(); struct Vector users = get_human_users();
struct Vector sessions = get_avaliable_sessions(); struct Vector sessions = get_avaliable_sessions();
int ret = load(&users, &sessions); int ret = load(&users, &sessions);
if (ret == 0) if (ret == 0) execl(argv[0], argv[0], NULL);
execl(argv[0], argv[0], NULL);
} }

77
src/ofield.c Normal file
View File

@ -0,0 +1,77 @@
#include <stddef.h>
#include "config.h"
#include "efield.h"
#include "ofield.h"
#include "ui.h"
#include "util.h"
struct opts_field ofield_new(size_t opts) {
if (opts == 0) {
return (struct opts_field){
.opts = 0,
.current_opt = 0,
.efield = efield_new(""),
};
}
return (struct opts_field){
.opts = opts,
.current_opt = 1,
};
}
void ofield_toedit(struct opts_field* self, char* init) {
self->current_opt = 0;
self->efield = efield_new(init);
}
void ofield_kbd_type(struct opts_field* self, char* typed,
char* empty_default) {
if (self->current_opt != 0) ofield_toedit(self, empty_default);
efield_update(&self->efield, typed);
}
bool ofield_opts_seek(struct opts_field* self, char seek) {
// no options or (a single option but its selected instead of on edit)
if (self->opts == 0 || (self->opts == 1 && self->current_opt != 0))
return false;
self->current_opt =
1 + ((self->current_opt - 1 + seek + self->opts) % self->opts);
ui_update_ofield(self);
return true;
}
bool ofield_seek(struct opts_field* self, char seek) {
if (self->current_opt == 0) {
if (efield_seek(&self->efield, seek)) {
return true;
}
}
if (self->opts == 0) return false;
ofield_opts_seek(self, seek);
return true;
}
u_char ofield_display_cursor_col(struct opts_field* self, u_char maxlen) {
if (self->current_opt == 0) {
u_char display_len = utf8len(self->efield.content);
u_char pos = utf8len_until(self->efield.content,
&self->efield.content[self->efield.pos]);
if (display_len > maxlen) {
if (pos < maxlen / 2) {
return pos;
}
if (display_len - pos < maxlen / 2) {
return maxlen - (display_len - pos);
}
return maxlen / 2;
}
return pos;
}
return 0;
}

View File

@ -7,6 +7,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include "desktop.h"
#include "log.h"
#include "sessions.h" #include "sessions.h"
#include "util.h" #include "util.h"
@ -14,106 +16,114 @@ struct source_dir {
enum session_type type; enum session_type type;
char* dir; char* dir;
}; };
static const struct source_dir sources[] = { static const struct source_dir SOURCES[] = {
{XORG, "/usr/share/xsessions"}, {XORG, "/usr/share/xsessions"},
{WAYLAND, "/usr/share/wayland-sessions"}, {WAYLAND, "/usr/share/wayland-sessions"},
}; };
static struct session __new_session(enum session_type type, char *name,
const char *exec, const char *tryexec) {
struct session __session;
__session.type = type;
strcln(&__session.name, name);
strcln(&__session.exec, exec);
strcln(&__session.tryexec, tryexec);
return __session;
}
static struct Vector* cb_sessions = NULL; static struct Vector* cb_sessions = NULL;
// NOTE: commented printf's here would be nice to have debug logs if I ever struct ctx_typ {
// implement it char* NULLABLE name;
static enum session_type session_type; char* NULLABLE exec;
static int fn(const char *fpath, const struct stat *sb, int typeflag) { char* NULLABLE tryexec;
if (sb == NULL || !S_ISREG(sb->st_mode)) };
return 0; struct status cb(void* _ctx, char* NULLABLE table, char* key, char* value) {
struct ctx_typ* ctx = (struct ctx_typ*)_ctx;
struct status ret;
ret.finish = false;
if (table == NULL) return ret;
if (strcmp(table, "Desktop Entry") != 0) return ret;
char** NULLABLE copy_at = NULL;
if (strcmp(key, "Name") == 0) {
if (ctx->name == NULL) copy_at = &ctx->name;
} else if (strcmp(key, "Exec") == 0) {
if (ctx->exec == NULL) copy_at = &ctx->exec;
} else if (strcmp(key, "TryExec") == 0) {
if (ctx->tryexec == NULL) copy_at = &ctx->tryexec;
}
if (copy_at != NULL) {
*copy_at = strdup(value);
if (*copy_at == NULL) {
log_perror("strdup");
log_puts("[E] failed to allocate memory");
ret.finish = true;
ret.ret = -1;
}
}
if (ctx->name != NULL && ctx->exec != NULL && ctx->tryexec != NULL) {
ret.finish = true;
ret.ret = 0;
}
return ret;
}
// also, always return 0 or we will break parsing and we don't want a bad
// desktop file to break all possible sessions
static enum session_type session_type;
// NOLINTNEXTLINE(readability-function-cognitive-complexity)
static int fn(const char* fpath, const struct stat* sb, int typeflag) {
// guessing symlink behavior
// - FTW_PHYS if set doesn't follow symlinks, so ftw() has no flags and it
// follows symlinks, we should never get to handle that
if (typeflag != FTW_F) return 0;
log_printf("[I] found file %s\n", fpath);
struct ctx_typ ctx = {
.name = NULL,
.exec = NULL,
.tryexec = NULL,
};
/*printf("gonna open %s\n", fpath);*/
FILE* fd = fopen(fpath, "r"); FILE* fd = fopen(fpath, "r");
if (fd == NULL) { if (fd == NULL) {
perror("fopen"); log_perror("fopen");
fprintf(stderr, "error opening file (r) '%s'\n", fpath); log_printf("[E] error opening file '%s' for read\n", fpath);
return 0; return 0;
} }
u_char found = 0; int ret = read_desktop(fd, &ctx, &cb);
size_t alloc_size = sb->st_blksize; if (ret < 0) { // any error
log_printf("[E] format error parsing %s", fpath);
char *name_buf = NULL; return 0;
char *exec_buf = NULL;
char *tryexec_buf = NULL;
// This should be made a specific function
while (true) {
char *buf = malloc(sb->st_blksize);
ssize_t read_size = getline(&buf, &alloc_size, fd);
if (read_size == -1) {
free(buf);
break;
} }
uint read; (void)fclose(fd);
char *key = malloc(read_size);
if ((read = sscanf(buf, "%[^=]=%[^\n]\n", key, buf)) != 0) {
if (strcmp(key, "Name") == 0) {
found &= 0b001;
name_buf = realloc(buf, read);
} else if (strcmp(key, "Exec") == 0) {
found &= 0b010;
exec_buf = realloc(buf, read);
} else if (strcmp(key, "TryExec") == 0) {
found &= 0b100;
tryexec_buf = realloc(buf, read);
} else
free(buf);
} else
free(buf);
free(key);
if (found == 0b111)
break;
}
/*printf("\nend parsing...\n");*/
fclose(fd);
// just add this to the list // just add this to the list
if (name_buf != NULL && exec_buf != NULL) { if (ctx.name != NULL && ctx.exec != NULL) {
struct session *session_i = malloc(sizeof (struct session)); struct session* this_session = malloc(sizeof(struct session));
*session_i = __new_session(session_type, name_buf, exec_buf, if (this_session == NULL) return 0;
tryexec_buf == NULL ? "" : tryexec_buf);
vec_push(cb_sessions, session_i);
}
if (name_buf != NULL) *this_session = (struct session){
free(name_buf); .name = ctx.name,
if (exec_buf != NULL) .exec = ctx.exec,
free(exec_buf); .tryexec = ctx.tryexec,
if (tryexec_buf != NULL) .type = session_type,
free(tryexec_buf); };
vec_push(cb_sessions, this_session);
}
return 0; return 0;
} }
// This code is designed to be run purely single threaded // This code is designed to be run purely single threaded
#define LIKELY_BOUND_SESSIONS 8
struct Vector get_avaliable_sessions() { struct Vector get_avaliable_sessions() {
struct Vector sessions = vec_new(); struct Vector sessions = VEC_NEW;
vec_reserve(&sessions, LIKELY_BOUND_SESSIONS);
cb_sessions = &sessions; cb_sessions = &sessions;
for (size_t i = 0; i < (sizeof(sources) / sizeof(sources[0])); i++) { for (size_t i = 0; i < (sizeof(SOURCES) / sizeof(SOURCES[0])); i++) {
/*printf("recurring into %s\n", sources[i].dir);*/ log_printf("[I] parsing into %s\n", SOURCES[i].dir);
session_type = sources[i].type; session_type = SOURCES[i].type;
ftw(sources[i].dir, &fn, 1); ftw(SOURCES[i].dir, &fn, 1);
} }
cb_sessions = NULL; cb_sessions = NULL;

617
src/ui.c
View File

@ -5,6 +5,7 @@
#include <pwd.h> #include <pwd.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -19,55 +20,53 @@
#include "auth.h" #include "auth.h"
#include "efield.h" #include "efield.h"
#include "keys.h" #include "keys.h"
#include "launch_state.h"
#include "log.h"
#include "ofield.h"
#include "sessions.h" #include "sessions.h"
#include "ui.h" #include "ui.h"
#include "ui_state.h"
#include "users.h" #include "users.h"
#include "util.h" #include "util.h"
const u_char INPUTS_N = 3;
static void print_box(); static void print_box();
static void print_footer(); static void print_footer();
static void restore_all(); static void restore_all();
static void signal_handler(int); static void signal_handler(int code);
const uint boxw = 50;
const uint boxh = 12;
struct uint_point { struct uint_point {
uint x; uint x;
uint y; uint y;
}; };
static void print_session(struct uint_point, struct session, bool); static void print_session(struct uint_point origin, struct session session,
static void print_user(struct uint_point, struct user, bool); bool multiple);
static void print_passwd(struct uint_point, uint, bool); static void print_user(struct uint_point origin, struct user user,
bool multiple);
enum input { SESSION, USER, PASSWD }; static void print_passwd(struct uint_point origin, uint length, bool err);
static u_char inputs_n = 3;
// ansi resource: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797 // ansi resource: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
static struct termios orig_term; static struct termios orig_term;
static struct termios term; static struct termios term;
static struct winsize window; static struct winsize window;
static struct theme theme; #define INNER_BOX_OUT_MARGIN 2
static struct functions functions; struct config* g_config = NULL;
static struct strings strings; void setup(struct config* config) {
static struct behavior behavior; g_config = config;
void setup(struct config __config) {
ioctl(STDOUT_FILENO, TIOCGWINSZ, &window); ioctl(STDOUT_FILENO, TIOCGWINSZ, &window);
// at least
// 2 padding top and bottom for footer and vertical compensation // 2 padding top and bottom for footer and vertical compensation
// 2 padding left & right to not overflow footer width // 2 padding left & right to not overflow footer width
if (window.ws_row < boxh + 4 || window.ws_col < boxw + 4) { if (window.ws_row < BOX_HEIGHT + INNER_BOX_OUT_MARGIN * 2 ||
fprintf(stderr, "\x1b[1;31mScreen too small\x1b[0m\n"); window.ws_col < BOX_WIDTH + INNER_BOX_OUT_MARGIN * 2) {
(void)fprintf(stderr, "\x1b[1;31mScreen too small\x1b[0m\n");
exit(1); exit(1);
} }
theme = __config.theme;
functions = __config.functions;
strings = __config.strings;
behavior = __config.behavior;
tcgetattr(STDOUT_FILENO, &orig_term); tcgetattr(STDOUT_FILENO, &orig_term);
term = orig_term; // save term term = orig_term; // save term
// "stty" attrs // "stty" attrs
@ -76,295 +75,185 @@ void setup(struct config __config) {
// save cursor pos, save screen, set color and reset screen // save cursor pos, save screen, set color and reset screen
// (applying color to all screen) // (applying color to all screen)
printf("\x1b[s\x1b[?47h\x1b[%s;%sm\x1b[2J", theme.colors.bg, theme.colors.fg); printf("\x1b[s\x1b[?47h\x1b[%s;%sm\x1b[2J", g_config->colors.bg,
g_config->colors.fg);
print_footer(); print_footer();
atexit(restore_all); (void)atexit(restore_all);
signal(SIGINT, signal_handler); (void)signal(SIGINT, signal_handler);
} }
static struct uint_point box_start() { static struct uint_point box_start() {
struct uint_point __start; return (struct uint_point){
__start.x = (window.ws_col - boxw) / 2 + 1; .x = ((window.ws_col - BOX_WIDTH) / 2) + 1, // looks better
__start.y = (window.ws_row - boxh) / 2 + 1; .y = ((window.ws_row - BOX_HEIGHT) / 2), // leave more space under
return __start;
}
static char *fmt_time() {
time_t t = time(NULL);
struct tm tm = *localtime(&t);
size_t bsize =
snprintf(NULL, 0, "%d-%02d-%02d %02d:%02d:%02d", tm.tm_year + 1900,
tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec) +
1;
char *buf = malloc(bsize);
snprintf(buf, bsize, "%d-%02d-%02d %02d:%02d:%02d", tm.tm_year + 1900,
tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
return buf;
}
// TODO: handle buffers longer than the buffer (cut str to the end, change
// cursor pos...) should just overlap for now
// ugh, this represent a field which might have options
// opts is the amount of other options possible (0 will behave as a passwd)
// aaaand (it's an abstract idea, letme think), also holds the status of a
// custom content, like custom launch command or user or smth
struct opt_field {
uint opts;
uint current_opt; // 0 is edit mode btw
struct editable_field efield;
}; };
void print_ofield(struct opt_field *focused_input);
static struct opt_field ofield_new(uint opts) {
struct opt_field __field;
__field.opts = opts;
__field.current_opt = 1;
if (opts == 0) {
__field.current_opt = 0;
__field.efield = field_new("");
}
return __field;
}
static void ofield_toedit(struct opt_field *ofield, char *init) {
ofield->current_opt = 0;
ofield->efield = field_new(init);
}
static void ofield_type(struct opt_field *ofield, char *new, char *startstr) {
if (ofield->current_opt != 0)
ofield_toedit(ofield, startstr);
field_update(&ofield->efield, new);
}
// true if it changed anything, single opt fields return false
static bool ofield_opt_seek(struct opt_field *ofield, char seek) {
// TODO: think this
if (ofield->opts == 0 || (ofield->opts == 1 && ofield->current_opt != 0))
return false;
ofield->current_opt =
1 + ((ofield->current_opt - 1 + seek + ofield->opts) % ofield->opts);
print_ofield(ofield);
return true;
}
// true in case it was able to "use" the seek (a empty only editable field
// wouldn't)
static bool ofield_seek(struct opt_field *ofield, char seek) {
if (ofield->current_opt == 0) {
if (field_seek(&ofield->efield, seek)) {
return true;
}
} }
if (ofield->opts == 0) #define STRFTIME_PREALLOC 64
return false; #define TM_YEAR_EPOCH 1900
static char* fmt_time(const char* fmt) {
time_t tme = time(NULL);
struct tm tm = *localtime(&tme);
ofield_opt_seek(ofield, seek); size_t alloc_size = STRFTIME_PREALLOC;
char* buf = malloc(alloc_size);
if (!buf) return NULL;
while (true) {
if (strftime(buf, alloc_size, fmt, &tm) != 0) return buf;
return true; alloc_size *= 2;
} char* nbuf = realloc(buf, alloc_size);
if (!nbuf) {
static u_char ofield_max_displ_pos(struct opt_field *ofield) { free(buf);
// TODO: set max cursor pos too
// keep in mind that also have to keep in mind scrolling and ughhh, mentally
// blocked, but this is complex
if (ofield->current_opt == 0)
return ofield->efield.pos;
else
return 0;
}
enum input focused_input = PASSWD;
struct opt_field of_session;
struct opt_field of_user;
struct opt_field of_passwd;
struct Vector *gusers;
struct Vector *gsessions;
// not *that* OF tho
struct opt_field *get_of(enum input from) {
if (from == SESSION)
return &of_session;
if (from == USER)
return &of_user;
if (from == PASSWD)
return &of_passwd;
return NULL; return NULL;
} }
buf = nbuf;
}
}
void ffield_cursor_focus() { void ui_update_cursor_focus() {
struct uint_point bstart = box_start(); struct uint_point bstart = box_start();
u_char line = bstart.y; u_char line = bstart.y;
u_char row = bstart.x + 15; u_char col = bstart.x + VALUES_COL;
struct opts_field* ofield = get_opts_ffield();
u_char maxlen = VALUE_MAXLEN;
if (ofield->opts > 1) {
maxlen -= utf8len(g_config->strings.opts_pre) +
utf8len(g_config->strings.opts_post);
}
col += ofield_display_cursor_col(ofield, maxlen);
if (ofield->opts > 1) col += utf8len(g_config->strings.opts_pre);
// rows in here quite bodged // rows in here quite bodged
if (focused_input == SESSION) { if (focused_input == SESSION) {
line += 5; line += SESSION_ROW;
row += (of_session.opts > 1) * 2;
} else if (focused_input == USER) { } else if (focused_input == USER) {
line += 7; line += USER_ROW;
row += (of_user.opts > 1) * 2;
} else if (focused_input == PASSWD) } else if (focused_input == PASSWD)
line += 9; line += PASSWD_ROW;
struct opt_field *ofield = get_of(focused_input); (void)printf("\x1b[%d;%dH", line, col);
row += ofield->current_opt == 0 ? ofield_max_displ_pos(ofield) : 0; (void)fflush(stdout);
printf("\x1b[%d;%dH", line, row);
fflush(stdout);
} }
struct user get_current_user() { void ui_update_field(enum input focused_input) {
if (of_user.current_opt != 0)
return *(struct user*)vec_get(gusers, of_user.current_opt - 1);
else {
struct user custom_user;
custom_user.shell = "/usr/bin/bash";
custom_user.username = custom_user.display_name = of_user.efield.content;
return custom_user;
}
}
struct session get_current_session() {
if (of_session.current_opt != 0) {
// this is for the default user shell :P, not the greatest
// implementation but I want to get his done
if (behavior.include_defshell &&
of_session.current_opt == gsessions->length + 1) {
struct session shell_session;
shell_session.type = SHELL;
shell_session.exec = shell_session.name = get_current_user().shell;
return shell_session;
} else
return *(struct session*)vec_get(gsessions, of_session.current_opt - 1);
} else {
struct session custom_session;
custom_session.type = SHELL;
custom_session.name = custom_session.exec = of_session.efield.content;
return custom_session;
}
}
void print_field(enum input focused_input) {
struct uint_point origin = box_start(); struct uint_point origin = box_start();
if (focused_input == PASSWD) { if (focused_input == PASSWD) {
print_passwd(origin, of_passwd.efield.length, false); print_passwd(origin, utf8len(of_passwd.efield.content), false);
} else if (focused_input == SESSION) { } else if (focused_input == SESSION) {
print_session(origin, get_current_session(), of_session.opts > 1); print_session(origin, st_session(g_config->behavior.include_defshell),
of_session.opts > 1);
} else if (focused_input == USER) { } else if (focused_input == USER) {
print_user(origin, get_current_user(), of_user.opts > 1); print_user(origin, st_user(), of_user.opts > 1);
print_field(SESSION); ui_update_field(SESSION);
} }
ffield_cursor_focus(); ui_update_cursor_focus();
} }
void print_ffield() { print_field(focused_input); } void ui_update_ffield() {
void print_ofield(struct opt_field *ofield) { ui_update_field(focused_input);
}
void ui_update_ofield(struct opts_field* NNULLABLE self) {
enum input input; enum input input;
if (ofield == &of_session) if (self == &of_session)
input = SESSION; input = SESSION;
else if (ofield == &of_user) else if (self == &of_user)
input = USER; input = USER;
else if (ofield == &of_passwd) else if (self == &of_passwd)
input = PASSWD; input = PASSWD;
else else
return; return;
print_field(input); ui_update_field(input);
}
// true = forward, false = backward
void ffield_move(bool direction) {
if (direction)
focused_input = (focused_input + 1 + inputs_n) % inputs_n;
else
focused_input = (focused_input - 1 + inputs_n) % inputs_n;
ffield_cursor_focus();
}
// tf I'm doing
void ffield_change_opt(bool direction) {
struct opt_field *ffield = get_of(focused_input);
if (focused_input == PASSWD)
ffield = &of_session;
if (!ofield_opt_seek(ffield, direction ? 1 : -1)) {
if (focused_input == PASSWD || focused_input == SESSION)
ofield_opt_seek(&of_user, direction ? 1 : -1);
else
ofield_opt_seek(&of_session, direction ? 1 : -1);
}
}
void ffield_change_pos(bool direction) {
struct opt_field *ffield = get_of(focused_input);
if (!ofield_seek(ffield, direction ? 1 : -1))
if (!ofield_opt_seek(&of_session, direction ? 1 : -1))
ofield_opt_seek(&of_user, direction ? 1 : -1);
ffield_cursor_focus();
}
void ffield_type(char *text) {
struct opt_field *field = get_of(focused_input);
char *start = "";
if (focused_input == USER && of_user.current_opt != 0)
start = get_current_user().username;
if (focused_input == SESSION && of_session.current_opt != 0 &&
get_current_session().type == SHELL)
start = get_current_session().exec;
ofield_type(field, text, start);
print_ffield();
} }
static char* unknown_str = "unknown";
// NOLINTNEXTLINE(readability-function-cognitive-complexity)
int load(struct Vector* users, struct Vector* sessions) { int load(struct Vector* users, struct Vector* sessions) {
/// SETUP /// SETUP
gusers = users; gusers = users;
gsessions = sessions; gsessions = sessions;
// hostnames larger won't render properly // hostnames larger won't render properly
char *hostname = malloc(16); const u_char HOSTNAME_SIZE = VALUES_COL - VALUES_SEPR - BOX_HMARGIN;
if (gethostname(hostname, 16) != 0) { char hostname_buf[HOSTNAME_SIZE];
free(hostname); char* hostname = hostname_buf;
hostname = "unknown"; if (gethostname(hostname_buf, HOSTNAME_SIZE) != 0) {
hostname = unknown_str;
} else { } else {
hostname = realloc(hostname, strlen(hostname) + 1); // Ig "successful completion" doesn't contemplate truncation case, so need
// to append the unspecified nullbyte
// char* hidx =
// (char*)utf8back(&hostname[VALUES_COL - VALUES_SEPR - BOX_HMARGIN -
// 1]);
// *hidx = '\0';
} }
of_session = ofield_new(sessions->length + behavior.include_defshell); of_session =
ofield_new(sessions->length + g_config->behavior.include_defshell);
of_user = ofield_new(users->length); of_user = ofield_new(users->length);
of_passwd = ofield_new(0); of_passwd = ofield_new(0);
of_user.current_opt = users->length > 0;
of_session.current_opt = sessions->length > 0;
struct LaunchState initial_state;
if (read_launch_state(&initial_state) == 0) {
for (size_t i = 0; i < users->length; i++) {
struct user* user_i = (struct user*)vec_get(users, i);
if (strcmp(user_i->username, initial_state.username) == 0) {
of_user.current_opt = i + 1;
break;
}
}
for (size_t i = 0; i < sessions->length; i++) {
struct session* session_i = (struct session*)vec_get(sessions, i);
if (strcmp(session_i->name, initial_state.session_opt) == 0) {
of_session.current_opt = i + 1;
break;
}
}
if (g_config->behavior.include_defshell) {
if (strcmp(st_user().shell, initial_state.session_opt) == 0)
of_session.current_opt = sessions->length + 1;
}
free(initial_state.username);
free(initial_state.session_opt);
}
/// PRINTING /// PRINTING
const struct uint_point boxstart = box_start(); const struct uint_point BOXSTART = box_start();
// printf box // printf box
print_box(); print_box();
// put hostname // put hostname
printf("\x1b[%d;%dH\x1b[%sm%s\x1b[%sm", boxstart.y + 2, printf("\x1b[%d;%dH\x1b[%sm%s\x1b[%sm", BOXSTART.y + HEAD_ROW,
boxstart.x + 12 - (uint)strlen(hostname), theme.colors.e_hostname, BOXSTART.x + VALUES_COL - VALUES_SEPR - (uint)utf8len(hostname),
hostname, theme.colors.fg); g_config->colors.e_hostname, hostname, g_config->colors.fg);
// 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 + 2, printf("\x1b[%d;%dH\x1b[%sm%s\x1b[%sm", BOXSTART.y + HEAD_ROW,
boxstart.x + boxw - 3 - (uint)strlen(fmtd_time), theme.colors.e_date, BOXSTART.x + BOX_WIDTH - 1 - BOX_HMARGIN - (uint)utf8len(fmtd_time),
fmtd_time, theme.colors.fg); g_config->colors.e_date, fmtd_time, g_config->colors.fg);
free(fmtd_time);
print_field(SESSION); ui_update_field(SESSION);
print_field(USER); ui_update_field(USER);
print_field(PASSWD); ui_update_field(PASSWD);
ffield_cursor_focus(); ui_update_cursor_focus();
/// INTERACTIVE /// INTERACTIVE
u_char len; u_char len;
char seq[256]; char seq[0xff];
uint esc = 0; uint esc = 0;
while (true) { while (true) {
read_press(&len, seq); read_press(&len, seq);
@ -373,199 +262,243 @@ int load(struct Vector *users, struct Vector *sessions) {
if (ansi_code != -1) { if (ansi_code != -1) {
if (ansi_code == ESC) { if (ansi_code == ESC) {
esc = 2; esc = 2;
} else if (ansi_code == functions.refresh) { } else if (ansi_code == g_config->functions.refresh) {
restore_all(); restore_all();
return 0; return 0;
} else if (ansi_code == functions.reboot) { } else if (ansi_code == g_config->functions.reboot) {
restore_all(); restore_all();
reboot(RB_AUTOBOOT); reboot(RB_AUTOBOOT);
exit(0); exit(0);
} else if (ansi_code == functions.poweroff) { } else if (ansi_code == g_config->functions.poweroff) {
restore_all(); restore_all();
reboot(RB_POWER_OFF); reboot(RB_POWER_OFF);
exit(0); exit(0);
} else if (ansi_code == A_UP || ansi_code == A_DOWN) { } else if (ansi_code == A_UP || ansi_code == A_DOWN) {
ffield_move(ansi_code == A_DOWN); st_ch_focus(ansi_code == A_DOWN ? 1 : -1);
} else if (ansi_code == A_RIGHT || ansi_code == A_LEFT) { } else if (ansi_code == A_RIGHT || ansi_code == A_LEFT) {
if (esc) if (esc)
ffield_change_opt(ansi_code == A_RIGHT); st_ch_of_opts(ansi_code == A_RIGHT ? 1 : -1);
else else
ffield_change_pos(ansi_code == A_RIGHT); st_ch_ef_col(ansi_code == A_RIGHT ? 1 : -1);
} }
} }
} else { } else {
if (len == 1 && *seq == '\n') { if (len == 1 && *seq == '\n') {
if (!launch(get_current_user().username, of_passwd.efield.content, bool successful_write = write_launch_state((struct LaunchState){
get_current_session(), &restore_all, &behavior)) { .username = st_user().username,
print_passwd(box_start(), of_passwd.efield.length, true); .session_opt = st_session(g_config->behavior.include_defshell).name,
ffield_cursor_focus(); });
if (!successful_write) log_puts("[E] failed to write launch state");
if (!launch(st_user().username, of_passwd.efield.content,
st_session(g_config->behavior.include_defshell),
&restore_all, g_config)) {
print_passwd(box_start(), utf8len(of_passwd.efield.content), true);
ui_update_cursor_focus();
} }
} else } else
ffield_type(seq); st_kbd_type(seq, g_config->behavior.include_defshell);
} }
if (esc != 0) if (esc != 0) esc--;
esc--;
} }
} }
static char *line_cleaner = NULL; void clean_line(struct uint_point origin, uint line) {
static void clean_line(struct uint_point origin, uint line) { // - outline + nullbyte
if (line_cleaner == NULL) { static char line_cleaner[BOX_WIDTH - 2 + 1] = {
line_cleaner = malloc((boxw - 2) * sizeof(char) + 1); [0 ... BOX_WIDTH - 2 - 1] = ' ', [BOX_WIDTH - 2] = '\0'};
memset(line_cleaner, 32, boxw - 2); printf("\x1b[%d;%dH%s", origin.y + line, origin.x + 1, line_cleaner);
line_cleaner[boxw - 2] = 0;
}
printf("\x1b[%d;%dH", origin.y + line, origin.x + 1);
printf("%s", line_cleaner);
} }
// TODO: session_len > 32 u_char get_render_pos_offset(struct opts_field* self, u_char maxlen) {
static void print_session(struct uint_point origin, struct session session, if (self->current_opt != 0) return 0;
u_char pos = utf8len_until(self->efield.content,
&self->efield.content[self->efield.pos]);
return pos - ofield_display_cursor_col(self, maxlen);
}
void print_session(struct uint_point origin, struct session session,
bool multiple) { bool multiple) {
clean_line(origin, 5); clean_line(origin, SESSION_ROW);
const char *session_type;
const char* NNULLABLE session_type;
if (session.type == XORG) { if (session.type == XORG) {
session_type = strings.s_xorg; session_type = g_config->strings.s_xorg;
} else if (session.type == WAYLAND) { } else if (session.type == WAYLAND) {
session_type = strings.s_wayland; session_type = g_config->strings.s_wayland;
} else if (session.type == SHELL) {
session_type = g_config->strings.s_shell;
} else { } else {
session_type = strings.s_shell; __builtin_unreachable();
} }
printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + 11 - strlen(session_type)), theme.colors.e_header, // already in the box, - 1 bcs no need to step over margin, same reasoning in
session_type, theme.colors.fg); // other places
printf(
"\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + VALUES_COL - VALUES_SEPR - utf8len(session_type) - 1),
g_config->colors.e_header, session_type, g_config->colors.fg);
char* session_color; char* session_color;
if (session.type == XORG) { if (session.type == XORG) {
session_color = theme.colors.s_xorg; session_color = g_config->colors.s_xorg;
} else if (session.type == WAYLAND) { } else if (session.type == WAYLAND) {
session_color = theme.colors.s_wayland; session_color = g_config->colors.s_wayland;
} else { } else {
session_color = theme.colors.s_shell; session_color = g_config->colors.s_shell;
} }
char* toprint = session.name;
if (multiple) { if (multiple) {
printf("\r\x1b[%dC< \x1b[%sm%s\x1b[%sm >", origin.x + 14, session_color, u_char maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
session.name, theme.colors.fg); utf8len(g_config->strings.opts_post);
toprint += get_render_pos_offset(&of_session, maxlen);
size_t printlen = utf8seekn(toprint, maxlen) - toprint;
printf("\r\x1b[%dC%s\x1b[%sm%.*s\x1b[%sm%s", origin.x + VALUES_COL - 1,
g_config->strings.opts_pre, session_color, (int)printlen, toprint,
g_config->colors.fg, g_config->strings.opts_post);
} else { } else {
printf("\r\x1b[%dC\x1b[%sm%s\x1b[%sm", origin.x + 14, session_color, toprint += get_render_pos_offset(&of_session, VALUE_MAXLEN);
session.name, theme.colors.fg); size_t printlen = utf8seekn(toprint, VALUE_MAXLEN) - toprint;
printf("\r\x1b[%dC\x1b[%sm%.*s\x1b[%sm", origin.x + VALUES_COL - 1,
session_color, (int)printlen, toprint, g_config->colors.fg);
} }
} }
// TODO: user_len > 32 void print_user(struct uint_point origin, struct user user, bool multiple) {
static void print_user(struct uint_point origin, struct user user, clean_line(origin, USER_ROW);
bool multiple) {
clean_line(origin, 7);
printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm", printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + 11 - strlen(strings.e_user)), theme.colors.e_header, (ulong)(origin.x + VALUES_COL - VALUES_SEPR -
strings.e_user, theme.colors.fg); utf8len(g_config->strings.e_user) - 1),
g_config->colors.e_header, g_config->strings.e_user,
g_config->colors.fg);
char *user_color = theme.colors.e_user; char* user_color = g_config->colors.e_user;
char* toprint = user.display_name;
if (multiple) { if (multiple) {
printf("\r\x1b[%dC< \x1b[%sm%s\x1b[%sm >", origin.x + 14, user_color, u_char maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
user.display_name, theme.colors.fg); utf8len(g_config->strings.opts_post);
toprint += get_render_pos_offset(&of_session, maxlen);
size_t printlen = utf8seekn(toprint, maxlen) - toprint;
printf("\r\x1b[%dC< \x1b[%sm%.*s\x1b[%sm >", origin.x + VALUES_COL - 1,
user_color, (int)printlen, toprint, g_config->colors.fg);
} else { } else {
printf("\r\x1b[%dC\x1b[%sm%s\x1b[%sm", origin.x + 14, user_color, toprint += get_render_pos_offset(&of_user, VALUE_MAXLEN);
user.display_name, theme.colors.fg); size_t printlen = utf8seekn(toprint, VALUE_MAXLEN) - toprint;
printf("\r\x1b[%dC\x1b[%sm%.*s\x1b[%sm", origin.x + VALUES_COL - 1,
user_color, (int)printlen, toprint, g_config->colors.fg);
} }
} }
static char passwd_prompt[33]; void print_passwd(struct uint_point origin, uint length, bool err) {
// TODO: passwd_len > 32 char passwd_prompt[VALUE_MAXLEN + 1];
static void print_passwd(struct uint_point origin, uint length, bool err) { clean_line(origin, PASSWD_ROW);
clean_line(origin, 9);
printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm", printf("\r\x1b[%luC\x1b[%sm%s\x1b[%sm",
(ulong)(origin.x + 11 - strlen(strings.e_passwd)), (ulong)(origin.x + VALUES_COL - VALUES_SEPR -
theme.colors.e_header, strings.e_passwd, theme.colors.fg); utf8len(g_config->strings.e_passwd) - 1),
g_config->colors.e_header, g_config->strings.e_passwd,
g_config->colors.fg);
char* pass_color; char* pass_color;
if (err) if (err)
pass_color = theme.colors.e_badpasswd; pass_color = g_config->colors.e_badpasswd;
else else
pass_color = theme.colors.e_passwd; pass_color = g_config->colors.e_passwd;
ulong prompt_len = sizeof(passwd_prompt); ulong actual_len = length > VALUE_MAXLEN ? VALUE_MAXLEN : length;
ulong actual_len = length > prompt_len ? prompt_len : length; memset(passwd_prompt, ' ', VALUE_MAXLEN);
memset(passwd_prompt, ' ', prompt_len);
memset(passwd_prompt, '*', actual_len); memset(passwd_prompt, '*', actual_len);
passwd_prompt[32] = 0; passwd_prompt[VALUE_MAXLEN] = '\0';
printf("\r\x1b[%dC\x1b[%sm", origin.x + 14, pass_color); printf("\r\x1b[%dC\x1b[%sm", origin.x + VALUES_COL - 1, pass_color);
printf("%s", passwd_prompt); printf("%s", passwd_prompt);
printf("\x1b[%sm", theme.colors.fg); printf("\x1b[%sm", g_config->colors.fg);
} }
static void print_empty_row(uint w, uint n, char *edge1, char *edge2) { static void print_empty_row(uint wid, uint n, char* edge1, char* edge2) {
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
printf("%s\x1b[%dC%s\x1b[%dD\x1b[1B", edge1, w, edge2, w + 2); printf("%s\x1b[%dC%s\x1b[%dD\x1b[1B", edge1, wid, edge2, wid + 2);
} }
} }
static void print_row(uint w, uint n, char *edge1, char *edge2, char *filler) { static void print_row(uint wid, uint n, char* edge1, char* edge2,
char* filler) {
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
printf("%s", edge1); printf("%s", edge1);
for (size_t i = 0; i < w; i++) { for (size_t i = 0; i < wid; i++) {
printf("%s", filler); printf("%s", filler);
} }
printf("%s\x1b[%dD\x1b[1B", edge2, w + 2); printf("%s\x1b[%dD\x1b[1B", edge2, wid + 2);
} }
} }
static void print_box() { static void print_box() {
// TODO: check min sizes const struct uint_point BSTART = box_start();
const struct uint_point bstart = box_start();
printf("\x1b[%d;%dH\x1b[%sm", bstart.y, bstart.x, theme.colors.e_box); printf("\x1b[%d;%dH\x1b[%sm", BSTART.y, BSTART.x, g_config->colors.e_box);
fflush(stdout); print_row(BOX_WIDTH - 2, 1, g_config->chars.ctl, g_config->chars.ctr,
print_row(boxw - 2, 1, theme.chars.ctl, theme.chars.ctr, theme.chars.hb); g_config->chars.hb);
print_empty_row(boxw - 2, boxh - 2, theme.chars.vb, theme.chars.vb); print_empty_row(BOX_WIDTH - 2, BOX_HEIGHT - 2, g_config->chars.vb,
print_row(boxw - 2, 1, theme.chars.cbl, theme.chars.cbr, theme.chars.hb); g_config->chars.vb);
printf("\x1b[%sm", theme.colors.fg); print_row(BOX_WIDTH - 2, 1, g_config->chars.cbl, g_config->chars.cbr,
fflush(stdout); g_config->chars.hb);
printf("\x1b[%sm", g_config->colors.fg);
(void)fflush(stdout);
} }
static void print_footer() { static void print_footer() {
size_t bsize = snprintf(NULL, 0, "%s %s %s %s %s %s", strings.f_poweroff, size_t bsize = utf8len(g_config->strings.f_poweroff) +
key_names[functions.poweroff], strings.f_reboot, utf8len(KEY_NAMES[g_config->functions.poweroff]) +
key_names[functions.reboot], strings.f_refresh, utf8len(g_config->strings.f_reboot) +
key_names[functions.refresh]); utf8len(KEY_NAMES[g_config->functions.reboot]) +
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;
printf("\x1b[%3$d;%4$dH%8$s \x1b[%1$sm%5$s\x1b[%2$sm %9$s " printf(
"\x1b[%3$d;%4$dH%8$s \x1b[%1$sm%5$s\x1b[%2$sm %9$s "
"\x1b[%1$sm%6$s\x1b[%2$sm %10$s \x1b[%1$sm%7$s\x1b[%2$sm", "\x1b[%1$sm%6$s\x1b[%2$sm %10$s \x1b[%1$sm%7$s\x1b[%2$sm",
theme.colors.e_key, theme.colors.fg, row, col, g_config->colors.e_key, g_config->colors.fg, row, col,
key_names[functions.poweroff], key_names[functions.reboot], KEY_NAMES[g_config->functions.poweroff],
key_names[functions.refresh], strings.f_poweroff, strings.f_reboot, KEY_NAMES[g_config->functions.reboot],
strings.f_refresh); KEY_NAMES[g_config->functions.refresh], g_config->strings.f_poweroff,
fflush(stdout); g_config->strings.f_reboot, g_config->strings.f_refresh);
(void)fflush(stdout);
} }
void print_err(const char* msg) { void print_err(const char* msg) {
struct uint_point origin = box_start(); struct uint_point origin = box_start();
fprintf(stderr, "\x1b[%d;%dH%s(%d): %s", origin.y - 1, origin.x, msg, errno, (void)fprintf(stderr, "\x1b[%d;%dH%s(%d): %s", origin.y - 1, origin.x, msg,
strerror(errno)); errno, strerror(errno));
} }
void print_errno(const char* descr) { void print_errno(const char* descr) {
struct uint_point origin = box_start(); struct uint_point origin = box_start();
if (descr == NULL) if (descr == NULL)
fprintf(stderr, "\x1b[%d;%dH\x1b[%smunknown error(%d): %s", origin.y - 1, (void)fprintf(stderr, "\x1b[%d;%dH\x1b[%smunknown error(%d): %s",
origin.x, theme.colors.err, errno, strerror(errno)); origin.y - 1, origin.x, g_config->colors.err, errno,
strerror(errno));
else { else {
fprintf(stderr, "\x1b[%d;%dH\x1b[%sm%s(%d): %s", origin.y - 1, origin.x, (void)fprintf(stderr, "\x1b[%d;%dH\x1b[%sm%s(%d): %s", origin.y - 1,
theme.colors.err, descr, errno, strerror(errno)); origin.x, g_config->colors.err, descr, errno,
strerror(errno));
} }
} }
void restore_all() { void restore_all() {
// restore cursor pos, restore screen and show cursor // restore cursor pos, restore screen and show cursor
printf("\x1b[u\x1b[?47l\x1b[?25h"); (void)printf("\x1b[u\x1b[?47l\x1b[?25h");
fflush(stdout); (void)fflush(stdout);
tcsetattr(STDOUT_FILENO, TCSANOW, &orig_term); tcsetattr(STDOUT_FILENO, TCSANOW, &orig_term);
} }

93
src/ui_state.c Normal file
View File

@ -0,0 +1,93 @@
#include "ui_state.h"
#include "ofield.h"
#include "sessions.h"
#include "ui.h"
#include "users.h"
enum input focused_input = PASSWD;
struct Vector* gusers;
struct Vector* gsessions;
struct opts_field of_session;
struct opts_field of_user;
struct opts_field of_passwd;
struct opts_field* NNULLABLE get_opts_field(enum input from) {
if (from == SESSION) return &of_session;
if (from == USER) return &of_user;
if (from == PASSWD) return &of_passwd;
__builtin_unreachable();
}
struct opts_field* NNULLABLE get_opts_ffield() {
return get_opts_field(focused_input);
}
struct user st_user() {
if (of_user.current_opt != 0)
return *(struct user*)vec_get(gusers, of_user.current_opt - 1);
struct user custom_user;
custom_user.shell = "/usr/bin/bash";
custom_user.username = custom_user.display_name = of_user.efield.content;
return custom_user;
}
struct session st_session(bool include_defshell) {
if (of_session.current_opt != 0) {
// this is for the default user shell :P, not the greatest
// implementation but I want to get his done
if (include_defshell && of_session.current_opt == gsessions->length + 1) {
struct session shell_session;
shell_session.type = SHELL;
shell_session.exec = shell_session.name = st_user().shell;
return shell_session;
}
return *(struct session*)vec_get(gsessions, of_session.current_opt - 1);
}
struct session custom_session;
custom_session.type = SHELL;
custom_session.name = custom_session.exec = of_session.efield.content;
return custom_session;
}
void st_ch_focus(char direction) {
focused_input = (focused_input + direction) % INPUTS_N;
ui_update_cursor_focus();
}
void st_ch_of_opts(char direction) {
struct opts_field* ffield = get_opts_ffield();
if (focused_input == PASSWD) ffield = &of_session;
if (!ofield_opts_seek(ffield, direction)) {
if (focused_input == PASSWD || focused_input == SESSION)
ofield_opts_seek(&of_user, direction);
else
ofield_opts_seek(&of_session, direction);
}
}
void st_ch_ef_col(char direction) {
struct opts_field* ffield = get_opts_ffield();
if (!ofield_seek(ffield, direction))
if (!ofield_opts_seek(&of_session, direction))
ofield_opts_seek(&of_user, direction);
ui_update_cursor_focus();
ui_update_ffield();
}
void st_kbd_type(char* text, bool cfg_include_defshell) {
struct opts_field* field = get_opts_ffield();
char* start = "";
if (focused_input == USER && of_user.current_opt != 0)
start = st_user().username;
if (focused_input == SESSION && of_session.current_opt != 0 &&
st_session(cfg_include_defshell).type == SHELL)
start = st_session(cfg_include_defshell).exec;
ofield_kbd_type(field, text, start);
ui_update_ffield();
}

View File

@ -1,36 +1,64 @@
#include <pwd.h> #include <pwd.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "log.h"
#include "macros.h"
#include "users.h" #include "users.h"
#include "util.h" #include "util.h"
static struct user __new_user(struct passwd *p) { // NOLINTNEXTLINE(readability-identifier-length)
struct user __user; int build_user(struct user* NNULLABLE user, struct passwd* p) {
strcln(&__user.shell, p->pw_shell); char* shell = strdup(p->pw_shell);
strcln(&__user.username, p->pw_name); char* username = strdup(p->pw_name);
if (p->pw_gecos[0] == '\0') char* displayname;
__user.display_name = __user.username; if (strlen(p->pw_gecos) == 0)
else displayname = username;
strcln(&__user.display_name, p->pw_gecos); else {
displayname = strdup(p->pw_gecos);
}
if (!shell || !username || !displayname) {
free(shell);
free(username);
if (displayname != username) free(displayname);
// actually tidy struggles with the line i have avobe
// NOLINTNEXTLINE(clang-analyzer-unix.Malloc)
return -1;
}
return __user; *user = (struct user){
.shell = shell,
.username = username,
.display_name = displayname,
};
return 0;
} }
// This code is designed to be run purely single threaded // This code is designed to be run purely single threaded
#define LIKELY_BOUND_USERS 4
struct Vector get_human_users() { struct Vector get_human_users() {
struct Vector users = vec_new(); struct Vector users = VEC_NEW;
vec_reserve(&users, LIKELY_BOUND_USERS);
struct passwd *pwd; struct passwd* NULLABLE pwd;
while ((pwd = getpwent()) != NULL) { while ((pwd = getpwent()) != NULL) {
if (!(pwd->pw_dir && strncmp(pwd->pw_dir, "/home/", 6) == 0)) log_printf("[I] handling user %s\n", pwd->pw_name);
// `- 1` bcs sizeof counts the nullbyte
if (pwd->pw_dir &&
strncmp(pwd->pw_dir, "/home/", sizeof("/home/") - 1) != 0)
continue; continue;
log_printf("[I] found %s\n", pwd->pw_name);
struct user* user_i = malloc(sizeof(struct user)); struct user* user_i = malloc(sizeof(struct user));
*user_i = __new_user(pwd); if (user_i == NULL) continue; // malloc error
if (build_user(user_i, pwd) != 0) {
log_printf("[E] failed to allocate allocate memory for %s\n",
pwd->pw_name);
}
vec_push(&users, user_i); vec_push(&users, user_i);
} }

View File

@ -11,24 +11,20 @@
static int selret_magic(); static int selret_magic();
void strcln(char **dest, const char *source) { int find_keyname(enum keys* at, const char* name) {
*dest = malloc(strlen(source) + sizeof(char)); for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
strcpy(*dest, source); if (strcmp(KEY_NAMES[i], name) == 0) {
*at = (enum keys)i;
return 0;
}
} }
enum keys find_keyname(char *name) { return -1;
for (size_t i = 0; i < sizeof(key_mappings) / sizeof(key_mappings[0]); i++) {
if (strcmp(key_names[i], name) == 0)
return (enum keys)i;
} }
perror("key not found"); enum keys find_ansi(const char* seq) {
exit(1); for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
} struct key_mapping mapping = KEY_MAPPINGS[i];
enum keys find_ansi(char *seq) {
for (size_t i = 0; i < sizeof(key_mappings) / sizeof(key_mappings[0]); i++) {
struct key_mapping mapping = key_mappings[i];
for (size_t j = 0; mapping.sequences[j] != NULL; j++) { for (size_t j = 0; mapping.sequences[j] != NULL; j++) {
if (strcmp(mapping.sequences[j], seq) == 0) { if (strcmp(mapping.sequences[j], seq) == 0) {
return (enum keys)i; return (enum keys)i;
@ -38,7 +34,6 @@ enum keys find_ansi(char *seq) {
return -1; return -1;
} }
// https://stackoverflow.com/a/48040042
void read_press(u_char* length, char* out) { void read_press(u_char* length, char* out) {
*length = 0; *length = 0;
@ -58,6 +53,7 @@ void read_press(u_char *length, char *out) {
} }
} }
// https://stackoverflow.com/a/48040042
static int selret_magic() { static int selret_magic() {
fd_set set; fd_set set;
struct timeval timeout; struct timeval timeout;
@ -68,60 +64,123 @@ static int selret_magic() {
return select(1, &set, NULL, NULL, &timeout); return select(1, &set, NULL, NULL, &timeout);
} }
// UTF-8 shii
// Vector shii #define UTF8_CONT_MSK 0b11000000
struct Vector vec_new() { #define UTF8_CONT_VAL 0b10000000
struct Vector vec; bool utf8_iscont(char byte) {
vec_clear(&vec); return (byte & UTF8_CONT_MSK) == UTF8_CONT_VAL;
return vec;
} }
int vec_push(struct Vector* vec, void* item) { size_t utf8len(const char* str) {
if (vec->length >= vec->alloc_len) { size_t len = 0;
uint32_t new_size = vec->alloc_len + vec->alloc_size; while (*str != '\0') {
void **new_location = realloc(vec->pages, vec->alloc_size); if (!utf8_iscont(*(str++))) len++;
}
return len;
}
size_t utf8len_until(const char* str, const char* until) {
size_t len = 0;
while (str < until) {
if (!utf8_iscont(*(str++))) len++;
}
return len;
}
const char* utf8back(const char* str) {
while (utf8_iscont(*(--str))) {
}
return str;
}
const char* utf8seek(const char* str) {
while (utf8_iscont(*(++str))) {
}
return str;
}
const char* utf8seekn(const char* str, size_t n) {
while (n > 0 && *str != '\0') {
str = utf8seek(str);
n--;
}
return str;
}
// Vector shii
const struct Vector VEC_NEW = {
.length = 0,
.capacity = 0,
.pages = NULL,
};
int vec_resize(struct Vector* self, size_t size) {
void** new_location =
(void**)realloc((void*)self->pages, size * sizeof(void*));
if (new_location != NULL) { if (new_location != NULL) {
vec->alloc_size = new_size; if (self->length > size) self->length = size;
vec->pages = new_location; self->capacity = size;
self->pages = new_location;
} else { } else {
return -1; return -1;
} }
}
vec->pages[vec->length] = item;
vec->length++;
return 0; return 0;
} }
void vec_free(struct Vector* vec) { int vec_reserve(struct Vector* self, size_t size) {
while(vec->length > 0) uint32_t new_capacity = self->capacity;
free(vec->pages[--vec->length]); while (self->length + size > new_capacity) {
new_capacity = new_capacity + (new_capacity >> 1) +
vec_clear(vec); 1; // cap * 1.5 + 1; 0 1 2 4 7 11...
}
return vec_resize(self, new_capacity);
} }
void vec_clear(struct Vector* vec) { int vec_reserve_exact(struct Vector* self, size_t size) {
free(vec->pages); uint32_t needed_capacity = self->length + size;
vec_reset(vec); if (self->capacity < needed_capacity) {
return vec_resize(self, needed_capacity);
}
return 0;
} }
void vec_reset(struct Vector* vec) { int vec_push(struct Vector* self, void* item) {
vec->length = 0; int res_ret = vec_reserve(self, 1);
vec->alloc_len = 0; if (res_ret != 0) return res_ret;
vec->alloc_size = 4096; // 4KiB page size?
vec->pages = NULL; self->pages[self->length++] = item;
return 0;
} }
void* vec_pop(struct Vector* vec) { void vec_free(struct Vector* self) {
if (vec->length == 0) while (self->length > 0)
return NULL; free(self->pages[--self->length]);
return vec->pages[--vec->length]; vec_clear(self);
} }
void* vec_get(struct Vector* vec, size_t index) { void vec_clear(struct Vector* self) {
if (index >= vec->length) free((void*)self->pages);
return NULL; vec_reset(self);
}
return vec->pages[index];
void vec_reset(struct Vector* self) {
*self = (struct Vector){
.length = 0,
.capacity = 0,
.pages = NULL,
};
}
void* vec_pop(struct Vector* self) {
if (self->length == 0) return NULL;
return self->pages[--self->length];
}
void* vec_get(struct Vector* self, size_t index) {
if (index >= self->length) return NULL;
return self->pages[index];
} }

View File

@ -16,6 +16,14 @@
![kanagawa-wave.ini theme](./screenshots/kanagawa-wave.png) ![kanagawa-wave.ini theme](./screenshots/kanagawa-wave.png)
## minimal.ini
![minimal.ini theme](./screenshots/minimal.png)
> [!WARNING]
> This theme **heavily** relies on terminal rendering. It's just to show
> customizability, a TTY won't render this properly
## nature.ini ## nature.ini
![nature.ini theme](./screenshots/nature.png) ![nature.ini theme](./screenshots/nature.png)

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;77;33;55 [colors]
colors.fg = 22;3;24;38;2;245;245;245 bg = "48;2;77;33;55"
colors.err = 1;31 fg = "22;3;24;38;2;245;245;245"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 32 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 1;23;38;5;197 s_shell = "32"
colors.e_date = 31 e_hostname = "1;23;38;5;197"
colors.e_box = 31 e_date = "31"
colors.e_header = 1;4;38;5;204 e_box = "31"
colors.e_user = 38;5;51 e_header = "1;4;38;5;204"
colors.e_passwd = 4;2;38;5;203 e_user = "38;5;51"
colors.e_badpasswd = 4;31 e_passwd = "4;2;38;5;203"
colors.e_key = 1;23;38;5;197 e_badpasswd = "4;31"
chars.hb = e_key = "1;23;38;5;197"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
# timefmt = "%X %x"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;38;28;28 [colors]
colors.fg = 22;24;38;2;245;245;245 # bg = "48;2;38;28;28"
colors.err = 1;31 # fg = "22;24;38;2;245;245;245"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 38;2;34;140;34 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 38;2;255;64;64 # s_shell = "38;2;34;140;34"
colors.e_date = 38;2;144;144;144 # e_hostname = "38;2;255;64;64"
colors.e_box = 38;2;122;122;122 # e_date = "38;2;144;144;144"
colors.e_header = 4;38;2;0;255;0 # e_box = "38;2;122;122;122"
colors.e_user = 36 # e_header = "4;38;2;0;255;0"
colors.e_passwd = 4;38;2;245;245;205 # e_user = "36"
colors.e_badpasswd = 3;4;31 # e_passwd = "4;38;2;245;245;205"
colors.e_key = 38;2;255;174;66 # e_badpasswd = "3;4;31"
chars.hb = # e_key = "38;2;255;174;66"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
# timefmt = "%X %x"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;24;22;22 [colors]
colors.fg = 22;24;38;2;185;185;185 bg = "48;2;24;22;22"
colors.err = 1;31 fg = "22;24;38;2;185;185;185"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 38;2;34;140;34 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 38;2;208;189;156 # s_shell = "38;2;34;140;34"
colors.e_date = 38;2;144;144;144 e_hostname = "38;2;208;189;156"
colors.e_box = 38;2;122;122;122 e_date = "38;2;144;144;144"
colors.e_header = 4;38;2;126;146;178 # e_box = "38;2;122;122;122"
colors.e_user = 38;2;148;89;84 e_header = "4;38;2;126;146;178"
colors.e_passwd = 4;38;2;245;245;205 e_user = "38;2;148;89;84"
colors.e_badpasswd = 3;4;31 # e_passwd = "4;38;2;245;245;205"
colors.e_key = 38;2;255;174;66 # e_badpasswd = "3;4;31"
chars.hb = # e_key = "38;2;255;174;66"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;28;28;36 [colors]
colors.fg = 22;24;38;2;168;168;168 bg = "48;2;28;28;36"
colors.err = 1;31 fg = "22;24;38;2;168;168;168"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 38;2;34;140;34 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 38;2;196;165;112 # s_shell = "38;2;34;140;34"
colors.e_date = 38;2;144;144;144 e_hostname = "38;2;196;165;112"
colors.e_box = 38;2;122;122;122 e_date = "38;2;144;144;144"
colors.e_header = 4;38;2;114;133;162 # e_box = "38;2;122;122;122"
colors.e_user = 38;2;211;137;88 e_header = "4;38;2;114;133;162"
colors.e_passwd = 4;38;2;245;245;205 e_user = "38;2;211;137;88"
colors.e_badpasswd = 3;4;31 # e_passwd = "4;38;2;245;245;205"
colors.e_key = 38;2;255;174;66 # e_badpasswd = "3;4;31"
chars.hb = # e_key = "38;2;255;174;66"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

48
themes/minimal.ini Normal file
View File

@ -0,0 +1,48 @@
[colors]
# bg = "48;2;38;28;28"
# fg = "22;24;38;2;245;245;245"
# err = "1;31"
# s_wayland = "38;2;255;174;66"
# s_xorg = "38;2;37;175;255"
# s_shell = "38;2;34;140;34"
# e_hostname = "38;2;255;64;64"
# e_date = "38;2;144;144;144"
# e_box = "38;2;122;122;122"
e_header = "38;2;0;255;0"
# e_user = "36"
# e_passwd = "4;38;2;245;245;205"
# e_badpasswd = "3;4;31"
# e_key = "38;2;255;174;66"
[chars]
hb = " "
vb = " "
ctl = " "
ctr = " "
cbl = " "
cbr = " "
[functions]
# poweroff = F1
# reboot = F2
# refresh = F5
# EXCLUSIVE TO NERD FONTS
[strings]
f_poweroff = "\xef\x80\x91 "
f_reboot = "\xee\xab\x92 "
f_refresh = "\xf3\xb0\x91\x93 "
e_user = "\xee\xb4\xb5"
e_passwd = "\xef\x80\xa3"
s_wayland = "W"
s_xorg = "X"
s_shell = "$"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "\xef\x80\x97 %X \xef\x84\xb3 %x"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;15;22;15 [colors]
colors.fg = 22;23;24;38;2;245;245;245 bg = "48;2;15;22;15"
colors.err = 1;31 fg = "22;23;24;38;2;245;245;245"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 32 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 38;5;28 s_shell = "32"
colors.e_date = 32 e_hostname = "38;5;28"
colors.e_box = 32 e_date = "32"
colors.e_header = 1;4;32 e_box = "32"
colors.e_user = 38;5;51 e_header = "1;4;32"
colors.e_passwd = 4;2;38;5;83 e_user = "38;5;51"
colors.e_badpasswd = 3;4;31 e_passwd = "4;2;38;5;83"
colors.e_key = 32 e_badpasswd = "3;4;31"
chars.hb = e_key = "32"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;19;19;22 [colors]
colors.fg = 22;24;38;2;245;245;245 bg = "48;2;19;19;22"
colors.err = 1;31 fg = "22;24;38;2;245;245;245"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 32 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 34 s_shell = "32"
colors.e_date = 38;2;66;66;88 e_hostname = "34"
colors.e_box = 38;2;122;122;122 e_date = "38;2;66;66;88"
colors.e_header = 1;4;36 # e_box = "38;2;122;122;122"
colors.e_user = 38;5;51 e_header = "1;4;36"
colors.e_passwd = 4;2;38;5;80 e_user = "38;5;51"
colors.e_badpasswd = 3;4;31 e_passwd = "4;2;38;5;80"
colors.e_key = 34 # e_badpasswd = "3;4;31"
chars.hb = e_key = "34"
chars.vb =
chars.ctl = [chars]
chars.ctr = # hb = "─"
chars.cbl = # vb = "│"
chars.cbr = # ctl = "┌"
functions.poweroff = F1 # ctr = "┐"
functions.reboot = F2 # cbl = "└"
functions.refresh = F5 # cbr = "┘"
strings.f_poweroff = poweroff
strings.f_reboot = reboot [functions]
strings.f_refresh = refresh # poweroff = F1
strings.e_user = user # reboot = F2
strings.e_passwd = password # refresh = F5
strings.s_wayland = wayland
strings.s_xorg = xorg [strings]
strings.s_shell = shell # f_poweroff = "poweroff"
behavior.include_defshell = true # f_reboot = "reboot"
behavior.source = /etc/lidm.env # f_refresh = "refresh"
behavior.source = /etc/locale.conf # e_user = "user"
behavior.user_source = .lidm.env # e_passwd = "password"
# s_wayland = "wayland"
# s_xorg = "xorg"
# s_shell = "shell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,49 @@
colors.bg = - [colors]
colors.fg = 24;39m[?25l[- # the '-' makes '\x1b[-m' which usually does nothing
colors.err = - bg = "-"
colors.s_wayland = - # you can even break out of the '\x1b...m' context like do, I wouldn't though
colors.s_xorg = - fg = "24;39m\x1b[?25l\x1b[-"
colors.s_shell = - err = "-"
colors.e_hostname = - s_wayland = "-"
colors.e_date = 30 s_xorg = "-"
colors.e_box = - s_shell = "-"
colors.e_header = 30 e_hostname = "-"
colors.e_user = - e_date = "30"
colors.e_passwd = 24;30 e_box = "-"
colors.e_badpasswd = - e_header = "30"
colors.e_key = - e_user = "-"
chars.hb = - e_passwd = "24;30"
chars.vb = - e_badpasswd = "-"
chars.ctl = - e_key = "-"
chars.ctr = -
chars.cbl = - [chars]
chars.cbr = - hb = " "
functions.poweroff = F1 vb = " "
functions.reboot = F2 ctl = " "
functions.refresh = F5 ctr = " "
strings.f_poweroff = poweroff cbl = " "
strings.f_reboot = reboot cbr = " "
strings.f_refresh = refresh
strings.e_user = user [functions]
strings.e_passwd = password # poweroff = F1
strings.s_wayland = wayland # reboot = F2
strings.s_xorg = xorg # refresh = F5
strings.s_shell = shell
behavior.include_defshell = true [strings]
behavior.source = /etc/lidm.env # f_poweroff = "poweroff"
behavior.source = /etc/locale.conf # f_reboot = "reboot"
behavior.user_source = .lidm.env # f_refresh = "refresh"
e_user = ""
e_passwd = ""
s_wayland = ""
s_xorg = ""
s_shell = ""
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = " "
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

View File

@ -1,35 +1,47 @@
colors.bg = 48;2;0;0;255 [colors]
colors.fg = 22;24;39;48;2;0;0;255 bg = "48;2;0;0;255"
colors.err = 1;31 fg = "22;24;39;48;2;0;0;255"
colors.s_wayland = 38;2;255;174;66 # err = "1;31"
colors.s_xorg = 38;2;37;175;255 # s_wayland = "38;2;255;174;66"
colors.s_shell = 38;2;34;140;34 # s_xorg = "38;2;37;175;255"
colors.e_hostname = 38;2;255;64;64 # s_shell = "38;2;34;140;34"
colors.e_date = 38;2;144;144;144 # e_hostname = "38;2;255;64;64"
colors.e_box = 34 e_date = "38;2;144;144;144"
colors.e_header = 4;38;2;0;255;0 e_box = "34"
colors.e_user = 36 e_header = "4;38;2;0;255;0"
colors.e_passwd = 4;38;2;245;245;205 e_user = "36"
colors.e_badpasswd = 3;4;31 e_passwd = "4;38;2;245;245;205"
colors.e_key = 1;31;48;2;255;174;66 # e_badpasswd = "3;4;31"
chars.hb = e_key = "1;31;48;2;255;174;66"
chars.vb =
chars.ctl = [chars]
chars.ctr = hb = "█"
chars.cbl = vb = "█"
chars.cbr = ctl = "█"
functions.poweroff = F1 ctr = "█"
functions.reboot = F2 cbl = "█"
functions.refresh = F5 cbr = "█"
strings.f_poweroff = powewoff
strings.f_reboot = rewoot [functions]
strings.f_refresh = rewresh # poweroff = F1
strings.e_user = wuser # reboot = F2
strings.e_passwd = passwd # refresh = F5
strings.s_wayland = waywand
strings.s_xorg = xworg [strings]
strings.s_shell = swell f_poweroff = "powewoff"
behavior.include_defshell = true f_reboot = "rewoot"
behavior.source = /etc/lidm.env f_refresh = "rewresh"
behavior.source = /etc/locale.conf e_user = "wuser"
behavior.user_source = .lidm.env e_passwd = "passwd"
s_wayland = "waywand"
s_xorg = "xworg"
s_shell = "swell"
# opts_pre = "< "
# opts_post = " >"
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 13 KiB

81
themes/take-screenshots.sh Executable file
View File

@ -0,0 +1,81 @@
#!/usr/bin/env bash
set -e
MYSELF=$(realpath "$0")
MYDIR=$(dirname "$MYSELF")
COLS=60
ROWS=35
if [[ -z "$IM_FLOATING" ]]; then
if [[ -z "$LIDM_SESSIONS_N" ]]; then
echo "Please set LIDM_SESSIONS_N" >&2;
exit 1;
fi
# 12 pts ≈ 16 px
exec hyprctl dispatch exec \
"[float; size $((COLS*16)) $((ROWS*16))]" \
"kitty --override font_size=12.0 --override background_opacity=1 --override cursor_trail=0 --override cursor_shape=beam --override cursor_blink_interval=0 bash -c 'cd \"$PWD\" && IM_FLOATING=1 LIDM_PATH=\"$LIDM_PATH\" LIDM_SCR_TTY=\"$(tty)\" LIDM_SESSIONS_N=\"$LIDM_SESSIONS_N\" \"$MYSELF\"'"
fi
LIDM_PATH=${LIDM_PATH:-$(command which lidm)}
echo "Using '$LIDM_PATH'"
[[ -e "$LIDM_PATH" ]] || {
echo "'$LIDM_PATH' is not executable" >&2;
sleep 2;
exit 1;
}
notify-send "also make sure this is not in the way either"
echo "Press enter when the window is clearly visible and nothing in the way"
echo "ONLY use this script if you are on hyprland and a \"normal\" kitty config"
echo "AND make sure you have rg, jq, grim, gifski and maybe a few more"
exec 2>"$LIDM_SCR_TTY"
echo "This should show on the original terminal" > "$LIDM_SCR_TTY"
echo "And this too" >&2
read -r
BG=$(rg '^background ' ~/.config/kitty/kitty.conf | cut -d'#' -f2)
printf '\033]4;0;rgb:%s\007' "${BG:0:2}/${BG:2:2}/${BG:4:2}"
PRAD=$(hyprctl getoption decoration:rounding | rg int | cut -d' ' -f2)
hyprctl keyword decoration:rounding 0
tty=$(tty)
for theme in "$MYDIR"/*.ini; do
LIDM_CONF="$theme" "$LIDM_PATH" <"$tty" &
LIDM_PID=$!
sleep .2
for n in $(seq "$LIDM_SESSIONS_N"); do
GEOMETRY=$(
hyprctl -j activewindow | \
jq -r '(.at[0]|tostring) + "," + (.at[1]|tostring) + " " + (.size[0]|tostring) + "x" + (.size[1]|tostring)'
)
grim -g "$GEOMETRY" - > "$MYDIR/screenshots/$(basename "$theme" | cut -d. -f1)-$n.png"
notify-send "$n taken"
wtype -k right
sleep .5
done
kill -15 $LIDM_PID
sleep .5
done
gifski \
-Q 95 --fps 4 \
-W $((COLS*32)) \
-o "$MYDIR/../assets/media/lidm.gif" \
"$MYDIR"/screenshots/*.png &> "$LIDM_SCR_TTY"
for screenshot in "$MYDIR"/screenshots/*"-1.png"; do
# shellcheck disable=SC2001
mv "$screenshot" "$(sed 's/-[0-9]\.png/.png/' <<<"$screenshot")"
done
rm "$MYDIR"/screenshots/*"-"[0-9].png
printf '\033]104\007'
hyprctl keyword decoration:rounding "$PRAD"

View File

@ -1,35 +1,48 @@
colors.bg = - [colors]
colors.fg = 24 # the '-' makes '\x1b[-m' which usually does nothing
colors.err = - bg = "-"
colors.s_wayland = - fg = "24"
colors.s_xorg = - err = "-"
colors.s_shell = - s_wayland = "-"
colors.e_hostname = - s_xorg = "-"
colors.e_date = - s_shell = "-"
colors.e_box = - e_hostname = "-"
colors.e_header = - e_date = "-"
colors.e_user = - e_box = "-"
colors.e_passwd = - e_header = "-"
colors.e_badpasswd = - e_user = "-"
colors.e_key = - e_passwd = "-"
chars.hb = e_badpasswd = "-"
chars.vb = e_key = "-"
chars.ctl =
chars.ctr = [chars]
chars.cbl = # hb = "─"
chars.cbr = # vb = "│"
functions.poweroff = F1 # ctl = "┌"
functions.reboot = F2 # ctr = "┐"
functions.refresh = F5 # cbl = "└"
strings.f_poweroff = poweroff # cbr = "┘"
strings.f_reboot = reboot
strings.f_refresh = refresh [functions]
strings.e_user = user # poweroff = F1
strings.e_passwd = password # reboot = F2
strings.s_wayland = wayland # refresh = F5
strings.s_xorg = xorg
strings.s_shell = shell [strings]
behavior.include_defshell = true f_poweroff = "off"
behavior.source = /etc/lidm.env f_reboot = "reb"
behavior.source = /etc/locale.conf f_refresh = "ref"
behavior.user_source = .lidm.env e_user = "user"
e_passwd = "pass"
s_wayland = "wayl"
s_xorg = "xorg"
s_shell = "sh"
opts_pre = "· "
opts_post = " "
[behavior]
# include_defshell = true
timefmt = "%Y-%m-%d %H:%M:%S"
source = "/etc/lidm.env"
source = "/etc/locale.conf"
user_source = ".lidm.env"

18
themes/view.sh Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env bash
set -e
MYSELF=$(realpath "$0")
MYDIR=$(dirname "$MYSELF")
LIDM_PATH=${LIDM_PATH:-$(command which lidm)}
echo "Using '$LIDM_PATH'"
[[ -e "$LIDM_PATH" ]] || { echo "'$LIDM_PATH' is not executable" >&2; exit 1; }
echo "Press \`Ctrl + C\` once you are done viewing the theme"
sleep 3
for theme in "$MYDIR/"*.ini; do
LIDM_CONF="$theme" "$LIDM_PATH" || :
echo "That was '$(basename "$theme")'"
sleep 2 || :
done