From 4a83e5d8251deaf2823db493d6713427b2ffcb89 Mon Sep 17 00:00:00 2001 From: rmntgx Date: Wed, 21 May 2025 00:22:04 +0500 Subject: [PATCH 1/3] feature: saving previous selection --- Makefile | 4 ++-- include/launch_state.h | 12 ++++++++++++ src/launch_state.c | 35 +++++++++++++++++++++++++++++++++++ src/ui.c | 14 ++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 include/launch_state.h create mode 100644 src/launch_state.c diff --git a/Makefile b/Makefile index a542b1e..422604c 100644 --- a/Makefile +++ b/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) diff --git a/include/launch_state.h b/include/launch_state.h new file mode 100644 index 0000000..bc05bba --- /dev/null +++ b/include/launch_state.h @@ -0,0 +1,12 @@ +#ifndef _LAUNCHSTATEH_ +#define _LAUNCHSTATEH_ + +struct LaunchState { + int user_opt; + int session_opt; +}; + +struct LaunchState read_launch_state(); +bool write_launch_state(struct LaunchState state); + +#endif diff --git a/src/launch_state.c b/src/launch_state.c new file mode 100644 index 0000000..ec19c02 --- /dev/null +++ b/src/launch_state.c @@ -0,0 +1,35 @@ +// Small file to save last selection + +#define STATE_PATH "/var/lib/lidm/state" + +#include +#include + +#include "launch_state.h" + +static void serialize_lstate(FILE* f, struct LaunchState st) { + fprintf(f, "%i;%i", st.user_opt, st.session_opt); +} + +static void deserialize_lstate(FILE* f, struct LaunchState* st) { + fscanf(f, "%i;%i", &st->user_opt, &st->session_opt); +} + +struct LaunchState read_launch_state() { + struct LaunchState state; + state.user_opt = 1; + state.session_opt = 1; + FILE* f = fopen(STATE_PATH, "r"); + if(!f) return state; + deserialize_lstate(f, &state); + fclose(f); + return state; +} + +bool write_launch_state(struct LaunchState state) { + FILE* f = fopen(STATE_PATH, "w"); + if(!f) return false; + serialize_lstate(f, state); + fclose(f); + return true; +} diff --git a/src/ui.c b/src/ui.c index eb2c463..c0fd3b0 100644 --- a/src/ui.c +++ b/src/ui.c @@ -26,6 +26,7 @@ #include "ui_state.h" #include "users.h" #include "util.h" +#include "launch_state.h" const u_char INPUTS_N = 3; @@ -198,6 +199,14 @@ int load(struct Vector* users, struct Vector* sessions) { of_user = ofield_new(users->length); of_passwd = ofield_new(0); + struct LaunchState initial_state = read_launch_state(); + if(initial_state.user_opt > users->length || initial_state.session_opt > sessions->length + behavior.include_defshell) { + initial_state.user_opt = 1; + initial_state.session_opt = 1; + } + of_user.current_opt = initial_state.user_opt; + of_session.current_opt = initial_state.session_opt; + /// PRINTING const struct uint_point BOXSTART = box_start(); @@ -254,6 +263,11 @@ int load(struct Vector* users, struct Vector* sessions) { } } else { if (len == 1 && *seq == '\n') { + struct LaunchState ls; + ls.user_opt = of_user.current_opt; + ls.session_opt = of_session.current_opt; + write_launch_state(ls); + if (!launch(st_user().username, of_passwd.efield.content, st_session(g_config->behavior.include_defshell), &restore_all, g_config)) { From a08ffa5a759cb22ddb69d456d128a61220f5c352 Mon Sep 17 00:00:00 2001 From: rmntgx Date: Wed, 21 May 2025 13:33:15 +0500 Subject: [PATCH 2/3] fix: simplified code --- src/launch_state.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/launch_state.c b/src/launch_state.c index ec19c02..9ac2ac6 100644 --- a/src/launch_state.c +++ b/src/launch_state.c @@ -7,21 +7,13 @@ #include "launch_state.h" -static void serialize_lstate(FILE* f, struct LaunchState st) { - fprintf(f, "%i;%i", st.user_opt, st.session_opt); -} - -static void deserialize_lstate(FILE* f, struct LaunchState* st) { - fscanf(f, "%i;%i", &st->user_opt, &st->session_opt); -} - struct LaunchState read_launch_state() { struct LaunchState state; state.user_opt = 1; state.session_opt = 1; FILE* f = fopen(STATE_PATH, "r"); if(!f) return state; - deserialize_lstate(f, &state); + fscanf(f, "%i;%i", &state.user_opt, &state.session_opt); fclose(f); return state; } @@ -29,7 +21,7 @@ struct LaunchState read_launch_state() { bool write_launch_state(struct LaunchState state) { FILE* f = fopen(STATE_PATH, "w"); if(!f) return false; - serialize_lstate(f, state); + fprintf(f, "%i;%i", state.user_opt, state.session_opt); fclose(f); return true; } From 1714b477adb6312406b4e36f42b6c7eaadd5a57a Mon Sep 17 00:00:00 2001 From: rmntgx Date: Sun, 29 Jun 2025 10:24:58 +0500 Subject: [PATCH 3/3] fix: compilation error after rebase --- src/ui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui.c b/src/ui.c index c0fd3b0..26c380b 100644 --- a/src/ui.c +++ b/src/ui.c @@ -200,7 +200,7 @@ int load(struct Vector* users, struct Vector* sessions) { of_passwd = ofield_new(0); struct LaunchState initial_state = read_launch_state(); - if(initial_state.user_opt > users->length || initial_state.session_opt > sessions->length + behavior.include_defshell) { + if(initial_state.user_opt > users->length || initial_state.session_opt > sessions->length + g_config->behavior.include_defshell) { initial_state.user_opt = 1; initial_state.session_opt = 1; }