From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 93DB81A1E73 for ; Fri, 14 Oct 2016 13:53:02 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id 191so198578wmr.0 for ; Fri, 14 Oct 2016 13:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:from:date:message-id :subject:to:cc; bh=Bj2bGsiK+5aojX5QxrQ/JqeOKo9OEcHd2uCE2qPWtq4=; b=oTQrng3z2BECNpdH/eArfPUiM4vL5fnf7FsJl64si+7gufuFlusyyEH86aQPSG4i+N a7ejEXCn9mwIyM48LiXcrJVAWsRaIAp4nRY6WPEsf2x+UMAbwVFeTptC714A4NPMMtDW WUq34clxNZ04JygFAYfpSVj+g16nXUYiHgV91w5YK3LIdBjCozn297qNsIl/UV+PHUMt 4q94d3B+1tDbU3ATI81gRUsUs1Ae2sWcxkJOq8vQ7Fk3tRt7UT9+eVdDPQPEJmRRG9rP u1jgFavPuthuojr+aZNi2iBoYlauJxIIuFxooRoAlGbTslpAhNNIpbZEeMCHHXNio0Ce JOtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=Bj2bGsiK+5aojX5QxrQ/JqeOKo9OEcHd2uCE2qPWtq4=; b=bb4QzsoIcuGenXe+FGfdlkbXj8YgKdl2+w5/hVijb7PX0FuozgSkpDz6DY5OPTPzOO 8X31ag3xkU91DtOCeefQBrU8V8VFDOYuo144LBW1TzJuN66I7Dl81IDUQrEOIfBcgTm/ 0vbV9bSSW3SvQbipxI9T9HoeDmV0X4Sy70NdvRgJ/Uav10Ppe//L61SbcoEXES8N66As Lc/6xiXtW4P1+S73fJ26n/3qQOcYyQ8SMglkZ+Ir6QD4lTIdJ0N2hVZDltM9CIf2Sn8m RxC7yHdUHpe+da/5xCEuuDLjv00TGGILxi45pup6UbFqsTr15endZucQv+4M4TszQk+M XHuA== X-Gm-Message-State: AA6/9RmMFtz5RJlQcG0cnSS8G8itFOGioVjwIprYtMa67J5eo38K27iwceBks2XUzgvdcyDrp98f13LPAUmYgA== X-Received: by 10.194.250.1 with SMTP id yy1mr3352774wjc.219.1476478380750; Fri, 14 Oct 2016 13:53:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.132.38 with HTTP; Fri, 14 Oct 2016 13:53:00 -0700 (PDT) Reply-To: roy.franz@hpe.com In-Reply-To: References: From: "Roy Franz (HPE)" Date: Fri, 14 Oct 2016 13:53:00 -0700 Message-ID: To: "Brian J. Johnson" Cc: edk2-devel@lists.01.org, Feng Tian , Star Zeng , roy.franz@hpe.com Subject: Re: [PATCH 3/3] MdeModulePkg/TerminalDxe: Handle more keys with TtyTerm X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2016 20:53:03 -0000 Content-Type: text/plain; charset=UTF-8 On Fri, Oct 7, 2016 at 7:54 AM, Brian J. Johnson wrote: > The TtyTerm terminal driver is missing support for sequences produced > by the page up, page down, insert, home, and end keys in some terimnal > emulators. Add them. > > Tested under Ubuntu 16.04 using xterm 322-1ubuntu1, GNOME terminal > 3.18.3-1ubuntu1, and XFCE terminal 0.6.3-2ubuntu1. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Kyle Roberts > Signed-off-by: Brian Johnson > Cc: Feng Tian > Cc: Star Zeng > --- > .../Universal/Console/TerminalDxe/TerminalConIn.c | 24 +++++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > index 3be877b..5c3ea86 100644 > --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c > @@ -3,6 +3,7 @@ > > (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
> Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
> +Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD License > which accompanies this distribution. The full text of the license may be found at > @@ -1374,7 +1375,7 @@ UnicodeToEfiKey ( > break; > } > } else if (TerminalDevice->TerminalType == TTYTERMTYPE) { > - /* Also accept VT100 escape codes for F1-F4 for TTY term */ > + /* Also accept VT100 escape codes for F1-F4, HOME and END for TTY term */ > switch (UnicodeChar) { > case 'P': > Key.ScanCode = SCAN_F1; > @@ -1388,6 +1389,12 @@ UnicodeToEfiKey ( > case 'S': > Key.ScanCode = SCAN_F4; > break; > + case 'H': > + Key.ScanCode = SCAN_HOME; > + break; > + case 'F': > + Key.ScanCode = SCAN_END; > + break; > } > } > > @@ -1429,12 +1436,14 @@ UnicodeToEfiKey ( > break; > case 'H': > if (TerminalDevice->TerminalType == PCANSITYPE || > - TerminalDevice->TerminalType == VT100TYPE) { > + TerminalDevice->TerminalType == VT100TYPE || > + TerminalDevice->TerminalType == TTYTERMTYPE) { > Key.ScanCode = SCAN_HOME; > } > break; > case 'F': > - if (TerminalDevice->TerminalType == PCANSITYPE) { > + if (TerminalDevice->TerminalType == PCANSITYPE || > + TerminalDevice->TerminalType == TTYTERMTYPE) { > Key.ScanCode = SCAN_END; > } > break; > @@ -1573,9 +1582,18 @@ UnicodeToEfiKey ( > TerminalDevice->TtyEscapeStr[TerminalDevice->TtyEscapeIndex] = 0; /* Terminate string */ > EscCode = (UINT16) StrDecimalToUintn(TerminalDevice->TtyEscapeStr); > switch (EscCode) { > + case 2: > + Key.ScanCode = SCAN_INSERT; > + break; > case 3: > Key.ScanCode = SCAN_DELETE; > break; > + case 5: > + Key.ScanCode = SCAN_PAGE_UP; > + break; > + case 6: > + Key.ScanCode = SCAN_PAGE_DOWN; > + break; > case 11: > case 12: > case 13: > -- > 2.7.4 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Roy Franz This patch looks good to me - I'm not enough of a terminal expert to review patches 1/2. Roy