From cadef4f05202df2c360773779a5f5b5d6d993df9 Mon Sep 17 00:00:00 2001 From: Moses Palmér Date: Sat, 7 May 2016 15:58:28 +0200 Subject: fbi: add --(no)interactive command line flag --- fbi.c | 2 ++ fbiconfig.c | 5 +++++ fbiconfig.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/fbi.c b/fbi.c index a2f7e34..cbccc0f 100644 --- a/fbi.c +++ b/fbi.c @@ -121,6 +121,7 @@ int read_ahead; int editable; int blend_msecs; int perfmon = 0; +int interactive = 0; /* font handling */ static char *fontname = NULL; @@ -1383,6 +1384,7 @@ int main(int argc, char *argv[]) h_steps = GET_SCROLL(); timeout = GET_TIMEOUT(); pcd_res = GET_PCD_RES(); + interactive = GET_INTERACTIVE(); fontname = cfg_get_str(O_FONT); filelist = cfg_get_str(O_FILE_LIST); diff --git a/fbiconfig.c b/fbiconfig.c index 6c2a4bc..524e3aa 100644 --- a/fbiconfig.c +++ b/fbiconfig.c @@ -171,6 +171,11 @@ struct cfg_cmdline fbi_cfg[] = { .option = { O_OUTPUT }, .needsarg = 1, .desc = "use drm output (try -info for a list)", + },{ + .cmdline = "interactive", + .option = { O_INTERACTIVE }, + .yesno = 1, + .desc = "allow keyboard interaction", },{ .letter = 'm', .cmdline = "mode", diff --git a/fbiconfig.h b/fbiconfig.h index e98a246..a2178a3 100644 --- a/fbiconfig.h +++ b/fbiconfig.h @@ -30,6 +30,7 @@ #define O_SCROLL O_OPTIONS, "scroll" #define O_TIMEOUT O_OPTIONS, "timeout" #define O_PCD_RES O_OPTIONS, "photocd-res" +#define O_INTERACTIVE O_OPTIONS, "interactive" #define O_DEVICE O_OPTIONS, "device" #define O_OUTPUT O_OPTIONS, "output" @@ -64,6 +65,7 @@ #define GET_SCROLL() cfg_get_int(O_SCROLL, 50) #define GET_TIMEOUT() cfg_get_int(O_TIMEOUT, 0) #define GET_PCD_RES() cfg_get_int(O_PCD_RES, 3) +#define GET_INTERACTIVE() cfg_get_bool(O_INTERACTIVE, 1) #define GET_OPENGL() cfg_get_bool(O_OPENGL, 0) #define GET_PAGEFLIP() cfg_get_bool(O_PAGEFLIP, 1) -- cgit