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
,
810 static const char *opt
=
811 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
812 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
813 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
814 " --unchanged-group-format=''";
820 char *file1_esc
, *file2_esc
;
822 /* escape potential $ to avoid shell variable substitutions in popen() */
823 file1_esc
= str_shell_escape (file1
);
824 file2_esc
= str_shell_escape (file2
);
825 cmd
= g_strdup_printf ("diff %s %s %s %s %s", args
, extra
, opt
, file1_esc
, file2_esc
);
832 f
= dview_popen (cmd
, O_RDONLY
);
838 rv
= scan_diff (f
, ops
);
839 code
= dview_pclose (f
);
841 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
847 /* --------------------------------------------------------------------------------------------- */
850 printer_for (char ch
, DFUNC printer
, void *ctx
, FBUF
* f
, int *line
, off_t
* off
)
855 sz
= dview_fgets (buf
, sizeof (buf
), f
);
860 printer (ctx
, ch
, *line
, *off
, sz
, buf
);
863 while (buf
[sz
- 1] != '\n')
865 sz
= dview_fgets (buf
, sizeof (buf
), f
);
868 printer (ctx
, 0, 0, 0, 1, "\n");
872 printer (ctx
, 0, 0, 0, sz
, buf
);
879 /* --------------------------------------------------------------------------------------------- */
882 * Reparse and display file according to diff statements.
884 * @param ord DIFF_LEFT if 1st file is displayed , DIFF_RIGHT if 2nd file is displayed.
885 * @param filename file name to display
886 * @param ops list of diff statements
887 * @param printer printf-like function to be used for displaying
888 * @param ctx printer context
890 * @return 0 if success, otherwise non-zero
894 dff_reparse (diff_place_t ord
, const char *filename
, const GArray
* ops
, DFUNC printer
, void *ctx
)
902 int add_cmd
, del_cmd
;
904 f
= dview_fopen (filename
, O_RDONLY
);
908 if (ord
!= DIFF_LEFT
)
912 if (ord
!= DIFF_LEFT
)
924 #define T1 a[ ord^1 ][0]
925 #define T2 a[ ord^1 ][1]
926 for (i
= 0; i
< ops
->len
; i
++)
930 op
= &g_array_index (ops
, DIFFCMD
, i
);
933 if (op
->cmd
!= add_cmd
)
936 while (line
< n
&& printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
942 if (op
->cmd
== add_cmd
)
943 for (n
= op
->T2
- op
->T1
+ 1; n
!= 0; n
--)
944 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
946 if (op
->cmd
== del_cmd
)
948 for (n
= op
->F2
- op
->F1
+ 1;
949 n
!= 0 && printer_for (ADD_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
958 for (n
= op
->F2
- op
->F1
+ 1;
959 n
!= 0 && printer_for (CHG_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
965 for (n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
); n
> 0; n
--)
966 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
974 while (printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
985 /* --------------------------------------------------------------------------------------------- */
987 /* horizontal diff ********************************************************** */
990 * Longest common substring.
992 * @param s first string
993 * @param m length of first string
994 * @param t second string
995 * @param n length of second string
996 * @param ret list of offsets for longest common substrings inside each string
997 * @param min minimum length of common substrings
999 * @return 0 if success, nonzero otherwise
1003 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
* ret
, int min
)
1009 if (m
< min
|| n
< min
)
1011 /* XXX early culling */
1015 Lprev
= g_try_new0 (int, n
+ 1);
1019 Lcurr
= g_try_new0 (int, n
+ 1);
1026 for (i
= 0; i
< m
; i
++)
1033 #ifdef USE_MEMSET_IN_LCS
1034 memset (Lcurr
, 0, (n
+ 1) * sizeof (*Lcurr
));
1036 for (j
= 0; j
< n
; j
++)
1038 #ifndef USE_MEMSET_IN_LCS
1050 g_array_set_size (ret
, 0);
1052 if (z
== v
&& z
>= min
)
1060 for (k
= 0; k
< ret
->len
; k
++)
1062 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1063 if ((*p
)[0] == off0
|| (*p
)[1] >= off1
)
1072 g_array_append_val (ret
, p2
);
1084 /* --------------------------------------------------------------------------------------------- */
1087 * Scan recursively for common substrings and build ranges.
1089 * @param s first string
1090 * @param t second string
1091 * @param bracket current limits for both of the strings
1092 * @param min minimum length of common substrings
1093 * @param hdiff list of horizontal diff ranges to fill
1094 * @param depth recursion depth
1096 * @return 0 if success, nonzero otherwise
1100 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
* hdiff
,
1111 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1113 len
= lcsubstr (s
+ bracket
[DIFF_LEFT
].off
, bracket
[DIFF_LEFT
].len
,
1114 t
+ bracket
[DIFF_RIGHT
].off
, bracket
[DIFF_RIGHT
].len
, ret
, min
);
1118 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1121 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1122 b
[DIFF_LEFT
].len
= (*data
)[0];
1123 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1124 b
[DIFF_RIGHT
].len
= (*data
)[1];
1125 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1128 for (k
= 0; k
< ret
->len
- 1; k
++)
1130 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1131 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1132 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1133 b
[DIFF_LEFT
].len
= (*data2
)[0] - (*data
)[0] - len
;
1134 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1135 b
[DIFF_RIGHT
].len
= (*data2
)[1] - (*data
)[1] - len
;
1136 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1139 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1140 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1141 b
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
- (*data
)[0] - len
;
1142 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1143 b
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
- (*data
)[1] - len
;
1144 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1147 g_array_free (ret
, TRUE
);
1152 p
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1153 p
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
;
1154 p
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1155 p
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
;
1156 g_array_append_val (hdiff
, p
);
1161 /* --------------------------------------------------------------------------------------------- */
1164 * Build list of horizontal diff ranges.
1166 * @param s first string
1167 * @param m length of first string
1168 * @param t second string
1169 * @param n length of second string
1170 * @param min minimum length of common substrings
1171 * @param hdiff list of horizontal diff ranges to fill
1172 * @param depth recursion depth
1174 * @return 0 if success, nonzero otherwise
1178 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
* hdiff
, unsigned int depth
)
1183 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1184 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1186 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1189 b
[DIFF_LEFT
].off
= i
;
1190 b
[DIFF_LEFT
].len
= m
- i
;
1191 b
[DIFF_RIGHT
].off
= i
;
1192 b
[DIFF_RIGHT
].len
= n
- i
;
1194 /* smartscan (multiple horizontal diff) */
1195 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1198 /* --------------------------------------------------------------------------------------------- */
1200 /* read line **************************************************************** */
1203 * Check if character is inside horizontal diff limits.
1205 * @param k rank of character inside line
1206 * @param hdiff horizontal diff structure
1207 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1209 * @return TRUE if inside hdiff limits, FALSE otherwise
1213 is_inside (int k
, GArray
* hdiff
, diff_place_t ord
)
1218 for (i
= 0; i
< hdiff
->len
; i
++)
1222 b
= &g_array_index (hdiff
, BRACKET
, i
);
1223 start
= (*b
)[ord
].off
;
1224 end
= start
+ (*b
)[ord
].len
;
1225 if (k
>= start
&& k
< end
)
1231 /* --------------------------------------------------------------------------------------------- */
1234 * Copy 'src' to 'dst' expanding tabs.
1235 * @note The procedure returns when all bytes are consumed from 'src'
1237 * @param dst destination buffer
1238 * @param src source buffer
1239 * @param srcsize size of src buffer
1240 * @param base virtual base of this string, needed to calculate tabs
1241 * @param ts tab size
1243 * @return new virtual base
1247 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1251 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1258 j
= TAB_SKIP (ts
, i
+ base
);
1260 fill_by_space (dst
, j
, FALSE
);
1267 /* --------------------------------------------------------------------------------------------- */
1270 * Copy 'src' to 'dst' expanding tabs.
1272 * @param dst destination buffer
1273 * @param dstsize size of dst buffer
1274 * @param[in,out] _src source buffer
1275 * @param srcsize size of src buffer
1276 * @param base virtual base of this string, needed to calculate tabs
1277 * @param ts tab size
1279 * @return new virtual base
1281 * @note The procedure returns when all bytes are consumed from 'src'
1282 * or 'dstsize' bytes are written to 'dst'
1283 * @note Upon return, 'src' points to the first unwritten character in source
1287 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1290 const char *src
= *_src
;
1292 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1299 j
= TAB_SKIP (ts
, i
+ base
);
1300 if (j
> dstsize
- i
)
1303 fill_by_space (dst
, j
, FALSE
);
1311 /* --------------------------------------------------------------------------------------------- */
1314 * Read line from memory, converting tabs to spaces and padding with spaces.
1316 * @param src buffer to read from
1317 * @param srcsize size of src buffer
1318 * @param dst buffer to read to
1319 * @param dstsize size of dst buffer, excluding trailing null
1320 * @param skip number of characters to skip
1321 * @param ts tab size
1322 * @param show_cr show trailing carriage return as ^M
1324 * @return negative on error, otherwise number of bytes except padding
1328 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1339 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1345 j
= TAB_SKIP (ts
, i
+ base
);
1351 else if (dstsize
!= 0)
1358 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1360 if (skip
== 0 && show_cr
)
1382 (void) dview_get_utf (src
, &ch
, &ch_length
);
1385 skip
+= ch_length
- 1;
1399 fill_by_space (dst
, dstsize
, TRUE
);
1404 /* --------------------------------------------------------------------------------------------- */
1407 * Read line from memory and build attribute array.
1409 * @param src buffer to read from
1410 * @param srcsize size of src buffer
1411 * @param dst buffer to read to
1412 * @param dstsize size of dst buffer, excluding trailing null
1413 * @param skip number of characters to skip
1414 * @param ts tab size
1415 * @param show_cr show trailing carriage return as ^M
1416 * @param hdiff horizontal diff structure
1417 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1418 * @param att buffer of attributes
1420 * @return negative on error, otherwise number of bytes except padding
1424 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1425 gboolean show_cr
, GArray
* hdiff
, diff_place_t ord
, char *att
)
1435 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1441 j
= TAB_SKIP (ts
, i
+ base
);
1447 else if (dstsize
!= 0)
1450 *att
++ = is_inside (k
, hdiff
, ord
);
1455 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1457 if (skip
== 0 && show_cr
)
1462 *att
++ = is_inside (k
, hdiff
, ord
);
1464 *att
++ = is_inside (k
, hdiff
, ord
);
1470 *att
++ = is_inside (k
, hdiff
, ord
);
1482 (void) dview_get_utf (src
, &ch
, &ch_length
);
1484 skip
+= ch_length
- 1;
1492 *att
++ = is_inside (k
, hdiff
, ord
);
1499 memset (att
, '\0', dstsize
);
1500 fill_by_space (dst
, dstsize
, TRUE
);
1505 /* --------------------------------------------------------------------------------------------- */
1508 * Read line from file, converting tabs to spaces and padding with spaces.
1510 * @param f file stream to read from
1511 * @param off offset of line inside file
1512 * @param dst buffer to read to
1513 * @param dstsize size of dst buffer, excluding trailing null
1514 * @param skip number of characters to skip
1515 * @param ts tab size
1516 * @param show_cr show trailing carriage return as ^M
1518 * @return negative on error, otherwise number of bytes except padding
1522 cvt_fget (FBUF
* f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, gboolean show_cr
)
1525 int old_base
= base
;
1526 size_t amount
= dstsize
;
1527 size_t useful
, offset
;
1531 const char *q
= NULL
;
1532 char tmp
[BUFSIZ
]; /* XXX capacity must be >= MAX{dstsize + 1, amount} */
1533 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1535 if (sizeof (tmp
) < amount
|| sizeof (tmp
) <= dstsize
|| sizeof (cvt
) < 8 * amount
)
1537 /* abnormal, but avoid buffer overflow */
1538 fill_by_space (dst
, dstsize
, TRUE
);
1542 dview_fseek (f
, off
, SEEK_SET
);
1547 sz
= dview_fgets (tmp
, amount
, f
);
1551 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1552 if (cvt
[base
- old_base
- 1] == '\n')
1554 q
= &cvt
[base
- old_base
- 1];
1555 base
= old_base
+ q
- cvt
+ 1;
1562 fill_by_space (dst
, dstsize
, TRUE
);
1566 useful
= base
- skip
;
1567 offset
= skip
- old_base
;
1569 if (useful
<= dstsize
)
1572 memmove (dst
, cvt
+ offset
, useful
);
1576 sz
= dview_fgets (tmp
, dstsize
- useful
+ 1, f
);
1579 const char *ptr
= tmp
;
1581 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1590 memmove (dst
, cvt
+ offset
, dstsize
);
1592 lastch
= cvt
[offset
+ dstsize
];
1596 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1597 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1601 if (i
+ 1 < dstsize
)
1612 fill_by_space (dst
, dstsize
, TRUE
);
1617 /* --------------------------------------------------------------------------------------------- */
1618 /* diff printers et al ****************************************************** */
1621 cc_free_elt (gpointer elt
)
1623 DIFFLN
*p
= (DIFFLN
*) elt
;
1629 /* --------------------------------------------------------------------------------------------- */
1632 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1634 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1635 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1645 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1647 if (sz
!= 0 && str
[sz
- 1] == '\n')
1650 p
.p
= g_strndup (str
, sz
);
1653 g_array_append_val (a
, p
);
1655 else if (dsrc
== DATA_SRC_MEM
)
1659 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1660 if (sz
!= 0 && str
[sz
- 1] == '\n')
1667 new_size
= p
->u
.len
+ sz
;
1668 q
= g_realloc (p
->p
, new_size
);
1669 memcpy (q
+ p
->u
.len
, str
, sz
);
1674 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1676 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1677 dview_fwrite (f
, str
, sz
);
1682 /* --------------------------------------------------------------------------------------------- */
1685 redo_diff (WDiff
* dview
)
1687 FBUF
*const *f
= dview
->f
;
1692 char extra
[BUF_MEDIUM
];
1695 if (dview
->opt
.quality
== 2)
1696 strcat (extra
, " -d");
1697 if (dview
->opt
.quality
== 1)
1698 strcat (extra
, " --speed-large-files");
1699 if (dview
->opt
.strip_trailing_cr
)
1700 strcat (extra
, " --strip-trailing-cr");
1701 if (dview
->opt
.ignore_tab_expansion
)
1702 strcat (extra
, " -E");
1703 if (dview
->opt
.ignore_space_change
)
1704 strcat (extra
, " -b");
1705 if (dview
->opt
.ignore_all_space
)
1706 strcat (extra
, " -w");
1707 if (dview
->opt
.ignore_case
)
1708 strcat (extra
, " -i");
1710 if (dview
->dsrc
!= DATA_SRC_MEM
)
1712 dview_freset (f
[DIFF_LEFT
]);
1713 dview_freset (f
[DIFF_RIGHT
]);
1716 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1717 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[DIFF_LEFT
], dview
->file
[DIFF_RIGHT
], ops
);
1721 g_array_free (ops
, TRUE
);
1725 ctx
.dsrc
= dview
->dsrc
;
1726 ctx
.a
= dview
->a
[DIFF_LEFT
];
1727 ctx
.f
= f
[DIFF_LEFT
];
1728 rv
|= dff_reparse (DIFF_LEFT
, dview
->file
[DIFF_LEFT
], ops
, printer
, &ctx
);
1730 ctx
.a
= dview
->a
[DIFF_RIGHT
];
1731 ctx
.f
= f
[DIFF_RIGHT
];
1732 rv
|= dff_reparse (DIFF_RIGHT
, dview
->file
[DIFF_RIGHT
], ops
, printer
, &ctx
);
1735 g_array_free (ops
, TRUE
);
1737 if (rv
!= 0 || dview
->a
[DIFF_LEFT
]->len
!= dview
->a
[DIFF_RIGHT
]->len
)
1740 if (dview
->dsrc
== DATA_SRC_TMP
)
1742 dview_ftrunc (f
[DIFF_LEFT
]);
1743 dview_ftrunc (f
[DIFF_RIGHT
]);
1746 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1750 dview
->hdiff
= g_ptr_array_new ();
1752 for (i
= 0; i
< dview
->a
[DIFF_LEFT
]->len
; i
++)
1758 p
= &g_array_index (dview
->a
[DIFF_LEFT
], DIFFLN
, i
);
1759 q
= &g_array_index (dview
->a
[DIFF_RIGHT
], DIFFLN
, i
);
1760 if (p
->line
!= 0 && q
->line
!= 0 && p
->ch
== CHG_CH
)
1764 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1767 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
, HDIFF_DEPTH
);
1770 g_array_free (h
, TRUE
);
1775 g_ptr_array_add (dview
->hdiff
, h
);
1781 /* --------------------------------------------------------------------------------------------- */
1784 destroy_hdiff (WDiff
* dview
)
1786 if (dview
->hdiff
!= NULL
)
1791 len
= dview
->a
[DIFF_LEFT
]->len
;
1793 for (i
= 0; i
< len
; i
++)
1797 h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1799 g_array_free (h
, TRUE
);
1801 g_ptr_array_free (dview
->hdiff
, TRUE
);
1802 dview
->hdiff
= NULL
;
1805 mc_search_free (dview
->search
.handle
);
1806 dview
->search
.handle
= NULL
;
1807 MC_PTR_FREE (dview
->search
.last_string
);
1810 /* --------------------------------------------------------------------------------------------- */
1811 /* stuff ******************************************************************** */
1814 get_digits (unsigned int n
)
1818 while ((n
/= 10) != 0)
1823 /* --------------------------------------------------------------------------------------------- */
1826 get_line_numbers (const GArray
* a
, size_t pos
, int *linenum
, int *lineofs
)
1838 p
= &g_array_index (a
, DIFFLN
, pos
);
1844 for (n
= pos
; n
> 0; n
--)
1850 *lineofs
= pos
- n
+ 1;
1858 /* --------------------------------------------------------------------------------------------- */
1861 calc_nwidth (const GArray
* const *a
)
1866 get_line_numbers (a
[DIFF_LEFT
], a
[DIFF_LEFT
]->len
- 1, &l1
, &o1
);
1867 get_line_numbers (a
[DIFF_RIGHT
], a
[DIFF_RIGHT
]->len
- 1, &l2
, &o2
);
1870 return get_digits (l1
);
1873 /* --------------------------------------------------------------------------------------------- */
1876 find_prev_hunk (const GArray
* a
, int pos
)
1879 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1881 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
--)
1883 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1885 if (pos
> 0 && (size_t) pos
< a
->len
)
1888 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
; pos
--)
1890 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
; pos
--)
1897 /* --------------------------------------------------------------------------------------------- */
1900 find_next_hunk (const GArray
* a
, size_t pos
)
1902 for (; pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1904 for (; pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
++)
1909 /* --------------------------------------------------------------------------------------------- */
1911 * Find start and end lines of the current hunk.
1913 * @param dview WDiff widget
1914 * @return boolean and
1915 * start_line1 first line of current hunk (file[0])
1916 * end_line1 last line of current hunk (file[0])
1917 * start_line1 first line of current hunk (file[0])
1918 * end_line1 last line of current hunk (file[0])
1922 get_current_hunk (WDiff
* dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
1924 const GArray
*a0
= dview
->a
[DIFF_LEFT
];
1925 const GArray
*a1
= dview
->a
[DIFF_RIGHT
];
1935 pos
= dview
->skip_rows
;
1936 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
1954 for (; pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1958 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
1959 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
1962 for (pos
= dview
->skip_rows
;
1963 pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1967 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
1968 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
1970 *end_line1
= MAX (*start_line1
, l0
);
1972 *end_line2
= MAX (*start_line2
, l1
);
1978 /* --------------------------------------------------------------------------------------------- */
1980 * Remove hunk from file.
1982 * @param dview WDiff widget
1983 * @param merge_file file stream for writing data
1984 * @param from1 first line of hunk
1985 * @param to1 last line of hunk
1986 * @param merge_direction in what direction files should be merged
1990 dview_remove_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
,
1991 action_direction_t merge_direction
)
1997 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
1998 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2000 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2002 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2003 fputs (buf
, merge_file
);
2005 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2009 fputs (buf
, merge_file
);
2014 /* --------------------------------------------------------------------------------------------- */
2018 * @param dview WDiff widget
2019 * @param merge_file file stream for writing data
2020 * @param from1 first line of source hunk
2021 * @param from2 first line of destination hunk
2022 * @param to1 last line of source hunk
2023 * @param merge_direction in what direction files should be merged
2027 dview_add_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int from2
, int to2
,
2028 action_direction_t merge_direction
)
2034 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2036 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2037 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2041 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2042 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2045 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2046 fputs (buf
, merge_file
);
2047 for (line
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
;)
2051 fputs (buf
, merge_file
);
2053 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2054 fputs (buf
, merge_file
);
2060 /* --------------------------------------------------------------------------------------------- */
2062 * Replace hunk in file.
2064 * @param dview WDiff widget
2065 * @param merge_file file stream for writing data
2066 * @param from1 first line of source hunk
2067 * @param to1 last line of source hunk
2068 * @param from2 first line of destination hunk
2069 * @param to2 last line of destination hunk
2070 * @param merge_direction in what direction files should be merged
2074 dview_replace_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
, int from2
, int to2
,
2075 action_direction_t merge_direction
)
2081 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2083 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2084 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2088 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2089 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2092 for (line1
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1; line1
++)
2093 fputs (buf
, merge_file
);
2094 for (line2
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
;)
2098 fputs (buf
, merge_file
);
2100 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2104 fputs (buf
, merge_file
);
2110 /* --------------------------------------------------------------------------------------------- */
2114 * @param dview WDiff widget
2115 * @param merge_direction in what direction files should be merged
2119 do_merge_hunk (WDiff
* dview
, action_direction_t merge_direction
)
2121 int from1
, to1
, from2
, to2
;
2123 diff_place_t n_merge
= (merge_direction
== FROM_RIGHT_TO_LEFT
) ? DIFF_RIGHT
: DIFF_LEFT
;
2125 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2126 hunk
= get_current_hunk (dview
, &from2
, &to2
, &from1
, &to1
);
2128 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2134 vfs_path_t
*merge_file_name_vpath
= NULL
;
2136 if (!dview
->merged
[n_merge
])
2138 dview
->merged
[n_merge
] = mc_util_make_backup_if_possible (dview
->file
[n_merge
], "~~~");
2139 if (!dview
->merged
[n_merge
])
2141 message (D_ERROR
, MSG_ERROR
,
2142 _("Cannot create backup file\n%s%s\n%s"),
2143 dview
->file
[n_merge
], "~~~", unix_error_string (errno
));
2148 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2149 if (merge_file_fd
== -1)
2151 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2152 unix_error_string (errno
));
2156 merge_file
= fdopen (merge_file_fd
, "w");
2161 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2162 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_RIGHT_TO_LEFT
);
2164 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_LEFT_TO_RIGHT
);
2167 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2168 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_RIGHT_TO_LEFT
);
2170 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_LEFT_TO_RIGHT
);
2173 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
, merge_direction
);
2178 fflush (merge_file
);
2179 fclose (merge_file
);
2183 res
= rewrite_backup_content (merge_file_name_vpath
, dview
->file
[n_merge
]);
2186 mc_unlink (merge_file_name_vpath
);
2187 vfs_path_free (merge_file_name_vpath
, TRUE
);
2191 /* --------------------------------------------------------------------------------------------- */
2192 /* view routines and callbacks ********************************************** */
2195 dview_compute_split (WDiff
* dview
, int i
)
2198 if (dview
->bias
< 2 - dview
->half1
)
2199 dview
->bias
= 2 - dview
->half1
;
2200 if (dview
->bias
> dview
->half2
- 2)
2201 dview
->bias
= dview
->half2
- 2;
2204 /* --------------------------------------------------------------------------------------------- */
2207 dview_compute_areas (WDiff
* dview
)
2209 Widget
*w
= WIDGET (dview
);
2211 dview
->height
= w
->rect
.lines
- 1;
2212 dview
->half1
= w
->rect
.cols
/ 2;
2213 dview
->half2
= w
->rect
.cols
- dview
->half1
;
2215 dview_compute_split (dview
, 0);
2218 /* --------------------------------------------------------------------------------------------- */
2221 dview_reread (WDiff
* dview
)
2225 destroy_hdiff (dview
);
2226 if (dview
->a
[DIFF_LEFT
] != NULL
)
2227 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2228 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2229 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2231 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2232 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2233 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2234 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2236 ndiff
= redo_diff (dview
);
2238 dview
->ndiff
= ndiff
;
2241 /* --------------------------------------------------------------------------------------------- */
2245 dview_set_codeset (WDiff
* dview
)
2247 const char *encoding_id
= NULL
;
2251 get_codepage_id (mc_global
.source_codepage
>=
2252 0 ? mc_global
.source_codepage
: mc_global
.display_codepage
);
2253 if (encoding_id
!= NULL
)
2257 conv
= str_crt_conv_from (encoding_id
);
2258 if (conv
!= INVALID_CONV
)
2260 if (dview
->converter
!= str_cnv_from_term
)
2261 str_close_conv (dview
->converter
);
2262 dview
->converter
= conv
;
2264 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
2268 /* --------------------------------------------------------------------------------------------- */
2271 dview_select_encoding (WDiff
* dview
)
2273 if (do_select_codepage ())
2274 dview_set_codeset (dview
);
2275 dview_reread (dview
);
2276 tty_touch_screen ();
2279 #endif /* HAVE_CHARSET */
2281 /* --------------------------------------------------------------------------------------------- */
2284 dview_load_options (WDiff
* dview
)
2286 gboolean show_numbers
;
2289 dview
->display_symbols
=
2290 mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_symbols", FALSE
);
2291 show_numbers
= mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_numbers", FALSE
);
2293 dview
->display_numbers
= 1;
2294 tab_size
= mc_config_get_int (mc_global
.main_config
, "DiffView", "tab_size", 8);
2295 if (tab_size
> 0 && tab_size
< 9)
2296 dview
->tab_size
= tab_size
;
2298 dview
->tab_size
= 8;
2300 dview
->opt
.quality
= mc_config_get_int (mc_global
.main_config
, "DiffView", "diff_quality", 0);
2302 dview
->opt
.strip_trailing_cr
=
2303 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2304 dview
->opt
.ignore_all_space
=
2305 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2306 dview
->opt
.ignore_space_change
=
2307 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2308 dview
->opt
.ignore_tab_expansion
=
2309 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2310 dview
->opt
.ignore_case
=
2311 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case", FALSE
);
2313 dview
->new_frame
= TRUE
;
2316 /* --------------------------------------------------------------------------------------------- */
2319 dview_save_options (WDiff
* dview
)
2321 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_symbols", dview
->display_symbols
);
2322 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_numbers",
2323 dview
->display_numbers
!= 0);
2324 mc_config_set_int (mc_global
.main_config
, "DiffView", "tab_size", dview
->tab_size
);
2326 mc_config_set_int (mc_global
.main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2328 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws",
2329 dview
->opt
.strip_trailing_cr
);
2330 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space",
2331 dview
->opt
.ignore_all_space
);
2332 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change",
2333 dview
->opt
.ignore_space_change
);
2334 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion",
2335 dview
->opt
.ignore_tab_expansion
);
2336 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case",
2337 dview
->opt
.ignore_case
);
2340 /* --------------------------------------------------------------------------------------------- */
2343 dview_diff_options (WDiff
* dview
)
2345 const char *quality_str
[] = {
2347 N_("&Fastest (Assume large files)"),
2348 N_("&Minimal (Find a smaller set of change)")
2351 quick_widget_t quick_widgets
[] = {
2353 QUICK_START_GROUPBOX (N_("Diff algorithm")),
2354 QUICK_RADIO (3, (const char **) quality_str
, (int *) &dview
->opt
.quality
, NULL
),
2355 QUICK_STOP_GROUPBOX
,
2356 QUICK_START_GROUPBOX (N_("Diff extra options")),
2357 QUICK_CHECKBOX (N_("&Ignore case"), &dview
->opt
.ignore_case
, NULL
),
2358 QUICK_CHECKBOX (N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
, NULL
),
2359 QUICK_CHECKBOX (N_("Ignore &space change"), &dview
->opt
.ignore_space_change
, NULL
),
2360 QUICK_CHECKBOX (N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
, NULL
),
2361 QUICK_CHECKBOX (N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
,
2363 QUICK_STOP_GROUPBOX
,
2364 QUICK_BUTTONS_OK_CANCEL
,
2369 WRect r
= { -1, -1, 0, 56 };
2371 quick_dialog_t qdlg
= {
2372 r
, N_("Diff Options"), "[Diff Options]",
2373 quick_widgets
, NULL
, NULL
2376 if (quick_dialog (&qdlg
) != B_CANCEL
)
2377 dview_reread (dview
);
2380 /* --------------------------------------------------------------------------------------------- */
2383 dview_init (WDiff
* dview
, const char *args
, const char *file1
, const char *file2
,
2384 const char *label1
, const char *label2
, DSRC dsrc
)
2386 FBUF
*f
[DIFF_COUNT
];
2388 f
[DIFF_LEFT
] = NULL
;
2389 f
[DIFF_RIGHT
] = NULL
;
2391 if (dsrc
== DATA_SRC_TMP
)
2393 f
[DIFF_LEFT
] = dview_ftemp ();
2394 if (f
[DIFF_LEFT
] == NULL
)
2397 f
[DIFF_RIGHT
] = dview_ftemp ();
2398 if (f
[DIFF_RIGHT
] == NULL
)
2400 dview_fclose (f
[DIFF_LEFT
]);
2404 else if (dsrc
== DATA_SRC_ORG
)
2406 f
[DIFF_LEFT
] = dview_fopen (file1
, O_RDONLY
);
2407 if (f
[DIFF_LEFT
] == NULL
)
2410 f
[DIFF_RIGHT
] = dview_fopen (file2
, O_RDONLY
);
2411 if (f
[DIFF_RIGHT
] == NULL
)
2413 dview_fclose (f
[DIFF_LEFT
]);
2418 dview
->view_quit
= FALSE
;
2421 dview
->new_frame
= TRUE
;
2422 dview
->skip_rows
= 0;
2423 dview
->skip_cols
= 0;
2424 dview
->display_symbols
= FALSE
;
2425 dview
->display_numbers
= 0;
2426 dview
->show_cr
= TRUE
;
2427 dview
->tab_size
= 8;
2428 dview
->ord
= DIFF_LEFT
;
2429 dview
->full
= FALSE
;
2431 dview
->search
.handle
= NULL
;
2432 dview
->search
.last_string
= NULL
;
2433 dview
->search
.last_found_line
= -1;
2434 dview
->search
.last_accessed_num_line
= -1;
2436 dview_load_options (dview
);
2439 dview
->file
[DIFF_LEFT
] = file1
;
2440 dview
->file
[DIFF_RIGHT
] = file2
;
2441 dview
->label
[DIFF_LEFT
] = g_strdup (label1
);
2442 dview
->label
[DIFF_RIGHT
] = g_strdup (label2
);
2443 dview
->f
[DIFF_LEFT
] = f
[0];
2444 dview
->f
[DIFF_RIGHT
] = f
[1];
2445 dview
->merged
[DIFF_LEFT
] = FALSE
;
2446 dview
->merged
[DIFF_RIGHT
] = FALSE
;
2447 dview
->hdiff
= NULL
;
2450 dview
->converter
= str_cnv_from_term
;
2451 dview_set_codeset (dview
);
2453 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2454 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2455 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2456 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2461 /* --------------------------------------------------------------------------------------------- */
2464 dview_fini (WDiff
* dview
)
2466 if (dview
->dsrc
!= DATA_SRC_MEM
)
2468 dview_fclose (dview
->f
[DIFF_RIGHT
]);
2469 dview_fclose (dview
->f
[DIFF_LEFT
]);
2473 if (dview
->converter
!= str_cnv_from_term
)
2474 str_close_conv (dview
->converter
);
2477 destroy_hdiff (dview
);
2478 if (dview
->a
[DIFF_LEFT
] != NULL
)
2480 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2481 dview
->a
[DIFF_LEFT
] = NULL
;
2483 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2485 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2486 dview
->a
[DIFF_RIGHT
] = NULL
;
2489 g_free (dview
->label
[DIFF_LEFT
]);
2490 g_free (dview
->label
[DIFF_RIGHT
]);
2493 /* --------------------------------------------------------------------------------------------- */
2496 dview_display_file (const WDiff
* dview
, diff_place_t ord
, int r
, int c
, int height
, int width
)
2501 FBUF
*f
= dview
->f
[ord
];
2502 int skip
= dview
->skip_cols
;
2503 gboolean display_symbols
= dview
->display_symbols
;
2504 int display_numbers
= dview
->display_numbers
;
2505 gboolean show_cr
= dview
->show_cr
;
2508 int nwidth
= display_numbers
;
2511 xwidth
= display_numbers
;
2512 if (display_symbols
)
2514 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2515 tab_size
= dview
->tab_size
;
2519 if (xwidth
> width
&& display_symbols
)
2522 display_symbols
= FALSE
;
2524 if (xwidth
> width
&& display_numbers
!= 0)
2527 display_numbers
= width
;
2537 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2539 /* abnormal, but avoid buffer overflow */
2543 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2550 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2552 tty_setcolor (NORMAL_COLOR
);
2553 if (display_symbols
)
2555 tty_gotoyx (r
+ j
, c
- 2);
2556 tty_print_char (ch
);
2560 if (display_numbers
!= 0)
2562 tty_gotoyx (r
+ j
, c
- xwidth
);
2563 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2564 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2567 tty_setcolor (DFF_ADD_COLOR
);
2569 tty_setcolor (DFF_CHG_COLOR
);
2572 if (i
== (size_t) dview
->search
.last_found_line
)
2573 tty_setcolor (MARKED_SELECTED_COLOR
);
2574 else if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2580 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2585 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2586 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2587 tty_gotoyx (r
+ j
, c
);
2590 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2599 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2601 cnt
+= ch_length
- 1;
2602 if (!g_unichar_isprint (next_ch
))
2607 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2611 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2613 if (mc_global
.utf8_display
)
2618 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2622 else if (dview
->utf8
)
2623 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2625 next_ch
= convert_to_display_c (next_ch
);
2627 tty_print_anychar (next_ch
);
2635 tty_setcolor (DFF_CHH_COLOR
);
2639 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2643 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2646 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2650 if (display_numbers
!= 0)
2652 tty_gotoyx (r
+ j
, c
- xwidth
);
2653 fill_by_space (buf
, display_numbers
, TRUE
);
2654 tty_print_string (buf
);
2657 tty_setcolor (DFF_DEL_COLOR
);
2659 tty_setcolor (DFF_CHD_COLOR
);
2660 fill_by_space (buf
, width
, TRUE
);
2662 tty_gotoyx (r
+ j
, c
);
2663 /* tty_print_nstring (buf, width); */
2665 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2674 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2676 cnt
+= ch_length
- 1;
2677 if (!g_unichar_isprint (next_ch
))
2682 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2687 if (mc_global
.utf8_display
)
2691 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2693 else if (dview
->utf8
)
2694 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2696 next_ch
= convert_to_display_c (next_ch
);
2699 tty_print_anychar (next_ch
);
2704 tty_setcolor (NORMAL_COLOR
);
2706 if (width
< xwidth
- 1)
2708 fill_by_space (buf
, k
, TRUE
);
2709 for (; j
< height
; j
++)
2713 tty_gotoyx (r
+ j
, c
- xwidth
);
2714 /* tty_print_nstring (buf, xwidth - 1); */
2715 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2717 tty_gotoyx (r
+ j
, c
);
2718 /* tty_print_nstring (buf, width); */
2719 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2725 /* --------------------------------------------------------------------------------------------- */
2728 dview_status (const WDiff
* dview
, diff_place_t ord
, int width
, int c
)
2732 int linenum
, lineofs
;
2736 tty_setcolor (STATUSBAR_COLOR
);
2739 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2741 filename_width
= width
- 24;
2742 if (filename_width
< 8)
2745 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2746 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2747 vfs_path_free (vpath
, TRUE
);
2748 buf
= str_term_trim (path
, filename_width
);
2749 if (ord
== DIFF_LEFT
)
2750 tty_printf ("%s%-*s %6d+%-4d Col %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2751 buf
, linenum
, lineofs
, dview
->skip_cols
);
2753 tty_printf ("%s%-*s %6d+%-4d Dif %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2754 buf
, linenum
, lineofs
, dview
->ndiff
);
2758 /* --------------------------------------------------------------------------------------------- */
2761 dview_redo (WDiff
* dview
)
2763 if (dview
->display_numbers
!= 0)
2767 old
= dview
->display_numbers
;
2768 dview
->display_numbers
= calc_nwidth ((const GArray
* const *) dview
->a
);
2769 dview
->new_frame
= (old
!= dview
->display_numbers
);
2771 dview_reread (dview
);
2774 /* --------------------------------------------------------------------------------------------- */
2777 dview_update (WDiff
* dview
)
2779 int height
= dview
->height
;
2783 last
= dview
->a
[DIFF_LEFT
]->len
- 1;
2785 if (dview
->skip_rows
> last
)
2786 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
2787 if (dview
->skip_rows
< 0)
2788 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
2789 if (dview
->skip_cols
< 0)
2790 dview
->skip_cols
= 0;
2795 /* use an actual length of dview->a */
2796 if (dview
->display_numbers
!= 0)
2797 dview
->display_numbers
= calc_nwidth ((const GArray
* const *) dview
->a
);
2799 width1
= dview
->half1
+ dview
->bias
;
2800 width2
= dview
->half2
- dview
->bias
;
2807 if (dview
->new_frame
)
2811 tty_setcolor (NORMAL_COLOR
);
2812 xwidth
= dview
->display_numbers
;
2813 if (dview
->display_symbols
)
2816 tty_draw_box (1, 0, height
, width1
, FALSE
);
2818 tty_draw_box (1, width1
, height
, width2
, FALSE
);
2823 if (xwidth
< width1
- 1)
2825 tty_gotoyx (1, xwidth
);
2826 tty_print_alt_char (ACS_TTEE
, FALSE
);
2827 tty_gotoyx (height
, xwidth
);
2828 tty_print_alt_char (ACS_BTEE
, FALSE
);
2829 tty_draw_vline (2, xwidth
, ACS_VLINE
, height
- 2);
2831 if (xwidth
< width2
- 1)
2833 tty_gotoyx (1, width1
+ xwidth
);
2834 tty_print_alt_char (ACS_TTEE
, FALSE
);
2835 tty_gotoyx (height
, width1
+ xwidth
);
2836 tty_print_alt_char (ACS_BTEE
, FALSE
);
2837 tty_draw_vline (2, width1
+ xwidth
, ACS_VLINE
, height
- 2);
2840 dview
->new_frame
= FALSE
;
2845 dview_status (dview
, dview
->ord
, width1
, 0);
2846 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
2852 ord
= dview
->ord
== DIFF_LEFT
? DIFF_RIGHT
: DIFF_LEFT
;
2853 dview_status (dview
, ord
, width2
, width1
);
2854 dview_display_file (dview
, ord
, 2, width1
+ 1, height
- 2, width2
- 2);
2858 /* --------------------------------------------------------------------------------------------- */
2861 dview_edit (WDiff
* dview
, diff_place_t ord
)
2865 int linenum
, lineofs
;
2867 if (dview
->dsrc
== DATA_SRC_TMP
)
2869 error_dialog (_("Edit"), _("Edit is disabled"));
2873 h
= WIDGET (WIDGET (dview
)->owner
);
2874 h_modal
= widget_get_state (h
, WST_MODAL
);
2876 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2878 /* disallow edit file in several editors */
2879 widget_set_state (h
, WST_MODAL
, TRUE
);
2882 vfs_path_t
*tmp_vpath
;
2884 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2885 edit_file_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2886 vfs_path_free (tmp_vpath
, TRUE
);
2889 widget_set_state (h
, WST_MODAL
, h_modal
);
2891 dview_update (dview
);
2894 /* --------------------------------------------------------------------------------------------- */
2897 dview_goto_cmd (WDiff
* dview
, diff_place_t ord
)
2899 static gboolean first_run
= TRUE
;
2902 static const char *title
[2] = {
2903 N_("Goto line (left)"),
2904 N_("Goto line (right)")
2912 input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
,
2913 first_run
? NULL
: INPUT_LAST_TEXT
, INPUT_COMPLETE_NONE
);
2916 const char *s
= input
;
2918 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2923 for (; i
< dview
->a
[ord
]->len
; i
++)
2927 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2928 if (p
->line
== newline
)
2932 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2941 /* --------------------------------------------------------------------------------------------- */
2944 dview_labels (WDiff
* dview
)
2946 Widget
*d
= WIDGET (dview
);
2949 b
= buttonbar_find (DIALOG (d
->owner
));
2951 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), d
->keymap
, d
);
2952 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), d
->keymap
, d
);
2953 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), d
->keymap
, d
);
2954 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), d
->keymap
, d
);
2955 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), d
->keymap
, d
);
2956 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), d
->keymap
, d
);
2957 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), d
->keymap
, d
);
2960 /* --------------------------------------------------------------------------------------------- */
2963 dview_save (WDiff
* dview
)
2965 gboolean res
= TRUE
;
2967 if (dview
->merged
[DIFF_LEFT
])
2969 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
2970 dview
->merged
[DIFF_LEFT
] = !res
;
2972 if (dview
->merged
[DIFF_RIGHT
])
2974 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
2975 dview
->merged
[DIFF_RIGHT
] = !res
;
2980 /* --------------------------------------------------------------------------------------------- */
2983 dview_do_save (WDiff
* dview
)
2985 (void) dview_save (dview
);
2988 /* --------------------------------------------------------------------------------------------- */
2991 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2995 dview_ok_to_exit (WDiff
* dview
)
2997 gboolean res
= TRUE
;
3000 if (!dview
->merged
[DIFF_LEFT
] && !dview
->merged
[DIFF_RIGHT
])
3003 act
= query_dialog (_("Quit"), !mc_global
.midnight_shutdown
?
3004 _("File(s) was modified. Save with exit?") :
3005 _("Midnight Commander is being shut down.\nSave modified file(s)?"),
3006 D_NORMAL
, 2, _("&Yes"), _("&No"));
3009 if (mc_global
.midnight_shutdown
|| (act
== -1))
3018 (void) dview_save (dview
);
3022 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~"))
3023 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
3024 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~"))
3025 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
3034 /* --------------------------------------------------------------------------------------------- */
3037 dview_execute_cmd (WDiff
* dview
, long command
)
3039 cb_ret_t res
= MSG_HANDLED
;
3043 case CK_ShowSymbols
:
3044 dview
->display_symbols
= !dview
->display_symbols
;
3045 dview
->new_frame
= TRUE
;
3047 case CK_ShowNumbers
:
3048 dview
->display_numbers
^= calc_nwidth ((const GArray
* const *) dview
->a
);
3049 dview
->new_frame
= TRUE
;
3052 dview
->full
= !dview
->full
;
3053 dview
->new_frame
= TRUE
;
3059 dview
->new_frame
= TRUE
;
3065 dview_compute_split (dview
, 1);
3066 dview
->new_frame
= TRUE
;
3073 dview_compute_split (dview
, -1);
3074 dview
->new_frame
= TRUE
;
3078 dview
->tab_size
= 2;
3081 dview
->tab_size
= 3;
3084 dview
->tab_size
= 4;
3087 dview
->tab_size
= 8;
3096 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3097 find_next_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3100 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3101 find_prev_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3104 dview_goto_cmd (dview
, DIFF_RIGHT
);
3107 dview_edit (dview
, dview
->ord
);
3110 do_merge_hunk (dview
, FROM_LEFT_TO_RIGHT
);
3114 do_merge_hunk (dview
, FROM_RIGHT_TO_LEFT
);
3118 dview_edit (dview
, dview
->ord
^ 1);
3121 dview_search_cmd (dview
);
3123 case CK_SearchContinue
:
3124 dview_continue_search_cmd (dview
);
3127 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3130 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[DIFF_LEFT
]->len
- 1;
3133 if (dview
->skip_rows
> 0)
3136 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3141 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3144 if (dview
->height
> 2)
3146 dview
->skip_rows
+= dview
->height
- 2;
3147 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3151 if (dview
->height
> 2)
3153 dview
->skip_rows
-= dview
->height
- 2;
3154 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3164 dview
->skip_cols
-= 8;
3167 dview
->skip_cols
+= 8;
3170 dview
->skip_cols
= 0;
3176 dview
->view_quit
= TRUE
;
3179 dview_do_save (dview
);
3182 dview_diff_options (dview
);
3185 case CK_SelectCodepage
:
3186 dview_select_encoding (dview
);
3190 /* don't close diffviewer due to SIGINT */
3193 res
= MSG_NOT_HANDLED
;
3198 /* --------------------------------------------------------------------------------------------- */
3201 dview_handle_key (WDiff
* dview
, int key
)
3206 key
= convert_from_input_c (key
);
3209 command
= widget_lookup_key (WIDGET (dview
), key
);
3210 if (command
== CK_IgnoreKey
)
3211 return MSG_NOT_HANDLED
;
3213 return dview_execute_cmd (dview
, command
);
3216 /* --------------------------------------------------------------------------------------------- */
3219 dview_callback (Widget
* w
, Widget
* sender
, widget_msg_t msg
, int parm
, void *data
)
3221 WDiff
*dview
= (WDiff
*) w
;
3222 WDialog
*h
= DIALOG (w
->owner
);
3228 dview_labels (dview
);
3229 dview_update (dview
);
3233 dview
->new_frame
= TRUE
;
3234 dview_update (dview
);
3238 i
= dview_handle_key (dview
, parm
);
3239 if (dview
->view_quit
)
3242 dview_update (dview
);
3246 i
= dview_execute_cmd (dview
, parm
);
3247 if (dview
->view_quit
)
3250 dview_update (dview
);
3254 widget_default_callback (w
, NULL
, MSG_RESIZE
, 0, data
);
3255 dview_compute_areas (dview
);
3259 dview_save_options (dview
);
3264 return widget_default_callback (w
, sender
, msg
, parm
, data
);
3268 /* --------------------------------------------------------------------------------------------- */
3271 dview_mouse_callback (Widget
* w
, mouse_msg_t msg
, mouse_event_t
* event
)
3273 WDiff
*dview
= (WDiff
*) w
;
3279 case MSG_MOUSE_SCROLL_UP
:
3280 case MSG_MOUSE_SCROLL_DOWN
:
3281 if (msg
== MSG_MOUSE_SCROLL_UP
)
3282 dview
->skip_rows
-= 2;
3284 dview
->skip_rows
+= 2;
3286 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3287 dview_update (dview
);
3295 /* --------------------------------------------------------------------------------------------- */
3298 dview_dialog_callback (Widget
* w
, Widget
* sender
, widget_msg_t msg
, int parm
, void *data
)
3301 WDialog
*h
= DIALOG (w
);
3306 /* Handle shortcuts. */
3308 /* Note: the buttonbar sends messages directly to the the WDiff, not to
3309 * here, which is why we can pass NULL in the following call. */
3310 return dview_execute_cmd (NULL
, parm
);
3313 dview
= (WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3314 /* don't stop the dialog before final decision */
3315 widget_set_state (w
, WST_ACTIVE
, TRUE
);
3316 if (dview_ok_to_exit (dview
))
3321 return dlg_default_callback (w
, sender
, msg
, parm
, data
);
3325 /* --------------------------------------------------------------------------------------------- */
3328 dview_get_title (const WDialog
* h
, size_t len
)
3331 const char *modified
= " (*) ";
3332 const char *notmodified
= " ";
3336 dview
= (const WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3337 len1
= (len
- str_term_width1 (_("Diff:")) - strlen (modified
) - 3) / 2;
3339 title
= g_string_sized_new (len
);
3340 g_string_append (title
, _("Diff:"));
3341 g_string_append (title
, dview
->merged
[DIFF_LEFT
] ? modified
: notmodified
);
3342 g_string_append (title
, str_term_trim (dview
->label
[DIFF_LEFT
], len1
));
3343 g_string_append (title
, " | ");
3344 g_string_append (title
, dview
->merged
[DIFF_RIGHT
] ? modified
: notmodified
);
3345 g_string_append (title
, str_term_trim (dview
->label
[DIFF_RIGHT
], len1
));
3347 return g_string_free (title
, FALSE
);
3350 /* --------------------------------------------------------------------------------------------- */
3353 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3363 /* Create dialog and widgets, put them on the dialog */
3365 dlg_create (FALSE
, 0, 0, 1, 1, WPOS_FULLSCREEN
, FALSE
, NULL
, dview_dialog_callback
, NULL
,
3366 "[Diff Viewer]", NULL
);
3367 dw
= WIDGET (dview_dlg
);
3368 widget_want_tab (dw
, TRUE
);
3371 g
= GROUP (dview_dlg
);
3373 dview
= g_new0 (WDiff
, 1);
3376 widget_init (w
, &r
, dview_callback
, dview_mouse_callback
);
3377 w
->options
|= WOP_SELECTABLE
;
3378 w
->keymap
= diff_map
;
3379 group_add_widget_autopos (g
, w
, WPOS_KEEP_ALL
, NULL
);
3381 w
= WIDGET (buttonbar_new ());
3382 group_add_widget_autopos (g
, w
, w
->pos_flags
, NULL
);
3384 dview_dlg
->get_title
= dview_get_title
;
3386 error
= dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); /* XXX binary diff? */
3388 error
= redo_diff (dview
);
3391 dview
->ndiff
= error
;
3392 dview_compute_areas (dview
);
3397 dlg_run (dview_dlg
);
3399 if (error
!= 0 || widget_get_state (dw
, WST_CLOSED
))
3400 widget_destroy (dw
);
3402 return error
== 0 ? 1 : 0;
3405 /*** public functions ****************************************************************************/
3406 /* --------------------------------------------------------------------------------------------- */
3408 #define GET_FILE_AND_STAMP(n) \
3412 real_file##n = file##n; \
3413 if (!vfs_file_is_local (file##n)) \
3415 real_file##n = mc_getlocalcopy (file##n); \
3416 if (real_file##n != NULL) \
3419 if (mc_stat (real_file##n, &st##n) != 0) \
3426 #define UNGET_FILE(n) \
3429 if (use_copy##n != 0) \
3431 gboolean changed = FALSE; \
3432 if (use_copy##n > 0) \
3435 mtime = st##n.st_mtime; \
3436 if (mc_stat (real_file##n, &st##n) == 0) \
3437 changed = (mtime != st##n.st_mtime); \
3439 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3440 vfs_path_free (real_file##n, TRUE); \
3446 dview_diff_cmd (const void *f0
, const void *f1
)
3449 vfs_path_t
*file0
= NULL
;
3450 vfs_path_t
*file1
= NULL
;
3451 gboolean is_dir0
= FALSE
;
3452 gboolean is_dir1
= FALSE
;
3454 switch (mc_global
.mc_run_mode
)
3458 /* run from panels */
3459 const WPanel
*panel0
= (const WPanel
*) f0
;
3460 const WPanel
*panel1
= (const WPanel
*) f1
;
3461 const file_entry_t
*fe0
, *fe1
;
3463 fe0
= panel_current_entry (panel0
);
3464 file0
= vfs_path_append_new (panel0
->cwd_vpath
, fe0
->fname
->str
, (char *) NULL
);
3465 is_dir0
= S_ISDIR (fe0
->st
.st_mode
);
3468 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3469 path_trunc (fe0
->fname
->str
, 30));
3473 fe1
= panel_current_entry (panel1
);
3474 file1
= vfs_path_append_new (panel1
->cwd_vpath
, fe1
->fname
->str
, (char *) NULL
);
3475 is_dir1
= S_ISDIR (fe1
->st
.st_mode
);
3478 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3479 path_trunc (fe1
->fname
->str
, 30));
3485 case MC_RUN_DIFFVIEWER
:
3487 /* run from command line */
3488 const char *p0
= (const char *) f0
;
3489 const char *p1
= (const char *) f1
;
3492 file0
= vfs_path_from_str (p0
);
3493 if (mc_stat (file0
, &st
) == 0)
3495 is_dir0
= S_ISDIR (st
.st_mode
);
3498 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p0
, 30));
3504 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3505 path_trunc (p0
, 30), unix_error_string (errno
));
3509 file1
= vfs_path_from_str (p1
);
3510 if (mc_stat (file1
, &st
) == 0)
3512 is_dir1
= S_ISDIR (st
.st_mode
);
3515 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p1
, 30));
3521 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3522 path_trunc (p1
, 30), unix_error_string (errno
));
3529 /* this should not happened */
3530 message (D_ERROR
, MSG_ERROR
, _("Diff viewer: invalid mode"));
3537 if (file0
!= NULL
&& file1
!= NULL
)
3539 int use_copy0
, use_copy1
;
3540 struct stat st0
, st1
;
3541 vfs_path_t
*real_file0
, *real_file1
;
3543 GET_FILE_AND_STAMP (0);
3544 GET_FILE_AND_STAMP (1);
3546 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3547 rv
= diff_view (vfs_path_as_str (real_file0
), vfs_path_as_str (real_file1
),
3548 vfs_path_as_str (file0
), vfs_path_as_str (file1
));
3556 message (D_ERROR
, MSG_ERROR
, _("Two files are needed to compare"));
3559 vfs_path_free (file1
, TRUE
);
3560 vfs_path_free (file0
, TRUE
);
3565 #undef GET_FILE_AND_STAMP
3568 /* --------------------------------------------------------------------------------------------- */