Commit Graph

678 Commits

Author SHA1 Message Date
Ilia Maslakov
b6ae0a2479 fix cursor in editor on utf-8 files 2009-04-13 15:33:21 +00:00
Ilia Maslakov
95edc18aa8 add char charbuf[], int charpoint for multibyte input
add edit_get_byte_ptr for get pointer to edit current position in buffer
add edit_get_buf_ptr pointer in start of edit buffer
fix edit_translate_key for multibyte input

add
2009-04-13 15:19:06 +00:00
Ilia Maslakov
13f13c1fb0 fix incorrect edit_draw_this_line, edit_get_utf.
utf-8 text now showed correct
2009-04-13 09:28:07 +00:00
Ilia Maslakov
f45e7d1dc6 fix: edit_draw_this_line iterators. iterators += utf8char_width
fix: edit.c edit_get_utf correct calculate utf8char width
2009-04-13 06:55:43 +00:00
Ilia Maslakov
d29c5d6d5f reworked: edit_get_utf return int value is utf-8 char, char_width 2009-04-12 19:16:52 +00:00
Ilia Maslakov
7d7560deea Change print_to_widget, edit_draw_this_line to use struct line_s line[].
Extract color attibutes from char to lines->style.
Add definition struct line_s:
    struct line_s {
        unsigned int ch;    <- textchar
        unsigned int style; <- color attr
    };
2009-04-12 08:09:00 +00: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
36bf010af6 add function edit_get_utf_char 2009-04-09 12:04:30 +00:00
Ilia Maslakov
8725fa60a8 add to status bar source codepage 2009-04-09 08:40:59 +00:00
Ilia Maslakov
a93bb95872 Merge branch '303_block_shift_unshift'
* 303_block_shift_unshift:
  Add edit_move_block_to_left, edit_move_block_to_right procedure for shift block.
  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.
2009-04-06 21:17:55 +00:00
Ilia Maslakov
f845e4b569 revert to strlen in edit_find_filter 2009-04-06 12:45:35 +00:00
Ilia Maslakov
bfa9c961ca replace isupper to g_ascii_isupper 2009-04-06 11:04:02 +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
5be16e2a0b replace name_trunc to str_trunc 2009-04-06 10:38:35 +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
3b5e2c052f Merge branch 'utf-8' into master
resolve conflicts:
	configure.ac
	src/complete.c
	src/file.c
	src/layout.c
	src/main.c
	src/menu.c
	src/screen.c
	src/util.c
	src/widget.c
	src/widget.h
