Refactor checklist plugin

The select widget is no longer just a simple selection from a list of
items. It is a list of widgets that can be scrolled through.

Signed-off-by: Alexey Gladkov <legion@kernel.org>

Author: legionus

Makefile.in

@@ -53,6 +53,7 @@ COMMON_SRC  = src/ipc.c src/request.c src/plugin.c src/dump.c \
 	      src/widget_hscroll.c \
 	      src/widget_input.c \
 	      src/widget_label.c \
+	      src/widget_list_vbox.c \
 	      src/widget_meter.c \
 	      src/widget_pad_box.c \
 	      src/widget_scroll_vbox.c \

src/macros.h

@@ -40,6 +40,10 @@
 #define MIN(a, b)	(((a) < (b)) ? (a) : (b))
 #define MAX(a, b)	(((a) > (b)) ? (a) : (b))
 
+#ifndef CLAMP
+#define CLAMP(x, lo, hi) ((x) < (lo) ? (lo) : ((x) > (hi) ? (hi) : (x)))
+#endif
+
 #include <string.h>
 
 #define streq(a, b)		(strcmp((a), (b)) == 0)

src/plugins/checklist-main.c

@@ -67,9 +67,10 @@ static struct widget *p_checklist_create(struct request *req)
 
 	for (size_t i = 0; i < p->num_kv; i++) {
 		if (streq(p->kv[i].key, "option")) {
-			wchar_t *opt = req_get_kv_wchars(p->kv + i);
-			make_select_option(select, opt);
-			free(opt);
+			wchar_t *txt = req_get_kv_wchars(p->kv + i);
+			struct widget *option = make_select_option(txt, false, (maxsel > 1));
+			free(txt);
+			widget_add(select, option);
 		}
 	}
 

src/widget.c

@@ -115,6 +115,7 @@ const char *widget_type(struct widget *w)
 		[WIDGET_VBOX]        = "vbox",
 		[WIDGET_HBOX]        = "hbox",
 		[WIDGET_TOOLTIP]     = "tooltip",
+		[WIDGET_LIST_VBOX]   = "list_vbox",
 		[WIDGET_SELECT]      = "select",
 		[WIDGET_SELECT_OPT]  = "select_option",
 		[WIDGET_SPINBOX]     = "spinbox",

src/widget.h

@@ -79,6 +79,7 @@ enum widget_type {
 	WIDGET_VBOX,
 	WIDGET_HBOX,
 	WIDGET_TOOLTIP,
+	WIDGET_LIST_VBOX,
 	WIDGET_SELECT,
 	WIDGET_SELECT_OPT,
 	WIDGET_SPINBOX,
@@ -117,8 +118,10 @@ enum widget_property {
 struct widget_border;
 struct widget_button;
 struct widget_checkbox;
+struct widget_hscroll;
 struct widget_input;
 struct widget_label;
+struct widget_list_vbox;
 struct widget_meter;
 struct widget_pad_box;
 struct widget_select;
@@ -127,7 +130,6 @@ struct widget_svbox;
 struct widget_textview;
 struct widget_tooltip;
 struct widget_vscroll;
-struct widget_hscroll;
 
 enum widget_flags {
 	FLAG_NONE    = 0,        // Nothing has been set
@@ -216,20 +218,21 @@ struct widget {
 
 	/* Widget-specific state */
 	union {
-		struct widget_border   *border;
-		struct widget_button   *button;
-		struct widget_checkbox *checkbox;
-		struct widget_input    *input;
-		struct widget_label    *label;
-		struct widget_meter    *meter;
-		struct widget_pad_box  *pad_box;
-		struct widget_select   *select;
-		struct widget_spinbox  *spinbox;
-		struct widget_svbox    *svbox;
-		struct widget_textview *textview;
-		struct widget_tooltip  *tooltip;
-		struct widget_vscroll  *vscroll;
-		struct widget_hscroll  *hscroll;
+		struct widget_border    *border;
+		struct widget_button    *button;
+		struct widget_checkbox  *checkbox;
+		struct widget_hscroll   *hscroll;
+		struct widget_input     *input;
+		struct widget_label     *label;
+		struct widget_list_vbox *list_vbox;
+		struct widget_meter     *meter;
+		struct widget_pad_box   *pad_box;
+		struct widget_select    *select;
+		struct widget_spinbox   *spinbox;
+		struct widget_svbox     *svbox;
+		struct widget_textview  *textview;
+		struct widget_tooltip   *tooltip;
+		struct widget_vscroll   *vscroll;
 	} state;
 
 	/*
@@ -292,10 +295,10 @@ struct widget *make_input_password(const wchar_t *initdata, const wchar_t *place
 struct widget *make_meter(int total);
 struct widget *make_tooltip(const wchar_t *line);
 struct widget *make_spinbox(int min, int max, int step, int initial, int width);
+struct widget *make_list_vbox(int view_rows);
 
 struct widget *make_select(int max_selected, int view_rows);
-bool make_select_option(struct widget *select, const wchar_t *item);
-struct widget *make_select_opt(const wchar_t *text, bool checked, bool is_radio);
+struct widget *make_select_option(const wchar_t *text, bool checked, bool is_radio);
 
 struct widget *make_border(void);
 struct widget *make_border_vbox(struct widget *parent);