Commit Graph

645 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT service
c7d04dd47a fixed several missing #include's 2009-06-18 21:02:29 +04:00
Ilia Maslakov
5c28d2bda4 Ticket #321 (Trouble with mc's clipboard paste)
add: paste as vertical block if clipfile contain magic sequence
add: vertical paste from file
add: symbolic definition MAGIC_VERTICAL for "\1\1\1\1\n" magic sequence
2009-06-17 13:12:03 +00:00
Andrew Borodin
0c51aa5ae1 Fixed missed declaration of simple_statusbar variable. 2009-06-16 15:36:45 +04:00
Andrew Borodin
6999a6123b Fixed comments and copyright info. 2009-06-16 15:36:45 +04:00
Andrew Borodin
fd09abaeb2 Hide private API of editor (#361).
All editor private API stuff is located now in edit/edit-impl.h.
Public API is located in edit/edit.h.
Added functions to read some fields of WEdit struct.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-06-16 15:36:45 +04:00
Andrew Borodin
efbbd3883f Fixed source_codepage handling in editor (#402).
Signed-off-by: Andrew Borodin <borodin@borodin.zarya>
2009-06-16 11:32:59 +04:00
Andrew Borodin
6e86e9f383 Fixed type of variables that store result of get_codepage_id(). 2009-06-15 23:35:20 +04:00
Andrew Borodin
205fa24e7d Fixed codepage selection (#402).
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-06-15 20:27:17 +04:00
Ilia Maslakov
2dffac596d Merge branch '327_simple_editor_status'
* 327_simple_editor_status:
  Simple statusbar mode for editor.
2009-06-14 18:25:27 +00:00
Ilia Maslakov
2f8e7cae7a Ticket #404 (Need more action in Editor menu)
add entries for many action:

 menu Edit
   * Copy to clipfile
   * Cut to clipfile
   * Paste from clipfile
   * Toggle bookmark
   * Next bookmark
   * Prev bookmark
   * Flush bookmark
 menu Command
   * Find declaration
   * Back from declaration
   * Forward to declaration

add show shortcuts for copy/cut/paste clipfile
2009-06-14 17:17:32 +00:00
Sergei Trofimovich
f5dce266fe Merge commit 'origin/340_inrorrect_handling_of_wildcards'
* commit 'origin/340_inrorrect_handling_of_wildcards': (21 commits)
  Fixed work with copying/moving files by mask into subdirs
  Fixed bug with copying files/dirs into directory with 'wild' name (such as ${}, \1, etc.)
  Fixed patterns escaping of wild filenames (such as \1, ${1}, \U, etc).
  Removed unused debug code from src/filegui.c
  Refactoring: renamed variable 'loop' into 'curr_index'
  Changed defined constants to static const char[] declarations.
  Fixed declarations of functions. May be, need to split with previous commmit...
  Reworked functions strutils_shell_escape and strutils_shell_unescape
  Renamed functions shell_escape (to strutils_shell_escape) and shell_unescape (to strutils_shell_unescape)
  Just identation of some source files
  Renamed function shell_is_char_escaped to strutils_is_char_escaped; removed function mc_search_is_char_escaped
  Moved 'escape' and 'unescape' strings functions from src/util.[ch] into src/strescape.[ch]
  Fixed crash if replace group ${N} used into replace string
  Some cosmetic optimisation for less code :)
  Fixed searched token in source file mask.
  Fixed NULL acertion if replacement don't correct
  Handle new search replace behaviour into src/file.c. Also fixed filemask into src/filegui.c
  Search Replace now handled \U,\u,\L,\l and \E modificators.
  Just identation of regex.c and search.h
  search engine: Added new syntax for replace tokenks.
  ...
2009-06-12 23:02:44 +03:00
Ilia Maslakov
b955d8c2ff Merge branch '318_alt_arrows_select_block'
* 318_alt_arrows_select_block:
  Add esc sequencies to src/key.c for xterm
2009-06-12 14:53:04 +00:00
Andrew Borodin
0bfd10f4c6 edit/editmenu.c: added separator in 'Options' submenu. 2009-06-12 17:30:21 +04:00
Ilia Maslakov
f4844e5b21 Add esc sequencies to src/key.c for xterm
Add CK_*_Alt_Highlight commands in edit/editcmddef.h
Add processing for CK_*_Alt_Highlight commands in edit/edit.c
2009-06-12 12:54:52 +00:00
Slava Zanko
e335712e41 Fix path to Syntax file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 16:12:10 +04:00
Andrew Borodin
5241c7a5d4 src/main.c: don't display "Encoding..." menu entry if charsets support is
disabled.

edit/editmenu.c: edded "Encoding..." menu entry to the "Command" submenu.
Display it if charsets support is enabled.
2009-06-12 16:12:10 +04:00
Andrew Borodin
a623c3a13c Editor: sync with new global config location (user menu and syntax files). 2009-06-12 16:12:10 +04:00
Andrew Borodin
fb48d4a295 Small reorganization of MC and Editor menus.
The 'User Menu' entry is moved from 'File' submenu to 'Command' one.
The 'Edit editor menu file' and 'Edit syntax file' entries are moved
from main MC menu ('Command' submenu) to editor main menu ('Options'
submenu) and renamed.

src/cmd.c (check_for_default): moved to util.c and maken global.
(menu_edit_cmd): rewritten to handle MC menu files only and renamed
to edit_mc_menu_cmd.
Editor relevant routines are moved to editor code.

src/cmd.h: cleanup.

src/main.c: main menu reorganization.

src/user.h: moved editor macros to edit/edit.h.

src/util.c, src/util.h: check_for_default function from src/cmd.h.
Rewritten to use exist_file() function.

edit/editcmddef.h: added new commands:
CK_Load_Syntax_File and CK_Load_Menu_File.

edit/edit.h: editor file macros from src/user.h.
New type for file which is currently being edited.
Modified edit_load_cmd function to be more advanced.

edit/edit.c (edit_execute_cmd): handle new commands:
CK_Load_Syntax_File and CK_Load_Menu_File.

edit/editmenu.c: menu reorganization: moved two entries here from main
MC menu. Added requireq handle functions. Small optimization: removed
extra layer in menu entry handlers.

edit/editcmd.c: menu and syntax files edit is implemented.
Modified edit_load_cmd function to be more advanced.
2009-06-12 16:12:10 +04:00
Slava Zanko
cf13c588d7 Fix encoding of newly created files in editor
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:31:57 +03:00
Slava Zanko
e9a644219a Fix encoding of newly created files in editor
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-11 12:59:46 +03:00
Mikhail S. Pobolovets
546b30008a Simple statusbar mode for editor.
Full mode:
    TODO [----] 2 L:[ 1+ 0 1/333] *(2 /11838b)= 102 0x066 cp:Other_8_bit

Simple mode:
    TODO [----] 2 1/333 (2 /11838b) 102 0x066 Other_8_bit

    modified:
        * edit/edit.h
        * edit/editdraw.c
        * src/setup.c

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-05-28 10:40:54 +03:00
Slava Zanko
abcd23406d remove ChangeLog files from mc tree
Description by Sergei Trofimovich:

GNU ChangeLog? files are result of CVS stupidpity about changeset tracking.
Currently constantly updated ChangeLogs? diverge in different branches and cause collisions(!)
when 'git merge' (almost ANY SINGLE MERGE!).

Major changes can be described in NEWS file, minor changes can be autogenerated via 'git log'/'git shortlog'
and friends (if needed at all).
2009-05-27 14:53:23 +03:00
Slava Zanko
17343149d6 Remove 'All charsets' checkbox from all search dialogs when specified '--disable-charsets' configure option 2009-05-27 12:20:21 +03:00
Slava Zanko
89bdeb7e34 edit/editcmd.c: fix backward search by one symbol. 2009-05-27 11:49:36 +03:00
Slava Zanko
8841747560 edit/syntax.c: fixed path to Syntax file 2009-05-22 10:53:02 +03:00
Slava Zanko
0c17219b2a Move global config files from pkg_datadir to sysconfdir
* Also fixed 'make dist' command
 * changed contrib/dist/redhat/mc.spec.in for builds with new dir
2009-05-21 01:01:10 +03:00
Ilia Maslakov
f8a487de01 Merge branch '351_show_number_line'
* 351_show_number_line:
  fix hotkey menu entry "Toggle li&ne state" now highlighted "n"
  add call CK_Toggle_Line_State to edit menu
  show line number in left part of screen (hotkey alt-n)
2009-05-14 07:57:51 +00:00
Ilia Maslakov
e9fe86f149 fix hotkey menu entry "Toggle li&ne state" now highlighted "n" 2009-05-13 09:00:49 +00:00
Slava Zanko
dd27f52286 Merge branch '352_add_XZ_compression_support'
* 352_add_XZ_compression_support:
  Added XZ compression support. Signed-off-by: xgizzmo <xgizzmo@slackbuilds.org>
2009-05-13 11:35:54 +03:00
xgizzmo
24ca27fe30 Added XZ compression support. Signed-off-by: xgizzmo <xgizzmo@slackbuilds.org>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-05-13 11:35:22 +03:00
Ilia Maslakov
c1413bb370 add call CK_Toggle_Line_State to edit menu 2009-05-13 07:34:32 +00:00
Ilia Maslakov
854f214563 show line number in left part of screen (hotkey alt-n)
add option editor_line_status to ini (src/setup.c)
    add action CK_Toggle_Line_State (edt/editcmddef.h)
    change "print_to_widget()" to show line state, if option_line_state = 1 show line num (edit/editdraw.c)
    change "edit_draw_this_line()", (set line state: line num, etc)
    add const LINE_STATE_WIDTH, add options: option_line_state, option_line_state_width (edit/edit.h)
    add switch on/off show line number (edit/edit.c)
    add CK_Toggle_Line_State to translation table command_names (bindings name is Toggle-Line-State).
    add const LINE_STATE_COLOR for draw left area bar line state
    add color pair "editlinestate" for set in ini
    add help for keyword "editlinestate" on "mc --help-color" (src/main.c)
2009-05-13 07:09:47 +00:00
Ilia Maslakov
427ecef234 fix mark tab and spaces 2009-05-12 14:14:27 +00:00
Ilia Maslakov
7fbff4fa86 fix highlight tab and spaces in mark procces. 2009-05-12 10:06:37 +00:00
Ilia Maslakov
25d5ed8c6a Merge branch '344_optional_shift_block'
* 344_optional_shift_block:
  add check option persistent_selection if persistent_selection = 0 Tab shift block
2009-05-11 17:59:57 +00:00
Ilia Maslakov
6a5dab64fe add check option persistent_selection if persistent_selection = 0 Tab shift block 2009-05-11 11:34:22 +00:00
Mikhail S. Pobolovets
3784f7253e Warning fix: 'implicit declaration of function'
edit.c:2645:
    implicit declaration of function ‘edit_move_block_to_right’
edit.c:2805:
    implicit declaration of function ‘edit_move_block_to_left’

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-05-08 13:15:50 +03:00
Ilia Maslakov
20090e0567 fix: error call edit_delete, add needed param. 2009-05-07 10:23:32 +00:00
Slava Zanko
2ebdf91079 Merge branch 'm-utf-8'
* m-utf-8: (223 commits)
  Fix wildcard pattern in file select and file find dialogs
  Project builds with option --disable-charsets
  Deleted build-glib1.sh because glib1 don't work with utf-8
  fix building without --enable-charset
  Total replacement to mc_search stuff in all places
  Search engine: if found_len parameter NULL, then mc_search_run don't try to fill them
  src/view.c: Reworked search stuff to usage src/search
  refactoring: rename edit/editcmd_dialog.c:editcmd_dialog__get_search_types_list to
  Search engine: development of hex search complete
  Search engine: remove forgotten debug string and reindent file
  Search engine:
  configure.ac: if present glib-2.14 and higher, libpcre don't linked
  Search engine: now used regexp external engines:
  src/find.c: Fixed core dump if content search pattern no present
  edit/editcmd_dialogs.c: fixed state of search type between dialog window calls
  Find files: checkbox 'Regular expression' for content search now default unchecked
  Find files: changes for usage of new search engine:
  Fix copy of current/opposite path to command line: remove charset info from path
  src/Makefile.am: add some header files to Make-tracking
  Fixed editor menu reloading.
2009-05-07 13:01:01 +03:00
Slava Zanko
09bc5434f6 Project builds with option --disable-charsets 2009-05-07 12:20:34 +03:00
Ilia Maslakov
079d83c779 fix building without --enable-charset 2009-05-07 07:21:04 +00:00
Slava Zanko
087ef15b1f Total replacement to mc_search stuff in all places 2009-05-06 19:12:32 +03:00
Slava Zanko
293310f727 refactoring: rename edit/editcmd_dialog.c:editcmd_dialog__get_search_types_list to
to src/search/lib.c:mc_search_get_types_strings_array
2009-05-06 10:50:12 +03:00
Slava Zanko
2276e9b513 Search engine: now used regexp external engines:
* glib
 * pcre
 * POSIX regex

External engine selected automatically, if present.
2009-05-05 16:19:32 +03:00
Slava Zanko
301435b374 edit/editcmd_dialogs.c: fixed state of search type between dialog window calls 2009-05-05 11:31:57 +03:00
Andrew Borodin
3c477cbdfd Fixed editor menu reloading.
edit/edit.h: moved N_menus 5 macro to editmenu.c. Renamed edit_init_menu()
to edit_create_menu().

edit/editmenu.c: added static variable EditMenuBar to store editor menus.
Reimplemented menu creation. Added new edit_create_menu() function.

edit/editwidget.c (edit_file): used edit_create_menu() instead of
edit_init_menu().
2009-05-01 21:10:52 +04:00
Slava Zanko
e12b9e50db edit/editcmd.c, edit/editcmd_dialigs.c: added 'search in all charsets' feature
src/search/search.c: fixed error with multicharset search
2009-04-30 16:58:28 +03:00
Slava Zanko
15b2d19428 Search engine: fix errors with backward regex-search 2009-04-30 14:21:39 +03:00
Slava Zanko
5e08dbbe76 edit/editcmd_dialogs.c: types of search now show as radiobuttons 2009-04-30 13:46:33 +03:00
Slava Zanko
3e2c3ebb5e Move replace confirm dialog into editcmd_dialogs.c 2009-04-30 12:45:02 +03:00