Attachment 592889 Details for Bug 828092 – Cleaned up patch

[patch] Cleaned up patch

terminfo.diff (text/plain), 2.48 KB, created by Vladimir Serbinenko on 2012-06-19 09:39:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Serbinenko

Created: 2012-06-19 09:39:21 UTC

Size: 2.48 KB

patch

obsolete

>=== modified file 'grub-core/term/terminfo.c'
>--- grub-core/term/terminfo.c	2012-04-26 16:57:22 +0000
>+++ grub-core/term/terminfo.c	2012-06-19 09:27:47 +0000
>@@ -389,6 +389,7 @@
> 
> static void
> grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
>+		       char *unget,
> 		       int (*readkey) (struct grub_term_input *term))
> {
>   int c;
>@@ -408,7 +409,13 @@
>     (*len)++;							\
>   }
> 
>-  c = readkey (term);
>+  if (*unget)
>+    {
>+      c = *unget;
>+      *unget = 0;
>+    }
>+  else
>+    c = readkey (term);
>   if (c < 0)
>     {
>       *len = 0;
>@@ -416,6 +423,15 @@
>     }
>   *len = 1;
>   keys[0] = c;
>+  if (c == '\r')
>+    {
>+      CONTINUE_READ;
>+      *len = 1;
>+      if (c != '\n')
>+	*unget = c;
>+      return;
>+    }
>+
>   if (c != ANSI_C0 && c != '\e')
>     {
>       /* Backspace: Ctrl-h.  */
>@@ -477,7 +493,11 @@
> 	CONTINUE_READ;
> 
> 	if (c != '[')
>-	  return;
>+	  {
>+	    (*len)--;
>+	    *unget = c;
>+	    return;
>+	  }
>       }
> 
>     CONTINUE_READ;
>@@ -501,6 +521,8 @@
> 	      *len = 1;
> 	      return;
> 	    }
>+	*unget = c;
>+	(*len)--;
> 	return;
> 
>       case '0':
>@@ -508,17 +530,33 @@
> 	  int num = 0;
> 	  CONTINUE_READ;
> 	  if (c != '0' && c != '1')
>-	    return;
>+	    {
>+	      *unget = c;
>+	      (*len)--;
>+	      return;
>+	    }
> 	  num = (c - '0') * 10;
> 	  CONTINUE_READ;
> 	  if (c < '0' || c > '9')
>-	    return;
>+	    {
>+	      *unget = c;
>+	      (*len)--;
>+	      return;
>+	    }
> 	  num += (c - '0');
> 	  if (num == 0 || num > 12)
>-	    return;
>+	    {
>+	      *unget = c;
>+	      (*len)--;
>+	      return;
>+	    }
> 	  CONTINUE_READ;
> 	  if (c != 'q')
>-	    return;
>+	    {
>+	      *unget = c;
>+	      (*len)--;
>+	      return;
>+	    }
> 	  keys[0] = fx_code[num - 1];
> 	  *len = 1;
> 	  return;
>@@ -530,11 +568,17 @@
> 	    {
> 	      CONTINUE_READ;
> 	      if (c != '~')
>-		return;
>+		{
>+		  *unget = c;
>+		  (*len)--;
>+		  return;
>+		}
> 	      keys[0] = three_code_table[i].ascii;
> 	      *len = 1;
> 	      return;
> 	    }
>+	*unget = c;
>+	(*len)--;
> 	return;
>       }
>   }
>@@ -558,7 +602,7 @@
>     }
> 
>   grub_terminfo_readkey (termi, data->input_buf,
>-			 &data->npending, data->readkey);
>+			 &data->npending, &data->unget, data->readkey);
> 
>   if (data->npending)
>     {
>
>=== modified file 'include/grub/terminfo.h'
>--- include/grub/terminfo.h	2012-02-26 23:28:45 +0000
>+++ include/grub/terminfo.h	2012-06-19 09:27:47 +0000
>@@ -32,6 +32,7 @@
> {
>   int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
>   int npending;
>+  char unget;
>   int (*readkey) (struct grub_term_input *term);
> };
> 
>

Actions: View | Diff

Attachments on bug 828092: 592889 | 593177 | 593178