1. rcrnstn/fzy
  2. Commit c3335044aa0263de4e5a92dea4259cef3653a6ab
Browse code

Disable signals from ^C (and friends)

Allows us to interpret ^C through ^Z as control codes and handle them
properly.

Also fixes resetting termios after ^C

John Hawthorn authored on 19/10/2014 23:42:38
Showing 2 changed files
  • fzy.c index 7663b71..dbefa45 100644
  • tty.c index 6939eb9..31fa095 100644
fzy.c
History View file @ c333504
... ... 
@@ -153,6 +153,10 @@ void run(tty_t *tty, choices_t *choices){
153 153 
 			strncpy(search, choices_get(choices, choices->selection), SEARCH_SIZE_MAX);
154 154 
 			search_size = strlen(search);
155 155 
 			choices_search(choices, search);
156 
+		}else if(ch == 3 || ch == 4){ /* ^C || ^D */
157 
+			clear(tty);
158 
+			tty_close(tty);
159 
+			exit(EXIT_FAILURE);
156 160 
 		}else if(ch == 10){ /* Enter */
157 161 
 			clear(tty);
158 162
tty.c
History View file @ c333504
... ... 
@@ -33,8 +33,9 @@ void tty_init(tty_t *tty, const char *tty_filename){
33 33 
 	 * Disable both of
34 34 
 	 * ICANON  Canonical input (erase and kill processing).
35 35 
 	 * ECHO    Enable echo.
36 
+	 * ISIG    Disable signals from control characters
36 37 
 	 */
37 
-	new_termios.c_lflag &= ~(ICANON | ECHO);
38 
+	new_termios.c_lflag &= ~(ICANON | ECHO | ISIG);
38 39
39 40 
 	if(tcsetattr(tty->fdin, TCSANOW, &new_termios))
40 41 
 		perror("tcsetattr");