Patchwork [for-1.5] readline: Handle xterm escape sequences for Home/End keys

login
register
mail settings
Submitter Kevin Wolf
Date May 14, 2013, 10:15 a.m.
Message ID <1368526554-15866-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/243657/
State New
Headers show

Comments

Kevin Wolf - May 14, 2013, 10:15 a.m.
This fixes the Home/End keys in the monitor using the GTK frontend.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 readline.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
Hans de Goede - May 14, 2013, 10:26 a.m.
Hi,

Looks good, ack.

Regards,

Hans


On 05/14/2013 12:15 PM, Kevin Wolf wrote:
> This fixes the Home/End keys in the monitor using the GTK frontend.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>   readline.c | 15 +++++++++++++++
>   1 file changed, 15 insertions(+)
>
> diff --git a/readline.c b/readline.c
> index d6e04d4..1c0f7ee 100644
> --- a/readline.c
> +++ b/readline.c
> @@ -27,6 +27,7 @@
>   #define IS_NORM 0
>   #define IS_ESC  1
>   #define IS_CSI  2
> +#define IS_SS3  3
>
>   #undef printf
>   #define printf do_not_use_printf
> @@ -397,6 +398,9 @@ void readline_handle_byte(ReadLineState *rs, int ch)
>           if (ch == '[') {
>               rs->esc_state = IS_CSI;
>               rs->esc_param = 0;
> +        } else if (ch == 'O') {
> +            rs->esc_state = IS_SS3;
> +            rs->esc_param = 0;
>           } else {
>               rs->esc_state = IS_NORM;
>           }
> @@ -439,6 +443,17 @@ void readline_handle_byte(ReadLineState *rs, int ch)
>           rs->esc_state = IS_NORM;
>       the_end:
>           break;
> +    case IS_SS3:
> +        switch(ch) {
> +        case 'F':
> +            readline_eol(rs);
> +            break;
> +        case 'H':
> +            readline_bol(rs);
> +            break;
> +        }
> +        rs->esc_state = IS_NORM;
> +        break;
>       }
>       readline_update(rs);
>   }
>
Anthony Liguori - May 14, 2013, 4:10 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/readline.c b/readline.c
index d6e04d4..1c0f7ee 100644
--- a/readline.c
+++ b/readline.c
@@ -27,6 +27,7 @@ 
 #define IS_NORM 0
 #define IS_ESC  1
 #define IS_CSI  2
+#define IS_SS3  3
 
 #undef printf
 #define printf do_not_use_printf
@@ -397,6 +398,9 @@  void readline_handle_byte(ReadLineState *rs, int ch)
         if (ch == '[') {
             rs->esc_state = IS_CSI;
             rs->esc_param = 0;
+        } else if (ch == 'O') {
+            rs->esc_state = IS_SS3;
+            rs->esc_param = 0;
         } else {
             rs->esc_state = IS_NORM;
         }
@@ -439,6 +443,17 @@  void readline_handle_byte(ReadLineState *rs, int ch)
         rs->esc_state = IS_NORM;
     the_end:
         break;
+    case IS_SS3:
+        switch(ch) {
+        case 'F':
+            readline_eol(rs);
+            break;
+        case 'H':
+            readline_bol(rs);
+            break;
+        }
+        rs->esc_state = IS_NORM;
+        break;
     }
     readline_update(rs);
 }