[hbelusca] 58635: [FREELDR] Add support for HOME and END keys in menus, and allow going to the end (resp. to the beginning) if we are on the first (resp. on the last) item and we press up (resp. do...
Author: hbelusca Date: Mon Apr 1 19:31:32 2013 New Revision: 58635
URL: http://svn.reactos.org/svn/reactos?rev=58635&view=rev Log: [FREELDR] Add support for HOME and END keys in menus, and allow going to the end (resp. to the beginning) if we are on the first (resp. on the last) item and we press up (resp. down). Enjoy :)
Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/dir... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Mon Apr 1 19:31:32 2013 @@ -397,7 +397,8 @@ UiProcessMenuKeyboardEvent(IN PUI_MENU_INFO MenuInfo, IN UiMenuKeyPressFilterCallback KeyPressFilter) { - ULONG KeyEvent = 0, Selected, Count; + ULONG KeyEvent = 0; + ULONG Selected, Count;
/* Check for a keypress */ if (MachConsKbHit()) @@ -405,9 +406,7 @@ /* Check if the timeout is not already complete */ if (MenuInfo->MenuTimeRemaining != -1) { - // - // Cancel it and remove it - // + /* Cancel it and remove it */ MenuInfo->MenuTimeRemaining = -1; UiDrawMenuBox(MenuInfo); } @@ -418,7 +417,10 @@ /* Is it extended? Then get the extended key */ if (!KeyEvent) KeyEvent = MachConsGetCh();
- /* Call the supplied key filter callback function to see if it is going to handle this keypress. */ + /* + * Call the supplied key filter callback function to see + * if it is going to handle this keypress. + */ if ((KeyPressFilter) && (KeyPressFilter(KeyEvent))) { /* It processed the key character, so redraw and exit */ @@ -427,40 +429,55 @@ }
/* Process the key */ - if ((KeyEvent == KEY_UP) || (KeyEvent == KEY_DOWN)) + if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || + (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) { /* Get the current selected item and count */ Selected = MenuInfo->SelectedMenuItem; Count = MenuInfo->MenuItemCount - 1;
- /* Check if this was a key up and there's a selected menu item */ - if ((KeyEvent == KEY_UP) && (Selected)) + /* Check the key and change the selected menu item */ + if ((KeyEvent == KEY_UP) && (Selected > 0)) { - /* Update the menu (Deselect previous item) */ + /* Deselect previous item and go up */ MenuInfo->SelectedMenuItem--; UiDrawMenuItem(MenuInfo, Selected); Selected--;
- /* Skip past any separators */ - if ((Selected) && + // Skip past any separators + if ((Selected > 0) && (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem--; } } + else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || + (KeyEvent == KEY_END) ) + { + /* Go to the end */ + MenuInfo->SelectedMenuItem = Count; + UiDrawMenuItem(MenuInfo, Selected); + } else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) { - /* Update the menu (deselect previous item) */ + /* Deselect previous item and go down */ MenuInfo->SelectedMenuItem++; UiDrawMenuItem(MenuInfo, Selected); Selected++;
- /* Skip past any separators */ + // Skip past any separators if ((Selected < Count) && (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem++; } + } + else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || + (KeyEvent == KEY_HOME) ) + { + /* Go to the beginning */ + MenuInfo->SelectedMenuItem = 0; + UiDrawMenuItem(MenuInfo, Selected); }
/* Select new item and update video buffer */
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tui... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Mon Apr 1 19:31:32 2013 @@ -495,7 +495,8 @@ // // Process the key // - if ((KeyEvent == KEY_UP) || (KeyEvent == KEY_DOWN)) + if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || + (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) { // // Get the current selected item and count @@ -504,28 +505,37 @@ Count = MenuInfo->MenuItemCount - 1;
// - // Check if this was a key up and there's a selected menu item - // - if ((KeyEvent == KEY_UP) && (Selected)) + // Check the key and change the selected menu item + // + if ((KeyEvent == KEY_UP) && (Selected > 0)) { // - // Update the menu (Deselect previous item) + // Deselect previous item and go up // MenuInfo->SelectedMenuItem--; TuiDrawMenuItem(MenuInfo, Selected); Selected--;
// Skip past any separators - if ((Selected) && + if ((Selected > 0) && (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem--; } } + else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || + (KeyEvent == KEY_END) ) + { + // + // Go to the end + // + MenuInfo->SelectedMenuItem = Count; + TuiDrawMenuItem(MenuInfo, Selected); + } else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) { // - // Update the menu (deselect previous item) + // Deselect previous item and go down // MenuInfo->SelectedMenuItem++; TuiDrawMenuItem(MenuInfo, Selected); @@ -538,6 +548,15 @@ MenuInfo->SelectedMenuItem++; } } + else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || + (KeyEvent == KEY_HOME) ) + { + // + // Go to the beginning + // + MenuInfo->SelectedMenuItem = 0; + TuiDrawMenuItem(MenuInfo, Selected); + }
// // Select new item and update video buffer
-
hbelusca＠svn.reactos.org