Merge pull request #47 from javalsai/actions/update-aur-1.1.1

[AUR update]: Bump to 1.1.1

Makefile

@@ -12,10 +12,10 @@ ALLFLAGS=$(CFLAGS) -I$(IDIR)
 
 LIBS=-lpam
 
-_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
+_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))
 
-_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
+_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))
 
 $(ODIR)/%.o: $(CDIR)/%.c $(DEPS)

assets/pkg/aur/lidm-bin/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm-bin
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
-	pkgver = 0.2.2
+	pkgver = 1.1.1
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = x86_64
@@ -8,13 +8,13 @@ pkgbase = lidm-bin
 	depends = pam
 	provides = lidm
 	conflicts = lidm
-	source = lidm::https://github.com/javalsai/lidm/releases/download/v0.2.2/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.2.2/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.2.2/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.2.2/assets/man/lidm-config.5
+	source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.1.1/assets/man/lidm-config.5
-	sha256sums = be2307be9bef7b3ef294fb0e8178040e2d8ccff6b8efb7546514da8b0f69c179
+	sha256sums = c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf
-	sha256sums = 68662430a6d262b35cc54d9f0e164ed935b7f7f4497a87cc94946c558bbe8a91
+	sha256sums = a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542
-	sha256sums = a6807a55ff72ec5a5678583156b3efd0d367f0bcb79854094132771f0cb86bce
+	sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8
-	sha256sums = 3adaae60f79dff1cef2b2aba7dcea04196cd49816759ad36afb9f7331ac9c3e4
+	sha256sums = 5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f
 
 pkgname = lidm-bin

assets/pkg/aur/lidm-bin/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-bin
-pkgver=0.2.2
+pkgver=1.1.1
 pkgrel=1
 depends=('pam')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
@@ -16,10 +16,10 @@ source=(
     "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"
 )
