prepare for 5.5.6

Author: okbob

pspg.spec

@@ -3,7 +3,7 @@
 
 Summary: 	pspg: a unix pager optimized for psql
 Name: 		pspg
-Version: 	5.5.5
+Version: 	5.5.6
 Release: 	0%{?dist}
 License: 	BSD
 Group: 		Development/Tools
@@ -43,7 +43,10 @@ CFLAGS="$RPM_OPT_FLAGS"
 %{_bindir}/*
 
 %changelog
-* Tue Nov  2 2021 Pavel Stehule <[email protected]>
+* Tue Aug 2 2022 Pavel Stehule <[email protected]>
+- allow to set esc delay interval
+
+* Tue Nov 2 2021 Pavel Stehule <[email protected]>
 - new visual effects --highlight-odd-rec and --hide-header-line
 - possibility to read SQLcl (Oracle) tables in ANSICONSOLE format
 - support streaming mode over files on BSD like systems (kqueue support)

src/commands.c

@@ -409,7 +409,7 @@ translate_event(int c, bool alt, Options *opts, int *nested_command)
 				return cmd_ForwardSearch;
 			case '9':
 				return cmd_ShowMenu;
-			case 27:
+			case PSPG_ESC_CODE:
 				return cmd_Escape;
 			case '0':
 				return cmd_Quit;

src/inputs.c

@@ -35,6 +35,8 @@
 #include "inputs.h"
 #include "pspg.h"
 
+#define PSPG_NOTASSIGNED_CODE					0
+
 static char	pathname[MAXPATHLEN] = "";
 
 FILE   *f_tty = NULL;						/* ncurses input stream */

src/pspg.c

@@ -1596,7 +1596,7 @@ show_info_wait(const char *fmt,
 
 	/* eat escape if pressed here */
 	if (event == PSPG_NCURSES_EVENT &&
-		!(nced.keycode == 27 && nced.alt))
+		!(nced.keycode == PSPG_ESC_CODE && nced.alt))
 		unget_pspg_event(&nced);
 }
 

src/pspg.h

@@ -35,7 +35,7 @@
 #define			FILE_TSV			2
 #define			FILE_MATRIX			3
 
-#define PSPG_VERSION "5.5.5"
+#define PSPG_VERSION "5.5.6"
 
 /* GNU Hurd does not define MAXPATHLEN */
 #ifndef MAXPATHLEN
@@ -473,7 +473,6 @@ extern bool get_string(char *prompt, char *buffer, int maxsize, char *defstr, ch
  * Global constants
  */
 #define PSPG_ESC_CODE							27
-#define PSPG_NOTASSIGNED_CODE					0
 
 /*
  * Global setting

src/readline.c

@@ -492,7 +492,7 @@ pspg_display_match(char **matches, int num_matches, int max_length)
 			pos -= 1;
 		else if (c == 2 || c == 9)
 			pos += 1;
-		else if (c == 4 || c == 27)
+		else if (c == 4 || c == PSPG_ESC_CODE)
 			break;
 		else if (c == 5)
 		{
@@ -662,7 +662,7 @@ get_string(char *prompt,
 		while (c == ERR || c == 0);
 
 		/* detect double alts .. escape */
-		if (c == 27 && prev_c == 27)
+		if (c == PSPG_ESC_CODE && prev_c == PSPG_ESC_CODE)
 		{
 			/*
 			 * Cannot leave here - readline requires complete ALT pair.
@@ -702,7 +702,7 @@ get_string(char *prompt,
 		char   *ptr = readline_buffer;
 
 		while (*ptr)
-			if (*ptr++ == 27)
+			if (*ptr++ == PSPG_ESC_CODE)
 			{
 				result_is_ok = false;
 				break;