Commit Graph

233 Commits

Author SHA1 Message Date
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
89bdeb7e34 edit/editcmd.c: fix backward search by one symbol. 2009-05-27 11:49:36 +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
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
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
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
3e2c3ebb5e Move replace confirm dialog into editcmd_dialogs.c 2009-04-30 12:45:02 +03:00
Slava Zanko
602f3c5796 Search engine: backward search now works 2009-04-30 12:35:24 +03:00
Slava Zanko
def581b24d Search engine:
* add function for prepare replacement string

edit/editcmd.c:
 * changes for correct replace

WARNING! replace don't fully works!
2009-04-29 18:45:21 +03:00
Slava Zanko
74c8c748b3 internal editor: change search/replace dialogs:
replace dialog:
 * removed 'replace order' field
 * removed 'scanf' and 'regex' chackboxes
 * added selectbox element for choise type of search
 * confirm replace and 'replace all' now radiobuttons

search dialog:
 * removed 'replace order' field
 * removed 'scanf' and 'regex' chackboxes
 * added selectbox element for choise type of search
2009-04-29 16:13:12 +03:00
Slava Zanko
10b7bdb361 Project now build with:
make CFLAGS="-ansi -pedantic -Wall -Wextra -Werror"

WARNING! Builds wuthout samba.
2009-04-24 01:47:22 +03:00
Slava Zanko
1d18f3227e edit/editcmd.c:
* Fix encoding in replace confirm dialog
 * Correct handle error codes from search engine
2009-04-23 17:46:38 +03:00
Slava Zanko
ea2740059b edit/editcmd.c: Replace now worked with new search engine (just simple mode search) 2009-04-23 17:28:07 +03:00
Slava Zanko
9db1cf46a4 Continue develop of search engine: simple search now worked 2009-04-23 15:46:06 +03:00
Slava Zanko
8fb216e732 Continue develop of mc_search module.
* Fix init of global variables cp_source and cp_display
 * add property (mc_search_t*) search to WEdit srtucture
 * start of reorganize edit/editcmd.c for new search engine
2009-04-23 14:30:14 +03:00
Andrew Borodin
4e64ee3b8d edit/editcmd.c (edit_search_cmd): removed redundant code. 2009-04-22 06:19:20 +04:00
Ilia Maslakov
945d2183ac fix: incorrect delete selected block if is utf-8 text
add param byte_delete to edit_delete, if byte_delete = 1 then one byte only delete,
but not multibyte char.
2009-04-21 22:32:30 +00:00
Slava Zanko
76bbeb60b2 Fixed search with different display and source charsets 2009-04-21 14:19:42 +03:00
Slava Zanko
dd07d30c0b Fix coredump with jumps to function definition/declaration 2009-04-20 13:35:09 +03:00
Slava Zanko
303cec8cb6 Supress compiler warnings. Now able to compile project with
make CFLAGS=-Werror
2009-04-20 11:10:06 +03:00
Slava Zanko
6568cad9df Fixies for search stuff in editor.
src/charsets.c:
 * fix error with recoding string for display
edit/editcmd.c:
 * fix core dump if search dialog calls some multiple times
 * fix memory leak
2009-04-17 18:08:51 +03:00
Slava Zanko
95e2fb90ef Fix search with 8-bit system codepage in utf-8 text codepage 2009-04-17 17:05:19 +03:00
Slava Zanko
3802929f94 edit/editcmd.c: Fixed search and replace with scanf-search 2009-04-17 15:01:25 +03:00
Slava Zanko
0730efa2fc Merge branch 'm-utf-8' of ssh://www.midnight-commander.org:2222/git/mc into m-utf-8
* 'm-utf-8' of ssh://www.midnight-commander.org:2222/git/mc:
  fix by andrew_b uninitialised tool->compose.
  fix incorrect draw utf-8 text in 8-bit locale
  fix some warnings
  add convert_from_utf_to_current_c, fix little warnings
  add utf8_display global variable, if display bits select utf-8 utf8_display = 1
  add more convertion before draw text
  change charbuf to char from unsigned char
  add: convert input in utf locale to needle
  fix incorrect convertion from utf to display CP
  fix: width utf buffer
  add in core viewer codepage selection from list
  fix: editor status bar
  fix: edit_get_prev_utf segfault, add compare str with start of buf

Conflicts:
	edit/edit.h
2009-04-17 11:52:20 +03:00
Slava Zanko
1e5a201abd Temporary commit. Half-fix searching.
Not fixed search by regexp.
2009-04-17 11:46:06 +03:00
Ilia Maslakov
42eba5c18c fix some warnings 2009-04-16 21:28:02 +00:00
Mikhail S. Pobolovets
1959b42fdc Merge branch '252_doxygen_desc_src'
Conflicts:

	src/file.h

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-04-16 08:26:52 +03:00
Andrew Borodin
004bc0077e Unification of widgets API.
widget.h: chaged paremeters order of listbox_new()
and groupbox_new() functions.

