2 Copyright (C) 2007, 2010, 2011
3 The Free Software Foundation, Inc.
6 Daniel Borca <dborca@yahoo.com>, 2007
7 Slava Zanko <slavazanko@gmail.com>, 2010
8 Andrew Borodin <aborodin@vmail.ru>, 2010
9 Ilia Maslakov <il.smind@gmail.com>, 2010
11 This file is part of the Midnight Commander.
13 The Midnight Commander is free software: you can redistribute it
14 and/or modify it under the terms of the GNU General Public License as
15 published by the Free Software Foundation, either version 3 of the License,
16 or (at your option) any later version.
18 The Midnight Commander is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details.
23 You should have received a copy of the GNU General Public License
24 along with this program. If not, see <http://www.gnu.org/licenses/>.
34 #include <sys/types.h>
37 #include "lib/global.h"
38 #include "lib/tty/tty.h"
39 #include "lib/tty/color.h"
40 #include "lib/tty/key.h"
41 #include "lib/skin.h" /* EDITOR_NORMAL_COLOR */
42 #include "lib/vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
44 #include "lib/widget.h"
45 #include "lib/strutil.h"
46 #include "lib/charsets.h"
47 #include "lib/event.h" /* mc_event_raise() */
49 #include "src/filemanager/cmd.h" /* do_edit_at_line(), view_other_cmd() */
50 #include "src/filemanager/panel.h"
51 #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */
53 #include "src/keybind-defaults.h"
54 #include "src/history.h"
55 #include "src/selcodepage.h"
60 /*** global variables ****************************************************************************/
62 /*** file scope macro definitions ****************************************************************/
64 #define g_array_foreach(a, TP, cbf) \
66 size_t g_array_foreach_i;\
67 TP *g_array_foreach_var=NULL; \
68 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
70 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
71 (*cbf) (g_array_foreach_var); \
75 #define FILE_READ_BUF 4096
76 #define FILE_FLAG_TEMP (1 << 0)
86 #define HDIFF_ENABLE 1
87 #define HDIFF_MINCTX 5
88 #define HDIFF_DEPTH 10
90 #define FILE_DIRTY(fs) \
98 /*** file scope type declarations ****************************************************************/
100 /*** file scope variables ************************************************************************/
102 /*** file scope functions ************************************************************************/
103 /* --------------------------------------------------------------------------------------------- */
106 TAB_SKIP (int ts
, int pos
)
108 if (ts
> 0 && ts
< 9)
109 return ts
- pos
% ts
;
114 /* --------------------------------------------------------------------------------------------- */
117 dview_set_codeset (WDiff
* dview
)
120 const char *encoding_id
= NULL
;
124 get_codepage_id (mc_global
.source_codepage
>=
125 0 ? mc_global
.source_codepage
: mc_global
.display_codepage
);
126 if (encoding_id
!= NULL
)
129 conv
= str_crt_conv_from (encoding_id
);
130 if (conv
!= INVALID_CONV
)
132 if (dview
->converter
!= str_cnv_from_term
)
133 str_close_conv (dview
->converter
);
134 dview
->converter
= conv
;
136 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
143 /* --------------------------------------------------------------------------------------------- */
146 dview_select_encoding (WDiff
* dview
)
149 if (do_select_codepage ())
150 dview_set_codeset (dview
);
156 /* --------------------------------------------------------------------------------------------- */
159 rewrite_backup_content (const vfs_path_t
* from_file_name_vpath
, const char *to_file_name
)
164 const char *from_file_name
;
166 from_file_name
= vfs_path_get_by_index (from_file_name_vpath
, -1)->path
;
167 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
170 backup_fd
= fopen (to_file_name
, "w");
171 if (backup_fd
== NULL
)
177 length
= fwrite ((const void *) contents
, length
, 1, backup_fd
);
185 /* buffered I/O ************************************************************* */
188 * Try to open a temporary file.
190 * \param[out] name address of a pointer to store the temporary name
192 * \return file descriptor on success, negative on error
194 * \note the name is not altered if this function fails
198 open_temp (void **name
)
201 vfs_path_t
*diff_file_name
= NULL
;
203 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
206 message (D_ERROR
, MSG_ERROR
,
207 _("Cannot create temporary diff file\n%s"), unix_error_string (errno
));
210 *name
= vfs_path_to_str (diff_file_name
);
211 vfs_path_free (diff_file_name
);
215 /* --------------------------------------------------------------------------------------------- */
218 * Alocate file structure and associate file descriptor to it.
220 * \param fd file descriptor
222 * \return file structure
232 fs
= g_try_malloc (sizeof (FBUF
));
236 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
251 /* --------------------------------------------------------------------------------------------- */
254 * Free file structure without closing the file.
256 * \param fs file structure
258 * \return 0 on success, non-zero on error
264 if (fs
->flags
& FILE_FLAG_TEMP
)
266 rv
= unlink (fs
->data
);
275 /* --------------------------------------------------------------------------------------------- */
278 * Open a binary temporary file in R/W mode.
280 * \return file structure
282 * \note the file will be deleted when closed
296 fd
= open_temp (&fs
->data
);
304 fs
->flags
= FILE_FLAG_TEMP
;
308 /* --------------------------------------------------------------------------------------------- */
311 * Open a binary file in specified mode.
313 * \param filename file name
314 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
316 * \return file structure
319 f_open (const char *filename
, int flags
)
330 fd
= open (filename
, flags
);
341 /* --------------------------------------------------------------------------------------------- */
344 * Read a line of bytes from file until newline or EOF.
346 * \param buf destination buffer
347 * \param size size of buffer
348 * \param fs file structure
350 * \return number of bytes read
352 * \note does not stop on null-byte
353 * \note buf will not be null-terminated
356 f_gets (char *buf
, size_t size
, FBUF
* fs
)
365 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
375 if (j
== size
|| stop
)
381 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
388 /* --------------------------------------------------------------------------------------------- */
393 * \param fs file structure
395 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
397 * \return position in file, starting from begginning
399 * \note avoids thrashing read cache when possible
402 f_seek (FBUF
* fs
, off_t off
, int whence
)
406 if (fs
->len
&& whence
!= SEEK_END
)
408 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
411 if (whence
== SEEK_CUR
)
414 off
+= rv
- fs
->len
+ fs
->pos
;
416 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
418 fs
->pos
= fs
->len
+ off
- rv
;
424 rv
= lseek (fs
->fd
, off
, whence
);
432 /* --------------------------------------------------------------------------------------------- */
435 * Seek to the beginning of file, thrashing read cache.
437 * \param fs file structure
439 * \return 0 if success, non-zero on error
444 off_t rv
= lseek (fs
->fd
, 0, SEEK_SET
);
452 /* --------------------------------------------------------------------------------------------- */
455 * Write bytes to file.
457 * \param fs file structure
458 * \param buf source buffer
459 * \param size size of buffer
461 * \return number of written bytes, -1 on error
463 * \note thrashes read cache
466 f_write (FBUF
* fs
, const char *buf
, size_t size
)
468 ssize_t rv
= write (fs
->fd
, buf
, size
);
476 /* --------------------------------------------------------------------------------------------- */
479 * Truncate file to the current position.
481 * \param fs file structure
483 * \return current file size on success, negative on error
485 * \note thrashes read cache
490 off_t off
= lseek (fs
->fd
, 0, SEEK_CUR
);
493 int rv
= ftruncate (fs
->fd
, off
);
506 /* --------------------------------------------------------------------------------------------- */
511 * \param fs file structure
513 * \return 0 on success, non-zero on error
515 * \note if this is temporary file, it is deleted
520 int rv
= close (fs
->fd
);
525 /* --------------------------------------------------------------------------------------------- */
528 * Create pipe stream to process.
530 * \param cmd shell command line
531 * \param flags open mode, either O_RDONLY or O_WRONLY
533 * \return file structure
536 p_open (const char *cmd
, int flags
)
540 const char *type
= NULL
;
542 if (flags
== O_RDONLY
)
546 if (flags
== O_WRONLY
)
562 f
= popen (cmd
, type
);
574 /* --------------------------------------------------------------------------------------------- */
579 * \param fs structure
581 * \return 0 on success, non-zero on error
586 int rv
= pclose (fs
->data
);
592 * Get one char (byte) from string
594 * \param char * str, gboolean * result
596 * \return int as character or 0 and result == FALSE if fail
600 dview_get_byte (char *str
, gboolean
* result
)
608 return (unsigned char) *str
;
613 * Get utf multibyte char from string
615 * \param char * str, int * char_width, gboolean * result
617 * \return int as utf character or 0 and result == FALSE if fail
621 dview_get_utf (char *str
, int *char_width
, gboolean
* result
)
625 gchar
*next_ch
= NULL
;
637 res
= g_utf8_get_char_validated (str
, -1);
647 /* Calculate UTF-8 char width */
648 next_ch
= g_utf8_next_char (str
);
651 width
= next_ch
- str
;
664 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
667 if (text
== NULL
|| text
[0] == '\0')
669 if (g_utf8_validate (text
, -1, NULL
))
671 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
676 char *tmpbuf
, *buffer
;
677 buffer
= tmpbuf
= g_strdup (text
);
678 while (tmpbuf
[0] != '\0')
680 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
681 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
683 tmpbuf
= g_utf8_next_char (tmpbuf
);
692 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
695 return max (length
, (size_t) result
);
699 /* --------------------------------------------------------------------------------------------- */
700 /* diff parse *************************************************************** */
703 * Read decimal number from string.
705 * \param[in,out] str string to parse
706 * \param[out] n extracted number
708 * \return 0 if success, otherwise non-zero
711 scan_deci (const char **str
, int *n
)
713 const char *p
= *str
;
716 *n
= strtol (p
, &q
, 10);
725 /* --------------------------------------------------------------------------------------------- */
728 * Parse line for diff statement.
730 * \param p string to parse
731 * \param ops list of diff statements
733 * \return 0 if success, otherwise non-zero
736 scan_line (const char *p
, GArray
* ops
)
746 /* handle the following cases:
748 * NUM[,NUM]cNUM[,NUM]
750 * where NUM is a positive integer
753 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
762 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
777 else if (cmd
!= 'c' && cmd
!= 'd')
782 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
791 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
811 g_array_append_val (ops
, op
);
815 /* --------------------------------------------------------------------------------------------- */
818 * Parse diff output and extract diff statements.
820 * \param f stream to read from
821 * \param ops list of diff statements to fill
823 * \return positive number indicating number of hunks, otherwise negative
826 scan_diff (FBUF
* f
, GArray
* ops
)
831 while ((sz
= f_gets (buf
, sizeof (buf
) - 1, f
)))
833 if (isdigit (buf
[0]))
835 if (buf
[sz
- 1] != '\n')
840 if (scan_line (buf
, ops
) != 0)
846 while (buf
[sz
- 1] != '\n' && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
854 /* --------------------------------------------------------------------------------------------- */
857 * Invoke diff and extract diff statements.
859 * \param args extra arguments to be passed to diff
860 * \param extra more arguments to be passed to diff
861 * \param file1 first file to compare
862 * \param file2 second file to compare
863 * \param ops list of diff statements to fill
865 * \return positive number indicating number of hunks, otherwise negative
868 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
,
871 static const char *opt
=
872 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
873 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
874 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
875 " --unchanged-group-format=''";
882 cmd
= g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args
, extra
, opt
, file1
, file2
);
886 f
= p_open (cmd
, O_RDONLY
);
892 rv
= scan_diff (f
, ops
);
895 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
901 /* --------------------------------------------------------------------------------------------- */
904 * Reparse and display file according to diff statements.
906 * \param ord 0 if displaying first file, 1 if displaying 2nd file
907 * \param filename file name to display
908 * \param ops list of diff statements
909 * \param printer printf-like function to be used for displaying
910 * \param ctx printer context
912 * \return 0 if success, otherwise non-zero
915 dff_reparse (int ord
, const char *filename
, const GArray
* ops
, DFUNC printer
, void *ctx
)
928 f
= f_open (filename
, O_RDONLY
);
946 #define T1 a[ ord^1 ][0]
947 #define T2 a[ ord^1 ][1]
948 for (i
= 0; i
< ops
->len
; i
++)
951 op
= &g_array_index (ops
, DIFFCMD
, i
);
952 n
= op
->F1
- (op
->cmd
!= add_cmd
);
953 while (line
< n
&& (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
956 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
958 while (buf
[sz
- 1] != '\n')
960 sz
= f_gets (buf
, sizeof (buf
), f
);
963 printer (ctx
, 0, 0, 0, 1, "\n");
966 printer (ctx
, 0, 0, 0, sz
, buf
);
975 if (op
->cmd
== add_cmd
)
977 n
= op
->T2
- op
->T1
+ 1;
980 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
984 if (op
->cmd
== del_cmd
)
986 n
= op
->F2
- op
->F1
+ 1;
987 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
990 printer (ctx
, ADD_CH
, line
, off
, sz
, buf
);
992 while (buf
[sz
- 1] != '\n')
994 sz
= f_gets (buf
, sizeof (buf
), f
);
997 printer (ctx
, 0, 0, 0, 1, "\n");
1000 printer (ctx
, 0, 0, 0, sz
, buf
);
1012 n
= op
->F2
- op
->F1
+ 1;
1013 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1016 printer (ctx
, CHG_CH
, line
, off
, sz
, buf
);
1018 while (buf
[sz
- 1] != '\n')
1020 sz
= f_gets (buf
, sizeof (buf
), f
);
1023 printer (ctx
, 0, 0, 0, 1, "\n");
1026 printer (ctx
, 0, 0, 0, sz
, buf
);
1035 n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
);
1038 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
1048 while ((sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1051 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
1053 while (buf
[sz
- 1] != '\n')
1055 sz
= f_gets (buf
, sizeof (buf
), f
);
1058 printer (ctx
, 0, 0, 0, 1, "\n");
1061 printer (ctx
, 0, 0, 0, sz
, buf
);
1074 /* --------------------------------------------------------------------------------------------- */
1075 /* horizontal diff ********************************************************** */
1078 * Longest common substring.
1080 * \param s first string
1081 * \param m length of first string
1082 * \param t second string
1083 * \param n length of second string
1084 * \param ret list of offsets for longest common substrings inside each string
1085 * \param min minimum length of common substrings
1087 * \return 0 if success, nonzero otherwise
1090 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
* ret
, int min
)
1098 if (m
< min
|| n
< min
)
1100 /* XXX early culling */
1104 Lprev
= g_new0 (int, n
+ 1);
1105 Lcurr
= g_new0 (int, n
+ 1);
1107 if (Lprev
== NULL
|| Lcurr
== NULL
)
1114 for (i
= 0; i
< m
; i
++)
1119 #ifdef USE_MEMSET_IN_LCS
1120 memset (Lcurr
, 0, (n
+ 1) * sizeof (int));
1122 for (j
= 0; j
< n
; j
++)
1124 #ifndef USE_MEMSET_IN_LCS
1129 int v
= Lprev
[j
] + 1;
1134 g_array_set_size (ret
, 0);
1136 if (z
== v
&& z
>= min
)
1138 int off0
= i
- z
+ 1;
1139 int off1
= j
- z
+ 1;
1141 for (k
= 0; k
< ret
->len
; k
++)
1143 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1144 if ((*p
)[0] == off0
)
1148 if ((*p
)[1] >= off1
)
1158 g_array_append_val (ret
, p2
);
1174 /* --------------------------------------------------------------------------------------------- */
1177 * Scan recursively for common substrings and build ranges.
1179 * \param s first string
1180 * \param t second string
1181 * \param bracket current limits for both of the strings
1182 * \param min minimum length of common substrings
1183 * \param hdiff list of horizontal diff ranges to fill
1184 * \param depth recursion depth
1186 * \return 0 if success, nonzero otherwise
1189 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
* hdiff
,
1199 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1203 len
= lcsubstr (s
+ bracket
[0].off
, bracket
[0].len
,
1204 t
+ bracket
[1].off
, bracket
[1].len
, ret
, min
);
1208 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1211 b
[0].off
= bracket
[0].off
;
1212 b
[0].len
= (*data
)[0];
1213 b
[1].off
= bracket
[1].off
;
1214 b
[1].len
= (*data
)[1];
1215 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1218 for (k
= 0; k
< ret
->len
- 1; k
++)
1220 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1221 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1222 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1223 b
[0].len
= (*data2
)[0] - (*data
)[0] - len
;
1224 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1225 b
[1].len
= (*data2
)[1] - (*data
)[1] - len
;
1226 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1229 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1230 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1231 b
[0].len
= bracket
[0].len
- (*data
)[0] - len
;
1232 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1233 b
[1].len
= bracket
[1].len
- (*data
)[1] - len
;
1234 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1237 g_array_free (ret
, TRUE
);
1242 p
[0].off
= bracket
[0].off
;
1243 p
[0].len
= bracket
[0].len
;
1244 p
[1].off
= bracket
[1].off
;
1245 p
[1].len
= bracket
[1].len
;
1246 g_array_append_val (hdiff
, p
);
1251 /* --------------------------------------------------------------------------------------------- */
1254 * Build list of horizontal diff ranges.
1256 * \param s first string
1257 * \param m length of first string
1258 * \param t second string
1259 * \param n length of second string
1260 * \param min minimum length of common substrings
1261 * \param hdiff list of horizontal diff ranges to fill
1262 * \param depth recursion depth
1264 * \return 0 if success, nonzero otherwise
1267 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
* hdiff
, unsigned int depth
)
1272 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1273 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1275 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1283 /* smartscan (multiple horizontal diff) */
1284 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1287 /* --------------------------------------------------------------------------------------------- */
1288 /* read line **************************************************************** */
1291 * Check if character is inside horizontal diff limits.
1293 * \param k rank of character inside line
1294 * \param hdiff horizontal diff structure
1295 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1297 * \return TRUE if inside hdiff limits, FALSE otherwise
1300 is_inside (int k
, GArray
* hdiff
, int ord
)
1304 for (i
= 0; i
< hdiff
->len
; i
++)
1307 b
= &g_array_index (hdiff
, BRACKET
, i
);
1309 start
= (*b
)[ord
].off
;
1310 end
= start
+ (*b
)[ord
].len
;
1311 if (k
>= start
&& k
< end
)
1319 /* --------------------------------------------------------------------------------------------- */
1322 * Copy `src' to `dst' expanding tabs.
1324 * \param dst destination buffer
1325 * \param src source buffer
1326 * \param srcsize size of src buffer
1327 * \param base virtual base of this string, needed to calculate tabs
1328 * \param ts tab size
1330 * \return new virtual base
1332 * \note The procedure returns when all bytes are consumed from `src'
1335 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1338 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1343 int j
= TAB_SKIP (ts
, i
+ base
);
1355 /* --------------------------------------------------------------------------------------------- */
1358 * Copy `src' to `dst' expanding tabs.
1360 * \param dst destination buffer
1361 * \param dstsize size of dst buffer
1362 * \param[in,out] _src source buffer
1363 * \param srcsize size of src buffer
1364 * \param base virtual base of this string, needed to calculate tabs
1365 * \param ts tab size
1367 * \return new virtual base
1369 * \note The procedure returns when all bytes are consumed from `src'
1370 * or `dstsize' bytes are written to `dst'
1371 * \note Upon return, `src' points to the first unwritten character in source
1374 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1377 const char *src
= *_src
;
1378 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1383 int j
= TAB_SKIP (ts
, i
+ base
);
1384 if (j
> dstsize
- i
)
1400 /* --------------------------------------------------------------------------------------------- */
1403 * Read line from memory, converting tabs to spaces and padding with spaces.
1405 * \param src buffer to read from
1406 * \param srcsize size of src buffer
1407 * \param dst buffer to read to
1408 * \param dstsize size of dst buffer, excluding trailing null
1409 * \param skip number of characters to skip
1410 * \param ts tab size
1411 * \param show_cr show trailing carriage return as ^M
1413 * \return negative on error, otherwise number of bytes except padding
1416 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
)
1424 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1428 int j
= TAB_SKIP (ts
, i
+ base
);
1436 else if (dstsize
!= 0)
1443 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1445 if (skip
== 0 && show_cr
)
1470 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1473 if (!g_unichar_isprint (utf_ch
))
1485 while (dstsize
!= 0)
1494 /* --------------------------------------------------------------------------------------------- */
1497 * Read line from memory and build attribute array.
1499 * \param src buffer to read from
1500 * \param srcsize size of src buffer
1501 * \param dst buffer to read to
1502 * \param dstsize size of dst buffer, excluding trailing null
1503 * \param skip number of characters to skip
1504 * \param ts tab size
1505 * \param show_cr show trailing carriage return as ^M
1506 * \param hdiff horizontal diff structure
1507 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1508 * \param att buffer of attributes
1510 * \return negative on error, otherwise number of bytes except padding
1513 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
,
1514 GArray
* hdiff
, int ord
, char *att
)
1522 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1526 int j
= TAB_SKIP (ts
, i
+ base
);
1534 else if (dstsize
!= 0)
1537 *att
++ = is_inside (k
, hdiff
, ord
);
1542 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1544 if (skip
== 0 && show_cr
)
1549 *att
++ = is_inside (k
, hdiff
, ord
);
1551 *att
++ = is_inside (k
, hdiff
, ord
);
1557 *att
++ = is_inside (k
, hdiff
, ord
);
1572 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1575 if (!g_unichar_isprint (utf_ch
))
1581 *att
++ = is_inside (k
, hdiff
, ord
);
1588 while (dstsize
!= 0)
1598 /* --------------------------------------------------------------------------------------------- */
1601 * Read line from file, converting tabs to spaces and padding with spaces.
1603 * \param f file stream to read from
1604 * \param off offset of line inside file
1605 * \param dst buffer to read to
1606 * \param dstsize size of dst buffer, excluding trailing null
1607 * \param skip number of characters to skip
1608 * \param ts tab size
1609 * \param show_cr show trailing carriage return as ^M
1611 * \return negative on error, otherwise number of bytes except padding
1614 cvt_fget (FBUF
* f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, int show_cr
)
1617 int old_base
= base
;
1618 const int amount
= dstsize
;
1620 size_t useful
, offset
;
1627 const char *q
= NULL
;
1628 char tmp
[BUFSIZ
]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1629 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1631 if ((int) sizeof (tmp
) < amount
|| (int) sizeof (tmp
) <= dstsize
1632 || (int) sizeof (cvt
) < 8 * amount
)
1634 /* abnormal, but avoid buffer overflow */
1635 memset (dst
, ' ', dstsize
);
1636 dst
[dstsize
] = '\0';
1640 f_seek (f
, off
, SEEK_SET
);
1645 sz
= f_gets (tmp
, amount
, f
);
1649 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1650 if (cvt
[base
- old_base
- 1] == '\n')
1652 q
= &cvt
[base
- old_base
- 1];
1653 base
= old_base
+ q
- cvt
+ 1;
1660 memset (dst
, ' ', dstsize
);
1661 dst
[dstsize
] = '\0';
1665 useful
= base
- skip
;
1666 offset
= skip
- old_base
;
1668 if (useful
<= dstsize
)
1671 memmove (dst
, cvt
+ offset
, useful
);
1675 sz
= f_gets (tmp
, dstsize
- useful
+ 1, f
);
1678 const char *ptr
= tmp
;
1679 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1688 memmove (dst
, cvt
+ offset
, dstsize
);
1690 lastch
= cvt
[offset
+ dstsize
];
1694 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1696 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1700 if (i
+ 1 < dstsize
)
1713 for (; i
< dstsize
; i
++)
1721 /* --------------------------------------------------------------------------------------------- */
1722 /* diff printers et al ****************************************************** */
1725 cc_free_elt (void *elt
)
1734 /* --------------------------------------------------------------------------------------------- */
1737 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1739 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1740 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1748 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1750 if (sz
!= 0 && str
[sz
- 1] == '\n')
1755 p
.p
= g_strndup (str
, sz
);
1758 g_array_append_val (a
, p
);
1760 else if (dsrc
== DATA_SRC_MEM
)
1763 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1764 if (sz
!= 0 && str
[sz
- 1] == '\n')
1770 size_t new_size
= p
->u
.len
+ sz
;
1771 char *q
= g_realloc (p
->p
, new_size
);
1772 memcpy (q
+ p
->u
.len
, str
, sz
);
1777 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1779 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1780 f_write (f
, str
, sz
);
1785 /* --------------------------------------------------------------------------------------------- */
1788 redo_diff (WDiff
* dview
)
1790 FBUF
*const *f
= dview
->f
;
1800 if (dview
->opt
.quality
== 2)
1802 strcat (extra
, " -d");
1804 if (dview
->opt
.quality
== 1)
1806 strcat (extra
, " --speed-large-files");
1808 if (dview
->opt
.strip_trailing_cr
)
1810 strcat (extra
, " --strip-trailing-cr");
1812 if (dview
->opt
.ignore_tab_expansion
)
1814 strcat (extra
, " -E");
1816 if (dview
->opt
.ignore_space_change
)
1818 strcat (extra
, " -b");
1820 if (dview
->opt
.ignore_all_space
)
1822 strcat (extra
, " -w");
1824 if (dview
->opt
.ignore_case
)
1826 strcat (extra
, " -i");
1829 if (dview
->dsrc
!= DATA_SRC_MEM
)
1835 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1836 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[0], dview
->file
[1], ops
);
1840 g_array_free (ops
, TRUE
);
1844 ctx
.dsrc
= dview
->dsrc
;
1847 ctx
.a
= dview
->a
[0];
1849 rv
|= dff_reparse (0, dview
->file
[0], ops
, printer
, &ctx
);
1851 ctx
.a
= dview
->a
[1];
1853 rv
|= dff_reparse (1, dview
->file
[1], ops
, printer
, &ctx
);
1856 g_array_free (ops
, TRUE
);
1858 if (rv
!= 0 || dview
->a
[0]->len
!= dview
->a
[1]->len
)
1861 if (dview
->dsrc
== DATA_SRC_TMP
)
1867 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1869 dview
->hdiff
= g_ptr_array_new ();
1870 if (dview
->hdiff
!= NULL
)
1875 for (i
= 0; i
< dview
->a
[0]->len
; i
++)
1878 p
= &g_array_index (dview
->a
[0], DIFFLN
, i
);
1879 q
= &g_array_index (dview
->a
[1], DIFFLN
, i
);
1880 if (p
->line
&& q
->line
&& p
->ch
== CHG_CH
)
1882 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1885 gboolean runresult
=
1886 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
,
1890 g_array_free (h
, TRUE
);
1895 g_ptr_array_add (dview
->hdiff
, h
);
1902 /* --------------------------------------------------------------------------------------------- */
1905 destroy_hdiff (WDiff
* dview
)
1907 if (dview
->hdiff
!= NULL
)
1910 int len
= dview
->a
[0]->len
;
1911 for (i
= 0; i
< len
; i
++)
1913 GArray
*h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1915 g_array_free (h
, TRUE
);
1917 g_ptr_array_free (dview
->hdiff
, TRUE
);
1918 dview
->hdiff
= NULL
;
1921 mc_search_free (dview
->search
.handle
);
1922 dview
->search
.handle
= NULL
;
1923 g_free (dview
->search
.last_string
);
1924 dview
->search
.last_string
= NULL
;
1927 /* --------------------------------------------------------------------------------------------- */
1928 /* stuff ******************************************************************** */
1931 get_digits (unsigned int n
)
1941 /* --------------------------------------------------------------------------------------------- */
1944 get_line_numbers (const GArray
* a
, size_t pos
, int *linenum
, int *lineofs
)
1958 p
= &g_array_index (a
, DIFFLN
, pos
);
1963 for (n
= pos
; n
> 0; n
--)
1971 *lineofs
= pos
- n
+ 1;
1979 /* --------------------------------------------------------------------------------------------- */
1982 calc_nwidth (const GArray
** const a
)
1986 get_line_numbers (a
[0], a
[0]->len
- 1, &l1
, &o1
);
1987 get_line_numbers (a
[1], a
[1]->len
- 1, &l2
, &o2
);
1992 return get_digits (l1
);
1995 /* --------------------------------------------------------------------------------------------- */
1998 find_prev_hunk (const GArray
* a
, int pos
)
2001 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2005 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2009 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2013 if (pos
> 0 && (size_t) pos
< a
->len
)
2016 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
)
2020 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
)
2029 /* --------------------------------------------------------------------------------------------- */
2032 find_next_hunk (const GArray
* a
, size_t pos
)
2034 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2038 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2046 * Find start and end lines of the current hunk.
2048 * \param dview - widget WDiff
2049 * \return boolean and
2050 * start_line1 first line of current hunk (file[0])
2051 * end_line1 last line of current hunk (file[0])
2052 * start_line1 first line of current hunk (file[0])
2053 * end_line1 last line of current hunk (file[0])
2056 get_current_hunk (WDiff
* dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
2058 const GArray
*a0
= dview
->a
[0];
2059 const GArray
*a1
= dview
->a
[1];
2069 pos
= dview
->skip_rows
;
2070 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
2085 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2091 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
2092 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
2094 pos
= dview
->skip_rows
;
2095 while (pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2098 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
2099 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
2101 *end_line1
= max (*start_line1
, l0
);
2103 *end_line2
= max (*start_line2
, l1
);
2111 dview_remove_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
)
2116 f0
= fopen (dview
->file
[0], "r");
2118 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2121 fputs (buf
, merge_file
);
2123 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2127 fputs (buf
, merge_file
);
2133 dview_add_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int from2
, int to2
)
2139 f0
= fopen (dview
->file
[0], "r");
2140 f1
= fopen (dview
->file
[1], "r");
2142 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2145 fputs (buf
, merge_file
);
2148 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
)
2152 fputs (buf
, merge_file
);
2154 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2156 fputs (buf
, merge_file
);
2163 dview_replace_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
, int from2
, int to2
)
2169 f0
= fopen (dview
->file
[0], "r");
2170 f1
= fopen (dview
->file
[1], "r");
2172 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1)
2175 fputs (buf
, merge_file
);
2178 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
)
2182 fputs (buf
, merge_file
);
2184 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2188 fputs (buf
, merge_file
);
2195 do_merge_hunk (WDiff
* dview
)
2197 int from1
, to1
, from2
, to2
;
2201 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2206 vfs_path_t
*merge_file_name_vpath
= NULL
;
2210 dview
->merged
= mc_util_make_backup_if_possible (dview
->file
[0], "~~~");
2213 message (D_ERROR
, MSG_ERROR
,
2214 _("Cannot create backup file\n%s%s\n%s"),
2215 dview
->file
[0], "~~~", unix_error_string (errno
));
2221 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2222 if (merge_file_fd
== -1)
2224 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2225 unix_error_string (errno
));
2229 merge_file
= fdopen (merge_file_fd
, "w");
2234 dview_remove_hunk (dview
, merge_file
, from1
, to1
);
2237 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
);
2240 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
);
2243 fflush (merge_file
);
2244 fclose (merge_file
);
2245 res
= rewrite_backup_content (merge_file_name_vpath
, dview
->file
[0]);
2246 mc_unlink (merge_file_name_vpath
);
2247 vfs_path_free (merge_file_name_vpath
);
2251 /* --------------------------------------------------------------------------------------------- */
2252 /* view routines and callbacks ********************************************** */
2255 dview_compute_split (WDiff
* dview
, int i
)
2258 if (dview
->bias
< 2 - dview
->half1
)
2260 dview
->bias
= 2 - dview
->half1
;
2262 if (dview
->bias
> dview
->half2
- 2)
2264 dview
->bias
= dview
->half2
- 2;
2268 /* --------------------------------------------------------------------------------------------- */
2271 dview_compute_areas (WDiff
* dview
)
2273 dview
->height
= LINES
- 2;
2274 dview
->half1
= COLS
/ 2;
2275 dview
->half2
= COLS
- dview
->half1
;
2277 dview_compute_split (dview
, 0);
2280 /* --------------------------------------------------------------------------------------------- */
2283 dview_init (WDiff
* dview
, const char *args
, const char *file1
, const char *file2
,
2284 const char *label1
, const char *label2
, DSRC dsrc
)
2292 if (dsrc
== DATA_SRC_TMP
)
2305 else if (dsrc
== DATA_SRC_ORG
)
2307 f
[0] = f_open (file1
, O_RDONLY
);
2311 f
[1] = f_open (file2
, O_RDONLY
);
2320 dview
->file
[0] = file1
;
2321 dview
->file
[1] = file2
;
2322 dview
->label
[0] = g_strdup (label1
);
2323 dview
->label
[1] = g_strdup (label2
);
2326 dview
->hdiff
= NULL
;
2328 dview
->converter
= str_cnv_from_term
;
2329 dview_set_codeset (dview
);
2331 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2332 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2334 ndiff
= redo_diff (dview
);
2337 /* goto WIDGET_DESTROY stage: dview_fini() */
2341 dview
->ndiff
= ndiff
;
2343 dview
->view_quit
= 0;
2346 dview
->new_frame
= 1;
2347 dview
->skip_rows
= 0;
2348 dview
->skip_cols
= 0;
2349 dview
->display_symbols
= 0;
2350 dview
->display_numbers
= 0;
2352 dview
->tab_size
= 8;
2356 dview
->search
.handle
= NULL
;
2357 dview
->search
.last_string
= NULL
;
2358 dview
->search
.last_found_line
= -1;
2359 dview
->search
.last_accessed_num_line
= -1;
2361 dview
->opt
.quality
= 0;
2362 dview
->opt
.strip_trailing_cr
= 0;
2363 dview
->opt
.ignore_tab_expansion
= 0;
2364 dview
->opt
.ignore_space_change
= 0;
2365 dview
->opt
.ignore_all_space
= 0;
2366 dview
->opt
.ignore_case
= 0;
2368 dview_compute_areas (dview
);
2373 /* --------------------------------------------------------------------------------------------- */
2376 dview_reread (WDiff
* dview
)
2378 int ndiff
= dview
->ndiff
;
2380 destroy_hdiff (dview
);
2381 if (dview
->a
[0] != NULL
)
2383 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2384 g_array_free (dview
->a
[0], TRUE
);
2386 if (dview
->a
[1] != NULL
)
2388 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2389 g_array_free (dview
->a
[1], TRUE
);
2392 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2393 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2395 ndiff
= redo_diff (dview
);
2397 dview
->ndiff
= ndiff
;
2400 /* --------------------------------------------------------------------------------------------- */
2402 dview_diff_options (WDiff
* dview
)
2404 const char *quality_str
[] = {
2406 N_("&Fastest (Assume large files)"),
2407 N_("&Minimal (Find a smaller set of change)")
2410 QuickWidget diffopt_widgets
[] = {
2411 QUICK_BUTTON (6, 10, 14, OPTY
, N_("&Cancel"), B_CANCEL
, NULL
),
2412 QUICK_BUTTON (2, 10, 14, OPTY
, N_("&OK"), B_ENTER
, NULL
),
2414 QUICK_CHECKBOX (3, OPTX
, 12, OPTY
,
2415 N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
),
2416 QUICK_CHECKBOX (3, OPTX
, 11, OPTY
,
2417 N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
),
2418 QUICK_CHECKBOX (3, OPTX
, 10, OPTY
,
2419 N_("Ignore &space change"), &dview
->opt
.ignore_space_change
),
2420 QUICK_CHECKBOX (3, OPTX
, 9, OPTY
,
2421 N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
),
2422 QUICK_CHECKBOX (3, OPTX
, 8, OPTY
,
2423 N_("&Ignore case"), &dview
->opt
.ignore_case
),
2424 QUICK_LABEL (3, OPTX
, 7, OPTY
, N_("Diff extra options")),
2425 QUICK_RADIO (3, OPTX
, 3, OPTY
,
2426 3, (const char **) quality_str
, (int *) &dview
->opt
.quality
),
2427 QUICK_LABEL (3, OPTX
, 2, OPTY
, N_("Diff algorithm")),
2432 QuickDialog diffopt
= {
2434 N_("Diff Options"), "[Diff Options]",
2435 diffopt_widgets
, NULL
, NULL
, FALSE
2438 if (quick_dialog (&diffopt
) != B_CANCEL
)
2440 dview_reread (dview
);
2444 /* --------------------------------------------------------------------------------------------- */
2447 dview_fini (WDiff
* dview
)
2449 if (dview
->dsrc
!= DATA_SRC_MEM
)
2451 f_close (dview
->f
[1]);
2452 f_close (dview
->f
[0]);
2455 if (dview
->converter
!= str_cnv_from_term
)
2456 str_close_conv (dview
->converter
);
2458 destroy_hdiff (dview
);
2459 if (dview
->a
[0] != NULL
)
2461 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2462 g_array_free (dview
->a
[0], TRUE
);
2465 if (dview
->a
[1] != NULL
)
2467 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2468 g_array_free (dview
->a
[1], TRUE
);
2472 g_free (dview
->label
[0]);
2473 g_free (dview
->label
[1]);
2477 /* --------------------------------------------------------------------------------------------- */
2480 dview_display_file (const WDiff
* dview
, int ord
, int r
, int c
, int height
, int width
)
2485 FBUF
*f
= dview
->f
[ord
];
2486 int skip
= dview
->skip_cols
;
2487 int display_symbols
= dview
->display_symbols
;
2488 int display_numbers
= dview
->display_numbers
;
2489 int show_cr
= dview
->show_cr
;
2492 int nwidth
= display_numbers
;
2493 int xwidth
= display_symbols
+ display_numbers
;
2494 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2495 tab_size
= dview
->tab_size
;
2499 if (xwidth
> width
&& display_symbols
)
2502 display_symbols
= 0;
2504 if (xwidth
> width
&& display_numbers
)
2507 display_numbers
= width
;
2521 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2523 /* abnormal, but avoid buffer overflow */
2527 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2529 int ch
, next_ch
, col
;
2531 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2533 tty_setcolor (NORMAL_COLOR
);
2534 if (display_symbols
)
2536 tty_gotoyx (r
+ j
, c
- 2);
2537 tty_print_char (ch
);
2541 if (display_numbers
)
2543 tty_gotoyx (r
+ j
, c
- xwidth
);
2544 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2545 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2549 tty_setcolor (DFF_ADD_COLOR
);
2553 tty_setcolor (DFF_CHG_COLOR
);
2557 if (i
== (size_t) dview
->search
.last_found_line
)
2559 tty_setcolor (MARKED_SELECTED_COLOR
);
2563 if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2567 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2570 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2571 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2572 tty_gotoyx (r
+ j
, c
);
2574 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2580 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2583 if (!g_unichar_isprint (next_ch
))
2587 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2590 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2592 if (mc_global
.utf8_display
)
2597 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2601 else if (dview
->utf8
)
2603 convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2606 next_ch
= convert_to_display_c (next_ch
);
2608 tty_print_anychar (next_ch
);
2614 else if (ch
== CHG_CH
)
2616 tty_setcolor (DFF_CHH_COLOR
);
2620 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2623 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2627 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2632 if (display_numbers
)
2634 tty_gotoyx (r
+ j
, c
- xwidth
);
2635 memset (buf
, ' ', display_numbers
);
2636 buf
[display_numbers
] = '\0';
2637 tty_print_string (buf
);
2641 tty_setcolor (DFF_DEL_COLOR
);
2645 tty_setcolor (DFF_CHD_COLOR
);
2647 memset (buf
, ' ', width
);
2650 tty_gotoyx (r
+ j
, c
);
2651 /* tty_print_nstring (buf, width); */
2653 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2659 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2662 if (!g_unichar_isprint (next_ch
))
2666 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2670 if (mc_global
.utf8_display
)
2675 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2678 else if (dview
->utf8
)
2679 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2682 next_ch
= convert_to_display_c (next_ch
);
2684 tty_print_anychar (next_ch
);
2690 tty_setcolor (NORMAL_COLOR
);
2692 if (width
< xwidth
- 1)
2696 memset (buf
, ' ', k
);
2698 for (; j
< height
; j
++)
2702 tty_gotoyx (r
+ j
, c
- xwidth
);
2703 /* tty_print_nstring (buf, xwidth - 1); */
2704 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2706 tty_gotoyx (r
+ j
, c
);
2707 /* tty_print_nstring (buf, width); */
2708 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2714 /* --------------------------------------------------------------------------------------------- */
2717 dview_status (const WDiff
* dview
, int ord
, int width
, int c
)
2721 int linenum
, lineofs
;
2725 tty_setcolor (STATUSBAR_COLOR
);
2728 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2730 filename_width
= width
- 22;
2731 if (filename_width
< 8)
2734 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2735 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2736 vfs_path_free (vpath
);
2737 buf
= str_term_trim (path
, filename_width
);
2739 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width
, buf
, linenum
, lineofs
,
2742 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width
, buf
, linenum
, lineofs
, dview
->ndiff
);
2746 /* --------------------------------------------------------------------------------------------- */
2749 dview_redo (WDiff
* dview
)
2751 if (dview
->display_numbers
)
2753 int old
= dview
->display_numbers
;
2754 dview
->display_numbers
= calc_nwidth ((const GArray
**) dview
->a
);
2755 dview
->new_frame
= (old
!= dview
->display_numbers
);
2757 dview_reread (dview
);
2760 /* --------------------------------------------------------------------------------------------- */
2763 dview_edit (WDiff
* dview
, int ord
)
2767 int linenum
, lineofs
;
2769 if (dview
->dsrc
== DATA_SRC_TMP
)
2771 error_dialog (_("Edit"), _("Edit is disabled"));
2775 h
= ((Widget
*) dview
)->owner
;
2778 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2779 h
->modal
= TRUE
; /* not allow edit file in several editors */
2781 vfs_path_t
*tmp_vpath
;
2783 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2784 do_edit_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2785 vfs_path_free (tmp_vpath
);
2789 dview_update (dview
);
2792 /* --------------------------------------------------------------------------------------------- */
2795 dview_goto_cmd (WDiff
* dview
, int ord
)
2797 static const char *title
[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2798 static char prev
[256];
2799 /* XXX some statics here, to be remembered between runs */
2804 input
= input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
, prev
);
2807 const char *s
= input
;
2808 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2814 for (; i
< dview
->a
[ord
]->len
; i
++)
2816 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2817 if (p
->line
== newline
)
2823 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2824 g_snprintf (prev
, sizeof (prev
), "%d", newline
);
2830 /* --------------------------------------------------------------------------------------------- */
2833 dview_labels (WDiff
* dview
)
2835 Dlg_head
*h
= dview
->widget
.owner
;
2836 WButtonBar
*b
= find_buttonbar (h
);
2838 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), diff_map
, (Widget
*) dview
);
2839 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), diff_map
, (Widget
*) dview
);
2840 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), diff_map
, (Widget
*) dview
);
2841 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), diff_map
, (Widget
*) dview
);
2842 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), diff_map
, (Widget
*) dview
);
2843 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), diff_map
, (Widget
*) dview
);
2844 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), diff_map
, (Widget
*) dview
);
2848 /* --------------------------------------------------------------------------------------------- */
2851 dview_event (Gpm_Event
* event
, void *data
)
2853 WDiff
*dview
= (WDiff
*) data
;
2855 if (!mouse_global_in_widget (event
, data
))
2856 return MOU_UNHANDLED
;
2858 /* We are not interested in release events */
2859 if ((event
->type
& (GPM_DOWN
| GPM_DRAG
)) == 0)
2863 if ((event
->buttons
& GPM_B_UP
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2865 dview
->skip_rows
-= 2;
2866 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2867 dview_update (dview
);
2869 else if ((event
->buttons
& GPM_B_DOWN
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2871 dview
->skip_rows
+= 2;
2872 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2873 dview_update (dview
);
2880 dview_save (WDiff
* dview
)
2882 gboolean res
= TRUE
;
2885 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2886 dview
->merged
= !res
;
2891 dview_do_save (WDiff
* dview
)
2893 (void) dview_save (dview
);
2897 dview_save_options (WDiff
* dview
)
2899 mc_config_set_bool (mc_main_config
, "DiffView", "show_symbols",
2900 dview
->display_symbols
!= 0 ? TRUE
: FALSE
);
2901 mc_config_set_bool (mc_main_config
, "DiffView", "show_numbers",
2902 dview
->display_numbers
!= 0 ? TRUE
: FALSE
);
2903 mc_config_set_int (mc_main_config
, "DiffView", "tab_size", dview
->tab_size
);
2905 mc_config_set_int (mc_main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2907 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_tws",
2908 dview
->opt
.strip_trailing_cr
);
2909 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_all_space",
2910 dview
->opt
.ignore_all_space
);
2911 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_space_change",
2912 dview
->opt
.ignore_space_change
);
2913 mc_config_set_bool (mc_main_config
, "DiffView", "diff_tab_expansion",
2914 dview
->opt
.ignore_tab_expansion
);
2915 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_case", dview
->opt
.ignore_case
);
2919 dview_load_options (WDiff
* dview
)
2921 gboolean show_numbers
, show_symbols
;
2924 show_symbols
= mc_config_get_bool (mc_main_config
, "DiffView", "show_symbols", FALSE
);
2926 dview
->display_symbols
= 1;
2927 show_numbers
= mc_config_get_bool (mc_main_config
, "DiffView", "show_numbers", FALSE
);
2929 dview
->display_numbers
= calc_nwidth ((const GArray
** const) dview
->a
);
2930 tab_size
= mc_config_get_int (mc_main_config
, "DiffView", "tab_size", 8);
2931 if (tab_size
> 0 && tab_size
< 9)
2932 dview
->tab_size
= tab_size
;
2934 dview
->tab_size
= 8;
2936 dview
->opt
.quality
= mc_config_get_int (mc_main_config
, "DiffView", "diff_quality", 0);
2938 dview
->opt
.strip_trailing_cr
=
2939 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2940 dview
->opt
.ignore_all_space
=
2941 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2942 dview
->opt
.ignore_space_change
=
2943 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2944 dview
->opt
.ignore_tab_expansion
=
2945 mc_config_get_bool (mc_main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2946 dview
->opt
.ignore_case
=
2947 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_case", FALSE
);
2949 dview
->new_frame
= 1;
2953 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2957 dview_ok_to_exit (WDiff
* dview
)
2959 gboolean res
= TRUE
;
2965 act
= query_dialog (_("Quit"), !mc_global
.midnight_shutdown
?
2966 _("File was modified. Save with exit?") :
2967 _("Midnight Commander is being shut down.\nSave modified file?"),
2968 D_NORMAL
, 2, _("&Yes"), _("&No"));
2971 if (mc_global
.midnight_shutdown
|| (act
== -1))
2980 (void) dview_save (dview
);
2984 if (mc_util_restore_from_backup_if_possible (dview
->file
[0], "~~~"))
2985 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2994 /* --------------------------------------------------------------------------------------------- */
2997 dview_execute_cmd (WDiff
* dview
, unsigned long command
)
2999 cb_ret_t res
= MSG_HANDLED
;
3002 case CK_ShowSymbols
:
3003 dview
->display_symbols
^= 1;
3004 dview
->new_frame
= 1;
3006 case CK_ShowNumbers
:
3007 dview
->display_numbers
^= calc_nwidth ((const GArray
** const) dview
->a
);
3008 dview
->new_frame
= 1;
3012 dview
->new_frame
= 1;
3018 dview
->new_frame
= 1;
3024 dview_compute_split (dview
, 1);
3025 dview
->new_frame
= 1;
3032 dview_compute_split (dview
, -1);
3033 dview
->new_frame
= 1;
3037 dview
->tab_size
= 2;
3040 dview
->tab_size
= 3;
3043 dview
->tab_size
= 4;
3046 dview
->tab_size
= 8;
3055 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3056 find_next_hunk (dview
->a
[0], dview
->skip_rows
);
3059 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3060 find_prev_hunk (dview
->a
[0], dview
->skip_rows
);
3063 dview_goto_cmd (dview
, TRUE
);
3066 dview_edit (dview
, dview
->ord
);
3069 do_merge_hunk (dview
);
3073 dview_edit (dview
, dview
->ord
^ 1);
3076 dview_search_cmd (dview
);
3078 case CK_SearchContinue
:
3079 dview_continue_search_cmd (dview
);
3082 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3085 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[0]->len
- 1;
3088 if (dview
->skip_rows
> 0)
3091 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3096 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3099 if (dview
->height
> 2)
3101 dview
->skip_rows
+= dview
->height
- 2;
3102 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3106 if (dview
->height
> 2)
3108 dview
->skip_rows
-= dview
->height
- 2;
3109 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3119 dview
->skip_cols
-= 8;
3122 dview
->skip_cols
+= 8;
3125 dview
->skip_cols
= 0;
3131 dview
->view_quit
= 1;
3134 dview_do_save (dview
);
3137 dview_diff_options (dview
);
3140 case CK_SelectCodepage
:
3141 dview_select_encoding (dview
);
3142 dview_reread (dview
);
3143 tty_touch_screen ();
3148 /* don't close diffviewer due to SIGINT */
3151 res
= MSG_NOT_HANDLED
;
3156 /* --------------------------------------------------------------------------------------------- */
3159 dview_handle_key (WDiff
* dview
, int key
)
3161 unsigned long command
;
3163 key
= convert_from_input_c (key
);
3165 command
= keybind_lookup_keymap_command (diff_map
, key
);
3166 if ((command
!= CK_IgnoreKey
) && (dview_execute_cmd (dview
, command
) == MSG_HANDLED
))
3170 return MSG_NOT_HANDLED
;
3173 /* --------------------------------------------------------------------------------------------- */
3176 dview_callback (Widget
* w
, widget_msg_t msg
, int parm
)
3178 WDiff
*dview
= (WDiff
*) w
;
3179 Dlg_head
*h
= dview
->widget
.owner
;
3185 dview_labels (dview
);
3186 dview_load_options (dview
);
3187 dview_update (dview
);
3191 dview
->new_frame
= 1;
3192 dview_update (dview
);
3196 i
= dview_handle_key (dview
, parm
);
3197 if (dview
->view_quit
)
3200 dview_update (dview
);
3203 case WIDGET_COMMAND
:
3204 i
= dview_execute_cmd (dview
, parm
);
3205 if (dview
->view_quit
)
3208 dview_update (dview
);
3211 case WIDGET_DESTROY
:
3212 dview_save_options (dview
);
3217 return default_proc (msg
, parm
);
3221 /* --------------------------------------------------------------------------------------------- */
3224 dview_adjust_size (Dlg_head
* h
)
3229 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3230 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3231 bar
= find_buttonbar (h
);
3232 widget_set_size (&dview
->widget
, 0, 0, LINES
- 1, COLS
);
3233 widget_set_size ((Widget
*) bar
, LINES
- 1, 0, 1, COLS
);
3235 dview_compute_areas (dview
);
3238 /* --------------------------------------------------------------------------------------------- */
3241 dview_dialog_callback (Dlg_head
* h
, Widget
* sender
, dlg_msg_t msg
, int parm
, void *data
)
3243 WDiff
*dview
= (WDiff
*) data
;
3248 dview_adjust_size (h
);
3254 return dview_execute_cmd (NULL
, parm
);
3255 /* message from buttonbar */
3256 if (sender
== (Widget
*) find_buttonbar (h
))
3259 return send_message ((Widget
*) data
, WIDGET_COMMAND
, parm
);
3261 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3262 return dview_execute_cmd (dview
, parm
);
3264 return MSG_NOT_HANDLED
;
3267 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3268 h
->state
= DLG_ACTIVE
; /* don't stop the dialog before final decision */
3269 if (dview_ok_to_exit (dview
))
3270 h
->state
= DLG_CLOSED
;
3274 return default_dlg_callback (h
, sender
, msg
, parm
, data
);
3278 /* --------------------------------------------------------------------------------------------- */
3281 dview_get_title (const Dlg_head
* h
, size_t len
)
3283 const WDiff
*dview
= (const WDiff
*) find_widget_type (h
, dview_callback
);
3284 const char *modified
= dview
->merged
? " (*) " : " ";
3288 len1
= (len
- str_term_width1 (_("Diff:")) - strlen (modified
) - 3) / 2;
3290 title
= g_string_sized_new (len
);
3291 g_string_append (title
, _("Diff:"));
3292 g_string_append (title
, modified
);
3293 g_string_append (title
, str_term_trim (dview
->label
[0], len1
));
3294 g_string_append (title
, " | ");
3295 g_string_append (title
, str_term_trim (dview
->label
[1], len1
));
3297 return g_string_free (title
, FALSE
);
3300 /* --------------------------------------------------------------------------------------------- */
3303 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3307 Dlg_head
*dview_dlg
;
3309 /* Create dialog and widgets, put them on the dialog */
3311 create_dlg (FALSE
, 0, 0, LINES
, COLS
, NULL
, dview_dialog_callback
, NULL
,
3312 "[Diff Viewer]", NULL
, DLG_WANT_TAB
);
3314 dview
= g_new0 (WDiff
, 1);
3316 init_widget (&dview
->widget
, 0, 0, LINES
- 1, COLS
,
3317 (callback_fn
) dview_callback
, (mouse_h
) dview_event
);
3319 widget_want_cursor (dview
->widget
, 0);
3321 add_widget (dview_dlg
, dview
);
3322 add_widget (dview_dlg
, buttonbar_new (TRUE
));
3324 dview_dlg
->get_title
= dview_get_title
;
3326 error
= dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); /* XXX binary diff? */
3328 /* Please note that if you add another widget,
3329 * you have to modify dview_adjust_size to
3333 run_dlg (dview_dlg
);
3335 if ((error
!= 0) || (dview_dlg
->state
== DLG_CLOSED
))
3336 destroy_dlg (dview_dlg
);
3338 return error
== 0 ? 1 : 0;
3341 /*** public functions ****************************************************************************/
3342 /* --------------------------------------------------------------------------------------------- */
3344 #define GET_FILE_AND_STAMP(n) \
3348 real_file##n = file##n; \
3349 if (!vfs_file_is_local (file##n)) \
3351 real_file##n = mc_getlocalcopy (file##n); \
3352 if (real_file##n != NULL) \
3355 if (mc_stat (real_file##n, &st##n) != 0) \
3362 #define UNGET_FILE(n) \
3368 if (use_copy##n > 0) \
3371 mtime = st##n.st_mtime; \
3372 if (mc_stat (real_file##n, &st##n) == 0) \
3373 changed = (mtime != st##n.st_mtime); \
3375 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3376 vfs_path_free (real_file##n); \
3382 dview_diff_cmd (const void *f0
, const void *f1
)
3385 vfs_path_t
*file0
= NULL
;
3386 vfs_path_t
*file1
= NULL
;
3387 gboolean is_dir0
= FALSE
;
3388 gboolean is_dir1
= FALSE
;
3390 switch (mc_global
.mc_run_mode
)
3394 /* run from panels */
3395 const WPanel
*panel0
= (const WPanel
*) f0
;
3396 const WPanel
*panel1
= (const WPanel
*) f1
;
3398 file0
= vfs_path_append_new (panel0
->cwd_vpath
, selection (panel0
)->fname
, NULL
);
3399 is_dir0
= S_ISDIR (selection (panel0
)->st
.st_mode
);
3402 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3403 path_trunc (selection (panel0
)->fname
, 30));
3407 file1
= vfs_path_append_new (panel1
->cwd_vpath
, selection (panel1
)->fname
, NULL
);
3408 is_dir1
= S_ISDIR (selection (panel1
)->st
.st_mode
);
3411 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3412 path_trunc (selection (panel1
)->fname
, 30));
3418 case MC_RUN_DIFFVIEWER
:
3420 /* run from command line */
3421 const char *p0
= (const char *) f0
;
3422 const char *p1
= (const char *) f1
;
3425 file0
= vfs_path_from_str (p0
);
3426 if (mc_stat (file0
, &st
) == 0)
3428 is_dir0
= S_ISDIR (st
.st_mode
);
3431 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p0
, 30));
3437 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3438 path_trunc (p0
, 30), unix_error_string (errno
));
3442 file1
= vfs_path_from_str (p1
);
3443 if (mc_stat (file1
, &st
) == 0)
3445 is_dir1
= S_ISDIR (st
.st_mode
);
3448 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p1
, 30));
3454 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3455 path_trunc (p1
, 30), unix_error_string (errno
));
3462 /* this should not happaned */
3463 message (D_ERROR
, MSG_ERROR
, _("Diff viewer: invalid mode"));
3470 if (file0
!= NULL
&& file1
!= NULL
)
3476 vfs_path_t
*real_file0
;
3477 vfs_path_t
*real_file1
;
3479 GET_FILE_AND_STAMP (0);
3480 GET_FILE_AND_STAMP (1);
3481 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3483 char *real_file0_str
, *real_file1_str
;
3484 char *file0_str
, *file1_str
;
3486 real_file0_str
= vfs_path_to_str (real_file0
);
3487 real_file1_str
= vfs_path_to_str (real_file1
);
3488 file0_str
= vfs_path_to_str (file0
);
3489 file1_str
= vfs_path_to_str (file1
);
3490 rv
= diff_view (real_file0_str
, real_file1_str
, file0_str
, file1_str
);
3491 g_free (real_file0_str
);
3492 g_free (real_file1_str
);
3502 message (D_ERROR
, MSG_ERROR
, _("Two files are needed to compare"));
3505 vfs_path_free (file1
);
3506 vfs_path_free (file0
);
3508 return (rv
!= 0) ? 1 : 0;
3511 /* --------------------------------------------------------------------------------------------- */
3514 dview_update (WDiff
* dview
)
3516 int height
= dview
->height
;
3520 int last
= dview
->a
[0]->len
- 1;
3522 if (dview
->skip_rows
> last
)
3524 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
3526 if (dview
->skip_rows
< 0)
3528 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3530 if (dview
->skip_cols
< 0)
3532 dview
->skip_cols
= 0;
3540 width1
= dview
->half1
+ dview
->bias
;
3541 width2
= dview
->half2
- dview
->bias
;
3548 if (dview
->new_frame
)
3550 int xwidth
= dview
->display_symbols
+ dview
->display_numbers
;
3552 tty_setcolor (NORMAL_COLOR
);
3555 tty_draw_box (1, 0, height
, width1
, FALSE
);
3559 tty_draw_box (1, width1
, height
, width2
, FALSE
);
3565 if (xwidth
< width1
- 1)
3567 tty_gotoyx (1, xwidth
);
3568 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3569 tty_gotoyx (height
, xwidth
);
3570 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3571 tty_draw_vline (2, xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3573 if (xwidth
< width2
- 1)
3575 tty_gotoyx (1, width1
+ xwidth
);
3576 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3577 tty_gotoyx (height
, width1
+ xwidth
);
3578 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3579 tty_draw_vline (2, width1
+ xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3582 dview
->new_frame
= 0;
3587 dview_status (dview
, dview
->ord
, width1
, 0);
3588 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
3592 dview_status (dview
, dview
->ord
^ 1, width2
, width1
);
3593 dview_display_file (dview
, dview
->ord
^ 1, 2, width1
+ 1, height
- 2, width2
- 2);
3597 /* --------------------------------------------------------------------------------------------- */