X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FHexEdit%2FMainHexEditor.c;h=a40388ff4097d4cb44fbd62ab687b0a29e018d02;hb=e755a4ca10aad316c3620223206d63982793b26c;hp=83b31992d2dab7ec06e3a96d8e2adb53f2cca2eb;hpb=6878e7a7be6a29da75fca61ba42681fc64a3fdf3;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index 83b31992d2..a40388ff40 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -4,7 +4,7 @@
      - Instances of the other objects of the editor
      - Main Interfaces
   
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved. <BR>
   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
@@ -50,8 +50,7 @@ HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorBackupVar;
 HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorConst = {
   &HBufferImage,
   {
-    0,
-    0
+    {0, 0}
   },
   {
     0,
@@ -65,6 +64,72 @@ HEFI_EDITOR_GLOBAL_EDITOR       HMainEditorConst = {
   1
 };
 
+/**
+  Help info that will be displayed.
+**/
+EFI_STRING_ID  HexMainMenuHelpInfo[] = {
+  STRING_TOKEN(STR_HEXEDIT_HELP_TITLE),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_LIST_TITLE),
+  STRING_TOKEN(STR_HEXEDIT_HELP_DIV),
+  STRING_TOKEN(STR_HEXEDIT_HELP_GO_TO_OFFSET),
+  STRING_TOKEN(STR_HEXEDIT_HELP_SAVE_BUFFER),
+  STRING_TOKEN(STR_HEXEDIT_HELP_EXIT),
+  STRING_TOKEN(STR_HEXEDIT_HELP_SELECT_START),
+  STRING_TOKEN(STR_HEXEDIT_HELP_SELECT_END),
+  STRING_TOKEN(STR_HEXEDIT_HELP_CUT),
+  STRING_TOKEN(STR_HEXEDIT_HELP_PASTE),
+  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_FILE),
+  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_DISK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_OPEN_MEMORY),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_EXIT_HELP),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_BLANK),
+  STRING_TOKEN(STR_HEXEDIT_HELP_DIV),
+  0
+};
+
+
+/**
+  show help menu.
+
+  @retval EFI_SUCCESS             The operation was successful.
+**/
+EFI_STATUS
+HMainCommandDisplayHelp (
+  VOID
+  )
+{
+  INT32    CurrentLine;
+  CHAR16 * InfoString;
+  EFI_INPUT_KEY  Key;
+
+  CurrentLine = 0;
+  // print helpInfo      
+  for (CurrentLine = 0; 0 != HexMainMenuHelpInfo[CurrentLine]; CurrentLine++) {
+    InfoString = HiiGetString(gShellDebug1HiiHandle, HexMainMenuHelpInfo[CurrentLine]
+, NULL);
+    ShellPrintEx (0,CurrentLine+1,L"%E%s%N",InfoString);        
+  }
+  
+  // scan for ctrl+w
+  do {
+    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+  } while(SCAN_CONTROL_W != Key.UnicodeChar); 
+
+  // update screen with buffer's info
+  HBufferImageNeedRefresh = TRUE;
+  HBufferImageOnlyLineNeedRefresh = FALSE;
+  HBufferImageRefresh ();
+
+  return EFI_SUCCESS;
+}
+
 /**
   Move cursor to specified lines.
 
@@ -533,7 +598,6 @@ HMainCommandCut (
   )
 {
   UINTN             Index;
-  HEFI_EDITOR_LINE  *Line;
   LIST_ENTRY    *Link;
   UINT8             *Buffer;
   UINTN             Count;
@@ -558,8 +622,6 @@ HMainCommandCut (
     Link = Link->ForwardLink;
   }
 
-  Line    = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);
-
   Count   = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;
   Buffer  = AllocateZeroPool (Count);
   if (Buffer == NULL) {
@@ -1439,6 +1501,36 @@ HMainCommandOpenMemory (
 
 }
 
+MENU_ITEM_FUNCTION HexMainControlBasedMenuFunctions[] = {
+  NULL,
+  NULL,                      /* Ctrl - A */
+  NULL,                      /* Ctrl - B */
+  NULL,                      /* Ctrl - C */
+  HMainCommandSelectEnd,     /* Ctrl - D */
+  HMainCommandDisplayHelp,   /* Ctrl - E */
+  NULL,                      /* Ctrl - F */
+  HMainCommandGoToOffset,    /* Ctrl - G */
+  NULL,                      /* Ctrl - H */
+  HMainCommandOpenDisk,      /* Ctrl - I */
+  NULL,                      /* Ctrl - J */
+  NULL,                      /* Ctrl - K */
+  NULL,                      /* Ctrl - L */
+  HMainCommandOpenMemory,    /* Ctrl - M */
+  NULL,                      /* Ctrl - N */
+  HMainCommandOpenFile,      /* Ctrl - O */
+  NULL,                      /* Ctrl - P */
+  HMainCommandExit,          /* Ctrl - Q */
+  NULL,                      /* Ctrl - R */
+  HMainCommandSaveBuffer,    /* Ctrl - S */
+  HMainCommandSelectStart,   /* Ctrl - T */
+  NULL,                      /* Ctrl - U */
+  HMainCommandPaste,         /* Ctrl - V */
+  NULL,                      /* Ctrl - W */
+  HMainCommandCut,           /* Ctrl - X */
+  NULL,                      /* Ctrl - Y */
+  NULL,                      /* Ctrl - Z */
+};
+
 CONST EDITOR_MENU_ITEM HexEditorMenuItems[] = {
   {
     STRING_TOKEN(STR_HEXEDIT_LIBMENUBAR_GO_TO_OFFSET),
@@ -1592,12 +1684,17 @@ HMainEditorInit (
   //
   // below will call the five components' init function
   //
-  Status = MainTitleBarInit (NULL);
+  Status = MainTitleBarInit (L"UEFI HEXEDIT");
   if (EFI_ERROR (Status)) {
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gShellDebug1HiiHandle);
     return EFI_LOAD_ERROR;
   }
 
+  Status = ControlHotKeyInit (HexMainControlBasedMenuFunctions);
+  if (EFI_ERROR (Status)) {
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);
+    return EFI_LOAD_ERROR;
+  }
   Status = MenuBarInit (HexEditorMenuItems);
   if (EFI_ERROR (Status)) {
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gShellDebug1HiiHandle);
@@ -1777,9 +1874,6 @@ HMainEditorRefresh (
   }
 
   if (HEditorFirst) {
-    MenuBarRefresh (    
-      HMainEditor.ScreenSize.Row,
-      HMainEditor.ScreenSize.Column);
     HBufferImageRefresh ();
   }
 
@@ -2138,8 +2232,9 @@ HMainEditorKeyInput (
       // clear previous status string
       //
       StatusBarSetRefresh();
-
-      if (Key.ScanCode == SCAN_NULL) {
+      if (EFI_SUCCESS == MenuBarDispatchControlHotKey(&Key)) {
+        Status = EFI_SUCCESS;
+      } else if (Key.ScanCode == SCAN_NULL) {
         Status = HBufferImageHandleInput (&Key);
       } else if (((Key.ScanCode >= SCAN_UP) && (Key.ScanCode <= SCAN_PAGE_DOWN))) {
         Status = HBufferImageHandleInput (&Key);