Add four PCDs for the different color settings of Subtitle and Text Filed on Browser.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11309 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 093eeae1800055d46cb9e44d83fa7b6076f36840..5bb55ebf382d60a5516ea8c11e8e4973e61373d3 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -521,6 +521,78 @@
   ## This PCD specifies whether to reset system when memory type information changes.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRUE|BOOLEAN|0x00010056\r
 \r
+  ## Specify the foreground color for Subtile text in HII Form Browser. The default value is EFI_BLUE.\r
+  #  Only following values defined in UEFI specification are valid:\r
+  #  0x00 (EFI_BLACK)\r
+  #  0x01 (EFI_BLUE)\r
+  #  0x02 (EFI_GREEN)\r
+  #  0x03 (EFI_CYAN)\r
+  #  0x04 (EFI_RED)\r
+  #  0x05 (EFI_MAGENTA)\r
+  #  0x06 (EFI_BROWN)\r
+  #  0x07 (EFI_LIGHTGRAY)\r
+  #  0x08 (EFI_DARKGRAY) \r
+  #  0x09 (EFI_LIGHTBLUE)\r
+  #  0x0A (EFI_LIGHTGREEN)\r
+  #  0x0B (EFI_LIGHTCYAN)\r
+  #  0x0C (EFI_LIGHTRED)\r
+  #  0x0D (EFI_LIGHTMAGENTA)\r
+  #  0x0E (EFI_YELLOW)\r
+  #  0x0F (EFI_WHITE)\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x01|UINT8|0x00010057\r
+  \r
+  ## Specify the foreground color for prompt and Question value text in HII Form Browser. The default value is EFI_BLACK.\r
+  #  Only following values defined in UEFI specification are valid:\r
+  #  0x00 (EFI_BLACK)\r
+  #  0x01 (EFI_BLUE)\r
+  #  0x02 (EFI_GREEN)\r
+  #  0x03 (EFI_CYAN)\r
+  #  0x04 (EFI_RED)\r
+  #  0x05 (EFI_MAGENTA)\r
+  #  0x06 (EFI_BROWN)\r
+  #  0x07 (EFI_LIGHTGRAY)\r
+  #  0x08 (EFI_DARKGRAY) \r
+  #  0x09 (EFI_LIGHTBLUE)\r
+  #  0x0A (EFI_LIGHTGREEN)\r
+  #  0x0B (EFI_LIGHTCYAN)\r
+  #  0x0C (EFI_LIGHTRED)\r
+  #  0x0D (EFI_LIGHTMAGENTA)\r
+  #  0x0E (EFI_YELLOW)\r
+  #  0x0F (EFI_WHITE)\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x00|UINT8|0x00010058\r
+  \r
+  ## Specify the foreground color for highlighted prompt and Question value text in HII Form Browser.\r
+  #  The default value is EFI_LIGHTGRAY. Only following values defined in UEFI specification are valid:\r
+  #  0x00 (EFI_BLACK)\r
+  #  0x01 (EFI_BLUE)\r
+  #  0x02 (EFI_GREEN)\r
+  #  0x03 (EFI_CYAN)\r
+  #  0x04 (EFI_RED)\r
+  #  0x05 (EFI_MAGENTA)\r
+  #  0x06 (EFI_BROWN)\r
+  #  0x07 (EFI_LIGHTGRAY)\r
+  #  0x08 (EFI_DARKGRAY) \r
+  #  0x09 (EFI_LIGHTBLUE)\r
+  #  0x0A (EFI_LIGHTGREEN)\r
+  #  0x0B (EFI_LIGHTCYAN)\r
+  #  0x0C (EFI_LIGHTRED)\r
+  #  0x0D (EFI_LIGHTMAGENTA)\r
+  #  0x0E (EFI_YELLOW)\r
+  #  0x0F (EFI_WHITE)\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextHighlightColor|0x07|UINT8|0x00010059\r
+  \r
+  ## Specify the background color for highlighted prompt and Question value text in HII Form Browser.\r
+  #  The default value is EFI_BACKGROUND_BLACK. Only following values defined in UEFI specification are valid:\r
+  #  0x00 (EFI_BACKGROUND_BLACK)\r
+  #  0x10 (EFI_BACKGROUND_BLUE)\r
+  #  0x20 (EFI_BACKGROUND_GREEN)\r
+  #  0x30 (EFI_BACKGROUND_CYAN)\r
+  #  0x40 (EFI_BACKGROUND_RED)\r
+  #  0x50 (EFI_BACKGROUND_MAGENTA)\r
+  #  0x60 (EFI_BACKGROUND_BROWN)\r
+  #  0x70 (EFI_BACKGROUND_LIGHTGRAY)\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldBackgroundHighlightColor|0x00|UINT8|0x0001005A\r
+\r
 [PcdsPatchableInModule]\r
   ## Specify  memory size with page number for PEI code when \r
   #  the feature of Loading Module at Fixed Address is enabled\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Colors.h b/MdeModulePkg/Universal/SetupBrowserDxe/Colors.h
