Commit Graph

10949 Commits

Author SHA1 Message Date
Andrew Borodin 35b429f625 Prepare to merge default and user-defined keymaps.
default_main_map and default_main_x_map renamed to
default_main_keymap and default_main_x_keymap respectively to unified
variable names.

Editor: setup keymaps only once for all editors.
Viewer: share single keymap array for all viewers.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-20 19:26:08 +03:00
Andrew Borodin 4fbdbd4456 Added --nokeymap command line option to disable load keybindings from file.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-20 19:26:08 +03:00
Andrew Borodin 722121a575 Define keybind numbers using enum.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-20 19:26:08 +03:00
Andrew Borodin 1374340aa2 Fixup of shift-arrow mark in editor.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-20 19:26:08 +03:00
Andrew Borodin 50de02cfe4 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>
2011-03-20 19:26:08 +03:00
Andrew Borodin 68a8745f6d Ticket #2511: simplification and unification of keybinding names.
Added doc/keybind-migration.txt file to describe new keybinding names
used in mc.keymap.* files in 4.8.x series.
Cosmetics: reordering of keymap section declarations to provide identical
order totally in the source tree.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-20 19:26:08 +03:00
Ilia Maslakov 7e87dd7024 Merge branch '2512_usermenu_fix'
* 2512_usermenu_fix:
  replaced #interactive to #silent into misc/macros.d/*
  changed mcedit.1.in. replaced directive #interactive to #silent.
  Ticket #2512 (fixup for usermenu)
2011-03-17 20:22:01 +00:00
Ilia Maslakov c7638e1a75 replaced #interactive to #silent into misc/macros.d/*
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-17 16:17:03 +00:00
Ilia Maslakov 91b234bbfe changed mcedit.1.in. replaced directive #interactive to #silent.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-17 16:17:02 +00:00
Ilia Maslakov 4015e14aff Ticket #2512 (fixup for usermenu)
Fixed user menu behaviour. MC hangs if menu entry contains the 'read' command or something like that.
    bug introduced in the Ticket #323 (changeset: 0cfbe19d96).

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-17 16:12:12 +00:00
Ilia Maslakov 3fec8a4282 Merge branch '2504_vertical_persistent_block_mark'
* 2504_vertical_persistent_block_mark:
  mark inserted from file
  Ticket #2504 (Verical block is unmarked after copy/move)
2011-03-17 08:52:04 +00:00
Ilia Maslakov ecd8ca2292 mark inserted from file
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-17 08:50:52 +00:00
Ilia Maslakov dc6bd875c4 Ticket #2504 (Verical block is unmarked after copy/move)
Now mark of vertical block is not reset after copy/move. This make easy many copies/movements.
    Do nothing if cursor is in first line of selection.
