summaryrefslogtreecommitdiff
path: root/com32/menu
Commit message (Collapse)AuthorAgeFilesLines
* menu: Disallow navigation to a disabled entry via *any* keyMatt Fleming2012-10-121-2/+3
| | | | | | | | | | | Generalise the fix from commit c823574f53c1 ("menu: Don't highlight disabled entries") as it only handled the case where we navigated to a disabled last entry by pressing Ctrl + N or the DOWN arrow key. Obviously, we can navigate with other keys such as END, PGDN, etc so we need to handle all cases. Reported-by: Ady <ady-sf@hotmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
* menu: Add MENU GOTO support to the MENU DEFAULT parsing codeMatt Fleming2012-10-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tomas reported that the 'test1' submenu in the following config file snippet doesn't honour the MENU DEFAULT directive, MENU BEGIN test0 MENU START LABEL - MENU DEFAULT MENU LABEL OptionA MENU GOTO test1 MENU END MENU BEGIN test1 LABEL - MENU LABEL OptionA1 MENU GOTO test0 LABEL - MENU DEFAULT MENU LABEL OptionB1 MENU GOTO test0 MENU END The reason is that the menu config code doesn't know how to handle a default item that is a MENU GOTO directive. A trivial addition to the code in record() fixes this. Reported-by: Tomas M <tomas@slax.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
* menu: Don't highlight disabled entriesMatt Fleming2012-10-091-2/+1
| | | | | | | | | | | | | There's an off-by-one bug in the menu input handling code which makes it possible to highlight/select the last entry in a menu even if that entry is disabled. It should be noted that you can't actually *do* anything with the disabled entry, i.e. edit or execute it. Still, allowing it to be highlighted does look a little strange. Reported-by: Matt Sephton <matt.sephton@gmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
* Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'H. Peter Anvin2011-04-261-4/+4
|\ | | | | | | | | | | | | | | Resolved Conflicts: com32/hdt/Makefile com32/sysdump/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * menu.c32: Delete superfluous $(LIBS) prerequistiteMatt Fleming2011-04-161-3/+2
| | | | | | | | | | | | | | com32.mk already includes the necessary libraries in $(C_LIBS), we don't need to list them again in $(LIBS). Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
| * Makefile: Move Makefile fragments into mk/Matt Fleming2011-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the MCONFIG files into a mk/ directory and give them more descriptive names. This is purely a cosmetic change to make the 'include' directives a bit more coherent by making it obvious exactly which MCONFIG file we're including. For example, in com32/lua/src/Makefile we exchange the line, include ../../MCONFIG for the much more comprehensible, include $(MAKEDIR)/com32.mk Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
* | menu: allow "menu hiddenkey" to take multiple keys; run unlabelH. Peter Anvin2011-04-181-8/+26
| | | | | | | | | | | | | | | | - Allow "menu hiddenkey" to take a comma-separated list of keys. - Run unlabel() on the commands passed to menu hiddenkey. XXX: Consider moving unlabelling to post-menu instead. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | menu: clear the timeout line on MENU HIDDENKEYH. Peter Anvin2011-04-111-2/+5
| | | | | | | | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | menu hiddenkey: fix parsing the config file optionH. Peter Anvin2011-04-111-3/+2
| | | | | | | | | | | | Fix parsing bugs in the config file. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | menu: Add "menu hiddenkey" to make terminating menu hidden a commandH. Peter Anvin2011-04-113-2/+33
|/ | | | | | | Use "menu hiddenkey" together with "menu hidden" for a one-keystroke action. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* com32: single instance of skipspace()Erwan Velu2011-02-071-8/+1
| | | | no need to keep several versions of it.
* pxelinux: new IPAPPEND 4 to generate a SYSUUID= option.syslinux-4.01-pre3H. Peter Anvin2010-07-011-1/+2
| | | | | | | Add a new IPAPPEND option to generate a SYSUUID= option with the in-system UUID. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* menu: add MENU HELPH. Peter Anvin2010-06-263-0/+32
| | | | | | | Add a feature to display fullscreen help via menu selection entry (inspired by the Debian install disc menus.) Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Replacing strncpy by strlcpyErwan Velu2010-06-221-1/+1
| | | | | As reported by hpa, strlcpy is safer and could prevent some bugs. So I replaced all strncpy by strlcpy calls.
* MENU IMMEDIATE: hotkeys which do not require Entersyslinux-4.00-pre47H. Peter Anvin2010-05-273-6/+31
| | | | | | | The normal behavior for a hotkey is to jump to a specific menu entry. With MENU IMMEDIATE, it activates the menu entry as well. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* readconfig.c: avoid uninitialized variable warningsH. Peter Anvin2010-05-121-3/+3
| | | | | | -Werror cleanup. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* menu: add MENU CLEAR optionH. Peter Anvin2010-02-033-1/+8
| | | | | | Add MENU CLEAR to clear the screen on menu exit. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* menu: when running hidden, clear the screen before final bootH. Peter Anvin2010-02-031-5/+17
| | | | | | | Clear away the countdown message before actually running the final boot. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* vesacon: don't display the cursor when doing a quiet bootH. Peter Anvin2009-12-074-0/+13
| | | | | | | | | Don't display the cursor on the graphical screen while doing a quiet boot. When doing a quiet boot we will probably show the graphical screen for a fair bit of time; as a result, we really don't want a completely bogus cursor blob on the bottom of the screen. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Merge branch 'softres'H. Peter Anvin2009-12-075-11/+30
|\
| * vesamenu: add MENU RESOLUTION to be able to set nonstandard resH. Peter Anvin2009-12-075-11/+30
| | | | | | | | | | | | | | | | Add a MENU RESOLUTION command to make it possible to set a nonstandard resolution. If the nonstandard resolution is unavailable, we revert to the text mode screen. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | menu: debugging hooksH. Peter Anvin2009-11-192-0/+7
| | | | | | | | | | | | Add (disabled) debugging hooks to the menu system. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | menu: initialize cm (current menu) before empty checkH. Peter Anvin2009-08-171-1/+2
| | | | | | | | | | | | | | | | | | The empty check in the menu system used "cm", but before "cm" had actually been initialized. Move the "cm" initialization earlier so we do the right thing here. Reported-by: CKSoon <cksoon79@yahoo.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | menu: fix Ctrl-W (word erase) when editing a command lineH. Peter Anvin2009-08-131-1/+1
|/ | | | | | | The Ctrl-W (word erase) key was broken: it would think the command line got longer, not shorter, resulting in havoc. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Merge commit 'syslinux-3.82'H. Peter Anvin2009-06-091-1/+4
|\ | | | | | | | | | | | | Conflicts: com32/menu/menumain.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * simple menu: make ONTIMEOUT work with MENU HIDDENSergey Vlasov2009-06-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | The command invoked when no keys were pressed for the specified time (ONTIMEOUT) may be different from the menu item initially selected when the menu is displayed (DEFAULT or MENU DEFAULT). Unfortunately, this did not work together with MENU HIDDEN (which is exactly the case when having a separate ONTIMEOUT command makes the most sense). Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/vesamenu.cH. Peter Anvin2009-05-291-8/+8
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/vesamenu.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/refstr.hH. Peter Anvin2009-05-291-4/+4
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/refstr.h using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/refstr.cH. Peter Anvin2009-05-291-46/+46
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/refstr.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/readconfig.cH. Peter Anvin2009-05-291-830/+816
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/readconfig.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/printmsg.cH. Peter Anvin2009-05-291-70/+70
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/printmsg.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/passwd.cH. Peter Anvin2009-05-291-50/+50
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/passwd.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/menumain.cH. Peter Anvin2009-05-291-910/+936
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/menumain.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/menu.hH. Peter Anvin2009-05-291-89/+89
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/menu.h using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/menu.cH. Peter Anvin2009-05-291-5/+5
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/menu.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/execute.cH. Peter Anvin2009-05-291-39/+39
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/execute.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/drain.cH. Peter Anvin2009-05-291-13/+13
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/drain.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/colors.cH. Peter Anvin2009-05-291-113/+114
| | | | | | | | | | | | | | | | | | Automatically reformat com32/menu/colors.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Run Nindent on com32/menu/background.cH. Peter Anvin2009-05-291-5/+5
|/ | | | | | | | | Automatically reformat com32/menu/background.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Don't set the autocr flag on the serial console; clean up crapsyslinux-3.81-pre12H. Peter Anvin2009-05-233-27/+0
| | | | | | | | | | | | | libutil would set the autocr flag on the serial console, which really never was any point -- we already do \n -> \r\n conversion explicitly in the serial code. This was always very annoying to deal with if the menu was interrupted. Furthermore, drop completely unnecessary initialization/deinitialization routines that completely duplicated other code. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Global whitespace cleanup.H. Peter Anvin2009-04-202-5/+2
| | | | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* menu: modify MENU SAVE to be a cascading defaultH. Peter Anvin2009-04-143-6/+20
| | | | | | | Change MENU SAVE to be a cascading default that can be reverted with MENU NOSAVE. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Makefiles: try to make "make install" do the right thingH. Peter Anvin2009-04-061-1/+1
| | | | | | | | One more attempt at getting semi-sanity to "make install". Realistically, the install/netinstall/install-all/... needs to be pushed into the com32 Makefiles, but this is at least a quick hack. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Implement MENU SAVE; fix COM32 setadv functionsyslinux-3.74-pre18H. Peter Anvin2009-04-063-0/+32
| | | | | | | | Implement MENU SAVE, which allows the menu system to retain the previous selection from one boot to another. In the process, fix the syslinux_setadv() function. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Update copyright notices; add Intel notices where appropriateH. Peter Anvin2009-04-041-1/+2
| | | | | | | Update copyright notices. Per agreement with my new employer, Intel Corporation, add Intel copyright notices where appropriate. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Add new "UI" directive instead of abusing the DEFAULT directiveH. Peter Anvin2008-12-142-1/+44
| | | | | | | | | Add a new "UI" directive to specify a user interface module, instead of abusing the DEFAULT directive. This allows the DEFAULT directive to be used for setting the default, even when the menu system is enabled. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Fix "make clean" confusionsyslinux-3.72H. Peter Anvin2008-09-251-1/+2
| | | | | | | | "make clean" must NOT remove stuff that "make installer" should not rebuild. This is a somewhat unfortunate choice of naming, but that's the way it is. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* simple menu: make "menu default" work after "menu begin"H. Peter Anvin2008-09-221-1/+5
| | | | | | | Make "menu default" work after "menu begin", similar to after "label". This is consistent with how "menu label" works. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* menu: quiet warnings in drain_keyboard()syslinux-3.72-pre5H. Peter Anvin2008-09-081-2/+2
| | | | | | | | Quiet warnings in drain_keyboard(). We need some volatiles in order to keep gcc from optimizing some of the clearings away, but cast them away where appropriate. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Add pxechain.com; new modules direction; reorganize installationH. Peter Anvin2008-08-271-2/+0
| | | | | | | | | Add the pxechain module from Jeffery Hutzelman at CMU. Create new modules directory for non-com32 modules. Centralize installation, since we have three types of install, and only one of them was distributed. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
View Lorry Controller Status