index 584b1af0ef299422644a3a0c5c0299e1412e7988..2db8b99614fc53c7292813d1ee5c630cf6e127e4 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Colors.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Colors.h
@@ -1,7 +1,7 @@
 /** @file\r
 MACRO definitions for color used in Setup Browser.\r
 \r
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -26,15 +26,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TITLE_BACKGROUND              EFI_BACKGROUND_BLUE\r
 #define KEYHELP_TEXT                  EFI_LIGHTGRAY\r
 #define KEYHELP_BACKGROUND            EFI_BACKGROUND_BLACK\r
-#define SUBTITLE_TEXT                 EFI_BLUE\r
 #define SUBTITLE_BACKGROUND           EFI_BACKGROUND_LIGHTGRAY\r
 #define BANNER_TEXT                   EFI_BLUE\r
 #define BANNER_BACKGROUND             EFI_BACKGROUND_LIGHTGRAY\r
-#define FIELD_TEXT                    EFI_BLACK\r
 #define FIELD_TEXT_GRAYED             EFI_DARKGRAY\r
 #define FIELD_BACKGROUND              EFI_BACKGROUND_LIGHTGRAY\r
-#define FIELD_TEXT_HIGHLIGHT          EFI_LIGHTGRAY\r
-#define FIELD_BACKGROUND_HIGHLIGHT    EFI_BACKGROUND_BLACK\r
 #define POPUP_TEXT                    EFI_LIGHTGRAY\r
 #define POPUP_BACKGROUND              EFI_BACKGROUND_BLUE\r
 #define POPUP_INVERSE_TEXT            EFI_LIGHTGRAY\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 0d42beae504a89d7188cc91aa8d8395a5ba0f8b6..360a6d75ecff552d852d05298d4f1558488aa121 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation for handling user input from the User Interfaces.\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -540,11 +540,11 @@ TheKey2:
             PrintFormattedNumber (Question, FormattedNumber, 21 * sizeof (CHAR16));\r
           }\r
 \r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
           for (Loop = 0; Loop < EraseLen; Loop++) {\r
             PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, L" ");\r
           }\r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT | FIELD_BACKGROUND_HIGHLIGHT);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor) | PcdGet8 (PcdBrowserFieldBackgroundHighlightColor));\r
 \r
           if (MenuOption->Sequence == 0) {\r
             PrintCharAt (MenuOption->OptCol, Row, LEFT_NUMERIC_DELIMITER);\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index e654545bf73e84d28c26eb000d495447122c866d..2e77522ca17f0efe2c6c1fe6e26e0dafc92b7ed6 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -2,7 +2,7 @@
 Implementation for handling the User Interface option processing.\r
 \r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -587,7 +587,7 @@ ProcessOptions (
             CopyMem (QuestionValue, &OneOfOption->Value, sizeof (EFI_HII_VALUE));\r
             SetQuestionValue (Selection->FormSet, Selection->Form, Question, TRUE);\r
             UpdateStatusBar (NV_UPDATE_REQUIRED, Question->QuestionFlags, TRUE);\r
-            gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+            gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
             break;\r
           }\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 289e668b9e32d3eb1f246e6a41166363a3688da6..50387b72eefdb4cccf8841e111c9da1c04480d07 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.\r
 #\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -75,7 +75,13 @@
   gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES\r
 \r
 [FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES\r
+\r
+[Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor               ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor                  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextHighlightColor         ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldBackgroundHighlightColor   ## CONSUMES\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 736d9e822a1b42019102aa58d8a47d73fb5e9592..83b13b19328b338aef844fd514e6bf0a7f8b2bfa 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility functions for User Interface functions.\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -1011,7 +1011,7 @@ UpdateStatusBar (
         );\r
       mInputError = TRUE;\r
     } else {\r
-      gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);\r
+      gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor));\r
       for (Index = 0; Index < (GetStringWidth (InputErrorMessage) - 2) / 2; Index++) {\r
         PrintAt (gScreenDimensions.LeftColumn + gPromptBlockWidth + Index, gScreenDimensions.BottomRow - 1, L"  ");\r
       }\r
@@ -1033,7 +1033,7 @@ UpdateStatusBar (
 \r
         gNvUpdateRequired = TRUE;\r
       } else {\r
-        gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);\r
+        gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor));\r
         for (Index = 0; Index < (GetStringWidth (NvUpdateMessage) - 2) / 2; Index++) {\r
           PrintAt (\r
             (gScreenDimensions.LeftColumn + gPromptBlockWidth + gOptionBlockWidth + Index),\r
@@ -1765,7 +1765,7 @@ UiDisplayMenu (
           LocalScreen.RightColumn,\r
           TopRow - SCROLL_ARROW_HEIGHT,\r
           BottomRow + SCROLL_ARROW_HEIGHT,\r
-          FIELD_TEXT | FIELD_BACKGROUND\r
+          PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND\r
           );\r
 \r
         UiFreeRefreshList ();\r
@@ -1786,7 +1786,7 @@ UiDisplayMenu (
             gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
           } else {\r
             if (Statement->Operand == EFI_IFR_SUBTITLE_OP) {\r
-              gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
+              gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserSubtitleTextColor) | FIELD_BACKGROUND);\r
             }\r
           }\r
 \r
@@ -1874,7 +1874,7 @@ UiDisplayMenu (
                 MenuRefreshEntry->Selection         = Selection;\r
                 MenuRefreshEntry->CurrentColumn     = MenuOption->OptCol;\r
                 MenuRefreshEntry->CurrentRow        = MenuOption->Row;\r
-                MenuRefreshEntry->CurrentAttribute  = FIELD_TEXT | FIELD_BACKGROUND;\r
+                MenuRefreshEntry->CurrentAttribute  = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
                 gMenuRefreshHead                    = MenuRefreshEntry;\r
               } else {\r
                 //\r
@@ -1892,7 +1892,7 @@ UiDisplayMenu (
                 MenuRefreshEntry->Selection         = Selection;\r
                 MenuRefreshEntry->CurrentColumn     = MenuOption->OptCol;\r
                 MenuRefreshEntry->CurrentRow        = MenuOption->Row;\r
-                MenuRefreshEntry->CurrentAttribute  = FIELD_TEXT | FIELD_BACKGROUND;\r
+                MenuRefreshEntry->CurrentAttribute  = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
               }\r
             }\r
 \r
@@ -1974,7 +1974,7 @@ UiDisplayMenu (
             Row = OriginalRow;\r
             FreePool (StringPtr);\r
           }\r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
 \r
           //\r
           // Need to handle the bottom of the display\r
@@ -2008,7 +2008,7 @@ UiDisplayMenu (
             L"%c",\r
             ARROW_UP\r
             );\r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
         }\r
 \r
         if (DownArrow) {\r
@@ -2019,7 +2019,7 @@ UiDisplayMenu (
             L"%c",\r
             ARROW_DOWN\r
             );\r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
         }\r
 \r
         MenuOption = NULL;\r
@@ -2095,7 +2095,7 @@ UiDisplayMenu (
           //\r
           gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
           ProcessOptions (Selection, MenuOption, FALSE, &OptionString);\r
-          gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+          gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
           if (OptionString != NULL) {\r
             if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
                 (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)\r
@@ -2139,7 +2139,7 @@ UiDisplayMenu (
               if (MenuOption->GrayOut) {\r
                 gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
               } else if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
-                gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
+                gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserSubtitleTextColor) | FIELD_BACKGROUND);\r
               }\r
 \r
               OriginalRow = MenuOption->Row;\r
@@ -2160,7 +2160,7 @@ UiDisplayMenu (
               }\r
 \r
               MenuOption->Row = OriginalRow;\r
-              gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+              gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
             }\r
           }\r
         }\r
@@ -2190,7 +2190,7 @@ UiDisplayMenu (
         //\r
         // Set reverse attribute\r
         //\r
-        gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT | FIELD_BACKGROUND_HIGHLIGHT);\r
+        gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor) | PcdGet8 (PcdBrowserFieldBackgroundHighlightColor));\r
         gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
 \r
         //\r
@@ -2200,9 +2200,9 @@ UiDisplayMenu (
         //\r
         if (gMenuRefreshHead != NULL) {\r
           for (MenuRefreshEntry = gMenuRefreshHead; MenuRefreshEntry != NULL; MenuRefreshEntry = MenuRefreshEntry->Next) {\r
-            MenuRefreshEntry->CurrentAttribute = FIELD_TEXT | FIELD_BACKGROUND;\r
+            MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
             if (MenuRefreshEntry->MenuOption == MenuOption) {\r
-              MenuRefreshEntry->CurrentAttribute = FIELD_TEXT_HIGHLIGHT | FIELD_BACKGROUND_HIGHLIGHT;\r
+              MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextHighlightColor) | PcdGet8 (PcdBrowserFieldBackgroundHighlightColor);\r
             }\r
           }\r
         }\r
@@ -2274,7 +2274,7 @@ UiDisplayMenu (
         //\r
         // Clear reverse attribute\r
         //\r
-        gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+        gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
       }\r
       //\r
       // Repaint flag will be used when process CfUpdateHelpString, so restore its value\r