4 Copyright (C) 2007-2024
5 Free Software Foundation, Inc.
8 Daniel Borca <dborca@yahoo.com>, 2007
9 Slava Zanko <slavazanko@gmail.com>, 2010, 2013
10 Andrew Borodin <aborodin@vmail.ru>, 2010-2022
11 Ilia Maslakov <il.smind@gmail.com>, 2010
13 This file is part of the Midnight Commander.
15 The Midnight Commander is free software: you can redistribute it
16 and/or modify it under the terms of the GNU General Public License as
17 published by the Free Software Foundation, either version 3 of the License,
18 or (at your option) any later version.
20 The Midnight Commander is distributed in the hope that it will be useful,
21 but WITHOUT ANY WARRANTY; without even the implied warranty of
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 GNU General Public License for more details.
25 You should have received a copy of the GNU General Public License
26 along with this program. If not, see <http://www.gnu.org/licenses/>.
34 #include <stddef.h> /* ptrdiff_t */
37 #include <sys/types.h>
40 #include "lib/global.h"
41 #include "lib/tty/tty.h"
42 #include "lib/tty/color.h"
43 #include "lib/tty/key.h"
44 #include "lib/skin.h" /* EDITOR_NORMAL_COLOR */
45 #include "lib/vfs/vfs.h"
47 #include "lib/widget.h"
48 #include "lib/strutil.h"
50 #include "lib/charsets.h"
52 #include "lib/event.h" /* mc_event_raise() */
54 #include "src/filemanager/cmd.h" /* edit_file_at_line() */
55 #include "src/filemanager/panel.h"
56 #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */
58 #include "src/execute.h" /* toggle_subshell() */
59 #include "src/keymap.h"
60 #include "src/setup.h"
61 #include "src/history.h"
63 #include "src/selcodepage.h"
69 /*** global variables ****************************************************************************/
71 /*** file scope macro definitions ****************************************************************/
73 #define FILE_READ_BUF 4096
74 #define FILE_FLAG_TEMP (1 << 0)
81 #define HDIFF_ENABLE 1
82 #define HDIFF_MINCTX 5
83 #define HDIFF_DEPTH 10
85 #define FILE_DIRTY(fs) \
93 /*** file scope type declarations ****************************************************************/
101 /*** forward declarations (file scope functions) *************************************************/
103 /*** file scope variables ************************************************************************/
105 /* --------------------------------------------------------------------------------------------- */
106 /*** file scope functions ************************************************************************/
107 /* --------------------------------------------------------------------------------------------- */
110 TAB_SKIP (int ts
, int pos
)
112 if (ts
> 0 && ts
< 9)
113 return ts
- pos
% ts
;
118 /* --------------------------------------------------------------------------------------------- */
121 * Fill buffer by spaces
124 * @param n number of spaces
125 * @param zero_terminate add a nul after @n spaces
128 fill_by_space (char *buf
, size_t n
, gboolean zero_terminate
)
130 memset (buf
, ' ', n
);
135 /* --------------------------------------------------------------------------------------------- */
138 rewrite_backup_content (const vfs_path_t
*from_file_name_vpath
, const char *to_file_name
)
143 const char *from_file_name
;
145 from_file_name
= vfs_path_get_last_path_str (from_file_name_vpath
);
146 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
149 backup_fd
= fopen (to_file_name
, "w");
150 if (backup_fd
== NULL
)
156 length
= fwrite ((const void *) contents
, length
, 1, backup_fd
);
164 /* buffered I/O ************************************************************* */
167 * Try to open a temporary file.
168 * @note the name is not altered if this function fails
170 * @param[out] name address of a pointer to store the temporary name
171 * @return file descriptor on success, negative on error
175 open_temp (void **name
)
178 vfs_path_t
*diff_file_name
= NULL
;
180 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
183 message (D_ERROR
, MSG_ERROR
,
184 _("Cannot create temporary diff file\n%s"), unix_error_string (errno
));
188 *name
= vfs_path_free (diff_file_name
, FALSE
);
192 /* --------------------------------------------------------------------------------------------- */
195 * Allocate file structure and associate file descriptor to it.
197 * @param fd file descriptor
198 * @return file structure
202 dview_fdopen (int fd
)
209 fs
= g_try_malloc (sizeof (FBUF
));
213 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
228 /* --------------------------------------------------------------------------------------------- */
231 * Free file structure without closing the file.
233 * @param fs file structure
234 * @return 0 on success, non-zero on error
238 dview_ffree (FBUF
*fs
)
242 if ((fs
->flags
& FILE_FLAG_TEMP
) != 0)
244 rv
= unlink (fs
->data
);
252 /* --------------------------------------------------------------------------------------------- */
255 * Open a binary temporary file in R/W mode.
256 * @note the file will be deleted when closed
258 * @return file structure
266 fs
= dview_fdopen (0);
270 fd
= open_temp (&fs
->data
);
278 fs
->flags
= FILE_FLAG_TEMP
;
282 /* --------------------------------------------------------------------------------------------- */
285 * Open a binary file in specified mode.
287 * @param filename file name
288 * @param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
290 * @return file structure
294 dview_fopen (const char *filename
, int flags
)
299 fs
= dview_fdopen (0);
303 fd
= open (filename
, flags
);
314 /* --------------------------------------------------------------------------------------------- */
317 * Read a line of bytes from file until newline or EOF.
318 * @note does not stop on null-byte
319 * @note buf will not be null-terminated
321 * @param buf destination buffer
322 * @param size size of buffer
323 * @param fs file structure
325 * @return number of bytes read
329 dview_fgets (char *buf
, size_t size
, FBUF
*fs
)
336 gboolean stop
= FALSE
;
338 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
346 if (j
== size
|| stop
)
350 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
357 /* --------------------------------------------------------------------------------------------- */
361 * @note avoids thrashing read cache when possible
363 * @param fs file structure
365 * @param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
367 * @return position in file, starting from beginning
371 dview_fseek (FBUF
*fs
, off_t off
, int whence
)
375 if (fs
->len
!= 0 && whence
!= SEEK_END
)
377 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
380 if (whence
== SEEK_CUR
)
383 off
+= rv
- fs
->len
+ fs
->pos
;
385 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
387 fs
->pos
= fs
->len
+ off
- rv
;
393 rv
= lseek (fs
->fd
, off
, whence
);
399 /* --------------------------------------------------------------------------------------------- */
402 * Seek to the beginning of file, thrashing read cache.
404 * @param fs file structure
406 * @return 0 if success, non-zero on error
410 dview_freset (FBUF
*fs
)
414 rv
= lseek (fs
->fd
, 0, SEEK_SET
);
420 /* --------------------------------------------------------------------------------------------- */
423 * Write bytes to file.
424 * @note thrashes read cache
426 * @param fs file structure
427 * @param buf source buffer
428 * @param size size of buffer
430 * @return number of written bytes, -1 on error
434 dview_fwrite (FBUF
*fs
, const char *buf
, size_t size
)
438 rv
= write (fs
->fd
, buf
, size
);
444 /* --------------------------------------------------------------------------------------------- */
447 * Truncate file to the current position.
448 * @note thrashes read cache
450 * @param fs file structure
452 * @return current file size on success, negative on error
456 dview_ftrunc (FBUF
*fs
)
460 off
= lseek (fs
->fd
, 0, SEEK_CUR
);
465 rv
= ftruncate (fs
->fd
, off
);
474 /* --------------------------------------------------------------------------------------------- */
478 * @note if this is temporary file, it is deleted
480 * @param fs file structure
481 * @return 0 on success, non-zero on error
485 dview_fclose (FBUF
*fs
)
498 /* --------------------------------------------------------------------------------------------- */
501 * Create pipe stream to process.
503 * @param cmd shell command line
504 * @param flags open mode, either O_RDONLY or O_WRONLY
506 * @return file structure
510 dview_popen (const char *cmd
, int flags
)
514 const char *type
= NULL
;
516 if (flags
== O_RDONLY
)
518 else if (flags
== O_WRONLY
)
524 fs
= dview_fdopen (0);
528 f
= popen (cmd
, type
);
540 /* --------------------------------------------------------------------------------------------- */
545 * @param fs structure
546 * @return 0 on success, non-zero on error
550 dview_pclose (FBUF
*fs
)
556 rv
= pclose (fs
->data
);
563 /* --------------------------------------------------------------------------------------------- */
566 * Get one char (byte) from string
570 * @return TRUE on success, FALSE otherwise
574 dview_get_byte (const char *str
, int *ch
)
579 *ch
= (unsigned char) (*str
);
583 /* --------------------------------------------------------------------------------------------- */
587 * Get utf multibyte char from string
591 * @param ch_length ...
592 * @return TRUE on success, FALSE otherwise
596 dview_get_utf (const char *str
, int *ch
, int *ch_length
)
601 *ch
= g_utf8_get_char_validated (str
, -1);
605 *ch
= (unsigned char) (*str
);
612 /* Calculate UTF-8 char length */
613 next_ch
= g_utf8_next_char (str
);
614 *ch_length
= next_ch
- str
;
620 /* --------------------------------------------------------------------------------------------- */
623 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
627 if (text
== NULL
|| text
[0] == '\0')
630 if (g_utf8_validate (text
, -1, NULL
))
631 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
635 char *tmpbuf
, *buffer
;
637 buffer
= tmpbuf
= g_strdup (text
);
638 while (tmpbuf
[0] != '\0')
640 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
641 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
642 tmpbuf
= g_utf8_next_char (tmpbuf
);
649 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
652 return MAX (length
, (size_t) result
);
654 #endif /*HAVE_CHARSET */
656 /* --------------------------------------------------------------------------------------------- */
658 /* diff parse *************************************************************** */
661 * Read decimal number from string.
663 * @param[in,out] str string to parse
664 * @param[out] n extracted number
665 * @return 0 if success, otherwise non-zero
669 scan_deci (const char **str
, int *n
)
671 const char *p
= *str
;
675 *n
= strtol (p
, &q
, 10);
676 if (errno
!= 0 || p
== q
)
682 /* --------------------------------------------------------------------------------------------- */
685 * Parse line for diff statement.
687 * @param p string to parse
688 * @param ops list of diff statements
689 * @return 0 if success, otherwise non-zero
693 scan_line (const char *p
, GArray
*ops
)
700 gboolean range
= FALSE
;
702 /* handle the following cases:
704 * NUM[,NUM]cNUM[,NUM]
706 * where NUM is a positive integer
709 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
716 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
728 else if (cmd
!= 'c' && cmd
!= 'd')
731 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
739 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
745 if (cmd
== 'd' && range
)
753 g_array_append_val (ops
, op
);
757 /* --------------------------------------------------------------------------------------------- */
760 * Parse diff output and extract diff statements.
762 * @param f stream to read from
763 * @param ops list of diff statements to fill
764 * @return positive number indicating number of hunks, otherwise negative
768 scan_diff (FBUF
*f
, GArray
*ops
)
773 while ((sz
= dview_fgets (buf
, sizeof (buf
) - 1, f
)) != 0)
775 if (isdigit (buf
[0]))
777 if (buf
[sz
- 1] != '\n')
781 if (scan_line (buf
, ops
) != 0)
785 while (buf
[sz
- 1] != '\n' && (sz
= dview_fgets (buf
, sizeof (buf
), f
)) != 0)
792 /* --------------------------------------------------------------------------------------------- */
795 * Invoke diff and extract diff statements.
797 * @param args extra arguments to be passed to diff
798 * @param extra more arguments to be passed to diff
799 * @param file1 first file to compare
800 * @param file2 second file to compare
801 * @param ops list of diff statements to fill
803 * @return positive number indicating number of hunks, otherwise negative
807 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
, GArray
*ops
)
809 static const char *opt
=
810 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
811 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
812 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
813 " --unchanged-group-format=''";
819 char *file1_esc
, *file2_esc
;
821 /* escape potential $ to avoid shell variable substitutions in popen() */
822 file1_esc
= str_shell_escape (file1
);
823 file2_esc
= str_shell_escape (file2
);
824 cmd
= g_strdup_printf ("diff %s %s %s %s %s", args
, extra
, opt
, file1_esc
, file2_esc
);
831 f
= dview_popen (cmd
, O_RDONLY
);
837 rv
= scan_diff (f
, ops
);
838 code
= dview_pclose (f
);
840 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
846 /* --------------------------------------------------------------------------------------------- */
849 printer_for (char ch
, DFUNC printer
, void *ctx
, FBUF
*f
, int *line
, off_t
*off
)
854 sz
= dview_fgets (buf
, sizeof (buf
), f
);
859 printer (ctx
, ch
, *line
, *off
, sz
, buf
);
862 while (buf
[sz
- 1] != '\n')
864 sz
= dview_fgets (buf
, sizeof (buf
), f
);
867 printer (ctx
, 0, 0, 0, 1, "\n");
871 printer (ctx
, 0, 0, 0, sz
, buf
);
878 /* --------------------------------------------------------------------------------------------- */
881 * Reparse and display file according to diff statements.
883 * @param ord DIFF_LEFT if 1st file is displayed , DIFF_RIGHT if 2nd file is displayed.
884 * @param filename file name to display
885 * @param ops list of diff statements
886 * @param printer printf-like function to be used for displaying
887 * @param ctx printer context
889 * @return 0 if success, otherwise non-zero
893 dff_reparse (diff_place_t ord
, const char *filename
, const GArray
*ops
, DFUNC printer
, void *ctx
)
901 int add_cmd
, del_cmd
;
903 f
= dview_fopen (filename
, O_RDONLY
);
907 if (ord
!= DIFF_LEFT
)
911 if (ord
!= DIFF_LEFT
)
923 #define T1 a[ ord^1 ][0]
924 #define T2 a[ ord^1 ][1]
925 for (i
= 0; i
< ops
->len
; i
++)
929 op
= &g_array_index (ops
, DIFFCMD
, i
);
932 if (op
->cmd
!= add_cmd
)
935 while (line
< n
&& printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
941 if (op
->cmd
== add_cmd
)
942 for (n
= op
->T2
- op
->T1
+ 1; n
!= 0; n
--)
943 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
945 if (op
->cmd
== del_cmd
)
947 for (n
= op
->F2
- op
->F1
+ 1;
948 n
!= 0 && printer_for (ADD_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
957 for (n
= op
->F2
- op
->F1
+ 1;
958 n
!= 0 && printer_for (CHG_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
964 for (n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
); n
> 0; n
--)
965 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
973 while (printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
984 /* --------------------------------------------------------------------------------------------- */
986 /* horizontal diff ********************************************************** */
989 * Longest common substring.
991 * @param s first string
992 * @param m length of first string
993 * @param t second string
994 * @param n length of second string
995 * @param ret list of offsets for longest common substrings inside each string
996 * @param min minimum length of common substrings
998 * @return 0 if success, nonzero otherwise
1002 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
*ret
, int min
)
1008 if (m
< min
|| n
< min
)
1010 /* XXX early culling */
1014 Lprev
= g_try_new0 (int, n
+ 1);
1018 Lcurr
= g_try_new0 (int, n
+ 1);
1025 for (i
= 0; i
< m
; i
++)
1032 #ifdef USE_MEMSET_IN_LCS
1033 memset (Lcurr
, 0, (n
+ 1) * sizeof (*Lcurr
));
1035 for (j
= 0; j
< n
; j
++)
1037 #ifndef USE_MEMSET_IN_LCS
1049 g_array_set_size (ret
, 0);
1051 if (z
== v
&& z
>= min
)
1059 for (k
= 0; k
< ret
->len
; k
++)
1061 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1062 if ((*p
)[0] == off0
|| (*p
)[1] >= off1
)
1071 g_array_append_val (ret
, p2
);
1083 /* --------------------------------------------------------------------------------------------- */
1086 * Scan recursively for common substrings and build ranges.
1088 * @param s first string
1089 * @param t second string
1090 * @param bracket current limits for both of the strings
1091 * @param min minimum length of common substrings
1092 * @param hdiff list of horizontal diff ranges to fill
1093 * @param depth recursion depth
1095 * @return 0 if success, nonzero otherwise
1099 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
*hdiff
,
1110 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1112 len
= lcsubstr (s
+ bracket
[DIFF_LEFT
].off
, bracket
[DIFF_LEFT
].len
,
1113 t
+ bracket
[DIFF_RIGHT
].off
, bracket
[DIFF_RIGHT
].len
, ret
, min
);
1117 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1120 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1121 b
[DIFF_LEFT
].len
= (*data
)[0];
1122 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1123 b
[DIFF_RIGHT
].len
= (*data
)[1];
1124 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1127 for (k
= 0; k
< ret
->len
- 1; k
++)
1129 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1130 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1131 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1132 b
[DIFF_LEFT
].len
= (*data2
)[0] - (*data
)[0] - len
;
1133 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1134 b
[DIFF_RIGHT
].len
= (*data2
)[1] - (*data
)[1] - len
;
1135 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1138 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1139 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1140 b
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
- (*data
)[0] - len
;
1141 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1142 b
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
- (*data
)[1] - len
;
1143 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1146 g_array_free (ret
, TRUE
);
1151 p
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1152 p
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
;
1153 p
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1154 p
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
;
1155 g_array_append_val (hdiff
, p
);
1160 /* --------------------------------------------------------------------------------------------- */
1163 * Build list of horizontal diff ranges.
1165 * @param s first string
1166 * @param m length of first string
1167 * @param t second string
1168 * @param n length of second string
1169 * @param min minimum length of common substrings
1170 * @param hdiff list of horizontal diff ranges to fill
1171 * @param depth recursion depth
1173 * @return 0 if success, nonzero otherwise
1177 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
*hdiff
, unsigned int depth
)
1182 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1183 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1185 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1188 b
[DIFF_LEFT
].off
= i
;
1189 b
[DIFF_LEFT
].len
= m
- i
;
1190 b
[DIFF_RIGHT
].off
= i
;
1191 b
[DIFF_RIGHT
].len
= n
- i
;
1193 /* smartscan (multiple horizontal diff) */
1194 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1197 /* --------------------------------------------------------------------------------------------- */
1199 /* read line **************************************************************** */
1202 * Check if character is inside horizontal diff limits.
1204 * @param k rank of character inside line
1205 * @param hdiff horizontal diff structure
1206 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1208 * @return TRUE if inside hdiff limits, FALSE otherwise
1212 is_inside (int k
, GArray
*hdiff
, diff_place_t ord
)
1217 for (i
= 0; i
< hdiff
->len
; i
++)
1221 b
= &g_array_index (hdiff
, BRACKET
, i
);
1222 start
= (*b
)[ord
].off
;
1223 end
= start
+ (*b
)[ord
].len
;
1224 if (k
>= start
&& k
< end
)
1230 /* --------------------------------------------------------------------------------------------- */
1233 * Copy 'src' to 'dst' expanding tabs.
1234 * @note The procedure returns when all bytes are consumed from 'src'
1236 * @param dst destination buffer
1237 * @param src source buffer
1238 * @param srcsize size of src buffer
1239 * @param base virtual base of this string, needed to calculate tabs
1240 * @param ts tab size
1242 * @return new virtual base
1246 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1250 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1257 j
= TAB_SKIP (ts
, i
+ base
);
1259 fill_by_space (dst
, j
, FALSE
);
1266 /* --------------------------------------------------------------------------------------------- */
1269 * Copy 'src' to 'dst' expanding tabs.
1271 * @param dst destination buffer
1272 * @param dstsize size of dst buffer
1273 * @param[in,out] _src source buffer
1274 * @param srcsize size of src buffer
1275 * @param base virtual base of this string, needed to calculate tabs
1276 * @param ts tab size
1278 * @return new virtual base
1280 * @note The procedure returns when all bytes are consumed from 'src'
1281 * or 'dstsize' bytes are written to 'dst'
1282 * @note Upon return, 'src' points to the first unwritten character in source
1286 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1289 const char *src
= *_src
;
1291 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1298 j
= TAB_SKIP (ts
, i
+ base
);
1299 if (j
> dstsize
- i
)
1302 fill_by_space (dst
, j
, FALSE
);
1310 /* --------------------------------------------------------------------------------------------- */
1313 * Read line from memory, converting tabs to spaces and padding with spaces.
1315 * @param src buffer to read from
1316 * @param srcsize size of src buffer
1317 * @param dst buffer to read to
1318 * @param dstsize size of dst buffer, excluding trailing null
1319 * @param skip number of characters to skip
1320 * @param ts tab size
1321 * @param show_cr show trailing carriage return as ^M
1323 * @return negative on error, otherwise number of bytes except padding
1327 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1338 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1344 j
= TAB_SKIP (ts
, i
+ base
);
1350 else if (dstsize
!= 0)
1357 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1359 if (skip
== 0 && show_cr
)
1381 (void) dview_get_utf (src
, &ch
, &ch_length
);
1384 skip
+= ch_length
- 1;
1398 fill_by_space (dst
, dstsize
, TRUE
);
1403 /* --------------------------------------------------------------------------------------------- */
1406 * Read line from memory and build attribute array.
1408 * @param src buffer to read from
1409 * @param srcsize size of src buffer
1410 * @param dst buffer to read to
1411 * @param dstsize size of dst buffer, excluding trailing null
1412 * @param skip number of characters to skip
1413 * @param ts tab size
1414 * @param show_cr show trailing carriage return as ^M
1415 * @param hdiff horizontal diff structure
1416 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1417 * @param att buffer of attributes
1419 * @return negative on error, otherwise number of bytes except padding
1423 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1424 gboolean show_cr
, GArray
*hdiff
, diff_place_t ord
, char *att
)
1434 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1440 j
= TAB_SKIP (ts
, i
+ base
);
1446 else if (dstsize
!= 0)
1449 *att
++ = is_inside (k
, hdiff
, ord
);
1454 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1456 if (skip
== 0 && show_cr
)
1461 *att
++ = is_inside (k
, hdiff
, ord
);
1463 *att
++ = is_inside (k
, hdiff
, ord
);
1469 *att
++ = is_inside (k
, hdiff
, ord
);
1481 (void) dview_get_utf (src
, &ch
, &ch_length
);
1483 skip
+= ch_length
- 1;
1491 *att
++ = is_inside (k
, hdiff
, ord
);
1498 memset (att
, '\0', dstsize
);
1499 fill_by_space (dst
, dstsize
, TRUE
);
1504 /* --------------------------------------------------------------------------------------------- */
1507 * Read line from file, converting tabs to spaces and padding with spaces.
1509 * @param f file stream to read from
1510 * @param off offset of line inside file
1511 * @param dst buffer to read to
1512 * @param dstsize size of dst buffer, excluding trailing null
1513 * @param skip number of characters to skip
1514 * @param ts tab size
1515 * @param show_cr show trailing carriage return as ^M
1517 * @return negative on error, otherwise number of bytes except padding
1521 cvt_fget (FBUF
*f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, gboolean show_cr
)
1524 int old_base
= base
;
1525 size_t amount
= dstsize
;
1526 size_t useful
, offset
;
1530 const char *q
= NULL
;
1531 char tmp
[BUFSIZ
]; /* XXX capacity must be >= MAX{dstsize + 1, amount} */
1532 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1534 if (sizeof (tmp
) < amount
|| sizeof (tmp
) <= dstsize
|| sizeof (cvt
) < 8 * amount
)
1536 /* abnormal, but avoid buffer overflow */
1537 fill_by_space (dst
, dstsize
, TRUE
);
1541 dview_fseek (f
, off
, SEEK_SET
);
1546 sz
= dview_fgets (tmp
, amount
, f
);
1550 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1551 if (cvt
[base
- old_base
- 1] == '\n')
1553 q
= &cvt
[base
- old_base
- 1];
1554 base
= old_base
+ q
- cvt
+ 1;
1561 fill_by_space (dst
, dstsize
, TRUE
);
1565 useful
= base
- skip
;
1566 offset
= skip
- old_base
;
1568 if (useful
<= dstsize
)
1571 memmove (dst
, cvt
+ offset
, useful
);
1575 sz
= dview_fgets (tmp
, dstsize
- useful
+ 1, f
);
1578 const char *ptr
= tmp
;
1580 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1589 memmove (dst
, cvt
+ offset
, dstsize
);
1591 lastch
= cvt
[offset
+ dstsize
];
1595 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1596 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1600 if (i
+ 1 < dstsize
)
1611 fill_by_space (dst
, dstsize
, TRUE
);
1616 /* --------------------------------------------------------------------------------------------- */
1617 /* diff printers et al ****************************************************** */
1620 cc_free_elt (gpointer elt
)
1622 DIFFLN
*p
= (DIFFLN
*) elt
;
1628 /* --------------------------------------------------------------------------------------------- */
1631 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1633 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1634 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1644 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1646 if (sz
!= 0 && str
[sz
- 1] == '\n')
1649 p
.p
= g_strndup (str
, sz
);
1652 g_array_append_val (a
, p
);
1654 else if (dsrc
== DATA_SRC_MEM
)
1658 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1659 if (sz
!= 0 && str
[sz
- 1] == '\n')
1666 new_size
= p
->u
.len
+ sz
;
1667 q
= g_realloc (p
->p
, new_size
);
1668 memcpy (q
+ p
->u
.len
, str
, sz
);
1673 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1675 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1676 dview_fwrite (f
, str
, sz
);
1681 /* --------------------------------------------------------------------------------------------- */
1684 redo_diff (WDiff
*dview
)
1686 FBUF
*const *f
= dview
->f
;
1691 char extra
[BUF_MEDIUM
];
1694 if (dview
->opt
.quality
== 2)
1695 strcat (extra
, " -d");
1696 if (dview
->opt
.quality
== 1)
1697 strcat (extra
, " --speed-large-files");
1698 if (dview
->opt
.strip_trailing_cr
)
1699 strcat (extra
, " --strip-trailing-cr");
1700 if (dview
->opt
.ignore_tab_expansion
)
1701 strcat (extra
, " -E");
1702 if (dview
->opt
.ignore_space_change
)
1703 strcat (extra
, " -b");
1704 if (dview
->opt
.ignore_all_space
)
1705 strcat (extra
, " -w");
1706 if (dview
->opt
.ignore_case
)
1707 strcat (extra
, " -i");
1709 if (dview
->dsrc
!= DATA_SRC_MEM
)
1711 dview_freset (f
[DIFF_LEFT
]);
1712 dview_freset (f
[DIFF_RIGHT
]);
1715 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1716 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[DIFF_LEFT
], dview
->file
[DIFF_RIGHT
], ops
);
1720 g_array_free (ops
, TRUE
);
1724 ctx
.dsrc
= dview
->dsrc
;
1725 ctx
.a
= dview
->a
[DIFF_LEFT
];
1726 ctx
.f
= f
[DIFF_LEFT
];
1727 rv
|= dff_reparse (DIFF_LEFT
, dview
->file
[DIFF_LEFT
], ops
, printer
, &ctx
);
1729 ctx
.a
= dview
->a
[DIFF_RIGHT
];
1730 ctx
.f
= f
[DIFF_RIGHT
];
1731 rv
|= dff_reparse (DIFF_RIGHT
, dview
->file
[DIFF_RIGHT
], ops
, printer
, &ctx
);
1734 g_array_free (ops
, TRUE
);
1736 if (rv
!= 0 || dview
->a
[DIFF_LEFT
]->len
!= dview
->a
[DIFF_RIGHT
]->len
)
1739 if (dview
->dsrc
== DATA_SRC_TMP
)
1741 dview_ftrunc (f
[DIFF_LEFT
]);
1742 dview_ftrunc (f
[DIFF_RIGHT
]);
1745 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1749 dview
->hdiff
= g_ptr_array_new ();
1751 for (i
= 0; i
< dview
->a
[DIFF_LEFT
]->len
; i
++)
1757 p
= &g_array_index (dview
->a
[DIFF_LEFT
], DIFFLN
, i
);
1758 q
= &g_array_index (dview
->a
[DIFF_RIGHT
], DIFFLN
, i
);
1759 if (p
->line
!= 0 && q
->line
!= 0 && p
->ch
== CHG_CH
)
1763 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1766 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
, HDIFF_DEPTH
);
1769 g_array_free (h
, TRUE
);
1774 g_ptr_array_add (dview
->hdiff
, h
);
1780 /* --------------------------------------------------------------------------------------------- */
1783 destroy_hdiff (WDiff
*dview
)
1785 if (dview
->hdiff
!= NULL
)
1790 len
= dview
->a
[DIFF_LEFT
]->len
;
1792 for (i
= 0; i
< len
; i
++)
1796 h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1798 g_array_free (h
, TRUE
);
1800 g_ptr_array_free (dview
->hdiff
, TRUE
);
1801 dview
->hdiff
= NULL
;
1804 mc_search_free (dview
->search
.handle
);
1805 dview
->search
.handle
= NULL
;
1806 MC_PTR_FREE (dview
->search
.last_string
);
1809 /* --------------------------------------------------------------------------------------------- */
1810 /* stuff ******************************************************************** */
1813 get_digits (unsigned int n
)
1817 while ((n
/= 10) != 0)
1822 /* --------------------------------------------------------------------------------------------- */
1825 get_line_numbers (const GArray
*a
, size_t pos
, int *linenum
, int *lineofs
)
1837 p
= &g_array_index (a
, DIFFLN
, pos
);
1843 for (n
= pos
; n
> 0; n
--)
1849 *lineofs
= pos
- n
+ 1;
1857 /* --------------------------------------------------------------------------------------------- */
1860 calc_nwidth (const GArray
*const *a
)
1865 get_line_numbers (a
[DIFF_LEFT
], a
[DIFF_LEFT
]->len
- 1, &l1
, &o1
);
1866 get_line_numbers (a
[DIFF_RIGHT
], a
[DIFF_RIGHT
]->len
- 1, &l2
, &o2
);
1869 return get_digits (l1
);
1872 /* --------------------------------------------------------------------------------------------- */
1875 find_prev_hunk (const GArray
*a
, int pos
)
1878 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1880 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
--)
1882 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1884 if (pos
> 0 && (size_t) pos
< a
->len
)
1887 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
; pos
--)
1889 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
; pos
--)
1896 /* --------------------------------------------------------------------------------------------- */
1899 find_next_hunk (const GArray
*a
, size_t pos
)
1901 for (; pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1903 for (; pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
++)
1908 /* --------------------------------------------------------------------------------------------- */
1910 * Find start and end lines of the current hunk.
1912 * @param dview WDiff widget
1913 * @return boolean and
1914 * start_line1 first line of current hunk (file[0])
1915 * end_line1 last line of current hunk (file[0])
1916 * start_line1 first line of current hunk (file[0])
1917 * end_line1 last line of current hunk (file[0])
1921 get_current_hunk (WDiff
*dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
1923 const GArray
*a0
= dview
->a
[DIFF_LEFT
];
1924 const GArray
*a1
= dview
->a
[DIFF_RIGHT
];
1934 pos
= dview
->skip_rows
;
1935 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
1953 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1957 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
1958 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
1961 for (pos
= dview
->skip_rows
;
1962 pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1966 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
1967 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
1969 *end_line1
= MAX (*start_line1
, l0
);
1971 *end_line2
= MAX (*start_line2
, l1
);
1977 /* --------------------------------------------------------------------------------------------- */
1979 * Remove hunk from file.
1981 * @param dview WDiff widget
1982 * @param merge_file file stream for writing data
1983 * @param from1 first line of hunk
1984 * @param to1 last line of hunk
1985 * @param merge_direction in what direction files should be merged
1989 dview_remove_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int to1
,
1990 action_direction_t merge_direction
)
1996 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
1997 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
1999 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2001 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2002 fputs (buf
, merge_file
);
2004 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2008 fputs (buf
, merge_file
);
2013 /* --------------------------------------------------------------------------------------------- */
2017 * @param dview WDiff widget
2018 * @param merge_file file stream for writing data
2019 * @param from1 first line of source hunk
2020 * @param from2 first line of destination hunk
2021 * @param to1 last line of source hunk
2022 * @param merge_direction in what direction files should be merged
2026 dview_add_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int from2
, int to2
,
2027 action_direction_t merge_direction
)
2033 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2035 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2036 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2040 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2041 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2044 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2045 fputs (buf
, merge_file
);
2046 for (line
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
;)
2050 fputs (buf
, merge_file
);
2052 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2053 fputs (buf
, merge_file
);
2059 /* --------------------------------------------------------------------------------------------- */
2061 * Replace hunk in file.
2063 * @param dview WDiff widget
2064 * @param merge_file file stream for writing data
2065 * @param from1 first line of source hunk
2066 * @param to1 last line of source hunk
2067 * @param from2 first line of destination hunk
2068 * @param to2 last line of destination hunk
2069 * @param merge_direction in what direction files should be merged
2073 dview_replace_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int to1
, int from2
, int to2
,
2074 action_direction_t merge_direction
)
2080 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2082 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2083 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2087 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2088 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2091 for (line1
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1; line1
++)
2092 fputs (buf
, merge_file
);
2093 for (line2
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
;)
2097 fputs (buf
, merge_file
);
2099 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2103 fputs (buf
, merge_file
);
2109 /* --------------------------------------------------------------------------------------------- */
2113 * @param dview WDiff widget
2114 * @param merge_direction in what direction files should be merged
2118 do_merge_hunk (WDiff
*dview
, action_direction_t merge_direction
)
2120 int from1
, to1
, from2
, to2
;
2122 diff_place_t n_merge
= (merge_direction
== FROM_RIGHT_TO_LEFT
) ? DIFF_RIGHT
: DIFF_LEFT
;
2124 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2125 hunk
= get_current_hunk (dview
, &from2
, &to2
, &from1
, &to1
);
2127 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2133 vfs_path_t
*merge_file_name_vpath
= NULL
;
2135 if (!dview
->merged
[n_merge
])
2137 dview
->merged
[n_merge
] = mc_util_make_backup_if_possible (dview
->file
[n_merge
], "~~~");
2138 if (!dview
->merged
[n_merge
])
2140 message (D_ERROR
, MSG_ERROR
,
2141 _("Cannot create backup file\n%s%s\n%s"),
2142 dview
->file
[n_merge
], "~~~", unix_error_string (errno
));
2147 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2148 if (merge_file_fd
== -1)
2150 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2151 unix_error_string (errno
));
2155 merge_file
= fdopen (merge_file_fd
, "w");
2160 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2161 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_RIGHT_TO_LEFT
);
2163 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_LEFT_TO_RIGHT
);
2166 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2167 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_RIGHT_TO_LEFT
);
2169 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_LEFT_TO_RIGHT
);
2172 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
, merge_direction
);
2177 fflush (merge_file
);
2178 fclose (merge_file
);
2182 res
= rewrite_backup_content (merge_file_name_vpath
, dview
->file
[n_merge
]);
2185 mc_unlink (merge_file_name_vpath
);
2186 vfs_path_free (merge_file_name_vpath
, TRUE
);
2190 /* --------------------------------------------------------------------------------------------- */
2191 /* view routines and callbacks ********************************************** */
2194 dview_compute_split (WDiff
*dview
, int i
)
2197 if (dview
->bias
< 2 - dview
->half1
)
2198 dview
->bias
= 2 - dview
->half1
;
2199 if (dview
->bias
> dview
->half2
- 2)
2200 dview
->bias
= dview
->half2
- 2;
2203 /* --------------------------------------------------------------------------------------------- */
2206 dview_compute_areas (WDiff
*dview
)
2208 Widget
*w
= WIDGET (dview
);
2210 dview
->height
= w
->rect
.lines
- 1;
2211 dview
->half1
= w
->rect
.cols
/ 2;
2212 dview
->half2
= w
->rect
.cols
- dview
->half1
;
2214 dview_compute_split (dview
, 0);
2217 /* --------------------------------------------------------------------------------------------- */
2220 dview_reread (WDiff
*dview
)
2224 destroy_hdiff (dview
);
2225 if (dview
->a
[DIFF_LEFT
] != NULL
)
2226 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2227 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2228 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2230 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2231 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2232 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2233 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2235 ndiff
= redo_diff (dview
);
2237 dview
->ndiff
= ndiff
;
2240 /* --------------------------------------------------------------------------------------------- */
2244 dview_set_codeset (WDiff
*dview
)
2246 const char *encoding_id
= NULL
;
2250 get_codepage_id (mc_global
.source_codepage
>=
2251 0 ? mc_global
.source_codepage
: mc_global
.display_codepage
);
2252 if (encoding_id
!= NULL
)
2256 conv
= str_crt_conv_from (encoding_id
);
2257 if (conv
!= INVALID_CONV
)
2259 if (dview
->converter
!= str_cnv_from_term
)
2260 str_close_conv (dview
->converter
);
2261 dview
->converter
= conv
;
2263 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
2267 /* --------------------------------------------------------------------------------------------- */
2270 dview_select_encoding (WDiff
*dview
)
2272 if (do_select_codepage ())
2273 dview_set_codeset (dview
);
2274 dview_reread (dview
);
2275 tty_touch_screen ();
2278 #endif /* HAVE_CHARSET */
2280 /* --------------------------------------------------------------------------------------------- */
2283 dview_load_options (WDiff
*dview
)
2285 gboolean show_numbers
;
2288 dview
->display_symbols
=
2289 mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_symbols", FALSE
);
2290 show_numbers
= mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_numbers", FALSE
);
2292 dview
->display_numbers
= 1;
2293 tab_size
= mc_config_get_int (mc_global
.main_config
, "DiffView", "tab_size", 8);
2294 if (tab_size
> 0 && tab_size
< 9)
2295 dview
->tab_size
= tab_size
;
2297 dview
->tab_size
= 8;
2299 dview
->opt
.quality
= mc_config_get_int (mc_global
.main_config
, "DiffView", "diff_quality", 0);
2301 dview
->opt
.strip_trailing_cr
=
2302 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2303 dview
->opt
.ignore_all_space
=
2304 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2305 dview
->opt
.ignore_space_change
=
2306 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2307 dview
->opt
.ignore_tab_expansion
=
2308 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2309 dview
->opt
.ignore_case
=
2310 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case", FALSE
);
2312 dview
->new_frame
= TRUE
;
2315 /* --------------------------------------------------------------------------------------------- */
2318 dview_save_options (WDiff
*dview
)
2320 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_symbols", dview
->display_symbols
);
2321 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_numbers",
2322 dview
->display_numbers
!= 0);
2323 mc_config_set_int (mc_global
.main_config
, "DiffView", "tab_size", dview
->tab_size
);
2325 mc_config_set_int (mc_global
.main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2327 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws",
2328 dview
->opt
.strip_trailing_cr
);
2329 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space",
2330 dview
->opt
.ignore_all_space
);
2331 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change",
2332 dview
->opt
.ignore_space_change
);
2333 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion",
2334 dview
->opt
.ignore_tab_expansion
);
2335 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case",
2336 dview
->opt
.ignore_case
);
2339 /* --------------------------------------------------------------------------------------------- */
2342 dview_diff_options (WDiff
*dview
)
2344 const char *quality_str
[] = {
2346 N_("&Fastest (Assume large files)"),
2347 N_("&Minimal (Find a smaller set of change)")
2350 quick_widget_t quick_widgets
[] = {
2352 QUICK_START_GROUPBOX (N_("Diff algorithm")),
2353 QUICK_RADIO (3, (const char **) quality_str
, (int *) &dview
->opt
.quality
, NULL
),
2354 QUICK_STOP_GROUPBOX
,
2355 QUICK_START_GROUPBOX (N_("Diff extra options")),
2356 QUICK_CHECKBOX (N_("&Ignore case"), &dview
->opt
.ignore_case
, NULL
),
2357 QUICK_CHECKBOX (N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
, NULL
),
2358 QUICK_CHECKBOX (N_("Ignore &space change"), &dview
->opt
.ignore_space_change
, NULL
),
2359 QUICK_CHECKBOX (N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
, NULL
),
2360 QUICK_CHECKBOX (N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
,
2362 QUICK_STOP_GROUPBOX
,
2363 QUICK_BUTTONS_OK_CANCEL
,
2368 WRect r
= { -1, -1, 0, 56 };
2370 quick_dialog_t qdlg
= {
2371 r
, N_("Diff Options"), "[Diff Options]",
2372 quick_widgets
, NULL
, NULL
2375 if (quick_dialog (&qdlg
) != B_CANCEL
)
2376 dview_reread (dview
);
2379 /* --------------------------------------------------------------------------------------------- */
2382 dview_init (WDiff
*dview
, const char *args
, const char *file1
, const char *file2
,
2383 const char *label1
, const char *label2
, DSRC dsrc
)
2385 FBUF
*f
[DIFF_COUNT
];
2387 f
[DIFF_LEFT
] = NULL
;
2388 f
[DIFF_RIGHT
] = NULL
;
2390 if (dsrc
== DATA_SRC_TMP
)
2392 f
[DIFF_LEFT
] = dview_ftemp ();
2393 if (f
[DIFF_LEFT
] == NULL
)
2396 f
[DIFF_RIGHT
] = dview_ftemp ();
2397 if (f
[DIFF_RIGHT
] == NULL
)
2399 dview_fclose (f
[DIFF_LEFT
]);
2403 else if (dsrc
== DATA_SRC_ORG
)
2405 f
[DIFF_LEFT
] = dview_fopen (file1
, O_RDONLY
);
2406 if (f
[DIFF_LEFT
] == NULL
)
2409 f
[DIFF_RIGHT
] = dview_fopen (file2
, O_RDONLY
);
2410 if (f
[DIFF_RIGHT
] == NULL
)
2412 dview_fclose (f
[DIFF_LEFT
]);
2417 dview
->view_quit
= FALSE
;
2420 dview
->new_frame
= TRUE
;
2421 dview
->skip_rows
= 0;
2422 dview
->skip_cols
= 0;
2423 dview
->display_symbols
= FALSE
;
2424 dview
->display_numbers
= 0;
2425 dview
->show_cr
= TRUE
;
2426 dview
->tab_size
= 8;
2427 dview
->ord
= DIFF_LEFT
;
2428 dview
->full
= FALSE
;
2430 dview
->search
.handle
= NULL
;
2431 dview
->search
.last_string
= NULL
;
2432 dview
->search
.last_found_line
= -1;
2433 dview
->search
.last_accessed_num_line
= -1;
2435 dview_load_options (dview
);
2438 dview
->file
[DIFF_LEFT
] = file1
;
2439 dview
->file
[DIFF_RIGHT
] = file2
;
2440 dview
->label
[DIFF_LEFT
] = g_strdup (label1
);
2441 dview
->label
[DIFF_RIGHT
] = g_strdup (label2
);
2442 dview
->f
[DIFF_LEFT
] = f
[0];
2443 dview
->f
[DIFF_RIGHT
] = f
[1];
2444 dview
->merged
[DIFF_LEFT
] = FALSE
;
2445 dview
->merged
[DIFF_RIGHT
] = FALSE
;
2446 dview
->hdiff
= NULL
;
2449 dview
->converter
= str_cnv_from_term
;
2450 dview_set_codeset (dview
);
2452 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2453 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2454 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2455 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2460 /* --------------------------------------------------------------------------------------------- */
2463 dview_fini (WDiff
*dview
)
2465 if (dview
->dsrc
!= DATA_SRC_MEM
)
2467 dview_fclose (dview
->f
[DIFF_RIGHT
]);
2468 dview_fclose (dview
->f
[DIFF_LEFT
]);
2472 if (dview
->converter
!= str_cnv_from_term
)
2473 str_close_conv (dview
->converter
);
2476 destroy_hdiff (dview
);
2477 if (dview
->a
[DIFF_LEFT
] != NULL
)
2479 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2480 dview
->a
[DIFF_LEFT
] = NULL
;
2482 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2484 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2485 dview
->a
[DIFF_RIGHT
] = NULL
;
2488 g_free (dview
->label
[DIFF_LEFT
]);
2489 g_free (dview
->label
[DIFF_RIGHT
]);
2492 /* --------------------------------------------------------------------------------------------- */
2495 dview_display_file (const WDiff
*dview
, diff_place_t ord
, int r
, int c
, int height
, int width
)
2500 FBUF
*f
= dview
->f
[ord
];
2501 int skip
= dview
->skip_cols
;
2502 gboolean display_symbols
= dview
->display_symbols
;
2503 int display_numbers
= dview
->display_numbers
;
2504 gboolean show_cr
= dview
->show_cr
;
2507 int nwidth
= display_numbers
;
2510 xwidth
= display_numbers
;
2511 if (display_symbols
)
2513 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2514 tab_size
= dview
->tab_size
;
2518 if (xwidth
> width
&& display_symbols
)
2521 display_symbols
= FALSE
;
2523 if (xwidth
> width
&& display_numbers
!= 0)
2526 display_numbers
= width
;
2536 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2538 /* abnormal, but avoid buffer overflow */
2542 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2549 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2551 tty_setcolor (NORMAL_COLOR
);
2552 if (display_symbols
)
2554 tty_gotoyx (r
+ j
, c
- 2);
2555 tty_print_char (ch
);
2559 if (display_numbers
!= 0)
2561 tty_gotoyx (r
+ j
, c
- xwidth
);
2562 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2563 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2566 tty_setcolor (DFF_ADD_COLOR
);
2568 tty_setcolor (DFF_CHG_COLOR
);
2571 if (i
== (size_t) dview
->search
.last_found_line
)
2572 tty_setcolor (MARKED_SELECTED_COLOR
);
2573 else if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2579 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2584 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2585 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2586 tty_gotoyx (r
+ j
, c
);
2589 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2598 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2600 cnt
+= ch_length
- 1;
2601 if (!g_unichar_isprint (next_ch
))
2606 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2610 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2612 if (mc_global
.utf8_display
)
2617 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2621 else if (dview
->utf8
)
2622 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2624 next_ch
= convert_to_display_c (next_ch
);
2626 tty_print_anychar (next_ch
);
2634 tty_setcolor (DFF_CHH_COLOR
);
2638 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2642 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2645 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2649 if (display_numbers
!= 0)
2651 tty_gotoyx (r
+ j
, c
- xwidth
);
2652 fill_by_space (buf
, display_numbers
, TRUE
);
2653 tty_print_string (buf
);
2656 tty_setcolor (DFF_DEL_COLOR
);
2658 tty_setcolor (DFF_CHD_COLOR
);
2659 fill_by_space (buf
, width
, TRUE
);
2661 tty_gotoyx (r
+ j
, c
);
2662 /* tty_print_nstring (buf, width); */
2664 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2673 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2675 cnt
+= ch_length
- 1;
2676 if (!g_unichar_isprint (next_ch
))
2681 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2686 if (mc_global
.utf8_display
)
2690 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2692 else if (dview
->utf8
)
2693 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2695 next_ch
= convert_to_display_c (next_ch
);
2698 tty_print_anychar (next_ch
);
2703 tty_setcolor (NORMAL_COLOR
);
2705 if (width
< xwidth
- 1)
2707 fill_by_space (buf
, k
, TRUE
);
2708 for (; j
< height
; j
++)
2712 tty_gotoyx (r
+ j
, c
- xwidth
);
2713 /* tty_print_nstring (buf, xwidth - 1); */
2714 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2716 tty_gotoyx (r
+ j
, c
);
2717 /* tty_print_nstring (buf, width); */
2718 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2724 /* --------------------------------------------------------------------------------------------- */
2727 dview_status (const WDiff
*dview
, diff_place_t ord
, int width
, int c
)
2731 int linenum
, lineofs
;
2735 tty_setcolor (STATUSBAR_COLOR
);
2738 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2740 filename_width
= width
- 24;
2741 if (filename_width
< 8)
2744 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2745 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2746 vfs_path_free (vpath
, TRUE
);
2747 buf
= str_term_trim (path
, filename_width
);
2748 if (ord
== DIFF_LEFT
)
2749 tty_printf ("%s%-*s %6d+%-4d Col %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2750 buf
, linenum
, lineofs
, dview
->skip_cols
);
2752 tty_printf ("%s%-*s %6d+%-4d Dif %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2753 buf
, linenum
, lineofs
, dview
->ndiff
);
2757 /* --------------------------------------------------------------------------------------------- */
2760 dview_redo (WDiff
*dview
)
2762 if (dview
->display_numbers
!= 0)
2766 old
= dview
->display_numbers
;
2767 dview
->display_numbers
= calc_nwidth ((const GArray
* const *) dview
->a
);
2768 dview
->new_frame
= (old
!= dview
->display_numbers
);
2770 dview_reread (dview
);
2773 /* --------------------------------------------------------------------------------------------- */
2776 dview_update (WDiff
*dview
)
2778 int height
= dview
->height
;
2782 last
= dview
->a
[DIFF_LEFT
]->len
- 1;
2784 if (dview
->skip_rows
> last
)
2785 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
2786 if (dview
->skip_rows
< 0)
2787 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
2788 if (dview
->skip_cols
< 0)
2789 dview
->skip_cols
= 0;
2794 /* use an actual length of dview->a */
2795 if (dview
->display_numbers
!= 0)
2796 dview
->display_numbers
= calc_nwidth ((const GArray
* const *) dview
->a
);
2798 width1
= dview
->half1
+ dview
->bias
;
2799 width2
= dview
->half2
- dview
->bias
;
2806 if (dview
->new_frame
)
2810 tty_setcolor (NORMAL_COLOR
);
2811 xwidth
= dview
->display_numbers
;
2812 if (dview
->display_symbols
)
2815 tty_draw_box (1, 0, height
, width1
, FALSE
);
2817 tty_draw_box (1, width1
, height
, width2
, FALSE
);
2822 if (xwidth
< width1
- 1)
2824 tty_gotoyx (1, xwidth
);
2825 tty_print_alt_char (ACS_TTEE
, FALSE
);
2826 tty_gotoyx (height
, xwidth
);
2827 tty_print_alt_char (ACS_BTEE
, FALSE
);
2828 tty_draw_vline (2, xwidth
, ACS_VLINE
, height
- 2);
2830 if (xwidth
< width2
- 1)
2832 tty_gotoyx (1, width1
+ xwidth
);
2833 tty_print_alt_char (ACS_TTEE
, FALSE
);
2834 tty_gotoyx (height
, width1
+ xwidth
);
2835 tty_print_alt_char (ACS_BTEE
, FALSE
);
2836 tty_draw_vline (2, width1
+ xwidth
, ACS_VLINE
, height
- 2);
2839 dview
->new_frame
= FALSE
;
2844 dview_status (dview
, dview
->ord
, width1
, 0);
2845 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
2851 ord
= dview
->ord
== DIFF_LEFT
? DIFF_RIGHT
: DIFF_LEFT
;
2852 dview_status (dview
, ord
, width2
, width1
);
2853 dview_display_file (dview
, ord
, 2, width1
+ 1, height
- 2, width2
- 2);
2857 /* --------------------------------------------------------------------------------------------- */
2860 dview_edit (WDiff
*dview
, diff_place_t ord
)
2864 int linenum
, lineofs
;
2866 if (dview
->dsrc
== DATA_SRC_TMP
)
2868 error_dialog (_("Edit"), _("Edit is disabled"));
2872 h
= WIDGET (WIDGET (dview
)->owner
);
2873 h_modal
= widget_get_state (h
, WST_MODAL
);
2875 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2877 /* disallow edit file in several editors */
2878 widget_set_state (h
, WST_MODAL
, TRUE
);
2881 vfs_path_t
*tmp_vpath
;
2883 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2884 edit_file_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2885 vfs_path_free (tmp_vpath
, TRUE
);
2888 widget_set_state (h
, WST_MODAL
, h_modal
);
2890 dview_update (dview
);
2893 /* --------------------------------------------------------------------------------------------- */
2896 dview_goto_cmd (WDiff
*dview
, diff_place_t ord
)
2898 static gboolean first_run
= TRUE
;
2901 static const char *title
[2] = {
2902 N_("Goto line (left)"),
2903 N_("Goto line (right)")
2911 input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
,
2912 first_run
? NULL
: INPUT_LAST_TEXT
, INPUT_COMPLETE_NONE
);
2915 const char *s
= input
;
2917 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2922 for (; i
< dview
->a
[ord
]->len
; i
++)
2926 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2927 if (p
->line
== newline
)
2931 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2940 /* --------------------------------------------------------------------------------------------- */
2943 dview_labels (WDiff
*dview
)
2945 Widget
*d
= WIDGET (dview
);
2948 b
= buttonbar_find (DIALOG (d
->owner
));
2950 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), d
->keymap
, d
);
2951 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), d
->keymap
, d
);
2952 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), d
->keymap
, d
);
2953 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), d
->keymap
, d
);
2954 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), d
->keymap
, d
);
2955 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), d
->keymap
, d
);
2956 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), d
->keymap
, d
);
2959 /* --------------------------------------------------------------------------------------------- */
2962 dview_save (WDiff
*dview
)
2964 gboolean res
= TRUE
;
2966 if (dview
->merged
[DIFF_LEFT
])
2968 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
2969 dview
->merged
[DIFF_LEFT
] = !res
;
2971 if (dview
->merged
[DIFF_RIGHT
])
2973 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
2974 dview
->merged
[DIFF_RIGHT
] = !res
;
2979 /* --------------------------------------------------------------------------------------------- */
2982 dview_do_save (WDiff
*dview
)
2984 (void) dview_save (dview
);
2987 /* --------------------------------------------------------------------------------------------- */
2990 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2994 dview_ok_to_exit (WDiff
*dview
)
2996 gboolean res
= TRUE
;
2999 if (!dview
->merged
[DIFF_LEFT
] && !dview
->merged
[DIFF_RIGHT
])
3002 act
= query_dialog (_("Quit"), !mc_global
.midnight_shutdown
?
3003 _("File(s) was modified. Save with exit?") :
3004 _("Midnight Commander is being shut down.\nSave modified file(s)?"),
3005 D_NORMAL
, 2, _("&Yes"), _("&No"));
3008 if (mc_global
.midnight_shutdown
|| (act
== -1))
3017 (void) dview_save (dview
);
3021 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~"))
3022 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
3023 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~"))
3024 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
3033 /* --------------------------------------------------------------------------------------------- */
3036 dview_execute_cmd (WDiff
*dview
, long command
)
3038 cb_ret_t res
= MSG_HANDLED
;
3042 case CK_ShowSymbols
:
3043 dview
->display_symbols
= !dview
->display_symbols
;
3044 dview
->new_frame
= TRUE
;
3046 case CK_ShowNumbers
:
3047 dview
->display_numbers
^= calc_nwidth ((const GArray
* const *) dview
->a
);
3048 dview
->new_frame
= TRUE
;
3051 dview
->full
= !dview
->full
;
3052 dview
->new_frame
= TRUE
;
3058 dview
->new_frame
= TRUE
;
3064 dview_compute_split (dview
, 1);
3065 dview
->new_frame
= TRUE
;
3072 dview_compute_split (dview
, -1);
3073 dview
->new_frame
= TRUE
;
3077 dview
->tab_size
= 2;
3080 dview
->tab_size
= 3;
3083 dview
->tab_size
= 4;
3086 dview
->tab_size
= 8;
3095 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3096 find_next_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3099 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3100 find_prev_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3103 dview_goto_cmd (dview
, DIFF_RIGHT
);
3106 dview_edit (dview
, dview
->ord
);
3109 do_merge_hunk (dview
, FROM_LEFT_TO_RIGHT
);
3113 do_merge_hunk (dview
, FROM_RIGHT_TO_LEFT
);
3117 dview_edit (dview
, dview
->ord
^ 1);
3120 dview_search_cmd (dview
);
3122 case CK_SearchContinue
:
3123 dview_continue_search_cmd (dview
);
3126 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3129 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[DIFF_LEFT
]->len
- 1;
3132 if (dview
->skip_rows
> 0)
3135 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3140 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3143 if (dview
->height
> 2)
3145 dview
->skip_rows
+= dview
->height
- 2;
3146 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3150 if (dview
->height
> 2)
3152 dview
->skip_rows
-= dview
->height
- 2;
3153 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3163 dview
->skip_cols
-= 8;
3166 dview
->skip_cols
+= 8;
3169 dview
->skip_cols
= 0;
3175 dview
->view_quit
= TRUE
;
3178 dview_do_save (dview
);
3181 dview_diff_options (dview
);
3184 case CK_SelectCodepage
:
3185 dview_select_encoding (dview
);
3189 /* don't close diffviewer due to SIGINT */
3192 res
= MSG_NOT_HANDLED
;
3197 /* --------------------------------------------------------------------------------------------- */
3200 dview_handle_key (WDiff
*dview
, int key
)
3205 key
= convert_from_input_c (key
);
3208 command
= widget_lookup_key (WIDGET (dview
), key
);
3209 if (command
== CK_IgnoreKey
)
3210 return MSG_NOT_HANDLED
;
3212 return dview_execute_cmd (dview
, command
);
3215 /* --------------------------------------------------------------------------------------------- */
3218 dview_callback (Widget
*w
, Widget
*sender
, widget_msg_t msg
, int parm
, void *data
)
3220 WDiff
*dview
= (WDiff
*) w
;
3221 WDialog
*h
= DIALOG (w
->owner
);
3227 dview_labels (dview
);
3228 dview_update (dview
);
3232 dview
->new_frame
= TRUE
;
3233 dview_update (dview
);
3237 i
= dview_handle_key (dview
, parm
);
3238 if (dview
->view_quit
)
3241 dview_update (dview
);
3245 i
= dview_execute_cmd (dview
, parm
);
3246 if (dview
->view_quit
)
3249 dview_update (dview
);
3253 widget_default_callback (w
, NULL
, MSG_RESIZE
, 0, data
);
3254 dview_compute_areas (dview
);
3258 dview_save_options (dview
);
3263 return widget_default_callback (w
, sender
, msg
, parm
, data
);
3267 /* --------------------------------------------------------------------------------------------- */
3270 dview_mouse_callback (Widget
*w
, mouse_msg_t msg
, mouse_event_t
*event
)
3272 WDiff
*dview
= (WDiff
*) w
;
3278 case MSG_MOUSE_SCROLL_UP
:
3279 case MSG_MOUSE_SCROLL_DOWN
:
3280 if (msg
== MSG_MOUSE_SCROLL_UP
)
3281 dview
->skip_rows
-= 2;
3283 dview
->skip_rows
+= 2;
3285 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3286 dview_update (dview
);
3294 /* --------------------------------------------------------------------------------------------- */
3297 dview_dialog_callback (Widget
*w
, Widget
*sender
, widget_msg_t msg
, int parm
, void *data
)
3300 WDialog
*h
= DIALOG (w
);
3305 /* Handle shortcuts. */
3307 /* Note: the buttonbar sends messages directly to the the WDiff, not to
3308 * here, which is why we can pass NULL in the following call. */
3309 return dview_execute_cmd (NULL
, parm
);
3312 dview
= (WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3313 /* don't stop the dialog before final decision */
3314 widget_set_state (w
, WST_ACTIVE
, TRUE
);
3315 if (dview_ok_to_exit (dview
))
3320 return dlg_default_callback (w
, sender
, msg
, parm
, data
);
3324 /* --------------------------------------------------------------------------------------------- */
3327 dview_get_title (const WDialog
*h
, size_t len
)
3330 const char *modified
= " (*) ";
3331 const char *notmodified
= " ";
3335 dview
= (const WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3336 len1
= (len
- str_term_width1 (_("Diff:")) - strlen (modified
) - 3) / 2;
3338 title
= g_string_sized_new (len
);
3339 g_string_append (title
, _("Diff:"));
3340 g_string_append (title
, dview
->merged
[DIFF_LEFT
] ? modified
: notmodified
);
3341 g_string_append (title
, str_term_trim (dview
->label
[DIFF_LEFT
], len1
));
3342 g_string_append (title
, " | ");
3343 g_string_append (title
, dview
->merged
[DIFF_RIGHT
] ? modified
: notmodified
);
3344 g_string_append (title
, str_term_trim (dview
->label
[DIFF_RIGHT
], len1
));
3346 return g_string_free (title
, FALSE
);
3349 /* --------------------------------------------------------------------------------------------- */
3352 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3362 /* Create dialog and widgets, put them on the dialog */
3364 dlg_create (FALSE
, 0, 0, 1, 1, WPOS_FULLSCREEN
, FALSE
, NULL
, dview_dialog_callback
, NULL
,
3365 "[Diff Viewer]", NULL
);
3366 dw
= WIDGET (dview_dlg
);
3367 widget_want_tab (dw
, TRUE
);
3370 g
= GROUP (dview_dlg
);
3372 dview
= g_new0 (WDiff
, 1);
3375 widget_init (w
, &r
, dview_callback
, dview_mouse_callback
);
3376 w
->options
|= WOP_SELECTABLE
;
3377 w
->keymap
= diff_map
;
3378 group_add_widget_autopos (g
, w
, WPOS_KEEP_ALL
, NULL
);
3380 w
= WIDGET (buttonbar_new ());
3381 group_add_widget_autopos (g
, w
, w
->pos_flags
, NULL
);
3383 dview_dlg
->get_title
= dview_get_title
;
3385 error
= dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); /* XXX binary diff? */
3387 error
= redo_diff (dview
);
3390 dview
->ndiff
= error
;
3391 dview_compute_areas (dview
);
3396 dlg_run (dview_dlg
);
3398 if (error
!= 0 || widget_get_state (dw
, WST_CLOSED
))
3399 widget_destroy (dw
);
3401 return error
== 0 ? 1 : 0;
3404 /*** public functions ****************************************************************************/
3405 /* --------------------------------------------------------------------------------------------- */
3407 #define GET_FILE_AND_STAMP(n) \
3411 real_file##n = file##n; \
3412 if (!vfs_file_is_local (file##n)) \
3414 real_file##n = mc_getlocalcopy (file##n); \
3415 if (real_file##n != NULL) \
3418 if (mc_stat (real_file##n, &st##n) != 0) \
3425 #define UNGET_FILE(n) \
3428 if (use_copy##n != 0) \
3430 gboolean changed = FALSE; \
3431 if (use_copy##n > 0) \
3434 mtime = st##n.st_mtime; \
3435 if (mc_stat (real_file##n, &st##n) == 0) \
3436 changed = (mtime != st##n.st_mtime); \
3438 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3439 vfs_path_free (real_file##n, TRUE); \
3445 dview_diff_cmd (const void *f0
, const void *f1
)
3448 vfs_path_t
*file0
= NULL
;
3449 vfs_path_t
*file1
= NULL
;
3450 gboolean is_dir0
= FALSE
;
3451 gboolean is_dir1
= FALSE
;
3453 switch (mc_global
.mc_run_mode
)
3457 /* run from panels */
3458 const WPanel
*panel0
= (const WPanel
*) f0
;
3459 const WPanel
*panel1
= (const WPanel
*) f1
;
3460 const file_entry_t
*fe0
, *fe1
;
3462 fe0
= panel_current_entry (panel0
);
3463 file0
= vfs_path_append_new (panel0
->cwd_vpath
, fe0
->fname
->str
, (char *) NULL
);
3464 is_dir0
= S_ISDIR (fe0
->st
.st_mode
);
3467 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3468 path_trunc (fe0
->fname
->str
, 30));
3472 fe1
= panel_current_entry (panel1
);
3473 file1
= vfs_path_append_new (panel1
->cwd_vpath
, fe1
->fname
->str
, (char *) NULL
);
3474 is_dir1
= S_ISDIR (fe1
->st
.st_mode
);
3477 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3478 path_trunc (fe1
->fname
->str
, 30));
3484 case MC_RUN_DIFFVIEWER
:
3486 /* run from command line */
3487 const char *p0
= (const char *) f0
;
3488 const char *p1
= (const char *) f1
;
3491 file0
= vfs_path_from_str (p0
);
3492 if (mc_stat (file0
, &st
) == 0)
3494 is_dir0
= S_ISDIR (st
.st_mode
);
3497 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p0
, 30));
3503 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3504 path_trunc (p0
, 30), unix_error_string (errno
));
3508 file1
= vfs_path_from_str (p1
);
3509 if (mc_stat (file1
, &st
) == 0)
3511 is_dir1
= S_ISDIR (st
.st_mode
);
3514 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p1
, 30));
3520 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3521 path_trunc (p1
, 30), unix_error_string (errno
));
3528 /* this should not happened */
3529 message (D_ERROR
, MSG_ERROR
, _("Diff viewer: invalid mode"));
3536 if (file0
!= NULL
&& file1
!= NULL
)
3538 int use_copy0
, use_copy1
;
3539 struct stat st0
, st1
;
3540 vfs_path_t
*real_file0
, *real_file1
;
3542 GET_FILE_AND_STAMP (0);
3543 GET_FILE_AND_STAMP (1);
3545 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3546 rv
= diff_view (vfs_path_as_str (real_file0
), vfs_path_as_str (real_file1
),
3547 vfs_path_as_str (file0
), vfs_path_as_str (file1
));
3555 message (D_ERROR
, MSG_ERROR
, _("Two files are needed to compare"));
3558 vfs_path_free (file1
, TRUE
);
3559 vfs_path_free (file0
, TRUE
);
3564 #undef GET_FILE_AND_STAMP
3567 /* --------------------------------------------------------------------------------------------- */