mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

check_movement_keys() function is not used now in viewer.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-08-16 15:49:30 +04:00
parent 61179c8477
commit b470fb81ce
5 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/mc.keymap.default
View File

@ -175,10 +175,10 @@ ViewMoveLeft = h; left
ViewMoveRight = l; right
ViewMoveLeft10 = ctrl-left
ViewMoveRight10 = ctrl-right
ViewMoveUp = k; y; insert; up
ViewMoveDown = j; e; delete; down; enter
ViewMovePgDn = f; space; pgdn
ViewMovePgUp = b; pgup
ViewMoveUp = k; y; insert; up; ctrl-p
ViewMoveDown = j; e; delete; down; enter; ctrl-n
ViewMovePgDn = f; space; pgdn; ctrl-v
ViewMovePgUp = b; pgup; alt-v; backspace
ViewMoveHalfPgDn = d
ViewMoveHalfPgUp = u
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
@ -208,6 +208,8 @@ ViewMoveLeft = b; left
ViewMoveRight = f; right
ViewMoveUp = k; y; up
ViewMoveDown = j; delete; down
ViewMovePgDn = pgdn; ctrl-v
ViewMovePgUp = pgup; alt-v
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g

10
misc/mc.keymap.emacs
View File

@ -179,10 +179,10 @@ ViewMoveLeft = h; left
ViewMoveRight = l; right
ViewMoveLeft10 = ctrl-left
ViewMoveRight10 = ctrl-right
ViewMoveUp = k; y; insert; up
ViewMoveDown = j; e; delete; down; enter
ViewMovePgDn = f; space; pgdn
ViewMovePgUp = b; pgup
ViewMoveUp = k; y; insert; up; ctrl-p
ViewMoveDown = j; e; delete; down; enter; ctrl-n
ViewMovePgDn = f; space; pgdn; ctrl-v
ViewMovePgUp = b; pgup; alt-v; backspace
ViewMoveHalfPgDn = d
ViewMoveHalfPgUp = u
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
@ -212,6 +212,8 @@ ViewMoveLeft = b; left
ViewMoveRight = f; right
ViewMoveUp = k; y; up
ViewMoveDown = j; delete; down
ViewMovePgDn = pgdn; ctrl-v
ViewMovePgUp = pgup; alt-v
ViewMoveTop = home; ctrl-home; ctrl-pgup; a1; alt-lt; g
ViewMoveBottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g

15
src/keybind.c
View File

@ -602,11 +602,13 @@ const global_keymap_t default_viewer_keymap[] = {
{ 'k', CK_ViewMoveUp, "k" },
{ 'y', CK_ViewMoveUp, "y" },
{ XCTRL ('p'), CK_ViewMoveUp, "C-p" },
{ KEY_IC, CK_ViewMoveUp, "Insert" },
{ KEY_UP, CK_ViewMoveUp, "Up" },
{ 'j', CK_ViewMoveDown, "j" },
{ 'e', CK_ViewMoveDown, "e" },
{ XCTRL ('n'), CK_ViewMoveUp, "C-n" },
{ KEY_DOWN, CK_ViewMoveDown, "Down" },
{ KEY_DC, CK_ViewMoveDown, "Delete" },
{ '\n', CK_ViewMoveDown, "Endter" },
@ -614,9 +616,12 @@ const global_keymap_t default_viewer_keymap[] = {
{ ' ', CK_ViewMovePgDn, "Space" },
{ 'f', CK_ViewMovePgDn, "f" },
{ KEY_NPAGE, CK_ViewMovePgDn, "PgDn" },
{ XCTRL ('v'), CK_ViewMovePgDn, "C-v" },
{ 'b', CK_ViewMovePgUp, "b" },
{ KEY_PPAGE, CK_ViewMovePgUp, "PgUp" },
{ 'b', CK_ViewMovePgUp, "b" },
{ KEY_PPAGE, CK_ViewMovePgUp, "PgUp" },
{ ALT ('v'), CK_ViewMovePgUp, "M-v" },
{ KEY_BACKSPACE, CK_ViewMovePgUp, "BackSpace" },
{ 'd', CK_ViewMoveHalfPgDn, "d" },
{ 'u', CK_ViewMoveHalfPgUp, "u" },
@ -688,6 +693,12 @@ const global_keymap_t default_viewer_hex_keymap[] = {
{ KEY_DOWN, CK_ViewMoveDown, "Down" },
{ KEY_DC, CK_ViewMoveDown, "Delete" },
{ KEY_NPAGE, CK_ViewMovePgDn, "PgDn" },
{ XCTRL ('v'), CK_ViewMovePgDn, "C-v" },
{ KEY_PPAGE, CK_ViewMovePgUp, "PgUp" },
{ ALT ('v'), CK_ViewMovePgUp, "M-v" },
{ KEY_HOME, CK_ViewMoveTop, "Home" },
{ KEY_M_CTRL | KEY_HOME, CK_ViewMoveTop, "C-Home" },
{ KEY_M_CTRL | KEY_PPAGE, CK_ViewMoveTop, "C-PgUp" },

41
src/viewer/actions_cmd.c
View File

@ -52,7 +52,7 @@
#include "lib/global.h"
#include "lib/tty/tty.h"
#include "lib/tty/key.h"
#include "lib/tty/key.h" /* is_idle() */
#include "lib/lock.h" /* lock_file() */
#include "src/dialog.h" /* cb_ret_t */
@ -144,40 +144,6 @@ mcview_continue_search_cmd (mcview_t * view)
/* --------------------------------------------------------------------------------------------- */
static void
mcview_cmk_move_up (void *w, int n)
{
mcview_move_up ((mcview_t *) w, n);
}
/* --------------------------------------------------------------------------------------------- */
static void
mcview_cmk_move_down (void *w, int n)
{
mcview_move_down ((mcview_t *) w, n);
}
/* --------------------------------------------------------------------------------------------- */
static void
mcview_cmk_moveto_top (void *w, int n)
{
(void) &n;
mcview_moveto_top ((mcview_t *) w);
}
/* --------------------------------------------------------------------------------------------- */
static void
mcview_cmk_moveto_bottom (void *w, int n)
{
(void) &n;
mcview_moveto_bottom ((mcview_t *) w);
}
/* --------------------------------------------------------------------------------------------- */
static void
mcview_hook (void *v)
{
@ -439,11 +405,6 @@ mcview_handle_key (mcview_t * view, int key)
if ((command != CK_Ignore_Key) && (mcview_execute_cmd (view, command) == MSG_HANDLED))
return MSG_HANDLED;
if (check_movement_keys (key, view->data_area.height + 1, view,
mcview_cmk_move_up, mcview_cmk_move_down,
mcview_cmk_moveto_top, mcview_cmk_moveto_bottom) == MSG_HANDLED)
return MSG_HANDLED;
#ifdef MC_ENABLE_DEBUGGING_CODE
if (c == 't')
{ /* mnemonic: "test" */

1
src/viewer/mcviewer.c
View File

@ -41,6 +41,7 @@
#include "lib/global.h"
#include "lib/tty/tty.h"
#include "lib/tty/mouse.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "lib/strutil.h"