commit 3148eeac0e951ab7d1818680e65b366276d484bd
from: Omar Polo <op@omarpolo.com>
date: Sat Mar 13 19:17:50 2021 UTC

refactor minibuf_hist stuff into more general hist/histhead

commit - dc5df781e91cacf1776473dad50da7a7e749d152
commit + 3148eeac0e951ab7d1818680e65b366276d484bd
blob - 8bad95b2dfd0f9ddca765cb59044a608c8da203a
blob + 891c0885d00a6245148faa47e09ae776f3e55035
--- telescope.h
+++ telescope.h
@@ -84,6 +84,15 @@ struct parser {
 	TAILQ_HEAD(, line)	 head;
 };
 
+struct histhead {
+	TAILQ_HEAD(mhisthead, hist)	head;
+	size_t				len;
+};
+struct hist {
+	char			h[1025];
+	TAILQ_ENTRY(hist)	entries;
+};
+
 struct ui_state;
 
 extern TAILQ_HEAD(tabshead, tab) tabshead;
blob - 81d0afaea9e344f3135c1fa639428e11a2f09ade
blob + 21f55e4d4b132b1b04f8ac77fabb7abf908cbf47
--- ui.c
+++ ui.c
@@ -70,8 +70,6 @@
 
 #define TAB_CURRENT	0x1
 
-struct minibuf_histhead;
-
 static struct event	stdioev, winchev;
 
 static void		 load_default_keys(void);
@@ -148,7 +146,7 @@ static void		 start_loading_anim(struct tab*);
 static void		 update_loading_anim(int, short, void*);
 static void		 stop_loading_anim(struct tab*);
 static void		 load_url_in_tab(struct tab*, const char*);
-static void		 enter_minibuffer(void(*)(void), void(*)(void), void(*)(void), struct minibuf_histhead*);
+static void		 enter_minibuffer(void(*)(void), void(*)(void), void(*)(void), struct histhead*);
 static void		 exit_minibuffer(void);
 static void		 switch_to_tab(struct tab*);
 static struct tab	*new_tab(void);
@@ -185,17 +183,7 @@ struct kmap global_map,
 	*current_map,
 	*base_map;
 
-/* TODO: limit to a maximum number of entries */
-struct minibuf_histhead {
-	TAILQ_HEAD(mhisthead, minibuf_hist)	head;
-	size_t					len;
-};
-struct minibuf_hist {
-	char				h[1025];
-	TAILQ_ENTRY(minibuf_hist)	entries;
-};
-
-static struct minibuf_histhead eecmd_history,
+static struct histhead eecmd_history,
 	ir_history,
 	lu_history;
 
@@ -210,8 +198,8 @@ static struct {
 	void	 (*donefn)(void);
 	void	 (*abortfn)(void);
 
-	struct minibuf_histhead	*history;
-	struct minibuf_hist	*hist_cur;
+	struct histhead	*history;
+	struct hist	*hist_cur;
 	size_t			 hist_off;
 } ministate;
 
@@ -833,7 +821,7 @@ cmd_mini_next_history_element(struct tab *tab)
 static void
 minibuffer_hist_save_entry(void)
 {
-	struct minibuf_hist	*hist;
+	struct hist	*hist;
 
 	if (ministate.history == NULL)
 		return;
@@ -1517,7 +1505,7 @@ load_url_in_tab(struct tab *tab, const char *url)
 
 static void
 enter_minibuffer(void (*self_insert_fn)(void), void (*donefn)(void),
-    void (*abortfn)(void), struct minibuf_histhead *hist)
+    void (*abortfn)(void), struct histhead *hist)
 {
 	in_minibuffer = 1;
 	base_map = &minibuffer_map;