Unification of keybinding names.

Most of keybind names are changed to unify that names.
Details see in doc/keybind-migration.txt file.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2011-01-21 11:47:27 +03:00
parent 68a8745f6d
commit 50de02cfe4
24 changed files with 2848 additions and 2855 deletions

View File

@ -1,4 +1,3 @@
This file describes how keybind names used in mc.keymap.* files This file describes how keybind names used in mc.keymap.* files
are changed in 4.8.* releases. are changed in 4.8.* releases.
@ -7,53 +6,479 @@ are changed in 4.8.* releases.
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [main] section | | [main] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | CmdCopy | Copy | |
| CmdRename | Move | |
| CmdDelete | Delete | |
| CmdMkdir | MakeDir | |
| ShowCommandLine | Shell | |
| CmdMenu | Menu | |
| CmdMenuLastSelected | MenuLastSelected | |
| CmdUserMenu | UserMenu | |
| CmdEditMcMenu | EditUserMenu | |
| CmdHelp | Help | |
| CmdHistory | History | |
| CmdEdit | Edit | |
| CmdEditForceInternal | EditForceInternal | |
| CmdView | View | |
| CmdViewFile | ViewFile | |
| CmdFilteredView | ViewFiltered | |
| CmdFind | Find | |
| CmdReread | Reread | |
| CmdSingleDirsize | DirSize | |
| CmdDialogList | ScreenList | |
| CmdSuspend | Suspend | |
| CmdCopyCurrentPathname | PutCurrentPath | |
| CmdCopyOtherPathname | PutOtherPath | |
| CmdSelect | Select | |
| CmdUnselect | Unselect | |
| CmdReverseSelection | SelectInvert | |
| CmdQuickChdir | HotList | |
| CmdSwapPanel | Swap | |
| CmdListing | PanelListing | |
| CmdToggleListing | PanelListingSwitch | |
| CmdChangeListing | PanelListingChange | |
| CmdToggleShowHidden | ShowHidden | |
| CmdTogglePanelsSplit | SplitVertHoriz | |
| CmdQuickCd | CdQuick | |
| CmdConfigureBox | Options | |
| CmdLayout | OptionsLayout | |
| CmdPanelOptions | OptionsPanel | |
| CmdConfirmBox | OptionsConfirm | |
| CmdDisplayBitsBox | OptionsDisplayBits | |
| CmdConfigureVfs | OptionsVfs | |
| CmdSaveSetup | SaveSetup | |
| CmdEditExtFile | EditExtensionsFile | |
| CmdEditFhlFile | EditFileHighlightFile | |
| CmdFilter | Filter | |
| CmdFishlink | ConnectFish | |
| CmdFtplink | ConnectFtp | |
| CmdSmblink | ConnectSmb | |
| CmdUndelete | Undelete | |
| CmdQuit | Quit | |
| CmdQuietQuit | QuitQuiet | |
| ExtMap1 | ExtendedKeyMap | |
| CmdEditUserMenu | | Unused. Removed |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [main:xmap] section | | [main:xmap] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | CmdChmod | ChangeMode | |
| CmdChown | ChangeOwn | |
| CmdCompareDirs | CompareDirs | |
| CmdDiffView | CompareFiles | |
| CmdInfo | PanelInfo | |
| CmdQuickView | PanelQuickView | |
| CmdLink | Link | |
| CmdSymlink | LinkSymbolic | |
| CmdRelativeSymlink | LinkSymbolicRelative | |
| CmdEditSymlink | LinkSymbolicEdit | |
| CmdExternalPanelize | ExternalPanelize | |
| CmdReselectVfs | VfsList | |
| CmdJobs | Jobs | |
| CmdAddHotlist | HotListAdd | |
| CmdCopyCurrentPathname | PutCurrentPath | |
| CmdCopyOtherPathname | PutOtherPath | |
| CmdCopyCurrentTagged | PutCurrentTagged | |
| CmdCopyOtherTagged | PutOtherTagged | |
| CmdCopyCurrentReadlink | PutCurrentLink | |
| CmdCopyOtherReadlink | PutOtherLink | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [panel] section | | [panel] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | PanelMoveUp | Up | |
| PanelMoveDown | Down | |
| PanelMoveLeft | Left | |
| PanelMoveRight | Right | |
| PanelPrevPage | PageUp | |
| PanelNextPage | PageDown | |
| PanelMoveHome | Top | |
| PanelMoveEnd | Bottom | |
| PanelGotoTopFile | TopOnScreen | |
| PanelGotoMiddleFile | MiddleOnScreen | |
| PanelGotoBottomFile | BottomOnScreen | |
| PanelCopyLocal | CopySingle | |
| PanelRenameLocal | MoveSingle | |
| PanelDeleteLocal | DeleteSingle | |
| PanelStartSearch | Search | |
| PanelSetPanelEncoding | SelectCodepage | |
| PanelDirectoryHistoryList | History | |
| PanelDirectoryHistoryNext | HistoryNext | |
| PanelDirectoryHistoryPrev | HistoryPrev | |
| PanelEditNew | EditNew | |
| PanelViewSimple | ViewRaw | |
| PanelSelect | Select | |
| PanelUnselect | Unselect | |
| PanelReverseSelection | SelectInvert | |
| PanelSyncOtherPanel | PanelOtherSync | |
| PanelChdirOtherPanel | PanelOtherCd | |
| PanelChdirToReadlink | PanelOtherCdLink | |
| PanelGotoChildDir | CdChild | |
| PanelGotoParentDir | CdParent | |
| PanelSmartGotoParentDir | CdParentSmart | |
| PanelMarkFile | Mark | |
| PanelMarkDown | MarkDown | |
| PanelMarkUp | MarkUp | |
| PanelDoEnter | Enter | |
| PanelSelectSortOrder | Sort | |
| PanelReverseSort | SortReverse | |
| PanelToggleSortOrderPrev | SortPrev | |
| PanelToggleSortOrderNext | SortNext | |
| PanelSortOrderByName | SortByName | |
| PanelSortOrderByExt | SortByExt | |
| PanelSortOrderBySize | SortBySize | |
| PanelSortOrderByMTime | SortByMTime | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [dialog] section | | [dialog] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | DialogOK | Ok | |
| DialogCancel | Cancel | |
| DialogPrevItem | Up, Left | Left should not be used |
| DialogNextItem | Down, Right | Right should not be used |
| DialogHelp | Help | |
| DialogRefresh | Refresh | |
| DialogSuspend | Suspend | |
| CmdDialogList | ScreenList | |
| CmdDialogNext | ScreenNext | |
| CmdDialogPrev | ScreenPrev | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [input] section | | [input] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | InputBol | Home | |
| InputEol | End | |
| InputMoveLeft | Left | |
| InputMoveRight | Right | |
| InputBackwardChar | | Removed. 'Left' is used instead |
| InputForwardChar | | Removed. 'Right' is used instead |
| InputWordLeft | WordLeft | |
| InputBackwardWord | | Removed. 'WordLeft' is used instead |
| InputWordRight | WordRight | |
| InputForwardWord | | Removed. 'WordRight' is used instead |
| InputDeleteChar | Delete | |
| InputBackwardDelete | Backspace | |
| InputBackwardKillWord | DeleteToWordBegin | |
| InputKillWord | DeleteToWordEnd | |
| InputKillLine | DeleteToEnd | |
| InputKillRegion | Remove | |
| InputClearLine | Clear | |
| InputComplete | Complete | |
| InputSetMark | Mark | |
| InputLeftHighlight | MarkLeft | |
| InputRightHighlight | MarkRight | |
| InputWordLeftHighlight | MarkToWordBegin | |
| InputWordRightHighlight | MarkToWordEnd | |
| InputBolHighlight | MarkToHome | |
| InputEolHighlight | MarkToEnd | |
| InputHistoryPrev | HistoryPrev | |
| InputHistoryNext | HistoryNext | |
| InputHistoryShow | History | |
| InputXCut | Cut | |
| InputXStore | Store | |
| InputXPaste | Paste | |
| InputYank | Yank | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [listbox] section | | [listbox] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | ListboxMoveUp | Up | |
| ListboxMoveDown | Down | |
| ListboxMovePgUp | PageUp | |
| ListboxMovePgDn | PageDown | |
| ListboxMoveHome | Top | |
| ListboxMoveEnd | Bottom | |
| ListboxDeleteItem | Delete | |
| ListboxDeleteAll | Clear | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [tree] section | | [tree] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | TreeMoveUp | Up | |
| TreeMoveDown | Down | |
| TreeMoveLeft | Left | |
| TreeMoveRight | Right | |
| TreeMovePgUp | PageUp | |
| TreeMovePgDn | PageDown | |
| TreeMoveHome | Top | |
| TreeMoveEnd | Bottom | |
| TreeCopy | Copy | |
| TreeMove | Move | |
| TreeRemove | Delete | |
| TreeHelp | Help | |
| TreeStartSearch | Search | |
| TreeRescan | Reread | |
| TreeToggleNav | ToggleNavigation | |
| TreeForget | Forget | |
| TreeOpen | Enter | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [help] section | | [help] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | HelpIndex | Index | |
| HelpBack | Back | |
| HelpMoveUp | Up | |
| HelpMoveDown | Down | |
| HelpMovePgUp | PageUp | |
| HelpMovePgDn | PageDown | |
| HelpMoveHalfPgUp | HalfPageUp | |
| HelpMoveHalfPgDn | HalfPageDown | |
| HelpMoveTop | Top | |
| HelpMoveBottom | Bottom | |
| HelpSelectLink | Enter | |
| HelpNextLink | LinkNext | |
| HelpPrevLink | LinkPrev | |
| HelpNextNode | NodeNext | |
| HelpPrevNode | NodePrev | |
| HelpHelp | Help | |
| HelpQuit | Quit | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [editor] section | | [editor] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | EditEnter | Enter | |
| EditUp | Up | |
| EditDown | Down | |
| EditLeft | Left | |
| EditRight | Right | |
| EditHome | Home | |
| EditEnd | End | |
| EditPageUp | PageUp | |
| EditPageDown | PageDown | |
| EditBeginningOfText | Top | |
| EditEndOfText | Bottom | |
| EditBeginPage | TopOnScreen | |
| EditEndPage | BottomOnScreen | |
| EditParagraphUp | ParagraphUp | |
| EditParagraphDown | ParagraphDown | |
| EditParagraphFormat | ParagraphFormat | |
| EditRemove | Remove | |
| EditDelete | Delete | |
| EditBackSpace | BackSpace | |
| EditWordLeft | WordLeft | |
| EditWordRight | WordRight | |
| EditDeleteWordLeft | DeleteToWordBegin | |
| EditDeleteWordRight | DeleteToWordEnd | |
| EditDeleteLine | DeleteLine | |
| EditDeleteToLineBegin | DeleteToHome | |
| EditDeleteToLineEnd | DeleteToEnd | |
| EditReturn | Return | |
| EditTab | Tab | |
| EditToggleInsert | InsertOverwrite | |
| EditUndo | Undo | |
| EditRedo | Redo | |
| EditInsertLiteral | InsertLiteral | |
| EditMenu | Menu | |
| EditUserMenu | UserMenu | |
| | EditUserMenu | Added to edit the user menu of editor |
| EditSelectionHistory | History | |
| EditHelp | Help | |
| EditFind | Search | |
| EditFindAgain | SearchContinue | |
| EditReplace | Replace | |
| EditReplaceAgain | ReplaceContinue | |
| EditCompleteWord | | Removed. 'Complete' is used instead |
| EditComplete | Complete | |
| EditLoad | EditFile | |
| EditInsertFile | InsertFile | |
| EditSave | Save | |
| EditSaveas | SaveAs | |
| EditSaveBlock | BlockSave | |
| EditShiftBlockLeft | BlockShiftLeft | |
| EditShiftBlockRight | BlockShiftRight | |
| EditMark | Mark | |
| EditColumnMark | MarkColumn | |
| EditMarkAll | MarkAll | |
| EditLeftHighlight | MarkLeft | |
| EditRightHighlight | MarkRight | |
| EditUpHighlight | MarkUp | |
| EditDownHighlight | MarkDown | |
| EditPageUpHighlight | MarkPageUp | |
| EditPageDownHighlight | MarkPageDown | |
| EditParagraphUpHighlight | MarkParagraphUp | |
| EditParagraphDownHighlight | MarkParagraphDown | |
| EditWordLeftHighlight | MarkToWordBegin | |
| EditWordRightHighlight | MarkToWordEnd | |
| EditHomeHighlight | MarkToHome | |
| EditEndHighlight | MarkToEnd | |
| EditBeginningOfTextHighlight | MarkToFileBegin | |
| EditEndOfTextHighlight | MarkToFileEnd | |
| EditBeginPageHighlight | MarkToPageBegin | |
| EditEndPageHighlight | MarkToPageEnd | |
| EditScrollUpHighlight | MarkScrollUp | |
| EditScrollDownHighlight | MarkScrollDown | |
| EditLeftAltHighlight | MarkColumnLeft | |
| EditRightAltHighlight | MarkColumnRight | |
| EditUpAltHighlight | MarkColumnUp | |
| EditDownAltHighlight | MarkColumnDown | |
| EditPageUpAltHighlight | MarkColumnPageUp | |
| EditPageDownAltHighlight | MarkColumnPageDown | |
| EditParagraphUpAltHighlight | MarkColumnParagraphUp | |
| EditParagraphDownAltHighlight | MarkColumnParagraphDown | |
| EditScrollUpAltHighlight | MarkColumnScrollUp | |
| EditScrollDownAltHighlight | MarkColumnScrollDown | |
| EditUnmark | Unmark | |
| EditCopy | Copy | |
| EditMove | Move | |
| EditScrollUp | ScrollUp | |
| EditScrollDown | ScrollDown | |
| EditGoto | Goto | |
| EditToggleLineState | ShowNumbers | |
| EditToggleTabTWS | ShowTabTws | |
| EditToggleShowMargin | ShowMargin | |
| EditToggleSyntax | SyntaxOnOff | |
| EditChooseSyntax | SyntaxChoose | |
| EditToggleBookmark | Bookmark | |
| EditNextBookmark | BookmarkNext | |
| EditPrevBookmark | BookmarkPrev | |
| EditFlushBookmarks | BookmarkFlush | |
| EditFindDefinition | Find | |
| EditLoadNextFile | FileNext | |
| EditLoadPrevFile | FilePrev | |
| EditXCut | Cut | |
| EditXStore | Store | |
| EditXPaste | Paste | |
| EditShell | Shell | |
| EditRefresh | Refresh | |
| EditSort | Sort | |
| EditOptions | Options | |
| EditSaveMode | OptionsSaveMode | |
| EditMatchBracket | MatchBracket | |
| EditDate | Date | |
| EditMail | Mail | |
| EditQuit | Quit | |
| EditAbout | About | |
| EditExtMode | ExtendedKeyMap | |
| EditExtCmd | ExternalCommand | |
| EditBeginRecordMacro | MacroStartRecord | |
| EditEndRecordMacro | MacroStopRecord | |
| EditBeginOrEndMacro | MacroStartStopRecord | |
| EditDeleteMacro | MacroDelete | |
| CmdLearnKeys | LearnKeys | |
| EditFindFile | | Unused. Removed |
| EditExecuteMacro | | Unused. Removed |
| EditWordLeftAltHighlight | | Unused. Removed |
| EditWordRightAltHighlight | | Unused. Removed |
| EditHomeAltHighlight | | Unused. Removed |
| EditEndAltHighlight | | Unused. Removed |
| EditBeginningOfTextAltHighlight | | Unused. Removed |
| EditEndOfTextAltHighlight | | Unused. Removed |
| EditBeginPageAltHighlight | | Unused. Removed |
| EditEndPageAltHighlight | | Unused. Removed |
| EditSaveAndQuit | | Unused. Removed |
| EditCheckSaveAndQuit | | Unused. Removed |
| EditNewWindow | | Unused. Removed |
| EditSaveDesktop | | Unused. Removed |
| EditTerminal | | Unused. Removed |
| EditTerminalApp | | Unused. Removed |
| EditTypeLoadPython | | Unused. Removed |
| EditUtil | | Unused. Removed |
| EditRunAnother | | Unused. Removed |
| EditDebugStart | | Unused. Removed |
| EditDebugStop | | Unused. Removed |
| EditDebugToggleBreak | | Unused. Removed |
| EditDebugClear | | Unused. Removed |
| EditDebugNext | | Unused. Removed |
| EditDebugStep | | Unused. Removed |
| EditDebugBackTrace | | Unused. Removed |
| EditDebugContinue | | Unused. Removed |
| EditDebugEnterCommand | | Unused. Removed |
| EditDebugUntilCurser | | Unused. Removed |
| EditCycle | | Unused. Removed |
| EditMaximize | | Unused. Removed |
| EditManPage | | Unused. Removed |
| EditCtags | | Unused. Removed |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [editor:xmap] section | | [editor:xmap] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | EditExecuteMacro | | Unused. Removed |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [viewer] section | | [viewer] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | ViewMoveUp | Up | |
| ViewMoveDown | Down | |
| ViewMoveLeft | Left | |
| ViewMoveRight | Right | |
| ViewMoveToBol | Home | |
| ViewMoveToEol | End | |
| ViewMovePgUp | PageUp | |
| ViewMovePgDn | PageDown | |
| ViewMoveHalfPgUp | HalfPageUp | |
| ViewMoveHalfPgDn | HalfPageDown | |
| ViewMoveTop | Top | |
| ViewMoveBottom | Bottom | |
| ViewHelp | Help | |
| ViewSearch | Search | |
| ViewSearchContinue | SearchContinue | |
| ViewGoto | Goto | |
| ViewNextFile | FileNext | |
| ViewPrevFile | FilePrev | |
| ViewToggleHexMode | HexMode | |
| ViewToggleWrapMode | WrapMode | |
| ViewToggleMagicMode | MagicMode | |
| ViewToggleNroffMode | NroffMode | |
| ViewToggleRuler | Ruler | |
| ViewNewBookmark | Bookmark | |
| ViewGotoBookmark | BookmarkGoto | |
| ShowCommandLine | Shell | |
| ViewQuit | Quit | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [viewer:hex] section | | [viewer:hex] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | ViewMoveUp | Up | |
| ViewMoveDown | Down | |
| ViewMoveLeft | Left | |
| ViewMoveRight | Right | |
| ViewMoveLeft10 | LeftQuick | |
| ViewMoveRight10 | RightQuick | |
| ViewMoveToBol | Home | |
| ViewMoveToEol | End | |
| ViewMovePgUp | PageUp | |
| ViewMovePgDn | PageDown | |
| ViewMoveTop | Top | |
| ViewMoveBottom | Bottom | |
| ViewHelp | Help | |
| ViewSearch | Search | |
| ViewSearchContinue | SearchContinue | |
| ViewHexEditSave | Save | |
| ViewGoto | Goto | |
| ViewToggleHexMode | HexMode | |
| ViewToggleHexEditMode | HexEditMode | |
| ViewToggleHexNavMode | ToggleNavigation | |
| ViewToggleMagicMode | MagicMode | |
| ViewToggleNroffMode | NroffMode | |
| ShowCommandLine | Shell | |
| ViewQuit | Quit | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| [diffviewer] section | | [diffviewer] section |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+
| | | | | DiffUp | Up | |
| DiffDown | Down | |
| DiffLeft | Left | |
| DiffRight | Right | |
| DiffQuickLeft | LeftQuick | |
| DiffQuickRight | RightQuick | |
| DiffHome | Home | |
| DiffEnd | | Unused. Removed |
| DiffPageUp | PageUp | |
| DiffPageDown | PageDown | |
| DiffBOF | Top | |
| DiffEOF | Bottom | |
| DiffHelp | Help | |
| DiffSearch | Search | |
| DiffSearchContinue | SearchContinue | |
| DiffRedo | Redo | |
| DiffSave | Save | |
| DiffGoto | Goto | |
| DiffSwapPanel | Swap | |
| DiffFull | SplitFull | |
| DiffEqual | SplitEqual | |
| DiffSplitMore | SplitMore | |
| DiffSplitLess | SplitLess | |
| DiffSetTab2 | Tab2 | |
| DiffSetTab3 | Tab3 | |
| DiffSetTab4 | Tab4 | |
| DiffSetTab8 | Tab8 | |
| DiffEditCurrent | Edit | |
| DiffEditOther | EditOther | |
| DiffNextHunk | HunkNext | |
| DiffPrevHunk | HunkPrev | |
| DiffMergeCurrentHunk | Merge | |
| DiffDisplaySymbols | ShowSymbols | |
| DiffDisplayNumbers | ShowNumbers | |
| DiffOptions | Options | |
| ShowCommandLine | Shell | |
| DiffQuit | Quit | |
+---------------------------------+-------------------------+-----------------------------------------+ +---------------------------------+-------------------------+-----------------------------------------+

View File

