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/charsets.h"
46 #include "lib/event.h" /* mc_event_raise() */
48 #include "src/filemanager/cmd.h"
49 #include "src/filemanager/midnight.h" /* Needed for current_panel and other_panel */
50 #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */
52 #include "src/keybind-defaults.h"
53 #include "src/history.h"
54 #include "src/selcodepage.h"
59 /*** global variables ****************************************************************************/
61 /*** file scope macro definitions ****************************************************************/
63 #define g_array_foreach(a, TP, cbf) \
65 size_t g_array_foreach_i;\
66 TP *g_array_foreach_var=NULL; \
67 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
69 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
70 (*cbf) (g_array_foreach_var); \
74 #define FILE_READ_BUF 4096
75 #define FILE_FLAG_TEMP (1 << 0)
85 #define HDIFF_ENABLE 1
86 #define HDIFF_MINCTX 5
87 #define HDIFF_DEPTH 10
89 #define FILE_DIRTY(fs) \
97 /*** file scope type declarations ****************************************************************/
99 /*** file scope variables ************************************************************************/
101 /*** file scope functions ************************************************************************/
102 /* --------------------------------------------------------------------------------------------- */
105 TAB_SKIP (int ts
, int pos
)
107 if (ts
> 0 && ts
< 9)
108 return ts
- pos
% ts
;
113 /* --------------------------------------------------------------------------------------------- */
116 dview_set_codeset (WDiff
* dview
)
119 const char *encoding_id
= NULL
;
123 get_codepage_id (mc_global
.source_codepage
>=
124 0 ? mc_global
.source_codepage
: mc_global
.display_codepage
);
125 if (encoding_id
!= NULL
)
128 conv
= str_crt_conv_from (encoding_id
);
129 if (conv
!= INVALID_CONV
)
131 if (dview
->converter
!= str_cnv_from_term
)
132 str_close_conv (dview
->converter
);
133 dview
->converter
= conv
;
135 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
142 /* --------------------------------------------------------------------------------------------- */
145 dview_select_encoding (WDiff
* dview
)
148 if (do_select_codepage ())
149 dview_set_codeset (dview
);
155 /* --------------------------------------------------------------------------------------------- */
158 rewrite_backup_content (const vfs_path_t
* from_file_name_vpath
, const char *to_file_name
)
163 const char *from_file_name
;
165 from_file_name
= vfs_path_get_by_index (from_file_name_vpath
, -1)->path
;
166 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
169 backup_fd
= fopen (to_file_name
, "w");
170 if (backup_fd
== NULL
)
176 length
= fwrite ((const void *) contents
, length
, 1, backup_fd
);
184 /* buffered I/O ************************************************************* */
187 * Try to open a temporary file.
189 * \param[out] name address of a pointer to store the temporary name
191 * \return file descriptor on success, negative on error
193 * \note the name is not altered if this function fails
197 open_temp (void **name
)
200 vfs_path_t
*diff_file_name
= NULL
;
202 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
205 message (D_ERROR
, MSG_ERROR
,
206 _("Cannot create temporary diff file\n%s"), unix_error_string (errno
));
209 *name
= vfs_path_to_str (diff_file_name
);
210 vfs_path_free (diff_file_name
);
214 /* --------------------------------------------------------------------------------------------- */
217 * Alocate file structure and associate file descriptor to it.
219 * \param fd file descriptor
221 * \return file structure
231 fs
= g_try_malloc (sizeof (FBUF
));
235 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
250 /* --------------------------------------------------------------------------------------------- */
253 * Free file structure without closing the file.
255 * \param fs file structure
257 * \return 0 on success, non-zero on error
263 if (fs
->flags
& FILE_FLAG_TEMP
)
265 rv
= unlink (fs
->data
);
274 /* --------------------------------------------------------------------------------------------- */
277 * Open a binary temporary file in R/W mode.
279 * \return file structure
281 * \note the file will be deleted when closed
295 fd
= open_temp (&fs
->data
);
303 fs
->flags
= FILE_FLAG_TEMP
;
307 /* --------------------------------------------------------------------------------------------- */
310 * Open a binary file in specified mode.
312 * \param filename file name
313 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
315 * \return file structure
318 f_open (const char *filename
, int flags
)
329 fd
= open (filename
, flags
);
340 /* --------------------------------------------------------------------------------------------- */
343 * Read a line of bytes from file until newline or EOF.
345 * \param buf destination buffer
346 * \param size size of buffer
347 * \param fs file structure
349 * \return number of bytes read
351 * \note does not stop on null-byte
352 * \note buf will not be null-terminated
355 f_gets (char *buf
, size_t size
, FBUF
* fs
)
364 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
374 if (j
== size
|| stop
)
380 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
387 /* --------------------------------------------------------------------------------------------- */
392 * \param fs file structure
394 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
396 * \return position in file, starting from begginning
398 * \note avoids thrashing read cache when possible
401 f_seek (FBUF
* fs
, off_t off
, int whence
)
405 if (fs
->len
&& whence
!= SEEK_END
)
407 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
410 if (whence
== SEEK_CUR
)
413 off
+= rv
- fs
->len
+ fs
->pos
;
415 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
417 fs
->pos
= fs
->len
+ off
- rv
;
423 rv
= lseek (fs
->fd
, off
, whence
);
431 /* --------------------------------------------------------------------------------------------- */
434 * Seek to the beginning of file, thrashing read cache.
436 * \param fs file structure
438 * \return 0 if success, non-zero on error
443 off_t rv
= lseek (fs
->fd
, 0, SEEK_SET
);
451 /* --------------------------------------------------------------------------------------------- */
454 * Write bytes to file.
456 * \param fs file structure
457 * \param buf source buffer
458 * \param size size of buffer
460 * \return number of written bytes, -1 on error
462 * \note thrashes read cache
465 f_write (FBUF
* fs
, const char *buf
, size_t size
)
467 ssize_t rv
= write (fs
->fd
, buf
, size
);
475 /* --------------------------------------------------------------------------------------------- */
478 * Truncate file to the current position.
480 * \param fs file structure
482 * \return current file size on success, negative on error
484 * \note thrashes read cache
489 off_t off
= lseek (fs
->fd
, 0, SEEK_CUR
);
492 int rv
= ftruncate (fs
->fd
, off
);
505 /* --------------------------------------------------------------------------------------------- */
510 * \param fs file structure
512 * \return 0 on success, non-zero on error
514 * \note if this is temporary file, it is deleted
519 int rv
= close (fs
->fd
);
524 /* --------------------------------------------------------------------------------------------- */
527 * Create pipe stream to process.
529 * \param cmd shell command line
530 * \param flags open mode, either O_RDONLY or O_WRONLY
532 * \return file structure
535 p_open (const char *cmd
, int flags
)
539 const char *type
= NULL
;
541 if (flags
== O_RDONLY
)
545 if (flags
== O_WRONLY
)
561 f
= popen (cmd
, type
);
573 /* --------------------------------------------------------------------------------------------- */
578 * \param fs structure
580 * \return 0 on success, non-zero on error
585 int rv
= pclose (fs
->data
);
591 * Get one char (byte) from string
593 * \param char * str, gboolean * result
595 * \return int as character or 0 and result == FALSE if fail
599 dview_get_byte (char *str
, gboolean
* result
)
607 return (unsigned char) *str
;
612 * Get utf multibyte char from string
614 * \param char * str, int * char_width, gboolean * result
616 * \return int as utf character or 0 and result == FALSE if fail
620 dview_get_utf (char *str
, int *char_width
, gboolean
* result
)
624 gchar
*next_ch
= NULL
;
636 res
= g_utf8_get_char_validated (str
, -1);
646 /* Calculate UTF-8 char width */
647 next_ch
= g_utf8_next_char (str
);
650 width
= next_ch
- str
;
663 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
666 if (text
== NULL
|| text
[0] == '\0')
668 if (g_utf8_validate (text
, -1, NULL
))
670 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
675 char *tmpbuf
, *buffer
;
676 buffer
= tmpbuf
= g_strdup (text
);
677 while (tmpbuf
[0] != '\0')
679 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
680 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
682 tmpbuf
= g_utf8_next_char (tmpbuf
);
691 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
694 return max (length
, (size_t) result
);
698 /* --------------------------------------------------------------------------------------------- */
699 /* diff parse *************************************************************** */
702 * Read decimal number from string.
704 * \param[in,out] str string to parse
705 * \param[out] n extracted number
707 * \return 0 if success, otherwise non-zero
710 scan_deci (const char **str
, int *n
)
712 const char *p
= *str
;
715 *n
= strtol (p
, &q
, 10);
724 /* --------------------------------------------------------------------------------------------- */
727 * Parse line for diff statement.
729 * \param p string to parse
730 * \param ops list of diff statements
732 * \return 0 if success, otherwise non-zero
735 scan_line (const char *p
, GArray
* ops
)
745 /* handle the following cases:
747 * NUM[,NUM]cNUM[,NUM]
749 * where NUM is a positive integer
752 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
761 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
776 else if (cmd
!= 'c' && cmd
!= 'd')
781 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
790 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
810 g_array_append_val (ops
, op
);
814 /* --------------------------------------------------------------------------------------------- */
817 * Parse diff output and extract diff statements.
819 * \param f stream to read from
820 * \param ops list of diff statements to fill
822 * \return positive number indicating number of hunks, otherwise negative
825 scan_diff (FBUF
* f
, GArray
* ops
)
830 while ((sz
= f_gets (buf
, sizeof (buf
) - 1, f
)))
832 if (isdigit (buf
[0]))
834 if (buf
[sz
- 1] != '\n')
839 if (scan_line (buf
, ops
) != 0)
845 while (buf
[sz
- 1] != '\n' && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
853 /* --------------------------------------------------------------------------------------------- */
856 * Invoke diff and extract diff statements.
858 * \param args extra arguments to be passed to diff
859 * \param extra more arguments to be passed to diff
860 * \param file1 first file to compare
861 * \param file2 second file to compare
862 * \param ops list of diff statements to fill
864 * \return positive number indicating number of hunks, otherwise negative
867 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
,
870 static const char *opt
=
871 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
872 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
873 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
874 " --unchanged-group-format=''";
881 cmd
= g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args
, extra
, opt
, file1
, file2
);
885 f
= p_open (cmd
, O_RDONLY
);
891 rv
= scan_diff (f
, ops
);
894 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
900 /* --------------------------------------------------------------------------------------------- */
903 * Reparse and display file according to diff statements.
905 * \param ord 0 if displaying first file, 1 if displaying 2nd file
906 * \param filename file name to display
907 * \param ops list of diff statements
908 * \param printer printf-like function to be used for displaying
909 * \param ctx printer context
911 * \return 0 if success, otherwise non-zero
914 dff_reparse (int ord
, const char *filename
, const GArray
* ops
, DFUNC printer
, void *ctx
)
927 f
= f_open (filename
, O_RDONLY
);
945 #define T1 a[ ord^1 ][0]
946 #define T2 a[ ord^1 ][1]
947 for (i
= 0; i
< ops
->len
; i
++)
950 op
= &g_array_index (ops
, DIFFCMD
, i
);
951 n
= op
->F1
- (op
->cmd
!= add_cmd
);
952 while (line
< n
&& (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
955 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
957 while (buf
[sz
- 1] != '\n')
959 sz
= f_gets (buf
, sizeof (buf
), f
);
962 printer (ctx
, 0, 0, 0, 1, "\n");
965 printer (ctx
, 0, 0, 0, sz
, buf
);
974 if (op
->cmd
== add_cmd
)
976 n
= op
->T2
- op
->T1
+ 1;
979 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
983 if (op
->cmd
== del_cmd
)
985 n
= op
->F2
- op
->F1
+ 1;
986 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
989 printer (ctx
, ADD_CH
, line
, off
, sz
, buf
);
991 while (buf
[sz
- 1] != '\n')
993 sz
= f_gets (buf
, sizeof (buf
), f
);
996 printer (ctx
, 0, 0, 0, 1, "\n");
999 printer (ctx
, 0, 0, 0, sz
, buf
);
1011 n
= op
->F2
- op
->F1
+ 1;
1012 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1015 printer (ctx
, CHG_CH
, line
, off
, sz
, buf
);
1017 while (buf
[sz
- 1] != '\n')
1019 sz
= f_gets (buf
, sizeof (buf
), f
);
1022 printer (ctx
, 0, 0, 0, 1, "\n");
1025 printer (ctx
, 0, 0, 0, sz
, buf
);
1034 n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
);
1037 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
1047 while ((sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1050 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
1052 while (buf
[sz
- 1] != '\n')
1054 sz
= f_gets (buf
, sizeof (buf
), f
);
1057 printer (ctx
, 0, 0, 0, 1, "\n");
1060 printer (ctx
, 0, 0, 0, sz
, buf
);
1073 /* --------------------------------------------------------------------------------------------- */
1074 /* horizontal diff ********************************************************** */
1077 * Longest common substring.
1079 * \param s first string
1080 * \param m length of first string
1081 * \param t second string
1082 * \param n length of second string
1083 * \param ret list of offsets for longest common substrings inside each string
1084 * \param min minimum length of common substrings
1086 * \return 0 if success, nonzero otherwise
1089 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
* ret
, int min
)
1097 if (m
< min
|| n
< min
)
1099 /* XXX early culling */
1103 Lprev
= g_new0 (int, n
+ 1);
1104 Lcurr
= g_new0 (int, n
+ 1);
1106 if (Lprev
== NULL
|| Lcurr
== NULL
)
1113 for (i
= 0; i
< m
; i
++)
1118 #ifdef USE_MEMSET_IN_LCS
1119 memset (Lcurr
, 0, (n
+ 1) * sizeof (int));
1121 for (j
= 0; j
< n
; j
++)
1123 #ifndef USE_MEMSET_IN_LCS
1128 int v
= Lprev
[j
] + 1;
1133 g_array_set_size (ret
, 0);
1135 if (z
== v
&& z
>= min
)
1137 int off0
= i
- z
+ 1;
1138 int off1
= j
- z
+ 1;
1140 for (k
= 0; k
< ret
->len
; k
++)
1142 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1143 if ((*p
)[0] == off0
)
1147 if ((*p
)[1] >= off1
)
1157 g_array_append_val (ret
, p2
);
1173 /* --------------------------------------------------------------------------------------------- */
1176 * Scan recursively for common substrings and build ranges.
1178 * \param s first string
1179 * \param t second string
1180 * \param bracket current limits for both of the strings
1181 * \param min minimum length of common substrings
1182 * \param hdiff list of horizontal diff ranges to fill
1183 * \param depth recursion depth
1185 * \return 0 if success, nonzero otherwise
1188 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
* hdiff
,
1198 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1202 len
= lcsubstr (s
+ bracket
[0].off
, bracket
[0].len
,
1203 t
+ bracket
[1].off
, bracket
[1].len
, ret
, min
);
1207 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1210 b
[0].off
= bracket
[0].off
;
1211 b
[0].len
= (*data
)[0];
1212 b
[1].off
= bracket
[1].off
;
1213 b
[1].len
= (*data
)[1];
1214 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1217 for (k
= 0; k
< ret
->len
- 1; k
++)
1219 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1220 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1221 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1222 b
[0].len
= (*data2
)[0] - (*data
)[0] - len
;
1223 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1224 b
[1].len
= (*data2
)[1] - (*data
)[1] - len
;
1225 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1228 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1229 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1230 b
[0].len
= bracket
[0].len
- (*data
)[0] - len
;
1231 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1232 b
[1].len
= bracket
[1].len
- (*data
)[1] - len
;
1233 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1236 g_array_free (ret
, TRUE
);
1241 p
[0].off
= bracket
[0].off
;
1242 p
[0].len
= bracket
[0].len
;
1243 p
[1].off
= bracket
[1].off
;
1244 p
[1].len
= bracket
[1].len
;
1245 g_array_append_val (hdiff
, p
);
1250 /* --------------------------------------------------------------------------------------------- */
1253 * Build list of horizontal diff ranges.
1255 * \param s first string
1256 * \param m length of first string
1257 * \param t second string
1258 * \param n length of second string
1259 * \param min minimum length of common substrings
1260 * \param hdiff list of horizontal diff ranges to fill
1261 * \param depth recursion depth
1263 * \return 0 if success, nonzero otherwise
1266 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
* hdiff
, unsigned int depth
)
1271 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1272 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1274 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1282 /* smartscan (multiple horizontal diff) */
1283 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1286 /* --------------------------------------------------------------------------------------------- */
1287 /* read line **************************************************************** */
1290 * Check if character is inside horizontal diff limits.
1292 * \param k rank of character inside line
1293 * \param hdiff horizontal diff structure
1294 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1296 * \return TRUE if inside hdiff limits, FALSE otherwise
1299 is_inside (int k
, GArray
* hdiff
, int ord
)
1303 for (i
= 0; i
< hdiff
->len
; i
++)
1306 b
= &g_array_index (hdiff
, BRACKET
, i
);
1308 start
= (*b
)[ord
].off
;
1309 end
= start
+ (*b
)[ord
].len
;
1310 if (k
>= start
&& k
< end
)
1318 /* --------------------------------------------------------------------------------------------- */
1321 * Copy `src' to `dst' expanding tabs.
1323 * \param dst destination buffer
1324 * \param src source buffer
1325 * \param srcsize size of src buffer
1326 * \param base virtual base of this string, needed to calculate tabs
1327 * \param ts tab size
1329 * \return new virtual base
1331 * \note The procedure returns when all bytes are consumed from `src'
1334 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1337 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1342 int j
= TAB_SKIP (ts
, i
+ base
);
1354 /* --------------------------------------------------------------------------------------------- */
1357 * Copy `src' to `dst' expanding tabs.
1359 * \param dst destination buffer
1360 * \param dstsize size of dst buffer
1361 * \param[in,out] _src source buffer
1362 * \param srcsize size of src buffer
1363 * \param base virtual base of this string, needed to calculate tabs
1364 * \param ts tab size
1366 * \return new virtual base
1368 * \note The procedure returns when all bytes are consumed from `src'
1369 * or `dstsize' bytes are written to `dst'
1370 * \note Upon return, `src' points to the first unwritten character in source
1373 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1376 const char *src
= *_src
;
1377 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1382 int j
= TAB_SKIP (ts
, i
+ base
);
1383 if (j
> dstsize
- i
)
1399 /* --------------------------------------------------------------------------------------------- */
1402 * Read line from memory, converting tabs to spaces and padding with spaces.
1404 * \param src buffer to read from
1405 * \param srcsize size of src buffer
1406 * \param dst buffer to read to
1407 * \param dstsize size of dst buffer, excluding trailing null
1408 * \param skip number of characters to skip
1409 * \param ts tab size
1410 * \param show_cr show trailing carriage return as ^M
1412 * \return negative on error, otherwise number of bytes except padding
1415 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
)
1423 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1427 int j
= TAB_SKIP (ts
, i
+ base
);
1435 else if (dstsize
!= 0)
1442 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1444 if (skip
== 0 && show_cr
)
1469 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1472 if (!g_unichar_isprint (utf_ch
))
1484 while (dstsize
!= 0)
1493 /* --------------------------------------------------------------------------------------------- */
1496 * Read line from memory and build attribute array.
1498 * \param src buffer to read from
1499 * \param srcsize size of src buffer
1500 * \param dst buffer to read to
1501 * \param dstsize size of dst buffer, excluding trailing null
1502 * \param skip number of characters to skip
1503 * \param ts tab size
1504 * \param show_cr show trailing carriage return as ^M
1505 * \param hdiff horizontal diff structure
1506 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1507 * \param att buffer of attributes
1509 * \return negative on error, otherwise number of bytes except padding
1512 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
,
1513 GArray
* hdiff
, int ord
, char *att
)
1521 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1525 int j
= TAB_SKIP (ts
, i
+ base
);
1533 else if (dstsize
!= 0)
1536 *att
++ = is_inside (k
, hdiff
, ord
);
1541 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1543 if (skip
== 0 && show_cr
)
1548 *att
++ = is_inside (k
, hdiff
, ord
);
1550 *att
++ = is_inside (k
, hdiff
, ord
);
1556 *att
++ = is_inside (k
, hdiff
, ord
);
1571 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1574 if (!g_unichar_isprint (utf_ch
))
1580 *att
++ = is_inside (k
, hdiff
, ord
);
1587 while (dstsize
!= 0)
1597 /* --------------------------------------------------------------------------------------------- */
1600 * Read line from file, converting tabs to spaces and padding with spaces.
1602 * \param f file stream to read from
1603 * \param off offset of line inside file
1604 * \param dst buffer to read to
1605 * \param dstsize size of dst buffer, excluding trailing null
1606 * \param skip number of characters to skip
1607 * \param ts tab size
1608 * \param show_cr show trailing carriage return as ^M
1610 * \return negative on error, otherwise number of bytes except padding
1613 cvt_fget (FBUF
* f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, int show_cr
)
1616 int old_base
= base
;
1617 const int amount
= dstsize
;
1619 size_t useful
, offset
;
1626 const char *q
= NULL
;
1627 char tmp
[BUFSIZ
]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1628 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1630 if ((int) sizeof (tmp
) < amount
|| (int) sizeof (tmp
) <= dstsize
1631 || (int) sizeof (cvt
) < 8 * amount
)
1633 /* abnormal, but avoid buffer overflow */
1634 memset (dst
, ' ', dstsize
);
1635 dst
[dstsize
] = '\0';
1639 f_seek (f
, off
, SEEK_SET
);
1644 sz
= f_gets (tmp
, amount
, f
);
1648 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1649 if (cvt
[base
- old_base
- 1] == '\n')
1651 q
= &cvt
[base
- old_base
- 1];
1652 base
= old_base
+ q
- cvt
+ 1;
1659 memset (dst
, ' ', dstsize
);
1660 dst
[dstsize
] = '\0';
1664 useful
= base
- skip
;
1665 offset
= skip
- old_base
;
1667 if (useful
<= dstsize
)
1670 memmove (dst
, cvt
+ offset
, useful
);
1674 sz
= f_gets (tmp
, dstsize
- useful
+ 1, f
);
1677 const char *ptr
= tmp
;
1678 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1687 memmove (dst
, cvt
+ offset
, dstsize
);
1689 lastch
= cvt
[offset
+ dstsize
];
1693 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1695 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1699 if (i
+ 1 < dstsize
)
1712 for (; i
< dstsize
; i
++)
1720 /* --------------------------------------------------------------------------------------------- */
1721 /* diff printers et al ****************************************************** */
1724 cc_free_elt (void *elt
)
1733 /* --------------------------------------------------------------------------------------------- */
1736 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1738 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1739 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1747 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1749 if (sz
!= 0 && str
[sz
- 1] == '\n')
1754 p
.p
= g_strndup (str
, sz
);
1757 g_array_append_val (a
, p
);
1759 else if (dsrc
== DATA_SRC_MEM
)
1762 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1763 if (sz
!= 0 && str
[sz
- 1] == '\n')
1769 size_t new_size
= p
->u
.len
+ sz
;
1770 char *q
= g_realloc (p
->p
, new_size
);
1771 memcpy (q
+ p
->u
.len
, str
, sz
);
1776 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1778 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1779 f_write (f
, str
, sz
);
1784 /* --------------------------------------------------------------------------------------------- */
1787 redo_diff (WDiff
* dview
)
1789 FBUF
*const *f
= dview
->f
;
1799 if (dview
->opt
.quality
== 2)
1801 strcat (extra
, " -d");
1803 if (dview
->opt
.quality
== 1)
1805 strcat (extra
, " --speed-large-files");
1807 if (dview
->opt
.strip_trailing_cr
)
1809 strcat (extra
, " --strip-trailing-cr");
1811 if (dview
->opt
.ignore_tab_expansion
)
1813 strcat (extra
, " -E");
1815 if (dview
->opt
.ignore_space_change
)
1817 strcat (extra
, " -b");
1819 if (dview
->opt
.ignore_all_space
)
1821 strcat (extra
, " -w");
1823 if (dview
->opt
.ignore_case
)
1825 strcat (extra
, " -i");
1828 if (dview
->dsrc
!= DATA_SRC_MEM
)
1834 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1835 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[0], dview
->file
[1], ops
);
1839 g_array_free (ops
, TRUE
);
1843 ctx
.dsrc
= dview
->dsrc
;
1846 ctx
.a
= dview
->a
[0];
1848 rv
|= dff_reparse (0, dview
->file
[0], ops
, printer
, &ctx
);
1850 ctx
.a
= dview
->a
[1];
1852 rv
|= dff_reparse (1, dview
->file
[1], ops
, printer
, &ctx
);
1855 g_array_free (ops
, TRUE
);
1857 if (rv
!= 0 || dview
->a
[0]->len
!= dview
->a
[1]->len
)
1860 if (dview
->dsrc
== DATA_SRC_TMP
)
1866 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1868 dview
->hdiff
= g_ptr_array_new ();
1869 if (dview
->hdiff
!= NULL
)
1874 for (i
= 0; i
< dview
->a
[0]->len
; i
++)
1877 p
= &g_array_index (dview
->a
[0], DIFFLN
, i
);
1878 q
= &g_array_index (dview
->a
[1], DIFFLN
, i
);
1879 if (p
->line
&& q
->line
&& p
->ch
== CHG_CH
)
1881 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1884 gboolean runresult
=
1885 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
,
1889 g_array_free (h
, TRUE
);
1894 g_ptr_array_add (dview
->hdiff
, h
);
1901 /* --------------------------------------------------------------------------------------------- */
1904 destroy_hdiff (WDiff
* dview
)
1906 if (dview
->hdiff
!= NULL
)
1909 int len
= dview
->a
[0]->len
;
1910 for (i
= 0; i
< len
; i
++)
1912 GArray
*h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1914 g_array_free (h
, TRUE
);
1916 g_ptr_array_free (dview
->hdiff
, TRUE
);
1917 dview
->hdiff
= NULL
;
1920 mc_search_free (dview
->search
.handle
);
1921 dview
->search
.handle
= NULL
;
1922 g_free (dview
->search
.last_string
);
1923 dview
->search
.last_string
= NULL
;
1926 /* --------------------------------------------------------------------------------------------- */
1927 /* stuff ******************************************************************** */
1930 get_digits (unsigned int n
)
1940 /* --------------------------------------------------------------------------------------------- */
1943 get_line_numbers (const GArray
* a
, size_t pos
, int *linenum
, int *lineofs
)
1957 p
= &g_array_index (a
, DIFFLN
, pos
);
1962 for (n
= pos
; n
> 0; n
--)
1970 *lineofs
= pos
- n
+ 1;
1978 /* --------------------------------------------------------------------------------------------- */
1981 calc_nwidth (const GArray
** const a
)
1985 get_line_numbers (a
[0], a
[0]->len
- 1, &l1
, &o1
);
1986 get_line_numbers (a
[1], a
[1]->len
- 1, &l2
, &o2
);
1991 return get_digits (l1
);
1994 /* --------------------------------------------------------------------------------------------- */
1997 find_prev_hunk (const GArray
* a
, int pos
)
2000 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2004 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2008 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2012 if (pos
> 0 && (size_t) pos
< a
->len
)
2015 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
)
2019 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
)
2028 /* --------------------------------------------------------------------------------------------- */
2031 find_next_hunk (const GArray
* a
, size_t pos
)
2033 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2037 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2045 * Find start and end lines of the current hunk.
2047 * \param dview - widget WDiff
2048 * \return boolean and
2049 * start_line1 first line of current hunk (file[0])
2050 * end_line1 last line of current hunk (file[0])
2051 * start_line1 first line of current hunk (file[0])
2052 * end_line1 last line of current hunk (file[0])
2055 get_current_hunk (WDiff
* dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
2057 const GArray
*a0
= dview
->a
[0];
2058 const GArray
*a1
= dview
->a
[1];
2068 pos
= dview
->skip_rows
;
2069 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
2084 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2090 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
2091 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
2093 pos
= dview
->skip_rows
;
2094 while (pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2097 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
2098 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
2100 *end_line1
= max (*start_line1
, l0
);
2102 *end_line2
= max (*start_line2
, l1
);
2110 dview_remove_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
)
2115 f0
= fopen (dview
->file
[0], "r");
2117 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2120 fputs (buf
, merge_file
);
2122 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2126 fputs (buf
, merge_file
);
2132 dview_add_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int from2
, int to2
)
2138 f0
= fopen (dview
->file
[0], "r");
2139 f1
= fopen (dview
->file
[1], "r");
2141 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2144 fputs (buf
, merge_file
);
2147 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
)
2151 fputs (buf
, merge_file
);
2153 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2155 fputs (buf
, merge_file
);
2162 dview_replace_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
, int from2
, int to2
)
2168 f0
= fopen (dview
->file
[0], "r");
2169 f1
= fopen (dview
->file
[1], "r");
2171 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1)
2174 fputs (buf
, merge_file
);
2177 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
)
2181 fputs (buf
, merge_file
);
2183 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2187 fputs (buf
, merge_file
);
2194 do_merge_hunk (WDiff
* dview
)
2196 int from1
, to1
, from2
, to2
;
2200 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2205 vfs_path_t
*merge_file_name_vpath
= NULL
;
2209 dview
->merged
= mc_util_make_backup_if_possible (dview
->file
[0], "~~~");
2212 message (D_ERROR
, MSG_ERROR
,
2213 _("Cannot create backup file\n%s%s\n%s"),
2214 dview
->file
[0], "~~~", unix_error_string (errno
));
2220 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2221 if (merge_file_fd
== -1)
2223 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2224 unix_error_string (errno
));
2228 merge_file
= fdopen (merge_file_fd
, "w");
2233 dview_remove_hunk (dview
, merge_file
, from1
, to1
);
2236 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
);
2239 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
);
2242 fflush (merge_file
);
2243 fclose (merge_file
);
2244 res
= rewrite_backup_content (merge_file_name_vpath
, dview
->file
[0]);
2245 mc_unlink (merge_file_name_vpath
);
2246 vfs_path_free (merge_file_name_vpath
);
2250 /* --------------------------------------------------------------------------------------------- */
2251 /* view routines and callbacks ********************************************** */
2254 dview_compute_split (WDiff
* dview
, int i
)
2257 if (dview
->bias
< 2 - dview
->half1
)
2259 dview
->bias
= 2 - dview
->half1
;
2261 if (dview
->bias
> dview
->half2
- 2)
2263 dview
->bias
= dview
->half2
- 2;
2267 /* --------------------------------------------------------------------------------------------- */
2270 dview_compute_areas (WDiff
* dview
)
2272 dview
->height
= LINES
- 2;
2273 dview
->half1
= COLS
/ 2;
2274 dview
->half2
= COLS
- dview
->half1
;
2276 dview_compute_split (dview
, 0);
2279 /* --------------------------------------------------------------------------------------------- */
2282 dview_init (WDiff
* dview
, const char *args
, const char *file1
, const char *file2
,
2283 const char *label1
, const char *label2
, DSRC dsrc
)
2291 if (dsrc
== DATA_SRC_TMP
)
2304 else if (dsrc
== DATA_SRC_ORG
)
2306 f
[0] = f_open (file1
, O_RDONLY
);
2310 f
[1] = f_open (file2
, O_RDONLY
);
2319 dview
->file
[0] = file1
;
2320 dview
->file
[1] = file2
;
2321 dview
->label
[0] = g_strdup (label1
);
2322 dview
->label
[1] = g_strdup (label2
);
2325 dview
->hdiff
= NULL
;
2327 dview
->converter
= str_cnv_from_term
;
2328 dview_set_codeset (dview
);
2330 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2331 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2333 ndiff
= redo_diff (dview
);
2336 /* goto WIDGET_DESTROY stage: dview_fini() */
2340 dview
->ndiff
= ndiff
;
2342 dview
->view_quit
= 0;
2345 dview
->new_frame
= 1;
2346 dview
->skip_rows
= 0;
2347 dview
->skip_cols
= 0;
2348 dview
->display_symbols
= 0;
2349 dview
->display_numbers
= 0;
2351 dview
->tab_size
= 8;
2355 dview
->search
.handle
= NULL
;
2356 dview
->search
.last_string
= NULL
;
2357 dview
->search
.last_found_line
= -1;
2358 dview
->search
.last_accessed_num_line
= -1;
2360 dview
->opt
.quality
= 0;
2361 dview
->opt
.strip_trailing_cr
= 0;
2362 dview
->opt
.ignore_tab_expansion
= 0;
2363 dview
->opt
.ignore_space_change
= 0;
2364 dview
->opt
.ignore_all_space
= 0;
2365 dview
->opt
.ignore_case
= 0;
2367 dview_compute_areas (dview
);
2372 /* --------------------------------------------------------------------------------------------- */
2375 dview_reread (WDiff
* dview
)
2377 int ndiff
= dview
->ndiff
;
2379 destroy_hdiff (dview
);
2380 if (dview
->a
[0] != NULL
)
2382 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2383 g_array_free (dview
->a
[0], TRUE
);
2385 if (dview
->a
[1] != NULL
)
2387 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2388 g_array_free (dview
->a
[1], TRUE
);
2391 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2392 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2394 ndiff
= redo_diff (dview
);
2396 dview
->ndiff
= ndiff
;
2399 /* --------------------------------------------------------------------------------------------- */
2401 dview_diff_options (WDiff
* dview
)
2403 const char *quality_str
[] = {
2405 N_("&Fastest (Assume large files)"),
2406 N_("&Minimal (Find a smaller set of change)")
2409 QuickWidget diffopt_widgets
[] = {
2410 QUICK_BUTTON (6, 10, 14, OPTY
, N_("&Cancel"), B_CANCEL
, NULL
),
2411 QUICK_BUTTON (2, 10, 14, OPTY
, N_("&OK"), B_ENTER
, NULL
),
2413 QUICK_CHECKBOX (3, OPTX
, 12, OPTY
,
2414 N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
),
2415 QUICK_CHECKBOX (3, OPTX
, 11, OPTY
,
2416 N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
),
2417 QUICK_CHECKBOX (3, OPTX
, 10, OPTY
,
2418 N_("Ignore &space change"), &dview
->opt
.ignore_space_change
),
2419 QUICK_CHECKBOX (3, OPTX
, 9, OPTY
,
2420 N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
),
2421 QUICK_CHECKBOX (3, OPTX
, 8, OPTY
,
2422 N_("&Ignore case"), &dview
->opt
.ignore_case
),
2423 QUICK_LABEL (3, OPTX
, 7, OPTY
, N_("Diff extra options")),
2424 QUICK_RADIO (3, OPTX
, 3, OPTY
,
2425 3, (const char **) quality_str
, (int *) &dview
->opt
.quality
),
2426 QUICK_LABEL (3, OPTX
, 2, OPTY
, N_("Diff algorithm")),
2431 QuickDialog diffopt
= {
2433 N_("Diff Options"), "[Diff Options]",
2434 diffopt_widgets
, NULL
, FALSE
2437 if (quick_dialog (&diffopt
) != B_CANCEL
)
2439 dview_reread (dview
);
2443 /* --------------------------------------------------------------------------------------------- */
2446 dview_fini (WDiff
* dview
)
2448 if (dview
->dsrc
!= DATA_SRC_MEM
)
2450 f_close (dview
->f
[1]);
2451 f_close (dview
->f
[0]);
2454 if (dview
->converter
!= str_cnv_from_term
)
2455 str_close_conv (dview
->converter
);
2457 destroy_hdiff (dview
);
2458 if (dview
->a
[0] != NULL
)
2460 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2461 g_array_free (dview
->a
[0], TRUE
);
2464 if (dview
->a
[1] != NULL
)
2466 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2467 g_array_free (dview
->a
[1], TRUE
);
2471 g_free (dview
->label
[0]);
2472 g_free (dview
->label
[1]);
2476 /* --------------------------------------------------------------------------------------------- */
2479 dview_display_file (const WDiff
* dview
, int ord
, int r
, int c
, int height
, int width
)
2484 FBUF
*f
= dview
->f
[ord
];
2485 int skip
= dview
->skip_cols
;
2486 int display_symbols
= dview
->display_symbols
;
2487 int display_numbers
= dview
->display_numbers
;
2488 int show_cr
= dview
->show_cr
;
2491 int nwidth
= display_numbers
;
2492 int xwidth
= display_symbols
+ display_numbers
;
2493 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2494 tab_size
= dview
->tab_size
;
2498 if (xwidth
> width
&& display_symbols
)
2501 display_symbols
= 0;
2503 if (xwidth
> width
&& display_numbers
)
2506 display_numbers
= width
;
2520 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2522 /* abnormal, but avoid buffer overflow */
2526 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2528 int ch
, next_ch
, col
;
2530 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2532 tty_setcolor (NORMAL_COLOR
);
2533 if (display_symbols
)
2535 tty_gotoyx (r
+ j
, c
- 2);
2536 tty_print_char (ch
);
2540 if (display_numbers
)
2542 tty_gotoyx (r
+ j
, c
- xwidth
);
2543 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2544 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2548 tty_setcolor (DFF_ADD_COLOR
);
2552 tty_setcolor (DFF_CHG_COLOR
);
2556 if (i
== (size_t) dview
->search
.last_found_line
)
2558 tty_setcolor (MARKED_SELECTED_COLOR
);
2562 if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2566 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2569 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2570 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2571 tty_gotoyx (r
+ j
, c
);
2573 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2579 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2582 if (!g_unichar_isprint (next_ch
))
2586 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2589 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2591 if (mc_global
.utf8_display
)
2596 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2600 else if (dview
->utf8
)
2602 convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2605 next_ch
= convert_to_display_c (next_ch
);
2607 tty_print_anychar (next_ch
);
2613 else if (ch
== CHG_CH
)
2615 tty_setcolor (DFF_CHH_COLOR
);
2619 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2622 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2626 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2631 if (display_numbers
)
2633 tty_gotoyx (r
+ j
, c
- xwidth
);
2634 memset (buf
, ' ', display_numbers
);
2635 buf
[display_numbers
] = '\0';
2636 tty_print_string (buf
);
2640 tty_setcolor (DFF_DEL_COLOR
);
2644 tty_setcolor (DFF_CHD_COLOR
);
2646 memset (buf
, ' ', width
);
2649 tty_gotoyx (r
+ j
, c
);
2650 /* tty_print_nstring (buf, width); */
2652 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2658 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2661 if (!g_unichar_isprint (next_ch
))
2665 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2669 if (mc_global
.utf8_display
)
2674 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2677 else if (dview
->utf8
)
2678 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2681 next_ch
= convert_to_display_c (next_ch
);
2683 tty_print_anychar (next_ch
);
2689 tty_setcolor (NORMAL_COLOR
);
2691 if (width
< xwidth
- 1)
2695 memset (buf
, ' ', k
);
2697 for (; j
< height
; j
++)
2701 tty_gotoyx (r
+ j
, c
- xwidth
);
2702 /* tty_print_nstring (buf, xwidth - 1); */
2703 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2705 tty_gotoyx (r
+ j
, c
);
2706 /* tty_print_nstring (buf, width); */
2707 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2713 /* --------------------------------------------------------------------------------------------- */
2716 dview_status (const WDiff
* dview
, int ord
, int width
, int c
)
2720 int linenum
, lineofs
;
2724 tty_setcolor (STATUSBAR_COLOR
);
2727 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2729 filename_width
= width
- 22;
2730 if (filename_width
< 8)
2733 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2734 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2735 vfs_path_free (vpath
);
2736 buf
= str_term_trim (path
, filename_width
);
2738 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width
, buf
, linenum
, lineofs
,
2741 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width
, buf
, linenum
, lineofs
, dview
->ndiff
);
2745 /* --------------------------------------------------------------------------------------------- */
2748 dview_redo (WDiff
* dview
)
2750 if (dview
->display_numbers
)
2752 int old
= dview
->display_numbers
;
2753 dview
->display_numbers
= calc_nwidth ((const GArray
**) dview
->a
);
2754 dview
->new_frame
= (old
!= dview
->display_numbers
);
2756 dview_reread (dview
);
2759 /* --------------------------------------------------------------------------------------------- */
2762 dview_edit (WDiff
* dview
, int ord
)
2766 int linenum
, lineofs
;
2768 if (dview
->dsrc
== DATA_SRC_TMP
)
2770 error_dialog (_("Edit"), _("Edit is disabled"));
2774 h
= ((Widget
*) dview
)->owner
;
2777 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2778 h
->modal
= TRUE
; /* not allow edit file in several editors */
2780 vfs_path_t
*tmp_vpath
;
2782 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2783 do_edit_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2784 vfs_path_free (tmp_vpath
);
2788 dview_update (dview
);
2791 /* --------------------------------------------------------------------------------------------- */
2794 dview_goto_cmd (WDiff
* dview
, int ord
)
2796 static const char *title
[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2797 static char prev
[256];
2798 /* XXX some statics here, to be remembered between runs */
2803 input
= input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
, prev
);
2806 const char *s
= input
;
2807 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2813 for (; i
< dview
->a
[ord
]->len
; i
++)
2815 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2816 if (p
->line
== newline
)
2822 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2823 g_snprintf (prev
, sizeof (prev
), "%d", newline
);
2829 /* --------------------------------------------------------------------------------------------- */
2832 dview_labels (WDiff
* dview
)
2834 Dlg_head
*h
= dview
->widget
.owner
;
2835 WButtonBar
*b
= find_buttonbar (h
);
2837 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), diff_map
, (Widget
*) dview
);
2838 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), diff_map
, (Widget
*) dview
);
2839 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), diff_map
, (Widget
*) dview
);
2840 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), diff_map
, (Widget
*) dview
);
2841 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), diff_map
, (Widget
*) dview
);
2842 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), diff_map
, (Widget
*) dview
);
2843 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), diff_map
, (Widget
*) dview
);
2847 /* --------------------------------------------------------------------------------------------- */
2850 dview_event (Gpm_Event
* event
, void *x
)
2852 WDiff
*dview
= (WDiff
*) x
;
2853 int result
= MOU_NORMAL
;
2855 /* We are not interested in the release events */
2856 if ((event
->type
& (GPM_DOWN
| GPM_DRAG
)) == 0)
2862 if ((event
->buttons
& GPM_B_UP
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2864 dview
->skip_rows
-= 2;
2865 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2866 dview_update (dview
);
2868 else if ((event
->buttons
& GPM_B_DOWN
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2870 dview
->skip_rows
+= 2;
2871 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2872 dview_update (dview
);
2879 dview_save (WDiff
* dview
)
2881 gboolean res
= TRUE
;
2884 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2885 dview
->merged
= !res
;
2890 dview_do_save (WDiff
* dview
)
2892 (void) dview_save (dview
);
2896 dview_save_options (WDiff
* dview
)
2898 mc_config_set_bool (mc_main_config
, "DiffView", "show_symbols",
2899 dview
->display_symbols
!= 0 ? TRUE
: FALSE
);
2900 mc_config_set_bool (mc_main_config
, "DiffView", "show_numbers",
2901 dview
->display_numbers
!= 0 ? TRUE
: FALSE
);
2902 mc_config_set_int (mc_main_config
, "DiffView", "tab_size", dview
->tab_size
);
2904 mc_config_set_int (mc_main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2906 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_tws",
2907 dview
->opt
.strip_trailing_cr
);
2908 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_all_space",
2909 dview
->opt
.ignore_all_space
);
2910 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_space_change",
2911 dview
->opt
.ignore_space_change
);
2912 mc_config_set_bool (mc_main_config
, "DiffView", "diff_tab_expansion",
2913 dview
->opt
.ignore_tab_expansion
);
2914 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_case", dview
->opt
.ignore_case
);
2918 dview_load_options (WDiff
* dview
)
2920 gboolean show_numbers
, show_symbols
;
2923 show_symbols
= mc_config_get_bool (mc_main_config
, "DiffView", "show_symbols", FALSE
);
2925 dview
->display_symbols
= 1;
2926 show_numbers
= mc_config_get_bool (mc_main_config
, "DiffView", "show_numbers", FALSE
);
2928 dview
->display_numbers
= calc_nwidth ((const GArray
** const) dview
->a
);
2929 tab_size
= mc_config_get_int (mc_main_config
, "DiffView", "tab_size", 8);
2930 if (tab_size
> 0 && tab_size
< 9)
2931 dview
->tab_size
= tab_size
;
2933 dview
->tab_size
= 8;
2935 dview
->opt
.quality
= mc_config_get_int (mc_main_config
, "DiffView", "diff_quality", 0);
2937 dview
->opt
.strip_trailing_cr
=
2938 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2939 dview
->opt
.ignore_all_space
=
2940 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2941 dview
->opt
.ignore_space_change
=
2942 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2943 dview
->opt
.ignore_tab_expansion
=
2944 mc_config_get_bool (mc_main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2945 dview
->opt
.ignore_case
=
2946 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_case", FALSE
);
2948 dview
->new_frame
= 1;
2952 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2956 dview_ok_to_exit (WDiff
* dview
)
2958 gboolean res
= TRUE
;
2964 act
= query_dialog (_("Quit"), !mc_global
.widget
.midnight_shutdown
?
2965 _("File was modified. Save with exit?") :
2966 _("Midnight Commander is being shut down.\nSave modified file?"),
2967 D_NORMAL
, 2, _("&Yes"), _("&No"));
2970 if (mc_global
.widget
.midnight_shutdown
|| (act
== -1))
2979 (void) dview_save (dview
);
2983 if (mc_util_restore_from_backup_if_possible (dview
->file
[0], "~~~"))
2984 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2993 /* --------------------------------------------------------------------------------------------- */
2996 dview_execute_cmd (WDiff
* dview
, unsigned long command
)
2998 cb_ret_t res
= MSG_HANDLED
;
3001 case CK_ShowSymbols
:
3002 dview
->display_symbols
^= 1;
3003 dview
->new_frame
= 1;
3005 case CK_ShowNumbers
:
3006 dview
->display_numbers
^= calc_nwidth ((const GArray
** const) dview
->a
);
3007 dview
->new_frame
= 1;
3011 dview
->new_frame
= 1;
3017 dview
->new_frame
= 1;
3023 dview_compute_split (dview
, 1);
3024 dview
->new_frame
= 1;
3031 dview_compute_split (dview
, -1);
3032 dview
->new_frame
= 1;
3036 dview
->tab_size
= 2;
3039 dview
->tab_size
= 3;
3042 dview
->tab_size
= 4;
3045 dview
->tab_size
= 8;
3054 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3055 find_next_hunk (dview
->a
[0], dview
->skip_rows
);
3058 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3059 find_prev_hunk (dview
->a
[0], dview
->skip_rows
);
3062 dview_goto_cmd (dview
, TRUE
);
3065 dview_edit (dview
, dview
->ord
);
3068 do_merge_hunk (dview
);
3072 dview_edit (dview
, dview
->ord
^ 1);
3075 dview_search_cmd (dview
);
3077 case CK_SearchContinue
:
3078 dview_continue_search_cmd (dview
);
3081 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3084 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[0]->len
- 1;
3087 if (dview
->skip_rows
> 0)
3090 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3095 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3098 if (dview
->height
> 2)
3100 dview
->skip_rows
+= dview
->height
- 2;
3101 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3105 if (dview
->height
> 2)
3107 dview
->skip_rows
-= dview
->height
- 2;
3108 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3118 dview
->skip_cols
-= 8;
3121 dview
->skip_cols
+= 8;
3124 dview
->skip_cols
= 0;
3130 dview
->view_quit
= 1;
3133 dview_do_save (dview
);
3136 dview_diff_options (dview
);
3139 case CK_SelectCodepage
:
3140 dview_select_encoding (dview
);
3141 dview_reread (dview
);
3142 tty_touch_screen ();
3147 /* don't close diffviewer due to SIGINT */
3150 res
= MSG_NOT_HANDLED
;
3155 /* --------------------------------------------------------------------------------------------- */
3158 dview_handle_key (WDiff
* dview
, int key
)
3160 unsigned long command
;
3162 key
= convert_from_input_c (key
);
3164 command
= keybind_lookup_keymap_command (diff_map
, key
);
3165 if ((command
!= CK_IgnoreKey
) && (dview_execute_cmd (dview
, command
) == MSG_HANDLED
))
3169 return MSG_NOT_HANDLED
;
3172 /* --------------------------------------------------------------------------------------------- */
3175 dview_callback (Widget
* w
, widget_msg_t msg
, int parm
)
3177 WDiff
*dview
= (WDiff
*) w
;
3178 Dlg_head
*h
= dview
->widget
.owner
;
3184 dview_labels (dview
);
3185 dview_load_options (dview
);
3186 dview_update (dview
);
3190 dview
->new_frame
= 1;
3191 dview_update (dview
);
3195 i
= dview_handle_key (dview
, parm
);
3196 if (dview
->view_quit
)
3199 dview_update (dview
);
3202 case WIDGET_COMMAND
:
3203 i
= dview_execute_cmd (dview
, parm
);
3204 if (dview
->view_quit
)
3207 dview_update (dview
);
3210 case WIDGET_DESTROY
:
3211 dview_save_options (dview
);
3216 return default_proc (msg
, parm
);
3220 /* --------------------------------------------------------------------------------------------- */
3223 dview_adjust_size (Dlg_head
* h
)
3228 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3229 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3230 bar
= find_buttonbar (h
);
3231 widget_set_size (&dview
->widget
, 0, 0, LINES
- 1, COLS
);
3232 widget_set_size ((Widget
*) bar
, LINES
- 1, 0, 1, COLS
);
3234 dview_compute_areas (dview
);
3237 /* --------------------------------------------------------------------------------------------- */
3240 dview_dialog_callback (Dlg_head
* h
, Widget
* sender
, dlg_msg_t msg
, int parm
, void *data
)
3242 WDiff
*dview
= (WDiff
*) data
;
3247 dview_adjust_size (h
);
3253 return dview_execute_cmd (NULL
, parm
);
3254 /* message from buttonbar */
3255 if (sender
== (Widget
*) find_buttonbar (h
))
3258 return send_message ((Widget
*) data
, WIDGET_COMMAND
, parm
);
3260 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3261 return dview_execute_cmd (dview
, parm
);
3263 return MSG_NOT_HANDLED
;
3266 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3267 h
->state
= DLG_ACTIVE
; /* don't stop the dialog before final decision */
3268 if (dview_ok_to_exit (dview
))
3269 h
->state
= DLG_CLOSED
;
3273 return default_dlg_callback (h
, sender
, msg
, parm
, data
);
3277 /* --------------------------------------------------------------------------------------------- */
3280 dview_get_title (const Dlg_head
* h
, size_t len
)
3282 const WDiff
*dview
= (const WDiff
*) find_widget_type (h
, dview_callback
);
3283 const char *modified
= dview
->merged
? " (*) " : " ";
3287 len1
= (len
- str_term_width1 (_("Diff:")) - strlen (modified
) - 3) / 2;
3289 title
= g_string_sized_new (len
);
3290 g_string_append (title
, _("Diff:"));
3291 g_string_append (title
, modified
);
3292 g_string_append (title
, str_term_trim (dview
->label
[0], len1
));
3293 g_string_append (title
, " | ");
3294 g_string_append (title
, str_term_trim (dview
->label
[1], len1
));
3296 return g_string_free (title
, FALSE
);
3299 /*** public functions ****************************************************************************/
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
,
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
);
3341 /* --------------------------------------------------------------------------------------------- */
3343 #define GET_FILE_AND_STAMP(n) \
3347 real_file##n = file##n; \
3348 if (!vfs_file_is_local (file##n)) \
3350 real_file##n = mc_getlocalcopy (file##n); \
3351 if (real_file##n != NULL) \
3354 if (mc_stat (real_file##n, &st##n) != 0) \
3361 #define UNGET_FILE(n) \
3367 if (use_copy##n > 0) \
3370 mtime = st##n.st_mtime; \
3371 if (mc_stat (real_file##n, &st##n) == 0) \
3372 changed = (mtime != st##n.st_mtime); \
3374 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3375 vfs_path_free (real_file##n); \
3381 dview_diff_cmd (void)
3384 vfs_path_t
*file0
= NULL
;
3385 vfs_path_t
*file1
= NULL
;
3389 if (mc_global
.mc_run_mode
== MC_RUN_FULL
)
3391 const WPanel
*panel0
= current_panel
;
3392 const WPanel
*panel1
= other_panel
;
3393 if (get_current_index ())
3395 panel0
= other_panel
;
3396 panel1
= current_panel
;
3398 file0
= vfs_path_append_new (panel0
->cwd_vpath
, selection (panel0
)->fname
, NULL
);
3399 file1
= vfs_path_append_new (panel1
->cwd_vpath
, selection (panel1
)->fname
, NULL
);
3400 is_dir0
= S_ISDIR (selection (panel0
)->st
.st_mode
);
3401 is_dir1
= S_ISDIR (selection (panel1
)->st
.st_mode
);
3407 if (file0
!= NULL
&& !is_dir0
&& file1
!= NULL
&& !is_dir1
)
3413 vfs_path_t
*real_file0
;
3414 vfs_path_t
*real_file1
;
3416 GET_FILE_AND_STAMP (0);
3417 GET_FILE_AND_STAMP (1);
3418 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3420 char *real_file0_str
, *real_file1_str
;
3421 char *file0_str
, *file1_str
;
3423 real_file0_str
= vfs_path_to_str (real_file0
);
3424 real_file1_str
= vfs_path_to_str (real_file1
);
3425 file0_str
= vfs_path_to_str (file0
);
3426 file1_str
= vfs_path_to_str (file1
);
3427 rv
= diff_view (real_file0_str
, real_file1_str
, file0_str
, file1_str
);
3428 g_free (real_file0_str
);
3429 g_free (real_file1_str
);
3438 vfs_path_free (file1
);
3439 vfs_path_free (file0
);
3442 message (1, MSG_ERROR
, _("Two files are needed to compare"));
3445 /* --------------------------------------------------------------------------------------------- */
3448 dview_update (WDiff
* dview
)
3450 int height
= dview
->height
;
3454 int last
= dview
->a
[0]->len
- 1;
3456 if (dview
->skip_rows
> last
)
3458 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
3460 if (dview
->skip_rows
< 0)
3462 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3464 if (dview
->skip_cols
< 0)
3466 dview
->skip_cols
= 0;
3474 width1
= dview
->half1
+ dview
->bias
;
3475 width2
= dview
->half2
- dview
->bias
;
3482 if (dview
->new_frame
)
3484 int xwidth
= dview
->display_symbols
+ dview
->display_numbers
;
3486 tty_setcolor (NORMAL_COLOR
);
3489 tty_draw_box (1, 0, height
, width1
, FALSE
);
3493 tty_draw_box (1, width1
, height
, width2
, FALSE
);
3499 if (xwidth
< width1
- 1)
3501 tty_gotoyx (1, xwidth
);
3502 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3503 tty_gotoyx (height
, xwidth
);
3504 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3505 tty_draw_vline (2, xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3507 if (xwidth
< width2
- 1)
3509 tty_gotoyx (1, width1
+ xwidth
);
3510 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3511 tty_gotoyx (height
, width1
+ xwidth
);
3512 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3513 tty_draw_vline (2, width1
+ xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3516 dview
->new_frame
= 0;
3521 dview_status (dview
, dview
->ord
, width1
, 0);
3522 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
3526 dview_status (dview
, dview
->ord
^ 1, width2
, width1
);
3527 dview_display_file (dview
, dview
->ord
^ 1, 2, width1
+ 1, height
- 2, width2
- 2);
3531 /* --------------------------------------------------------------------------------------------- */