From 4081bd29fb471a93daba746643419d858f06bdfe Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Jun 2010 19:43:16 -0400 Subject: [PATCH] [terminal] Force enter to output newline This matches the default unix behavior, and so we're going to be a lot more robust against our terminal settings getting mucked with. --- src/libply-splash-core/ply-keyboard.c | 2 +- src/libply-splash-core/ply-terminal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libply-splash-core/ply-keyboard.c b/src/libply-splash-core/ply-keyboard.c index 0f26bb42..b5b4c392 100644 --- a/src/libply-splash-core/ply-keyboard.c +++ b/src/libply-splash-core/ply-keyboard.c @@ -45,7 +45,7 @@ #define KEY_CTRL_W ('\100' ^'W') #define KEY_CTRL_V ('\100' ^'V') #define KEY_ESCAPE ('\100' ^'[') -#define KEY_RETURN '\r' +#define KEY_RETURN '\n' #define KEY_BACKSPACE '\177' typedef void (* ply_keyboard_handler_t) (void *); diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c index 6140fa45..028551d6 100644 --- a/src/libply-splash-core/ply-terminal.c +++ b/src/libply-splash-core/ply-terminal.c @@ -182,6 +182,9 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal) cfmakeraw (&term_attributes); + /* Make return output new line like canonical mode */ + term_attributes.c_iflag |= ICRNL; + /* Make \n return go to the beginning of the next line */ term_attributes.c_oflag |= ONLCR;