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"
47 #include "lib/charsets.h"
49 #include "lib/event.h" /* mc_event_raise() */
51 #include "src/filemanager/cmd.h" /* do_edit_at_line(), view_other_cmd() */
52 #include "src/filemanager/panel.h"
53 #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */
55 #include "src/keybind-defaults.h"
56 #include "src/history.h"
58 #include "src/selcodepage.h"
64 /*** global variables ****************************************************************************/
66 /*** file scope macro definitions ****************************************************************/
68 #define g_array_foreach(a, TP, cbf) \
70 size_t g_array_foreach_i;\
71 TP *g_array_foreach_var=NULL; \
72 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
74 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
75 (*cbf) (g_array_foreach_var); \
79 #define FILE_READ_BUF 4096
80 #define FILE_FLAG_TEMP (1 << 0)
90 #define HDIFF_ENABLE 1
91 #define HDIFF_MINCTX 5
92 #define HDIFF_DEPTH 10
94 #define FILE_DIRTY(fs) \
102 /*** file scope type declarations ****************************************************************/
104 /*** file scope variables ************************************************************************/
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 rewrite_backup_content (const vfs_path_t
* from_file_name_vpath
, const char *to_file_name
)
126 const char *from_file_name
;
128 from_file_name
= vfs_path_get_by_index (from_file_name_vpath
, -1)->path
;
129 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
132 backup_fd
= fopen (to_file_name
, "w");
133 if (backup_fd
== NULL
)
139 length
= fwrite ((const void *) contents
, length
, 1, backup_fd
);
147 /* buffered I/O ************************************************************* */
150 * Try to open a temporary file.
152 * \param[out] name address of a pointer to store the temporary name
154 * \return file descriptor on success, negative on error
156 * \note the name is not altered if this function fails
160 open_temp (void **name
)
163 vfs_path_t
*diff_file_name
= NULL
;
165 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
168 message (D_ERROR
, MSG_ERROR
,
169 _("Cannot create temporary diff file\n%s"), unix_error_string (errno
));
172 *name
= vfs_path_to_str (diff_file_name
);
173 vfs_path_free (diff_file_name
);
177 /* --------------------------------------------------------------------------------------------- */
180 * Alocate file structure and associate file descriptor to it.
182 * \param fd file descriptor
184 * \return file structure
194 fs
= g_try_malloc (sizeof (FBUF
));
198 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
213 /* --------------------------------------------------------------------------------------------- */
216 * Free file structure without closing the file.
218 * \param fs file structure
220 * \return 0 on success, non-zero on error
226 if (fs
->flags
& FILE_FLAG_TEMP
)
228 rv
= unlink (fs
->data
);
237 /* --------------------------------------------------------------------------------------------- */
240 * Open a binary temporary file in R/W mode.
242 * \return file structure
244 * \note the file will be deleted when closed
258 fd
= open_temp (&fs
->data
);
266 fs
->flags
= FILE_FLAG_TEMP
;
270 /* --------------------------------------------------------------------------------------------- */
273 * Open a binary file in specified mode.
275 * \param filename file name
276 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
278 * \return file structure
281 f_open (const char *filename
, int flags
)
292 fd
= open (filename
, flags
);
303 /* --------------------------------------------------------------------------------------------- */
306 * Read a line of bytes from file until newline or EOF.
308 * \param buf destination buffer
309 * \param size size of buffer
310 * \param fs file structure
312 * \return number of bytes read
314 * \note does not stop on null-byte
315 * \note buf will not be null-terminated
318 f_gets (char *buf
, size_t size
, FBUF
* fs
)
327 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
337 if (j
== size
|| stop
)
343 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
350 /* --------------------------------------------------------------------------------------------- */
355 * \param fs file structure
357 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
359 * \return position in file, starting from begginning
361 * \note avoids thrashing read cache when possible
364 f_seek (FBUF
* fs
, off_t off
, int whence
)
368 if (fs
->len
&& whence
!= SEEK_END
)
370 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
373 if (whence
== SEEK_CUR
)
376 off
+= rv
- fs
->len
+ fs
->pos
;
378 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
380 fs
->pos
= fs
->len
+ off
- rv
;
386 rv
= lseek (fs
->fd
, off
, whence
);
394 /* --------------------------------------------------------------------------------------------- */
397 * Seek to the beginning of file, thrashing read cache.
399 * \param fs file structure
401 * \return 0 if success, non-zero on error
406 off_t rv
= lseek (fs
->fd
, 0, SEEK_SET
);
414 /* --------------------------------------------------------------------------------------------- */
417 * Write bytes to file.
419 * \param fs file structure
420 * \param buf source buffer
421 * \param size size of buffer
423 * \return number of written bytes, -1 on error
425 * \note thrashes read cache
428 f_write (FBUF
* fs
, const char *buf
, size_t size
)
430 ssize_t rv
= write (fs
->fd
, buf
, size
);
438 /* --------------------------------------------------------------------------------------------- */
441 * Truncate file to the current position.
443 * \param fs file structure
445 * \return current file size on success, negative on error
447 * \note thrashes read cache
452 off_t off
= lseek (fs
->fd
, 0, SEEK_CUR
);
455 int rv
= ftruncate (fs
->fd
, off
);
468 /* --------------------------------------------------------------------------------------------- */
473 * \param fs file structure
475 * \return 0 on success, non-zero on error
477 * \note if this is temporary file, it is deleted
482 int rv
= close (fs
->fd
);
487 /* --------------------------------------------------------------------------------------------- */
490 * Create pipe stream to process.
492 * \param cmd shell command line
493 * \param flags open mode, either O_RDONLY or O_WRONLY
495 * \return file structure
498 p_open (const char *cmd
, int flags
)
502 const char *type
= NULL
;
504 if (flags
== O_RDONLY
)
508 if (flags
== O_WRONLY
)
524 f
= popen (cmd
, type
);
536 /* --------------------------------------------------------------------------------------------- */
541 * \param fs structure
543 * \return 0 on success, non-zero on error
548 int rv
= pclose (fs
->data
);
554 * Get one char (byte) from string
556 * \param char * str, gboolean * result
558 * \return int as character or 0 and result == FALSE if fail
562 dview_get_byte (char *str
, gboolean
* result
)
570 return (unsigned char) *str
;
575 * Get utf multibyte char from string
577 * \param char * str, int * char_width, gboolean * result
579 * \return int as utf character or 0 and result == FALSE if fail
583 dview_get_utf (char *str
, int *char_width
, gboolean
* result
)
587 gchar
*next_ch
= NULL
;
598 res
= g_utf8_get_char_validated (str
, -1);
605 /* Calculate UTF-8 char width */
606 next_ch
= g_utf8_next_char (str
);
608 width
= next_ch
- str
;
617 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
620 if (text
== NULL
|| text
[0] == '\0')
622 if (g_utf8_validate (text
, -1, NULL
))
624 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
629 char *tmpbuf
, *buffer
;
630 buffer
= tmpbuf
= g_strdup (text
);
631 while (tmpbuf
[0] != '\0')
633 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
634 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
636 tmpbuf
= g_utf8_next_char (tmpbuf
);
645 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
648 return max (length
, (size_t) result
);
652 /* --------------------------------------------------------------------------------------------- */
653 /* diff parse *************************************************************** */
656 * Read decimal number from string.
658 * \param[in,out] str string to parse
659 * \param[out] n extracted number
661 * \return 0 if success, otherwise non-zero
664 scan_deci (const char **str
, int *n
)
666 const char *p
= *str
;
669 *n
= strtol (p
, &q
, 10);
678 /* --------------------------------------------------------------------------------------------- */
681 * Parse line for diff statement.
683 * \param p string to parse
684 * \param ops list of diff statements
686 * \return 0 if success, otherwise non-zero
689 scan_line (const char *p
, GArray
* ops
)
699 /* handle the following cases:
701 * NUM[,NUM]cNUM[,NUM]
703 * where NUM is a positive integer
706 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
715 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
730 else if (cmd
!= 'c' && cmd
!= 'd')
735 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
744 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
764 g_array_append_val (ops
, op
);
768 /* --------------------------------------------------------------------------------------------- */
771 * Parse diff output and extract diff statements.
773 * \param f stream to read from
774 * \param ops list of diff statements to fill
776 * \return positive number indicating number of hunks, otherwise negative
779 scan_diff (FBUF
* f
, GArray
* ops
)
784 while ((sz
= f_gets (buf
, sizeof (buf
) - 1, f
)))
786 if (isdigit (buf
[0]))
788 if (buf
[sz
- 1] != '\n')
793 if (scan_line (buf
, ops
) != 0)
799 while (buf
[sz
- 1] != '\n' && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
807 /* --------------------------------------------------------------------------------------------- */
810 * Invoke diff and extract diff statements.
812 * \param args extra arguments to be passed to diff
813 * \param extra more arguments to be passed to diff
814 * \param file1 first file to compare
815 * \param file2 second file to compare
816 * \param ops list of diff statements to fill
818 * \return positive number indicating number of hunks, otherwise negative
821 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
,
824 static const char *opt
=
825 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
826 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
827 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
828 " --unchanged-group-format=''";
835 cmd
= g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args
, extra
, opt
, file1
, file2
);
839 f
= p_open (cmd
, O_RDONLY
);
845 rv
= scan_diff (f
, ops
);
848 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
854 /* --------------------------------------------------------------------------------------------- */
857 * Reparse and display file according to diff statements.
859 * \param ord 0 if displaying first file, 1 if displaying 2nd file
860 * \param filename file name to display
861 * \param ops list of diff statements
862 * \param printer printf-like function to be used for displaying
863 * \param ctx printer context
865 * \return 0 if success, otherwise non-zero
868 dff_reparse (int ord
, const char *filename
, const GArray
* ops
, DFUNC printer
, void *ctx
)
881 f
= f_open (filename
, O_RDONLY
);
899 #define T1 a[ ord^1 ][0]
900 #define T2 a[ ord^1 ][1]
901 for (i
= 0; i
< ops
->len
; i
++)
904 op
= &g_array_index (ops
, DIFFCMD
, i
);
905 n
= op
->F1
- (op
->cmd
!= add_cmd
);
906 while (line
< n
&& (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
909 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
911 while (buf
[sz
- 1] != '\n')
913 sz
= f_gets (buf
, sizeof (buf
), f
);
916 printer (ctx
, 0, 0, 0, 1, "\n");
919 printer (ctx
, 0, 0, 0, sz
, buf
);
928 if (op
->cmd
== add_cmd
)
930 n
= op
->T2
- op
->T1
+ 1;
933 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
937 if (op
->cmd
== del_cmd
)
939 n
= op
->F2
- op
->F1
+ 1;
940 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
943 printer (ctx
, ADD_CH
, line
, off
, sz
, buf
);
945 while (buf
[sz
- 1] != '\n')
947 sz
= f_gets (buf
, sizeof (buf
), f
);
950 printer (ctx
, 0, 0, 0, 1, "\n");
953 printer (ctx
, 0, 0, 0, sz
, buf
);
965 n
= op
->F2
- op
->F1
+ 1;
966 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
969 printer (ctx
, CHG_CH
, line
, off
, sz
, buf
);
971 while (buf
[sz
- 1] != '\n')
973 sz
= f_gets (buf
, sizeof (buf
), f
);
976 printer (ctx
, 0, 0, 0, 1, "\n");
979 printer (ctx
, 0, 0, 0, sz
, buf
);
988 n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
);
991 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
1001 while ((sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1004 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
1006 while (buf
[sz
- 1] != '\n')
1008 sz
= f_gets (buf
, sizeof (buf
), f
);
1011 printer (ctx
, 0, 0, 0, 1, "\n");
1014 printer (ctx
, 0, 0, 0, sz
, buf
);
1027 /* --------------------------------------------------------------------------------------------- */
1028 /* horizontal diff ********************************************************** */
1031 * Longest common substring.
1033 * \param s first string
1034 * \param m length of first string
1035 * \param t second string
1036 * \param n length of second string
1037 * \param ret list of offsets for longest common substrings inside each string
1038 * \param min minimum length of common substrings
1040 * \return 0 if success, nonzero otherwise
1043 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
* ret
, int min
)
1051 if (m
< min
|| n
< min
)
1053 /* XXX early culling */
1057 Lprev
= g_new0 (int, n
+ 1);
1058 Lcurr
= g_new0 (int, n
+ 1);
1060 if (Lprev
== NULL
|| Lcurr
== NULL
)
1067 for (i
= 0; i
< m
; i
++)
1072 #ifdef USE_MEMSET_IN_LCS
1073 memset (Lcurr
, 0, (n
+ 1) * sizeof (int));
1075 for (j
= 0; j
< n
; j
++)
1077 #ifndef USE_MEMSET_IN_LCS
1082 int v
= Lprev
[j
] + 1;
1087 g_array_set_size (ret
, 0);
1089 if (z
== v
&& z
>= min
)
1091 int off0
= i
- z
+ 1;
1092 int off1
= j
- z
+ 1;
1094 for (k
= 0; k
< ret
->len
; k
++)
1096 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1097 if ((*p
)[0] == off0
)
1101 if ((*p
)[1] >= off1
)
1111 g_array_append_val (ret
, p2
);
1127 /* --------------------------------------------------------------------------------------------- */
1130 * Scan recursively for common substrings and build ranges.
1132 * \param s first string
1133 * \param t second string
1134 * \param bracket current limits for both of the strings
1135 * \param min minimum length of common substrings
1136 * \param hdiff list of horizontal diff ranges to fill
1137 * \param depth recursion depth
1139 * \return 0 if success, nonzero otherwise
1142 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
* hdiff
,
1152 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1156 len
= lcsubstr (s
+ bracket
[0].off
, bracket
[0].len
,
1157 t
+ bracket
[1].off
, bracket
[1].len
, ret
, min
);
1161 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1164 b
[0].off
= bracket
[0].off
;
1165 b
[0].len
= (*data
)[0];
1166 b
[1].off
= bracket
[1].off
;
1167 b
[1].len
= (*data
)[1];
1168 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1171 for (k
= 0; k
< ret
->len
- 1; k
++)
1173 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1174 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1175 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1176 b
[0].len
= (*data2
)[0] - (*data
)[0] - len
;
1177 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1178 b
[1].len
= (*data2
)[1] - (*data
)[1] - len
;
1179 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1182 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1183 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1184 b
[0].len
= bracket
[0].len
- (*data
)[0] - len
;
1185 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1186 b
[1].len
= bracket
[1].len
- (*data
)[1] - len
;
1187 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1190 g_array_free (ret
, TRUE
);
1195 p
[0].off
= bracket
[0].off
;
1196 p
[0].len
= bracket
[0].len
;
1197 p
[1].off
= bracket
[1].off
;
1198 p
[1].len
= bracket
[1].len
;
1199 g_array_append_val (hdiff
, p
);
1204 /* --------------------------------------------------------------------------------------------- */
1207 * Build list of horizontal diff ranges.
1209 * \param s first string
1210 * \param m length of first string
1211 * \param t second string
1212 * \param n length of second string
1213 * \param min minimum length of common substrings
1214 * \param hdiff list of horizontal diff ranges to fill
1215 * \param depth recursion depth
1217 * \return 0 if success, nonzero otherwise
1220 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
* hdiff
, unsigned int depth
)
1225 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1226 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1228 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1236 /* smartscan (multiple horizontal diff) */
1237 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1240 /* --------------------------------------------------------------------------------------------- */
1241 /* read line **************************************************************** */
1244 * Check if character is inside horizontal diff limits.
1246 * \param k rank of character inside line
1247 * \param hdiff horizontal diff structure
1248 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1250 * \return TRUE if inside hdiff limits, FALSE otherwise
1253 is_inside (int k
, GArray
* hdiff
, int ord
)
1257 for (i
= 0; i
< hdiff
->len
; i
++)
1260 b
= &g_array_index (hdiff
, BRACKET
, i
);
1262 start
= (*b
)[ord
].off
;
1263 end
= start
+ (*b
)[ord
].len
;
1264 if (k
>= start
&& k
< end
)
1272 /* --------------------------------------------------------------------------------------------- */
1275 * Copy `src' to `dst' expanding tabs.
1277 * \param dst destination buffer
1278 * \param src source buffer
1279 * \param srcsize size of src buffer
1280 * \param base virtual base of this string, needed to calculate tabs
1281 * \param ts tab size
1283 * \return new virtual base
1285 * \note The procedure returns when all bytes are consumed from `src'
1288 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1291 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1296 int j
= TAB_SKIP (ts
, i
+ base
);
1308 /* --------------------------------------------------------------------------------------------- */
1311 * Copy `src' to `dst' expanding tabs.
1313 * \param dst destination buffer
1314 * \param dstsize size of dst buffer
1315 * \param[in,out] _src source buffer
1316 * \param srcsize size of src buffer
1317 * \param base virtual base of this string, needed to calculate tabs
1318 * \param ts tab size
1320 * \return new virtual base
1322 * \note The procedure returns when all bytes are consumed from `src'
1323 * or `dstsize' bytes are written to `dst'
1324 * \note Upon return, `src' points to the first unwritten character in source
1327 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1330 const char *src
= *_src
;
1331 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1336 int j
= TAB_SKIP (ts
, i
+ base
);
1337 if (j
> dstsize
- i
)
1353 /* --------------------------------------------------------------------------------------------- */
1356 * Read line from memory, converting tabs to spaces and padding with spaces.
1358 * \param src buffer to read from
1359 * \param srcsize size of src buffer
1360 * \param dst buffer to read to
1361 * \param dstsize size of dst buffer, excluding trailing null
1362 * \param skip number of characters to skip
1363 * \param ts tab size
1364 * \param show_cr show trailing carriage return as ^M
1366 * \return negative on error, otherwise number of bytes except padding
1369 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
)
1377 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1381 int j
= TAB_SKIP (ts
, i
+ base
);
1389 else if (dstsize
!= 0)
1396 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1398 if (skip
== 0 && show_cr
)
1423 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1426 if (!g_unichar_isprint (utf_ch
))
1438 while (dstsize
!= 0)
1447 /* --------------------------------------------------------------------------------------------- */
1450 * Read line from memory and build attribute array.
1452 * \param src buffer to read from
1453 * \param srcsize size of src buffer
1454 * \param dst buffer to read to
1455 * \param dstsize size of dst buffer, excluding trailing null
1456 * \param skip number of characters to skip
1457 * \param ts tab size
1458 * \param show_cr show trailing carriage return as ^M
1459 * \param hdiff horizontal diff structure
1460 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1461 * \param att buffer of attributes
1463 * \return negative on error, otherwise number of bytes except padding
1466 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
,
1467 GArray
* hdiff
, int ord
, char *att
)
1475 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1479 int j
= TAB_SKIP (ts
, i
+ base
);
1487 else if (dstsize
!= 0)
1490 *att
++ = is_inside (k
, hdiff
, ord
);
1495 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1497 if (skip
== 0 && show_cr
)
1502 *att
++ = is_inside (k
, hdiff
, ord
);
1504 *att
++ = is_inside (k
, hdiff
, ord
);
1510 *att
++ = is_inside (k
, hdiff
, ord
);
1525 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1528 if (!g_unichar_isprint (utf_ch
))
1534 *att
++ = is_inside (k
, hdiff
, ord
);
1541 while (dstsize
!= 0)
1551 /* --------------------------------------------------------------------------------------------- */
1554 * Read line from file, converting tabs to spaces and padding with spaces.
1556 * \param f file stream to read from
1557 * \param off offset of line inside file
1558 * \param dst buffer to read to
1559 * \param dstsize size of dst buffer, excluding trailing null
1560 * \param skip number of characters to skip
1561 * \param ts tab size
1562 * \param show_cr show trailing carriage return as ^M
1564 * \return negative on error, otherwise number of bytes except padding
1567 cvt_fget (FBUF
* f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, int show_cr
)
1570 int old_base
= base
;
1571 const int amount
= dstsize
;
1573 size_t useful
, offset
;
1580 const char *q
= NULL
;
1581 char tmp
[BUFSIZ
]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1582 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1584 if ((int) sizeof (tmp
) < amount
|| (int) sizeof (tmp
) <= dstsize
1585 || (int) sizeof (cvt
) < 8 * amount
)
1587 /* abnormal, but avoid buffer overflow */
1588 memset (dst
, ' ', dstsize
);
1589 dst
[dstsize
] = '\0';
1593 f_seek (f
, off
, SEEK_SET
);
1598 sz
= f_gets (tmp
, amount
, f
);
1602 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1603 if (cvt
[base
- old_base
- 1] == '\n')
1605 q
= &cvt
[base
- old_base
- 1];
1606 base
= old_base
+ q
- cvt
+ 1;
1613 memset (dst
, ' ', dstsize
);
1614 dst
[dstsize
] = '\0';
1618 useful
= base
- skip
;
1619 offset
= skip
- old_base
;
1621 if (useful
<= dstsize
)
1624 memmove (dst
, cvt
+ offset
, useful
);
1628 sz
= f_gets (tmp
, dstsize
- useful
+ 1, f
);
1631 const char *ptr
= tmp
;
1632 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1641 memmove (dst
, cvt
+ offset
, dstsize
);
1643 lastch
= cvt
[offset
+ dstsize
];
1647 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1649 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1653 if (i
+ 1 < dstsize
)
1666 for (; i
< dstsize
; i
++)
1674 /* --------------------------------------------------------------------------------------------- */
1675 /* diff printers et al ****************************************************** */
1678 cc_free_elt (void *elt
)
1687 /* --------------------------------------------------------------------------------------------- */
1690 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1692 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1693 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1701 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1703 if (sz
!= 0 && str
[sz
- 1] == '\n')
1708 p
.p
= g_strndup (str
, sz
);
1711 g_array_append_val (a
, p
);
1713 else if (dsrc
== DATA_SRC_MEM
)
1716 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1717 if (sz
!= 0 && str
[sz
- 1] == '\n')
1723 size_t new_size
= p
->u
.len
+ sz
;
1724 char *q
= g_realloc (p
->p
, new_size
);
1725 memcpy (q
+ p
->u
.len
, str
, sz
);
1730 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1732 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1733 f_write (f
, str
, sz
);
1738 /* --------------------------------------------------------------------------------------------- */
1741 redo_diff (WDiff
* dview
)
1743 FBUF
*const *f
= dview
->f
;
1753 if (dview
->opt
.quality
== 2)
1755 strcat (extra
, " -d");
1757 if (dview
->opt
.quality
== 1)
1759 strcat (extra
, " --speed-large-files");
1761 if (dview
->opt
.strip_trailing_cr
)
1763 strcat (extra
, " --strip-trailing-cr");
1765 if (dview
->opt
.ignore_tab_expansion
)
1767 strcat (extra
, " -E");
1769 if (dview
->opt
.ignore_space_change
)
1771 strcat (extra
, " -b");
1773 if (dview
->opt
.ignore_all_space
)
1775 strcat (extra
, " -w");
1777 if (dview
->opt
.ignore_case
)
1779 strcat (extra
, " -i");
1782 if (dview
->dsrc
!= DATA_SRC_MEM
)
1788 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1789 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[0], dview
->file
[1], ops
);
1793 g_array_free (ops
, TRUE
);
1797 ctx
.dsrc
= dview
->dsrc
;
1800 ctx
.a
= dview
->a
[0];
1802 rv
|= dff_reparse (0, dview
->file
[0], ops
, printer
, &ctx
);
1804 ctx
.a
= dview
->a
[1];
1806 rv
|= dff_reparse (1, dview
->file
[1], ops
, printer
, &ctx
);
1809 g_array_free (ops
, TRUE
);
1811 if (rv
!= 0 || dview
->a
[0]->len
!= dview
->a
[1]->len
)
1814 if (dview
->dsrc
== DATA_SRC_TMP
)
1820 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1822 dview
->hdiff
= g_ptr_array_new ();
1823 if (dview
->hdiff
!= NULL
)
1828 for (i
= 0; i
< dview
->a
[0]->len
; i
++)
1831 p
= &g_array_index (dview
->a
[0], DIFFLN
, i
);
1832 q
= &g_array_index (dview
->a
[1], DIFFLN
, i
);
1833 if (p
->line
&& q
->line
&& p
->ch
== CHG_CH
)
1835 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1838 gboolean runresult
=
1839 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
,
1843 g_array_free (h
, TRUE
);
1848 g_ptr_array_add (dview
->hdiff
, h
);
1855 /* --------------------------------------------------------------------------------------------- */
1858 destroy_hdiff (WDiff
* dview
)
1860 if (dview
->hdiff
!= NULL
)
1863 int len
= dview
->a
[0]->len
;
1864 for (i
= 0; i
< len
; i
++)
1866 GArray
*h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1868 g_array_free (h
, TRUE
);
1870 g_ptr_array_free (dview
->hdiff
, TRUE
);
1871 dview
->hdiff
= NULL
;
1874 mc_search_free (dview
->search
.handle
);
1875 dview
->search
.handle
= NULL
;
1876 g_free (dview
->search
.last_string
);
1877 dview
->search
.last_string
= NULL
;
1880 /* --------------------------------------------------------------------------------------------- */
1881 /* stuff ******************************************************************** */
1884 get_digits (unsigned int n
)
1894 /* --------------------------------------------------------------------------------------------- */
1897 get_line_numbers (const GArray
* a
, size_t pos
, int *linenum
, int *lineofs
)
1911 p
= &g_array_index (a
, DIFFLN
, pos
);
1916 for (n
= pos
; n
> 0; n
--)
1924 *lineofs
= pos
- n
+ 1;
1932 /* --------------------------------------------------------------------------------------------- */
1935 calc_nwidth (const GArray
** const a
)
1939 get_line_numbers (a
[0], a
[0]->len
- 1, &l1
, &o1
);
1940 get_line_numbers (a
[1], a
[1]->len
- 1, &l2
, &o2
);
1945 return get_digits (l1
);
1948 /* --------------------------------------------------------------------------------------------- */
1951 find_prev_hunk (const GArray
* a
, int pos
)
1954 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
1958 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
1962 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
1966 if (pos
> 0 && (size_t) pos
< a
->len
)
1969 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
)
1973 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
)
1982 /* --------------------------------------------------------------------------------------------- */
1985 find_next_hunk (const GArray
* a
, size_t pos
)
1987 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
1991 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
1999 * Find start and end lines of the current hunk.
2001 * \param dview - widget WDiff
2002 * \return boolean and
2003 * start_line1 first line of current hunk (file[0])
2004 * end_line1 last line of current hunk (file[0])
2005 * start_line1 first line of current hunk (file[0])
2006 * end_line1 last line of current hunk (file[0])
2009 get_current_hunk (WDiff
* dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
2011 const GArray
*a0
= dview
->a
[0];
2012 const GArray
*a1
= dview
->a
[1];
2022 pos
= dview
->skip_rows
;
2023 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
2038 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2044 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
2045 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
2047 pos
= dview
->skip_rows
;
2048 while (pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2051 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
2052 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
2054 *end_line1
= max (*start_line1
, l0
);
2056 *end_line2
= max (*start_line2
, l1
);
2064 dview_remove_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
)
2069 f0
= fopen (dview
->file
[0], "r");
2071 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2074 fputs (buf
, merge_file
);
2076 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2080 fputs (buf
, merge_file
);
2086 dview_add_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int from2
, int to2
)
2092 f0
= fopen (dview
->file
[0], "r");
2093 f1
= fopen (dview
->file
[1], "r");
2095 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2098 fputs (buf
, merge_file
);
2101 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
)
2105 fputs (buf
, merge_file
);
2107 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2109 fputs (buf
, merge_file
);
2116 dview_replace_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
, int from2
, int to2
)
2122 f0
= fopen (dview
->file
[0], "r");
2123 f1
= fopen (dview
->file
[1], "r");
2125 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1)
2128 fputs (buf
, merge_file
);
2131 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
)
2135 fputs (buf
, merge_file
);
2137 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2141 fputs (buf
, merge_file
);
2148 do_merge_hunk (WDiff
* dview
)
2150 int from1
, to1
, from2
, to2
;
2153 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2158 vfs_path_t
*merge_file_name_vpath
= NULL
;
2162 dview
->merged
= mc_util_make_backup_if_possible (dview
->file
[0], "~~~");
2165 message (D_ERROR
, MSG_ERROR
,
2166 _("Cannot create backup file\n%s%s\n%s"),
2167 dview
->file
[0], "~~~", unix_error_string (errno
));
2173 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2174 if (merge_file_fd
== -1)
2176 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2177 unix_error_string (errno
));
2181 merge_file
= fdopen (merge_file_fd
, "w");
2186 dview_remove_hunk (dview
, merge_file
, from1
, to1
);
2189 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
);
2192 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
);
2195 fflush (merge_file
);
2196 fclose (merge_file
);
2197 rewrite_backup_content (merge_file_name_vpath
, dview
->file
[0]);
2198 mc_unlink (merge_file_name_vpath
);
2199 vfs_path_free (merge_file_name_vpath
);
2203 /* --------------------------------------------------------------------------------------------- */
2204 /* view routines and callbacks ********************************************** */
2207 dview_compute_split (WDiff
* dview
, int i
)
2210 if (dview
->bias
< 2 - dview
->half1
)
2212 dview
->bias
= 2 - dview
->half1
;
2214 if (dview
->bias
> dview
->half2
- 2)
2216 dview
->bias
= dview
->half2
- 2;
2220 /* --------------------------------------------------------------------------------------------- */
2223 dview_compute_areas (WDiff
* dview
)
2225 dview
->height
= LINES
- 2;
2226 dview
->half1
= COLS
/ 2;
2227 dview
->half2
= COLS
- dview
->half1
;
2229 dview_compute_split (dview
, 0);
2232 /* --------------------------------------------------------------------------------------------- */
2235 dview_reread (WDiff
* dview
)
2239 destroy_hdiff (dview
);
2240 if (dview
->a
[0] != NULL
)
2242 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2243 g_array_free (dview
->a
[0], TRUE
);
2245 if (dview
->a
[1] != NULL
)
2247 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2248 g_array_free (dview
->a
[1], TRUE
);
2251 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2252 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2254 ndiff
= redo_diff (dview
);
2256 dview
->ndiff
= ndiff
;
2259 /* --------------------------------------------------------------------------------------------- */
2263 dview_set_codeset (WDiff
* dview
)
2265 const char *encoding_id
= NULL
;
2269 get_codepage_id (mc_global
.source_codepage
>=
2270 0 ? mc_global
.source_codepage
: mc_global
.display_codepage
);
2271 if (encoding_id
!= NULL
)
2274 conv
= str_crt_conv_from (encoding_id
);
2275 if (conv
!= INVALID_CONV
)
2277 if (dview
->converter
!= str_cnv_from_term
)
2278 str_close_conv (dview
->converter
);
2279 dview
->converter
= conv
;
2281 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
2285 /* --------------------------------------------------------------------------------------------- */
2288 dview_select_encoding (WDiff
* dview
)
2290 if (do_select_codepage ())
2291 dview_set_codeset (dview
);
2293 dview_reread (dview
);
2294 tty_touch_screen ();
2297 #endif /* HAVE_CHARSET */
2299 /* --------------------------------------------------------------------------------------------- */
2302 dview_diff_options (WDiff
* dview
)
2304 const char *quality_str
[] = {
2306 N_("&Fastest (Assume large files)"),
2307 N_("&Minimal (Find a smaller set of change)")
2310 QuickWidget diffopt_widgets
[] = {
2311 QUICK_BUTTON (6, 10, 14, OPTY
, N_("&Cancel"), B_CANCEL
, NULL
),
2312 QUICK_BUTTON (2, 10, 14, OPTY
, N_("&OK"), B_ENTER
, NULL
),
2314 QUICK_CHECKBOX (3, OPTX
, 12, OPTY
,
2315 N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
),
2316 QUICK_CHECKBOX (3, OPTX
, 11, OPTY
,
2317 N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
),
2318 QUICK_CHECKBOX (3, OPTX
, 10, OPTY
,
2319 N_("Ignore &space change"), &dview
->opt
.ignore_space_change
),
2320 QUICK_CHECKBOX (3, OPTX
, 9, OPTY
,
2321 N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
),
2322 QUICK_CHECKBOX (3, OPTX
, 8, OPTY
,
2323 N_("&Ignore case"), &dview
->opt
.ignore_case
),
2324 QUICK_LABEL (3, OPTX
, 7, OPTY
, N_("Diff extra options")),
2325 QUICK_RADIO (3, OPTX
, 3, OPTY
,
2326 3, (const char **) quality_str
, (int *) &dview
->opt
.quality
),
2327 QUICK_LABEL (3, OPTX
, 2, OPTY
, N_("Diff algorithm")),
2332 QuickDialog diffopt
= {
2334 N_("Diff Options"), "[Diff Options]",
2335 diffopt_widgets
, NULL
, NULL
, FALSE
2338 if (quick_dialog (&diffopt
) != B_CANCEL
)
2340 dview_reread (dview
);
2344 /* --------------------------------------------------------------------------------------------- */
2347 dview_init (WDiff
* dview
, const char *args
, const char *file1
, const char *file2
,
2348 const char *label1
, const char *label2
, DSRC dsrc
)
2356 if (dsrc
== DATA_SRC_TMP
)
2369 else if (dsrc
== DATA_SRC_ORG
)
2371 f
[0] = f_open (file1
, O_RDONLY
);
2375 f
[1] = f_open (file2
, O_RDONLY
);
2384 dview
->file
[0] = file1
;
2385 dview
->file
[1] = file2
;
2386 dview
->label
[0] = g_strdup (label1
);
2387 dview
->label
[1] = g_strdup (label2
);
2390 dview
->hdiff
= NULL
;
2392 dview
->converter
= str_cnv_from_term
;
2394 dview_set_codeset (dview
);
2396 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2397 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2399 ndiff
= redo_diff (dview
);
2402 /* goto WIDGET_DESTROY stage: dview_fini() */
2406 dview
->ndiff
= ndiff
;
2408 dview
->view_quit
= 0;
2411 dview
->new_frame
= 1;
2412 dview
->skip_rows
= 0;
2413 dview
->skip_cols
= 0;
2414 dview
->display_symbols
= 0;
2415 dview
->display_numbers
= 0;
2417 dview
->tab_size
= 8;
2421 dview
->search
.handle
= NULL
;
2422 dview
->search
.last_string
= NULL
;
2423 dview
->search
.last_found_line
= -1;
2424 dview
->search
.last_accessed_num_line
= -1;
2426 dview
->opt
.quality
= 0;
2427 dview
->opt
.strip_trailing_cr
= 0;
2428 dview
->opt
.ignore_tab_expansion
= 0;
2429 dview
->opt
.ignore_space_change
= 0;
2430 dview
->opt
.ignore_all_space
= 0;
2431 dview
->opt
.ignore_case
= 0;
2433 dview_compute_areas (dview
);
2438 /* --------------------------------------------------------------------------------------------- */
2441 dview_fini (WDiff
* dview
)
2443 if (dview
->dsrc
!= DATA_SRC_MEM
)
2445 f_close (dview
->f
[1]);
2446 f_close (dview
->f
[0]);
2449 if (dview
->converter
!= str_cnv_from_term
)
2450 str_close_conv (dview
->converter
);
2452 destroy_hdiff (dview
);
2453 if (dview
->a
[0] != NULL
)
2455 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2456 g_array_free (dview
->a
[0], TRUE
);
2459 if (dview
->a
[1] != NULL
)
2461 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2462 g_array_free (dview
->a
[1], TRUE
);
2466 g_free (dview
->label
[0]);
2467 g_free (dview
->label
[1]);
2471 /* --------------------------------------------------------------------------------------------- */
2474 dview_display_file (const WDiff
* dview
, int ord
, int r
, int c
, int height
, int width
)
2479 FBUF
*f
= dview
->f
[ord
];
2480 int skip
= dview
->skip_cols
;
2481 int display_symbols
= dview
->display_symbols
;
2482 int display_numbers
= dview
->display_numbers
;
2483 int show_cr
= dview
->show_cr
;
2486 int nwidth
= display_numbers
;
2487 int xwidth
= display_symbols
+ display_numbers
;
2488 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2489 tab_size
= dview
->tab_size
;
2493 if (xwidth
> width
&& display_symbols
)
2496 display_symbols
= 0;
2498 if (xwidth
> width
&& display_numbers
)
2501 display_numbers
= width
;
2515 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2517 /* abnormal, but avoid buffer overflow */
2521 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2523 int ch
, next_ch
, col
;
2525 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2527 tty_setcolor (NORMAL_COLOR
);
2528 if (display_symbols
)
2530 tty_gotoyx (r
+ j
, c
- 2);
2531 tty_print_char (ch
);
2535 if (display_numbers
)
2537 tty_gotoyx (r
+ j
, c
- xwidth
);
2538 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2539 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2543 tty_setcolor (DFF_ADD_COLOR
);
2547 tty_setcolor (DFF_CHG_COLOR
);
2551 if (i
== (size_t) dview
->search
.last_found_line
)
2553 tty_setcolor (MARKED_SELECTED_COLOR
);
2557 if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2561 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2564 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2565 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2566 tty_gotoyx (r
+ j
, c
);
2568 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2574 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2577 if (!g_unichar_isprint (next_ch
))
2581 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2584 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2586 if (mc_global
.utf8_display
)
2591 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2595 else if (dview
->utf8
)
2597 convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2599 next_ch
= convert_to_display_c (next_ch
);
2602 tty_print_anychar (next_ch
);
2608 else if (ch
== CHG_CH
)
2610 tty_setcolor (DFF_CHH_COLOR
);
2614 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2617 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2621 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2626 if (display_numbers
)
2628 tty_gotoyx (r
+ j
, c
- xwidth
);
2629 memset (buf
, ' ', display_numbers
);
2630 buf
[display_numbers
] = '\0';
2631 tty_print_string (buf
);
2635 tty_setcolor (DFF_DEL_COLOR
);
2639 tty_setcolor (DFF_CHD_COLOR
);
2641 memset (buf
, ' ', width
);
2644 tty_gotoyx (r
+ j
, c
);
2645 /* tty_print_nstring (buf, width); */
2647 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2653 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2656 if (!g_unichar_isprint (next_ch
))
2660 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2664 if (mc_global
.utf8_display
)
2669 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2672 else if (dview
->utf8
)
2673 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2675 next_ch
= convert_to_display_c (next_ch
);
2678 tty_print_anychar (next_ch
);
2684 tty_setcolor (NORMAL_COLOR
);
2686 if (width
< xwidth
- 1)
2690 memset (buf
, ' ', k
);
2692 for (; j
< height
; j
++)
2696 tty_gotoyx (r
+ j
, c
- xwidth
);
2697 /* tty_print_nstring (buf, xwidth - 1); */
2698 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2700 tty_gotoyx (r
+ j
, c
);
2701 /* tty_print_nstring (buf, width); */
2702 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2708 /* --------------------------------------------------------------------------------------------- */
2711 dview_status (const WDiff
* dview
, int ord
, int width
, int c
)
2715 int linenum
, lineofs
;
2719 tty_setcolor (STATUSBAR_COLOR
);
2722 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2724 filename_width
= width
- 22;
2725 if (filename_width
< 8)
2728 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2729 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2730 vfs_path_free (vpath
);
2731 buf
= str_term_trim (path
, filename_width
);
2733 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width
, buf
, linenum
, lineofs
,
2736 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width
, buf
, linenum
, lineofs
, dview
->ndiff
);
2740 /* --------------------------------------------------------------------------------------------- */
2743 dview_redo (WDiff
* dview
)
2745 if (dview
->display_numbers
)
2747 int old
= dview
->display_numbers
;
2748 dview
->display_numbers
= calc_nwidth ((const GArray
**) dview
->a
);
2749 dview
->new_frame
= (old
!= dview
->display_numbers
);
2751 dview_reread (dview
);
2754 /* --------------------------------------------------------------------------------------------- */
2757 dview_edit (WDiff
* dview
, int ord
)
2761 int linenum
, lineofs
;
2763 if (dview
->dsrc
== DATA_SRC_TMP
)
2765 error_dialog (_("Edit"), _("Edit is disabled"));
2769 h
= ((Widget
*) dview
)->owner
;
2772 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2773 h
->modal
= TRUE
; /* not allow edit file in several editors */
2775 vfs_path_t
*tmp_vpath
;
2777 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2778 do_edit_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2779 vfs_path_free (tmp_vpath
);
2783 dview_update (dview
);
2786 /* --------------------------------------------------------------------------------------------- */
2789 dview_goto_cmd (WDiff
* dview
, int ord
)
2791 static const char *title
[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2792 static char prev
[256];
2793 /* XXX some statics here, to be remembered between runs */
2798 input
= input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
, prev
);
2801 const char *s
= input
;
2802 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2808 for (; i
< dview
->a
[ord
]->len
; i
++)
2810 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2811 if (p
->line
== newline
)
2817 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2818 g_snprintf (prev
, sizeof (prev
), "%d", newline
);
2824 /* --------------------------------------------------------------------------------------------- */
2827 dview_labels (WDiff
* dview
)
2829 Dlg_head
*h
= dview
->widget
.owner
;
2830 WButtonBar
*b
= find_buttonbar (h
);
2832 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), diff_map
, (Widget
*) dview
);
2833 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), diff_map
, (Widget
*) dview
);
2834 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), diff_map
, (Widget
*) dview
);
2835 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), diff_map
, (Widget
*) dview
);
2836 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), diff_map
, (Widget
*) dview
);
2837 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), diff_map
, (Widget
*) dview
);
2838 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), diff_map
, (Widget
*) dview
);
2842 /* --------------------------------------------------------------------------------------------- */
2845 dview_event (Gpm_Event
* event
, void *data
)
2847 WDiff
*dview
= (WDiff
*) data
;
2849 if (!mouse_global_in_widget (event
, data
))
2850 return MOU_UNHANDLED
;
2852 /* We are not interested in release events */
2853 if ((event
->type
& (GPM_DOWN
| GPM_DRAG
)) == 0)
2857 if ((event
->buttons
& GPM_B_UP
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2859 dview
->skip_rows
-= 2;
2860 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2861 dview_update (dview
);
2863 else if ((event
->buttons
& GPM_B_DOWN
) != 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
);
2874 dview_save (WDiff
* dview
)
2876 gboolean res
= TRUE
;
2879 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2880 dview
->merged
= !res
;
2885 dview_do_save (WDiff
* dview
)
2887 (void) dview_save (dview
);
2891 dview_save_options (WDiff
* dview
)
2893 mc_config_set_bool (mc_main_config
, "DiffView", "show_symbols",
2894 dview
->display_symbols
!= 0 ? TRUE
: FALSE
);
2895 mc_config_set_bool (mc_main_config
, "DiffView", "show_numbers",
2896 dview
->display_numbers
!= 0 ? TRUE
: FALSE
);
2897 mc_config_set_int (mc_main_config
, "DiffView", "tab_size", dview
->tab_size
);
2899 mc_config_set_int (mc_main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2901 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_tws",
2902 dview
->opt
.strip_trailing_cr
);
2903 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_all_space",
2904 dview
->opt
.ignore_all_space
);
2905 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_space_change",
2906 dview
->opt
.ignore_space_change
);
2907 mc_config_set_bool (mc_main_config
, "DiffView", "diff_tab_expansion",
2908 dview
->opt
.ignore_tab_expansion
);
2909 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_case", dview
->opt
.ignore_case
);
2913 dview_load_options (WDiff
* dview
)
2915 gboolean show_numbers
, show_symbols
;
2918 show_symbols
= mc_config_get_bool (mc_main_config
, "DiffView", "show_symbols", FALSE
);
2920 dview
->display_symbols
= 1;
2921 show_numbers
= mc_config_get_bool (mc_main_config
, "DiffView", "show_numbers", FALSE
);
2923 dview
->display_numbers
= calc_nwidth ((const GArray
** const) dview
->a
);
2924 tab_size
= mc_config_get_int (mc_main_config
, "DiffView", "tab_size", 8);
2925 if (tab_size
> 0 && tab_size
< 9)
2926 dview
->tab_size
= tab_size
;
2928 dview
->tab_size
= 8;
2930 dview
->opt
.quality
= mc_config_get_int (mc_main_config
, "DiffView", "diff_quality", 0);
2932 dview
->opt
.strip_trailing_cr
=
2933 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2934 dview
->opt
.ignore_all_space
=
2935 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2936 dview
->opt
.ignore_space_change
=
2937 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2938 dview
->opt
.ignore_tab_expansion
=
2939 mc_config_get_bool (mc_main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2940 dview
->opt
.ignore_case
=
2941 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_case", FALSE
);
2943 dview
->new_frame
= 1;
2947 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2951 dview_ok_to_exit (WDiff
* dview
)
2953 gboolean res
= TRUE
;
2959 act
= query_dialog (_("Quit"), !mc_global
.midnight_shutdown
?
2960 _("File was modified. Save with exit?") :
2961 _("Midnight Commander is being shut down.\nSave modified file?"),
2962 D_NORMAL
, 2, _("&Yes"), _("&No"));
2965 if (mc_global
.midnight_shutdown
|| (act
== -1))
2974 (void) dview_save (dview
);
2978 if (mc_util_restore_from_backup_if_possible (dview
->file
[0], "~~~"))
2979 mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2988 /* --------------------------------------------------------------------------------------------- */
2991 dview_execute_cmd (WDiff
* dview
, unsigned long command
)
2993 cb_ret_t res
= MSG_HANDLED
;
2996 case CK_ShowSymbols
:
2997 dview
->display_symbols
^= 1;
2998 dview
->new_frame
= 1;
3000 case CK_ShowNumbers
:
3001 dview
->display_numbers
^= calc_nwidth ((const GArray
** const) dview
->a
);
3002 dview
->new_frame
= 1;
3006 dview
->new_frame
= 1;
3012 dview
->new_frame
= 1;
3018 dview_compute_split (dview
, 1);
3019 dview
->new_frame
= 1;
3026 dview_compute_split (dview
, -1);
3027 dview
->new_frame
= 1;
3031 dview
->tab_size
= 2;
3034 dview
->tab_size
= 3;
3037 dview
->tab_size
= 4;
3040 dview
->tab_size
= 8;
3049 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3050 find_next_hunk (dview
->a
[0], dview
->skip_rows
);
3053 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3054 find_prev_hunk (dview
->a
[0], dview
->skip_rows
);
3057 dview_goto_cmd (dview
, TRUE
);
3060 dview_edit (dview
, dview
->ord
);
3063 do_merge_hunk (dview
);
3067 dview_edit (dview
, dview
->ord
^ 1);
3070 dview_search_cmd (dview
);
3072 case CK_SearchContinue
:
3073 dview_continue_search_cmd (dview
);
3076 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3079 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[0]->len
- 1;
3082 if (dview
->skip_rows
> 0)
3085 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3090 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3093 if (dview
->height
> 2)
3095 dview
->skip_rows
+= dview
->height
- 2;
3096 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3100 if (dview
->height
> 2)
3102 dview
->skip_rows
-= dview
->height
- 2;
3103 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3113 dview
->skip_cols
-= 8;
3116 dview
->skip_cols
+= 8;
3119 dview
->skip_cols
= 0;
3125 dview
->view_quit
= 1;
3128 dview_do_save (dview
);
3131 dview_diff_options (dview
);
3134 case CK_SelectCodepage
:
3135 dview_select_encoding (dview
);
3139 /* don't close diffviewer due to SIGINT */
3142 res
= MSG_NOT_HANDLED
;
3147 /* --------------------------------------------------------------------------------------------- */
3150 dview_handle_key (WDiff
* dview
, int key
)
3152 unsigned long command
;
3155 key
= convert_from_input_c (key
);
3158 command
= keybind_lookup_keymap_command (diff_map
, key
);
3159 if ((command
!= CK_IgnoreKey
) && (dview_execute_cmd (dview
, command
) == MSG_HANDLED
))
3163 return MSG_NOT_HANDLED
;
3166 /* --------------------------------------------------------------------------------------------- */
3169 dview_callback (Widget
* w
, widget_msg_t msg
, int parm
)
3171 WDiff
*dview
= (WDiff
*) w
;
3172 Dlg_head
*h
= dview
->widget
.owner
;
3178 dview_labels (dview
);
3179 dview_load_options (dview
);
3180 dview_update (dview
);
3184 dview
->new_frame
= 1;
3185 dview_update (dview
);
3189 i
= dview_handle_key (dview
, parm
);
3190 if (dview
->view_quit
)
3193 dview_update (dview
);
3196 case WIDGET_COMMAND
:
3197 i
= dview_execute_cmd (dview
, parm
);
3198 if (dview
->view_quit
)
3201 dview_update (dview
);
3204 case WIDGET_DESTROY
:
3205 dview_save_options (dview
);
3210 return default_proc (msg
, parm
);
3214 /* --------------------------------------------------------------------------------------------- */
3217 dview_adjust_size (Dlg_head
* h
)
3222 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3223 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3224 bar
= find_buttonbar (h
);
3225 widget_set_size (&dview
->widget
, 0, 0, LINES
- 1, COLS
);
3226 widget_set_size ((Widget
*) bar
, LINES
- 1, 0, 1, COLS
);
3228 dview_compute_areas (dview
);
3231 /* --------------------------------------------------------------------------------------------- */
3234 dview_dialog_callback (Dlg_head
* h
, Widget
* sender
, dlg_msg_t msg
, int parm
, void *data
)
3236 WDiff
*dview
= (WDiff
*) data
;
3241 dview_adjust_size (h
);
3247 return dview_execute_cmd (NULL
, parm
);
3248 /* message from buttonbar */
3249 if (sender
== (Widget
*) find_buttonbar (h
))
3252 return send_message ((Widget
*) data
, WIDGET_COMMAND
, parm
);
3254 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3255 return dview_execute_cmd (dview
, parm
);
3257 return MSG_NOT_HANDLED
;
3260 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3261 h
->state
= DLG_ACTIVE
; /* don't stop the dialog before final decision */
3262 if (dview_ok_to_exit (dview
))
3263 h
->state
= DLG_CLOSED
;
3267 return default_dlg_callback (h
, sender
, msg
, parm
, data
);
3271 /* --------------------------------------------------------------------------------------------- */
3274 dview_get_title (const Dlg_head
* h
, size_t len
)
3276 const WDiff
*dview
= (const WDiff
*) find_widget_type (h
, dview_callback
);
3277 const char *modified
= dview
->merged
? " (*) " : " ";
3281 len1
= (len
- str_term_width1 (_("Diff:")) - strlen (modified
) - 3) / 2;
3283 title
= g_string_sized_new (len
);
3284 g_string_append (title
, _("Diff:"));
3285 g_string_append (title
, modified
);
3286 g_string_append (title
, str_term_trim (dview
->label
[0], len1
));
3287 g_string_append (title
, " | ");
3288 g_string_append (title
, str_term_trim (dview
->label
[1], len1
));
3290 return g_string_free (title
, FALSE
);
3293 /* --------------------------------------------------------------------------------------------- */
3296 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3300 Dlg_head
*dview_dlg
;
3302 /* Create dialog and widgets, put them on the dialog */
3304 create_dlg (FALSE
, 0, 0, LINES
, COLS
, NULL
, dview_dialog_callback
, NULL
,
3305 "[Diff Viewer]", NULL
, DLG_WANT_TAB
);
3307 dview
= g_new0 (WDiff
, 1);
3309 init_widget (&dview
->widget
, 0, 0, LINES
- 1, COLS
,
3310 (callback_fn
) dview_callback
, (mouse_h
) dview_event
);
3312 widget_want_cursor (dview
->widget
, 0);
3314 add_widget (dview_dlg
, dview
);
3315 add_widget (dview_dlg
, buttonbar_new (TRUE
));
3317 dview_dlg
->get_title
= dview_get_title
;
3319 error
= dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); /* XXX binary diff? */
3321 /* Please note that if you add another widget,
3322 * you have to modify dview_adjust_size to
3326 run_dlg (dview_dlg
);
3328 if ((error
!= 0) || (dview_dlg
->state
== DLG_CLOSED
))
3329 destroy_dlg (dview_dlg
);
3331 return error
== 0 ? 1 : 0;
3334 /*** public functions ****************************************************************************/
3335 /* --------------------------------------------------------------------------------------------- */
3337 #define GET_FILE_AND_STAMP(n) \
3341 real_file##n = file##n; \
3342 if (!vfs_file_is_local (file##n)) \
3344 real_file##n = mc_getlocalcopy (file##n); \
3345 if (real_file##n != NULL) \
3348 if (mc_stat (real_file##n, &st##n) != 0) \
3355 #define UNGET_FILE(n) \
3361 if (use_copy##n > 0) \
3364 mtime = st##n.st_mtime; \
3365 if (mc_stat (real_file##n, &st##n) == 0) \
3366 changed = (mtime != st##n.st_mtime); \
3368 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3369 vfs_path_free (real_file##n); \
3375 dview_diff_cmd (const void *f0
, const void *f1
)
3378 vfs_path_t
*file0
= NULL
;
3379 vfs_path_t
*file1
= NULL
;
3380 gboolean is_dir0
= FALSE
;
3381 gboolean is_dir1
= FALSE
;
3383 switch (mc_global
.mc_run_mode
)
3387 /* run from panels */
3388 const WPanel
*panel0
= (const WPanel
*) f0
;
3389 const WPanel
*panel1
= (const WPanel
*) f1
;
3391 file0
= vfs_path_append_new (panel0
->cwd_vpath
, selection (panel0
)->fname
, NULL
);
3392 is_dir0
= S_ISDIR (selection (panel0
)->st
.st_mode
);
3395 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3396 path_trunc (selection (panel0
)->fname
, 30));
3400 file1
= vfs_path_append_new (panel1
->cwd_vpath
, selection (panel1
)->fname
, NULL
);
3401 is_dir1
= S_ISDIR (selection (panel1
)->st
.st_mode
);
3404 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"),
3405 path_trunc (selection (panel1
)->fname
, 30));
3411 case MC_RUN_DIFFVIEWER
:
3413 /* run from command line */
3414 const char *p0
= (const char *) f0
;
3415 const char *p1
= (const char *) f1
;
3418 file0
= vfs_path_from_str (p0
);
3419 if (mc_stat (file0
, &st
) == 0)
3421 is_dir0
= S_ISDIR (st
.st_mode
);
3424 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p0
, 30));
3430 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3431 path_trunc (p0
, 30), unix_error_string (errno
));
3435 file1
= vfs_path_from_str (p1
);
3436 if (mc_stat (file1
, &st
) == 0)
3438 is_dir1
= S_ISDIR (st
.st_mode
);
3441 message (D_ERROR
, MSG_ERROR
, _("\"%s\" is a directory"), path_trunc (p1
, 30));
3447 message (D_ERROR
, MSG_ERROR
, _("Cannot stat \"%s\"\n%s"),
3448 path_trunc (p1
, 30), unix_error_string (errno
));
3455 /* this should not happaned */
3456 message (D_ERROR
, MSG_ERROR
, _("Diff viewer: invalid mode"));
3463 if (file0
!= NULL
&& file1
!= NULL
)
3469 vfs_path_t
*real_file0
;
3470 vfs_path_t
*real_file1
;
3472 GET_FILE_AND_STAMP (0);
3473 GET_FILE_AND_STAMP (1);
3474 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3476 char *real_file0_str
, *real_file1_str
;
3477 char *file0_str
, *file1_str
;
3479 real_file0_str
= vfs_path_to_str (real_file0
);
3480 real_file1_str
= vfs_path_to_str (real_file1
);
3481 file0_str
= vfs_path_to_str (file0
);
3482 file1_str
= vfs_path_to_str (file1
);
3483 rv
= diff_view (real_file0_str
, real_file1_str
, file0_str
, file1_str
);
3484 g_free (real_file0_str
);
3485 g_free (real_file1_str
);
3495 message (D_ERROR
, MSG_ERROR
, _("Two files are needed to compare"));
3498 vfs_path_free (file1
);
3499 vfs_path_free (file0
);
3501 return (rv
!= 0) ? 1 : 0;
3504 /* --------------------------------------------------------------------------------------------- */
3507 dview_update (WDiff
* dview
)
3509 int height
= dview
->height
;
3513 int last
= dview
->a
[0]->len
- 1;
3515 if (dview
->skip_rows
> last
)
3517 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
3519 if (dview
->skip_rows
< 0)
3521 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3523 if (dview
->skip_cols
< 0)
3525 dview
->skip_cols
= 0;
3533 width1
= dview
->half1
+ dview
->bias
;
3534 width2
= dview
->half2
- dview
->bias
;
3541 if (dview
->new_frame
)
3543 int xwidth
= dview
->display_symbols
+ dview
->display_numbers
;
3545 tty_setcolor (NORMAL_COLOR
);
3548 tty_draw_box (1, 0, height
, width1
, FALSE
);
3552 tty_draw_box (1, width1
, height
, width2
, FALSE
);
3558 if (xwidth
< width1
- 1)
3560 tty_gotoyx (1, xwidth
);
3561 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3562 tty_gotoyx (height
, xwidth
);
3563 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3564 tty_draw_vline (2, xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3566 if (xwidth
< width2
- 1)
3568 tty_gotoyx (1, width1
+ xwidth
);
3569 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3570 tty_gotoyx (height
, width1
+ xwidth
);
3571 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3572 tty_draw_vline (2, width1
+ xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3575 dview
->new_frame
= 0;
3580 dview_status (dview
, dview
->ord
, width1
, 0);
3581 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
3585 dview_status (dview
, dview
->ord
^ 1, width2
, width1
);
3586 dview_display_file (dview
, dview
->ord
^ 1, 2, width1
+ 1, height
- 2, width2
- 2);
3590 /* --------------------------------------------------------------------------------------------- */