2009-04-04 19:50:46 +00:00
Ilia Maslakov
3a161f9576 fix: problem when flag Persistent selection swiched off then text not marked
by F3 + arrows
2009-03-31 10:39:00 +00:00
Ilia Maslakov
a8eb299506 Fix: defult value of option_persistent_selectionsis, set "yes" by default. 2009-03-28 09:46:07 +00:00
Ilia Maslakov
a443945748 replace "Persistent blocks" to "Persistent selection" in
edit/edit.c, edit/edit.h, edit/editoptions.c, src/setup.c
2009-03-28 00:35:25 +00:00
Slava Zanko
2390c46d06 Rename '*persistent_block*' to '*persistent_selection*' for more sence.
Thanks to Ossi
2009-03-27 22:48:31 +02:00
Ilia Maslakov
3cc9aac553 Add load/save option editor_persistent_block to ~/.mc/ini;
Add option editor_persistent_block to Options/General dialog;
Make persistent/nonpersistent blocks if mcedit;
Enlarged height of Options/General dialog from 17 to 19 lines;
2009-03-26 11:32:18 +00:00
Ilia Maslakov
f22b5d16b5 Add load/save option editor_persistent_block to ~/.mc/ini
Add option editor_persistent_block to Options/General dialog
enlarged Options/General dialog Height from 17 to 19 lines
2009-03-26 09:21:43 +00:00
Ilia Maslakov
f312a93332 experemental commit 2009-03-25 21:31:07 +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
e7b82fe9f3 add static in parse_define 2009-03-10 20:11:51 +00:00
Ilia Maslakov
70be4fbf7b fix err in Makefile.am. Change etats.h to etags.h 2009-03-10 20:08:30 +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
6c39432c98 edit/etags.c: Use function 'g_build_filename' instread of 'g_strdup_printf' for making path to file 2009-03-05 12:48:47 +02: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
Ilia Maslakov
da66b3154b small bug fix struct name 2009-03-05 12:31:15 +02:00
Ilia Maslakov
2a038f109a TAGS parser full reworked, add hungry search algorithm, change etags hash struct 2009-03-05 12:31:10 +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
da3b76b8d7 Merge branch '176_lzma' 2009-02-21 12:23:50 +02: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
Patrick Winnertz
ae987b923e Reverted the use of bool in favour of gboolean
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:46:07 +01:00
Patrick Winnertz
281652cc23 Use FALSE/TRUE in favour of false/true (reverts 4fcf4e9685)
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:41:40 +01:00
Patrick Winnertz
d84586ba82 Reverted the use of mhl_str_dup and use g_strdup instead.
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:40:32 +01:00
Patrick Winnertz
1c287d798d First bunch of mhl_mem_free removal patches
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:36:58 +01:00
Patrick Winnertz
3d0f9e419a Reverted some more GString removals. (See f235b1976e)
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:22:08 +01:00
Patrick Winnertz
155fd328a4 Revert second bunch of mhl patches (see 9b9cab5874)
This reintroduce GString again and drop the use of mhl_mem_free in some files

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:18:38 +01:00
Patrick Winnertz
5920d13810 First bunch of reverting stuff from mhl to switch back to glib
This removes the usage of stdbool.h in favour of mhl/tyes.h as we have to revert everything one by one

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:09:37 +01:00
Enrico Weigelt, metux IT service
a6a9c1c147 fixed edit.c 2009-02-04 21:16:01 +01:00
Enrico Weigelt, metux IT service
a5ba278729 merged in lzma patch from mandriva 2009-02-04 21:16:00 +01:00
Enrico Weigelt, metux IT service
0c97636212 fixed #240 2009-02-04 01:11:56 +01:00
Enrico Weigelt, metux IT service
463a18623d removed obsolete own memmove implementation (#242) 2009-02-03 19:51:01 +01:00
Enrico Weigelt, metux IT service
9b9cab5874 manually merged 234_remove_g_string 2009-02-02 22:39:12 +01:00
Enrico Weigelt, metux IT service
8b38cf44da manully merged 227_replace_g_free 2009-02-02 22:34:05 +01:00
Enrico Weigelt, metux IT service
035fa47c06 manually merged 228_replace_g_strdup 2009-02-02 21:28:01 +01:00
Enrico Weigelt, metux IT service
7015de5db5 Merge commit 'origin/236_replace_gboolean' 2009-02-02 21:16:39 +01:00
Enrico Weigelt, metux IT service
4fcf4e9685 replaced TRUE/FALSE by true/false 2009-02-02 21:12:46 +01:00
Enrico Weigelt, metux IT service
0434e3de5d manually merged 235_remove_g_snprintf 2009-02-02 20:53:03 +01:00
Enrico Weigelt, metux IT service
45964f373b replaced gboolean by bool (from mhl/types.h) 2009-02-02 05:07:56 +01:00
Enrico Weigelt, metux IT service
e4a4f77ac2 replaced g_snprintf() by snprintf() 2009-02-01 20:03:28 +01:00
Sergei Trofimovich
df4129517b Merge branch 'mc-4.6'
* mc-4.6: (38 commits)
  mhl: mhl_shell_unescape_buf(): fixed memory array OOB.
  completion: fixed complete already escaped secuences.
  completion: added changelog entry for solved #147
  completion: fixed completion of escaped commands in commandline
  Removed unused char*.
  mhl: added mhl_strmove() function (memmove semantics)
  completion: added escapes in command line on completion
  complete: cleanup: #define to enum INPUT_COMPLETION_FLAGS
  added a new parameter for completion flags to input_new
  fish: cleanup: unboxed quoted strings when generate shell commands
  introduced new type SHELL_ESCAPED_STR for more type safety
  added mhl/types.h which defines bool enum, escape.h now using this type
  Removed unused variable
  Changes for use MHL.
  Fixed bug with renamig/copying files with backshashes in names
  Remove some testing stuff
  Temporarry commit. Fixed completion in browse by directoryes.
  Fixed some memory leaks.
  Add $ and ` for escaping and reorder it according to the ascii values
  Rewrite it to use g_string_append_c instead of some homebrew stuff
  ...
2009-02-01 14:26:54 +02:00
Enrico Weigelt, metux IT service
f235b1976e replaced GString stuff by static buffers 2009-01-31 21:55:51 +01:00
Sergei Trofimovich
ff4de3d66f Merge branch 'mc-4.6' into 147_escaping
* mc-4.6:
  replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()
  fixed out-of-tree-builds
  Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list.
  Update for OpenOffice and StarOffice viewer.
  changelog: added entry for python syntax
  syntax: python: keywords update (patch by NNemec) fixes #216
  AC_USE_SYSTEM_EXTENSIONS macro requires autoconf >= 2.60
  po/ru.po: In russian translation, there are some hotkey conficts in menu.
  ChangeLog/NEWS: added entry for #181 ticket (copy to deleted dir)
  Now a trailing slash will only be added in copy & move dialogs if the path itselfs
  copy/move dialog: add trailing '/' to default destination path (fix #181)
  fixed comments to /* ... */
  Not only comment it out but removing it
  Removed unneeded var to make build process a bit cleaner
  Add code snipplet by il.smind which should fix issues with putty and

Conflicts:
	ChangeLog
	mhl/string.h
	src/command.c
	src/complete.c
	src/file.c
	src/util.c
2009-01-31 22:18:19 +02:00
Enrico Weigelt, metux IT service
5f77615b35 Merge commit 'origin/mc-4.6' 2009-01-31 18:20:54 +01:00
Enrico Weigelt, metux IT service
54d6ec88dc replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() 2009-01-31 16:51:58 +01:00
Enrico Weigelt, metux IT service
b407c65b74 manually merged mc-4.6 2009-01-31 06:34:40 +01:00
Enrico Weigelt, metux IT service
f921cc40cd replaced calls to g_strdup() by mhl_str_dup() 2009-01-30 20:10:40 +01:00
Enrico Weigelt, metux IT service
15d7d47c15 replaced g_free() by mhl_mem_free() 2009-01-30 19:28:35 +01:00
Enrico Weigelt, metux IT service
e3a3890a3a fixed out-of-tree-builds 2009-01-30 16:46:44 +01:00
Enrico Weigelt, metux IT service
7639b364af added a new parameter for completion flags to input_new 2009-01-29 19:17:43 +01:00
Slava Zanko
4f00496233 patches by Rostislav Beneš: mc-12-menu
like buttons use menu entries hotkey_t. But menus are staticly defined, so this
change is much bigger. All menu declaration must be edited. follow standard
changes in drawing and handling hotkeys.

now basic mc's functions works in utf-8, remain correct calculation of controls
width in dialogs, replace functions like tolower, toupper,isspace, ... width
functions from strutil or g_ascii variant.
2009-01-26 11:47:41 +02:00
Enrico Weigelt, metux IT service
7cef5b112e Merge commit 'origin/50_history_sections.metux' 2009-01-25 07:00:32 +01:00
Enrico Weigelt, metux IT service
0dcb057459 separated out history section names to history.h 2009-01-24 21:51:29 +01:00
Enrico Weigelt, metux IT service
b9b09436c4 Merge commit 'origin/50_history_section_names' into 50_history_sections.metux 2009-01-24 21:26:41 +01:00
Patrick Winnertz
106616423e Merge branch 'mc-4.6' 2009-01-24 13:21:18 +01:00
Patrick Winnertz
786f68dd4f Merge branch '207_minor_regex_fixes' into mc-4.6 2009-01-24 13:17:28 +01:00
Enrico Weigelt, metux IT service
5d150562aa merged 158_message_codes branch 2009-01-24 04:53:51 +01:00
Patrick Winnertz
9bed802084 Merge branch 'mc-4.6' 2009-01-23 20:06:12 +01:00
Patrick Winnertz
88c320822a Fix some smaller errors concerning regex searches in mcedit 2009-01-23 20:01:15 +01:00
Patrick Winnertz
b7ac1e0484 Applied patch from debian which fixes a test if a file can be opened. 2009-01-23 19:55:43 +01:00
Slava Zanko
22fada9ce0 History sections names:
Make names of sections with function name as prefix string.

for example:
[inp:mc_mkdir Enter directory name ]
0=...
2009-01-20 00:57:09 +02:00
Enrico Weigelt, metux IT service
c3a1d292fd added patch from ticket 148 2009-01-19 22:09:54 +01:00
Patrick Winnertz
537b55b46e Move this var into if condition as it's only needed there 2009-01-14 23:28:35 +01:00
Patrick Winnertz
a144f2e4f6 Apply patch to fix localised history headers to mc-4.6 branch.
This is bad as if the localised string changed or you start mc
in another language your history will be lost.
2009-01-14 01:01:18 +01:00
Patrick Winnertz
aed7edf0f6 Removed some unused vars and functions 2009-01-12 22:47:05 +01:00
Enrico Weigelt, metux IT service
8fef98a418 Merge commit 'origin/96_segfault_invalid_mtime' into mc-4.6 2009-01-11 22:07:25 +01:00
Enrico Weigelt, metux IT service
154feb5160 2009-01-10 Enrico Weigelt, metux ITS <weigelt@metux.de>
* edit/editcmd.c:
    * src/achown.c src/background.c src/boxes.c src/chmod.c:
    * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
    * src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
    * src/learn.c src/main.c src/panelize.c src/screen.c:
    * src/selcodepage.c src/subshell.c src/tree.c src/user.c:
    * src/utilunix.c src/view.c:
    * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
    * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
    * vfs/utilvfs.c vfs/vfs.c:

    Changed message type codes on calls to message(), query_dialog(),
    close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
2009-01-10 14:13:56 +01:00
Patrick Winnertz
197973ccf2 Applied patch from metux on git - needed to fix some stuff manually.
This branch is based on mc-4.6
2009-01-10 11:53:20 +01:00
Slava Zanko
8ebe7873c9 in file edit/edit.[ch]
make function edit_cursor_move() to non-return (void).
2009-01-09 01:33:17 +02:00
Patrick Winnertz
6f8a3b3825 Add small patch which should fix the uninitialised warning 2009-01-08 23:05:30 +01:00
Patrick Winnertz
dcd57a34ef Removed .cvsignore files as we don't need them any longer 2009-01-05 16:58:44 +01:00
Slava Zanko
aad7c6c317 Added .svnignore files (same as .cvsignore) 2008-12-28 23:27:03 +02:00
Pavel Tsekov
b0f2d1654c * edit/editlock.c (lock_build_name): Check the return value of getpwuid().
* src/cmd.c (save_setup_cmd): Remove redundant g_strconcat() call.
* src/hotlist.c (load_hotlist): Likewise.
* vfs/smbfs.c (smbfs_convert_path): Replaced NULL with (char *) NULL.
2007-11-02 14:02:23 +00:00
Pavel Tsekov
2f3df3af4e * edit/bookmark.c: Update copyright notice.
* edit/edit.c: Likewise.
* edit/editcmd.c: Likewise.
* edit/editdraw.c: Likewise.
* edit/editkeys.c: Likewise.
* edit/editlock.c: Likewise.
* edit/editmenu.c: Likewise.
* edit/editoptions.c: Likewise.
* edit/editwidget.c: Likewise.
* edit/syntax.c: Likewise.
* src/background.c: Likewise.
* src/boxes.c: Likewise.
* src/complete.c: Likewise.
* src/execute.c: Likewise.
* src/ext.c: Likewise.
* src/file.c: Likewise.
* src/filegui.c: Likewise.
* src/fileopctx.c: Likewise.
* src/find.c: Likewise.
* src/hotlist.c: Likewise.
* src/key.c: Likewise.
* src/keyxdef.c: Likewise.
* src/layout.c: Likewise.
* src/learn.c: Likewise.
* src/listmode.c: Likewise.
* src/main.c: Likewise.
* src/panelize.c: Likewise.
* src/slint.c: Likewise.
* src/textconf.c: Likewise.
* src/tree.c: Likewise.
* src/treestore.c: Likewise.
* src/tty.c: Likewise.
* src/util.c: Likewise.
* src/utilunix.c: Likewise.
* src/view.c: Likewise.
* src/widget.c: Likewise.
* src/wtools.c: Likewise.
* src/x11conn.c: Likewise.
* vfs/cpio.c: Likewise.
* vfs/extfs.c: Likewise.
* vfs/fish.c: Likewise.
* vfs/ftpfs.c: Likewise.
* vfs/gc.c: Likewise.
* vfs/mcfs.c: Likewise.
* vfs/mcserv.c: Likewise.
* vfs/smbfs.c: Likewise.
* vfs/tar.c: Likewise.
2007-09-25 15:33:35 +00:00
Pavel Tsekov
23361694b6 * src/background.c: Use the correct form of FSF's name in the copyright
notice.
* src/boxes.c: Ditto.
* src/complete.c: Ditto.
* src/execute.c: Ditto.
* src/ext.c: Ditto.
* src/file.c: Ditto.
* src/filegui.c: Ditto.
* src/fileopctx.c: Ditto.
* src/fileopctx.h: Ditto.
* src/find.c: Ditto.
* src/hotlist.c: Ditto.
* src/key.c: Ditto.
* src/keyxdef.c: Ditto.
* src/layout.c: Ditto.
* src/learn.c: Ditto.
* src/listmode.c: Ditto.
* src/main.c: Ditto.
* src/panelize.c: Ditto.
* src/slint.c: Ditto.
* src/textconf.c: Ditto.
* src/tree.c: Ditto.
* src/treestore.c: Ditto.
* src/tty.c: Ditto.
* src/util.c: Ditto.
* src/utilunix.c: Ditto.
* src/view.c: Ditto.
* src/widget.c: Ditto.
* src/wtools.c: Ditto.
* src/x11conn.c: Ditto.
* vfs/cpio.c: Ditto.
* vfs/extfs.c: Ditto.
* vfs/fish.c: Ditto.
* vfs/ftpfs.c: Ditto.
* vfs/gc.c: Ditto.
* vfs/mcfs.c: Ditto.
* vfs/mcserv.c: Ditto.
* vfs/smbfs.c: Ditto.
* vfs/tar.c: Ditto.
* vfs/undelfs.c: Ditto.
* vfs/utilvfs.c: Ditto.
* vfs/vfs.c: Ditto.
* edit/bookmark.c: Ditto.
* edit/edit.c: Ditto.
* edit/edit.h: Ditto.
* edit/editcmd.c: Ditto.
* edit/editdraw.c: Ditto.
* edit/editkeys.c: Ditto.
* edit/editlock.c: Ditto.
* edit/editmenu.c: Ditto.
* edit/editoptions.c: Ditto.
* edit/editwidget.c: Ditto.
* edit/syntax.c: Ditto.
2007-09-24 09:28:32 +00:00
Pavel Tsekov
ca6af7ed40 * edit/choosesyntax.c (pstrcmp): Make static. 2007-09-11 08:34:31 +00:00
Pavel Tsekov
139e48183f * src/color.h: Add a new color pair.
* src/color.c: Likewise.
* edit/editdraw.c (print_to_widget): Make tabs and trailing whitespace
characters visible.
(edit_draw_this_line): Likewise.
2007-08-27 12:06:02 +00:00
Pavel Tsekov
46d039e0e1 * edit/editcmd.c (edit_find_string): Fix an off-by-one error when matching
against a RE.
2007-05-02 11:22:01 +00:00
Pavel Tsekov
fb01c26098 * edit/editcmd.c (edit_replace_cmd): Disable scanf-printf replacement
if "Regular expression" is selected. Fix for savannah bug #19333.
2007-04-27 08:53:50 +00:00
Pavel Roskin
5da9a185c9 * edit.h: Make skip_detach_prompt unsigned. Otherwise, it
cannot get value of 1.
2007-02-03 01:03:53 +00:00
Pavel Tsekov
bb2231fd1b * edit/edit.c (edit_execute_cmd): Update the bracket pair highlighter
state after processing CK_Find, CK_Find_Again, CK_Replace,
CK_Replace_Again, CK_Complete_Word.
2007-01-04 15:37:23 +00:00
Pavel Tsekov
2cb049a9cb * edit/edit.h (edit_move_to_prev_col): Declare the function to have
external linkage.
(edit_find_bracket): Likewise.
* edit/edit.c (edit_move_to_prev_col): Reflect the changes above.
(edit_find_bracket): Likewise.
* edit/editwidget.c (edit_event): When moving around with the mouse
use edit_move_down(), edit_move_up() and edit_move_to_prev_col()
instead of move_cursor() to update the cursor position since
the latter doesn't update some internal variables.
Use edit_find_bracket() to update the bracket pair highlighter
state.
2006-12-10 22:07:28 +00:00
Leonard den Ottolander
59e59d9e3b * edit/editdraw.c (edit_draw_this_line): Remove unused variable book_mark. 2006-12-04 22:44:50 +00:00
Roland Illig
45bb7dbe50 The file's mtime is checked before saving. 2006-11-17 21:50:33 +00:00
Leonard den Ottolander
2f8a75974b * syntax.c (edit_read_syntax_file): Set NENTRIES to 30. 2006-08-02 15:18:22 +00:00
Pavel Tsekov
6625412758 * edit/wordproc.c (next_word_start): A word is preceded by a whitespace -
the latest changes missed that fact. Restore the original behaviour.
2006-06-16 20:01:29 +00:00
Pavel Tsekov
13884c4908 * src/wordproc.c (word_start): Add new argument. Pass extra argument
to next_word_start().
(next_word_start):  Add new argument to denote the maximum number of
characters to process.
(format_this): Reflect the changes above.
2006-06-16 19:34:49 +00:00
Pavel Tsekov
afe0fce14e * edit/choosesyntax.c (pstrcmp): Fix the function declaration. 2006-05-04 12:33:57 +00:00
Leonard den Ottolander
d5a17b01f8 * syntax.c (edit_read_syntax_rules): Zero edit->rules on allocation to
avoid crash after attempting to load a non existent syntax file.
2006-04-03 21:22:09 +00:00
Leonard den Ottolander
76cf84bb69 * choosesyntax.c: Sort syntax list. 2006-03-21 22:23:37 +00:00
Leonard den Ottolander
8d439c2f88 * choosesyntax.c: GPL v2 only. 2006-03-21 22:22:03 +00:00
Pavel Tsekov
2a7a8fa19d * edit/edit-widget.h (struct WEdit): Add new field.
* edit/editcmd.c (edit_save_file): Prompt whether to detach a hardlinked
file if in "Quick save" mode.
Return -1 to indicated that the user requested to cancel the operation.
(edit_save_as_cmd): Adjust the code to handle the new return value of
edit_save_file().
(edit_save_cmd): Likewise.
2006-03-17 15:41:21 +00:00
Pavel Tsekov
1ab4a2b41c * edit/editcmd.c (edit_save_as_cmd): If saving of the file fails
remove only the _save_ lock.
2006-03-17 10:24:50 +00:00
Pavel Tsekov
03e7a434b4 * edit/editlock.c: Fix for savannah bug #13673.
(lock_build_symlink_name): New function.
(edit_lock_file): Use lock_build_symlink_name().
(edit_unlock_file): Likewise.
2006-03-15 16:08:28 +00:00
Pavel Tsekov
fcc6f9bbea * edit/editcmd.c (edit_new_cmd): Remove redundant call to
`edit_unlock_file()'.
(edit_ok_to_exit): Likewise.
2006-03-15 13:20:24 +00:00
Roland Illig
663f821891 * edit.c (user_menu): There is no need to prefix the filename
with PATH_SEP when calling concat_dir_and_file().
2006-02-10 12:29:36 +00:00
Roland Illig
c29b321563 * edit.h: Removed the leading PATH_SEP_STR from EDIT_DIR, as the
latter is not an absolute directory.
	* edit.c: Adjusted the users of EDIT_DIR.
	* editcmd.c: Likewise.
	* syntax.c: Likewise.
	* src/user.c: Likewise.
2006-02-04 14:41:41 +00:00
Leonard den Ottolander
2157716489 edit/edit.c (edit_execute_cmd): Reload syntax on toggle to on. 2006-02-02 19:45:49 +00:00
Leonard den Ottolander
17108c8b2e edit/edit.c, edit/editcmddef.h, edit/editkeys.c: Add Ctrl-S to toggle syntax
highlighting.
2006-02-01 17:07:11 +00:00
Pavel Tsekov
b0ced33741 * edit/editcmd.c: Do not set the field histname' of QuickWidget' unless
the widget is of type `quick_input'.
* src/boxes.c: Likewise.
* src/filegui.c: Likewise.
* src/hotlist.c: Likewise.
2006-01-30 09:22:33 +00:00
Pavel Tsekov
60658b4b35 * editcmd.c (edit_block_copy_cmd): Allow a block of selected
columns	as created by Shift + F3 to be copied anywhere in
the editor area.
2006-01-27 15:00:59 +00:00
Pavel Tsekov
450fe431fc * edit.c (edit_auto_indent): Remove redundant parameters.
Change the indentation strategy to copy whitespace
from the previous line instead of filling up with allegedly
equivalent whitespace depending on the tab setting.
(edit_execute_cmd): Accomodate change of parameters to
edit_auto_indent().
2006-01-26 15:42:56 +00:00
Leonard den Ottolander
689681db31 * edit/editcmd.c (edit_replace_dialog): Use Alt-m on pro&Mpt in replace
dialog. Alt-p is in use for the previous entry.
* po/*.po: Update pro&Mpt string.
2005-11-22 22:05:44 +00:00
Pavel Roskin
0e653491c1 * choosesyntax.c: Make undeclared functions static.
* editmenu.c: Likewise.
* usermap.c: Likewise.
2005-11-11 02:26:04 +00:00
Roland Illig
13684ebcd7 Added many empty lines to make reading easier. 2005-10-12 15:50:43 +00:00
Leonard den Ottolander
cd2061a883 * edit/editcmd.c (edit_replace_dialog): Replace duplicate hotkey.
* po/*.po: Update changed string.
2005-10-04 21:15:06 +00:00
Roland Illig
9be77996d6 Replaced the
editor_option_backup_ext_int hack with a string configuration
	variable, which allows the backup extension to have more than
	just four characters.
2005-09-07 08:54:11 +00:00
Roland Illig
34d39bfd0b * editmenu.c: Added a "Save setup..." entry. There had not been
the possibility of saving editor options except calling the
	"Save setup..." function from within the file manager.
2005-09-07 08:49:30 +00:00
Roland Illig
ad9acbde44 Moved printwstr() from src/slint.c to edit/editdraw.c. 2005-09-05 02:14:29 +00:00
Roland Illig
d12e66fb17 * editcmd.c: Fixed some of the gcc warnings. 2005-09-05 01:25:34 +00:00
David Martin
e97997b2ba Do translate dialog strings, not just mark. 2005-08-19 09:10:07 +00:00
Roland Illig
1c607a7414 Removed unused variable. 2005-08-15 21:40:34 +00:00
Roland Illig
ad8b819a48 * editdraw.c (render_edit_text): Removed unused variables. 2005-08-15 21:38:33 +00:00
Roland Illig
dee3850ee4 * editdraw.c (render_edit_text): Removed unused variable. 2005-08-15 21:37:34 +00:00
Roland Illig
3b1fcf6792 * editcmd.c (edit_completion_dialog): Code cleanup. 2005-08-15 21:35:33 +00:00
Roland Illig
f9df117df1 * edit-widget.h: Changed bit fields of length 1 from signed to
unsigned.
2005-08-15 20:34:26 +00:00
Pavel Roskin
56c1ec97ad * choosesyntax.c (edit_syntax_dialog): Add parentheses as
suggested by gcc.
* editkeys.c: Use braces in the keymap initializers.
2005-08-10 16:47:44 +00:00
Leonard den Ottolander
412d3b8123 edit/choosesyntax.c: Add option to reload current syntax. 2005-07-27 15:43:55 +00:00
Leonard den Ottolander
ed1899d211 * src/ChangeLog, edit/ChangeLog: Fix wrong dates on latest entries. 2005-07-24 13:42:28 +00:00
Leonard den Ottolander
f21564b9e6 * edit/choosesyntax.c: Create file. Menu option to override syntax
highlighting.
* edit/Makefile.am: Add choosesyntax.c.
* edit/edit.c (edit_init): Set option_auto_syntax to 1 on every invokation
of the editor.
* edit/edit.h: Pass char*** to edit_load_syntax(). Add parameters for
syntax dialog and override.
* edit/editmenu.c (menu_options): Add menu option to override syntax
hightlighting.
* edit/editoptions.c (edit_options_dialog): Pass option_syntax_type to
edit_load_syntax().
* edit/syntax.c (edit_read_syntax_file): Dynamically allocate and fill
syntax list pnames.
* edit/syntax.c (edit_load_syntax): Use char*** for syntax list.
* src/wtools.h: #include "widget.h" and remove redundant declarations
of Dlg_head and WListbox.
2005-07-24 13:37:58 +00:00
Pavel Roskin
2fd33802b3 * Makefile.am: Add usermap.h to the sources. 2005-07-21 21:01:51 +00:00
Roland Illig
073907ec5f * usermap.c: Allow user-defined keyboard bindings for mcedit.
* usermap.h: Likewise.
	* Makefile.am: Likewise.
	* editcmd.c: Define new editor commands which had been coded
	inline before.
	This change also affects some other files.
	* edit-widget.h: Invented a new type edit_key_map_type instead of
	using long for.
	* editkeys.c: Using that type.
2005-07-20 11:56:30 +00:00
Roland Illig
fb221cb8b0 * editkeys.c: When typing literal characters after C-q, allow
the alphabetic characters to input ASCII control characters.
2005-07-18 09:32:19 +00:00
Roland Illig
bf034f70e1 * edit.h: Added missing #include <stdio.h>. 2005-07-06 21:26:26 +00:00
Roland Illig
0ee0936513 * editwidget.c: Don't dereference WButtonBar. 2005-06-14 13:00:09 +00:00
Pavel Roskin
1f60f44145 Update postal address of Free Software Foundation. 2005-05-27 03:35:10 +00:00
Roland Illig
7758bb1b95 * editwidget.c: Removed casts on function pointer types. 2005-05-23 11:14:31 +00:00
Pavel Roskin
cd702593f6 * editwidget.c (edit_file): Move menu initialization ...
* editmenu.c (edit_init_menu): ... here.  Allocate menu
dynamically.
(edit_done_menu): Take Wmenu argument rather than Menu.  Free
menu.
(edit_reload_menu): New function, reload the menu.
(edit_options_dialog): Reload the menu if key emulation has
changed.
2005-05-20 21:19:40 +00:00
Pavel Roskin
9260860bbf * dialog.c (dlg_select_widget): Remove first argument, it's
redundant.  Adjust all callers.
(dlg_replace_widget): Likewise.
2005-05-20 20:22:06 +00:00
Pavel Roskin
b5b70bce10 * edit.h: Eliminate global EditMenuBar. Fix all dependencies. 2005-05-20 19:46:47 +00:00
Pavel Roskin
7511729690 * edit.h: Eliminate edit_message_dialog macro - it's used
inconsistently.  Fix all callers to use query_dialog().
2005-05-20 19:27:45 +00:00
Pavel Roskin
071f70d0e9 * edit-widget.h: Revert signedness fixes. We need unsigned char
for character classification.
* editcmd.c: Likewise.  Use casts to suppress warnings instead.
Thanks to Roland Illig <roland.illig@gmx.de>
2005-05-10 23:04:32 +00:00
Pavel Roskin
21ea3f6740 * *.c: Remove duplicate includes. 2005-05-10 20:57:11 +00:00
Pavel Roskin
4adb9bfe13 * edit-widget.h: Use char instead of unsigned char to fix
warnings from gcc 4.0.
* editcmd.c: Likewise.
2005-05-03 23:40:15 +00:00
Pavel Roskin
d78556d3c5 * edit.h: Use D_ERROR for edit_error_dialog, D_NORMAL for query
dialogs.  Remove unused edit_query_dialog4.
2005-05-03 23:26:51 +00:00
Leonard den Ottolander
8994b8bbec Added casts on 2 parameters to g_snprintf. 2005-04-27 21:02:59 +00:00
Pavel Roskin
b2999839e8 * editcmd.c (edit_replace_cmd): Restore correct behavior of
Shift-F4.
2005-03-17 21:18:23 +00:00
Roland Illig
ecc08f6c60 * edit.h: Removed unnecessary #include directives ...
* *.c: ... and added them here.
2005-02-22 17:00:36 +00:00
Roland Illig
5dbdfb07ba * editcmd.c: Explicitly declared unused variables to make gcc
quiet.
2005-02-08 17:14:34 +00:00
Roland Illig
e501886d58 * editdraw.c: Renamed redraw_labels to buttonbar_redraw.
* editwidget.c: Likewise. Renamed define_label_data to
	buttonbar_set_label_data.
2005-02-08 09:50:16 +00:00
Roland Illig
db5eec4964 * edit.h: Reformatted #definitions. 2005-02-08 06:48:54 +00:00
Roland Illig
e5e3a8f87d * editcmd.c: Fixed whitespacing issues.
* editdraw.c: Likewise.
	* syntax.c: Likewise.
2005-02-07 20:32:17 +00:00
Roland Illig
15342acba1 * edit.c: Fixed some whitespacing issues. 2005-02-07 20:28:13 +00:00
Roland Illig
2a281ad18d * *.c: Removed unused parameters for static functions. Marked
unused parameters for global functions. Removed redundant
	comments.
2005-02-07 20:08:01 +00:00
Roland Illig
51156030fb * ChangeLog: Applied trim_changelog. 2005-02-07 07:33:47 +00:00
Roland Illig
05d2881a71 * *.c: Removed trailing whitespace. 2005-02-07 07:31:19 +00:00
Roland Illig
e8e0035587 * edit.h: Removed catstrs, as it is only used in editcmd.c.
* editcmd.c (catstrs): Changed declaration to be static.
2005-02-07 06:34:08 +00:00
Roland Illig
b49ac634f5 * editwidget.c: Don't use catstrs anymore. 2005-02-07 06:31:04 +00:00
Roland Illig
13737b1de1 * edit.c (user_menu): Don't use catstrs anymore. 2005-02-07 06:18:13 +00:00
Roland Illig
259485542a * syntax.c: Don't use catstrs anymore. 2005-02-07 06:11:15 +00:00
Roland Illig
64eed6e12b * edit.h (catstrs): Changed the return type to "const char *".
* editcmd.c (catstrs): Likewise.
	* edit.c (user_menu): Added const qualifiers.
	* editcmd.c: Likewise.
	* syntax.c: Likewise.
2005-02-07 06:02:59 +00:00
Roland Illig
c90e9d1b95 * edit.c: Improved message formatting. 2005-02-06 23:58:59 +00:00
Roland Illig
6dc6158ff1 * edit.h: Removed NO_INLINE_GETBYTE conditional. The name was
misleading, as it really meant INLINE_GETBYTE. Furthermore,
	it has not been working since the split of edit.h into edit-widget.h.
	* edit.c: Likewise.
2005-01-30 20:34:58 +00:00
Roland Illig
020455853d * editdraw.c (edit_status): Changed some variables from size_t to
int to avoid GCC warnings.
2005-01-28 01:34:48 +00:00
Roland Illig
067e407cf7 * editdraw.c (edit_status): Fixed drawing bug with ncurses. 2005-01-27 22:14:58 +00:00
Roland Illig
6f03d9bbd9 * edit.h: Renamed multiple inclusion guards that started with a
double underscore. Added #includes for dependent files.
	* editcmddef.h: Likewise.
	* editlock.h: Likewise.
	* edit-widget.h: Likewise.
2004-12-03 17:09:27 +00:00
Roland Illig
521be0ef82 * editcmd.c (edit_replace_cmd): Separated input and output arguments.
* editcmd.c (edit_replace_dialog): Code cleanup.
2004-12-02 21:02:07 +00:00
Andrew V. Samoilov
a6c81a0d7a Change my contacts 2004-12-02 16:53:50 +00:00
Andrew V. Samoilov
26e400227a * editcmd.c (edit_replace_prompt): Fix warning with 'unused' label_len. 2004-12-02 08:31:52 +00:00
Roland Illig
badf915e39 * editcmd.c: Introduced a type edit_getbyte_fn to get rid of
the many function type casts.
2004-12-01 00:55:17 +00:00
Andrew V. Samoilov
82f580f857 * syntax.c (get_args): Use in "args_size" argument instead of
in out "argc".  Return number of found entries.
        Adjust all callers.
2004-11-18 10:02:33 +00:00
Andrew V. Samoilov
f22b5d749f * syntax.c (get_args): Use "argc" to check "args" size.
(edit_read_syntax_rules): Add new parameter "argc" (size of the
        "args" buffer) to prevent buffer overflow.
2004-11-16 19:46:46 +00:00
Andrew V. Samoilov
bfee231c11 * editdraw.c (edit_status): Don't output extra characters on the
status line.
        (print_to_widget): Don't use addch() with negative offset to skip
        over excessive columns. Output only those columns that should be
        displayed on the screen.
2004-11-10 14:11:27 +00:00
Roland Illig
188b970477 * editcmd.c (edit_replace_prompt): Fixed codepage conversion bug
introduced in on 2004-09-25 by me.
2004-11-10 06:50:50 +00:00
Roland Illig
63cae58f20 * editdraw.c (edit_status): Expand the filename field in the status
line to 16 characters even if the actual filename is shorter.
2004-10-23 13:14:14 +00:00
Roland Illig
5d5237e557 * syntax.c (read_one_line): Fixed SEGV when reading syntax file
with "\r\n" line endings on Unix.
2004-10-16 13:33:21 +00:00
Andrew V. Samoilov
5d5f56d4ee * editcmd.c (regexp_error): Small text fix.
(edit_search_cmd): Likewise.
2004-10-11 05:31:29 +00:00
Roland Illig
7a505ea99d * editcmd.c (edit_ext_cmd): Revoked my last change. 2004-09-26 11:42:17 +00:00
Roland Illig
8d75409e60 * editcmd.c (edit_ext_cmd): Don't delete the current block if no
block has been selected. In that case, just insert the output.
2004-09-25 21:39:11 +00:00
Roland Illig
d0a8da7cef * editcmd.c (edit_ext_cmd): Replaced the old version with a new
one that uses ../src/pipethrough. The new version feeds the
	currently selected block (or an empty input) into the command
	which reduces the chance of a deadlock when the command tried
	to read from stdin. It also allows the user to insert the output
	of a command that has exited with a nonzero result. Another
	feature is that it does not use temporary files.
2004-09-25 21:34:36 +00:00
Roland Illig
2a2b478f67 * syntax.c (this_try_alloc_color_pair): Added const qualifiers.
* editcmd.c (snprintf_p): Likewise. (edit_replace_prompt):
	Simplified the code.
2004-09-25 20:53:32 +00:00
Roland Illig
a3c3564d4d * syntax.c (this_try_alloc_color_pair): Added const qualifiers. 2004-09-25 14:28:10 +00:00
Andrew V. Samoilov
12d24222db * edit.c (edit_clean): g_free handles NULL argument too,
no need for the comparison.
            (edit_move_backward_lots): Likewise.
        * editcmd.c (edit_set_filename): Likewise.
            (edit_replace_cmd): Likewise.
            (edit_search_cmd): Likewise.
            (edit_sort_cmd): Likewise.
            (edit_mail_dialog): Likewise.
        * syntax.c (syntax_g_free): Likewise.
            (edit_read_syntax_rules): Likewise.
2004-09-24 22:37:00 +00:00
Roland Illig
9c65d36bdd * edit.c: Replaced NULL with (char *) NULL. Likewise for 0, where
NULL was meant.
	* editcmd.c: Likewise.
	* editlock.c: Likewise.
	* editwidget.c: Likewise.
	* syntax.c: Likewise.
2004-09-24 14:57:57 +00:00
Roland Illig
283441db92 * editdraw.c (status_string): Removed unused parameter.
(edit_status): Rewrote to allow longer filenames to be displayed
	completely whenever possible.
2004-09-24 11:13:11 +00:00
Roland Illig
3c6a792d4b * edit/edit.h: renamed edit() to edit_file() to avoid GCC shadow
warnings (many variables are also called edit).
	* edit/editwidget.c: likewise.
	* src/cmd.c: renamed edit() to edit_file() to avoid GCC shadow
	warnings (many variables are also called edit).
	* src/main.c: likewise.
2004-09-19 17:46:39 +00:00
Roland Illig
6c29de339b * editcmd.c (edit_replace_prompt): Allocate the label text
dynamically instead of using catstrs. Don't handle
	ENABLE_CHARSET specially.
2004-09-19 17:23:52 +00:00
Roland Illig
d5f70f2ab8 * editcmd.c (edit_replace_cmd): Added const qualifier.
* editwidget.c (edit_my_define): likewise.
2004-09-19 15:40:09 +00:00