widget.c: likewise.

src/achown.c: sync with modified API of WListbox and WGroupbox widgets.
src/boxes.c: likewise.
src/chown.c: likewise.
src/complete.c: likewise.
src/find.c: likewise.
src/hotlist.c: likewise.
src/layout.c: likewise.
src/listmode.c: likewise.
src/option.c: likewise.
src/panelize.c: likewise.
src/wtools.c: likewise.
edit/editcmd.c: likewise.
2009-04-15 20:22:26 +04:00
Ilia Maslakov
3236fe285c fix: segfault in 'edit_save_confirm_cmd', g_free non allocated memory 2009-04-14 20:41:41 +00:00
Slava Zanko
ca7427cd35 edit/{editcmd.c,edit.h,edit.c}: remove catstrs() and freestrs() functions
These functions fully replaced with g_strconcat ()

WARNING! This just stupid replace. Some parts of code need to usage
concat_dir_and_file() function instread of g_strconcat ()
2009-04-14 15:12:36 +03:00
Ilia Maslakov
b5c4a9ddf2 add str_isutf8 return 1 if codeset_name is utf8 or utf-8
add unsigned int utf8:1 to struct WEdit if utf8 then file multibute codeset
2009-04-09 14:23:08 +00:00
Ilia Maslakov
87a891a54c replace islower to g_ascii_islower
replace tolower to g_ascii_tolower
2009-04-06 10:58:33 +00:00
Ilia Maslakov
b0729f75fb replace isalpha to g_ascii_isalpha
replace strlen to str_term_width1
add #include "strutil.h" if need
2009-04-06 10:31:12 +00:00
Ilia Maslakov
4ba7d47fba Add edit_move_block_to_left, edit_move_block_to_right procedure for shift block.
Tab: if block selected, shift block to right.
  M-Tab(complete): if block selected, shift block to left.
Remove "static" from insert_spaces_tab.
Add define insert_spaces_tab in edit.h
2009-03-24 14:48:18 +00:00
Ilia Maslakov
f3dcf1b3aa replace malloc to g_malloc.
fix some leak (thx andrew_b)
define TAGS_NAME, MAX_WIDTH_DEF_DIALOG vars
2009-03-06 15:28:54 +00:00
Slava Zanko
00567b61b2 etags: make new type 'etags_hash_t' 2009-03-05 12:31:16 +02:00
Ilia Maslakov
474d22d6c9 change width listbox, change output format 2009-03-05 12:31:16 +02:00
Ilia Maslakov
4be6c1c2c5 some little bug fix 2009-03-05 12:31:16 +02:00
Slava Zanko
8abf76df7c edit/editcmd.c
* changed searching algorithm of 'TAGS' file
 * changed #include "etags.h" to "../edit/etags.h" for building outside of sources tree
edit/etags.c:
 * apply template from maint/template.c file
 * rename all functions with prefix etags_*
 * make function "etags_get_pos_from" in file-scope visibility
edit/etags.h:
 * added logic block "#ifndef ... #define ... #endif" for correctly processing of header file
 * remove declaration of file-scope function etags_get_pos_from (ex. get_pos_from)
2009-03-02 16:43:22 +02:00
Ilia Maslakov
ffca67e3cb one word bug fix 2009-02-27 22:07:01 +00:00
Ilia Maslakov
889233a7dd add canonicalize_pathname for displayed files in list, replace get curren dir from panel->cwd to g_get_current_dir() 2009-02-27 21:31:30 +00:00
Ilia Maslakov
351f42ac24 add recursive search file TAGS 2009-02-26 20:50:58 +00:00
Ilia Maslakov
20c769b063 Add stack navigation structure. Add hotkeys A-'-' backward A-'=' forward navigation to files.
add edit/etags.c edit/etags.h
2009-02-25 21:55:35 +00:00
Mikhail S. Pobolovets
6a209bdb59 Simple doxygen description for files in edit directory.
Mostly \file and \brief tag added.
Some fixes for warnings with existing comments.

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-02-10 16:07:59 +02:00
Slava Zanko
e54f318cef Completely removed MHL stuff
Changed all source files relative to remove MHL

Some string-related functions moved into src/util.c

This stable fix.
2009-02-06 14:01:28 +02:00
Patrick Winnertz
3b8f37b99e Moved some functions out of mhl into src/util.c
This commit moves the mhl_str_concat_dir_and_file back into src/util.c whitout changing atm the functionality.

Please note that this is an incomplete fix and needs to be partially enhanced in order to keep the full functionality with glib.

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-06 11:17:03 +01:00
Patrick Winnertz
589ffd0b10 Use g_snprintf instead of snprintf as we switch back to glib
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:49:00 +01:00