mirror of https://github.com/MidnightCommander/mc
* editkeys.c: Move key maps to the file scope. Put common keys
to a separate table common_key_map. (edit_translate_key): Remove unused argument x_keycode.
This commit is contained in:
Pavel Roskin
parent
9dc4fc6342
commit
812bac9a33
|
|
@ -1,5 +1,9 @@
|
|||
2002-12-25 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* editkeys.c: Move key maps to the file scope. Put common keys
|
||||
to a separate table common_key_map.
|
||||
(edit_translate_key): Remove unused argument x_keycode.
|
||||
|
||||
* editkeys.c (edit_translate_key): Treat Shift-Enter as return
|
||||
without indent. Useful when pasting multiline text with
|
||||
Shift-button3 or Shift-Insert with autoindent enabled.
|
||||
|
|
|
|||
|
|
@ -123,8 +123,7 @@ void menu_save_mode_cmd (void);
|
|||
int edit_raw_key_query (char *heading, char *query, int cancel);
|
||||
char *strcasechr (const unsigned char *s, int c);
|
||||
int edit (const char *_file, int line);
|
||||
int edit_translate_key (WEdit *edit, unsigned int x_keycode, long x_key,
|
||||
int *cmd, int *ch);
|
||||
int edit_translate_key (WEdit *edit, long x_key, int *cmd, int *ch);
|
||||
|
||||
#ifndef NO_INLINE_GETBYTE
|
||||
int edit_get_byte (WEdit * edit, long byte_index);
|
||||
|
|
|
|||
430
edit/editkeys.c
430
edit/editkeys.c
|
|
@ -1,4 +1,4 @@
|
|||
/* editor key translation table.
|
||||
/* Editor key translation.
|
||||
|
||||
Copyright (C) 1996, 1997 the Free Software Foundation
|
||||
|
||||
|
|
@ -29,142 +29,183 @@
|
|||
#include "src/charsets.h" /* convert_from_input_c() */
|
||||
#include "src/selcodepage.h" /* do_select_codepage() */
|
||||
|
||||
/*
|
||||
* Ordinary translations. Note that the keys listed first take priority
|
||||
* when the key is assigned to more than one command.
|
||||
*/
|
||||
static const long cooledit_key_map[] = {
|
||||
KEY_BACKSPACE, CK_BackSpace,
|
||||
0177, CK_BackSpace,
|
||||
XCTRL ('h'), CK_BackSpace,
|
||||
KEY_DC, CK_Delete,
|
||||
XCTRL ('d'), 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 ('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,
|
||||
0, 0
|
||||
};
|
||||
|
||||
static long const emacs_key_map[] = {
|
||||
KEY_BACKSPACE, CK_BackSpace,
|
||||
0177, CK_BackSpace,
|
||||
XCTRL ('h'), CK_BackSpace,
|
||||
KEY_DC, CK_Delete,
|
||||
XCTRL ('d'), 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,
|
||||
XCTRL ('a'), CK_Home,
|
||||
XCTRL ('e'), CK_End,
|
||||
XCTRL ('b'), CK_Left,
|
||||
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 ('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,
|
||||
ALT ('<'), CK_Beginning_Of_Text,
|
||||
ALT ('>'), CK_End_Of_Text,
|
||||
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,
|
||||
|
||||
/* Shift */
|
||||
KEY_M_SHIFT | KEY_PPAGE, CK_Page_Up_Highlight,
|
||||
KEY_M_SHIFT | KEY_NPAGE, CK_Page_Down_Highlight,
|
||||
KEY_M_SHIFT | KEY_LEFT, CK_Left_Highlight,
|
||||
KEY_M_SHIFT | KEY_RIGHT, CK_Right_Highlight,
|
||||
KEY_M_SHIFT | KEY_UP, CK_Up_Highlight,
|
||||
KEY_M_SHIFT | KEY_DOWN, CK_Down_Highlight,
|
||||
KEY_M_SHIFT | KEY_HOME, CK_Home_Highlight,
|
||||
KEY_M_SHIFT | KEY_END, CK_End_Highlight,
|
||||
KEY_M_SHIFT | KEY_IC, CK_XPaste,
|
||||
KEY_M_SHIFT | KEY_DC, CK_XCut,
|
||||
KEY_M_SHIFT | '\n', CK_Return, /* useful for pasting multiline text */
|
||||
|
||||
/* Ctrl */
|
||||
KEY_M_CTRL | (KEY_F (2)), CK_Save_As,
|
||||
KEY_M_CTRL | (KEY_F (4)), CK_Replace_Again,
|
||||
KEY_M_CTRL | (KEY_F (7)), CK_Find_Again,
|
||||
KEY_M_CTRL | KEY_BACKSPACE, CK_Undo,
|
||||
KEY_M_CTRL | KEY_PPAGE, CK_Beginning_Of_Text,
|
||||
KEY_M_CTRL | KEY_NPAGE, CK_End_Of_Text,
|
||||
KEY_M_CTRL | KEY_HOME, CK_Beginning_Of_Text,
|
||||
KEY_M_CTRL | KEY_END, CK_End_Of_Text,
|
||||
KEY_M_CTRL | KEY_UP, CK_Scroll_Up,
|
||||
KEY_M_CTRL | KEY_DOWN, CK_Scroll_Down,
|
||||
KEY_M_CTRL | KEY_LEFT, CK_Word_Left,
|
||||
KEY_M_CTRL | KEY_RIGHT, CK_Word_Right,
|
||||
KEY_M_CTRL | KEY_IC, CK_XStore,
|
||||
KEY_M_CTRL | KEY_DC, CK_Remove,
|
||||
|
||||
0, 0
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Translate the keycode into either 'command' or 'char_for_insertion'.
|
||||
* 'command' is one of the editor commands from editcmddef.h.
|
||||
*/
|
||||
int
|
||||
edit_translate_key (WEdit *edit, unsigned int x_keycode, long x_key,
|
||||
int *cmd, int *ch)
|
||||
edit_translate_key (WEdit *edit, long x_key, int *cmd, int *ch)
|
||||
{
|
||||
int command = -1;
|
||||
int char_for_insertion = -1;
|
||||
|
||||
/*
|
||||
these #defines are probably the ones most people will be interested in.
|
||||
You can use these two #defines to hard code the key mappings --- just
|
||||
uncomment the one you want. But only if you have trouble with learn
|
||||
keys (which is unlikely).
|
||||
*/
|
||||
|
||||
/* KEY_BACKSPACE is the key learned in the learn keys menu : */
|
||||
#define OUR_BACKSPACE_KEY KEY_BACKSPACE
|
||||
/* ...otherwise ctrl-h : */
|
||||
/* #define OUR_BACKSPACE_KEY XCTRL ('h') */
|
||||
/* ...otherwise 127 or DEL in ascii : */
|
||||
/* #define OUR_BACKSPACE_KEY 0177 */
|
||||
|
||||
/* KEY_DC is the key learned in the learn keys menu */
|
||||
#define OUR_DELETE_KEY KEY_DC
|
||||
/* ...otherwise ctrl-d : */
|
||||
/* #define OUR_DELETE_KEY XCTRL ('d') */
|
||||
/* ...otherwise 127 or DEL in ascii : */
|
||||
/* #define OUR_DELETE_KEY 0177 */
|
||||
|
||||
|
||||
/*
|
||||
This is #include'd into the function edit_translate_key in edit.c.
|
||||
This sequence of code takes 'x_state' and 'x_key' and translates them
|
||||
into either 'command' or 'char_for_insertion'. 'x_key' holds one of
|
||||
KEY_NPAGE, KEY_HOME etc., possibly with modifiers.
|
||||
'command' is one of the editor commands editcmddef.h.
|
||||
|
||||
Almost any C code can go into this file. The code below is an example
|
||||
that may by appended or modified by the user.
|
||||
*/
|
||||
|
||||
|
||||
#define KEY_NUMLOCK ???
|
||||
|
||||
/* ordinary translations. (Some of this may be redundant.) Note that keys listed
|
||||
first take priority when a key is assigned to more than one command */
|
||||
static const long *key_map;
|
||||
static const long cooledit_key_map[] =
|
||||
{ OUR_BACKSPACE_KEY, CK_BackSpace, OUR_DELETE_KEY, CK_Delete,
|
||||
XCTRL ('d'), 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 ('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,
|
||||
XCTRL ('h'), CK_BackSpace, 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,
|
||||
0177, CK_BackSpace,
|
||||
0, 0
|
||||
};
|
||||
|
||||
static long const emacs_key_map[] =
|
||||
{ OUR_BACKSPACE_KEY, CK_BackSpace, OUR_DELETE_KEY, 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,
|
||||
|
||||
XCTRL ('a'), CK_Home, XCTRL ('e'), CK_End,
|
||||
XCTRL ('b'), CK_Left, XCTRL ('f'), CK_Right,
|
||||
XCTRL ('n'), CK_Down, XCTRL ('p'), CK_Up,
|
||||
XCTRL ('d'), CK_Delete,
|
||||
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 ('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), /* edit user menu */ CK_User_Menu,
|
||||
KEY_F (19), /*C formatter */ CK_Pipe_Block (0),
|
||||
ALT ('$'), /*spell check */ CK_Pipe_Block (1),
|
||||
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,
|
||||
XCTRL ('h'), CK_BackSpace, ALT ('l'), CK_Goto, ALT ('L'), CK_Goto,
|
||||
KEY_F (17), CK_Find_Again,
|
||||
ALT ('<'), CK_Beginning_Of_Text,
|
||||
ALT ('>'), CK_End_Of_Text,
|
||||
0177, CK_BackSpace,
|
||||
|
||||
0, 0
|
||||
};
|
||||
|
||||
static long const key_pad_map[10] =
|
||||
{ XCTRL ('o'), KEY_END, KEY_DOWN, KEY_NPAGE, KEY_LEFT,
|
||||
KEY_DOWN, KEY_RIGHT, KEY_HOME, KEY_UP, KEY_PPAGE
|
||||
};
|
||||
|
||||
|
||||
#define DEFAULT_NUM_LOCK 0
|
||||
|
||||
static int num_lock = DEFAULT_NUM_LOCK;
|
||||
int i = 0;
|
||||
static const long *key_map;
|
||||
|
||||
switch (edit_key_emulation) {
|
||||
case EDIT_KEY_EMULATION_NORMAL:
|
||||
|
|
@ -235,118 +276,6 @@ edit_translate_key (WEdit *edit, unsigned int x_keycode, long x_key,
|
|||
goto fin;
|
||||
}
|
||||
|
||||
/* first translate the key-pad */
|
||||
if (num_lock) {
|
||||
if (x_key >= '0' && x_key <= '9') {
|
||||
x_key = key_pad_map[x_key - '0'];
|
||||
}
|
||||
if (x_key == '.') {
|
||||
x_key = KEY_DC;
|
||||
}
|
||||
}
|
||||
|
||||
/* keys with modifiers */
|
||||
switch (x_key) {
|
||||
/* shift + ctrl */
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_PPAGE:
|
||||
command = CK_Beginning_Of_Text_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_NPAGE:
|
||||
command = CK_End_Of_Text_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_LEFT:
|
||||
command = CK_Word_Left_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_RIGHT:
|
||||
command = CK_Word_Right_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_UP:
|
||||
command = CK_Scroll_Up_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_M_CTRL | KEY_DOWN:
|
||||
command = CK_Scroll_Down_Highlight;
|
||||
goto fin;
|
||||
|
||||
/* shift */
|
||||
case KEY_M_SHIFT | KEY_PPAGE:
|
||||
command = CK_Page_Up_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_NPAGE:
|
||||
command = CK_Page_Down_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_LEFT:
|
||||
command = CK_Left_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_RIGHT:
|
||||
command = CK_Right_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_UP:
|
||||
command = CK_Up_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_DOWN:
|
||||
command = CK_Down_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_HOME:
|
||||
command = CK_Home_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_END:
|
||||
command = CK_End_Highlight;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_IC:
|
||||
command = CK_XPaste;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | KEY_DC:
|
||||
command = CK_XCut;
|
||||
goto fin;
|
||||
case KEY_M_SHIFT | '\n':
|
||||
/* useful for pasting multiline text */
|
||||
command = CK_Return;
|
||||
goto fin;
|
||||
|
||||
/* ctrl */
|
||||
case KEY_M_CTRL | (KEY_F (2)):
|
||||
command = CK_Save_As;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | (KEY_F (4)):
|
||||
command = CK_Replace_Again;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | (KEY_F (7)):
|
||||
command = CK_Find_Again;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_BACKSPACE:
|
||||
command = CK_Undo;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_PPAGE:
|
||||
command = CK_Beginning_Of_Text;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_NPAGE:
|
||||
command = CK_End_Of_Text;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_HOME:
|
||||
command = CK_Beginning_Of_Text;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_END:
|
||||
command = CK_End_Of_Text;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_UP:
|
||||
command = CK_Scroll_Up;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_DOWN:
|
||||
command = CK_Scroll_Down;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_LEFT:
|
||||
command = CK_Word_Left;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_RIGHT:
|
||||
command = CK_Word_Right;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_IC:
|
||||
command = CK_XStore;
|
||||
goto fin;
|
||||
case KEY_M_CTRL | KEY_DC:
|
||||
command = CK_Remove;
|
||||
goto fin;
|
||||
}
|
||||
|
||||
/* an ordinary insertable character */
|
||||
if (x_key < 256) {
|
||||
|
|
@ -358,7 +287,7 @@ edit_translate_key (WEdit *edit, unsigned int x_keycode, long x_key,
|
|||
}
|
||||
}
|
||||
|
||||
/* other commands */
|
||||
/* Commands specific to the key emulation */
|
||||
i = 0;
|
||||
while (key_map[i] != x_key && (key_map[i] || key_map[i + 1]))
|
||||
i += 2;
|
||||
|
|
@ -366,16 +295,23 @@ edit_translate_key (WEdit *edit, unsigned int x_keycode, long x_key,
|
|||
if (command)
|
||||
goto fin;
|
||||
|
||||
/* Function still not found for this key, so try macro's */
|
||||
/* Commands common for the key emulations */
|
||||
key_map = common_key_map;
|
||||
i = 0;
|
||||
while (key_map[i] != x_key && (key_map[i] || key_map[i + 1]))
|
||||
i += 2;
|
||||
command = key_map[i + 1];
|
||||
if (command)
|
||||
goto fin;
|
||||
|
||||
/* Function still not found for this key, so try macros */
|
||||
/* This allows the same macro to be
|
||||
enabled by either eg "ALT('f')" or "XCTRL('f')" or "XCTRL('a'), 'f'" */
|
||||
|
||||
/* key.h: #define ALT(x) (0x200 | (x)) */
|
||||
if (x_key & ALT (0)) { /* is an alt key ? */
|
||||
command = CK_Macro (x_key - ALT (0));
|
||||
goto fin;
|
||||
}
|
||||
/* key.h: #define XCTRL(x) ((x) & 31) */
|
||||
if (x_key < ' ') { /* is a ctrl key ? */
|
||||
command = CK_Macro (x_key);
|
||||
goto fin;
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ static int edit_callback (WEdit *e, int msg, int par)
|
|||
int cmd, ch;
|
||||
if (edit_drop_hotkey_menu (e, par)) /* first check alt-f, alt-e, alt-s, etc for drop menus */
|
||||
return 1;
|
||||
if (!edit_translate_key (e, 0, par, &cmd, &ch))
|
||||
if (!edit_translate_key (e, par, &cmd, &ch))
|
||||
return 0;
|
||||
edit_execute_key_command (e, cmd, ch);
|
||||
edit_update_screen (e);
|
||||
|
|
|
|||
Loading…
Reference in New Issue