X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=abook_rl.c;h=55b303965cfaa972caacbc280357991694f03f3a;hp=f9ebba6529f32c7e4a3675e4aa4c75e0df1bec38;hb=7c88cafcd333277b6bfd55370a5ec1c5b76c2b0d;hpb=4d2aca39cdd96958b3f0bbc6973f15aac5133cdc

diff --git a/abook_rl.c b/abook_rl.c
index f9ebba6..55b3039 100644
--- a/abook_rl.c
+++ b/abook_rl.c
@@ -12,9 +12,6 @@
 #include "abook.h"
 #include "abook_rl.h"
 
-#define KEYPAD_HACK 1 /* enable keypad hack */
-#define CBREAK_HACK 1 /* enable cbreak hack */
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
@@ -23,16 +20,22 @@
 #       include <readline/readline.h>
 #elif defined(HAVE_READLINE_H)
 #       include <readline.h>
+#else
+#	error "You don't seem to have readline.h"
+#	error "No HAVE_READLINE_READLINE_H or HAVE_READLINE_H defined"
 #endif
 
 #if defined(HAVE_READLINE_HISTORY_H)
 #       include <readline/history.h>
 #elif defined(HAVE_HISTORY_H)
 #       include <history.h>
+#else
+#	error "You don't seem to have history.h"
+#	error "No HAVE_READLINE_HISTORY_H or HAVE_HISTORY_H defined"
 #endif
 
 #ifdef HANDLE_MULTIBYTE
-#	include <wchar.h>
+#	include <mbswidth.h>
 #endif
 
 #define RL_READLINE_NAME	"Abook"
@@ -45,7 +48,7 @@ static bool rl_cancelled;
 static void
 rl_refresh()
 {
-	/*refresh();*/
+	/* refresh(); */
 	wrefresh(rl_win);
 }
 
@@ -53,39 +56,19 @@ rl_refresh()
 static int
 rline_calc_point()
 {
-	char *p;
-	int ret = 0;
-	
-	mbtowc(NULL, NULL, 0);
-	for(p = rl_line_buffer;(p - rl_line_buffer) < rl_point;) {
-		int a, l;
-		wchar_t wc;
-		
-		if((a = mbtowc(&wc, p, MB_CUR_MAX)) == 0)
-			break;
-		else if (a == -1)
-			return rl_point; /* fall back */
-		else
-			p += a;
-
-		l = wcwidth(wc);
-		if(l > 0)
-			ret += l;
-	}
-
-	return ret;
+	return (int)mbsnwidth(rl_line_buffer, rl_point, 0);
 }
 #endif
 
 static void
 rline_update()
-{	
+{
 #ifdef HANDLE_MULTIBYTE
 	int real_point = rline_calc_point() + rl_x;
 #else
 	int real_point = rl_point + rl_x;
 #endif
-	
+
 	if(real_point > (COLS - 1))
 		mvwaddnstr(rl_win, rl_y, rl_x,
 			rl_line_buffer + (1 + real_point - COLS),
@@ -105,6 +88,39 @@ rline_compdisp(char **matches, int n, int max_len)
 	/* dummy */
 }
 
+static void
+rline_prep_terminal(int dummy)
+{
+#if (RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR > 2) || (RL_VERSION_MAJOR > 4)
+	/* nothing */
+#else
+	/*
+	 * #warning is an extension. Not all compilers support it.
+	 */
+#	ifdef __GNUC__
+#		warning "You seem to have rather old readline version or \
+non-GNU version of it. If you have problems please use \
+GNU readline 4.3 or newer. \
+GNU readline versions 4.0, 4.1 and 4.2 should be OK despite \
+of this warning."
+#	endif
+	/*
+	 * this kludge avoids older readline libraries to print a newline
+	 */
+	extern int readline_echoing_p;
+	readline_echoing_p = 0;
+#endif
+	raw();
+	keypad(rl_win, FALSE);
+}
+
+static void
+rline_deprep_terminal(void)
+{
+	cbreak();
+	keypad(rl_win, TRUE);
+}
+
 static int
 rl_cancel(int dummy1, int dummy2)
 {
@@ -119,17 +135,22 @@ static void
 abook_rl_init(bool use_completion)
 {
 	rl_readline_name = RL_READLINE_NAME;
-	
+
+#if RL_VERSION_MAJOR >= 4
 	rl_already_prompted = 1;
+#endif
 	rl_catch_sigwinch = 0;
-	
+	rl_erase_empty_line = 0;
+
 	rl_redisplay_function = rline_update;
 	rl_completion_display_matches_hook = rline_compdisp;
+	rl_prep_term_function = rline_prep_terminal;
+	rl_deprep_term_function = rline_deprep_terminal;
 
 	rl_unbind_function_in_map(rl_clear_screen, rl_get_keymap());
 	rl_unbind_function_in_map(rl_reverse_search_history, rl_get_keymap());
 	rl_unbind_function_in_map(rl_re_read_init_file, rl_get_keymap());
-	
+
 	if(use_completion) {
 		rl_bind_key('\t', rl_menu_complete);
 	} else {
@@ -142,10 +163,10 @@ abook_rl_init(bool use_completion)
 	clear_history();
 
 	rl_cancelled = FALSE;
-}	
+}
 
 char *
-abook_readline(WINDOW *w, int y, int x, char *s, int limit, bool use_completion)
+abook_readline(WINDOW *w, int y, int x, char *s, bool use_completion)
 {
 	char *ret;
 
@@ -156,20 +177,8 @@ abook_readline(WINDOW *w, int y, int x, char *s, int limit, bool use_completion)
 
 	if(s && *s)
 		add_history(s);
-	
-#ifdef KEYPAD_HACK
-	keypad(w, FALSE);
-#endif
-#ifdef CBREAK_HACK
-	nocbreak();
-#endif
+
 	ret = readline(NULL);
-#ifdef CBREAK_HACK
-	cbreak();
-#endif
-#ifdef KEYPAD_HACK
-	keypad(w, TRUE);
-#endif
 
 	if(rl_cancelled && ret) {
 		free(ret);