* editkeys.c: Leave only distinct entries in cooledit_key_map

and emacs_key_map.  Move the rest to common_key_map.
This commit is contained in:
Pavel Roskin 2003-06-14 05:02:33 +00:00
parent 9dae056016
commit 6b63507463
2 changed files with 75 additions and 108 deletions

View File

@ -1,3 +1,8 @@
2003-06-14 Pavel Roskin <proski@gnu.org>
* editkeys.c: Leave only distinct entries in cooledit_key_map
and emacs_key_map. Move the rest to common_key_map.
2003-06-09 Pavel Roskin <proski@gnu.org>
* editkeys.c (emacs_key_map): Move Atl-'>' and Alt-'<' ...

View File

@ -34,127 +34,86 @@
* when the key is assigned to more than one command.
*/
static const long cooledit_key_map[] = {
KEY_BACKSPACE, CK_BackSpace,
KEY_DC, CK_Delete,
'\n', CK_Enter,
KEY_PPAGE, CK_Page_Up,
KEY_NPAGE, CK_Page_Down,
KEY_LEFT, CK_Left,
KEY_RIGHT, CK_Right,
KEY_UP, CK_Up,
KEY_DOWN, CK_Down,
ALT ('\t'), CK_Complete_Word,
ALT ('\n'), CK_Return,
KEY_HOME, CK_Home,
KEY_END, CK_End,
'\t', CK_Tab,
XCTRL ('u'), CK_Undo,
KEY_IC, CK_Toggle_Insert,
XCTRL ('o'), CK_Shell,
KEY_F (3), CK_Mark,
KEY_F (13), CK_Column_Mark,
KEY_F (5), CK_Copy,
KEY_F (6), CK_Move,
KEY_F (8), CK_Remove,
KEY_F (12), CK_Save_As,
KEY_F (2), CK_Save,
XCTRL ('n'), CK_New,
XCTRL ('l'), CK_Refresh,
ESC_CHAR, CK_Exit,
KEY_F (10), CK_Exit,
KEY_F (11), /* edit user menu */ CK_User_Menu,
KEY_F (19), /*C formatter */ CK_Pipe_Block (0),
XCTRL ('p'), /*spell check */ CK_Pipe_Block (1),
KEY_F (15), CK_Insert_File,
XCTRL ('f'), CK_Save_Block,
KEY_F (1), CK_Help,
ALT ('t'), CK_Sort,
ALT ('u'), CK_ExtCmd,
ALT ('m'), CK_Mail,
XCTRL ('z'), CK_Word_Left,
XCTRL ('x'), CK_Word_Right,
KEY_F (4), CK_Replace,
KEY_F (7), CK_Find,
KEY_F (14), CK_Replace_Again,
ALT ('l'), CK_Goto,
ALT ('L'), CK_Goto,
XCTRL ('y'), CK_Delete_Line,
XCTRL ('k'), CK_Delete_To_Line_End,
KEY_F (17), CK_Find_Again,
ALT ('p'), CK_Paragraph_Format,
ALT ('b'), CK_Match_Bracket,
ALT ('m'), CK_Mail,
XCTRL ('f'), CK_Save_Block,
XCTRL ('n'), CK_New,
XCTRL ('p'), CK_Pipe_Block (1), /* spell check */
XCTRL ('x'), CK_Word_Right,
XCTRL ('y'), CK_Delete_Line,
XCTRL ('z'), CK_Word_Left,
0, 0
};
static long const emacs_key_map[] = {
KEY_BACKSPACE, CK_BackSpace,
KEY_DC, CK_Delete,
'\n', CK_Enter,
KEY_PPAGE, CK_Page_Up,
KEY_NPAGE, CK_Page_Down,
KEY_LEFT, CK_Left,
KEY_RIGHT, CK_Right,
KEY_UP, CK_Up,
KEY_DOWN, CK_Down,
ALT ('\t'), CK_Complete_Word,
ALT ('\n'), CK_Return,
KEY_HOME, CK_Home,
KEY_END, CK_End,
'\t', CK_Tab,
XCTRL ('u'), CK_Undo,
KEY_IC, CK_Toggle_Insert,
XCTRL ('o'), CK_Shell,
KEY_F (3), CK_Mark,
KEY_F (13), CK_Column_Mark,
KEY_F (5), CK_Copy,
KEY_F (6), CK_Move,
KEY_F (8), CK_Remove,
KEY_F (12), CK_Save_As,
KEY_F (2), CK_Save,
ALT ('p'), CK_Paragraph_Format,
ALT ('t'), CK_Sort,
ALT ('u'), CK_ExtCmd,
ALT ('$'), CK_Pipe_Block (1), /* spell check */
ALT ('b'), CK_Word_Left,
ALT ('f'), CK_Word_Right,
ALT ('v'), CK_Page_Up,
ALT ('w'), CK_XStore,
XCTRL ('@'), CK_Mark,
XCTRL ('a'), CK_Home,
XCTRL ('e'), CK_End,
XCTRL ('b'), CK_Left,
XCTRL ('e'), CK_End,
XCTRL ('f'), CK_Right,
XCTRL ('n'), CK_Down,
XCTRL ('p'), CK_Up,
XCTRL ('v'), CK_Page_Down,
ALT ('v'), CK_Page_Up,
XCTRL ('@'), CK_Mark,
XCTRL ('k'), CK_Delete_To_Line_End,
XCTRL ('s'), CK_Find,
ALT ('b'), CK_Word_Left,
ALT ('f'), CK_Word_Right,
XCTRL ('v'), CK_Page_Down,
XCTRL ('w'), CK_XCut,
XCTRL ('y'), CK_XPaste,
ALT ('w'), CK_XStore,
XCTRL ('l'), CK_Refresh,
ESC_CHAR, CK_Exit,
KEY_F (10), CK_Exit,
KEY_F (11), CK_User_Menu, /* edit user menu */
KEY_F (19), CK_Pipe_Block (0), /* C formatter */
ALT ('$'), CK_Pipe_Block (1), /*spell check */
KEY_F (15), CK_Insert_File,
KEY_F (1), CK_Help,
KEY_F (4), CK_Replace,
KEY_F (7), CK_Find,
KEY_F (14), CK_Replace_Again,
ALT ('l'), CK_Goto,
ALT ('L'), CK_Goto,
KEY_F (17), CK_Find_Again,
0, 0
};
static long const common_key_map[] = {
/* Ctrl + Shift */
KEY_M_SHIFT | KEY_M_CTRL | KEY_PPAGE, CK_Beginning_Of_Text_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_NPAGE, CK_End_Of_Text_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_LEFT, CK_Word_Left_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_RIGHT, CK_Word_Right_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_UP, CK_Scroll_Up_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_DOWN, CK_Scroll_Down_Highlight,
'\n', CK_Enter,
'\t', CK_Tab,
ESC_CHAR, CK_Exit,
KEY_BACKSPACE, CK_BackSpace,
KEY_DC, CK_Delete,
KEY_DOWN, CK_Down,
KEY_END, CK_End,
KEY_HOME, CK_Home,
KEY_IC, CK_Toggle_Insert,
KEY_LEFT, CK_Left,
KEY_NPAGE, CK_Page_Down,
KEY_PPAGE, CK_Page_Up,
KEY_RIGHT, CK_Right,
KEY_UP, CK_Up,
ALT ('\n'), CK_Return,
ALT ('\t'), CK_Complete_Word,
ALT ('l'), CK_Goto,
ALT ('L'), CK_Goto,
ALT ('p'), CK_Paragraph_Format,
ALT ('t'), CK_Sort,
ALT ('u'), CK_ExtCmd,
ALT ('<'), CK_Beginning_Of_Text,
ALT ('>'), CK_End_Of_Text,
ALT (KEY_BACKSPACE), CK_Delete_Word_Left,
XCTRL ('k'), CK_Delete_To_Line_End,
XCTRL ('l'), CK_Refresh,
XCTRL ('o'), CK_Shell,
XCTRL ('u'), CK_Undo,
KEY_F (1), CK_Help,
KEY_F (2), CK_Save,
KEY_F (3), CK_Mark,
KEY_F (4), CK_Replace,
KEY_F (5), CK_Copy,
KEY_F (6), CK_Move,
KEY_F (7), CK_Find,
KEY_F (8), CK_Remove,
KEY_F (10), CK_Exit,
KEY_F (11), CK_User_Menu, /* edit user menu */
KEY_F (12), CK_Save_As,
KEY_F (13), CK_Column_Mark,
KEY_F (14), CK_Replace_Again,
KEY_F (15), CK_Insert_File,
KEY_F (17), CK_Find_Again,
KEY_F (19), CK_Pipe_Block (0), /* C formatter */
/* Shift */
KEY_M_SHIFT | KEY_PPAGE, CK_Page_Up_Highlight,
@ -185,10 +144,13 @@ static long const common_key_map[] = {
KEY_M_CTRL | KEY_IC, CK_XStore,
KEY_M_CTRL | KEY_DC, CK_Remove,
/* Alt */
KEY_M_ALT | KEY_BACKSPACE, CK_Delete_Word_Left,
ALT ('<'), CK_Beginning_Of_Text,
ALT ('>'), CK_End_Of_Text,
/* Ctrl + Shift */
KEY_M_SHIFT | KEY_M_CTRL | KEY_PPAGE, CK_Beginning_Of_Text_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_NPAGE, CK_End_Of_Text_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_LEFT, CK_Word_Left_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_RIGHT, CK_Word_Right_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_UP, CK_Scroll_Up_Highlight,
KEY_M_SHIFT | KEY_M_CTRL | KEY_DOWN, CK_Scroll_Down_Highlight,
0, 0
};