From d1484a422ec7d94394e17277584a28730f92ff4e Mon Sep 17 00:00:00 2001
From: Manoel Rebelo Abranches <mrabran@br.ibm.com>
Date: Sat, 20 Feb 2010 11:23:13 +0100
Subject: [PATCH] 2010-02-20  Manoel Rebelo Abranches <mrabran@br.ibm.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
	backspace keys.
---
 ChangeLog                 |   5 ++
 term/ieee1275/ofconsole.c | 119 ++++++++++++++++++++++++--------------
 2 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca8e3c3fd..95dcd51a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Manoel Rebelo Abranches <mrabran@br.ibm.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
+	backspace keys.
+
 2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 82108022a..a4ffdcd23 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -202,53 +202,82 @@ grub_ofconsole_readkey (int *key)
 
   grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
 
-  if (actual > 0 && c == '\e')
-    {
-      grub_uint64_t start;
-      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-      /* On 9600 we have to wait up to 12 milliseconds.  */
-      start = grub_get_time_ms ();
-      while (actual <= 0 && grub_get_time_ms () - start < 12)
-	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-      if (actual <= 0)
+  if (actual > 0)
+    switch(c)
+      {
+      case 0x7f:
+        /* Backspace: Ctrl-h.  */
+        c = '\b'; 
+        break;
+      case '\e':
 	{
-	  *key = '\e';
-	  return 1;
+	  grub_uint64_t start;
+	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  /* On 9600 we have to wait up to 12 milliseconds.  */
+	  start = grub_get_time_ms ();
+	  while (actual <= 0 && grub_get_time_ms () - start < 12)
+	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  if (actual <= 0)
+	    {
+	      *key = '\e';
+	      return 1;
+	    }
+
+	  if (c != '[')
+	    return 0;
+	  
+	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  /* On 9600 we have to wait up to 12 milliseconds.  */
+	  start = grub_get_time_ms ();
+	  while (actual <= 0 && grub_get_time_ms () - start < 12)
+	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+	  if (actual <= 0)
+	    return 0;
+
+	  switch (c)
+	    {
+	    case 'A':
+	      /* Up: Ctrl-p.  */
+	      c = GRUB_TERM_UP;
+	      break;
+	    case 'B':
+	      /* Down: Ctrl-n.  */
+	      c = GRUB_TERM_DOWN;
+	      break;
+	    case 'C':
+	      /* Right: Ctrl-f.  */
+	      c = GRUB_TERM_RIGHT;
+	      break;
+	    case 'D':
+	      /* Left: Ctrl-b.  */
+	      c = GRUB_TERM_LEFT;
+	      break;
+	    case '3':
+	      {
+		grub_uint64_t start;		
+		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+		/* On 9600 we have to wait up to 12 milliseconds.  */
+		start = grub_get_time_ms ();
+		while (actual <= 0 && grub_get_time_ms () - start < 12)
+		  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+		
+		if (actual <= 0)
+		  return 0;
+  	    
+		/* Delete: Ctrl-d.  */
+		if (c == '~')
+		  c = GRUB_TERM_DC;
+		else
+		  return 0;
+		break;
+	      }
+	      break;
+	    }
 	}
-
-      if (c != '[')
-	return 0;
-
-      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-      /* On 9600 we have to wait up to 12 milliseconds.  */
-      start = grub_get_time_ms ();
-      while (actual <= 0 && grub_get_time_ms () - start < 12)
-	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-      if (actual <= 0)
-	return 0;
-
-      switch (c)
-	{
-	case 'A':
-	  /* Up: Ctrl-p.  */
-	  c = GRUB_TERM_UP;
-	  break;
-	case 'B':
-	  /* Down: Ctrl-n.  */
-	  c = GRUB_TERM_DOWN;
-	  break;
-	case 'C':
-	  /* Right: Ctrl-f.  */
-	  c = GRUB_TERM_RIGHT;
-	  break;
-	case 'D':
-	  /* Left: Ctrl-b.  */
-	  c = GRUB_TERM_LEFT;
-	  break;
-	}
-    }
+      }
 
   *key = c;
   return actual > 0;