feature: saving previous selection

This commit is contained in:
rmntgx 2025-05-21 00:22:04 +05:00
parent 4361e1d9a2
commit 4a83e5d825
4 changed files with 63 additions and 2 deletions

View File

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

12
include/launch_state.h Normal file
View File

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

35
src/launch_state.c Normal file
View File

@ -0,0 +1,35 @@
// Small file to save last selection
#define STATE_PATH "/var/lib/lidm/state"
#include <stdio.h>
#include <stdbool.h>
#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;
}

View File

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