-sha256sums=('be2307be9bef7b3ef294fb0e8178040e2d8ccff6b8efb7546514da8b0f69c179'
+sha256sums=('c4e82ae2c08c223ef417edca50f86f516e3f9154339f67110c87d01855673fcf'
-            '68662430a6d262b35cc54d9f0e164ed935b7f7f4497a87cc94946c558bbe8a91'
+            'a8d29e220c23b48b5cd3aac0c0e395e90a9d6c9ca9c9c35a45ad6f3df5f55542'
-            'a6807a55ff72ec5a5678583156b3efd0d367f0bcb79854094132771f0cb86bce'
+            '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8'
-            '3adaae60f79dff1cef2b2aba7dcea04196cd49816759ad36afb9f7331ac9c3e4')
+            '5dbe088ce29c95a400080190560d4308c10519a953e83d2d5020dfdf47dd830f')
 
 package() {
     install -Dm755 lidm "${pkgdir}/usr/bin/lidm"

assets/pkg/aur/lidm-git/PKGBUILD

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

assets/pkg/aur/lidm/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
-	pkgver = 0.2.2
+	pkgver = 1.1.1
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = any
@@ -8,7 +8,7 @@ pkgbase = lidm
 	makedepends = git
 	makedepends = gcc
 	depends = pam
-	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v0.2.2.tar.gz
+	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.1.1.tar.gz
-	sha256sums = 25523abc3ce6f2f261bff0cc52663607fe114692d6d3736f27fd843cae3f3a27
+	sha256sums = 915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479
 
 pkgname = lidm

assets/pkg/aur/lidm/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm
-pkgver=0.2.2
+pkgver=1.1.1
 pkgrel=1
 depends=('pam')
 makedepends=('git' 'gcc')
@@ -10,7 +10,7 @@ arch=('any')
 url="https://github.com/javalsai/lidm"
 license=('GPL')
 source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('25523abc3ce6f2f261bff0cc52663607fe114692d6d3736f27fd843cae3f3a27')
+sha256sums=('915dc5acce413d5d32bb52c6f9980661a389a0939a49ac31bc250b2d162a5479')
 
 build() {
     tar -xzf "tarball.tar.gz"

debug/README.md

@@ -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.

debug/debug.gdb

@@ -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

include/launch_state.h

@@ -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

src/auth.c

@@ -121,19 +121,26 @@ void moarEnv(char* user, struct session session, struct passwd* pw,
     sourceFileTry((char*)vec_get(&config->behavior.source, i));
   }
   /* printf("\n"); */
-  if (pw->pw_dir) {
-    uint home_len = strlen(pw->pw_dir);
-    for (size_t i = 0; i < config->behavior.user_source.length; i++) {
-      char* file2sourcepath = (char*)vec_get(&config->behavior.user_source, i);
-      size_t newbuf_len = home_len + strlen(file2sourcepath) + 2;
-      char* newbuf = malloc(newbuf_len); // nullbyte and slash
-      if (newbuf == NULL) continue;      // can't bother
-      memcpy(newbuf, pw->pw_dir, newbuf_len);
-      newbuf[home_len] = '/'; // assume pw_dir doesn't start with '/' :P
-      memcpy(&newbuf[home_len + 1], file2sourcepath, newbuf_len - home_len);
 
-      sourceFileTry(newbuf);
+  if (pw->pw_dir) {
-      free(newbuf);
+    const char* home = pw->pw_dir;
+    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);
     }
   }
 

src/config.c

@@ -126,7 +126,7 @@ struct parser_error parse_key(enum introspection_type typ, union typ_ptr at,
       aux_str = strdup(key);
       if (!aux_str) FAIL("allocation failure");
       aux_err = parse_str_inplace(aux_str);
-      if (!aux_err.msg) {
+      if (aux_err.msg) {
         free(aux_str);
         return aux_err;
       }
@@ -157,7 +157,7 @@ struct parser_error parse_key(enum introspection_type typ, union typ_ptr at,
       aux_str = strdup(key);
       if (!aux_str) FAIL("allocation failure");
       aux_err = parse_str_inplace(aux_str);
-      if (!aux_err.msg) {
+      if (aux_err.msg) {
         free(aux_str);
         return aux_err;
       }
@@ -170,7 +170,7 @@ struct parser_error parse_key(enum introspection_type typ, union typ_ptr at,
 #undef FAIL
 #undef NOFAIL
 
-// NOLINTBEGIN(readability-identifier-length,readability-function-cognitive-complexity,readability-identifier-length)
+// NOLINTBEGIN(readability-identifier-length,readability-function-cognitive-complexity)
 struct status config_line_handler(void* _config, char* table, char* k,
                                   char* v) {
   struct config* config = (struct config*)_config;
@@ -213,11 +213,14 @@ struct status config_line_handler(void* _config, char* table, char* k,
     return ret;
   }
 
-  log_printf("[I] cfg parsed [%s.%s]\n", table, k);
+  if (this_intros_key->typ == STRING)
+    log_printf("[I] cfg parsed [%s.%s] (%s)\n", table, k, *k_addr.string);
+  else
+    log_printf("[I] cfg parsed [%s.%s]\n", table, k);
 
   return ret;
 }
-// NOLINTEND(readability-identifier-length,readability-function-cognitive-complexity,readability-identifier-length)
+// NOLINTEND(readability-identifier-length,readability-function-cognitive-complexity)
 
 int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
   FILE* fd = fopen(path, "r");
@@ -232,9 +235,7 @@ int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
 
   bool ret = read_desktop(fd, config, config_line_handler);
   (void)fclose(fd);
-  if (!ret) {
-    return -1;
-  }
 
+  if (!ret) return -1;
   return 0;
 }

src/launch_state.c

@@ -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;
+}

src/ui.c

@@ -20,6 +20,8 @@
 #include "auth.h"
 #include "efield.h"
 #include "keys.h"
+#include "launch_state.h"
+#include "log.h"
 #include "ofield.h"
 #include "sessions.h"
 #include "ui.h"
@@ -198,6 +200,34 @@ int load(struct Vector* users, struct Vector* sessions) {
   of_user = ofield_new(users->length);
   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
   const struct uint_point BOXSTART = box_start();
 
@@ -254,6 +284,12 @@ int load(struct Vector* users, struct Vector* sessions) {
       }
     } else {
       if (len == 1 && *seq == '\n') {
+        bool successful_write = write_launch_state((struct LaunchState){
+            .username = st_user().username,
+            .session_opt = st_session(g_config->behavior.include_defshell).name,
+        });
+        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)) {