@ -45,486 +45,288 @@
static name_keymap_t command_names[] = { static name_keymap_t command_names[] = {
/* common */ /* common */
{"Enter", CK_Enter},
{"Up", CK_Up},
{"Down", CK_Down},
{"Left", CK_Left},
{"Right", CK_Right},
{"LeftQuick", CK_LeftQuick},
{"RightQuick", CK_RightQuick},
{"Home", CK_Home},
{"End", CK_End},
{"PageUp", CK_PageUp},
{"PageDown", CK_PageDown},
{"HalfPageUp", CK_HalfPageUp},
{"HalfPageDown", CK_HalfPageDown},
{"Top", CK_Top},
{"Bottom", CK_Bottom},
{"TopOnScreen", CK_TopOnScreen},
{"MiddleOnScreen", CK_MiddleOnScreen},
{"BottomOnScreen", CK_BottomOnScreen},
{"WordLeft", CK_WordLeft},
{"WordRight", CK_WordRight},
{"Copy", CK_Copy},
{"Move", CK_Move},
{"Delete", CK_Delete},
{"MakeDir", CK_MakeDir},
{"ChangeMode", CK_ChangeMode},
{"ChangeOwn", CK_ChangeOwn},
{"ChangeOwnAdvanced", CK_ChangeOwnAdvanced},
{"Remove", CK_Remove},
{"BackSpace", CK_BackSpace},
{"Undo", CK_Undo},
{"Redo", CK_Redo},
{"Clear", CK_Clear},
{"Menu", CK_Menu},
{"MenuLastSelected", CK_MenuLastSelected},
{"UserMenu", CK_UserMenu},
{"EditUserMenu", CK_EditUserMenu},
{"Search", CK_Search},
{"SearchContinue", CK_SearchContinue},
{"Replace", CK_Replace},
{"ReplaceContinue", CK_ReplaceContinue},
{"Help", CK_Help},
{"Shell", CK_Shell},
{"Edit", CK_Edit},
{"EditNew", CK_EditNew},
#ifdef HAVE_CHARSET
{"SelectCodepage", CK_SelectCodepage}, {"SelectCodepage", CK_SelectCodepage},
{"ShowCommandLine", CK_ShowCommandLine}, #endif
{"ExtMap1", CK_StartExtMap1}, {"History", CK_History},
{"ExtMap2", CK_StartExtMap2}, {"HistoryNext", CK_HistoryNext},
{"HistoryPrev", CK_HistoryPrev},
{"Complete", CK_Complete},
{"Save", CK_Save},
{"SaveAs", CK_SaveAs},
{"Goto", CK_Goto},
{"Reread", CK_Reread},
{"Refresh", CK_Refresh},
{"Suspend", CK_Suspend},
{"Swap", CK_Swap},
{"HotList", CK_HotList},
{"SelectInvert", CK_SelectInvert},
{"ScreenList", CK_ScreenList},
{"ScreenNext", CK_ScreenNext},
{"ScreenPrev", CK_ScreenPrev},
{"FileNext", CK_FileNext},
{"FilePrev", CK_FilePrev},
{"DeleteToWordBegin", CK_DeleteToWordBegin},
{"DeleteToWordEnd", CK_DeleteToWordEnd},
{"Cut", CK_Cut},
{"Store", CK_Store},
{"Paste", CK_Paste},
{"Mark", CK_Mark},
{"MarkLeft", CK_MarkLeft},
{"MarkRight", CK_MarkRight},
{"MarkUp", CK_MarkUp},
{"MarkDown", CK_MarkDown},
{"MarkToWordBegin", CK_MarkToWordBegin},
{"MarkToWordEnd", CK_MarkToWordEnd},
{"MarkToHome", CK_MarkToHome},
{"MarkToEnd", CK_MarkToEnd},
{"ToggleNavigation", CK_ToggleNavigation},
{"Sort", CK_Sort},
{"Options", CK_Options},
{"LearnKeys", CK_LearnKeys},
{"Bookmark", CK_Bookmark},
{"Quit", CK_Quit},
{"QuitQuiet", CK_QuitQuiet},
{"ExtendedKeyMap", CK_ExtendedKeyMap},
/* main commands */ /* main commands */
{"CmdHelp", CK_HelpCmd},
{"CmdMenu", CK_MenuCmd},
{"CmdChmod", CK_ChmodCmd},
{"CmdMenuLastSelected", CK_MenuLastSelectedCmd},
{"CmdSingleDirsize", CK_SingleDirsizeCmd},
{"CmdCopyCurrentPathname", CK_CopyCurrentPathname},
{"CmdCopyOtherPathname", CK_CopyOtherPathname},
{"CmdSuspend", CK_SuspendCmd},
{"CmdToggleListing", CK_ToggleListingCmd},
{"CmdChownAdvanced", CK_ChownAdvancedCmd},
{"CmdChown", CK_ChownCmd},
{"CmdCompareDirs", CK_CompareDirsCmd},
{"CmdConfigureBox", CK_ConfigureBox},
{"CmdConfigureVfs", CK_ConfigureVfs},
{"CmdConfirmBox", CK_ConfirmBox},
{"CmdCopy", CK_CopyCmd},
{"CmdDelete", CK_DeleteCmd},
{"CmdDirsizes", CK_DirsizesCmd},
{"CmdDisplayBitsBox", CK_DisplayBitsBox},
{"CmdEdit", CK_EditCmd},
#ifdef USE_INTERNAL_EDIT #ifdef USE_INTERNAL_EDIT
{"CmdEditForceInternal", CK_EditForceInternalCmd}, {"EditForceInternal", CK_EditForceInternal},
#endif #endif
{"CmdEditExtFile", CK_EditExtFileCmd}, {"View", CK_View},
{"CmdEditFhlFile", CK_EditFhlFileCmd}, {"ViewRaw", CK_ViewRaw},
{"CmdEditMcMenu", CK_EditMcMenuCmd}, {"ViewFile", CK_ViewFile},
{"CmdEditSymlink", CK_EditSymlinkCmd}, {"ViewFiltered", CK_ViewFiltered},
{"CmdEditSyntax", CK_EditSyntaxCmd}, {"Find", CK_Find},
{"CmdEditUserMenu", CK_EditUserMenuCmd}, {"DirSize", CK_DirSize},
{"CmdExternalPanelize", CK_ExternalPanelize}, {"PanelListingSwitch", CK_PanelListingSwitch},
{"CmdFilter", CK_FilterCmd}, {"CompareDirs", CK_CompareDirs},
{"CmdFilteredView", CK_FilteredViewCmd}, #ifdef USE_DIFF_VIEW
{"CmdFind", CK_FindCmd}, {"CompareFiles", CK_CompareFiles},
#endif
{"OptionsVfs", CK_OptionsVfs},
{"OptionsConfirm", CK_OptionsConfirm},
{"OptionsDisplayBits", CK_OptionsDisplayBits},
{"EditExtensionsFile", CK_EditExtensionsFile},
{"EditFileHighlightFile", CK_EditFileHighlightFile},
{"LinkSymbolicEdit", CK_LinkSymbolicEdit},
{"ExternalPanelize", CK_ExternalPanelize},
{"Filter", CK_Filter},
#ifdef ENABLE_VFS_FISH #ifdef ENABLE_VFS_FISH
{"CmdFishlink", CK_FishlinkCmd}, {"ConnectFish", CK_ConnectFish},
#endif #endif
#ifdef ENABLE_VFS_FTP #ifdef ENABLE_VFS_FTP
{"CmdFtplink", CK_FtplinkCmd}, {"ConnectFtp", CK_ConnectFtp},
#endif #endif
{"CmdHistory", CK_HistoryCmd},
{"CmdInfo", CK_InfoCmd},
#ifdef WITH_BACKGROUND
{"CmdJobs", CK_JobsCmd},
#endif
{"CmdLayout", CK_LayoutBox},
{"CmdLearnKeys", CK_LearnKeys},
{"CmdLink", CK_LinkCmd},
{"CmdChangeListing", CK_ChangeListingCmd},
{"CmdListing", CK_ListingCmd},
#ifdef LISTMODE_EDITOR
{"CmdListmodeCmd", CK_ListmodeCmd}.
#endif
{"CmdMkdir", CK_MkdirCmd},
{"CmdPanelOptions", CK_PanelOptionsBox},
{"CmdQuickCd", CK_QuickCdCmd},
{"CmdQuickChdir", CK_QuickChdirCmd},
{"CmdQuickView", CK_QuickViewCmd},
{"CmdQuietQuit", CK_QuietQuitCmd},
{"CmdRelativeSymlink", CK_RelativeSymlinkCmd},
{"CmdRename", CK_RenameCmd},
{"CmdReread", CK_RereadCmd},
{"CmdReselectVfs", CK_ReselectVfs},
{"CmdReverseSelection", CK_ReverseSelectionCmd},
{"CmdSaveSetup", CK_SaveSetupCmd},
{"CmdSelect", CK_SelectCmd},
#ifdef ENABLE_VFS_SMB #ifdef ENABLE_VFS_SMB
{"CmdSmblinkCmd", CK_SmblinkCmd}, {"ConnectSmb", CK_ConnectSmb},
#endif #endif
{"CmdSwapPanel", CK_SwapCmd}, {"PanelInfo", CK_PanelInfo},
{"CmdSymlink", CK_SymlinkCmd}, #ifdef WITH_BACKGROUND
{"CmdTree", CK_TreeCmd}, {"Jobs", CK_Jobs},
{"CmdTreeBox", CK_TreeBoxCmd}, #endif
{"OptionsLayout", CK_OptionsLayout},
{"Link", CK_Link},
{"PanelListingChange", CK_PanelListingChange},
{"PanelListing", CK_PanelListing},
#ifdef LISTMODE_EDITOR
{"ListMode", CK_ListMode}.
#endif
{"OptionsPanel", CK_OptionsPanel},
{"CdQuick", CK_CdQuick},
{"PanelQuickView", CK_PanelQuickView},
{"LinkSymbolicRelative", CK_LinkSymbolicRelative},
{"VfsList", CK_VfsList},
{"SaveSetup", CK_SaveSetup},
{"LinkSymbolic", CK_LinkSymbolic},
{"PanelTree", CK_PanelTree},
{"Tree", CK_Tree},
#ifdef ENABLE_VFS_UNDELFS #ifdef ENABLE_VFS_UNDELFS
{"CmdUndelete", CK_UndeleteCmd}, {"Undelete", CK_Undelete},
#endif #endif
{"CmdUnselect", CK_UnselectCmd}, {"PutCurrentLink", CK_PutCurrentLink},
{"CmdUserMenu", CK_UserMenuCmd}, {"PutOtherLink", CK_PutOtherLink},
{"CmdUserFileMenu", CK_UserFileMenuCmd}, {"HotListAdd", CK_HotListAdd},
{"CmdView", CK_ViewCmd}, {"ShowHidden", CK_ShowHidden},
{"CmdViewFile", CK_ViewFileCmd}, {"SplitVertHoriz", CK_SplitVertHoriz},
{"CmdCopyCurrentReadlink", CK_CopyCurrentReadlink}, {"PutCurrentPath", CK_PutCurrentPath},
{"CmdCopyOtherReadlink", CK_CopyOtherReadlink}, {"PutOtherPath", CK_PutOtherPath},
{"CmdAddHotlist", CK_AddHotlist}, {"PutCurrentTagged", CK_PutCurrentTagged},
{"CmdQuit", CK_QuitCmd}, {"PutOtherTagged", CK_PutOtherTagged},
{"CmdCopyCurrentTagged", CK_CopyCurrentTagged}, {"Select", CK_Select},
{"CmdCopyOtherTagged", CK_CopyOtherTagged}, {"Unselect", CK_Unselect},
{"CmdToggleShowHidden", CK_ToggleShowHidden},
{"CmdTogglePanelsSplit", CK_TogglePanelsSplit},
#ifdef USE_DIFF_VIEW
{"CmdDiffView", CK_DiffViewCmd},
#endif
{"CmdDialogList", CK_DialogListCmd},
{"CmdDialogNext", CK_DialogNextCmd},
{"CmdDialogPrev", CK_DialogPrevCmd},
/* panel */ /* panel */
{"PanelChdirOtherPanel", CK_PanelChdirOtherPanel}, {"PanelOtherCd", CK_PanelOtherCd},
{"PanelChdirToReadlink", CK_PanelChdirToReadlink}, {"PanelOtherCdLink", CK_PanelOtherCdLink},
{"PanelCopyLocal", CK_PanelCmdCopyLocal}, {"CopySingle", CK_CopySingle},
{"PanelDeleteLocal", CK_PanelCmdDeleteLocal}, {"MoveSingle", CK_MoveSingle},
{"PanelDoEnter", CK_PanelCmdDoEnter}, {"DeleteSingle", CK_DeleteSingle},
{"PanelEditNew", CK_PanelCmdEditNew}, {"CdParent", CK_CdParent},
{"PanelRenameLocal", CK_PanelCmdRenameLocal}, {"CdChild", CK_CdChild},
{"PanelReverseSelection", CK_PanelCmdReverseSelection}, {"PanelOtherSync", CK_PanelOtherSync},
{"PanelSelect", CK_PanelCmdSelect}, {"SortNext", CK_SortNext},
{"PanelUnselect", CK_PanelCmdUnselect}, {"SortPrev", CK_SortPrev},
{"PanelViewSimple", CK_PanelCmdViewSimple}, {"SortReverse", CK_SortReverse},
{"PanelGotoParentDir", CK_PanelGotoParentDir}, {"SortByName", CK_SortByName},
{"PanelGotoChildDir", CK_PanelGotoChildDir}, {"SortByExt", CK_SortByExt},
{"PanelDirectoryHistoryList", CK_PanelDirectoryHistoryList}, {"SortBySize", CK_SortBySize},
{"PanelDirectoryHistoryNext", CK_PanelDirectoryHistoryNext}, {"SortByMTime", CK_SortByMTime},
{"PanelDirectoryHistoryPrev", CK_PanelDirectoryHistoryPrev}, {"CdParentSmart", CK_CdParentSmart},
{"PanelGotoBottomFile", CK_PanelGotoBottomFile},
{"PanelGotoMiddleFile", CK_PanelGotoMiddleFile},
{"PanelGotoTopFile", CK_PanelGotoTopFile},
{"PanelMarkFile", CK_PanelMarkFile},
{"PanelMarkFileDown", CK_PanelMarkFileDown},
{"PanelMarkFileUp", CK_PanelMarkFileUp},
{"PanelMoveUp", CK_PanelMoveUp},
{"PanelMoveDown", CK_PanelMoveDown},
{"PanelMoveLeft", CK_PanelMoveLeft},
{"PanelMoveRight", CK_PanelMoveRight},
{"PanelMoveEnd", CK_PanelMoveEnd},
{"PanelMoveHome", CK_PanelMoveHome},
{"PanelNextPage", CK_PanelNextPage},
{"PanelPrevPage", CK_PanelPrevPage},
#ifdef HAVE_CHARSET
{"PanelSetPanelEncoding", CK_PanelSetPanelEncoding},
#endif
{"PanelStartSearch", CK_PanelStartSearch},
{"PanelSyncOtherPanel", CK_PanelSyncOtherPanel},
{"PanelToggleSortOrderNext", CK_PanelToggleSortOrderNext},
{"PanelToggleSortOrderPrev", CK_PanelToggleSortOrderPrev},
{"PanelSelectSortOrder", CK_PanelSelectSortOrder},
{"PanelReverseSort", CK_PanelReverseSort},
{"PanelSortOrderByName", CK_PanelSortOrderByName},
{"PanelSortOrderByExt", CK_PanelSortOrderByExt},
{"PanelSortOrderBySize", CK_PanelSortOrderBySize},
{"PanelSortOrderByMTime", CK_PanelSortOrderByMTime},
{"PanelSmartGotoParentDir", CK_PanelSmartGotoParentDir},
/* dialog */ /* dialog */
{"DialogOK", CK_DialogOK}, {"Ok", CK_Ok},
{"DialogCancel", CK_DialogCancel}, {"Cancel", CK_Cancel},
{"DialogPrevItem", CK_DialogPrevItem},
{"DialogNextItem", CK_DialogNextItem},
{"DialogHelp", CK_DialogHelp},
{"DialogSuspend", CK_DialogSuspend},
{"DialogRefresh", CK_DialogRefresh},
/* input line */ /* input line */
{"InputBol", CK_InputBol}, {"Yank", CK_Yank},
{"InputEol", CK_InputEol},
{"InputMoveLeft", CK_InputMoveLeft},
{"InputWordLeft", CK_InputWordLeft},
{"InputBackwardChar", CK_InputBackwardChar},
{"InputBackwardWord", CK_InputBackwardWord},
{"InputMoveRight", CK_InputMoveRight},
{"InputWordRight", CK_InputWordRight},
{"InputForwardChar", CK_InputForwardChar},
{"InputForwardWord", CK_InputForwardWord},
{"InputBackwardDelete", CK_InputBackwardDelete},
{"InputDeleteChar", CK_InputDeleteChar},
{"InputKillWord", CK_InputKillWord},
{"InputBackwardKillWord", CK_InputBackwardKillWord},
{"InputSetMark", CK_InputSetMark},
{"InputKillRegion", CK_InputKillRegion},
{"InputYank", CK_InputYank},
{"InputKillLine", CK_InputKillLine},
{"InputHistoryPrev", CK_InputHistoryPrev},
{"InputHistoryNext", CK_InputHistoryNext},
{"InputHistoryShow", CK_InputHistoryShow},
{"InputComplete", CK_InputComplete},
{"InputXStore", CK_InputKillSave},
{"InputXPaste", CK_InputPaste},
{"InputClearLine", CK_InputClearLine},
{"InputLeftHighlight", CK_InputLeftHighlight},
{"InputRightHighlight", CK_InputRightHighlight},
{"InputWordLeftHighlight", CK_InputWordLeftHighlight},
{"InputWordRightHighlight", CK_InputWordRightHighlight},
{"InputBolHighlight", CK_InputBolHighlight},
{"InputEolHighlight", CK_InputEolHighlight},
/* listbox */
{"ListboxMoveUp", CK_ListboxMoveUp},
{"ListboxMoveDown", CK_ListboxMoveDown},
{"ListboxMoveHome", CK_ListboxMoveHome},
{"ListboxMoveEnd", CK_ListboxMoveEnd},
{"ListboxMovePgUp", CK_ListboxMovePgUp},
{"ListboxMovePgDn", CK_ListboxMovePgDn},
{"ListboxDeleteItem", CK_ListboxDeleteItem},
{"ListboxDeleteAll", CK_ListboxDeleteAll},
/* help */ /* help */
{"HelpHelp", CK_HelpHelp}, {"Index", CK_Index},
{"HelpIndex", CK_HelpIndex}, {"Back", CK_Back},
{"HelpBack", CK_HelpBack}, {"LinkNext", CK_LinkNext},
{"HelpQuit", CK_HelpQuit}, {"LinkPrev", CK_LinkPrev},
{"HelpMoveUp", CK_HelpMoveUp}, {"NodeNext", CK_NodeNext},
{"HelpMoveDown", CK_HelpMoveDown}, {"NodePrev", CK_NodePrev},
{"HelpMovePgDn", CK_HelpMovePgDn},
{"HelpMovePgUp", CK_HelpMovePgUp},
{"HelpMoveHalfPgDn", CK_HelpMoveHalfPgDn},
{"HelpMoveHalfPgUp", CK_HelpMoveHalfPgUp},
{"HelpMoveTop", CK_HelpMoveTop},
{"HelpMoveBottom", CK_HelpMoveBottom},
{"HelpSelectLink", CK_HelpSelectLink},
{"HelpNextLink", CK_HelpNextLink},
{"HelpPrevLink", CK_HelpPrevLink},
{"HelpNextNode", CK_HelpNextNode},
{"HelpPrevNode", CK_HelpPrevNode},
/* tree */ /* tree */
{"TreeHelp", CK_TreeHelp}, {"Forget", CK_Forget},
{"TreeForget", CK_TreeForget},
{"TreeToggleNav", CK_TreeToggleNav}, #if defined (USE_INTERNAL_EDIT) || defined (USE_DIFF_VIEW)
{"TreeCopy", CK_TreeCopy}, {"ShowNumbers", CK_ShowNumbers},
{"TreeMove", CK_TreeMove}, #endif
{"TreeMake", CK_TreeMake},
{"TreeMoveUp", CK_TreeMoveUp},
{"TreeMoveDown", CK_TreeMoveDown},
{"TreeMoveLeft", CK_TreeMoveLeft},
{"TreeMoveRight", CK_TreeMoveRight},
{"TreeMoveHome", CK_TreeMoveHome},
{"TreeMoveEnd", CK_TreeMoveEnd},
{"TreeMovePgUp", CK_TreeMovePgUp},
{"TreeMovePgDn", CK_TreeMovePgDn},
{"TreeOpen", CK_TreeOpen},
{"TreeRescan", CK_TreeRescan},
{"TreeStartSearch", CK_TreeStartSearch},
{"TreeRemove", CK_TreeRemove},
#ifdef USE_INTERNAL_EDIT #ifdef USE_INTERNAL_EDIT
{"EditNoCommand", CK_Ignore_Key}, {"Tab", CK_Tab},
{"EditIgnoreKey", CK_Ignore_Key}, {"ScrollUp", CK_ScrollUp},
{"EditBackSpace", CK_BackSpace}, {"ScrollDown", CK_ScrollDown},
{"EditDelete", CK_Delete}, {"Return", CK_Return},
{"EditEnter", CK_Enter}, {"ParagraphUp", CK_ParagraphUp},
{"EditPageUp", CK_Page_Up}, {"ParagraphDown", CK_ParagraphDown},
{"EditPageDown", CK_Page_Down}, {"EditFile", CK_EditFile},
{"EditLeft", CK_Left}, {"MarkWord", CK_MarkWord},
{"EditRight", CK_Right}, {"MarkLine", CK_MarkLine},
{"EditWordLeft", CK_Word_Left}, {"MarkAll", CK_MarkAll},
{"EditWordRight", CK_Word_Right}, {"Unmark", CK_Unmark},
{"EditUp", CK_Up}, {"MarkColumn", CK_MarkColumn},
{"EditDown", CK_Down}, {"BlockSave", CK_BlockSave},
{"EditHome", CK_Home}, {"InsertFile", CK_InsertFile},
{"EditEnd", CK_End}, {"InsertOverwrite", CK_InsertOverwrite},
{"EditTab", CK_Tab}, {"Date", CK_Date},
{"EditUndo", CK_Undo}, {"DeleteLine", CK_DeleteLine},
{"EditRedo", CK_Redo}, {"DeleteToHome", CK_DeleteToHome},
{"EditBeginningOfText", CK_Beginning_Of_Text}, {"DeleteToEnd", CK_DeleteToEnd},
{"EditEndOfText", CK_End_Of_Text},
{"EditScrollUp", CK_Scroll_Up},
{"EditScrollDown", CK_Scroll_Down},
{"EditReturn", CK_Return},
{"EditBeginPage", CK_Begin_Page},
{"EditEndPage", CK_End_Page},
{"EditDeleteWordLeft", CK_Delete_Word_Left},
{"EditDeleteWordRight", CK_Delete_Word_Right},
{"EditParagraphUp", CK_Paragraph_Up},
{"EditParagraphDown", CK_Paragraph_Down},
{"EditMenu", CK_Menu},
{"EditSave", CK_Save},
{"EditLoad", CK_Load},
{"EditNew", CK_New},
{"EditSaveas", CK_Save_As},
{"EditMark", CK_Mark},
{"EditCopy", CK_Copy},
{"EditMove", CK_Move},
{"EditRemove", CK_Remove},
{"EditMarkAll", CK_Mark_All},
{"EditUnmark", CK_Unmark},
{"EditMarkWord", CK_Mark_Word},
{"EditMarkLine", CK_Mark_Line},
{"EditSaveBlock", CK_Save_Block},
{"EditColumnMark", CK_Column_Mark},
{"EditFind", CK_Find},
{"EditFindAgain", CK_Find_Again},
{"EditReplace", CK_Replace},
{"EditReplaceAgain", CK_Replace_Again},
{"EditCompleteWord", CK_Complete_Word},
#if 0
{"EditDebugStart", CK_Debug_Start},
{"EditDebugStop", CK_Debug_Stop},
{"EditDebugToggleBreak", CK_Debug_Toggle_Break},
{"EditDebugClear", CK_Debug_Clear},
{"EditDebugNext", CK_Debug_Next},
{"EditDebugStep", CK_Debug_Step},
{"EditDebugBackTrace", CK_Debug_Back_Trace},
{"EditDebugContinue", CK_Debug_Continue},
{"EditDebugEnterCommand", CK_Debug_Enter_Command},
{"EditDebugUntilCurser", CK_Debug_Until_Curser},
#endif
{"EditInsertFile", CK_Insert_File},
{"EditQuit", CK_Quit},
{"EditToggleInsert", CK_Toggle_Insert},
{"EditHelp", CK_Help},
{"EditDate", CK_Date},
{"EditRefresh", CK_Refresh},
{"EditGoto", CK_Goto},
{"EditDeleteLine", CK_Delete_Line},
{"EditDeleteToLineEnd", CK_Delete_To_Line_End},
{"EditDeleteToLineBegin", CK_Delete_To_Line_Begin},
{"EditManPage", CK_Man_Page},
{"EditSort", CK_Sort},
{"EditMail", CK_Mail}, {"EditMail", CK_Mail},
{"EditCancel", CK_Cancel}, {"ParagraphFormat", CK_ParagraphFormat},
{"EditComplete", CK_Complete}, {"MatchBracket", CK_MatchBracket},
{"EditParagraphFormat", CK_Paragraph_Format}, {"ExternalCommand", CK_ExternalCommand},
{"EditUtil", CK_Util}, {"MacroStartRecord", CK_MacroStartRecord},
{"EditTypeLoadPython", CK_Type_Load_Python}, {"MacroStopRecord", CK_MacroStopRecord},
{"EditFindFile", CK_Find_File}, {"MacroStartStopRecord", CK_MacroStartStopRecord},
{"EditCtags", CK_Ctags}, {"MacroDelete", CK_MacroDelete},
{"EditMatchBracket", CK_Match_Bracket}, {"RepeatStartStopRecord", CK_RepeatStartStopRecord},
{"EditTerminal", CK_Terminal}, {"BookmarkFlush", CK_BookmarkFlush},
{"EditTerminalApp", CK_Terminal_App}, {"BookmarkNext", CK_BookmarkNext},
{"EditExtCmd", CK_ExtCmd}, {"BookmarkPrev", CK_BookmarkPrev},
{"EditUserMenu", CK_User_Menu}, {"MarkPageUp", CK_MarkPageUp},
{"EditBeginRecordMacro", CK_Begin_Record_Macro}, {"MarkPageDown", CK_MarkPageDown},
{"EditEndRecordMacro", CK_End_Record_Macro}, {"MarkToFileBegin", CK_MarkToFileBegin},
{"EditBeginEndRepeat", CK_Begin_End_Repeat}, {"MarkToFileEnd", CK_MarkToFileEnd},
{"EditDeleteMacro", CK_Delete_Macro}, {"MarkToPageBegin", CK_MarkToPageBegin},
{"EditToggleBookmark", CK_Toggle_Bookmark}, {"MarkToPageEnd", CK_MarkToPageEnd},
{"EditFlushBookmarks", CK_Flush_Bookmarks}, {"MarkScrollUp", CK_MarkScrollUp},
{"EditNextBookmark", CK_Next_Bookmark}, {"MarkScrollDown", CK_MarkScrollDown},
{"EditPrevBookmark", CK_Prev_Bookmark}, {"MarkParagraphUp", CK_MarkParagraphUp},
{"EditPageUpHighlight", CK_Page_Up_Highlight}, {"MarkParagraphDown", CK_MarkParagraphDown},
{"EditPageDownHighlight", CK_Page_Down_Highlight}, {"MarkColumnPageUp", CK_MarkColumnPageUp},
{"EditLeftHighlight", CK_Left_Highlight}, {"MarkColumnPageDown", CK_MarkColumnPageDown},
{"EditRightHighlight", CK_Right_Highlight}, {"MarkColumnLeft", CK_MarkColumnLeft},
{"EditWordLeftHighlight", CK_Word_Left_Highlight}, {"MarkColumnRight", CK_MarkColumnRight},
{"EditWordRightHighlight", CK_Word_Right_Highlight}, {"MarkColumnUp", CK_MarkColumnUp},
{"EditUpHighlight", CK_Up_Highlight}, {"MarkColumnDown", CK_MarkColumnDown},
{"EditDownHighlight", CK_Down_Highlight}, {"MarkColumnScrollUp", CK_MarkColumnScrollUp},
{"EditHomeHighlight", CK_Home_Highlight}, {"MarkColumnScrollDown", CK_MarkColumnScrollDown},
{"EditEndHighlight", CK_End_Highlight}, {"MarkColumnParagraphUp", CK_MarkColumnParagraphUp},
{"EditBeginningOfTextHighlight", CK_Beginning_Of_Text_Highlight}, {"MarkColumnParagraphDown", CK_MarkColumnParagraphDown},
{"EditEndOfTextHighlight", CK_End_Of_Text_Highlight}, {"BlockShiftLeft", CK_BlockShiftLeft},
{"EditBeginPageHighlight", CK_Begin_Page_Highlight}, {"BlockShiftRight", CK_BlockShiftRight},
{"EditEndPageHighlight", CK_End_Page_Highlight}, {"InsertLiteral", CK_InsertLiteral},
{"EditScrollUpHighlight", CK_Scroll_Up_Highlight}, {"ShowTabTws", CK_ShowTabTws},
{"EditScrollDownHighlight", CK_Scroll_Down_Highlight}, {"SyntaxOnOff", CK_SyntaxOnOff},
{"EditParagraphUpHighlight", CK_Paragraph_Up_Highlight}, {"SyntaxChoose", CK_SyntaxChoose},
{"EditParagraphDownHighlight", CK_Paragraph_Down_Highlight}, {"ShowMargin", CK_ShowMargin},
{"EditPageUpAltHighlight", CK_Page_Up_Alt_Highlight}, {"OptionsSaveMode", CK_OptionsSaveMode},
{"EditPageDownAltHighlight", CK_Page_Down_Alt_Highlight}, {"About", CK_About},
{"EditLeftAltHighlight", CK_Left_Alt_Highlight},
{"EditRightAltHighlight", CK_Right_Alt_Highlight},
{"EditWordLeftAltHighlight", CK_Word_Left_Alt_Highlight},
{"EditWordRightAltHighlight", CK_Word_Right_Alt_Highlight},
{"EditUpAltHighlight", CK_Up_Alt_Highlight},
{"EditDownAltHighlight", CK_Down_Alt_Highlight},
{"EditHomeAltHighlight", CK_Home_Alt_Highlight},
{"EditEndAltHighlight", CK_End_Alt_Highlight},
{"EditBeginningOfTextAltHighlight", CK_Beginning_Of_Text_Alt_Highlight},
{"EditEndOfTextAltHighlight", CK_End_Of_Text_Alt_Highlight},
{"EditBeginPageAltHighlight", CK_Begin_Page_Alt_Highlight},
{"EditEndPageAltHighlight", CK_End_Page_Alt_Highlight},
{"EditScrollUpAltHighlight", CK_Scroll_Up_Alt_Highlight},
{"EditScrollDownAltHighlight", CK_Scroll_Down_Alt_Highlight},
{"EditParagraphUpAltHighlight", CK_Paragraph_Up_Alt_Highlight},
{"EditParagraphDownAltHighlight", CK_Paragraph_Down_Alt_Highlight},
{"EditShiftBlockLeft", CK_Shift_Block_Left},
{"EditShiftBlockRight", CK_Shift_Block_Right},
{"EditXStore", CK_XStore},
{"EditXCut", CK_XCut},
{"EditXPaste", CK_XPaste},
{"EditSelectionHistory", CK_Selection_History},
{"EditShell", CK_Shell},
{"EditInsertLiteral", CK_Insert_Literal},
{"EditBeginOrEndMacro", CK_Begin_End_Macro},
{"EditExtMode", CK_Ext_Mode},
{"EditToggleLineState", CK_Toggle_Line_State},
{"EditToggleTabTWS", CK_Toggle_Tab_TWS},
{"EditToggleSyntax", CK_Toggle_Syntax},
{"EditToggleShowMargin", CK_Toggle_Show_Margin},
{"EditFindDefinition", CK_Find_Definition},
{"EditLoadPrevFile", CK_Load_Prev_File},
{"EditLoadNextFile", CK_Load_Next_File},
{"EditOptions", CK_Edit_Options},
{"EditSaveMode", CK_Edit_Save_Mode},
{"EditChooseSyntax", CK_Choose_Syntax},
{"EditAbout", CK_About},
#if 0
{"EditFocusNext", CK_Focus_Next},
{"EditFocusPrev", CK_Focus_Prev},
{"EditHeightInc", CK_Height_Inc},
{"EditHeightDec", CK_Height_Dec},
{"EditMake", CK_Make},
{"EditErrorNext", CK_Error_Next},
{"EditErrorPrev", CK_Error_Prev},
{"EditSaveDesktop", CK_Save_Desktop},
{"EditNewWindow", CK_New_Window},
{"EditCycle", CK_Cycle},
{"EditSaveAndQuit", CK_Save_And_Quit},
{"EditRunAnother", CK_Run_Another},
{"EditCheckSaveAndQuit", CK_Check_Save_And_Quit},
{"EditMaximize", CK_Maximize},
#endif
#endif /* USE_INTERNAL_EDIT */ #endif /* USE_INTERNAL_EDIT */
/* viewer */ /* viewer */
{"ViewHelp", CK_ViewHelp}, {"WrapMode", CK_WrapMode},
{"ViewToggleWrapMode", CK_ViewToggleWrapMode}, {"HexEditMode", CK_HexEditMode},
{"ViewToggleHexEditMode", CK_ViewToggleHexEditMode}, {"HexMode", CK_HexMode},
{"ViewQuit", CK_ViewQuit}, {"MagicMode", CK_MagicMode},
{"ViewToggleHexMode", CK_ViewToggleHexMode}, {"NroffMode", CK_NroffMode},
{"ViewGoto", CK_ViewGoto}, {"BookmarkGoto", CK_BookmarkGoto},
{"ViewHexEditSave", CK_ViewHexEditSave}, {"Ruler", CK_Ruler},
{"ViewSearch", CK_ViewSearch},
{"ViewToggleMagicMode", CK_ViewToggleMagicMode},
{"ViewToggleNroffMode", CK_ViewToggleNroffMode},
{"ViewContinueSearch", CK_ViewContinueSearch},
{"ViewGotoBookmark", CK_ViewGotoBookmark},
{"ViewNewBookmark", CK_ViewNewBookmark},
{"ViewMoveUp", CK_ViewMoveUp},
{"ViewMoveDown", CK_ViewMoveDown},
{"ViewMoveLeft", CK_ViewMoveLeft},
{"ViewMoveRight", CK_ViewMoveRight},
{"ViewMoveLeft10", CK_ViewMoveLeft10},
{"ViewMoveRight10", CK_ViewMoveRight10},
{"ViewMovePgDn", CK_ViewMovePgDn},
{"ViewMovePgUp", CK_ViewMovePgUp},
{"ViewMoveHalfPgDn", CK_ViewMoveHalfPgDn},
{"ViewMoveHalfPgUp", CK_ViewMoveHalfPgUp},
{"ViewMoveToBol", CK_ViewMoveToBol},
{"ViewMoveToEol", CK_ViewMoveToEol},
{"ViewMoveTop", CK_ViewMoveTop},
{"ViewMoveBottom", CK_ViewMoveBottom},
{"ViewNextFile", CK_ViewNextFile},
{"ViewPrevFile", CK_ViewPrevFile},
{"ViewToggleRuler", CK_ViewToggleRuler},
{"ViewToggleHexNavMode", CK_ViewToggleHexNavMode},
#ifdef USE_DIFF_VIEW #ifdef USE_DIFF_VIEW
/* diff viewer */ /* diff viewer */
{"DiffDisplaySymbols", CK_DiffDisplaySymbols}, {"ShowSymbols", CK_ShowSymbols},
{"DiffDisplayNumbers", CK_DiffDisplayNumbers}, {"SplitFull", CK_SplitFull},
{"DiffFull", CK_DiffFull}, {"SplitEqual", CK_SplitEqual},
{"DiffEqual", CK_DiffEqual}, {"SplitMore", CK_SplitMore},
{"DiffSplitMore", CK_DiffSplitMore}, {"SplitLess", CK_SplitLess},
{"DiffSplitLess", CK_DiffSplitLess}, {"Tab2", CK_Tab2},
{"DiffShowDiff", CK_DiffShowDiff}, {"Tab3", CK_Tab3},
{"DiffSetTab2", CK_DiffSetTab2}, {"Tab4", CK_Tab4},
{"DiffSetTab3", CK_DiffSetTab3}, {"Tab8", CK_Tab8},
{"DiffSetTab4", CK_DiffSetTab4}, {"HunkNext", CK_HunkNext},
{"DiffSetTab8", CK_DiffSetTab8}, {"HunkPrev", CK_HunkPrev},
{"DiffSwapPanel", CK_DiffSwapPanel}, {"EditOther", CK_EditOther},
{"DiffRedo", CK_DiffRedo}, {"Merge", CK_Merge},
{"DiffNextHunk", CK_DiffNextHunk},
{"DiffPrevHunk", CK_DiffPrevHunk},
{"DiffGoto", CK_DiffGoto},
{"DiffEditCurrent", CK_DiffEditCurrent},
{"DiffEditOther", CK_DiffEditOther},
{"DiffSearch", CK_DiffSearch},
{"DiffContinueSearch", CK_DiffContinueSearch},
{"DiffEOF", CK_DiffEOF},
{"DiffBOF", CK_DiffBOF},
{"DiffDown", CK_DiffDown},
{"DiffUp", CK_DiffUp},
{"DiffQuickLeft", CK_DiffQuickLeft},
{"DiffQuickRight", CK_DiffQuickRight},
{"DiffLeft", CK_DiffLeft},
{"DiffRight", CK_DiffRight},
{"DiffPageDown", CK_DiffPageDown},
{"DiffPageUp", CK_DiffPageUp},
{"DiffHome", CK_DiffHome},
{"DiffEnd", CK_DiffEnd},
{"DiffQuit", CK_DiffQuit},
{"DiffHelp", CK_DiffHelp},
{"DiffMergeCurrentHunk", CK_DiffMergeCurrentHunk},
{"DiffSave", CK_DiffSave},
{"DiffOptions", CK_DiffOptions},
#endif /* USE_DIFF_VIEW */ #endif /* USE_DIFF_VIEW */
{NULL, CK_Ignore_Key} {NULL, CK_Ignore_Key}

View File

@ -15,481 +15,289 @@
#define CK_Ignore_Key 0 #define CK_Ignore_Key 0
/* common */ /* common */
#define CK_Enter 3
#define CK_Up 10
#define CK_Down 11
#define CK_Left 6
#define CK_Right 7
#define CK_Home 12
#define CK_End 13
#define CK_LeftQuick 9027
#define CK_RightQuick 9028
#define CK_PageUp 4
#define CK_PageDown 5
#define CK_HalfPageUp 1015
#define CK_HalfPageDown 1014
#define CK_Top 17
#define CK_Bottom 18
#define CK_TopOnScreen 8019
#define CK_MiddleOnScreen 8018
#define CK_BottomOnScreen 8017
#define CK_WordLeft 8
#define CK_WordRight 9
#define CK_Copy 202
#define CK_Move 203
#define CK_Delete 2
#define CK_MakeDir 7045
#define CK_ChangeMode 7003
#define CK_ChangeOwn 7005
#define CK_ChangeOwnAdvanced 7004
#define CK_Remove 204
#define CK_BackSpace 1
#define CK_Redo 16
#define CK_Clear 4026
#define CK_Menu 123
#define CK_MenuLastSelected 7044
#define CK_UserMenu 425
#define CK_EditUserMenu 7026
#define CK_Search 8032
#define CK_SearchContinue 5011
#define CK_Replace 303
#define CK_ReplaceContinue 304
#define CK_SearchStop 8033
#define CK_Help 404
#define CK_Edit 7020
#define CK_Shell 801
#ifdef HAVE_CHARSET
#define CK_SelectCodepage 2002 #define CK_SelectCodepage 2002
#define CK_ShowCommandLine 2001 #endif
#define CK_StartExtMap1 2021 #define CK_History 4021
#define CK_StartExtMap2 2022 #define CK_HistoryNext 4022
#define CK_HistoryPrev 4023
#define CK_Complete 305
#define CK_SaveAs 104
#define CK_Goto 407
#define CK_Reread 7053
#define CK_Refresh 406
#define CK_Suspend 7060
#define CK_Swap 7061
#define CK_HotList 7048
#define CK_ScreenList 7079
#define CK_ScreenNext 7080
#define CK_ScreenPrev 7081
#define CK_FilePrev 111
#define CK_FileNext 112
#define CK_DeleteToWordBegin 24
#define CK_DeleteToWordEnd 25
#define CK_ShowNumbers 490
#define CK_Store 701
#define CK_Cut 702
#define CK_Paste 703
#define CK_Mark 201
#define CK_MarkLeft 606
#define CK_MarkRight 607
#define CK_MarkUp 8021
#define CK_MarkDown 8022
#define CK_MarkToWordBegin 608
#define CK_MarkToWordEnd 609
#define CK_MarkToHome 612
#define CK_MarkToEnd 613
#define CK_ToggleNavigation 5027
#define CK_Sort 412
#define CK_Options 7007
#define CK_LearnKeys 7037
#define CK_Bookmark 5013
#define CK_Quit 402
#define CK_QuitQuiet 7050
/* C-x or similar */
#define CK_ExtendedKeyMap 820
/* main commands */ /* main commands */
#define CK_AddHotlist 7001 #ifdef USE_INTERNAL_EDIT
#define CK_ChangeListingCmd 7002 #define CK_EditForceInternal 7082
#define CK_ChmodCmd 7003 #endif
#define CK_ChownAdvancedCmd 7004 #define CK_View 7071
#define CK_ChownCmd 7005 #define CK_ViewRaw 8011
#define CK_CompareDirsCmd 7006 #define CK_ViewFile 7072
#define CK_ConfigureBox 7007 #define CK_ViewFiltered 7029
#define CK_ConfigureVfs 7008 #define CK_Find 419
#define CK_ConfirmBox 7009 #define CK_DirSize 7058
#define CK_CopyCmd 7010 #define CK_HotListAdd 7001
#define CK_CopyCurrentPathname 7011 #define CK_PanelListingChange 7002
#define CK_CopyCurrentReadlink 7012 #define CK_CompareDirs 7006
#define CK_CopyCurrentTagged 7013 #define CK_OptionsVfs 7008
#define CK_CopyOtherPathname 7014 #define CK_OptionsConfirm 7009
#define CK_CopyOtherReadlink 7015 #define CK_PutCurrentLink 7012
#define CK_CopyOtherTagged 7016 #define CK_PutOtherLink 7015
#define CK_DeleteCmd 7017 #define CK_OptionsDisplayBits 7019
#define CK_DirsizesCmd 7018 #define CK_EditExtensionsFile 7021
#define CK_DisplayBitsBox 7019 #define CK_EditFileHighlightFile 7022
#define CK_EditCmd 7020 #define CK_LinkSymbolicEdit 7024
#define CK_EditExtFileCmd 7021
#define CK_EditFhlFileCmd 7022
#define CK_EditMcMenuCmd 7023
#define CK_EditSymlinkCmd 7024
#define CK_EditSyntaxCmd 7025
#define CK_EditUserMenuCmd 7026
#define CK_ExternalPanelize 7027 #define CK_ExternalPanelize 7027
#define CK_FilterCmd 7028 #define CK_Filter 7028
#define CK_FilteredViewCmd 7029 #define CK_ConnectFish 7031
#define CK_FindCmd 7030 #define CK_ConnectFtp 7032
#define CK_FishlinkCmd 7031 #define CK_ConnectSmb 7059
#define CK_FtplinkCmd 7032 #define CK_PanelInfo 7034
#define CK_HistoryCmd 7033 #define CK_Jobs 7035
#define CK_InfoCmd 7034 #define CK_OptionsLayout 7036
#define CK_JobsCmd 7035 #define CK_Link 7038
#define CK_LayoutBox 7036 #define CK_PanelListing 7039
#define CK_LearnKeys 7037 #define CK_ListMode 7042
#define CK_LinkCmd 7038 #define CK_CdQuick 7047
#define CK_ListingCmd 7039 #define CK_PanelQuickView 7049
#define CK_ListmodeCmd 7042 #define CK_VfsList 7054
#define CK_MenuLastSelectedCmd 7044 #define CK_SaveSetup 7056
#define CK_MkdirCmd 7045 #define CK_LinkSymbolic 7062
#define CK_QuickCdCmd 7047 #define CK_PanelListingSwitch 7063
#define CK_QuickChdirCmd 7048 #define CK_ShowHidden 7064
#define CK_QuickViewCmd 7049 #define CK_PanelTree 7065
#define CK_QuietQuitCmd 7050 #define CK_Tree 7066
#define CK_QuitCmd 7051 #define CK_Undelete 7067
#define CK_RenameCmd 7052 #define CK_SplitVertHoriz 7075
#define CK_RereadCmd 7053 #ifdef USE_DIFF_VIEW
#define CK_ReselectVfs 7054 #define CK_CompareFiles 7076
#define CK_ReverseSelectionCmd 7055 #endif /* USE_DIFF_VIEW */
#define CK_SaveSetupCmd 7056 #define CK_OptionsPanel 7077
#define CK_SelectCmd 7057 #define CK_LinkSymbolicRelative 7078
#define CK_SingleDirsizeCmd 7058 #define CK_PutCurrentPath 7011
#define CK_SmblinkCmd 7059 #define CK_PutOtherPath 7014
#define CK_SuspendCmd 7060 #define CK_PutCurrentTagged 7013
#define CK_SwapCmd 7061 #define CK_PutOtherTagged 7016
#define CK_SymlinkCmd 7062 #define CK_Select 7057
#define CK_ToggleListingCmd 7063 #define CK_Unselect 7068
#define CK_ToggleShowHidden 7064 #define CK_SelectInvert 7055
#define CK_TreeCmd 7065
#define CK_TreeBoxCmd 7066
#define CK_UndeleteCmd 7067
#define CK_UnselectCmd 7068
#define CK_UserFileMenuCmd 7069
#define CK_UserMenuCmd 7070
#define CK_ViewCmd 7071
#define CK_ViewFileCmd 7072
#define CK_HelpCmd 7073
#define CK_MenuCmd 7074
#define CK_TogglePanelsSplit 7075
#define CK_DiffViewCmd 7076
#define CK_PanelOptionsBox 7077
#define CK_RelativeSymlinkCmd 7078
#define CK_DialogListCmd 7079
#define CK_DialogNextCmd 7080
#define CK_DialogPrevCmd 7081
#define CK_EditForceInternalCmd 7082
/* panels */ /* panels */
#define CK_PanelChdirOtherPanel 8001 #define CK_PanelOtherCd 8001
#define CK_PanelChdirToReadlink 8002 #define CK_PanelOtherCdLink 8002
#define CK_PanelCmdCopyLocal 8003 #define CK_CopySingle 8003
#define CK_PanelCmdDeleteLocal 8004 #define CK_MoveSingle 8007
#define CK_PanelCmdDoEnter 8005 #define CK_DeleteSingle 8004
#define CK_PanelCmdEditNew 8006 #define CK_CdChild 8012
#define CK_PanelCmdRenameLocal 8007 #define CK_CdParent 8013
#define CK_PanelCmdReverseSelection 8008 #define CK_CdParentSmart 8043
#define CK_PanelCmdSelect 8009 #define CK_PanelOtherSync 8034
#define CK_PanelCmdUnselect 8010 #define CK_SortNext 8035
#define CK_PanelCmdViewSimple 8011 #define CK_SortPrev 8036
#define CK_PanelGotoChildDir 8012 #define CK_SortReverse 8038
#define CK_PanelGotoParentDir 8013 #define CK_SortByName 8039
#define CK_PanelDirectoryHistoryList 8014 #define CK_SortByExt 8040
#define CK_PanelDirectoryHistoryNext 8015 #define CK_SortBySize 8041
#define CK_PanelDirectoryHistoryPrev 8016 #define CK_SortByMTime 8042
#define CK_PanelGotoBottomFile 8017
#define CK_PanelGotoMiddleFile 8018
#define CK_PanelGotoTopFile 8019
#define CK_PanelMarkFile 8020
#define CK_PanelMarkFileUp 8021
#define CK_PanelMarkFileDown 8022
#define CK_PanelMoveDown 8023
#define CK_PanelMoveEnd 8024
#define CK_PanelMoveHome 8025
#define CK_PanelMoveUp 8026
#define CK_PanelMoveLeft 8027
#define CK_PanelMoveRight 8028
#define CK_PanelNextPage 8029
#define CK_PanelPrevPage 8030
#define CK_PanelSetPanelEncoding 8031
#define CK_PanelStartSearch 8032
#define CK_PanelStopSearch 8033
#define CK_PanelSyncOtherPanel 8034
#define CK_PanelToggleSortOrderNext 8035
#define CK_PanelToggleSortOrderPrev 8036
#define CK_PanelSelectSortOrder 8037
#define CK_PanelReverseSort 8038
#define CK_PanelSortOrderByName 8039
#define CK_PanelSortOrderByExt 8040
#define CK_PanelSortOrderBySize 8041
#define CK_PanelSortOrderByMTime 8042
#define CK_PanelSmartGotoParentDir 8043
/* dialog */ /* dialog */
#define CK_DialogOK 3001 #define CK_Ok 3001
#define CK_DialogCancel 3002 #define CK_Cancel 3002
#define CK_DialogPrevItem 3003
#define CK_DialogNextItem 3004
#define CK_DialogHelp 3005
#define CK_DialogSuspend 3006
#define CK_DialogRefresh 3007
/* input */ /* input */
#define CK_InputBol 4001 #define CK_Yank 4018
#define CK_InputEol 4002
#define CK_InputMoveLeft 4003
#define CK_InputWordLeft 4004
#define CK_InputBackwardChar 4005
#define CK_InputBackwardWord 4006
#define CK_InputMoveRight 4007
#define CK_InputWordRight 4008
#define CK_InputForwardChar 4009
#define CK_InputForwardWord 4010
#define CK_InputBackwardDelete 4011
#define CK_InputDeleteChar 4012
#define CK_InputKillWord 4013
#define CK_InputBackwardKillWord 4014
#define CK_InputSetMark 4015
#define CK_InputKillRegion 4016
#define CK_InputKillSave 4017
#define CK_InputYank 4018
#define CK_InputCopyRegion 4019
#define CK_InputKillLine 4020
#define CK_InputHistoryPrev 4021
#define CK_InputHistoryNext 4022
#define CK_InputHistoryShow 4023
#define CK_InputComplete 4024
#define CK_InputPaste 4025
#define CK_InputClearLine 4026
#define CK_InputLeftHighlight 4027
#define CK_InputRightHighlight 4028
#define CK_InputWordLeftHighlight 4029
#define CK_InputWordRightHighlight 4030
#define CK_InputBolHighlight 4031
#define CK_InputEolHighlight 4032
/* listbox */
#define CK_ListboxMoveUp 4500
#define CK_ListboxMoveDown 4501
#define CK_ListboxMoveHome 4502
#define CK_ListboxMoveEnd 4503
#define CK_ListboxMovePgUp 4504
#define CK_ListboxMovePgDn 4505
#define CK_ListboxDeleteItem 4506
#define CK_ListboxDeleteAll 4507
/* help */ /* help */
#define CK_HelpHelp 1001 #define CK_Index 1002
#define CK_HelpIndex 1002 #define CK_Back 1003
#define CK_HelpBack 1003 #define CK_LinkNext 1008
#define CK_HelpQuit 1004 #define CK_LinkPrev 1009
#define CK_HelpMoveUp 1005 #define CK_NodeNext 1010
#define CK_HelpMoveDown 1006 #define CK_NodePrev 1011
#define CK_HelpSelectLink 1007
#define CK_HelpNextLink 1008
#define CK_HelpPrevLink 1009
#define CK_HelpNextNode 1010
#define CK_HelpPrevNode 1011
#define CK_HelpMovePgDn 1012
#define CK_HelpMovePgUp 1013
#define CK_HelpMoveHalfPgDn 1014
#define CK_HelpMoveHalfPgUp 1015
#define CK_HelpMoveTop 1016
#define CK_HelpMoveBottom 1017
/* tree */ /* tree */
#define CK_TreeHelp 6001 #define CK_Forget 6003
#define CK_TreeForget 6003
#define CK_TreeToggleNav 6004
#define CK_TreeCopy 6005
#define CK_TreeMove 6006
#define CK_TreeMake 6007
#define CK_TreeMoveUp 6011
#define CK_TreeMoveDown 6012
#define CK_TreeMoveLeft 6013
#define CK_TreeMoveRight 6014
#define CK_TreeMoveHome 6015
#define CK_TreeMoveEnd 6016
#define CK_TreeMovePgUp 6017
#define CK_TreeMovePgDn 6018
#define CK_TreeOpen 6019
#define CK_TreeRescan 6020
#define CK_TreeStartSearch 6021
#define CK_TreeRemove 6022
#ifdef USE_INTERNAL_EDIT #ifdef USE_INTERNAL_EDIT
/* cursor movements */ /* cursor movements */
#define CK_BackSpace 1
#define CK_Delete 2
#define CK_Enter 3
#define CK_Page_Up 4
#define CK_Page_Down 5
#define CK_Left 6
#define CK_Right 7
#define CK_Word_Left 8
#define CK_Word_Right 9
#define CK_Up 10
#define CK_Down 11
#define CK_Home 12
#define CK_End 13
#define CK_Tab 14 #define CK_Tab 14
#define CK_Undo 15 #define CK_Undo 15
#define CK_Redo 16 #define CK_ScrollUp 19
#define CK_Beginning_Of_Text 17 #define CK_ScrollDown 20
#define CK_End_Of_Text 18
#define CK_Scroll_Up 19
#define CK_Scroll_Down 20
#define CK_Return 21 #define CK_Return 21
#define CK_Begin_Page 22 #define CK_ParagraphUp 26
#define CK_End_Page 23 #define CK_ParagraphDown 27
#define CK_Delete_Word_Left 24
#define CK_Delete_Word_Right 25
#define CK_Paragraph_Up 26
#define CK_Paragraph_Down 27
/* file commands */ /* file commands */
#define CK_Save 101 #define CK_Save 101
#define CK_Load 102 #define CK_EditFile 102
#define CK_New 103 #define CK_EditNew 103
#define CK_Save_As 104 #define CK_EditSyntaxFile 121
#define CK_Load_Prev_File 111
#define CK_Load_Next_File 112
#define CK_Load_Syntax_File 121
#define CK_Load_Menu_File 122
#define CK_Menu 123
/* block commands */ /* block commands */
#define CK_Mark 201
#define CK_Copy 202
#define CK_Move 203
#define CK_Remove 204
#define CK_Unmark 206 #define CK_Unmark 206
#define CK_Save_Block 207 #define CK_BlockSave 207
#define CK_Column_Mark 208 #define CK_MarkColumn 208
#define CK_Shift_Block_Left 211 #define CK_BlockShiftLeft 211
#define CK_Shift_Block_Right 212 #define CK_BlockShiftRight 212
#define CK_Mark_All 213 #define CK_MarkAll 213
#define CK_Mark_Word 214 #define CK_MarkWord 214
#define CK_Mark_Line 215 #define CK_MarkLine 215
#define CK_InsertFile 401
/* search and replace */ #define CK_InsertOverwrite 403
#define CK_Find 301
#define CK_Find_Again 302
#define CK_Replace 303
#define CK_Replace_Again 304
#define CK_Complete_Word 305
#if 0
/* debugger commands */
#define CK_Debug_Start 350
#define CK_Debug_Stop 351
#define CK_Debug_Toggle_Break 352
#define CK_Debug_Clear 353
#define CK_Debug_Next 354
#define CK_Debug_Step 355
#define CK_Debug_Back_Trace 356
#define CK_Debug_Continue 357
#define CK_Debug_Enter_Command 358
#define CK_Debug_Until_Curser 359
#endif
#define CK_Insert_File 401
#define CK_Quit 402
#define CK_Toggle_Insert 403
#define CK_Help 404
#define CK_Date 405 #define CK_Date 405
#define CK_Refresh 406 #define CK_DeleteLine 408
#define CK_Goto 407 #define CK_DeleteToHome 409
#define CK_Delete_Line 408 #define CK_DeleteToEnd 410
#define CK_Delete_To_Line_End 409
#define CK_Delete_To_Line_Begin 410
#define CK_Man_Page 411
#define CK_Sort 412
#define CK_Mail 413 #define CK_Mail 413
#define CK_Cancel 414 #define CK_ParagraphFormat 416
#define CK_Complete 415 #define CK_MatchBracket 421
#define CK_Paragraph_Format 416 #define CK_ExternalCommand 424
#define CK_Util 417 #define CK_OptionsSaveMode 428
#define CK_Type_Load_Python 418
#define CK_Find_File 419
#define CK_Ctags 420
#define CK_Match_Bracket 421
#define CK_Terminal 422
#define CK_Terminal_App 423
#define CK_ExtCmd 424
#define CK_User_Menu 425
#define CK_Find_Definition 426
#define CK_Edit_Options 427
#define CK_Edit_Save_Mode 428
#define CK_Choose_Syntax 429
#define CK_About 430 #define CK_About 430
#if 0 #define CK_ShowMargin 460
/* application control */ #define CK_ShowTabTws 470
#define CK_Save_Desktop 451 #define CK_SyntaxOnOff 480
#define CK_New_Window 452 #define CK_SyntaxChoose 429
#define CK_Cycle 453 #define CK_InsertLiteral 851
#define CK_Save_And_Quit 455 /* bookmarks */
#define CK_Run_Another 456 #define CK_BookmarkFlush 551
#define CK_Check_Save_And_Quit 457 #define CK_BookmarkNext 552
#define CK_Maximize 458 #define CK_BookmarkPrev 553
#endif /* mark commands */
#define CK_Toggle_Show_Margin 460 #define CK_MarkPageUp 604
#define CK_Toggle_Tab_TWS 470 #define CK_MarkPageDown 605
#define CK_Toggle_Syntax 480 #define CK_MarkToFileBegin 614
#define CK_Toggle_Line_State 490 #define CK_MarkToFileEnd 615
/* macro */ #define CK_MarkToPageBegin 616
#define CK_Begin_Record_Macro 501 #define CK_MarkToPageEnd 617
#define CK_End_Record_Macro 502 #define CK_MarkScrollUp 618
#define CK_Delete_Macro 503 #define CK_MarkScrollDown 619
/* book mark */ #define CK_MarkParagraphUp 620
#define CK_Toggle_Bookmark 550 #define CK_MarkParagraphDown 621
#define CK_Flush_Bookmarks 551 /* column mark commands */
#define CK_Next_Bookmark 552 #define CK_MarkColumnPageUp 654
#define CK_Prev_Bookmark 553 #define CK_MarkColumnPageDown 655
/* highlight commands */ #define CK_MarkColumnLeft 656
#define CK_Page_Up_Highlight 604 #define CK_MarkColumnRight 657
#define CK_Page_Down_Highlight 605 #define CK_MarkColumnUp 660
#define CK_Left_Highlight 606 #define CK_MarkColumnDown 661
#define CK_Right_Highlight 607 #define CK_MarkColumnScrollUp 668
#define CK_Word_Left_Highlight 608 #define CK_MarkColumnScrollDown 669
#define CK_Word_Right_Highlight 609 #define CK_MarkColumnParagraphUp 670
#define CK_Up_Highlight 610 #define CK_MarkColumnParagraphDown 671
#define CK_Down_Highlight 611 /* macros */
#define CK_Home_Highlight 612 #define CK_MacroStartRecord 501
#define CK_End_Highlight 613 #define CK_MacroStopRecord 502
#define CK_Beginning_Of_Text_Highlight 614 #define CK_MacroStartStopRecord 853
#define CK_End_Of_Text_Highlight 615 #define CK_MacroExecute 852
#define CK_Begin_Page_Highlight 616 #define CK_MacroDelete 503
#define CK_End_Page_Highlight 617 #define CK_RepeatStartStopRecord 854
#define CK_Scroll_Up_Highlight 618 #define CK_RepeatStartRecord 855
#define CK_Scroll_Down_Highlight 619 #define CK_RepeatStopRecord 856
#define CK_Paragraph_Up_Highlight 620
#define CK_Paragraph_Down_Highlight 621
/* alt highlight commands */
#define CK_Page_Up_Alt_Highlight 654
#define CK_Page_Down_Alt_Highlight 655
#define CK_Left_Alt_Highlight 656
#define CK_Right_Alt_Highlight 657
#define CK_Word_Left_Alt_Highlight 658
#define CK_Word_Right_Alt_Highlight 659
#define CK_Up_Alt_Highlight 660
#define CK_Down_Alt_Highlight 661
#define CK_Home_Alt_Highlight 662
#define CK_End_Alt_Highlight 663
#define CK_Beginning_Of_Text_Alt_Highlight 664
#define CK_End_Of_Text_Alt_Highlight 665
#define CK_Begin_Page_Alt_Highlight 666
#define CK_End_Page_Alt_Highlight 667
#define CK_Scroll_Up_Alt_Highlight 668
#define CK_Scroll_Down_Alt_Highlight 669
#define CK_Paragraph_Up_Alt_Highlight 670
#define CK_Paragraph_Down_Alt_Highlight 671
/* X clipboard operations */
#define CK_XStore 701
#define CK_XCut 702
#define CK_XPaste 703
#define CK_Selection_History 704
#define CK_Shell 801
/* C-x or similar */
#define CK_Ext_Mode 820
#define CK_Insert_Literal 851
#define CK_Begin_End_Macro 853
#define CK_Begin_End_Repeat 854
#define CK_Begin_Record_Repeat 855
#define CK_End_Record_Repeat 856
#endif /* USE_INTERNAL_EDIT */ #endif /* USE_INTERNAL_EDIT */
/* viewer */ /* viewer */
#define CK_ViewHelp 5001 #define CK_WrapMode 5002
#define CK_ViewToggleWrapMode 5002 #define CK_HexEditMode 5003
#define CK_ViewToggleHexEditMode 5003 #define CK_HexMode 5004
#define CK_ViewToggleHexMode 5004 #define CK_MagicMode 5008
#define CK_ViewGoto 5005 #define CK_NroffMode 5009
#define CK_ViewHexEditSave 5006 #define CK_BookmarkGoto 5012
#define CK_ViewSearch 5007 #define CK_Ruler 5026
#define CK_ViewToggleMagicMode 5008
#define CK_ViewToggleNroffMode 5009
#define CK_ViewQuit 5010
#define CK_ViewContinueSearch 5011
#define CK_ViewGotoBookmark 5012
#define CK_ViewNewBookmark 5013
#define CK_ViewMoveUp 5014
#define CK_ViewMoveDown 5015
#define CK_ViewMoveLeft 5016
#define CK_ViewMoveRight 5017
#define CK_ViewMovePgDn 5018
#define CK_ViewMovePgUp 5019
#define CK_ViewMoveHalfPgDn 5020
#define CK_ViewMoveHalfPgUp 5021
#define CK_ViewMoveToBol 5022
#define CK_ViewMoveToEol 5023
#define CK_ViewNextFile 5024
#define CK_ViewPrevFile 5025
#define CK_ViewToggleRuler 5026
#define CK_ViewToggleHexNavMode 5027
#define CK_ViewMoveTop 5028
#define CK_ViewMoveBottom 5029
#define CK_ViewMoveLeft10 5030
#define CK_ViewMoveRight10 5031
#ifdef USE_DIFF_VIEW #ifdef USE_DIFF_VIEW
/* diff viewer */ /* diff viewer */
#define CK_DiffDisplaySymbols 9001 #define CK_ShowSymbols 9001
#define CK_DiffDisplayNumbers 9002 #define CK_SplitFull 9003
#define CK_DiffFull 9003 #define CK_SplitEqual 9004
#define CK_DiffEqual 9004 #define CK_SplitMore 9005
#define CK_DiffSplitMore 9005 #define CK_SplitLess 9006
#define CK_DiffSplitLess 9006 #define CK_Tab2 9009
#define CK_DiffShowDiff 9008 #define CK_Tab3 9010
#define CK_DiffSetTab2 9009 #define CK_Tab4 9011
#define CK_DiffSetTab3 9010 #define CK_Tab8 9012
#define CK_DiffSetTab4 9011 #define CK_HunkNext 9015
#define CK_DiffSetTab8 9012 #define CK_HunkPrev 9016
#define CK_DiffSwapPanel 9013 #define CK_EditOther 9019
#define CK_DiffRedo 9014 #define CK_Merge 9035
#define CK_DiffNextHunk 9015
#define CK_DiffPrevHunk 9016
#define CK_DiffGoto 9017
#define CK_DiffEditCurrent 9018
#define CK_DiffEditOther 9019
#define CK_DiffSearch 9020
#define CK_DiffEOF 9021
#define CK_DiffBOF 9022
#define CK_DiffDown 9023
#define CK_DiffUp 9024
#define CK_DiffLeft 9025
#define CK_DiffRight 9026
#define CK_DiffQuickLeft 9027
#define CK_DiffQuickRight 9028
#define CK_DiffPageDown 9029
#define CK_DiffPageUp 9030
#define CK_DiffHome 9031
#define CK_DiffEnd 9032
#define CK_DiffQuit 9033
#define CK_DiffHelp 9034
#define CK_DiffMergeCurrentHunk 9035
#define CK_DiffSave 9036
#define CK_DiffContinueSearch 9037
#define CK_DiffOptions 9038
#endif /* USE_DIFF_VIEW */ #endif /* USE_DIFF_VIEW */
#define CK_Pipe_Block(i) (10000+(i)) #define CK_PipeBlock(i) (10000+(i))
#define CK_Macro(i) (20000+(i)) #define CK_Macro(i) (20000+(i))
#define CK_Last_Macro CK_Macro(0x7FFF) #define CK_Last_Macro CK_Macro(0x7FFF)

View File

@ -246,48 +246,50 @@ dlg_execute_cmd (Dlg_head * h, unsigned long command)
cb_ret_t ret = MSG_HANDLED; cb_ret_t ret = MSG_HANDLED;
switch (command) switch (command)
{ {
case CK_DialogOK: case CK_Ok:
h->ret_value = B_ENTER; h->ret_value = B_ENTER;
dlg_stop (h); dlg_stop (h);
break; break;
case CK_DialogCancel: case CK_Cancel:
h->ret_value = B_CANCEL; h->ret_value = B_CANCEL;
dlg_stop (h); dlg_stop (h);
break; break;
case CK_DialogPrevItem: case CK_Up:
case CK_Left:
dlg_one_up (h); dlg_one_up (h);
break; break;
case CK_DialogNextItem: case CK_Down:
case CK_Right:
dlg_one_down (h); dlg_one_down (h);
break; break;
case CK_DialogHelp: case CK_Help:
interactive_display (NULL, h->help_ctx); interactive_display (NULL, h->help_ctx);
do_refresh (); do_refresh ();
break; break;
case CK_DialogSuspend: case CK_Suspend:
suspend_cmd (); suspend_cmd ();
refresh_cmd (); refresh_cmd ();
break; break;
case CK_DialogRefresh: case CK_Refresh:
refresh_cmd (); refresh_cmd ();
break; break;
case CK_DialogListCmd: case CK_ScreenList:
if (!h->modal) if (!h->modal)
dialog_switch_list (); dialog_switch_list ();
else else
ret = MSG_NOT_HANDLED; ret = MSG_NOT_HANDLED;
break; break;
case CK_DialogNextCmd: case CK_ScreenNext:
if (!h->modal) if (!h->modal)
dialog_switch_next (); dialog_switch_next ();
else else
ret = MSG_NOT_HANDLED; ret = MSG_NOT_HANDLED;
break; break;
case CK_DialogPrevCmd: case CK_ScreenPrev:
if (!h->modal) if (!h->modal)
dialog_switch_prev (); dialog_switch_prev ();
else else
@ -1102,7 +1104,7 @@ dlg_process_event (Dlg_head * h, int key, Gpm_Event * event)
if (key == EV_NONE) if (key == EV_NONE)
{ {
if (tty_got_interrupt ()) if (tty_got_interrupt ())
dlg_execute_cmd (h, CK_DialogCancel); dlg_execute_cmd (h, CK_Cancel);
return; return;
} }

View File

@ -747,11 +747,9 @@ input_execute_cmd (WInput * in, unsigned long command)
cb_ret_t res = MSG_HANDLED; cb_ret_t res = MSG_HANDLED;
/* a highlight command like shift-arrow */ /* a highlight command like shift-arrow */
if (command == CK_InputLeftHighlight || if (command == CK_MarkLeft || command == CK_MarkRight ||
command == CK_InputRightHighlight || command == CK_MarkToWordBegin || command == CK_MarkToWordEnd ||
command == CK_InputWordLeftHighlight || command == CK_MarkToHome || command == CK_MarkToEnd)
command == CK_InputWordRightHighlight ||
command == CK_InputBolHighlight || command == CK_InputEolHighlight)
{ {
if (!in->highlight) if (!in->highlight)
{ {
@ -762,53 +760,41 @@ input_execute_cmd (WInput * in, unsigned long command)
switch (command) switch (command)
{ {
case CK_InputForwardWord: case CK_WordRight:
case CK_InputBackwardWord: case CK_WordLeft:
case CK_InputForwardChar: case CK_Right:
case CK_InputBackwardChar: case CK_Left:
if (in->highlight) if (in->highlight)
input_mark_cmd (in, FALSE); input_mark_cmd (in, FALSE);
} }
switch (command) switch (command)
{ {
case CK_InputBol: case CK_Home:
case CK_InputBolHighlight: case CK_MarkToHome:
beginning_of_line (in); beginning_of_line (in);
break; break;
case CK_InputEol: case CK_End:
case CK_InputEolHighlight: case CK_MarkToEnd:
end_of_line (in); end_of_line (in);
break; break;
case CK_InputMoveLeft: case CK_Left:
case CK_InputLeftHighlight: case CK_MarkLeft:
backward_char (in); backward_char (in);
break; break;
case CK_InputWordLeft: case CK_WordLeft:
case CK_InputWordLeftHighlight: case CK_MarkToWordBegin:
backward_word (in); backward_word (in);
break; break;
case CK_InputMoveRight: case CK_Right:
case CK_InputRightHighlight: case CK_MarkRight:
forward_char (in); forward_char (in);
break; break;
case CK_InputWordRight: case CK_WordRight:
case CK_InputWordRightHighlight: case CK_MarkToWordEnd:
forward_word (in); forward_word (in);
break; break;
case CK_InputBackwardChar: case CK_BackSpace:
backward_char (in);
break;
case CK_InputBackwardWord:
backward_word (in);
break;
case CK_InputForwardChar:
forward_char (in);
break;
case CK_InputForwardWord:
forward_word (in);
break;
case CK_InputBackwardDelete:
if (in->highlight) if (in->highlight)
{ {
long m1, m2; long m1, m2;
@ -818,7 +804,7 @@ input_execute_cmd (WInput * in, unsigned long command)
else else
backward_delete (in); backward_delete (in);
break; break;
case CK_InputDeleteChar: case CK_Delete:
if (in->first) if (in->first)
port_region_marked_for_delete (in); port_region_marked_for_delete (in);
else if (in->highlight) else if (in->highlight)
@ -830,60 +816,56 @@ input_execute_cmd (WInput * in, unsigned long command)
else else
delete_char (in); delete_char (in);
break; break;
case CK_InputKillWord: case CK_DeleteToWordEnd:
kill_word (in); kill_word (in);
break; break;
case CK_InputBackwardKillWord: case CK_DeleteToWordBegin:
back_kill_word (in); back_kill_word (in);
break; break;
case CK_InputSetMark: case CK_Mark:
input_mark_cmd (in, TRUE); input_mark_cmd (in, TRUE);
break; break;
case CK_InputKillRegion: case CK_Remove:
delete_region (in, in->point, in->mark); delete_region (in, in->point, in->mark);
break; break;
case CK_InputKillLine: case CK_DeleteToEnd:
/* clear command line from cursor to the EOL */
kill_line (in); kill_line (in);
break; break;
case CK_InputClearLine: case CK_Clear:
/* clear command line */
clear_line (in); clear_line (in);
break; break;
case CK_InputCopyRegion: case CK_Store:
copy_region (in, in->mark, in->point); copy_region (in, in->mark, in->point);
break; break;
case CK_InputKillSave: case CK_Cut:
copy_region (in, in->mark, in->point); copy_region (in, in->mark, in->point);
delete_region (in, in->point, in->mark); delete_region (in, in->point, in->mark);
break; break;
case CK_InputYank: case CK_Yank:
yank (in); yank (in);
break; break;
case CK_InputPaste: case CK_Paste:
ins_from_clip (in); ins_from_clip (in);
break; break;
case CK_InputHistoryPrev: case CK_HistoryPrev:
hist_prev (in); hist_prev (in);
break; break;
case CK_InputHistoryNext: case CK_HistoryNext:
hist_next (in); hist_next (in);
break; break;
case CK_InputHistoryShow: case CK_History:
do_show_hist (in); do_show_hist (in);
break; break;
case CK_InputComplete: case CK_Complete:
complete (in); complete (in);
break; break;
default: default:
res = MSG_NOT_HANDLED; res = MSG_NOT_HANDLED;
} }
if (command != CK_InputLeftHighlight && if (command != CK_MarkLeft && command != CK_MarkRight &&
command != CK_InputRightHighlight && command != CK_MarkToWordBegin && command != CK_MarkToWordEnd &&
command != CK_InputWordLeftHighlight && command != CK_MarkToHome && command != CK_MarkToEnd)
command != CK_InputWordRightHighlight &&
command != CK_InputBolHighlight && command != CK_InputEolHighlight)
in->highlight = FALSE; in->highlight = FALSE;
return res; return res;
@ -1144,7 +1126,7 @@ input_handle_char (WInput * in, int key)
} }
else else
{ {
if (command != CK_InputComplete) if (command != CK_Complete)
input_free_completions (in); input_free_completions (in);
input_execute_cmd (in, command); input_execute_cmd (in, command);
v = MSG_HANDLED; v = MSG_HANDLED;
@ -1172,7 +1154,7 @@ input_key_is_in_map (WInput * in, int key)
if (command == CK_Ignore_Key) if (command == CK_Ignore_Key)
return 0; return 0;
return (command == CK_InputComplete) ? 2 : 1; return (command == CK_Complete) ? 2 : 1;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */

View File

@ -237,27 +237,27 @@ listbox_execute_cmd (WListbox * l, unsigned long command)
switch (command) switch (command)
{ {
case CK_ListboxMoveUp: case CK_Up:
listbox_back (l); listbox_back (l);
break; break;
case CK_ListboxMoveDown: case CK_Down:
listbox_fwd (l); listbox_fwd (l);
break; break;
case CK_ListboxMoveHome: case CK_Top:
listbox_select_first (l); listbox_select_first (l);
break; break;
case CK_ListboxMoveEnd: case CK_Bottom:
listbox_select_last (l); listbox_select_last (l);
break; break;
case CK_ListboxMovePgUp: case CK_PageUp:
for (i = 0; (i < l->widget.lines - 1) && (l->pos > 0); i++) for (i = 0; (i < l->widget.lines - 1) && (l->pos > 0); i++)
listbox_back (l); listbox_back (l);
break; break;
case CK_ListboxMovePgDn: case CK_PageDown:
for (i = 0; (i < l->widget.lines - 1) && (l->pos < l->count - 1); i++) for (i = 0; (i < l->widget.lines - 1) && (l->pos < l->count - 1); i++)
listbox_fwd (l); listbox_fwd (l);
break; break;
case CK_ListboxDeleteItem: case CK_Delete:
if (l->deletable) if (l->deletable)
{ {
gboolean is_last = (l->pos + 1 >= l->count); gboolean is_last = (l->pos + 1 >= l->count);
@ -268,7 +268,7 @@ listbox_execute_cmd (WListbox * l, unsigned long command)
l->top--; l->top--;
} }
break; break;
case CK_ListboxDeleteAll: case CK_Clear:
if (l->deletable && confirm_history_cleanup if (l->deletable && confirm_history_cleanup
/* TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix */ /* TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix */
&& (query_dialog (Q_ ("DialogTitle|History cleanup"), && (query_dialog (Q_ ("DialogTitle|History cleanup"),

View File

@ -1,439 +1,427 @@
[main] [main]
CmdHelp = f1 Help = f1
CmdUserMenu = f2 UserMenu = f2
CmdView = f3 View = f3
CmdViewFile = f13 ViewFile =
CmdEdit = f4 Edit = f4
CmdEditForceInternal = EditForceInternal =
CmdCopy = f5 Copy = f5
CmdRename = f6 Move = f6
CmdMkdir = f7 MakeDir = f7
CmdDelete = f8 Delete = f8
CmdMenu = f9 Menu = f9
CmdQuit = f10 Quit = f10
CmdMenuLastSelected = f19 MenuLastSelected = f19
CmdQuietQuit = f20 QuitQuiet = f20
CmdFind = alt-question Find = alt-question
CmdQuickCd = alt-c CdQuick = alt-c
CmdQuickChdir = ctrl-backslash HotList = ctrl-backslash
CmdReread = ctrl-r Reread = ctrl-r
CmdSingleDirsize = ctrl-space DirSize = ctrl-space
CmdSuspend = ctrl-z Suspend = ctrl-z
CmdSwapPanel = ctrl-u Swap = ctrl-u
CmdHistory = alt-h History = alt-h
CmdListing = PanelListing =
CmdToggleListing = alt-t PanelListingSwitch = alt-t
CmdToggleShowHidden = alt-dot PanelListingChange =
CmdTogglePanelsSplit = alt-comma ShowHidden = alt-dot
ShowCommandLine = ctrl-o SplitVertHoriz = alt-comma
CmdCopyCurrentPathname = alt-a Shell = ctrl-o
CmdCopyOtherPathname = alt-shift-a PutCurrentPath = alt-a
CmdFilteredView = alt-exclamation PutOtherPath = alt-shift-a
CmdSelect = kpplus ViewFiltered = alt-exclamation
CmdUnselect = kpminus Select = kpplus
CmdReverseSelection = kpasterisk Unselect = kpminus
CmdDialogList = alt-prime SelectInvert = kpasterisk
ExtMap1 = ctrl-x ScreenList = alt-prime
OptionsLayout =
OptionsPanel =
OptionsConfirm =
OptionsDisplayBits =
OptionsVfs =
LearnKeys =
SaveSetup =
EditExtensionsFile =
EditFileHighlightFile =
Filter =
ConnectFish =
ConnectFtp =
ConnectSmb =
Undelete =
ExtendedKeyMap = ctrl-x
[main:xmap] [main:xmap]
CmdChmod = c ChangeMode = c
CmdChown = o ChangeOwn = o
CmdCompareDirs = d CompareDirs = d
CmdEditSymlink = ctrl-s CompareFiles = ctrl-d
CmdLink = l HotListAdd = h
CmdSymlink = s LinkSymbolicEdit = ctrl-s
CmdRelativeSymlink = v Link = l
CmdInfo = i LinkSymbolic = s
CmdQuickView = q LinkSymbolicRelative = v
CmdExternalPanelize = exclamation PanelInfo = i
CmdReselectVfs = a PanelQuickView = q
CmdJobs = j ExternalPanelize = exclamation
CmdCopyCurrentPathname = p VfsList = a
CmdCopyOtherPathname = ctrl-p Jobs = j
CmdCopyCurrentTagged = t PutCurrentPath = p
CmdCopyOtherTagged = ctrl-t PutOtherPath = ctrl-p
CmdDiffView = ctrl-d PutCurrentTagged = t
PutOtherTagged = ctrl-t
PutCurrentLink = r
PutOtherLink = ctrl-r
[panel] [panel]
PanelStartSearch = ctrl-s; alt-s Search = ctrl-s; alt-s
PanelMarkFile = insert; ctrl-t Mark = insert; ctrl-t
PanelMarkFileUp = shift-up MarkUp = shift-up
PanelMarkFileDown = shift-down MarkDown = shift-down
PanelMoveDown = down; ctrl-n Down = down; ctrl-n
PanelMoveUp = up; ctrl-p Up = up; ctrl-p
PanelMoveLeft = left Left = left
PanelMoveRight = right Right = right
PanelPrevPage = pgup; alt-v PageUp = pgup; alt-v
PanelNextPage = pgdn; ctrl-v PageDown = pgdn; ctrl-v
PanelDoEnter = enter Enter = enter
PanelChdirOtherPanel = alt-o PanelOtherCd = alt-o
PanelChdirToReadlink = alt-l PanelOtherCdLink = alt-l
PanelViewSimple = F13 ViewRaw = F13
PanelEditNew = F14 EditNew = F14
PanelCopyLocal = F15 CopySingle = F15
PanelRenameLocal = F16 MoveSingle = F16
PanelDeleteLocal = F18 DeleteSingle = F18
PanelReverseSelection = alt-asterisk Select = alt-plus
PanelSelect = alt-plus Unselect = alt-minus
PanelUnselect = alt-minus SelectInvert = alt-asterisk
PanelGotoChildDir = ctrl-pgdn CdChild = ctrl-pgdn
PanelGotoParentDir = ctrl-pgup CdParent = ctrl-pgup
PanelDirectoryHistoryList = alt-shift-h CdParentSmart =
PanelDirectoryHistoryNext = alt-u History = alt-shift-h
PanelDirectoryHistoryPrev = alt-y HistoryNext = alt-u
PanelGotoBottomFile = alt-j HistoryPrev = alt-y
PanelGotoMiddleFile = alt-r BottomOnScreen = alt-j
PanelSyncOtherPanel = alt-i MiddleOnScreen = alt-r
PanelGotoTopFile = alt-g TopOnScreen = alt-g
PanelSetPanelEncoding = alt-e PanelOtherSync = alt-i
PanelMoveHome = alt-lt; home; a1 SelectCodepage = alt-e
PanelMoveEnd = alt-gt; end; c1 Top = alt-lt; home; a1
PanelSelectSortOrder = Bottom = alt-gt; end; c1
PanelToggleSortOrderPrev = Sort =
PanelToggleSortOrderNext = SortPrev =
PanelReverseSort = SortNext =
PanelSortOrderByName = SortReverse =
PanelSortOrderByExt = SortByName =
PanelSortOrderBySize = SortByExt =
PanelSortOrderByMTime = SortBySize =
PanelSmartGotoParentDir = SortByMTime =
[dialog] [dialog]
DialogOK = enter Ok = enter
DialogCancel = f10; esc; ctrl-g Cancel = f10; esc; ctrl-g
DialogPrevItem = left; up Up = left; up
DialogNextItem = right; down #Left = left; up
DialogHelp = f1 Down = right; down
DialogSuspend = ctrl-z #Right = right; down
DialogRefresh = ctrl-l Help = f1
CmdDialogList = alt-prime Suspend = ctrl-z
CmdDialogNext = alt-rbrace Refresh = ctrl-l
CmdDialogPrev = alt-lbrace ScreenList = alt-prime
ScreenNext = alt-rbrace
ScreenPrev = alt-lbrace
[input] [input]
InputBol = ctrl-a; alt-lt; home; a1 Home = ctrl-a; alt-lt; home; a1
InputEol = ctrl-e; alt-gt; end; c1 End = ctrl-e; alt-gt; end; c1
InputMoveLeft = left; alt-left Left = left; alt-left; ctrl-b
InputWordLeft = ctrl-left Right = right; alt-right; ctrl-f
InputBackwardChar = ctrl-b WordLeft = ctrl-left; alt-b
InputBackwardWord = alt-b WordRight = ctrl-right; alt-f
InputMoveRight = right; alt-right Backspace = backspace; ctrl-h
InputWordRight = ctrl-right Delete = delete; ctrl-d
InputForwardChar = ctrl-f DeleteToWordBegin = alt-backspace
InputForwardWord = alt-f DeleteToWordEnd = alt-d
InputBackwardDelete = backspace; ctrl-h Mark =
InputDeleteChar = delete; ctrl-d Remove = ctrl-w
InputKillWord = alt-d Cut =
InputBackwardKillWord = alt-backspace Store = alt-w
InputSetMark = Paste =
InputKillRegion = ctrl-w Yank = ctrl-y
InputXCut = DeleteToEnd = ctrl-k
InputXStore = alt-w HistoryPrev = alt-p; ctrl-down
InputXPaste = HistoryNext = alt-n; ctrl-up
InputYank = ctrl-y History = alt-h
InputKillLine = ctrl-k Complete = alt-tab
InputHistoryPrev = alt-p; ctrl-down Clear =
InputHistoryNext = alt-n; ctrl-up MarkLeft = shift-left
InputHistoryShow = alt-h MarkRight = shift-right
InputComplete = alt-tab MarkToWordBegin = ctrl-shift-left
InputClearLine = MarkToWordEnd = ctrl-shift-right
InputLeftHighlight = shift-left MarkToHome = shift-home
InputRightHighlight = shift-right MarkToEnd = shift-end
InputWordLeftHighlight = ctrl-shift-left
InputWordRightHighlight = ctrl-shift-right
InputBolHighlight = shift-home
InputEolHighlight = shift-end
[listbox] [listbox]
ListboxMoveUp = up; ctrl-p Up = up; ctrl-p
ListboxMoveDown = down; ctrl-n Down = down; ctrl-n
ListboxMoveHome = home; alt-lt; a1 Top = home; alt-lt; a1
ListboxMoveEnd = end; alt-gt; c1 Bottom = end; alt-gt; c1
ListboxMovePgUp = pgup; alt-v PageUp = pgup; alt-v
ListboxMovePgDn = pgdn; ctrl-v PageDown = pgdn; ctrl-v
ListboxDeleteItem = delete; d Delete = delete; d
ListboxDeleteAll = shift-delete; shift-d Clear = shift-delete; shift-d
[tree] [tree]
TreeHelp = f1 Help = f1
TreeForget = f3 Reread = f2; ctrl-r
TreeToggleNav = f4 Forget = f3
TreeCopy = f5 ToggleNavigation = f4
TreeMove = f6 Copy = f5
TreeMoveUp = up; ctrl-p Move = f6
TreeMoveDown = down; ctrl-n Up = up; ctrl-p
TreeMoveLeft = left Down = down; ctrl-n
TreeMoveRight = right Left = left
TreeMoveHome = home; alt-lt; a1 Right = right
TreeMoveEnd = end; alt-gt; c1 Top = home; alt-lt; a1
TreeMovePgUp = pgup; alt-v Bottom = end; alt-gt; c1
TreeMovePgDn = pgdn; ctrl-v PageUp = pgup; alt-v
TreeOpen = enter PageDown = pgdn; ctrl-v
TreeRescan = f2; ctrl-r Enter = enter
TreeStartSearch = ctrl-s; alt-s Search = ctrl-s; alt-s
TreeRemove = f8; delete Delete = f8; delete
[help] [help]
HelpHelp = f1 Help = f1
HelpIndex = f2; c Index = f2; c
HelpBack = f3; left; l Back = f3; left; l
HelpQuit = f10; esc; ctrl-g Quit = f10; esc; ctrl-g
HelpMoveUp = up; ctrl-p Up = up; ctrl-p
HelpMoveDown = down; ctrl-n Down = down; ctrl-n
HelpMovePgDn = f; space; pgdn; ctrl-v PageDown = f; space; pgdn; ctrl-v
HelpMovePgUp = b; pgup; alt-v; backspace PageUp = b; pgup; alt-v; backspace
HelpMoveHalfPgDn = d HalfPageDown = d
HelpMoveHalfPgUp = u HalfPageUp = u
HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
HelpSelectLink = right; enter Enter = right; enter
HelpNextLink = tab LinkNext = tab
HelpPrevLink = alt-tab LinkPrev = alt-tab
HelpNextNode = n NodeNext = n
HelpPrevNode = p NodePrev = p
[editor] [editor]
EditXStore = ctrl-insert Store = ctrl-insert
EditXPaste = shift-insert Paste = shift-insert
EditXCut = shift-delete Cut = shift-delete
EditDeleteLine = ctrl-y Up = up
EditDeleteToLineEnd = ctrl-k Down = down
EditDeleteToLineBegin = Left = left
EditLeft = left Right = right
EditRight = right WordLeft = ctrl-left; ctrl-z
EditUp = up WordRight = ctrl-right; ctrl-x
EditDown = down Enter = enter
EditEnter = enter Return = shift-enter
EditReturn = shift-enter BackSpace = backspace; ctrl-h
EditBackSpace = backspace; ctrl-h Delete = delete; ctrl-d
EditDelete = delete; ctrl-d PageUp = pgup
EditPageUp = pgup PageDown = pgdn
EditPageDown = pgdn Home = home
EditWordLeft = ctrl-left; ctrl-z End = end
EditWordRight = ctrl-right; ctrl-x Tab = tab
EditHome = home Undo = ctrl-u
EditEnd = end Redo = alt-r
EditTab = tab Top = ctrl-home; alt-lt
EditUndo = ctrl-u Bottom = ctrl-end; alt-gt
EditRedo = alt-r ScrollUp = ctrl-up
EditBeginningOfText = ctrl-home; alt-lt ScrollDown = ctrl-down
EditEndOfText = ctrl-end; alt-gt TopOnScreen = ctrl-pgup
EditScrollUp = ctrl-up BottomOnScreen = ctrl-pgdn
EditScrollDown = ctrl-down DeleteToWordBegin = alt-backspace
EditBeginPage = ctrl-pgup DeleteToWordEnd = alt-d
EditEndPage = ctrl-pgdn DeleteLine = ctrl-y
EditDeleteWordLeft = alt-backspace DeleteToEnd = ctrl-k
EditDeleteWordRight = alt-d DeleteToHome =
EditParagraphUp = ParagraphUp =
EditParagraphDown = ParagraphDown =
EditSave = f2 Save = f2
EditLoad = EditFile =
EditNew = ctrl-n EditNew = ctrl-n
EditSaveas = f12 SaveAs = f12; ctrl-f2
EditMark = f3 Mark = f3
EditCopy = f5 Copy = f5
EditMove = f6 Move = f6
EditRemove = f8 Remove = f8
EditMarkAll = MarkLine =
EditUnmark = MarkWord =
EditFind = f7 MarkAll =
EditMarkLine = Unmark =
EditMarkWord = Search = f7
EditShiftBlockLeft = SearchContinue = f17
EditShiftBlockRight = BlockShiftLeft =
EditPageUpHighlight = shift-pgup BlockShiftRight =
EditPageDownHighlight = shift-pgdn MarkPageUp = shift-pgup
EditLeftHighlight = shift-left MarkPageDown = shift-pgdn
EditRightHighlight = shift-right MarkLeft = shift-left
EditWordLeftHighlight = ctrl-shift-left MarkRight = shift-right
EditWordRightHighlight = ctrl-shift-right MarkToWordBegin = ctrl-shift-left
EditUpHighlight = shift-up MarkToWordEnd = ctrl-shift-right
EditDownHighlight = shift-down MarkUp = shift-up
EditHomeHighlight = shift-home MarkDown = shift-down
EditEndHighlight = shift-end MarkToHome = shift-home
EditBeginningOfTextHighlight = ctrl-shift-home MarkToEnd = shift-end
EditEndOfTextHighlight = ctrl-shift-end MarkToFileBegin = ctrl-shift-home
EditBeginPageHighlight = ctrl-shift-pgup MarkToFileEnd = ctrl-shift-end
EditEndPageHighlight = ctrl-shift-pgdn MarkToPageBegin = ctrl-shift-pgup
EditScrollUpHighlight = ctrl-shift-up MarkToPageEnd = ctrl-shift-pgdn
EditScrollDownHighlight = ctrl-shift-down MarkScrollUp = ctrl-shift-up
EditParagraphUpHighlight = MarkScrollDown = ctrl-shift-down
EditParagraphDownHighlight = MarkParagraphUp =
EditPageUpAltHighlight = alt-pgup MarkParagraphDown =
EditPageDownAltHighlight = alt-pgdn MarkColumnPageUp = alt-pgup
EditLeftAltHighlight = alt-left MarkColumnPageDown = alt-pgdn
EditRightAltHighlight = alt-right MarkColumnLeft = alt-left
EditWordLeftAltHighlight = ctrl-alt-left MarkColumnRight = alt-right
EditWordRightAltHighlight = ctrl-alt-right MarkColumnUp = alt-up
EditUpAltHighlight = alt-up MarkColumnDown = alt-down
EditDownAltHighlight = alt-down MarkColumnScrollUp =
EditHomeAltHighlight = alt-home MarkColumnScrollDown =
EditEndAltHighlight = alt-end MarkColumnParagraphUp =
EditBeginningOfTextAltHighlight = ctrl-alt-home MarkColumnParagraphDown =
EditEndOfTextHighlight = ctrl-alt-end BlockSave = ctrl-f
EditBeginPageHighlight = ctrl-alt-pgup MarkColumn = f13
EditEndPageAltHighlight = ctrl-alt-pgdn Replace = f4
EditScrollUpAltHighlight = ReplaceContinue = f14
EditScrollDownAltHighlight = Complete = alt-tab
EditParagraphUpAltHighlight = InsertFile = f15
EditParagraphDownAltHighlight = Quit = f10
EditSaveBlock = ctrl-f InsertOverwrite = insert
EditColumnMark = f13 Help = f1
EditFindAgain = f17 Date =
EditReplace = f4 Refresh = ctrl-l
EditReplaceAgain = f14 Goto = alt-l
EditCompleteWord = alt-tab Sort = alt-t
EditDebugStart = Mail = alt-m
EditDebugStop = ParagraphFormat = alt-p
EditDebugToggleBreak = MatchBracket = alt-b
EditDebugClear = ExternalCommand = alt-u
EditDebugNext = UserMenu = f11
EditDebugStep = Menu = f9
EditDebugBackTrace = Bookmark = alt-k
EditDebugContinue = BookmarkFlush = alt-o
EditDebugEnterCommand = BookmarkNext = alt-j
EditDebugUntilCurser = BookmarkPrev = alt-i
EditInsertFile = f15 History =
EditQuit = f10 Shell = ctrl-o
EditToggleInsert = insert InsertLiteral = ctrl-q
EditHelp = f1 MacroStartRecord =
EditDate = MacroStopRecord =
EditRefresh = ctrl-l MacroStartStopRecord = ctrl-r
EditGoto = alt-l MacroDelete =
EditManPage = ShowNumbers = alt-n
EditSort = alt-t ShowTabTws = alt-underline
EditMail = alt-m SyntaxOnOff = ctrl-s
EditCancel = SyntaxChoose =
EditComplete = ShowMargin =
EditParagraphFormat = alt-p Find = alt-enter
EditUtil = FilePrev = alt-minus
EditTypeLoadPython = FileNext = alt-plus
EditFindFile = RepeatStartStopRecord =
EditCtags =
EditMatchBracket = alt-b
EditTerminal =
EditTerminalApp =
EditExtCmd = alt-u
EditUserMenu = f11
EditSaveDesktop =
EditNewWindow =
EditCycle =
EditMenu = f9
EditSaveAndQuit =
EditRunAnother =
EditCheckSaveAndQuit =
EditMaximize =
EditToggleBookmark = alt-k
EditFlushBookmarks = alt-o
EditNextBookmark = alt-j
EditPrevBookmark = alt-i
EditSelectionHistory =
EditShell = ctrl-o
EditInsertLiteral = ctrl-q
EditBeginRecordMacro =
EditEndRecordMacro =
EditBeginOrEndMacro = ctrl-r
EditDeleteMacro =
EditToggleLineState = alt-n
EditToggleTabTWS = alt-underline
EditToggleSyntax = ctrl-s
EditToggleShowMargin =
EditFindDefinition = alt-enter
EditLoadPrevFile = alt-minus
EditLoadNextFile = alt-plus
EditBeginEndRepeat =
SelectCodepage = alt-e SelectCodepage = alt-e
Options =
OptionsSaveMode =
LearnKeys =
ExtendedKeyMap = ctrl-x
[viewer] [viewer]
ViewHelp = f1 Help = f1
ViewToggleWrapMode = f2 WrapMode = f2
ViewQuit = f3; f10; q; esc; ctrl-g Quit = f3; f10; q; esc; ctrl-g
ViewToggleHexMode = f4 HexMode = f4
ViewGoto = f5 Goto = f5
ViewSearch = f7; question; slash Search = f7; question; slash
ViewToggleMagicMode = f8 SearchContinue = ctrl-r; ctrl-s; f17; n
ViewToggleNroffMode = f9 MagicMode = f8
ViewContinueSearch = ctrl-r; ctrl-s; f17; n NroffMode = f9
ViewMoveToBol = ctrl-a Home = ctrl-a
ViewMoveToEol = ctrl-e End = ctrl-e
ViewMoveLeft = h; left Left = h; left
ViewMoveRight = l; right Right = l; right
ViewMoveLeft10 = ctrl-left LeftQuick = ctrl-left
ViewMoveRight10 = ctrl-right RightQuick = ctrl-right
ViewMoveUp = k; y; insert; up; ctrl-p Up = k; y; insert; up; ctrl-p
ViewMoveDown = j; e; delete; down; enter; ctrl-n Down = j; e; delete; down; enter; ctrl-n
ViewMovePgDn = f; space; pgdn; ctrl-v PageDown = f; space; pgdn; ctrl-v
ViewMovePgUp = b; pgup; alt-v; backspace PageUp = b; pgup; alt-v; backspace
ViewMoveHalfPgDn = d HalfPageDown = d
ViewMoveHalfPgUp = u HalfPageUp = u
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
ViewGotoBookmark = m BookmarkGoto = m
ViewNewBookmark = r Bookmark = r
ViewNextFile = ctrl-f FileNext = ctrl-f
ViewPrevFile = ctrl-b FilePrev = ctrl-b
SelectCodepage = alt-e SelectCodepage = alt-e
ShowCommandLine = ctrl-o Shell = ctrl-o
ViewToggleRuler = alt-r Ruler = alt-r
[viewer:hex] [viewer:hex]
ViewHelp = f1 Help = f1
ViewToggleHexEditMode = f2 HexEditMode = f2
ViewQuit = f3; f10; q; esc; ctrl-g Quit = f3; f10; q; esc; ctrl-g
ViewToggleHexMode = f4 HexMode = f4
ViewGoto = f5 Goto = f5
ViewHexEditSave = f6 Save = f6
ViewSearch = f7; question; slash Search = f7; question; slash
ViewToggleMagicMode = f8 SearchContinue = ctrl-r; ctrl-s; f17; n
ViewToggleNroffMode = f9 MagicMode = f8
ViewToggleHexNavMode = tab NroffMode = f9
ViewMoveToBol = ctrl-a; home ToggleNavigation = tab
ViewMoveToEol = ctrl-e; end Home = ctrl-a; home
ViewMoveLeft = b; left End = ctrl-e; end
ViewMoveRight = f; right Left = b; left
ViewMoveUp = k; y; up Right = f; right
ViewMoveDown = j; delete; down Up = k; y; up
ViewMovePgDn = pgdn; ctrl-v Down = j; delete; down
ViewMovePgUp = pgup; alt-v PageDown = pgdn; ctrl-v
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g PageUp = pgup; alt-v
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
[diffviewer] [diffviewer]
DiffDisplaySymbols = alt-s; s ShowSymbols = alt-s; s
DiffDisplayNumbers = alt-n; l ShowNumbers = alt-n; l
DiffFull = f SplitFull = f
DiffEqual = equal SplitEqual = equal
DiffSplitMore = gt SplitMore = gt
DiffSplitLess = lt SplitLess = lt
DiffSetTab2 = 2 Tab2 = 2
DiffSetTab3 = 3 Tab3 = 3
DiffSetTab4 = 4 Tab4 = 4
DiffSetTab8 = 8 Tab8 = 8
DiffSwapPanel = ctrl-u Swap = ctrl-u
DiffRedo = ctrl-r Redo = ctrl-r
DiffNextHunk = n; enter; space HunkNext = n; enter; space
DiffPrevHunk = p; backspace HunkPrev = p; backspace
DiffGoto = g; shift-g Goto = g; shift-g
DiffSave = f2 Save = f2
DiffEditCurrent = f4 Edit = f4
DiffEditOther = f14 EditOther = f14
DiffMergeCurrentHunk = f5 Merge = f5
DiffSearch = f7 Search = f7
DiffContinueSearch = f17 SearchContinue = f17
DiffOptions = f9 Options = f9
DiffBOF = ctrl-home Top = ctrl-home
DiffEOF = ctrl-end Bottom = ctrl-end
DiffDown = down Down = down
DiffUp = up Up = up
DiffQuickLeft = ctrl-left LeftQuick = ctrl-left
DiffQuickRight = ctrl-right RightQuick = ctrl-right
DiffLeft = left Left = left
DiffRight = right Right = right
DiffPageDown = pgdn PageDown = pgdn
DiffPageUp = pgup PageUp = pgup
DiffHome = home Home = home
DiffEnd = end End = end
DiffHelp = f1 Help = f1
DiffQuit = f10; q; shift-q; ctrl-g; esc Quit = f10; q; shift-q; ctrl-g; esc
ShowCommandLine = ctrl-o Shell = ctrl-o
SelectCodepage = alt-e SelectCodepage = alt-e

View File

@ -1,441 +1,430 @@
[main] [main]
CmdHelp = f1 Help = f1
CmdUserMenu = f2 UserMenu = f2
CmdView = f3 View = f3
CmdViewFile = f13 ViewFile =
CmdEdit = f4 Edit = f4
CmdEditForceInternal = EditForceInternal =
CmdCopy = f5 Copy = f5
CmdRename = f6 Move = f6
CmdMkdir = f7 MakeDir = f7
CmdDelete = f8 Delete = f8
CmdMenu = f9 Menu = f9
CmdQuit = f10 Quit = f10
CmdMenuLastSelected = f19 MenuLastSelected = f19
CmdQuietQuit = f20 QuitQuiet = f20
CmdFind = alt-question Find = alt-question
CmdQuickCd = alt-c CdQuick = alt-c
CmdQuickChdir = ctrl-backslash HotList = ctrl-backslash
CmdReread = ctrl-r Reread = ctrl-r
CmdSingleDirsize = ctrl-space DirSize = ctrl-space
CmdSuspend = ctrl-z Suspend = ctrl-z
CmdSwapPanel = ctrl-u Swap = ctrl-u
CmdHistory = alt-h History = alt-h
CmdListing = PanelListing =
CmdToggleListing = alt-t PanelListingSwitch = alt-t
CmdToggleShowHidden = alt-dot PanelListingChange =
CmdTogglePanelsSplit = alt-comma ShowHidden = alt-dot
ShowCommandLine = ctrl-o SplitVertHoriz = alt-comma
CmdCopyCurrentPathname = alt-a Shell = ctrl-o
CmdCopyOtherPathname = alt-shift-a PutCurrentPath = alt-a
CmdFilteredView = alt-exclamation PutOtherPath = alt-shift-a
CmdSelect = kpplus ViewFiltered = alt-exclamation
CmdUnselect = kpminus Select = kpplus
CmdReverseSelection = kpasterisk Unselect = kpminus
CmdDialogList = alt-prime SelectInvert = kpasterisk
ExtMap1 = ctrl-x ScreenList = alt-prime
Options =
OptionsLayout =
OptionsPanel =
OptionsConfirm =
OptionsDisplayBits =
OptionsVfs =
LearnKeys =
SaveSetup =
EditExtensionsFile =
EditFileHighlightFile =
Filter =
ConnectFish =
ConnectFtp =
ConnectSmb =
Undelete =
ExtendedKeyMap = ctrl-x
[main:xmap] [main:xmap]
CmdChmod = c ChangeMode = c
CmdChown = o ChangeOwn = o
CmdCompareDirs = d CompareDirs = d
CmdEditSymlink = ctrl-s CompareFiles = ctrl-d
CmdLink = l HotListAdd = h
CmdSymlink = s LinkSymbolicEdit = ctrl-s
CmdRelativeSymlink = v Link = l
CmdInfo = i LinkSymbolic = s
CmdQuickView = q LinkSymbolicRelative
CmdExternalPanelize = exclamation PanelInfo = i
CmdReselectVfs = a PanelQuickView = q
CmdJobs = j ExternalPanelize = exclamation
CmdCopyCurrentPathname = p VfsList = a
CmdCopyOtherPathname = ctrl-p Jobs = j
CmdCopyCurrentTagged = t PutCurrentPath = p
CmdCopyOtherTagged = ctrl-t PutOtherPath = ctrl-p
CmdDiffView = ctrl-d PutCurrentTagged = t
PutOtherTagged = ctrl-t
PutCurrentLink = r
PutOtherLink = ctrl-r
[panel] [panel]
PanelStartSearch = ctrl-s; alt-s Search = ctrl-s; alt-s
PanelMarkFile = insert; ctrl-t Mark = insert; ctrl-t
PanelMarkFileUp = shift-up MarkUp = shift-up
PanelMarkFileDown = shift-down MarkDown = shift-down
PanelMoveDown = down; ctrl-n Down = down; ctrl-n
PanelMoveUp = up; ctrl-p Up = up; ctrl-p
PanelMoveLeft = left Left = left
PanelMoveRight = right Right = right
PanelPrevPage = pgup; alt-v PageUp = pgup; alt-v
PanelNextPage = pgdn; ctrl-v PageDown = pgdn; ctrl-v
PanelDoEnter = enter Enter = enter
PanelChdirOtherPanel = alt-o PanelOtherCd = alt-o
PanelChdirToReadlink = alt-l PanelOtherCdLink = alt-l
PanelViewSimple = F13 ViewRaw = F13
PanelEditNew = F14 EditNew = F14
PanelCopyLocal = F15 CopySingle = F15
PanelRenameLocal = F16 MoveSingle = F16
PanelDeleteLocal = F18 DeleteSingle = F18
PanelReverseSelection = alt-asterisk Select = alt-plus
PanelSelect = alt-plus Unselect = alt-minus
PanelUnselect = alt-minus SelectInvert = alt-asterisk
PanelGotoChildDir = ctrl-pgdn CdChild = ctrl-pgdn
PanelGotoParentDir = ctrl-pgup CdParent = ctrl-pgup
PanelDirectoryHistoryList = alt-shift-h CdParentSmart =
PanelDirectoryHistoryNext = alt-u History = alt-shift-h
PanelDirectoryHistoryPrev = alt-y HistoryNext = alt-u
PanelGotoBottomFile = alt-j HistoryPrev = alt-y
PanelGotoMiddleFile = alt-r BottomOnScreen = alt-j
PanelSyncOtherPanel = alt-i MiddleOnScreen = alt-r
PanelGotoTopFile = alt-g TopOnScreen = alt-g
PanelSetPanelEncoding = alt-e PanelOtherSync = alt-i
PanelMoveHome = alt-lt; home; a1 SelectCodepage = alt-e
PanelMoveEnd = alt-gt; end; c1 Top = alt-lt; home; a1
PanelSelectSortOrder = Bottom = alt-gt; end; c1
PanelToggleSortOrderPrev = Sort =
PanelToggleSortOrderNext = SortPrev =
PanelReverseSort = SortNext =
PanelSortOrderByName = SortReverse =
PanelSortOrderByExt = SortByName =
PanelSortOrderBySize = SortByExt =
PanelSortOrderByMTime = SortBySize =
PanelSmartGotoParentDir = SortByMTime =
[dialog] [dialog]
DialogOK = enter Ok = enter
DialogCancel = f10; esc; ctrl-g Cancel = f10; esc; ctrl-g
DialogPrevItem = left; up Up = left; up
DialogNextItem = right; down #Left = left; up
DialogHelp = f1 Down = right; down
DialogSuspend = ctrl-z #Right = right; down
DialogRefresh = ctrl-l Help = f1
CmdDialogList = alt-prime Suspend = ctrl-z
CmdDialogNext = alt-rbrace Refresh = ctrl-l
CmdDialogPrev = alt-lbrace ScreenList = alt-prime
ScreenNext = alt-rbrace
ScreenPrev = alt-lbrace
[input] [input]
InputBol = ctrl-a; alt-lt; home; a1 Home = ctrl-a; alt-lt; home; a1
InputEol = ctrl-e; alt-gt; end; c1 End = ctrl-e; alt-gt; end; c1
InputMoveLeft = left; alt-left Left = left; alt-left; ctrl-b
InputWordLeft = ctrl-left Right = right; alt-right; ctrl-f
InputBackwardChar = ctrl-b WordLeft = ctrl-left; alt-b
InputBackwardWord = alt-b WordRight = ctrl-right; alt-f
InputMoveRight = right; alt-right Backspace = backspace
InputWordRight = ctrl-right Delete = delete
InputForwardChar = ctrl-f DeleteToWordBegin = alt-backspace
InputForwardWord = alt-f DeleteToWordEnd = alt-d
InputBackwardDelete = backspace Mark =
InputDeleteChar = delete Remove = ctrl-w
InputKillWord = alt-d Cut =
InputBackwardKillWord = alt-backspace Store = alt-w
InputSetMark = Paste =
InputKillRegion = ctrl-w Yank = ctrl-y
InputXCut = DeleteToEnd = ctrl-k
InputXStore = alt-w HistoryPrev = alt-p; ctrl-down
InputXPaste = HistoryNext = alt-n; ctrl-up
InputYank = ctrl-y History = alt-h
InputKillLine = ctrl-k Complete = alt-tab
InputHistoryPrev = alt-p; ctrl-down Clear =
InputHistoryNext = alt-n; ctrl-up MarkLeft =
InputHistoryShow = alt-h MarkRight =
InputComplete = alt-tab MarkToWordBegin =
InputClearLine = MarkToWordEnd =
InputLeftHighlight = MarkToHome =
InputRightHighlight = MarkToEnd =
InputWordLeftHighlight =
InputWordRightHighlight =
InputBolHighlight =
InputEolHighlight =
[listbox] [listbox]
ListboxMoveUp = up; ctrl-p Up = up; ctrl-p
ListboxMoveDown = down; ctrl-n Down = down; ctrl-n
ListboxMoveHome = home; alt-lt; a1 Top = home; alt-lt; a1
ListboxMoveEnd = end; alt-gt; c1 Bottom = end; alt-gt; c1
ListboxMovePgUp = pgup; alt-v PageUp = pgup; alt-v
ListboxMovePgDn = pgdn; ctrl-v PageDown = pgdn; ctrl-v
ListboxDeleteItem = delete; d Delete = delete; d
ListboxDeleteAll = shift-delete; shift-d Clear = shift-delete; shift-d
[tree] [tree]
TreeHelp = f1 Help = f1
TreeForget = f3 Reread = f2; ctrl-r
TreeToggleNav = f4 Forget = f3
TreeCopy = f5 ToggleNavigation = f4
TreeMove = f6 Copy = f5
TreeMoveUp = up; ctrl-p Move = f6
TreeMoveDown = down; ctrl-n Up = up; ctrl-p
TreeMoveLeft = left Down = down; ctrl-n
TreeMoveRight = right Left = left
TreeMoveHome = home; alt-lt; a1 Right = right
TreeMoveEnd = end; alt-gt; c1 Top = home; alt-lt; a1
TreeMovePgUp = pgup; alt-v Bottom = end; alt-gt; c1
TreeMovePgDn = pgdn; ctrl-v PageUp = pgup; alt-v
TreeOpen = enter PageDown = pgdn; ctrl-v
TreeRescan = f2; ctrl-r Enter = enter
TreeStartSearch = ctrl-s; alt-s Search = ctrl-s; alt-s
TreeRemove = f8; delete Delete = f8; delete
[help] [help]
HelpHelp = f1 Help = f1
HelpIndex = f2; c Index = f2; c
HelpBack = f3; left; l Back = f3; left; l
HelpQuit = f10; esc; ctrl-g Quit = f10; esc; ctrl-g
HelpMoveUp = up; ctrl-p Up = up; ctrl-p
HelpMoveDown = down; ctrl-n Down = down; ctrl-n
HelpMovePgDn = f; space; pgdn; ctrl-v PageDown = f; space; pgdn; ctrl-v
HelpMovePgUp = b; pgup; alt-v; backspace PageUp = b; pgup; alt-v; backspace
HelpMoveHalfPgDn = d HalfPageDown = d
HelpMoveHalfPgUp = u HalfPageUp = u
HelpMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
HelpMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
HelpSelectLink = right; enter Enter = right; enter
HelpNextLink = tab LinkNext = tab
HelpPrevLink = alt-tab LinkPrev = alt-tab
HelpNextNode = n NodeNext = n
HelpPrevNode = p NodePrev = p
[editor] [editor]
EditXStore = alt-w Store = alt-w
EditXPaste = ctrl-y Paste = ctrl-y
EditXCut = ctrl-w Cut = ctrl-w
EditDeleteLine = ctrl-y Up = up; ctrl-p
EditDeleteToLineEnd = ctrl-k Down = down; ctrl-n
EditDeleteToLineBegin = Left = left; ctrl-b
EditLeft = left; ctrl-b Right = right; ctrl-f
EditRight = right; ctrl-f WordLeft = ctrl-left; alt-b
EditUp = up; ctrl-p WordRight = ctrl-right; alt-f
EditDown = down; ctrl-n Enter = enter
EditEnter = enter Return = shift-enter
EditReturn = shift-enter BackSpace = backspace
EditBackSpace = backspace Delete = delete
EditDelete = delete PageUp = pgup; alt-v
EditPageUp = pgup; alt-v PageDown = pgdn; ctrl-v
EditPageDown = pgdn; ctrl-v Home = home; ctrl-a
EditWordLeft = ctrl-left; alt-b End = end; ctrl-e
EditWordRight = ctrl-right; alt-f Tab = tab
EditHome = home; ctrl-a Undo = ctrl-u
EditEnd = end; ctrl-e Redo =
EditTab = tab Top = ctrl-home; alt-lt
EditUndo = ctrl-u Bottom = ctrl-end; alt-gt
EditBeginningOfText = ctrl-home; alt-lt ScrollUp = ctrl-up
EditEndOfText = ctrl-end; alt-gt ScrollDown = ctrl-down
EditScrollUp = ctrl-up TopOnScreen = ctrl-pgup
EditScrollDown = ctrl-down BottomOnScreen = ctrl-pgdn
EditBeginPage = ctrl-pgup DeleteToWordBegin = alt-backspace
EditEndPage = ctrl-pgdn DeleteToWordEnd = alt-d
EditDeleteWordLeft = alt-backspace DeleteLine = ctrl-y
EditDeleteWordRight = alt-d DeleteToEnd = ctrl-k
EditParagraphUp = DeleteToHome =
EditParagraphDown = ParagraphUp =
EditSave = f2 ParagraphDown =
EditLoad = Save = f2
EditSaveas = f12 EditFile =
EditMark = f3; ctrl-at SaveAs = f12; ctrl-f2
EditCopy = f5 Mark = f3; ctrl-at
EditMove = f6 Copy = f5
EditRemove = f8 Move = f6
EditMarkAll = Remove = f8
EditUnmark = MarkLine =
EditFind = f7; ctrl-s MarkWord =
EditMarkLine = MarkAll =
EditMarkWord = Unmark =
EditShiftBlockLeft = Search = f7; ctrl-s
EditShiftBlockRight = SearchContinue = f17
EditPageUpHighlight = shift-pgup BlockShiftLeft =
EditPageDownHighlight = shift-pgdn BlockShiftRight =
EditLeftHighlight = shift-left MarkPageUp = shift-pgup
EditRightHighlight = shift-right MarkPageDown = shift-pgdn
EditWordLeftHighlight = ctrl-shift-left MarkLeft = shift-left
EditWordRightHighlight = ctrl-shift-right MarkRight = shift-right
EditUpHighlight = shift-up MarkToWordBegin = ctrl-shift-left
EditDownHighlight = shift-down MarkToWordEnd = ctrl-shift-right
EditHomeHighlight = shift-home MarkUp = shift-up
EditEndHighlight = shift-end MarkDown = shift-down
EditBeginningOfTextHighlight = ctrl-shift-home MarkToHome = shift-home
EditEndOfTextHighlight = ctrl-shift-end MarkToEnd = shift-end
EditBeginPageHighlight = ctrl-shift-pgup MarkToFileBegin = ctrl-shift-home
EditEndPageHighlight = ctrl-shift-pgdn MarkToFileEnd = ctrl-shift-end
EditScrollUpHighlight = ctrl-shift-up MarkToPageBegin = ctrl-shift-pgup
EditScrollDownHighlight = ctrl-shift-down MarkToPageEnd = ctrl-shift-pgdn
EditParagraphUpHighlight = MarkScrollUp = ctrl-shift-up
EditParagraphDownHighlight = MarkScrollDown = ctrl-shift-down
EditPageUpAltHighlight = alt-pgup MarkParagraphUp =
EditPageDownAltHighlight = alt-pgdn MarkParagraphDown =
EditLeftAltHighlight = alt-left MarkColumnPageUp = alt-pgup
EditRightAltHighlight = alt-right MarkColumnPageDown = alt-pgdn
EditWordLeftAltHighlight = ctrl-alt-left MarkColumnLeft = alt-left
EditWordRightAltHighlight = ctrl-alt-right MarkColumnRight = alt-right
EditUpAltHighlight = alt-up MarkColumnUp = alt-up
EditDownAltHighlight = alt-down MarkColumnDown = alt-down
EditHomeAltHighlight = alt-home MarkColumnScrollUp =
EditEndAltHighlight = alt-end MarkColumnScrollDown =
EditBeginningOfTextAltHighlight = ctrl-alt-home MarkColumnParagraphUp =
EditEndOfTextHighlight = ctrl-alt-end MarkColumnParagraphDown =
EditBeginPageHighlight = ctrl-alt-pgup BlockSave =
EditEndPageAltHighlight = ctrl-alt-pgdn MarkColumn = f13
EditScrollUpAltHighlight = Replace = f4
EditScrollDownAltHighlight = ReplaceContinue = f14
EditParagraphUpAltHighlight = Complete = alt-tab
EditParagraphDownAltHighlight = InsertFile = f15
EditSaveBlock = Quit = f10
EditColumnMark = f13 InsertOverwrite = insert
EditFindAgain = f17 Help = f1
EditReplace = f4 Date =
EditReplaceAgain = f14 Refresh = ctrl-l
EditCompleteWord = alt-tab Goto = alt-l
EditDebugStart = Sort = alt-t
EditDebugStop = Mail =
EditDebugToggleBreak = ParagraphFormat = alt-p
EditDebugClear = MatchBracket =
EditDebugNext = ExternalCommand = alt-u
EditDebugStep = UserMenu = f11
EditDebugBackTrace = Menu = f9
EditDebugContinue = Bookmark =
EditDebugEnterCommand = BookmarkFlush =
EditDebugUntilCurser = BookmarkNext =
EditInsertFile = f15 BookmarkPrev =
EditQuit = f10 History =
EditToggleInsert = insert Shell = ctrl-o
EditHelp = f1 InsertLiteral = ctrl-q
EditDate = MacroStartRecord =
EditRefresh = ctrl-l MacroStopRecord =
EditGoto = alt-l MacroStartStopRecord = ctrl-r
EditManPage = MacroDelete =
EditSort = alt-t ShowNumbers = alt-n
EditMail = ShowTabTws = alt-underline
EditCancel = SyntaxOnOff = ctrl-s
EditComplete = SyntaxChoose =
EditParagraphFormat = alt-p ShowMargin =
EditUtil = Find = alt-enter
EditTypeLoadPython = FilePrev = alt-minus
EditFindFile = FileNext = alt-plus
EditCtags = RepeatStartStopRecord =
EditMatchBracket =
EditTerminal =
EditTerminalApp =
EditExtCmd = alt-u
EditUserMenu = f11
EditSaveDesktop =
EditNewWindow =
EditCycle =
EditMenu = f9
EditSaveAndQuit =
EditRunAnother =
EditCheckSaveAndQuit =
EditMaximize =
EditToggleBookmark =
EditFlushBookmarks =
EditNextBookmark =
EditPrevBookmark =
EditSelectionHistory =
EditShell = ctrl-o
EditInsertLiteral = ctrl-q
EditBeginRecordMacro =
EditEndRecordMacro =
EditBeginOrEndMacro = ctrl-r
EditDeleteMacro =
EditToggleLineState = alt-n
EditToggleTabTWS = alt-underline
EditToggleSyntax = ctrl-s
EditToggleShowMargin =
EditFindDefinition = alt-enter
EditLoadPrevFile = alt-minus
EditLoadNextFile = alt-plus
EditBeginEndRepeat =
SelectCodepage = alt-e SelectCodepage = alt-e
EditExtMode = ctrl-x Options =
OptionsSaveMode =
LearnKeys =
ExtendedKeyMap = ctrl-x
[editor:xmap] [editor:xmap]
EditNew = k EditNew = k
[viewer] [viewer]
ViewHelp = f1 Help = f1
ViewToggleWrapMode = f2 WrapMode = f2
ViewQuit = f3; f10; q; esc; ctrl-g Quit = f3; f10; q; esc; ctrl-g
ViewToggleHexMode = f4 HexMode = f4
ViewGoto = f5 Goto = f5
ViewSearch = f7; question; slash Search = f7; question; slash
ViewToggleMagicMode = f8 MagicMode = f8
ViewToggleNroffMode = f9 NroffMode = f9
ViewContinueSearch = ctrl-r; ctrl-s; f17; n SearchContinue = ctrl-r; ctrl-s; f17; n
ViewMoveToBol = ctrl-a Home = ctrl-a
ViewMoveToEol = ctrl-e End = ctrl-e
ViewMoveLeft = h; left Left = h; left
ViewMoveRight = l; right Right = l; right
ViewMoveLeft10 = ctrl-left LeftQuick= ctrl-left
ViewMoveRight10 = ctrl-right RightQuick = ctrl-right
ViewMoveUp = k; y; insert; up; ctrl-p Up = k; y; insert; up; ctrl-p
ViewMoveDown = j; e; delete; down; enter; ctrl-n Down = j; e; delete; down; enter; ctrl-n
ViewMovePgDn = f; space; pgdn; ctrl-v PageDown = f; space; pgdn; ctrl-v
ViewMovePgUp = b; pgup; alt-v; backspace PageUp = b; pgup; alt-v; backspace
ViewMoveHalfPgDn = d HalfPageDown = d
ViewMoveHalfPgUp = u HalfPageUp = u
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
ViewGotoBookmark = m BookmarkGoto = m
ViewNewBookmark = r Bookmark = r
ViewNextFile = ctrl-f FileNext = ctrl-f
ViewPrevFile = ctrl-b FilePrev = ctrl-b
SelectCodepage = alt-e SelectCodepage = alt-e
ShowCommandLine = ctrl-o Shell = ctrl-o
ViewToggleRuler = alt-r Ruler = alt-r
[viewer:hex] [viewer:hex]
ViewHelp = f1 Help = f1
ViewToggleHexEditMode = f2 HexEditMode = f2
ViewQuit = f3; f10; q; esc; ctrl-g Quit = f3; f10; q; esc; ctrl-g
ViewToggleHexMode = f4 HexMode = f4
ViewGoto = f5 Goto = f5
ViewHexEditSave = f6 Save = f6
ViewSearch = f7; question; slash Search = f7; question; slash
ViewToggleMagicMode = f8 SearchContinue = ctrl-r; ctrl-s; f17; n
ViewToggleNroffMode = f9 MagicMode = f8
ViewToggleHexNavMode = tab NroffMode = f9
ViewMoveToBol = ctrl-a; home ToggleNavigation = tab
ViewMoveToEol = ctrl-e; end Home = ctrl-a; home
ViewMoveLeft = b; left End = ctrl-e; end
ViewMoveRight = f; right Left = b; left
ViewMoveUp = k; y; up Right = f; right
ViewMoveDown = j; delete; down Up = k; y; up
ViewMovePgDn = pgdn; ctrl-v Down = j; delete; down
ViewMovePgUp = pgup; alt-v PageDown = pgdn; ctrl-v
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g PageUp = pgup; alt-v
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g Top = ctrl-home; ctrl-pgup; a1; alt-lt; g
Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g
[diffviewer] [diffviewer]
DiffDisplaySymbols = alt-s; s ShowSymbols = alt-s; s
DiffDisplayNumbers = alt-n; l ShowNumbers = alt-n; l
DiffFull = f SplitFull = f
DiffEqual = equal SplitEqual = equal
DiffSplitMore = gt SplitMore = gt
DiffSplitLess = lt SplitLess = lt
DiffSetTab2 = 2 Tab2 = 2
DiffSetTab3 = 3 Tab3 = 3
DiffSetTab4 = 4 Tab4 = 4
DiffSetTab8 = 8 Tab8 = 8
DiffSwapPanel = ctrl-u Swap = ctrl-u
DiffRedo = ctrl-r Redo = ctrl-r
DiffNextHunk = n; enter; space HunkNext = n; enter; space
DiffPrevHunk = p; backspace HunkPrev = p; backspace
DiffGoto = g; shift-g Goto = g; shift-g
DiffSave = f2 Save = f2
DiffEditCurrent = f4 Edit = f4
DiffEditOther = f14 EditOther = f14
DiffMergeCurrentHunk = f5 Merge = f5
DiffSearch = f7 Search = f7
DiffContinueSearch = f17 SearchContinue = f17
DiffOptions = f9 Options = f9
DiffBOF = ctrl-home Top = ctrl-home
DiffEOF = ctrl-end Bottom = ctrl-end
DiffDown = down Down = down
DiffUp = up Up = up
DiffQuickLeft = ctrl-left LeftQuick = ctrl-left
DiffQuickRight = ctrl-right RightQuick = ctrl-right
DiffLeft = left Left = left
DiffRight = right Right = right
DiffPageDown = pgdn PageDown = pgdn
DiffPageUp = pgup PageUp = pgup
DiffHome = home Home = home
DiffEnd = end End = end
DiffHelp = f1 Help = f1
DiffQuit = f10; q; shift-q; ctrl-g; esc Quit = f10; q; shift-q; ctrl-g; esc
ShowCommandLine = ctrl-o Shell = ctrl-o
SelectCodepage = alt-e SelectCodepage = alt-e

View File

@ -2980,29 +2980,29 @@ dview_execute_cmd (WDiff * dview, unsigned long command)
cb_ret_t res = MSG_HANDLED; cb_ret_t res = MSG_HANDLED;
switch (command) switch (command)
{ {
case CK_DiffHelp: case CK_Help:
interactive_display (NULL, "[Diff Viewer]"); interactive_display (NULL, "[Diff Viewer]");
break; break;
case CK_DiffDisplaySymbols: case CK_ShowSymbols:
dview->display_symbols ^= 1; dview->display_symbols ^= 1;
dview->new_frame = 1; dview->new_frame = 1;
break; break;
case CK_DiffDisplayNumbers: case CK_ShowNumbers:
dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a); dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a);
dview->new_frame = 1; dview->new_frame = 1;
break; break;
case CK_DiffFull: case CK_SplitFull:
dview->full ^= 1; dview->full ^= 1;
dview->new_frame = 1; dview->new_frame = 1;
break; break;
case CK_DiffEqual: case CK_SplitEqual:
if (!dview->full) if (!dview->full)
{ {
dview->bias = 0; dview->bias = 0;
dview->new_frame = 1; dview->new_frame = 1;
} }
break; break;
case CK_DiffSplitMore: case CK_SplitMore:
if (!dview->full) if (!dview->full)
{ {
dview_compute_split (dview, 1); dview_compute_split (dview, 1);
@ -3010,122 +3010,124 @@ dview_execute_cmd (WDiff * dview, unsigned long command)
} }
break; break;
case CK_DiffSplitLess: case CK_SplitLess:
if (!dview->full) if (!dview->full)
{ {
dview_compute_split (dview, -1); dview_compute_split (dview, -1);
dview->new_frame = 1; dview->new_frame = 1;
} }
break; break;
case CK_DiffSetTab2: case CK_Tab2:
dview->tab_size = 2; dview->tab_size = 2;
break; break;
case CK_DiffSetTab3: case CK_Tab3:
dview->tab_size = 3; dview->tab_size = 3;
break; break;
case CK_DiffSetTab4: case CK_Tab4:
dview->tab_size = 4; dview->tab_size = 4;
break; break;
case CK_DiffSetTab8: case CK_Tab8:
dview->tab_size = 8; dview->tab_size = 8;
break; break;
case CK_DiffSwapPanel: case CK_Swap:
dview->ord ^= 1; dview->ord ^= 1;
break; break;
case CK_DiffRedo: case CK_Redo:
dview_redo (dview); dview_redo (dview);
break; break;
case CK_DiffNextHunk: case CK_HunkNext:
dview->skip_rows = dview->search.last_accessed_num_line = dview->skip_rows = dview->search.last_accessed_num_line =
find_next_hunk (dview->a[0], dview->skip_rows); find_next_hunk (dview->a[0], dview->skip_rows);
break; break;
case CK_DiffPrevHunk: case CK_HunkPrev:
dview->skip_rows = dview->search.last_accessed_num_line = dview->skip_rows = dview->search.last_accessed_num_line =
find_prev_hunk (dview->a[0], dview->skip_rows); find_prev_hunk (dview->a[0], dview->skip_rows);
break; break;
case CK_DiffGoto: case CK_Goto:
dview_goto_cmd (dview, TRUE); dview_goto_cmd (dview, TRUE);
break; break;
case CK_DiffEditCurrent: case CK_Edit:
dview_edit (dview, dview->ord); dview_edit (dview, dview->ord);
break; break;
case CK_DiffMergeCurrentHunk: case CK_Merge:
do_merge_hunk (dview); do_merge_hunk (dview);
dview_redo (dview); dview_redo (dview);
break; break;
case CK_DiffEditOther: case CK_EditOther:
dview_edit (dview, dview->ord ^ 1); dview_edit (dview, dview->ord ^ 1);
break; break;
case CK_DiffSearch: case CK_Search:
dview_search_cmd (dview); dview_search_cmd (dview);
break; break;
case CK_DiffContinueSearch: case CK_SearchContinue:
dview_continue_search_cmd (dview); dview_continue_search_cmd (dview);
break; break;
case CK_DiffBOF: case CK_Top:
dview->skip_rows = dview->search.last_accessed_num_line = 0; dview->skip_rows = dview->search.last_accessed_num_line = 0;
break; break;
case CK_DiffEOF: case CK_Bottom:
dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1; dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1;
break; break;
case CK_DiffUp: case CK_Up:
if (dview->skip_rows > 0) if (dview->skip_rows > 0)
{ {
dview->skip_rows--; dview->skip_rows--;
dview->search.last_accessed_num_line = dview->skip_rows; dview->search.last_accessed_num_line = dview->skip_rows;
} }
break; break;
case CK_DiffDown: case CK_Down:
dview->skip_rows++; dview->skip_rows++;
dview->search.last_accessed_num_line = dview->skip_rows; dview->search.last_accessed_num_line = dview->skip_rows;
break; break;
case CK_DiffPageDown: case CK_PageDown:
if (dview->height > 2) if (dview->height > 2)
{ {
dview->skip_rows += dview->height - 2; dview->skip_rows += dview->height - 2;
dview->search.last_accessed_num_line = dview->skip_rows; dview->search.last_accessed_num_line = dview->skip_rows;
} }
break; break;
case CK_DiffPageUp: case CK_PageUp:
if (dview->height > 2) if (dview->height > 2)
{ {
dview->skip_rows -= dview->height - 2; dview->skip_rows -= dview->height - 2;
dview->search.last_accessed_num_line = dview->skip_rows; dview->search.last_accessed_num_line = dview->skip_rows;
} }
break; break;
case CK_DiffLeft: case CK_Left:
dview->skip_cols--; dview->skip_cols--;
break; break;
case CK_DiffRight: case CK_Right:
dview->skip_cols++; dview->skip_cols++;
break; break;
case CK_DiffQuickLeft: case CK_LeftQuick:
dview->skip_cols -= 8; dview->skip_cols -= 8;
break; break;
case CK_DiffQuickRight: case CK_RightQuick:
dview->skip_cols += 8; dview->skip_cols += 8;
break; break;
case CK_DiffHome: case CK_Home:
dview->skip_cols = 0; dview->skip_cols = 0;
break; break;
case CK_ShowCommandLine: case CK_Shell:
view_other_cmd (); view_other_cmd ();
break; break;
case CK_DiffQuit: case CK_Quit:
dview->view_quit = 1; dview->view_quit = 1;
break; break;
case CK_DiffSave: case CK_Save:
dview_do_save (dview); dview_do_save (dview);
break; break;
case CK_DiffOptions: case CK_Options:
dview_diff_options (dview); dview_diff_options (dview);
break; break;
#ifdef HAVE_CHARSET
case CK_SelectCodepage: case CK_SelectCodepage:
dview_select_encoding (dview); dview_select_encoding (dview);
dview_reread (dview); dview_reread (dview);
tty_touch_screen (); tty_touch_screen ();
repaint_screen (); repaint_screen ();
break; break;
#endif
default: default:
res = MSG_NOT_HANDLED; res = MSG_NOT_HANDLED;
} }

View File

@ -1666,8 +1666,7 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
/* run shell scripts from menu */ /* run shell scripts from menu */
if (user_menu_cmd (edit, menu_file, selected_entry) if (user_menu_cmd (edit, menu_file, selected_entry)
&& (mc_stat (block_file, &status) == 0) && (mc_stat (block_file, &status) == 0) && (status.st_size != 0))
&& (status.st_size != 0))
{ {
int rc = 0; int rc = 0;
FILE *fd; FILE *fd;
@ -3386,8 +3385,9 @@ edit_find_bracket (WEdit * edit)
void void
edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_insertion) edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_insertion)
{ {
if (command == CK_Begin_Record_Macro || command == CK_Begin_Record_Repeat if (command == CK_MacroStartRecord || command == CK_RepeatStartRecord
|| (macro_index < 0 && (command == CK_Begin_End_Macro || command == CK_Begin_End_Repeat))) || (macro_index < 0
&& (command == CK_MacroStartStopRecord || command == CK_RepeatStartStopRecord)))
{ {
macro_index = 0; macro_index = 0;
edit->force |= REDRAW_CHAR_ONLY | REDRAW_LINE; edit->force |= REDRAW_CHAR_ONLY | REDRAW_LINE;
@ -3396,19 +3396,18 @@ edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_inse
if (macro_index != -1) if (macro_index != -1)
{ {
edit->force |= REDRAW_COMPLETELY; edit->force |= REDRAW_COMPLETELY;
if (command == CK_End_Record_Macro || command == CK_Begin_End_Macro) if (command == CK_MacroStopRecord || command == CK_MacroStartStopRecord)
{ {
edit_store_macro_cmd (edit); edit_store_macro_cmd (edit);
macro_index = -1; macro_index = -1;
return; return;
} }
else if (command == CK_End_Record_Repeat || command == CK_Begin_End_Repeat) else if (command == CK_RepeatStopRecord || command == CK_RepeatStartStopRecord)
{ {
edit_repeat_macro_cmd (edit); edit_repeat_macro_cmd (edit);
macro_index = -1; macro_index = -1;
return; return;
} }
} }
if (macro_index >= 0 && macro_index < MAX_MACRO_LENGTH - 1) if (macro_index >= 0 && macro_index < MAX_MACRO_LENGTH - 1)
@ -3417,7 +3416,7 @@ edit_execute_key_command (WEdit * edit, unsigned long command, int char_for_inse
record_macro_buf[macro_index++].ch = char_for_insertion; record_macro_buf[macro_index++].ch = char_for_insertion;
} }
/* record the beginning of a set of editing actions initiated by a key press */ /* record the beginning of a set of editing actions initiated by a key press */
if (command != CK_Undo && command != CK_Ext_Mode) if (command != CK_Undo && command != CK_ExtendedKeyMap)
edit_push_key_press (edit); edit_push_key_press (edit);
edit_execute_cmd (edit, command, char_for_insertion); edit_execute_cmd (edit, command, char_for_insertion);
@ -3542,16 +3541,16 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
switch (command) switch (command)
{ {
case CK_Begin_Page: case CK_TopOnScreen:
case CK_End_Page: case CK_BottomOnScreen:
case CK_Begin_Page_Highlight: case CK_MarkToPageBegin:
case CK_End_Page_Highlight: case CK_MarkToPageEnd:
case CK_Word_Left:
case CK_Word_Right:
case CK_Up: case CK_Up:
case CK_Down: case CK_Down:
case CK_Left: case CK_Left:
case CK_Right: case CK_Right:
case CK_WordLeft:
case CK_WordRight:
if (edit->mark2 >= 0) if (edit->mark2 >= 0)
{ {
if (!option_persistent_selections) if (!option_persistent_selections)
@ -3566,26 +3565,26 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
switch (command) switch (command)
{ {
case CK_Begin_Page: case CK_TopOnScreen:
case CK_End_Page: case CK_BottomOnScreen:
case CK_Begin_Page_Highlight: case CK_MarkToPageBegin:
case CK_End_Page_Highlight: case CK_MarkToPageEnd:
case CK_Word_Left:
case CK_Word_Right:
case CK_Up: case CK_Up:
case CK_Down: case CK_Down:
case CK_Word_Left_Highlight: case CK_WordLeft:
case CK_Word_Right_Highlight: case CK_WordRight:
case CK_Up_Highlight: case CK_MarkToWordBegin:
case CK_Down_Highlight: case CK_MarkToWordEnd:
case CK_Up_Alt_Highlight: case CK_MarkUp:
case CK_Down_Alt_Highlight: case CK_MarkDown:
case CK_MarkColumnUp:
case CK_MarkColumnDown:
if (edit->mark2 == -1) if (edit->mark2 == -1)
break; /*marking is following the cursor: may need to highlight a whole line */ break; /*marking is following the cursor: may need to highlight a whole line */
case CK_Left: case CK_Left:
case CK_Right: case CK_Right:
case CK_Left_Highlight: case CK_MarkLeft:
case CK_Right_Highlight: case CK_MarkRight:
edit->force |= REDRAW_CHAR_ONLY; edit->force |= REDRAW_CHAR_ONLY;
} }
@ -3654,25 +3653,25 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
edit_delete (edit, 0); edit_delete (edit, 0);
break; break;
case CK_Delete_Word_Left: case CK_DeleteToWordBegin:
edit->over_col = 0; edit->over_col = 0;
edit_left_delete_word (edit); edit_left_delete_word (edit);
break; break;
case CK_Delete_Word_Right: case CK_DeleteToWordEnd:
if (option_cursor_beyond_eol && edit->over_col > 0) if (option_cursor_beyond_eol && edit->over_col > 0)
edit_insert_over (edit); edit_insert_over (edit);
edit_right_delete_word (edit); edit_right_delete_word (edit);
break; break;
case CK_Delete_Line: case CK_DeleteLine:
edit_delete_line (edit); edit_delete_line (edit);
break; break;
case CK_Delete_To_Line_End: case CK_DeleteToHome:
edit_delete_to_line_end (edit);
break;
case CK_Delete_To_Line_Begin:
edit_delete_to_line_begin (edit); edit_delete_to_line_begin (edit);
break; break;
case CK_DeleteToEnd:
edit_delete_to_line_end (edit);
break;
case CK_Enter: case CK_Enter:
edit->over_col = 0; edit->over_col = 0;
if (option_auto_para_formatting) if (option_auto_para_formatting)
@ -3695,22 +3694,22 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit_insert (edit, '\n'); edit_insert (edit, '\n');
break; break;
case CK_Page_Up_Alt_Highlight: case CK_MarkColumnPageUp:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Page_Up: case CK_PageUp:
case CK_Page_Up_Highlight: case CK_MarkPageUp:
edit_move_up (edit, edit->num_widget_lines - 1, 1); edit_move_up (edit, edit->num_widget_lines - 1, 1);
break; break;
case CK_Page_Down_Alt_Highlight: case CK_MarkColumnPageDown:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Page_Down: case CK_PageDown:
case CK_Page_Down_Highlight: case CK_MarkPageDown:
edit_move_down (edit, edit->num_widget_lines - 1, 1); edit_move_down (edit, edit->num_widget_lines - 1, 1);
break; break;
case CK_Left_Alt_Highlight: case CK_MarkColumnLeft:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Left: case CK_Left:
case CK_Left_Highlight: case CK_MarkLeft:
if (option_fake_half_tabs) if (option_fake_half_tabs)
{ {
if (is_in_indent (edit) && right_of_four_spaces (edit)) if (is_in_indent (edit) && right_of_four_spaces (edit))
@ -3725,10 +3724,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
edit_left_char_move_cmd (edit); edit_left_char_move_cmd (edit);
break; break;
case CK_Right_Alt_Highlight: case CK_MarkColumnRight:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Right: case CK_Right:
case CK_Right_Highlight: case CK_MarkRight:
if (option_fake_half_tabs) if (option_fake_half_tabs)
{ {
if (is_in_indent (edit) && left_of_four_spaces (edit)) if (is_in_indent (edit) && left_of_four_spaces (edit))
@ -3740,66 +3739,66 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
edit_right_char_move_cmd (edit); edit_right_char_move_cmd (edit);
break; break;
case CK_Begin_Page: case CK_TopOnScreen:
case CK_Begin_Page_Highlight: case CK_MarkToPageBegin:
edit_begin_page (edit); edit_begin_page (edit);
break; break;
case CK_End_Page: case CK_BottomOnScreen:
case CK_End_Page_Highlight: case CK_MarkToPageEnd:
edit_end_page (edit); edit_end_page (edit);
break; break;
case CK_Word_Left: case CK_WordLeft:
case CK_Word_Left_Highlight: case CK_MarkToWordBegin:
edit->over_col = 0; edit->over_col = 0;
edit_left_word_move_cmd (edit); edit_left_word_move_cmd (edit);
break; break;
case CK_Word_Right: case CK_WordRight:
case CK_Word_Right_Highlight: case CK_MarkToWordEnd:
edit->over_col = 0; edit->over_col = 0;
edit_right_word_move_cmd (edit); edit_right_word_move_cmd (edit);
break; break;
case CK_Up_Alt_Highlight: case CK_MarkColumnUp:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Up: case CK_Up:
case CK_Up_Highlight: case CK_MarkUp:
edit_move_up (edit, 1, 0); edit_move_up (edit, 1, 0);
break; break;
case CK_Down_Alt_Highlight: case CK_MarkColumnDown:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Down: case CK_Down:
case CK_Down_Highlight: case CK_MarkDown:
edit_move_down (edit, 1, 0); edit_move_down (edit, 1, 0);
break; break;
case CK_Paragraph_Up_Alt_Highlight: case CK_MarkColumnParagraphUp:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Paragraph_Up: case CK_ParagraphUp:
case CK_Paragraph_Up_Highlight: case CK_MarkParagraphUp:
edit_move_up_paragraph (edit, 0); edit_move_up_paragraph (edit, 0);
break; break;
case CK_Paragraph_Down_Alt_Highlight: case CK_MarkColumnParagraphDown:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Paragraph_Down: case CK_ParagraphDown:
case CK_Paragraph_Down_Highlight: case CK_MarkParagraphDown:
edit_move_down_paragraph (edit, 0); edit_move_down_paragraph (edit, 0);
break; break;
case CK_Scroll_Up_Alt_Highlight: case CK_MarkColumnScrollUp:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Scroll_Up: case CK_ScrollUp:
case CK_Scroll_Up_Highlight: case CK_MarkScrollUp:
edit_move_up (edit, 1, 1); edit_move_up (edit, 1, 1);
break; break;
case CK_Scroll_Down_Alt_Highlight: case CK_MarkColumnScrollDown:
edit->column_highlight = 1; edit->column_highlight = 1;
case CK_Scroll_Down: case CK_ScrollDown:
case CK_Scroll_Down_Highlight: case CK_MarkScrollDown:
edit_move_down (edit, 1, 1); edit_move_down (edit, 1, 1);
break; break;
case CK_Home: case CK_Home:
case CK_Home_Highlight: case CK_MarkToHome:
edit_cursor_to_bol (edit); edit_cursor_to_bol (edit);
break; break;
case CK_End: case CK_End:
case CK_End_Highlight: case CK_MarkToEnd:
edit_cursor_to_eol (edit); edit_cursor_to_eol (edit);
break; break;
case CK_Tab: case CK_Tab:
@ -3827,8 +3826,8 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
break; break;
case CK_Toggle_Insert: case CK_InsertOverwrite:
edit->overwrite = (edit->overwrite == 0); edit->overwrite = !edit->overwrite;
break; break;
case CK_Mark: case CK_Mark:
@ -3840,13 +3839,13 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
edit_mark_cmd (edit, 0); edit_mark_cmd (edit, 0);
break; break;
case CK_Column_Mark: case CK_MarkColumn:
if (!edit->column_highlight) if (!edit->column_highlight)
edit_push_undo_action (edit, COLUMN_OFF); edit_push_undo_action (edit, COLUMN_OFF);
edit->column_highlight = 1; edit->column_highlight = 1;
edit_mark_cmd (edit, 0); edit_mark_cmd (edit, 0);
break; break;
case CK_Mark_All: case CK_MarkAll:
edit_set_markers (edit, 0, edit->last_byte, 0, 0); edit_set_markers (edit, 0, edit->last_byte, 0, 0);
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
@ -3856,49 +3855,43 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit->column_highlight = 0; edit->column_highlight = 0;
edit_mark_cmd (edit, 1); edit_mark_cmd (edit, 1);
break; break;
case CK_Mark_Word: case CK_MarkWord:
if (edit->column_highlight) if (edit->column_highlight)
edit_push_undo_action (edit, COLUMN_ON); edit_push_undo_action (edit, COLUMN_ON);
edit->column_highlight = 0; edit->column_highlight = 0;
edit_mark_current_word_cmd (edit); edit_mark_current_word_cmd (edit);
break; break;
case CK_Mark_Line: case CK_MarkLine:
if (edit->column_highlight) if (edit->column_highlight)
edit_push_undo_action (edit, COLUMN_ON); edit_push_undo_action (edit, COLUMN_ON);
edit->column_highlight = 0; edit->column_highlight = 0;
edit_mark_current_line_cmd (edit); edit_mark_current_line_cmd (edit);
break; break;
case CK_Toggle_Line_State:
case CK_ShowNumbers:
option_line_state = !option_line_state; option_line_state = !option_line_state;
if (option_line_state) option_line_state_width = option_line_state ? LINE_STATE_WIDTH : 0;
{
option_line_state_width = LINE_STATE_WIDTH;
}
else
{
option_line_state_width = 0;
}
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Toggle_Show_Margin: case CK_ShowMargin:
show_right_margin = !show_right_margin; show_right_margin = !show_right_margin;
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Toggle_Bookmark: case CK_Bookmark:
book_mark_clear (edit, edit->curs_line, BOOK_MARK_FOUND_COLOR); book_mark_clear (edit, edit->curs_line, BOOK_MARK_FOUND_COLOR);
if (book_mark_query_color (edit, edit->curs_line, BOOK_MARK_COLOR)) if (book_mark_query_color (edit, edit->curs_line, BOOK_MARK_COLOR))
book_mark_clear (edit, edit->curs_line, BOOK_MARK_COLOR); book_mark_clear (edit, edit->curs_line, BOOK_MARK_COLOR);
else else
book_mark_insert (edit, edit->curs_line, BOOK_MARK_COLOR); book_mark_insert (edit, edit->curs_line, BOOK_MARK_COLOR);
break; break;
case CK_Flush_Bookmarks: case CK_BookmarkFlush:
book_mark_flush (edit, BOOK_MARK_COLOR); book_mark_flush (edit, BOOK_MARK_COLOR);
book_mark_flush (edit, BOOK_MARK_FOUND_COLOR); book_mark_flush (edit, BOOK_MARK_FOUND_COLOR);
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Next_Bookmark: case CK_BookmarkNext:
if (edit->book_mark) if (edit->book_mark)
{ {
struct _book_mark *p; struct _book_mark *p;
@ -3913,7 +3906,7 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
} }
break; break;
case CK_Prev_Bookmark: case CK_BookmarkPrev:
if (edit->book_mark) if (edit->book_mark)
{ {
struct _book_mark *p; struct _book_mark *p;
@ -3931,12 +3924,12 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
} }
break; break;
case CK_Beginning_Of_Text: case CK_Top:
case CK_Beginning_Of_Text_Highlight: case CK_MarkToFileBegin:
edit_move_to_top (edit); edit_move_to_top (edit);
break; break;
case CK_End_Of_Text: case CK_Bottom:
case CK_End_Of_Text_Highlight: case CK_MarkToFileEnd:
edit_move_to_bottom (edit); edit_move_to_bottom (edit);
break; break;
@ -3952,21 +3945,21 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit_block_move_cmd (edit); edit_block_move_cmd (edit);
break; break;
case CK_Shift_Block_Left: case CK_BlockShiftLeft:
if (edit->mark1 != edit->mark2) if (edit->mark1 != edit->mark2)
edit_move_block_to_left (edit); edit_move_block_to_left (edit);
break; break;
case CK_Shift_Block_Right: case CK_BlockShiftRight:
if (edit->mark1 != edit->mark2) if (edit->mark1 != edit->mark2)
edit_move_block_to_right (edit); edit_move_block_to_right (edit);
break; break;
case CK_XStore: case CK_Store:
edit_copy_to_X_buf_cmd (edit); edit_copy_to_X_buf_cmd (edit);
break; break;
case CK_XCut: case CK_Cut:
edit_cut_to_X_buf_cmd (edit); edit_cut_to_X_buf_cmd (edit);
break; break;
case CK_XPaste: case CK_Paste:
/* if non persistent selection and text selected */ /* if non persistent selection and text selected */
if (!option_persistent_selections) if (!option_persistent_selections)
{ {
@ -3977,69 +3970,69 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit_insert_over (edit); edit_insert_over (edit);
edit_paste_from_X_buf_cmd (edit); edit_paste_from_X_buf_cmd (edit);
break; break;
case CK_Selection_History: case CK_History:
edit_paste_from_history (edit); edit_paste_from_history (edit);
break; break;
case CK_Save_As: case CK_SaveAs:
edit_save_as_cmd (edit); edit_save_as_cmd (edit);
break; break;
case CK_Save: case CK_Save:
edit_save_confirm_cmd (edit); edit_save_confirm_cmd (edit);
break; break;
case CK_Load: case CK_EditFile:
edit_load_cmd (edit, EDIT_FILE_COMMON); edit_load_cmd (edit, EDIT_FILE_COMMON);
break; break;
case CK_Save_Block: case CK_BlockSave:
edit_save_block_cmd (edit); edit_save_block_cmd (edit);
break; break;
case CK_Insert_File: case CK_InsertFile:
edit_insert_file_cmd (edit); edit_insert_file_cmd (edit);
break; break;
case CK_Load_Prev_File: case CK_FilePrev:
edit_load_back_cmd (edit); edit_load_back_cmd (edit);
break; break;
case CK_Load_Next_File: case CK_FileNext:
edit_load_forward_cmd (edit); edit_load_forward_cmd (edit);
break; break;
case CK_Load_Syntax_File: case CK_EditSyntaxFile:
edit_load_cmd (edit, EDIT_FILE_SYNTAX); edit_load_cmd (edit, EDIT_FILE_SYNTAX);
break; break;
case CK_Choose_Syntax: case CK_SyntaxChoose:
edit_syntax_dialog (edit); edit_syntax_dialog (edit);
break; break;
case CK_Load_Menu_File: case CK_EditUserMenu:
edit_load_cmd (edit, EDIT_FILE_MENU); edit_load_cmd (edit, EDIT_FILE_MENU);
break; break;
case CK_Toggle_Syntax: case CK_SyntaxOnOff:
option_syntax_highlighting ^= 1; option_syntax_highlighting ^= 1;
if (option_syntax_highlighting == 1) if (option_syntax_highlighting == 1)
edit_load_syntax (edit, NULL, edit->syntax_type); edit_load_syntax (edit, NULL, edit->syntax_type);
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Toggle_Tab_TWS: case CK_ShowTabTws:
enable_show_tabs_tws ^= 1; enable_show_tabs_tws ^= 1;
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Find: case CK_Search:
edit_search_cmd (edit, FALSE); edit_search_cmd (edit, FALSE);
break; break;
case CK_Find_Again: case CK_SearchContinue:
edit_search_cmd (edit, TRUE); edit_search_cmd (edit, TRUE);
break; break;
case CK_Replace: case CK_Replace:
edit_replace_cmd (edit, 0); edit_replace_cmd (edit, 0);
break; break;
case CK_Replace_Again: case CK_ReplaceContinue:
edit_replace_cmd (edit, 1); edit_replace_cmd (edit, 1);
break; break;
case CK_Complete_Word: case CK_Complete:
/* if text marked shift block */ /* if text marked shift block */
if (edit->mark1 != edit->mark2 && !option_persistent_selections) if (edit->mark1 != edit->mark2 && !option_persistent_selections)
{ {
@ -4050,13 +4043,13 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
edit_complete_word_cmd (edit); edit_complete_word_cmd (edit);
} }
break; break;
case CK_Find_Definition: case CK_Find:
edit_get_match_keyword_cmd (edit); edit_get_match_keyword_cmd (edit);
break; break;
case CK_Quit: case CK_Quit:
dlg_stop (edit->widget.owner); dlg_stop (edit->widget.owner);
break; break;
case CK_New: case CK_EditNew:
edit_new_cmd (edit); edit_new_cmd (edit);
break; break;
case CK_Help: case CK_Help:
@ -4065,7 +4058,7 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_Refresh: case CK_Refresh:
edit_refresh_cmd (edit); edit_refresh_cmd (edit);
break; break;
case CK_SaveSetupCmd: case CK_SaveSetup:
save_setup_cmd (); save_setup_cmd ();
break; break;
case CK_About: case CK_About:
@ -4074,10 +4067,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_LearnKeys: case CK_LearnKeys:
learn_keys (); learn_keys ();
break; break;
case CK_Edit_Options: case CK_Options:
edit_options_dialog (edit); edit_options_dialog (edit);
break; break;
case CK_Edit_Save_Mode: case CK_OptionsSaveMode:
menu_save_mode_cmd (); menu_save_mode_cmd ();
break; break;
case CK_Date: case CK_Date:
@ -4096,23 +4089,23 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_Goto: case CK_Goto:
edit_goto_cmd (edit); edit_goto_cmd (edit);
break; break;
case CK_Paragraph_Format: case CK_ParagraphFormat:
format_paragraph (edit, 1); format_paragraph (edit, 1);
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
break; break;
case CK_Delete_Macro: case CK_MacroDelete:
edit_delete_macro_cmd (edit); edit_delete_macro_cmd (edit);
break; break;
case CK_Match_Bracket: case CK_MatchBracket:
edit_goto_matching_bracket (edit); edit_goto_matching_bracket (edit);
break; break;
case CK_User_Menu: case CK_UserMenu:
user_menu (edit, NULL, -1); user_menu (edit, NULL, -1);
break; break;
case CK_Sort: case CK_Sort:
edit_sort_cmd (edit); edit_sort_cmd (edit);
break; break;
case CK_ExtCmd: case CK_ExternalCommand:
edit_ext_cmd (edit); edit_ext_cmd (edit);
break; break;
case CK_Mail: case CK_Mail:
@ -4121,67 +4114,69 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_Shell: case CK_Shell:
view_other_cmd (); view_other_cmd ();
break; break;
#ifdef HAVE_CHARSET
case CK_SelectCodepage: case CK_SelectCodepage:
edit_select_codepage_cmd (edit); edit_select_codepage_cmd (edit);
break; break;
case CK_Insert_Literal: #endif
case CK_InsertLiteral:
edit_insert_literal_cmd (edit); edit_insert_literal_cmd (edit);
break; break;
case CK_Begin_End_Macro: case CK_MacroStartStopRecord:
edit_begin_end_macro_cmd (edit); edit_begin_end_macro_cmd (edit);
break; break;
case CK_Begin_End_Repeat: case CK_RepeatStartStopRecord:
edit_begin_end_repeat_cmd (edit); edit_begin_end_repeat_cmd (edit);
break; break;
case CK_Ext_Mode: case CK_ExtendedKeyMap:
edit->extmod = 1; edit->extmod = 1;
break; break;
default: default:
break; break;
} }
/* CK_Pipe_Block */ /* CK_PipeBlock */
if ((command / CK_Pipe_Block (0)) == 1) if ((command / CK_PipeBlock (0)) == 1)
edit_block_process_cmd (edit, command - CK_Pipe_Block (0)); edit_block_process_cmd (edit, command - CK_PipeBlock (0));
/* keys which must set the col position, and the search vars */ /* keys which must set the col position, and the search vars */
switch (command) switch (command)
{ {
case CK_Find: case CK_Search:
case CK_Find_Again: case CK_SearchContinue:
case CK_Replace: case CK_Replace:
case CK_Replace_Again: case CK_ReplaceContinue:
case CK_Complete_Word: case CK_Complete:
edit->prev_col = edit_get_col (edit); edit->prev_col = edit_get_col (edit);
break; break;
case CK_Up: case CK_Up:
case CK_Up_Highlight: case CK_MarkUp:
case CK_Up_Alt_Highlight: case CK_MarkColumnUp:
case CK_Down: case CK_Down:
case CK_Down_Highlight: case CK_MarkDown:
case CK_Down_Alt_Highlight: case CK_MarkColumnDown:
case CK_Page_Up: case CK_PageUp:
case CK_Page_Up_Highlight: case CK_MarkPageUp:
case CK_Page_Up_Alt_Highlight: case CK_MarkColumnPageUp:
case CK_Page_Down: case CK_PageDown:
case CK_Page_Down_Highlight: case CK_MarkPageDown:
case CK_Page_Down_Alt_Highlight: case CK_MarkColumnPageDown:
case CK_Beginning_Of_Text: case CK_Top:
case CK_Beginning_Of_Text_Highlight: case CK_MarkToFileBegin:
case CK_End_Of_Text: case CK_Bottom:
case CK_End_Of_Text_Highlight: case CK_MarkToFileEnd:
case CK_Paragraph_Up: case CK_ParagraphUp:
case CK_Paragraph_Up_Highlight: case CK_MarkParagraphUp:
case CK_Paragraph_Up_Alt_Highlight: case CK_MarkColumnParagraphUp:
case CK_Paragraph_Down: case CK_ParagraphDown:
case CK_Paragraph_Down_Highlight: case CK_MarkParagraphDown:
case CK_Paragraph_Down_Alt_Highlight: case CK_MarkColumnParagraphDown:
case CK_Scroll_Up: case CK_ScrollUp:
case CK_Scroll_Up_Highlight: case CK_MarkScrollUp:
case CK_Scroll_Up_Alt_Highlight: case CK_MarkColumnScrollUp:
case CK_Scroll_Down: case CK_ScrollDown:
case CK_Scroll_Down_Highlight: case CK_MarkScrollDown:
case CK_Scroll_Down_Alt_Highlight: case CK_MarkColumnScrollDown:
edit->search_start = edit->curs1; edit->search_start = edit->curs1;
edit->found_len = 0; edit->found_len = 0;
break; break;
@ -4198,10 +4193,10 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
{ {
case CK_BackSpace: case CK_BackSpace:
case CK_Delete: case CK_Delete:
case CK_Delete_Word_Left: case CK_DeleteToWordBegin:
case CK_Delete_Word_Right: case CK_DeleteToWordEnd:
case CK_Delete_To_Line_End: case CK_DeleteToHome:
case CK_Delete_To_Line_Begin: case CK_DeleteToEnd:
format_paragraph (edit, 0); format_paragraph (edit, 0);
edit->force |= REDRAW_PAGE; edit->force |= REDRAW_PAGE;
} }

View File

@ -1533,9 +1533,9 @@ edit_store_macro_cmd (WEdit * edit)
tmp_act = keybind_lookup_keymap_command (editor_map, hotkey); tmp_act = keybind_lookup_keymap_command (editor_map, hotkey);
/* return FALSE if try assign macro into restricted hotkeys */ /* return FALSE if try assign macro into restricted hotkeys */
if (tmp_act == CK_Begin_Record_Macro if (tmp_act == CK_MacroStartRecord
|| tmp_act == CK_End_Record_Macro || tmp_act == CK_MacroStopRecord
|| tmp_act == CK_Begin_End_Macro) || tmp_act == CK_MacroStartStopRecord)
return FALSE; return FALSE;
edit_delete_macro (edit, hotkey); edit_delete_macro (edit, hotkey);
@ -1692,9 +1692,9 @@ edit_load_macro_cmd (WEdit * edit)
if (m_act.action != 0) if (m_act.action != 0)
{ {
/* a shell command */ /* a shell command */
if ((m_act.action / CK_Pipe_Block (0)) == 1) if ((m_act.action / CK_PipeBlock (0)) == 1)
{ {
m_act.action = CK_Pipe_Block (0) + (m_act.ch > 0 ? m_act.ch : 0); m_act.action = CK_PipeBlock (0) + (m_act.ch > 0 ? m_act.ch : 0);
m_act.ch = -1; m_act.ch = -1;
} }
g_array_append_val (macros, m_act); g_array_append_val (macros, m_act);
@ -3056,7 +3056,7 @@ edit_begin_end_macro_cmd (WEdit * edit)
/* edit is a pointer to the widget */ /* edit is a pointer to the widget */
if (edit != NULL) if (edit != NULL)
{ {
unsigned long command = macro_index < 0 ? CK_Begin_Record_Macro : CK_End_Record_Macro; unsigned long command = macro_index < 0 ? CK_MacroStartRecord : CK_MacroStopRecord;
edit_execute_key_command (edit, command, -1); edit_execute_key_command (edit, command, -1);
} }
} }
@ -3069,7 +3069,7 @@ edit_begin_end_repeat_cmd (WEdit * edit)
/* edit is a pointer to the widget */ /* edit is a pointer to the widget */
if (edit != NULL) if (edit != NULL)
{ {
unsigned long command = macro_index < 0 ? CK_Begin_Record_Repeat : CK_End_Record_Repeat; unsigned long command = macro_index < 0 ? CK_RepeatStartRecord : CK_RepeatStopRecord;
edit_execute_key_command (edit, command, -1); edit_execute_key_command (edit, command, -1);
} }
} }

View File

@ -67,16 +67,16 @@ create_file_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&Open file..."), CK_Load)); entries = g_list_append (entries, menu_entry_create (_("&Open file..."), CK_EditFile));
entries = g_list_append (entries, menu_entry_create (_("&New"), CK_New)); entries = g_list_append (entries, menu_entry_create (_("&New"), CK_EditNew));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Save"), CK_Save)); entries = g_list_append (entries, menu_entry_create (_("&Save"), CK_Save));
entries = g_list_append (entries, menu_entry_create (_("Save &as..."), CK_Save_As)); entries = g_list_append (entries, menu_entry_create (_("Save &as..."), CK_SaveAs));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Insert file..."), CK_Insert_File)); entries = g_list_append (entries, menu_entry_create (_("&Insert file..."), CK_InsertFile));
entries = g_list_append (entries, menu_entry_create (_("Cop&y to file..."), CK_Save_Block)); entries = g_list_append (entries, menu_entry_create (_("Cop&y to file..."), CK_BlockSave));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&User menu..."), CK_User_Menu)); entries = g_list_append (entries, menu_entry_create (_("&User menu..."), CK_UserMenu));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("A&bout..."), CK_About)); entries = g_list_append (entries, menu_entry_create (_("A&bout..."), CK_About));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
@ -95,23 +95,24 @@ create_edit_menu (void)
entries = g_list_append (entries, menu_entry_create (_("&Undo"), CK_Undo)); entries = g_list_append (entries, menu_entry_create (_("&Undo"), CK_Undo));
entries = g_list_append (entries, menu_entry_create (_("&Redo"), CK_Redo)); entries = g_list_append (entries, menu_entry_create (_("&Redo"), CK_Redo));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Toggle ins/overw"), CK_Toggle_Insert)); entries =
g_list_append (entries, menu_entry_create (_("&Toggle ins/overw"), CK_InsertOverwrite));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("To&ggle mark"), CK_Mark)); entries = g_list_append (entries, menu_entry_create (_("To&ggle mark"), CK_Mark));
entries = g_list_append (entries, menu_entry_create (_("&Mark columns"), CK_Column_Mark)); entries = g_list_append (entries, menu_entry_create (_("&Mark columns"), CK_MarkColumn));
entries = g_list_append (entries, menu_entry_create (_("Mark &all"), CK_Mark_All)); entries = g_list_append (entries, menu_entry_create (_("Mark &all"), CK_MarkAll));
entries = g_list_append (entries, menu_entry_create (_("Unmar&k"), CK_Unmark)); entries = g_list_append (entries, menu_entry_create (_("Unmar&k"), CK_Unmark));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("Cop&y"), CK_Copy)); entries = g_list_append (entries, menu_entry_create (_("Cop&y"), CK_Copy));
entries = g_list_append (entries, menu_entry_create (_("Mo&ve"), CK_Move)); entries = g_list_append (entries, menu_entry_create (_("Mo&ve"), CK_Move));
entries = g_list_append (entries, menu_entry_create (_("&Delete"), CK_Remove)); entries = g_list_append (entries, menu_entry_create (_("&Delete"), CK_Remove));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("Co&py to clipfile"), CK_XStore)); entries = g_list_append (entries, menu_entry_create (_("Co&py to clipfile"), CK_Store));
entries = g_list_append (entries, menu_entry_create (_("&Cut to clipfile"), CK_XCut)); entries = g_list_append (entries, menu_entry_create (_("&Cut to clipfile"), CK_Cut));
entries = g_list_append (entries, menu_entry_create (_("Pa&ste from clipfile"), CK_XPaste)); entries = g_list_append (entries, menu_entry_create (_("Pa&ste from clipfile"), CK_Paste));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Beginning"), CK_Beginning_Of_Text)); entries = g_list_append (entries, menu_entry_create (_("&Beginning"), CK_Top));
entries = g_list_append (entries, menu_entry_create (_("&End"), CK_End_Of_Text)); entries = g_list_append (entries, menu_entry_create (_("&End"), CK_Bottom));
return entries; return entries;
} }
@ -123,15 +124,14 @@ create_search_replace_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&Search..."), CK_Find)); entries = g_list_append (entries, menu_entry_create (_("&Search..."), CK_Search));
entries = g_list_append (entries, menu_entry_create (_("Search &again"), CK_Find_Again)); entries = g_list_append (entries, menu_entry_create (_("Search &again"), CK_SearchContinue));
entries = g_list_append (entries, menu_entry_create (_("&Replace..."), CK_Replace)); entries = g_list_append (entries, menu_entry_create (_("&Replace..."), CK_Replace));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries = g_list_append (entries, menu_entry_create (_("&Toggle bookmark"), CK_Bookmark));
g_list_append (entries, menu_entry_create (_("&Toggle bookmark"), CK_Toggle_Bookmark)); entries = g_list_append (entries, menu_entry_create (_("&Next bookmark"), CK_BookmarkNext));
entries = g_list_append (entries, menu_entry_create (_("&Next bookmark"), CK_Next_Bookmark)); entries = g_list_append (entries, menu_entry_create (_("&Prev bookmark"), CK_BookmarkPrev));
entries = g_list_append (entries, menu_entry_create (_("&Prev bookmark"), CK_Prev_Bookmark)); entries = g_list_append (entries, menu_entry_create (_("&Flush bookmarks"), CK_BookmarkFlush));
entries = g_list_append (entries, menu_entry_create (_("&Flush bookmark"), CK_Flush_Bookmarks));
return entries; return entries;
} }
@ -145,20 +145,18 @@ create_command_menu (void)
entries = g_list_append (entries, menu_entry_create (_("&Go to line..."), CK_Goto)); entries = g_list_append (entries, menu_entry_create (_("&Go to line..."), CK_Goto));
entries = entries =
g_list_append (entries, menu_entry_create (_("&Toggle line state"), CK_Toggle_Line_State)); g_list_append (entries, menu_entry_create (_("&Toggle line state"), CK_ShowNumbers));
entries = entries =
g_list_append (entries, menu_entry_create (_("Go to matching &bracket"), CK_Match_Bracket)); g_list_append (entries, menu_entry_create (_("Go to matching &bracket"), CK_MatchBracket));
entries = entries =
g_list_append (entries, g_list_append (entries,
menu_entry_create (_("Toggle s&yntax highlighting"), CK_Toggle_Syntax)); menu_entry_create (_("Toggle s&yntax highlighting"), CK_SyntaxOnOff));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries =
g_list_append (entries, menu_entry_create (_("&Find declaration"), CK_Find_Definition)); g_list_append (entries, menu_entry_create (_("&Find declaration"), CK_Find));
entries = g_list_append (entries, menu_entry_create (_("Back from &declaration"), CK_FilePrev));
entries = entries =
g_list_append (entries, menu_entry_create (_("Back from &declaration"), CK_Load_Prev_File)); g_list_append (entries, menu_entry_create (_("For&ward to declaration"), CK_FileNext));
entries =
g_list_append (entries,
menu_entry_create (_("For&ward to declaration"), CK_Load_Next_File));
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("Encod&ing..."), CK_SelectCodepage)); entries = g_list_append (entries, menu_entry_create (_("Encod&ing..."), CK_SelectCodepage));
@ -168,12 +166,14 @@ create_command_menu (void)
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries =
g_list_append (entries, g_list_append (entries,
menu_entry_create (_("&Start/Stop record macro"), CK_Begin_End_Macro)); menu_entry_create (_("&Start/Stop record macro"), CK_MacroStartStopRecord));
entries = g_list_append (entries, menu_entry_create (_("Delete macr&o..."), CK_Delete_Macro)); entries = g_list_append (entries, menu_entry_create (_("Delete macr&o..."), CK_MacroDelete));
entries = g_list_append (entries, menu_entry_create (_("Record/Repeat &actions"), CK_Begin_End_Repeat)); entries =
g_list_append (entries,
menu_entry_create (_("Record/Repeat &actions"), CK_RepeatStartStopRecord));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries =
g_list_append (entries, menu_entry_create (_("'ispell' s&pell check"), CK_Pipe_Block (1))); g_list_append (entries, menu_entry_create (_("'ispell' s&pell check"), CK_PipeBlock (1)));
entries = g_list_append (entries, menu_entry_create (_("&Mail..."), CK_Mail)); entries = g_list_append (entries, menu_entry_create (_("&Mail..."), CK_Mail));
return entries; return entries;
@ -187,15 +187,16 @@ create_format_menu (void)
GList *entries = NULL; GList *entries = NULL;
entries = entries =
g_list_append (entries, menu_entry_create (_("Insert &literal..."), CK_Insert_Literal)); g_list_append (entries, menu_entry_create (_("Insert &literal..."), CK_InsertLiteral));
entries = g_list_append (entries, menu_entry_create (_("Insert &date/time"), CK_Date)); entries = g_list_append (entries, menu_entry_create (_("Insert &date/time"), CK_Date));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries =
g_list_append (entries, menu_entry_create (_("&Format paragraph"), CK_Paragraph_Format)); g_list_append (entries, menu_entry_create (_("&Format paragraph"), CK_ParagraphFormat));
entries = g_list_append (entries, menu_entry_create (_("&Sort..."), CK_Sort)); entries = g_list_append (entries, menu_entry_create (_("&Sort..."), CK_Sort));
entries = g_list_append (entries, menu_entry_create (_("&Paste output of..."), CK_ExtCmd));
entries = entries =
g_list_append (entries, menu_entry_create (_("&External formatter"), CK_Pipe_Block (0))); g_list_append (entries, menu_entry_create (_("&Paste output of..."), CK_ExternalCommand));
entries =
g_list_append (entries, menu_entry_create (_("&External formatter"), CK_PipeBlock (0)));
return entries; return entries;
} }
@ -207,16 +208,16 @@ create_options_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&General..."), CK_Edit_Options)); entries = g_list_append (entries, menu_entry_create (_("&General..."), CK_Options));
entries = g_list_append (entries, menu_entry_create (_("Save &mode..."), CK_Edit_Save_Mode)); entries = g_list_append (entries, menu_entry_create (_("Save &mode..."), CK_OptionsSaveMode));
entries = g_list_append (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys)); entries = g_list_append (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys));
entries = entries =
g_list_append (entries, menu_entry_create (_("Syntax &highlighting..."), CK_Choose_Syntax)); g_list_append (entries, menu_entry_create (_("Syntax &highlighting..."), CK_SyntaxChoose));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("S&yntax file"), CK_Load_Syntax_File)); entries = g_list_append (entries, menu_entry_create (_("S&yntax file"), CK_EditSyntaxFile));
entries = g_list_append (entries, menu_entry_create (_("&Menu file"), CK_Load_Menu_File)); entries = g_list_append (entries, menu_entry_create (_("&Menu file"), CK_EditUserMenu));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Save setup"), CK_SaveSetupCmd)); entries = g_list_append (entries, menu_entry_create (_("&Save setup"), CK_SaveSetup));
return entries; return entries;
} }

View File

@ -79,7 +79,7 @@ edit_get_shortcut (unsigned long command)
if (shortcut != NULL) if (shortcut != NULL)
return g_strdup (shortcut); return g_strdup (shortcut);
ext_map = keybind_lookup_keymap_shortcut (editor_map, CK_Ext_Mode); ext_map = keybind_lookup_keymap_shortcut (editor_map, CK_ExtendedKeyMap);
if (ext_map != NULL) if (ext_map != NULL)
shortcut = keybind_lookup_keymap_shortcut (editor_x_map, command); shortcut = keybind_lookup_keymap_shortcut (editor_x_map, command);
if (shortcut != NULL) if (shortcut != NULL)

View File

@ -58,7 +58,7 @@
#include "lib/strutil.h" #include "lib/strutil.h"
#include "lib/util.h" #include "lib/util.h"
#include "lib/widget.h" #include "lib/widget.h"
#include "lib/keybind.h" /* CK_PanelMoveDown, CK_InputHistoryShow */ #include "lib/keybind.h" /* CK_Down, CK_History */
#include "src/subshell.h" /* use_subshell */ #include "src/subshell.h" /* use_subshell */
#include "src/consaver/cons.saver.h" /* console_flag */ #include "src/consaver/cons.saver.h" /* console_flag */
@ -79,7 +79,7 @@
#include "fileopctx.h" #include "fileopctx.h"
#include "file.h" /* file operation routines */ #include "file.h" /* file operation routines */
#include "find.h" /* do_find() */ #include "find.h" /* do_find() */
#include "hotlist.h" /* hotlist_cmd() */ #include "hotlist.h" /* hotlist_show() */
#include "tree.h" /* tree_chdir() */ #include "tree.h" /* tree_chdir() */
#include "midnight.h" /* change_panel() */ #include "midnight.h" /* change_panel() */
#include "usermenu.h" /* MC_GLOBAL_MENU */ #include "usermenu.h" /* MC_GLOBAL_MENU */
@ -146,10 +146,10 @@ scan_for_file (WPanel * panel, int idx, int direction)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* Run viewer (internal or external) on the currently selected file. * Run viewer (internal or external) on the currently selected file.
* If normal is 1, force internal viewer and raw mode (used for F13). * If normal is TRUE, force internal viewer and raw mode (used for F13).
*/ */
static void static void
do_view_cmd (int normal) do_view_cmd (gboolean normal)
{ {
/* Directories are viewed by changing to them */ /* Directories are viewed by changing to them */
if (S_ISDIR (selection (current_panel)->st.st_mode) || link_isdir (selection (current_panel))) if (S_ISDIR (selection (current_panel)->st.st_mode) || link_isdir (selection (current_panel)))
@ -168,14 +168,16 @@ do_view_cmd (int normal)
} }
else else
{ {
int dir, file_idx; int file_idx;
char *filename;
file_idx = current_panel->selected; file_idx = current_panel->selected;
while (1)
{
filename = current_panel->dir.list[file_idx].fname;
while (TRUE)
{
char *filename;
int dir;
filename = current_panel->dir.list[file_idx].fname;
dir = view_file (filename, normal, use_internal_view); dir = view_file (filename, normal, use_internal_view);
if (dir == 0) if (dir == 0)
break; break;
@ -686,7 +688,7 @@ view_file (const char *filename, int plain_view, int internal)
void void
view_cmd (void) view_cmd (void)
{ {
do_view_cmd (0); do_view_cmd (FALSE);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -710,15 +712,15 @@ view_file_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** Run plain internal viewer on the currently selected file */ /** Run plain internal viewer on the currently selected file */
void void
view_simple_cmd (void) view_raw_cmd (void)
{ {
do_view_cmd (1); do_view_cmd (TRUE);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
filtered_view_cmd (void) view_filtered_cmd (void)
{ {
char *command; char *command;
const char *initial_command; const char *initial_command;
@ -975,7 +977,7 @@ reread_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
reverse_selection_cmd (void) select_invert_cmd (void)
{ {
int i; int i;
file_entry *file; file_entry *file;
@ -1142,11 +1144,11 @@ edit_fhl_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
quick_chdir_cmd (void) hotlist_cmd (void)
{ {
char *target; char *target;
target = hotlist_cmd (LIST_HOTLIST); target = hotlist_show (LIST_HOTLIST);
if (!target) if (!target)
return; return;
@ -1163,11 +1165,11 @@ quick_chdir_cmd (void)
#ifdef ENABLE_VFS #ifdef ENABLE_VFS
void void
reselect_vfs (void) vfs_list (void)
{ {
char *target; char *target;
target = hotlist_cmd (LIST_VFSLIST); target = hotlist_show (LIST_VFSLIST);
if (!target) if (!target)
return; return;
@ -1224,15 +1226,6 @@ diff_view_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void
history_cmd (void)
{
/* show the history of command line widget */
send_message (&cmdline->widget, WIDGET_COMMAND, CK_InputHistoryShow);
}
/* --------------------------------------------------------------------------------------------- */
void void
swap_cmd (void) swap_cmd (void)
{ {
@ -1518,7 +1511,7 @@ single_dirsize_cmd (void)
} }
if (panels_options.mark_moves_down) if (panels_options.mark_moves_down)
send_message ((Widget *) panel, WIDGET_COMMAND, CK_PanelMoveDown); send_message ((Widget *) panel, WIDGET_COMMAND, CK_Down);
recalculate_panel_summary (panel); recalculate_panel_summary (panel);
@ -1636,7 +1629,7 @@ change_listing_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
tree_cmd (void) panel_tree_cmd (void)
{ {
set_display_type (MENU_PANEL_IDX, view_tree); set_display_type (MENU_PANEL_IDX, view_tree);
} }

View File

@ -53,8 +53,8 @@ int view_file_at_line (const char *filename, int plain_view, int internal, int s
int view_file (const char *filename, int normal, int internal); int view_file (const char *filename, int normal, int internal);
void view_cmd (void); void view_cmd (void);
void view_file_cmd (void); void view_file_cmd (void);
void view_simple_cmd (void); void view_raw_cmd (void);
void filtered_view_cmd (void); void view_filtered_cmd (void);
void do_edit_at_line (const char *what, gboolean internal, int start_line); void do_edit_at_line (const char *what, gboolean internal, int start_line);
void edit_cmd (void); void edit_cmd (void);
void edit_cmd_new (void); void edit_cmd_new (void);
@ -71,18 +71,17 @@ void delete_cmd_local (void);
void find_cmd (void); void find_cmd (void);
void filter_cmd (void); void filter_cmd (void);
void reread_cmd (void); void reread_cmd (void);
void reselect_vfs (void); void vfs_list (void);
void ext_cmd (void); void ext_cmd (void);
void edit_mc_menu_cmd (void); void edit_mc_menu_cmd (void);
void edit_fhl_cmd (void); void edit_fhl_cmd (void);
void quick_chdir_cmd (void); void hotlist_cmd (void);
void compare_dirs_cmd (void); void compare_dirs_cmd (void);
void diff_view_cmd (void); void diff_view_cmd (void);
void history_cmd (void); void panel_tree_cmd (void);
void tree_cmd (void);
void link_cmd (link_type_t link_type); void link_cmd (link_type_t link_type);
void edit_symlink_cmd (void); void edit_symlink_cmd (void);
void reverse_selection_cmd (void); void select_invert_cmd (void);
void unselect_cmd (void); void unselect_cmd (void);
void select_cmd (void); void select_cmd (void);
void swap_cmd (void); void swap_cmd (void);

View File

@ -1707,7 +1707,7 @@ add2hotlist_cmd (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
char * char *
hotlist_cmd (int vfs_or_hotlist) hotlist_show (int vfs_or_hotlist)
{ {
char *target = NULL; char *target = NULL;

View File

@ -20,7 +20,7 @@
/*** declarations of public functions ************************************************************/ /*** declarations of public functions ************************************************************/
void add2hotlist_cmd (void); void add2hotlist_cmd (void);
char *hotlist_cmd (int list_vfs); char *hotlist_show (int list_vfs);
int save_hotlist (void); int save_hotlist (void);
void done_hotlist (void); void done_hotlist (void);

View File

@ -193,33 +193,32 @@ create_panel_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("File listin&g"), CK_ListingCmd)); entries = g_list_append (entries, menu_entry_create (_("File listin&g"), CK_PanelListing));
entries = g_list_append (entries, menu_entry_create (_("&Quick view"), CK_QuickViewCmd)); entries = g_list_append (entries, menu_entry_create (_("&Quick view"), CK_PanelQuickView));
entries = g_list_append (entries, menu_entry_create (_("&Info"), CK_InfoCmd)); entries = g_list_append (entries, menu_entry_create (_("&Info"), CK_PanelInfo));
entries = g_list_append (entries, menu_entry_create (_("&Tree"), CK_TreeCmd)); entries = g_list_append (entries, menu_entry_create (_("&Tree"), CK_PanelTree));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = entries =
g_list_append (entries, menu_entry_create (_("&Listing mode..."), CK_ChangeListingCmd)); g_list_append (entries, menu_entry_create (_("&Listing mode..."), CK_PanelListingChange));
entries = g_list_append (entries, menu_entry_create (_("&Sort order..."), CK_Sort)); entries = g_list_append (entries, menu_entry_create (_("&Sort order..."), CK_Sort));
entries = g_list_append (entries, menu_entry_create (_("&Filter..."), CK_FilterCmd)); entries = g_list_append (entries, menu_entry_create (_("&Filter..."), CK_Filter));
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
entries = entries = g_list_append (entries, menu_entry_create (_("&Encoding..."), CK_SelectCodepage));
g_list_append (entries, menu_entry_create (_("&Encoding..."), CK_PanelSetPanelEncoding));
#endif #endif
#ifdef ENABLE_VFS_NET #ifdef ENABLE_VFS_NET
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
#ifdef ENABLE_VFS_FTP #ifdef ENABLE_VFS_FTP
entries = g_list_append (entries, menu_entry_create (_("FT&P link..."), CK_FtplinkCmd)); entries = g_list_append (entries, menu_entry_create (_("FT&P link..."), CK_ConnectFtp));
#endif #endif
#ifdef ENABLE_VFS_FISH #ifdef ENABLE_VFS_FISH
entries = g_list_append (entries, menu_entry_create (_("S&hell link..."), CK_FishlinkCmd)); entries = g_list_append (entries, menu_entry_create (_("S&hell link..."), CK_ConnectFish));
#endif #endif
#ifdef ENABLE_VFS_SMB #ifdef ENABLE_VFS_SMB
entries = g_list_append (entries, menu_entry_create (_("SM&B link..."), CK_SmblinkCmd)); entries = g_list_append (entries, menu_entry_create (_("SM&B link..."), CK_ConnectSmb));
#endif #endif
#endif /* ENABLE_VFS_NET */ #endif /* ENABLE_VFS_NET */
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Rescan"), CK_RereadCmd)); entries = g_list_append (entries, menu_entry_create (_("&Rescan"), CK_Reread));
return entries; return entries;
} }
@ -231,32 +230,31 @@ create_file_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&View"), CK_ViewCmd)); entries = g_list_append (entries, menu_entry_create (_("&View"), CK_View));
entries = g_list_append (entries, menu_entry_create (_("Vie&w file..."), CK_ViewFileCmd)); entries = g_list_append (entries, menu_entry_create (_("Vie&w file..."), CK_ViewFile));
entries = g_list_append (entries, menu_entry_create (_("&Filtered view"), CK_FilteredViewCmd)); entries = g_list_append (entries, menu_entry_create (_("&Filtered view"), CK_ViewFiltered));
entries = g_list_append (entries, menu_entry_create (_("&Edit"), CK_EditCmd)); entries = g_list_append (entries, menu_entry_create (_("&Edit"), CK_Edit));
entries = g_list_append (entries, menu_entry_create (_("&Copy"), CK_CopyCmd)); entries = g_list_append (entries, menu_entry_create (_("&Copy"), CK_Copy));
entries = g_list_append (entries, menu_entry_create (_("C&hmod"), CK_ChmodCmd)); entries = g_list_append (entries, menu_entry_create (_("C&hmod"), CK_ChangeMode));
entries = g_list_append (entries, menu_entry_create (_("&Link"), CK_LinkCmd)); entries = g_list_append (entries, menu_entry_create (_("&Link"), CK_Link));
entries = g_list_append (entries, menu_entry_create (_("&Symlink"), CK_SymlinkCmd)); entries = g_list_append (entries, menu_entry_create (_("&Symlink"), CK_LinkSymbolic));
entries =
g_list_append (entries, menu_entry_create (_("Relative symlin&k"), CK_RelativeSymlinkCmd));
entries = g_list_append (entries, menu_entry_create (_("Edit s&ymlink"), CK_EditSymlinkCmd));
entries = g_list_append (entries, menu_entry_create (_("Ch&own"), CK_ChownCmd));
entries =
g_list_append (entries, menu_entry_create (_("&Advanced chown"), CK_ChownAdvancedCmd));
entries = g_list_append (entries, menu_entry_create (_("&Rename/Move"), CK_RenameCmd));
entries = g_list_append (entries, menu_entry_create (_("&Mkdir"), CK_MkdirCmd));
entries = g_list_append (entries, menu_entry_create (_("&Delete"), CK_DeleteCmd));
entries = g_list_append (entries, menu_entry_create (_("&Quick cd"), CK_QuickCdCmd));
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("Select &group"), CK_SelectCmd));
entries = g_list_append (entries, menu_entry_create (_("U&nselect group"), CK_UnselectCmd));
entries = entries =
g_list_append (entries, g_list_append (entries,
menu_entry_create (_("Reverse selec&tion"), CK_ReverseSelectionCmd)); menu_entry_create (_("Relative symlin&k"), CK_LinkSymbolicRelative));
entries = g_list_append (entries, menu_entry_create (_("Edit s&ymlink"), CK_LinkSymbolicEdit));
entries = g_list_append (entries, menu_entry_create (_("Ch&own"), CK_ChangeOwn));
entries =
g_list_append (entries, menu_entry_create (_("&Advanced chown"), CK_ChangeOwnAdvanced));
entries = g_list_append (entries, menu_entry_create (_("&Rename/Move"), CK_Move));
entries = g_list_append (entries, menu_entry_create (_("&Mkdir"), CK_MakeDir));
entries = g_list_append (entries, menu_entry_create (_("&Delete"), CK_Delete));
entries = g_list_append (entries, menu_entry_create (_("&Quick cd"), CK_CdQuick));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("E&xit"), CK_QuitCmd)); entries = g_list_append (entries, menu_entry_create (_("Select &group"), CK_Select));
entries = g_list_append (entries, menu_entry_create (_("U&nselect group"), CK_Unselect));
entries = g_list_append (entries, menu_entry_create (_("&Invert selection"), CK_SelectInvert));
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("E&xit"), CK_Quit));
return entries; return entries;
} }
@ -272,52 +270,49 @@ create_command_menu (void)
*/ */
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&User menu"), CK_UserMenuCmd)); entries = g_list_append (entries, menu_entry_create (_("&User menu"), CK_UserMenu));
entries = g_list_append (entries, menu_entry_create (_("&Directory tree"), CK_TreeBoxCmd)); entries = g_list_append (entries, menu_entry_create (_("&Directory tree"), CK_Tree));
entries = g_list_append (entries, menu_entry_create (_("&Find file"), CK_FindCmd)); entries = g_list_append (entries, menu_entry_create (_("&Find file"), CK_Find));
entries = g_list_append (entries, menu_entry_create (_("S&wap panels"), CK_SwapCmd)); entries = g_list_append (entries, menu_entry_create (_("S&wap panels"), CK_Swap));
entries = g_list_append (entries, menu_entry_create (_("Switch &panels on/off"), CK_Shell));
entries = entries =
g_list_append (entries, menu_entry_create (_("Switch &panels on/off"), CK_ShowCommandLine)); g_list_append (entries, menu_entry_create (_("&Compare directories"), CK_CompareDirs));
entries =
g_list_append (entries, menu_entry_create (_("&Compare directories"), CK_CompareDirsCmd));
#ifdef USE_DIFF_VIEW #ifdef USE_DIFF_VIEW
entries = g_list_append (entries, menu_entry_create (_("&View diff files"), CK_DiffViewCmd)); entries = g_list_append (entries, menu_entry_create (_("C&ompare files"), CK_CompareFiles));
#endif #endif
entries = entries =
g_list_append (entries, menu_entry_create (_("E&xternal panelize"), CK_ExternalPanelize)); g_list_append (entries, menu_entry_create (_("E&xternal panelize"), CK_ExternalPanelize));
entries = entries = g_list_append (entries, menu_entry_create (_("Show directory s&izes"), CK_DirSize));
g_list_append (entries,
menu_entry_create (_("Show directory s&izes"), CK_SingleDirsizeCmd));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("Command &history"), CK_HistoryCmd)); entries = g_list_append (entries, menu_entry_create (_("Command &history"), CK_History));
entries = entries = g_list_append (entries, menu_entry_create (_("Di&rectory hotlist"), CK_HotList));
g_list_append (entries, menu_entry_create (_("Di&rectory hotlist"), CK_QuickChdirCmd));
#ifdef ENABLE_VFS #ifdef ENABLE_VFS
entries = g_list_append (entries, menu_entry_create (_("&Active VFS list"), CK_ReselectVfs)); entries = g_list_append (entries, menu_entry_create (_("&Active VFS list"), CK_VfsList));
#endif #endif
#ifdef WITH_BACKGROUND #ifdef WITH_BACKGROUND
entries = g_list_append (entries, menu_entry_create (_("&Background jobs"), CK_JobsCmd)); entries = g_list_append (entries, menu_entry_create (_("&Background jobs"), CK_Jobs));
#endif #endif
entries = g_list_append (entries, menu_entry_create (_("Screen lis&t"), CK_DialogListCmd)); entries = g_list_append (entries, menu_entry_create (_("Screen lis&t"), CK_ScreenList));
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
#ifdef ENABLE_VFS_UNDELFS #ifdef ENABLE_VFS_UNDELFS
entries = entries =
g_list_append (entries, g_list_append (entries,
menu_entry_create (_("&Undelete files (ext2fs only)"), CK_UndeleteCmd)); menu_entry_create (_("&Undelete files (ext2fs only)"), CK_Undelete));
#endif #endif
#ifdef LISTMODE_EDITOR #ifdef LISTMODE_EDITOR
entries = entries = g_list_append (entries, menu_entry_create (_("&Listing format edit"), CK_ListMode));
g_list_append (entries, menu_entry_create (_("&Listing format edit"), CK_ListmodeCmd));
#endif #endif
#if defined (ENABLE_VFS_UNDELFS) || defined (LISTMODE_EDITOR) #if defined (ENABLE_VFS_UNDELFS) || defined (LISTMODE_EDITOR)
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
#endif #endif
entries = entries =
g_list_append (entries, menu_entry_create (_("Edit &extension file"), CK_EditExtFileCmd)); g_list_append (entries,
entries = g_list_append (entries, menu_entry_create (_("Edit &menu file"), CK_EditMcMenuCmd)); menu_entry_create (_("Edit &extension file"), CK_EditExtensionsFile));
entries = g_list_append (entries, menu_entry_create (_("Edit &menu file"), CK_EditUserMenu));
entries = entries =
g_list_append (entries, g_list_append (entries,
menu_entry_create (_("Edit hi&ghlighting group file"), CK_EditFhlFileCmd)); menu_entry_create (_("Edit hi&ghlighting group file"),
CK_EditFileHighlightFile));
return entries; return entries;
} }
@ -329,18 +324,18 @@ create_options_menu (void)
{ {
GList *entries = NULL; GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&Configuration..."), CK_ConfigureBox)); entries = g_list_append (entries, menu_entry_create (_("&Configuration..."), CK_Options));
entries = g_list_append (entries, menu_entry_create (_("&Layout..."), CK_LayoutBox)); entries = g_list_append (entries, menu_entry_create (_("&Layout..."), CK_OptionsLayout));
entries = g_list_append (entries, menu_entry_create (_("&Panel options..."), CK_OptionsPanel));
entries = g_list_append (entries, menu_entry_create (_("C&onfirmation..."), CK_OptionsConfirm));
entries = entries =
g_list_append (entries, menu_entry_create (_("&Panel options..."), CK_PanelOptionsBox)); g_list_append (entries, menu_entry_create (_("&Display bits..."), CK_OptionsDisplayBits));
entries = g_list_append (entries, menu_entry_create (_("C&onfirmation..."), CK_ConfirmBox));
entries = g_list_append (entries, menu_entry_create (_("&Display bits..."), CK_DisplayBitsBox));
entries = g_list_append (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys)); entries = g_list_append (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys));
#ifdef ENABLE_VFS #ifdef ENABLE_VFS
entries = g_list_append (entries, menu_entry_create (_("&Virtual FS..."), CK_ConfigureVfs)); entries = g_list_append (entries, menu_entry_create (_("&Virtual FS..."), CK_OptionsVfs));
#endif #endif
entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Save setup"), CK_SaveSetupCmd)); entries = g_list_append (entries, menu_entry_create (_("&Save setup"), CK_SaveSetup));
return entries; return entries;
} }
@ -420,7 +415,7 @@ midnight_get_shortcut (unsigned long command)
if (shortcut != NULL) if (shortcut != NULL)
return g_strdup (shortcut); return g_strdup (shortcut);
ext_map = keybind_lookup_keymap_shortcut (main_map, CK_StartExtMap1); ext_map = keybind_lookup_keymap_shortcut (main_map, CK_ExtendedKeyMap);
if (ext_map != NULL) if (ext_map != NULL)
shortcut = keybind_lookup_keymap_shortcut (main_x_map, command); shortcut = keybind_lookup_keymap_shortcut (main_x_map, command);
if (shortcut != NULL) if (shortcut != NULL)
@ -570,7 +565,7 @@ create_panels (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_current_pathname (void) put_current_path (void)
{ {
char *cwd_path; char *cwd_path;
if (!command_prompt) if (!command_prompt)
@ -587,7 +582,7 @@ copy_current_pathname (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_other_pathname (void) put_other_path (void)
{ {
char *cwd_path; char *cwd_path;
@ -608,21 +603,22 @@ copy_other_pathname (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_readlink (WPanel * panel) put_link (WPanel * panel)
{ {
if (!command_prompt) if (!command_prompt)
return; return;
if (S_ISLNK (selection (panel)->st.st_mode)) if (S_ISLNK (selection (panel)->st.st_mode))
{ {
char buffer[MC_MAXPATHLEN]; char buffer[MC_MAXPATHLEN];
char *p = concat_dir_and_file (panel->cwd, selection (panel)->fname); char *p;
int i; int i;
p = concat_dir_and_file (panel->cwd, selection (panel)->fname);
i = mc_readlink (p, buffer, MC_MAXPATHLEN - 1); i = mc_readlink (p, buffer, MC_MAXPATHLEN - 1);
g_free (p); g_free (p);
if (i > 0) if (i > 0)
{ {
buffer[i] = 0; buffer[i] = '\0';
command_insert (cmdline, buffer, TRUE); command_insert (cmdline, buffer, TRUE);
} }
} }
@ -631,25 +627,25 @@ copy_readlink (WPanel * panel)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_current_readlink (void) put_current_link (void)
{ {
copy_readlink (current_panel); put_link (current_panel);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_other_readlink (void) put_other_link (void)
{ {
if (get_other_type () == view_listing) if (get_other_type () == view_listing)
copy_readlink (other_panel); put_link (other_panel);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** Insert the selected file name into the input line */ /** Insert the selected file name into the input line */
static void static void
copy_prog_name (void) put_prog_name (void)
{ {
char *tmp; char *tmp;
if (!command_prompt) if (!command_prompt)
@ -669,7 +665,7 @@ copy_prog_name (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_tagged (WPanel * panel) put_tagged (WPanel * panel)
{ {
int i; int i;
@ -694,18 +690,18 @@ copy_tagged (WPanel * panel)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_current_tagged (void) put_current_tagged (void)
{ {
copy_tagged (current_panel); put_tagged (current_panel);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
copy_other_tagged (void) put_other_tagged (void)
{ {
if (get_other_type () == view_listing) if (get_other_type () == view_listing)
copy_tagged (other_panel); put_tagged (other_panel);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -1024,264 +1020,265 @@ midnight_execute_cmd (Widget * sender, unsigned long command)
(void) sender; (void) sender;
/* stop quick search before executing any command */ /* stop quick search before executing any command */
send_message ((Widget *) current_panel, WIDGET_COMMAND, CK_PanelStopSearch); send_message ((Widget *) current_panel, WIDGET_COMMAND, CK_SearchStop);
switch (command) switch (command)
{ {
case CK_AddHotlist: case CK_HotListAdd:
add2hotlist_cmd (); add2hotlist_cmd ();
break; break;
case CK_ChangeListingCmd: case CK_PanelListingChange:
change_listing_cmd (); change_listing_cmd ();
break; break;
case CK_ChmodCmd: case CK_ChangeMode:
chmod_cmd (); chmod_cmd ();
break; break;
case CK_ChownCmd: case CK_ChangeOwn:
chown_cmd (); chown_cmd ();
break; break;
case CK_ChownAdvancedCmd: case CK_ChangeOwnAdvanced:
chown_advanced_cmd (); chown_advanced_cmd ();
break; break;
case CK_CompareDirsCmd: case CK_CompareDirs:
compare_dirs_cmd (); compare_dirs_cmd ();
break; break;
case CK_ConfigureBox: case CK_Options:
configure_box (); configure_box ();
break; break;
#ifdef ENABLE_VFS #ifdef ENABLE_VFS
case CK_ConfigureVfs: case CK_OptionsVfs:
configure_vfs (); configure_vfs ();
break; break;
#endif #endif
case CK_ConfirmBox: case CK_OptionsConfirm:
confirm_box (); confirm_box ();
break; break;
case CK_CopyCmd: case CK_Copy:
copy_cmd (); copy_cmd ();
break; break;
case CK_CopyCurrentPathname: case CK_PutCurrentPath:
copy_current_pathname (); put_current_path ();
break; break;
case CK_CopyCurrentReadlink: case CK_PutCurrentLink:
copy_current_readlink (); put_current_link ();
break; break;
case CK_CopyCurrentTagged: case CK_PutCurrentTagged:
copy_current_tagged (); put_current_tagged ();
break; break;
case CK_CopyOtherPathname: case CK_PutOtherPath:
copy_other_pathname (); put_other_path ();
break; break;
case CK_CopyOtherReadlink: case CK_PutOtherLink:
copy_other_readlink (); put_other_link ();
break; break;
case CK_CopyOtherTagged: case CK_PutOtherTagged:
copy_other_tagged (); put_other_tagged ();
break; break;
case CK_DeleteCmd: case CK_Delete:
delete_cmd (); delete_cmd ();
break; break;
case CK_DialogListCmd: case CK_ScreenList:
dialog_switch_list (); dialog_switch_list ();
break; break;
#ifdef USE_DIFF_VIEW #ifdef USE_DIFF_VIEW
case CK_DiffViewCmd: case CK_CompareFiles:
diff_view_cmd (); diff_view_cmd ();
break; break;
#endif #endif
case CK_DisplayBitsBox: case CK_OptionsDisplayBits:
display_bits_box (); display_bits_box ();
break; break;
case CK_EditCmd: case CK_Edit:
edit_cmd (); edit_cmd ();
break; break;
#ifdef USE_INTERNAL_EDIT #ifdef USE_INTERNAL_EDIT
case CK_EditForceInternalCmd: case CK_EditForceInternal:
edit_cmd_force_internal (); edit_cmd_force_internal ();
break; break;
#endif #endif
case CK_EditExtFileCmd: case CK_EditExtensionsFile:
ext_cmd (); ext_cmd ();
break; break;
case CK_EditFhlFileCmd: case CK_EditFileHighlightFile:
edit_fhl_cmd (); edit_fhl_cmd ();
break; break;
case CK_EditMcMenuCmd: case CK_EditUserMenu:
edit_mc_menu_cmd (); edit_mc_menu_cmd ();
break; break;
case CK_EditSymlinkCmd: case CK_LinkSymbolicEdit:
edit_symlink_cmd (); edit_symlink_cmd ();
break; break;
case CK_ExternalPanelize: case CK_ExternalPanelize:
external_panelize (); external_panelize ();
break; break;
case CK_FilterCmd: case CK_Filter:
filter_cmd (); filter_cmd ();
break; break;
case CK_FilteredViewCmd: case CK_ViewFiltered:
filtered_view_cmd (); view_filtered_cmd ();
break; break;
case CK_FindCmd: case CK_Find:
find_cmd (); find_cmd ();
break; break;
#ifdef ENABLE_VFS_FISH #ifdef ENABLE_VFS_FISH
case CK_FishlinkCmd: case CK_ConnectFish:
fishlink_cmd (); fishlink_cmd ();
break; break;
#endif #endif
#ifdef ENABLE_VFS_FTP #ifdef ENABLE_VFS_FTP
case CK_FtplinkCmd: case CK_ConnectFtp:
ftplink_cmd (); ftplink_cmd ();
break; break;
#endif #endif
case CK_HelpCmd: #ifdef ENABLE_VFS_SMB
case CK_ConnectSmb:
smblink_cmd ();
break;
#endif /* ENABLE_VFS_SMB */
case CK_Help:
help_cmd (); help_cmd ();
break; break;
case CK_HistoryCmd: case CK_History:
history_cmd (); /* show the history of command line widget */
send_message (&cmdline->widget, WIDGET_COMMAND, CK_History);
break; break;
case CK_InfoCmd: case CK_PanelInfo:
if (sender == (Widget *) the_menubar) if (sender == (Widget *) the_menubar)
info_cmd (); /* mwnu */ info_cmd (); /* menu */
else else
info_cmd_no_menu (); /* shortcut or buttonbar */ info_cmd_no_menu (); /* shortcut or buttonbar */
break; break;
#ifdef WITH_BACKGROUND #ifdef WITH_BACKGROUND
case CK_JobsCmd: case CK_Jobs:
jobs_cmd (); jobs_cmd ();
break; break;
#endif #endif
case CK_LayoutBox: case CK_OptionsLayout:
layout_box (); layout_box ();
break; break;
case CK_LearnKeys: case CK_LearnKeys:
learn_keys (); learn_keys ();
break; break;
case CK_LinkCmd: case CK_Link:
link_cmd (LINK_HARDLINK); link_cmd (LINK_HARDLINK);
break; break;
case CK_ListingCmd: case CK_PanelListing:
listing_cmd (); listing_cmd ();
break; break;
#ifdef LISTMODE_EDITOR #ifdef LISTMODE_EDITOR
case CK_ListmodeCmd: case CK_ListMode:
listmode_cmd (); listmode_cmd ();
break; break;
#endif #endif
case CK_MenuCmd: case CK_Menu:
menu_cmd (); menu_cmd ();
break; break;
case CK_MenuLastSelectedCmd: case CK_MenuLastSelected:
menu_last_selected_cmd (); menu_last_selected_cmd ();
break; break;
case CK_MkdirCmd: case CK_MakeDir:
mkdir_cmd (); mkdir_cmd ();
break; break;
case CK_PanelOptionsBox: case CK_OptionsPanel:
panel_options_box (); panel_options_box ();
break; break;
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
case CK_PanelSetPanelEncoding: case CK_SelectCodepage:
encoding_cmd (); encoding_cmd ();
break; break;
#endif #endif
case CK_QuickCdCmd: case CK_CdQuick:
quick_cd_cmd (); quick_cd_cmd ();
break; break;
case CK_QuickChdirCmd: case CK_HotList:
quick_chdir_cmd (); hotlist_cmd ();
break; break;
case CK_QuickViewCmd: case CK_PanelQuickView:
if (sender == (Widget *) the_menubar) if (sender == (Widget *) the_menubar)
quick_view_cmd (); /* menu */ quick_view_cmd (); /* menu */
else else
quick_cmd_no_menu (); /* shortcut or buttonabr */ quick_cmd_no_menu (); /* shortcut or buttonabr */
break; break;
case CK_QuietQuitCmd: case CK_QuitQuiet:
quiet_quit_cmd (); quiet_quit_cmd ();
break; break;
case CK_QuitCmd: case CK_Quit:
quit_cmd (); quit_cmd ();
break; break;
case CK_RelativeSymlinkCmd: case CK_LinkSymbolicRelative:
link_cmd (LINK_SYMLINK_RELATIVE); link_cmd (LINK_SYMLINK_RELATIVE);
break; break;
case CK_RenameCmd: case CK_Move:
rename_cmd (); rename_cmd ();
break; break;
case CK_RereadCmd: case CK_Reread:
reread_cmd (); reread_cmd ();
break; break;
#ifdef ENABLE_VFS #ifdef ENABLE_VFS
case CK_ReselectVfs: case CK_VfsList:
reselect_vfs (); vfs_list ();
break; break;
#endif #endif
case CK_ReverseSelectionCmd: case CK_SelectInvert:
reverse_selection_cmd (); select_invert_cmd ();
break; break;
case CK_SaveSetupCmd: case CK_SaveSetup:
save_setup_cmd (); save_setup_cmd ();
break; break;
case CK_SelectCmd: case CK_Select:
select_cmd (); select_cmd ();
break; break;
case CK_ShowCommandLine: case CK_Shell:
view_other_cmd (); view_other_cmd ();
break; break;
case CK_SingleDirsizeCmd: case CK_DirSize:
smart_dirsize_cmd (); smart_dirsize_cmd ();
break; break;
#ifdef ENABLE_VFS_SMB
case CK_SmblinkCmd:
smblink_cmd ();
break;
#endif /* ENABLE_VFS_SMB */
case CK_Sort: case CK_Sort:
sort_cmd (); sort_cmd ();
break; break;
case CK_StartExtMap1: case CK_ExtendedKeyMap:
ctl_x_cmd (); ctl_x_cmd ();
break; break;
case CK_SuspendCmd: case CK_Suspend:
suspend_cmd (); suspend_cmd ();
break; break;
case CK_SwapCmd: case CK_Swap:
swap_cmd (); swap_cmd ();
break; break;
case CK_SymlinkCmd: case CK_LinkSymbolic:
link_cmd (LINK_SYMLINK_ABSOLUTE); link_cmd (LINK_SYMLINK_ABSOLUTE);
break; break;
case CK_ToggleListingCmd: case CK_PanelListingSwitch:
toggle_listing_cmd (); toggle_listing_cmd ();
break; break;
case CK_ToggleShowHidden: case CK_ShowHidden:
toggle_show_hidden (); toggle_show_hidden ();
break; break;
case CK_TogglePanelsSplit: case CK_SplitVertHoriz:
toggle_panels_split (); toggle_panels_split ();
break; break;
case CK_TreeCmd: case CK_PanelTree:
tree_cmd (); panel_tree_cmd ();
break; break;
case CK_TreeBoxCmd: case CK_Tree:
treebox_cmd (); treebox_cmd ();
break; break;
#ifdef ENABLE_VFS_UNDELFS #ifdef ENABLE_VFS_UNDELFS
case CK_UndeleteCmd: case CK_Undelete:
undelete_cmd (); undelete_cmd ();
break; break;
#endif #endif
case CK_UnselectCmd: case CK_Unselect:
unselect_cmd (); unselect_cmd ();
break; break;
case CK_UserMenuCmd: case CK_UserMenu:
user_file_menu_cmd (); user_file_menu_cmd ();
break; break;
case CK_ViewCmd: case CK_View:
view_cmd (); view_cmd ();
break; break;
case CK_ViewFileCmd: case CK_ViewFile:
view_file_cmd (); view_file_cmd ();
break; break;
default: default:
@ -1329,7 +1326,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
dlg_select_widget (get_panel_widget (1)); dlg_select_widget (get_panel_widget (1));
if (auto_menu) if (auto_menu)
midnight_execute_cmd (NULL, CK_UserMenuCmd); midnight_execute_cmd (NULL, CK_UserMenu);
return MSG_HANDLED; return MSG_HANDLED;
case DLG_KEY: case DLG_KEY:
@ -1369,15 +1366,15 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
/* Ctrl-Enter and Alt-Enter */ /* Ctrl-Enter and Alt-Enter */
if (((parm & ~(KEY_M_CTRL | KEY_M_ALT)) == '\n') && (parm & (KEY_M_CTRL | KEY_M_ALT))) if (((parm & ~(KEY_M_CTRL | KEY_M_ALT)) == '\n') && (parm & (KEY_M_CTRL | KEY_M_ALT)))
{ {
copy_prog_name (); put_prog_name ();
return MSG_HANDLED; return MSG_HANDLED;
} }
/* Ctrl-Shift-Enter */ /* Ctrl-Shift-Enter */
if (parm == (KEY_M_CTRL | KEY_M_SHIFT | '\n')) if (parm == (KEY_M_CTRL | KEY_M_SHIFT | '\n'))
{ {
copy_current_pathname (); put_current_path ();
copy_prog_name (); put_prog_name ();
return MSG_HANDLED; return MSG_HANDLED;
} }
@ -1401,7 +1398,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
if (parm == '*') if (parm == '*')
{ {
reverse_selection_cmd (); select_invert_cmd ();
return MSG_HANDLED; return MSG_HANDLED;
} }
} }
@ -1425,7 +1422,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
if (parm == '*') if (parm == '*')
{ {
reverse_selection_cmd (); select_invert_cmd ();
return MSG_HANDLED; return MSG_HANDLED;
} }
} }
@ -1436,7 +1433,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
if ((get_current_type () == view_listing) && current_panel->searching) if ((get_current_type () == view_listing) && current_panel->searching)
{ {
current_panel->dirty = 1; /* FIXME: unneeded? */ current_panel->dirty = 1; /* FIXME: unneeded? */
send_message ((Widget *) current_panel, WIDGET_COMMAND, CK_PanelStopSearch); send_message ((Widget *) current_panel, WIDGET_COMMAND, CK_SearchStop);
} }
return MSG_HANDLED; return MSG_HANDLED;

View File

@ -2319,7 +2319,7 @@ chdir_other_panel (WPanel * panel)
*/ */
static void static void
sync_other_panel (WPanel * panel) panel_sync_other (const WPanel * panel)
{ {
if (get_other_type () != view_listing) if (get_other_type () != view_listing)
{ {
@ -2718,138 +2718,140 @@ panel_execute_cmd (WPanel * panel, unsigned long command)
{ {
int res = MSG_HANDLED; int res = MSG_HANDLED;
if (command != CK_PanelStartSearch) if (command != CK_Search)
stop_search (panel); stop_search (panel);
switch (command) switch (command)
{ {
case CK_PanelChdirOtherPanel: case CK_PanelOtherCd:
chdir_other_panel (panel); chdir_other_panel (panel);
break; break;
case CK_PanelChdirToReadlink: case CK_PanelOtherCdLink:
chdir_to_readlink (panel); chdir_to_readlink (panel);
break; break;
case CK_PanelCmdCopyLocal: case CK_CopySingle:
copy_cmd_local (); copy_cmd_local ();
break; break;
case CK_PanelCmdDeleteLocal: case CK_DeleteSingle:
delete_cmd_local (); delete_cmd_local ();
break; break;
case CK_PanelCmdDoEnter: case CK_Enter:
do_enter (panel); do_enter (panel);
break; break;
case CK_PanelCmdViewSimple: case CK_ViewRaw:
view_simple_cmd (); view_raw_cmd ();
break; break;
case CK_PanelCmdEditNew: case CK_EditNew:
edit_cmd_new (); edit_cmd_new ();
break; break;
case CK_PanelCmdRenameLocal: case CK_MoveSingle:
rename_cmd_local (); rename_cmd_local ();
break; break;
case CK_PanelCmdReverseSelection: case CK_SelectInvert:
reverse_selection_cmd (); select_invert_cmd ();
break; break;
case CK_PanelCmdSelect: case CK_Select:
select_cmd (); select_cmd ();
break; break;
case CK_PanelCmdUnselect: case CK_Unselect:
unselect_cmd (); unselect_cmd ();
break; break;
case CK_PanelNextPage: case CK_PageDown:
next_page (panel); next_page (panel);
break; break;
case CK_PanelPrevPage: case CK_PageUp:
prev_page (panel); prev_page (panel);
break; break;
case CK_PanelGotoChildDir: case CK_CdChild:
goto_child_dir (panel); goto_child_dir (panel);
break; break;
case CK_PanelGotoParentDir: case CK_CdParent:
goto_parent_dir (panel); goto_parent_dir (panel);
break; break;
case CK_PanelDirectoryHistoryList: case CK_History:
directory_history_list (panel); directory_history_list (panel);
break; break;
case CK_PanelDirectoryHistoryNext: case CK_HistoryNext:
directory_history_next (panel); directory_history_next (panel);
break; break;
case CK_PanelDirectoryHistoryPrev: case CK_HistoryPrev:
directory_history_prev (panel); directory_history_prev (panel);
break; break;
case CK_PanelGotoBottomFile: case CK_BottomOnScreen:
goto_bottom_file (panel); goto_bottom_file (panel);
break; break;
case CK_PanelGotoMiddleFile: case CK_MiddleOnScreen:
goto_middle_file (panel); goto_middle_file (panel);
break; break;
case CK_PanelGotoTopFile: case CK_TopOnScreen:
goto_top_file (panel); goto_top_file (panel);
break; break;
case CK_PanelMarkFile: case CK_Mark:
mark_file (panel); mark_file (panel);
break; break;
case CK_PanelMarkFileUp: case CK_MarkUp:
mark_file_up (panel); mark_file_up (panel);
break; break;
case CK_PanelMarkFileDown: case CK_MarkDown:
mark_file_down (panel); mark_file_down (panel);
break; break;
case CK_PanelSmartGotoParentDir: case CK_CdParentSmart:
res = force_maybe_cd (); res = force_maybe_cd ();
break; break;
case CK_PanelMoveUp: case CK_Up:
move_up (panel); move_up (panel);
break; break;
case CK_PanelMoveDown: case CK_Down:
move_down (panel); move_down (panel);
break; break;
case CK_PanelMoveLeft: case CK_Left:
res = move_left (panel); res = move_left (panel);
break; break;
case CK_PanelMoveRight: case CK_Right:
res = move_right (panel); res = move_right (panel);
break; break;
case CK_PanelMoveEnd: case CK_Bottom:
move_end (panel); move_end (panel);
break; break;
case CK_PanelMoveHome: case CK_Top:
move_home (panel); move_home (panel);
break; break;
case CK_PanelSetPanelEncoding: #ifdef HAVE_CHARSET
case CK_SelectCodepage:
panel_change_encoding (panel); panel_change_encoding (panel);
break; break;
case CK_PanelStartSearch: #endif
case CK_Search:
start_search (panel); start_search (panel);
break; break;
case CK_PanelStopSearch: case CK_SearchStop:
break; break;
case CK_PanelSyncOtherPanel: case CK_PanelOtherSync:
sync_other_panel (panel); panel_sync_other (panel);
break; break;
case CK_PanelSelectSortOrder: case CK_Sort:
panel_select_sort_order (panel); panel_select_sort_order (panel);
break; break;
case CK_PanelToggleSortOrderPrev: case CK_SortPrev:
panel_toggle_sort_order_prev (panel); panel_toggle_sort_order_prev (panel);
break; break;
case CK_PanelToggleSortOrderNext: case CK_SortNext:
panel_toggle_sort_order_next (panel); panel_toggle_sort_order_next (panel);
break; break;
case CK_PanelReverseSort: case CK_SortReverse:
panel->sort_info.reverse = !panel->sort_info.reverse; panel->sort_info.reverse = !panel->sort_info.reverse;
panel_set_sort_order (panel, panel->sort_info.sort_field); panel_set_sort_order (panel, panel->sort_info.sort_field);
break; break;
case CK_PanelSortOrderByName: case CK_SortByName:
panel_set_sort_type_by_id (panel, "name"); panel_set_sort_type_by_id (panel, "name");
break; break;
case CK_PanelSortOrderByExt: case CK_SortByExt:
panel_set_sort_type_by_id (panel, "extension"); panel_set_sort_type_by_id (panel, "extension");
break; break;
case CK_PanelSortOrderBySize: case CK_SortBySize:
panel_set_sort_type_by_id (panel, "size"); panel_set_sort_type_by_id (panel, "size");
break; break;
case CK_PanelSortOrderByMTime: case CK_SortByMTime:
panel_set_sort_type_by_id (panel, "mtime"); panel_set_sort_type_by_id (panel, "mtime");
break; break;
} }
@ -3091,7 +3093,7 @@ do_panel_event (Gpm_Event * event, WPanel * panel, gboolean * redir)
if (event->x == panel->widget.cols - 5) if (event->x == panel->widget.cols - 5)
{ {
panel->widget.owner->callback (panel->widget.owner, NULL, panel->widget.owner->callback (panel->widget.owner, NULL,
DLG_ACTION, CK_ToggleShowHidden, NULL); DLG_ACTION, CK_ShowHidden, NULL);
repaint_screen (); repaint_screen ();
return MOU_NORMAL; return MOU_NORMAL;
} }

View File

@ -1016,54 +1016,54 @@ tree_execute_cmd (WTree * tree, unsigned long command)
{ {
cb_ret_t res = MSG_HANDLED; cb_ret_t res = MSG_HANDLED;
if (command != CK_TreeStartSearch) if (command != CK_Search)
tree->searching = 0; tree->searching = 0;
switch (command) switch (command)
{ {
case CK_TreeHelp: case CK_Help:
interactive_display (NULL, "[Directory Tree]"); interactive_display (NULL, "[Directory Tree]");
break; break;
case CK_TreeForget: case CK_Forget:
tree_forget (tree); tree_forget (tree);
break; break;
case CK_TreeToggleNav: case CK_ToggleNavigation:
tree_toggle_navig (tree); tree_toggle_navig (tree);
break; break;
case CK_TreeCopy: case CK_Copy:
tree_copy (tree, ""); tree_copy (tree, "");
break; break;
case CK_TreeMove: case CK_Move:
tree_move (tree, ""); tree_move (tree, "");
break; break;
case CK_TreeMoveUp: case CK_Up:
tree_move_up (tree); tree_move_up (tree);
break; break;
case CK_TreeMoveDown: case CK_Down:
tree_move_down (tree); tree_move_down (tree);
break; break;
case CK_TreeMoveHome: case CK_Top:
tree_move_home (tree); tree_move_home (tree);
break; break;
case CK_TreeMoveEnd: case CK_Bottom:
tree_move_end (tree); tree_move_end (tree);
break; break;
case CK_TreeMovePgUp: case CK_PageUp:
tree_move_pgup (tree); tree_move_pgup (tree);
break; break;
case CK_TreeMovePgDn: case CK_PageDown:
tree_move_pgdn (tree); tree_move_pgdn (tree);
break; break;
case CK_TreeOpen: case CK_Enter:
tree_chdir_sel (tree); tree_chdir_sel (tree);
break; break;
case CK_TreeRescan: case CK_Reread:
tree_rescan (tree); tree_rescan (tree);
break; break;
case CK_TreeStartSearch: case CK_Search:
tree_start_search (tree); tree_start_search (tree);
break; break;
case CK_TreeRemove: case CK_Delete:
tree_rmdir (tree); tree_rmdir (tree);
break; break;
default: default:
@ -1086,9 +1086,9 @@ tree_key (WTree * tree, int key)
if (key == tree_map[i].key) if (key == tree_map[i].key)
switch (tree_map[i].command) switch (tree_map[i].command)
{ {
case CK_TreeMoveLeft: case CK_Left:
return tree_move_left (tree) ? MSG_HANDLED : MSG_NOT_HANDLED; return tree_move_left (tree) ? MSG_HANDLED : MSG_NOT_HANDLED;
case CK_TreeMoveRight: case CK_Right:
return tree_move_right (tree) ? MSG_HANDLED : MSG_NOT_HANDLED; return tree_move_right (tree) ? MSG_HANDLED : MSG_NOT_HANDLED;
default: default:
tree_execute_cmd (tree, tree_map[i].command); tree_execute_cmd (tree, tree_map[i].command);

View File

@ -853,55 +853,55 @@ help_execute_cmd (unsigned long command)
switch (command) switch (command)
{ {
case CK_HelpHelp: case CK_Help:
help_help (whelp); help_help (whelp);
break; break;
case CK_HelpIndex: case CK_Index:
help_index (whelp); help_index (whelp);
break; break;
case CK_HelpBack: case CK_Back:
help_back (whelp); help_back (whelp);
break; break;
case CK_HelpMoveUp: case CK_Up:
help_prev_link (TRUE); help_prev_link (TRUE);
break; break;
case CK_HelpMoveDown: case CK_Down:
help_next_link (TRUE); help_next_link (TRUE);
break; break;
case CK_HelpMovePgDn: case CK_PageDown:
move_forward (help_lines - 1); move_forward (help_lines - 1);
break; break;
case CK_HelpMovePgUp: case CK_PageUp:
move_backward (help_lines - 1); move_backward (help_lines - 1);
break; break;
case CK_HelpMoveHalfPgDn: case CK_HalfPageDown:
move_forward (help_lines / 2); move_forward (help_lines / 2);
break; break;
case CK_HelpMoveHalfPgUp: case CK_HalfPageUp:
move_backward (help_lines / 2); move_backward (help_lines / 2);
break; break;
case CK_HelpMoveTop: case CK_Top:
move_to_top (); move_to_top ();
break; break;
case CK_HelpMoveBottom: case CK_Bottom:
move_to_bottom (); move_to_bottom ();
break; break;
case CK_HelpSelectLink: case CK_Enter:
help_select_link (); help_select_link ();
break; break;
case CK_HelpNextLink: case CK_LinkNext:
help_next_link (FALSE); help_next_link (FALSE);
break; break;
case CK_HelpPrevLink: case CK_LinkPrev:
help_prev_link (FALSE); help_prev_link (FALSE);
break; break;
case CK_HelpNextNode: case CK_NodeNext:
help_next_node (); help_next_node ();
break; break;
case CK_HelpPrevNode: case CK_NodePrev:
help_prev_node (); help_prev_node ();
break; break;
case CK_HelpQuit: case CK_Quit:
dlg_stop (whelp); dlg_stop (whelp);
break; break;
default: default:

File diff suppressed because it is too large Load Diff

View File

@ -249,22 +249,22 @@ mcview_execute_cmd (mcview_t * view, unsigned long command)
switch (command) switch (command)
{ {
case CK_ViewHelp: case CK_Help:
interactive_display (NULL, "[Internal File Viewer]"); interactive_display (NULL, "[Internal File Viewer]");
break; break;
case CK_ViewToggleWrapMode: case CK_WrapMode:
/* Toggle between wrapped and unwrapped view */ /* Toggle between wrapped and unwrapped view */
mcview_toggle_wrap_mode (view); mcview_toggle_wrap_mode (view);
break; break;
case CK_ViewToggleHexEditMode: case CK_HexEditMode:
/* Toggle between hexview and hexedit mode */ /* Toggle between hexview and hexedit mode */
mcview_toggle_hexedit_mode (view); mcview_toggle_hexedit_mode (view);
break; break;
case CK_ViewToggleHexMode: case CK_HexMode:
/* Toggle between hex view and text view */ /* Toggle between hex view and text view */
mcview_toggle_hex_mode (view); mcview_toggle_hex_mode (view);
break; break;
case CK_ViewGoto: case CK_Goto:
{ {
off_t addr; off_t addr;
@ -280,100 +280,102 @@ mcview_execute_cmd (mcview_t * view, unsigned long command)
} }
break; break;
} }
case CK_ViewHexEditSave: case CK_Save:
mcview_hexedit_save_changes (view); mcview_hexedit_save_changes (view);
break; break;
case CK_ViewSearch: case CK_Search:
mcview_search (view); mcview_search (view);
break; break;
case CK_ViewToggleMagicMode: case CK_MagicMode:
mcview_toggle_magic_mode (view); mcview_toggle_magic_mode (view);
break; break;
case CK_ViewToggleNroffMode: case CK_NroffMode:
mcview_toggle_nroff_mode (view); mcview_toggle_nroff_mode (view);
break; break;
case CK_ViewToggleHexNavMode: case CK_ToggleNavigation:
view->hexview_in_text = !view->hexview_in_text; view->hexview_in_text = !view->hexview_in_text;
view->dirty++; view->dirty++;
break; break;
case CK_ViewMoveToBol: case CK_Home:
mcview_moveto_bol (view); mcview_moveto_bol (view);
break; break;
case CK_ViewMoveToEol: case CK_End:
mcview_moveto_eol (view); mcview_moveto_eol (view);
break; break;
case CK_ViewMoveLeft: case CK_Left:
mcview_move_left (view, 1); mcview_move_left (view, 1);
break; break;
case CK_ViewMoveRight: case CK_Right:
mcview_move_right (view, 1); mcview_move_right (view, 1);
break; break;
case CK_ViewMoveLeft10: case CK_LeftQuick:
if (!view->hex_mode) if (!view->hex_mode)
mcview_move_left (view, 10); mcview_move_left (view, 10);
break; break;
case CK_ViewMoveRight10: case CK_RightQuick:
if (!view->hex_mode) if (!view->hex_mode)
mcview_move_right (view, 10); mcview_move_right (view, 10);
break; break;
case CK_ViewContinueSearch: case CK_SearchContinue:
mcview_continue_search_cmd (view); mcview_continue_search_cmd (view);
break; break;
case CK_ViewToggleRuler: case CK_Ruler:
mcview_display_toggle_ruler (view); mcview_display_toggle_ruler (view);
break; break;
case CK_ViewMoveUp: case CK_Up:
mcview_move_up (view, 1); mcview_move_up (view, 1);
break; break;
case CK_ViewMoveDown: case CK_Down:
mcview_move_down (view, 1); mcview_move_down (view, 1);
break; break;
case CK_ViewMoveHalfPgUp: case CK_HalfPageUp:
mcview_move_up (view, (view->data_area.height + 1) / 2); mcview_move_up (view, (view->data_area.height + 1) / 2);
break; break;
case CK_ViewMoveHalfPgDn: case CK_HalfPageDown:
mcview_move_down (view, (view->data_area.height + 1) / 2); mcview_move_down (view, (view->data_area.height + 1) / 2);
break; break;
case CK_ViewMovePgUp: case CK_PageUp:
mcview_move_up (view, view->data_area.height); mcview_move_up (view, view->data_area.height);
break; break;
case CK_ViewMovePgDn: case CK_PageDown:
mcview_move_down (view, view->data_area.height); mcview_move_down (view, view->data_area.height);
break; break;
case CK_ViewMoveTop: case CK_Top:
mcview_moveto_top (view); mcview_moveto_top (view);
break; break;
case CK_ViewMoveBottom: case CK_Bottom:
mcview_moveto_bottom (view); mcview_moveto_bottom (view);
break; break;
case CK_ShowCommandLine: case CK_Shell:
view_other_cmd (); view_other_cmd ();
break; break;
/* #if 0
// Unlike Ctrl-O, run a new shell if the subshell is not running /* Unlike Ctrl-O, run a new shell if the subshell is not running */
case '!': case '!':
exec_shell (); exec_shell ();
return MSG_HANDLED; return MSG_HANDLED;
*/ #endif
case CK_ViewGotoBookmark: case CK_BookmarkGoto:
view->marks[view->marker] = view->dpy_start; view->marks[view->marker] = view->dpy_start;
break; break;
case CK_ViewNewBookmark: case CK_Bookmark:
view->dpy_start = view->marks[view->marker]; view->dpy_start = view->marks[view->marker];
view->dirty++; view->dirty++;
break; break;
#ifdef HAVE_CHARSET
case CK_SelectCodepage: case CK_SelectCodepage:
mcview_select_encoding (view); mcview_select_encoding (view);
view->dirty++; view->dirty++;
break; break;
case CK_ViewNextFile: #endif
case CK_ViewPrevFile: case CK_FileNext:
case CK_FilePrev:
/* Use to indicate parent that we want to see the next/previous file */ /* Use to indicate parent that we want to see the next/previous file */
/* Does not work in panel mode */ /* Does not work in panel mode */
if (!mcview_is_in_panel (view)) if (!mcview_is_in_panel (view))
view->move_dir = (command == CK_ViewNextFile) ? 1 : -1; view->move_dir = (command == CK_FileNext) ? 1 : -1;
/* fallthrough */ /* fallthrough */
case CK_ViewQuit: case CK_Quit:
if (!mcview_is_in_panel (view)) if (!mcview_is_in_panel (view))
dlg_stop (view->widget.owner); dlg_stop (view->widget.owner);
break; break;

View File

@ -315,9 +315,7 @@ mcview_select_encoding (mcview_t * view)
{ {
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
if (do_select_codepage ()) if (do_select_codepage ())
{
mcview_set_codeset (view); mcview_set_codeset (view);
}
#else #else
(void) view; (void) view;
#endif #endif