2011-03-17 08:50:52 +00:00
Ilia Maslakov bc3c848ab1 Added two macro examples:
* macro.6.sh - execute selected block
    * macro.7.sh - delete trailing whitespaces

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-07 14:06:38 +03:00
Slava Zanko bdf5543950 Direct commit: fixed visibility scope for global variable GArray *macros_list
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-04 11:53:30 +02:00
Ilia Maslakov 0cfbe19d96 Merge branch '323_editor_macros'
* 323_editor_macros:
  (mc_config_init): don't drop file name if file is not exist.
  added examples     added rules for misc/macros.d/*. in the process of installation, example scripts will be copied into share/mc/examples/macros.d
  added check for instruction "#interactive" in the script. if the external script contain #interactive then do show prompt.
  changed mcedit.1.in
  Fix cursor position after execution of external script.
  Changed engine of external macros execution
  added a new action "Record and Repeat commands", added menu entry (Record/Repeat actions) for this.
  Removed unneeded menu entries.
  Added lookup_key_by_code, now parameter is string.
  Ticket #323 (reimplimented editor macros)
2011-03-03 20:53:34 +00:00
Andrew Borodin f28ec51c77 (mc_config_init): don't drop file name if file is not exist.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-03 20:48:31 +00:00
Ilia Maslakov 04d54931d0 added examples
added rules for misc/macros.d/*. in the process of installation, example scripts will be copied into share/mc/examples/macros.d

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-03 20:48:31 +00:00
Ilia Maslakov b642e2e1e1 added check for instruction "#interactive" in the script.
if the external script contain #interactive then do show prompt.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-03 20:48:30 +00:00
Ilia Maslakov 4438117628 changed mcedit.1.in
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-03 20:48:30 +00:00
Ilia Maslakov b58e7e64fc Fix cursor position after execution of external script.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-03 20:48:30 +00:00
Ilia Maslakov d31116328a Changed engine of external macros execution
Now "EditPipeBlock (X)" action tries execute the
~/.local/share/mc/mcedit/macros.d/macro.X.sh script.
To bind action EditPipeBlock (X) to the any hotkey you need add this binding
into ~/.local/share/mc/mc.macros file like following:

[editor]
ctrl-Q=EditWordLeft:-1;EditWordRightHighlight:-1;EditPipeBlock:3;
ctrl-W=EditPipeBlock:1;

This means that "ctrl-W" hotkey initiates the EditPipeBlock (1) action,
editor handler translates this into execution of
~/.local/share/mc/mcedit/macros.d/macro.1.sh shell script.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-03 20:48:30 +00:00
Ilia Maslakov 83177cfc16 added a new action "Record and Repeat commands", added menu entry (Record/Repeat actions) for this.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

some fixes

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

and one more fix

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-03 20:45:07 +00:00
Ilia Maslakov 6066713f77 Removed unneeded menu entries.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-03-02 11:16:55 +00:00
Ilia Maslakov 8e22a16430 Added lookup_key_by_code, now parameter is string.
For example: "ctrl-w=action:code;action:code;action:code;"

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-02 11:16:54 +00:00
Ilia Maslakov 8509b74f73 Ticket #323 (reimplimented editor macros)
Reimplemented editor macro engine:

    * added string binding "InsertChar" for action - "CK_Insert_Char"
    * added keybind_lookup_actionname - found action name by numeric constant
    * replaced struct macro to struct macro_action_t
    * added struct macros_t for describe editor scripts
    * rewritten edit_load_macro_cmd, edit_execute_macro
    * renamed edit_save_macro_cmd into edit_store_macro_cmd (WEdit * edit);
    * dropped Wedit properties: macro_i, macro_depth, macro[MAX_MACRO_LENGTH]
    * added GArray *macros_list to the store macroses of mcedit
    * added edit_get_macro

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-02 11:16:44 +00:00
Andrew Borodin 1636f8e956 Merge branch '2509_diff_quick_move'
* 2509_diff_quick_move:
  Ticket #2509: missed names of CK_DiffQuickLeft and CK_DiffQuickRight actions
2011-03-02 11:00:17 +03:00
Tomasz Pala eaf889a3a2 Ticket #2509: missed names of CK_DiffQuickLeft and CK_DiffQuickRight actions
...used in keymap files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-02 10:43:36 +03:00
Andrew Borodin 2a97cbf7e7 Merge branch '1668_io_corruption_xterm_nonutf'
* 1668_io_corruption_xterm_nonutf:
  Fixup of S-Lang initialization.
  Ticket #1668: Screen and input corruption under xterm [non-UTF]
2011-03-01 16:40:05 +03:00
Andrew Borodin 0bdbd6c608 Fixup of S-Lang initialization.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-01 15:24:44 +03:00
GoTaR 795b3a76f0 Ticket #1668: Screen and input corruption under xterm [non-UTF]
The problem:
    viewing binary files contain char 0x9A leads to massive screen corruption and Search
    dialog pops up with 1;2c search string (multiple times depending on actual screen contents).
    So it looks like the file 'presses' F7 or / and shift-right_arrow for every specified
    character combination occurrence. In case of bigger files it's impossible to exit from
    such viewer, as search dialog keeps popping up after closing.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-03-01 15:24:38 +03:00
Andrew Borodin 8f92ba1fcb Merge branch '2462_find_content_enable_by_default'
* 2462_find_content_enable_by_default:
  Ticket #2462: "Search for content" checkbox is disabled by default.
2011-02-24 16:25:16 +03:00
Andrew Borodin 41758cc0e4 Ticket #2462: "Search for content" checkbox is disabled by default.
"Search for content" checkbox in 'Find File' dialog should be enabled by default.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-02-24 10:23:20 +03:00
Yury V. Zaytsev 462be175fd Typo fix in testdup.sh
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2011-02-21 00:12:34 +01:00
Lee Bigelow 15458a0ff5 Ticket #1791: a nice dark skin created by Lee Bigelow (update)
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2011-02-20 23:57:20 +01:00
Slava Zanko d194d2478a Merge branch '2178_hardlink_highlight'
* 2178_hardlink_highlight:
  Changes for respect new 'HARDLINK' highlight type.
  Ticket #2478: HARDLINK file type
2011-02-18 15:20:55 +02:00
Slava Zanko 2712ec2ca8 Changes for respect new 'HARDLINK' highlight type.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-02-18 15:20:34 +02:00
Curtis Doty 264f90b675 Ticket #2478: HARDLINK file type
It doesn't work as documented, but instead seems to *wrongly* identify/highlight symlinks instead.
Of course, the LINK type also fails to detect hardlinks.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-02-18 15:20:33 +02:00
Ilia Maslakov 92061acce5 Merge branch '2499_mcedit_select_cur_word'
* 2499_mcedit_select_cur_word:
  code indentation
  Ticket #2499 (action to the mark current word)
2011-02-17 21:52:16 +00:00
Ilia Maslakov 4e97991714 code indentation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-02-17 21:46:20 +00:00
Ilia Maslakov afed48a44a Ticket #2499 (action to the mark current word)
added action CK_Mark_Word to the mark current word
    changed double-click the mouse handler of the editor

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-17 21:38:06 +00:00
Ilia Maslakov 6cd8812756 Merge branch '2500_editor_WordRight_fix'
* 2500_editor_WordRight_fix:
  Ticket #2500 (incorrect the word boundary detection)
2011-02-17 21:06:05 +00:00
Ilia Maslakov cfad4d685b Ticket #2500 (incorrect the word boundary detection)
fixed detection of the word boundary (added '{', '}' as end of the word).

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-16 22:17:15 +00:00
Ilia Maslakov 9f0d38520a replaced call mc_config_del_param to mc_config_del_key
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-16 22:09:41 +00:00
Ilia Maslakov aa8f4ffbf6 added shell script 'testdup.sh' for locate duplicate includes
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-16 20:37:31 +00:00
Ilia Maslakov bd3c950dce changed script maint/doctest to utf-8 support.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-16 20:21:01 +00:00
Andrew Borodin e4ee7ea383 Merge branch '2275_ignore_relative_dirs'
* 2275_ignore_relative_dirs:
  Handle ignore dirs directly in 'Find file' dialog.
  Added counter of ignored dirs.
  Ticket #2275: find files: support of relative dirs in ignore_dirs.
2011-02-16 22:00:32 +03:00
Andrew Borodin cfd0e8d3fc Handle ignore dirs directly in 'Find file' dialog.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2011-02-16 21:59:55 +03:00
Andrew Borodin 7fa3dfc649 Added counter of ignored dirs.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-02-16 21:58:59 +03:00
Andrew Borodin 90e3933e89 Ticket #2275: find files: support of relative dirs in ignore_dirs.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-02-16 21:58:59 +03:00