Support of multiple editors and viewers.
[midnight-commander.git] / src / diffviewer / ydiff.c
blobb0bcd16f9db9bfa612d2c7b4a06860c5fa86114e
1 /*
2 Copyright (C) 2007, 2010 Free Software Foundation, Inc.
3 Written by:
4 2007 Daniel Borca <dborca@yahoo.com>
6 2010 Slava Zanko <slavazanko@gmail.com>
7 2010 Andrew Borodin <aborodin@vmail.ru>
8 2010 Ilia Maslakov <il.smind@gmail.com>
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13 the Free Software Foundation; either version 2 of the License, or
14 (at your option) any later version.
16 This program is distributed in the hope that it will be useful,
17 but WITHOUT ANY WARRANTY; without even the implied warranty of
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 GNU General Public License for more details.
21 You should have received a copy of the GNU General Public License
22 along with this program; if not, write to the Free Software
23 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
27 #include <config.h>
28 #include <ctype.h>
29 #include <errno.h>
30 #include <fcntl.h>
31 #include <stdlib.h>
32 #include <sys/stat.h>
33 #include <sys/types.h>
34 #include <sys/wait.h>
36 #include "lib/global.h"
37 #include "lib/tty/tty.h"
38 #include "lib/tty/color.h"
39 #include "lib/tty/key.h"
41 #include "lib/skin.h" /* EDITOR_NORMAL_COLOR */
42 #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
44 #include "src/cmddef.h"
45 #include "src/keybind.h"
46 #include "src/cmd.h"
47 #include "src/dialog.h"
48 #include "src/help.h"
49 #include "src/wtools.h"
50 #include "src/charsets.h"
51 #include "src/history.h"
52 #include "src/panel.h" /* Needed for current_panel and other_panel */
53 #include "src/layout.h" /* Needed for get_current_index and get_other_panel */
54 #include "src/main.h" /* mc_run_mode */
55 #include "src/selcodepage.h"
57 #include "ydiff.h"
58 #include "internal.h"
60 /*** global variables ****************************************************************************/
62 /*** file scope macro definitions ****************************************************************/
64 #define g_array_foreach(a, TP, cbf) \
65 do { \
66 size_t g_array_foreach_i;\
67 TP *g_array_foreach_var=NULL; \
68 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
69 { \
70 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
71 (*cbf) (g_array_foreach_var); \
72 } \
73 } while (0)
75 #define FILE_READ_BUF 4096
76 #define FILE_FLAG_TEMP (1 << 0)
78 #define OPTX 56
79 #define OPTY 17
81 #define ADD_CH '+'
82 #define DEL_CH '-'
83 #define CHG_CH '*'
84 #define EQU_CH ' '
86 #define HDIFF_ENABLE 1
87 #define HDIFF_MINCTX 5
88 #define HDIFF_DEPTH 10
90 #define FILE_DIRTY(fs) \
91 do { \
92 (fs)->pos = 0; \
93 (fs)->len = 0; \
94 } while (0)
97 /*** file scope type declarations ****************************************************************/
99 /*** file scope variables ************************************************************************/
101 /*** file scope functions ************************************************************************/
102 /* --------------------------------------------------------------------------------------------- */
104 static inline int
105 TAB_SKIP (int ts, int pos)
107 if (ts > 0 && ts < 9)
108 return ts - pos % ts;
109 else
110 return 8 - pos % 8;
113 /* --------------------------------------------------------------------------------------------- */
115 static void
116 dview_set_codeset (WDiff * dview)
118 #ifdef HAVE_CHARSET
119 const char *encoding_id = NULL;
121 dview->utf8 = TRUE;
122 encoding_id = get_codepage_id (source_codepage >= 0 ? source_codepage : display_codepage);
123 if (encoding_id != NULL)
125 GIConv conv;
126 conv = str_crt_conv_from (encoding_id);
127 if (conv != INVALID_CONV)
129 if (dview->converter != str_cnv_from_term)
130 str_close_conv (dview->converter);
131 dview->converter = conv;
133 dview->utf8 = (gboolean) str_isutf8 (encoding_id);
135 #else
136 (void) dview;
137 #endif
140 /* --------------------------------------------------------------------------------------------- */
142 static void
143 dview_select_encoding (WDiff * dview)
145 #ifdef HAVE_CHARSET
146 if (do_select_codepage ())
147 dview_set_codeset (dview);
148 #else
149 (void) dview;
150 #endif
154 static gboolean
155 rewrite_backup_content (const char *from_file_name, const char *to_file_name)
157 FILE *backup_fd;
158 char *contents;
159 gsize length;
161 if (!g_file_get_contents (from_file_name, &contents, &length, NULL))
162 return FALSE;
164 backup_fd = fopen (to_file_name, "w");
165 if (backup_fd == NULL)
167 g_free (contents);
168 return FALSE;
171 fwrite ((const void *) contents, length, 1, backup_fd);
173 fflush (backup_fd);
174 fclose (backup_fd);
175 g_free (contents);
176 return TRUE;
179 /* buffered I/O ************************************************************* */
182 * Try to open a temporary file.
184 * \param[out] name address of a pointer to store the temporary name
186 * \return file descriptor on success, negative on error
188 * \note the name is not altered if this function fails
191 static int
192 open_temp (void **name)
194 int fd;
195 char *diff_file_name = NULL;
197 fd = mc_mkstemps (&diff_file_name, "mcdiff", NULL);
198 if (fd == -1)
200 message (D_ERROR, MSG_ERROR,
201 _("Cannot create temporary diff file\n%s"), unix_error_string (errno));
202 return -1;
204 *name = diff_file_name;
205 return fd;
208 /* --------------------------------------------------------------------------------------------- */
211 * Alocate file structure and associate file descriptor to it.
213 * \param fd file descriptor
215 * \return file structure
217 static FBUF *
218 f_dopen (int fd)
220 FBUF *fs;
222 if (fd < 0)
223 return NULL;
225 fs = g_try_malloc (sizeof (FBUF));
226 if (fs == NULL)
227 return NULL;
229 fs->buf = g_try_malloc (FILE_READ_BUF);
230 if (fs->buf == NULL)
232 g_free (fs);
233 return NULL;
236 fs->fd = fd;
237 FILE_DIRTY (fs);
238 fs->flags = 0;
239 fs->data = NULL;
241 return fs;
244 /* --------------------------------------------------------------------------------------------- */
247 * Free file structure without closing the file.
249 * \param fs file structure
251 * \return 0 on success, non-zero on error
253 static int
254 f_free (FBUF * fs)
256 int rv = 0;
257 if (fs->flags & FILE_FLAG_TEMP)
259 rv = unlink (fs->data);
260 g_free (fs->data);
262 g_free (fs->buf);
263 g_free (fs);
264 return rv;
268 /* --------------------------------------------------------------------------------------------- */
271 * Open a binary temporary file in R/W mode.
273 * \return file structure
275 * \note the file will be deleted when closed
277 static FBUF *
278 f_temp (void)
280 int fd;
281 FBUF *fs;
283 fs = f_dopen (0);
284 if (fs == NULL)
286 return NULL;
289 fd = open_temp (&fs->data);
290 if (fd < 0)
292 f_free (fs);
293 return NULL;
296 fs->fd = fd;
297 fs->flags = FILE_FLAG_TEMP;
298 return fs;
301 /* --------------------------------------------------------------------------------------------- */
304 * Open a binary file in specified mode.
306 * \param filename file name
307 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
309 * \return file structure
311 static FBUF *
312 f_open (const char *filename, int flags)
314 int fd;
315 FBUF *fs;
317 fs = f_dopen (0);
318 if (fs == NULL)
320 return NULL;
323 fd = open (filename, flags);
324 if (fd < 0)
326 f_free (fs);
327 return NULL;
330 fs->fd = fd;
331 return fs;
334 /* --------------------------------------------------------------------------------------------- */
337 * Read a line of bytes from file until newline or EOF.
339 * \param buf destination buffer
340 * \param size size of buffer
341 * \param fs file structure
343 * \return number of bytes read
345 * \note does not stop on null-byte
346 * \note buf will not be null-terminated
348 static size_t
349 f_gets (char *buf, size_t size, FBUF * fs)
351 size_t j = 0;
355 int i;
356 int stop = 0;
358 for (i = fs->pos; j < size && i < fs->len && !stop; i++, j++)
360 buf[j] = fs->buf[i];
361 if (buf[j] == '\n')
363 stop = 1;
366 fs->pos = i;
368 if (j == size || stop)
370 break;
373 fs->pos = 0;
374 fs->len = read (fs->fd, fs->buf, FILE_READ_BUF);
376 while (fs->len > 0);
378 return j;
381 /* --------------------------------------------------------------------------------------------- */
384 * Seek into file.
386 * \param fs file structure
387 * \param off offset
388 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
390 * \return position in file, starting from begginning
392 * \note avoids thrashing read cache when possible
394 static off_t
395 f_seek (FBUF * fs, off_t off, int whence)
397 off_t rv;
399 if (fs->len && whence != SEEK_END)
401 rv = lseek (fs->fd, 0, SEEK_CUR);
402 if (rv != -1)
404 if (whence == SEEK_CUR)
406 whence = SEEK_SET;
407 off += rv - fs->len + fs->pos;
409 if (off - rv >= -fs->len && off - rv <= 0)
411 fs->pos = fs->len + off - rv;
412 return off;
417 rv = lseek (fs->fd, off, whence);
418 if (rv != -1)
420 FILE_DIRTY (fs);
422 return rv;
425 /* --------------------------------------------------------------------------------------------- */
428 * Seek to the beginning of file, thrashing read cache.
430 * \param fs file structure
432 * \return 0 if success, non-zero on error
434 static off_t
435 f_reset (FBUF * fs)
437 off_t rv = lseek (fs->fd, 0, SEEK_SET);
438 if (rv != -1)
440 FILE_DIRTY (fs);
442 return rv;
445 /* --------------------------------------------------------------------------------------------- */
448 * Write bytes to file.
450 * \param fs file structure
451 * \param buf source buffer
452 * \param size size of buffer
454 * \return number of written bytes, -1 on error
456 * \note thrashes read cache
458 static ssize_t
459 f_write (FBUF * fs, const char *buf, size_t size)
461 ssize_t rv = write (fs->fd, buf, size);
462 if (rv >= 0)
464 FILE_DIRTY (fs);
466 return rv;
469 /* --------------------------------------------------------------------------------------------- */
472 * Truncate file to the current position.
474 * \param fs file structure
476 * \return current file size on success, negative on error
478 * \note thrashes read cache
480 static off_t
481 f_trunc (FBUF * fs)
483 off_t off = lseek (fs->fd, 0, SEEK_CUR);
484 if (off != -1)
486 int rv = ftruncate (fs->fd, off);
487 if (rv != 0)
489 off = -1;
491 else
493 FILE_DIRTY (fs);
496 return off;
499 /* --------------------------------------------------------------------------------------------- */
502 * Close file.
504 * \param fs file structure
506 * \return 0 on success, non-zero on error
508 * \note if this is temporary file, it is deleted
510 static int
511 f_close (FBUF * fs)
513 int rv = close (fs->fd);
514 f_free (fs);
515 return rv;
518 /* --------------------------------------------------------------------------------------------- */
521 * Create pipe stream to process.
523 * \param cmd shell command line
524 * \param flags open mode, either O_RDONLY or O_WRONLY
526 * \return file structure
528 static FBUF *
529 p_open (const char *cmd, int flags)
531 FILE *f;
532 FBUF *fs;
533 const char *type = NULL;
535 if (flags == O_RDONLY)
537 type = "r";
539 if (flags == O_WRONLY)
541 type = "w";
544 if (type == NULL)
546 return NULL;
549 fs = f_dopen (0);
550 if (fs == NULL)
552 return NULL;
555 f = popen (cmd, type);
556 if (f == NULL)
558 f_free (fs);
559 return NULL;
562 fs->fd = fileno (f);
563 fs->data = f;
564 return fs;
567 /* --------------------------------------------------------------------------------------------- */
570 * Close pipe stream.
572 * \param fs structure
574 * \return 0 on success, non-zero on error
576 static int
577 p_close (FBUF * fs)
579 int rv = pclose (fs->data);
580 f_free (fs);
581 return rv;
585 * Get one char (byte) from string
587 * \param char * str, gboolean * result
589 * \return int as character or 0 and result == FALSE if fail
592 static int
593 dview_get_byte (char *str, gboolean * result)
595 if (str == NULL)
597 *result = FALSE;
598 return 0;
600 *result = TRUE;
601 return (unsigned char) *str;
606 * Get utf multibyte char from string
608 * \param char * str, int * char_width, gboolean * result
610 * \return int as utf character or 0 and result == FALSE if fail
613 static int
614 dview_get_utf (char *str, int *char_width, gboolean * result)
616 int res = -1;
617 gunichar ch;
618 gchar *next_ch = NULL;
619 int width = 0;
621 *result = TRUE;
623 if (str == NULL)
625 *result = FALSE;
626 width = 0;
627 return 0;
630 res = g_utf8_get_char_validated (str, -1);
632 if (res < 0)
634 ch = *str;
635 width = 0;
637 else
639 ch = res;
640 /* Calculate UTF-8 char width */
641 next_ch = g_utf8_next_char (str);
642 if (next_ch)
644 width = next_ch - str;
646 else
648 ch = 0;
649 width = 0;
652 *char_width = width;
653 return ch;
656 static int
657 dview_str_utf8_offset_to_pos (const char *text, size_t length)
659 ptrdiff_t result;
660 if (text == NULL || text[0] == '\0')
661 return length;
662 if (g_utf8_validate (text, -1, NULL))
664 result = g_utf8_offset_to_pointer (text, length) - text;
666 else
668 gunichar uni;
669 char *tmpbuf, *buffer;
670 buffer = tmpbuf = g_strdup (text);
671 while (tmpbuf[0] != '\0')
673 uni = g_utf8_get_char_validated (tmpbuf, -1);
674 if ((uni != (gunichar) (-1)) && (uni != (gunichar) (-2)))
676 tmpbuf = g_utf8_next_char (tmpbuf);
678 else
680 tmpbuf[0] = '.';
681 tmpbuf++;
685 result = g_utf8_offset_to_pointer (tmpbuf, length) - tmpbuf;
686 g_free (buffer);
688 return max (length, (size_t) result);
692 /* --------------------------------------------------------------------------------------------- */
693 /* diff parse *************************************************************** */
696 * Read decimal number from string.
698 * \param[in,out] str string to parse
699 * \param[out] n extracted number
701 * \return 0 if success, otherwise non-zero
703 static int
704 scan_deci (const char **str, int *n)
706 const char *p = *str;
707 char *q;
708 errno = 0;
709 *n = strtol (p, &q, 10);
710 if (errno || p == q)
712 return -1;
714 *str = q;
715 return 0;
718 /* --------------------------------------------------------------------------------------------- */
721 * Parse line for diff statement.
723 * \param p string to parse
724 * \param ops list of diff statements
726 * \return 0 if success, otherwise non-zero
728 static int
729 scan_line (const char *p, GArray * ops)
731 DIFFCMD op;
733 int f1, f2;
734 int t1, t2;
735 int cmd;
737 int range;
739 /* handle the following cases:
740 * NUMaNUM[,NUM]
741 * NUM[,NUM]cNUM[,NUM]
742 * NUM[,NUM]dNUM
743 * where NUM is a positive integer
746 if (scan_deci (&p, &f1) != 0 || f1 < 0)
748 return -1;
750 f2 = f1;
751 range = 0;
752 if (*p == ',')
754 p++;
755 if (scan_deci (&p, &f2) != 0 || f2 < f1)
757 return -1;
759 range = 1;
762 cmd = *p++;
763 if (cmd == 'a')
765 if (range)
767 return -1;
770 else if (cmd != 'c' && cmd != 'd')
772 return -1;
775 if (scan_deci (&p, &t1) != 0 || t1 < 0)
777 return -1;
779 t2 = t1;
780 range = 0;
781 if (*p == ',')
783 p++;
784 if (scan_deci (&p, &t2) != 0 || t2 < t1)
786 return -1;
788 range = 1;
791 if (cmd == 'd')
793 if (range)
795 return -1;
799 op.a[0][0] = f1;
800 op.a[0][1] = f2;
801 op.cmd = cmd;
802 op.a[1][0] = t1;
803 op.a[1][1] = t2;
804 g_array_append_val (ops, op);
805 return 0;
808 /* --------------------------------------------------------------------------------------------- */
811 * Parse diff output and extract diff statements.
813 * \param f stream to read from
814 * \param ops list of diff statements to fill
816 * \return positive number indicating number of hunks, otherwise negative
818 static int
819 scan_diff (FBUF * f, GArray * ops)
821 int sz;
822 char buf[BUFSIZ];
824 while ((sz = f_gets (buf, sizeof (buf) - 1, f)))
826 if (isdigit (buf[0]))
828 if (buf[sz - 1] != '\n')
830 return -1;
832 buf[sz] = '\0';
833 if (scan_line (buf, ops) != 0)
835 return -1;
837 continue;
839 while (buf[sz - 1] != '\n' && (sz = f_gets (buf, sizeof (buf), f)) != 0)
844 return ops->len;
847 /* --------------------------------------------------------------------------------------------- */
850 * Invoke diff and extract diff statements.
852 * \param args extra arguments to be passed to diff
853 * \param extra more arguments to be passed to diff
854 * \param file1 first file to compare
855 * \param file2 second file to compare
856 * \param ops list of diff statements to fill
858 * \return positive number indicating number of hunks, otherwise negative
860 static int
861 dff_execute (const char *args, const char *extra, const char *file1, const char *file2,
862 GArray * ops)
864 static const char *opt =
865 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
866 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
867 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
868 " --unchanged-group-format=''";
870 int rv;
871 FBUF *f;
872 char *cmd;
873 int code;
875 cmd = g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args, extra, opt, file1, file2);
876 if (cmd == NULL)
877 return -1;
879 f = p_open (cmd, O_RDONLY);
880 g_free (cmd);
882 if (f == NULL)
883 return -1;
885 rv = scan_diff (f, ops);
886 code = p_close (f);
888 if (rv < 0 || code == -1 || !WIFEXITED (code) || WEXITSTATUS (code) == 2)
889 return -1;
891 return rv;
894 /* --------------------------------------------------------------------------------------------- */
897 * Reparse and display file according to diff statements.
899 * \param ord 0 if displaying first file, 1 if displaying 2nd file
900 * \param filename file name to display
901 * \param ops list of diff statements
902 * \param printer printf-like function to be used for displaying
903 * \param ctx printer context
905 * \return 0 if success, otherwise non-zero
907 static int
908 dff_reparse (int ord, const char *filename, const GArray * ops, DFUNC printer, void *ctx)
910 size_t i;
911 FBUF *f;
912 size_t sz;
913 char buf[BUFSIZ];
914 int line = 0;
915 off_t off = 0;
916 const DIFFCMD *op;
917 int eff;
918 int add_cmd;
919 int del_cmd;
921 f = f_open (filename, O_RDONLY);
922 if (f == NULL)
924 return -1;
927 ord &= 1;
928 eff = ord;
930 add_cmd = 'a';
931 del_cmd = 'd';
932 if (ord)
934 add_cmd = 'd';
935 del_cmd = 'a';
937 #define F1 a[eff][0]
938 #define F2 a[eff][1]
939 #define T1 a[ ord^1 ][0]
940 #define T2 a[ ord^1 ][1]
941 for (i = 0; i < ops->len; i++)
943 int n;
944 op = &g_array_index (ops, DIFFCMD, i);
945 n = op->F1 - (op->cmd != add_cmd);
946 while (line < n && (sz = f_gets (buf, sizeof (buf), f)) != 0)
948 line++;
949 printer (ctx, EQU_CH, line, off, sz, buf);
950 off += sz;
951 while (buf[sz - 1] != '\n')
953 sz = f_gets (buf, sizeof (buf), f);
954 if (sz == 0)
956 printer (ctx, 0, 0, 0, 1, "\n");
957 break;
959 printer (ctx, 0, 0, 0, sz, buf);
960 off += sz;
963 if (line != n)
965 goto err;
968 if (op->cmd == add_cmd)
970 n = op->T2 - op->T1 + 1;
971 while (n)
973 printer (ctx, DEL_CH, 0, 0, 1, "\n");
974 n--;
977 if (op->cmd == del_cmd)
979 n = op->F2 - op->F1 + 1;
980 while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0)
982 line++;
983 printer (ctx, ADD_CH, line, off, sz, buf);
984 off += sz;
985 while (buf[sz - 1] != '\n')
987 sz = f_gets (buf, sizeof (buf), f);
988 if (sz == 0)
990 printer (ctx, 0, 0, 0, 1, "\n");
991 break;
993 printer (ctx, 0, 0, 0, sz, buf);
994 off += sz;
996 n--;
998 if (n)
1000 goto err;
1003 if (op->cmd == 'c')
1005 n = op->F2 - op->F1 + 1;
1006 while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0)
1008 line++;
1009 printer (ctx, CHG_CH, line, off, sz, buf);
1010 off += sz;
1011 while (buf[sz - 1] != '\n')
1013 sz = f_gets (buf, sizeof (buf), f);
1014 if (sz == 0)
1016 printer (ctx, 0, 0, 0, 1, "\n");
1017 break;
1019 printer (ctx, 0, 0, 0, sz, buf);
1020 off += sz;
1022 n--;
1024 if (n)
1026 goto err;
1028 n = op->T2 - op->T1 - (op->F2 - op->F1);
1029 while (n > 0)
1031 printer (ctx, CHG_CH, 0, 0, 1, "\n");
1032 n--;
1036 #undef T2
1037 #undef T1
1038 #undef F2
1039 #undef F1
1041 while ((sz = f_gets (buf, sizeof (buf), f)) != 0)
1043 line++;
1044 printer (ctx, EQU_CH, line, off, sz, buf);
1045 off += sz;
1046 while (buf[sz - 1] != '\n')
1048 sz = f_gets (buf, sizeof (buf), f);
1049 if (sz == 0)
1051 printer (ctx, 0, 0, 0, 1, "\n");
1052 break;
1054 printer (ctx, 0, 0, 0, sz, buf);
1055 off += sz;
1059 f_close (f);
1060 return 0;
1062 err:
1063 f_close (f);
1064 return -1;
1067 /* --------------------------------------------------------------------------------------------- */
1068 /* horizontal diff ********************************************************** */
1071 * Longest common substring.
1073 * \param s first string
1074 * \param m length of first string
1075 * \param t second string
1076 * \param n length of second string
1077 * \param ret list of offsets for longest common substrings inside each string
1078 * \param min minimum length of common substrings
1080 * \return 0 if success, nonzero otherwise
1082 static int
1083 lcsubstr (const char *s, int m, const char *t, int n, GArray * ret, int min)
1085 int i, j;
1087 int *Lprev, *Lcurr;
1089 int z = 0;
1091 if (m < min || n < min)
1093 /* XXX early culling */
1094 return 0;
1097 Lprev = g_new0 (int, n + 1);
1098 Lcurr = g_new0 (int, n + 1);
1100 if (Lprev == NULL || Lcurr == NULL)
1102 g_free (Lprev);
1103 g_free (Lcurr);
1104 return -1;
1107 for (i = 0; i < m; i++)
1109 int *L = Lprev;
1110 Lprev = Lcurr;
1111 Lcurr = L;
1112 #ifdef USE_MEMSET_IN_LCS
1113 memset (Lcurr, 0, (n + 1) * sizeof (int));
1114 #endif
1115 for (j = 0; j < n; j++)
1117 #ifndef USE_MEMSET_IN_LCS
1118 Lcurr[j + 1] = 0;
1119 #endif
1120 if (s[i] == t[j])
1122 int v = Lprev[j] + 1;
1123 Lcurr[j + 1] = v;
1124 if (z < v)
1126 z = v;
1127 g_array_set_size (ret, 0);
1129 if (z == v && z >= min)
1131 int off0 = i - z + 1;
1132 int off1 = j - z + 1;
1133 size_t k;
1134 for (k = 0; k < ret->len; k++)
1136 PAIR *p = (PAIR *) g_array_index (ret, PAIR, k);
1137 if ((*p)[0] == off0)
1139 break;
1141 if ((*p)[1] >= off1)
1143 break;
1146 if (k == ret->len)
1148 PAIR p2;
1149 p2[0] = off0;
1150 p2[1] = off1;
1151 g_array_append_val (ret, p2);
1158 free (Lcurr);
1159 free (Lprev);
1160 return z;
1162 free (Lcurr);
1163 free (Lprev);
1164 return -1;
1167 /* --------------------------------------------------------------------------------------------- */
1170 * Scan recursively for common substrings and build ranges.
1172 * \param s first string
1173 * \param t second string
1174 * \param bracket current limits for both of the strings
1175 * \param min minimum length of common substrings
1176 * \param hdiff list of horizontal diff ranges to fill
1177 * \param depth recursion depth
1179 * \return 0 if success, nonzero otherwise
1181 static gboolean
1182 hdiff_multi (const char *s, const char *t, const BRACKET bracket, int min, GArray * hdiff,
1183 unsigned int depth)
1185 BRACKET p;
1187 if (depth--)
1189 GArray *ret;
1190 BRACKET b;
1191 int len;
1192 ret = g_array_new (FALSE, TRUE, sizeof (PAIR));
1193 if (ret == NULL)
1194 return FALSE;
1196 len = lcsubstr (s + bracket[0].off, bracket[0].len,
1197 t + bracket[1].off, bracket[1].len, ret, min);
1198 if (ret->len)
1200 size_t k = 0;
1201 const PAIR *data = (const PAIR *) &g_array_index (ret, PAIR, 0);
1202 const PAIR *data2;
1204 b[0].off = bracket[0].off;
1205 b[0].len = (*data)[0];
1206 b[1].off = bracket[1].off;
1207 b[1].len = (*data)[1];
1208 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1209 return FALSE;
1211 for (k = 0; k < ret->len - 1; k++)
1213 data = (const PAIR *) &g_array_index (ret, PAIR, k);
1214 data2 = (const PAIR *) &g_array_index (ret, PAIR, k + 1);
1215 b[0].off = bracket[0].off + (*data)[0] + len;
1216 b[0].len = (*data2)[0] - (*data)[0] - len;
1217 b[1].off = bracket[1].off + (*data)[1] + len;
1218 b[1].len = (*data2)[1] - (*data)[1] - len;
1219 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1220 return FALSE;
1222 data = (const PAIR *) &g_array_index (ret, PAIR, k);
1223 b[0].off = bracket[0].off + (*data)[0] + len;
1224 b[0].len = bracket[0].len - (*data)[0] - len;
1225 b[1].off = bracket[1].off + (*data)[1] + len;
1226 b[1].len = bracket[1].len - (*data)[1] - len;
1227 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1228 return FALSE;
1230 g_array_free (ret, TRUE);
1231 return TRUE;
1235 p[0].off = bracket[0].off;
1236 p[0].len = bracket[0].len;
1237 p[1].off = bracket[1].off;
1238 p[1].len = bracket[1].len;
1239 g_array_append_val (hdiff, p);
1241 return TRUE;
1244 /* --------------------------------------------------------------------------------------------- */
1247 * Build list of horizontal diff ranges.
1249 * \param s first string
1250 * \param m length of first string
1251 * \param t second string
1252 * \param n length of second string
1253 * \param min minimum length of common substrings
1254 * \param hdiff list of horizontal diff ranges to fill
1255 * \param depth recursion depth
1257 * \return 0 if success, nonzero otherwise
1259 static gboolean
1260 hdiff_scan (const char *s, int m, const char *t, int n, int min, GArray * hdiff, unsigned int depth)
1262 int i;
1263 BRACKET b;
1265 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1266 for (i = 0; i < m && i < n && s[i] == t[i]; i++)
1268 for (; m > i && n > i && s[m - 1] == t[n - 1]; m--, n--)
1271 b[0].off = i;
1272 b[0].len = m - i;
1273 b[1].off = i;
1274 b[1].len = n - i;
1276 /* smartscan (multiple horizontal diff) */
1277 return hdiff_multi (s, t, b, min, hdiff, depth);
1280 /* --------------------------------------------------------------------------------------------- */
1281 /* read line **************************************************************** */
1284 * Check if character is inside horizontal diff limits.
1286 * \param k rank of character inside line
1287 * \param hdiff horizontal diff structure
1288 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1290 * \return TRUE if inside hdiff limits, FALSE otherwise
1292 static int
1293 is_inside (int k, GArray * hdiff, int ord)
1295 size_t i;
1296 BRACKET *b;
1297 for (i = 0; i < hdiff->len; i++)
1299 int start, end;
1300 b = &g_array_index (hdiff, BRACKET, i);
1302 start = (*b)[ord].off;
1303 end = start + (*b)[ord].len;
1304 if (k >= start && k < end)
1306 return 1;
1309 return 0;
1312 /* --------------------------------------------------------------------------------------------- */
1315 * Copy `src' to `dst' expanding tabs.
1317 * \param dst destination buffer
1318 * \param src source buffer
1319 * \param srcsize size of src buffer
1320 * \param base virtual base of this string, needed to calculate tabs
1321 * \param ts tab size
1323 * \return new virtual base
1325 * \note The procedure returns when all bytes are consumed from `src'
1327 static int
1328 cvt_cpy (char *dst, const char *src, size_t srcsize, int base, int ts)
1330 int i;
1331 for (i = 0; srcsize != 0; i++, src++, dst++, srcsize--)
1333 *dst = *src;
1334 if (*src == '\t')
1336 int j = TAB_SKIP (ts, i + base);
1337 i += j - 1;
1338 while (j-- > 0)
1340 *dst++ = ' ';
1342 dst--;
1345 return i + base;
1348 /* --------------------------------------------------------------------------------------------- */
1351 * Copy `src' to `dst' expanding tabs.
1353 * \param dst destination buffer
1354 * \param dstsize size of dst buffer
1355 * \param[in,out] _src source buffer
1356 * \param srcsize size of src buffer
1357 * \param base virtual base of this string, needed to calculate tabs
1358 * \param ts tab size
1360 * \return new virtual base
1362 * \note The procedure returns when all bytes are consumed from `src'
1363 * or `dstsize' bytes are written to `dst'
1364 * \note Upon return, `src' points to the first unwritten character in source
1366 static int
1367 cvt_ncpy (char *dst, int dstsize, const char **_src, size_t srcsize, int base, int ts)
1369 int i;
1370 const char *src = *_src;
1371 for (i = 0; i < dstsize && srcsize != 0; i++, src++, dst++, srcsize--)
1373 *dst = *src;
1374 if (*src == '\t')
1376 int j = TAB_SKIP (ts, i + base);
1377 if (j > dstsize - i)
1379 j = dstsize - i;
1381 i += j - 1;
1382 while (j-- > 0)
1384 *dst++ = ' ';
1386 dst--;
1389 *_src = src;
1390 return i + base;
1393 /* --------------------------------------------------------------------------------------------- */
1396 * Read line from memory, converting tabs to spaces and padding with spaces.
1398 * \param src buffer to read from
1399 * \param srcsize size of src buffer
1400 * \param dst buffer to read to
1401 * \param dstsize size of dst buffer, excluding trailing null
1402 * \param skip number of characters to skip
1403 * \param ts tab size
1404 * \param show_cr show trailing carriage return as ^M
1406 * \return negative on error, otherwise number of bytes except padding
1408 static int
1409 cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr)
1411 int sz = 0;
1412 if (src != NULL)
1414 int i;
1415 char *tmp = dst;
1416 const int base = 0;
1417 for (i = 0; dstsize != 0 && srcsize != 0 && *src != '\n'; i++, src++, srcsize--)
1419 if (*src == '\t')
1421 int j = TAB_SKIP (ts, i + base);
1422 i += j - 1;
1423 while (j-- > 0)
1425 if (skip > 0)
1427 skip--;
1429 else if (dstsize != 0)
1431 dstsize--;
1432 *dst++ = ' ';
1436 else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n'))
1438 if (skip == 0 && show_cr)
1440 if (dstsize > 1)
1442 dstsize -= 2;
1443 *dst++ = '^';
1444 *dst++ = 'M';
1446 else
1448 dstsize--;
1449 *dst++ = '.';
1452 break;
1454 else
1456 if (skip > 0)
1458 int utf_ch = 0;
1459 gboolean res;
1460 int w;
1462 skip--;
1463 utf_ch = dview_get_utf ((char *) src, &w, &res);
1464 if (w > 1)
1465 skip += w - 1;
1466 if (!g_unichar_isprint (utf_ch))
1467 utf_ch = '.';
1469 else
1471 dstsize--;
1472 *dst++ = *src;
1476 sz = dst - tmp;
1478 while (dstsize != 0)
1480 dstsize--;
1481 *dst++ = ' ';
1483 *dst = '\0';
1484 return sz;
1487 /* --------------------------------------------------------------------------------------------- */
1490 * Read line from memory and build attribute array.
1492 * \param src buffer to read from
1493 * \param srcsize size of src buffer
1494 * \param dst buffer to read to
1495 * \param dstsize size of dst buffer, excluding trailing null
1496 * \param skip number of characters to skip
1497 * \param ts tab size
1498 * \param show_cr show trailing carriage return as ^M
1499 * \param hdiff horizontal diff structure
1500 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1501 * \param att buffer of attributes
1503 * \return negative on error, otherwise number of bytes except padding
1505 static int
1506 cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr,
1507 GArray * hdiff, int ord, char *att)
1509 int sz = 0;
1510 if (src != NULL)
1512 int i, k;
1513 char *tmp = dst;
1514 const int base = 0;
1515 for (i = 0, k = 0; dstsize != 0 && srcsize != 0 && *src != '\n'; i++, k++, src++, srcsize--)
1517 if (*src == '\t')
1519 int j = TAB_SKIP (ts, i + base);
1520 i += j - 1;
1521 while (j-- > 0)
1523 if (skip != 0)
1525 skip--;
1527 else if (dstsize != 0)
1529 dstsize--;
1530 *att++ = is_inside (k, hdiff, ord);
1531 *dst++ = ' ';
1535 else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n'))
1537 if (skip == 0 && show_cr)
1539 if (dstsize > 1)
1541 dstsize -= 2;
1542 *att++ = is_inside (k, hdiff, ord);
1543 *dst++ = '^';
1544 *att++ = is_inside (k, hdiff, ord);
1545 *dst++ = 'M';
1547 else
1549 dstsize--;
1550 *att++ = is_inside (k, hdiff, ord);
1551 *dst++ = '.';
1554 break;
1556 else
1558 if (skip != 0)
1560 int utf_ch = 0;
1561 gboolean res;
1562 int w;
1564 skip--;
1565 utf_ch = dview_get_utf ((char *) src, &w, &res);
1566 if (w > 1)
1567 skip += w - 1;
1568 if (!g_unichar_isprint (utf_ch))
1569 utf_ch = '.';
1571 else
1573 dstsize--;
1574 *att++ = is_inside (k, hdiff, ord);
1575 *dst++ = *src;
1579 sz = dst - tmp;
1581 while (dstsize != 0)
1583 dstsize--;
1584 *att++ = 0;
1585 *dst++ = ' ';
1587 *dst = '\0';
1588 return sz;
1591 /* --------------------------------------------------------------------------------------------- */
1594 * Read line from file, converting tabs to spaces and padding with spaces.
1596 * \param f file stream to read from
1597 * \param off offset of line inside file
1598 * \param dst buffer to read to
1599 * \param dstsize size of dst buffer, excluding trailing null
1600 * \param skip number of characters to skip
1601 * \param ts tab size
1602 * \param show_cr show trailing carriage return as ^M
1604 * \return negative on error, otherwise number of bytes except padding
1606 static int
1607 cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, int show_cr)
1609 int base = 0;
1610 int old_base = base;
1611 const int amount = dstsize;
1613 size_t useful, offset;
1615 size_t i;
1616 size_t sz;
1618 int lastch = '\0';
1620 const char *q = NULL;
1621 char tmp[BUFSIZ]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1622 char cvt[BUFSIZ]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1624 if ((int) sizeof (tmp) < amount || (int) sizeof (tmp) <= dstsize
1625 || (int) sizeof (cvt) < 8 * amount)
1627 /* abnormal, but avoid buffer overflow */
1628 memset (dst, ' ', dstsize);
1629 dst[dstsize] = '\0';
1630 return 0;
1633 f_seek (f, off, SEEK_SET);
1635 while (skip > base)
1637 old_base = base;
1638 sz = f_gets (tmp, amount, f);
1639 if (sz == 0)
1640 break;
1642 base = cvt_cpy (cvt, tmp, sz, old_base, ts);
1643 if (cvt[base - old_base - 1] == '\n')
1645 q = &cvt[base - old_base - 1];
1646 base = old_base + q - cvt + 1;
1647 break;
1651 useful = base - skip;
1652 offset = skip - old_base;
1654 if (useful < 0)
1656 memset (dst, ' ', dstsize);
1657 dst[dstsize] = '\0';
1658 return 0;
1661 if (useful <= dstsize)
1663 if (useful != 0)
1664 memmove (dst, cvt + offset, useful);
1666 if (q == NULL)
1668 sz = f_gets (tmp, dstsize - useful + 1, f);
1669 if (sz != 0)
1671 const char *ptr = tmp;
1672 useful += cvt_ncpy (dst + useful, dstsize - useful, &ptr, sz, base, ts) - base;
1673 if (ptr < tmp + sz)
1674 lastch = *ptr;
1677 sz = useful;
1679 else
1681 memmove (dst, cvt + offset, dstsize);
1682 sz = dstsize;
1683 lastch = cvt[offset + dstsize];
1686 dst[sz] = lastch;
1687 for (i = 0; i < sz && dst[i] != '\n'; i++)
1689 if (dst[i] == '\r' && dst[i + 1] == '\n')
1691 if (show_cr)
1693 if (i + 1 < dstsize)
1695 dst[i++] = '^';
1696 dst[i++] = 'M';
1698 else
1700 dst[i++] = '*';
1703 break;
1706 for (; i < dstsize; i++)
1708 dst[i] = ' ';
1710 dst[i] = '\0';
1711 return sz;
1714 /* --------------------------------------------------------------------------------------------- */
1715 /* diff printers et al ****************************************************** */
1717 static void
1718 cc_free_elt (void *elt)
1720 DIFFLN *p = elt;
1721 if (p != NULL)
1723 g_free (p->p);
1727 /* --------------------------------------------------------------------------------------------- */
1729 static int
1730 printer (void *ctx, int ch, int line, off_t off, size_t sz, const char *str)
1732 GArray *a = ((PRINTER_CTX *) ctx)->a;
1733 DSRC dsrc = ((PRINTER_CTX *) ctx)->dsrc;
1734 if (ch)
1736 DIFFLN p;
1737 p.p = NULL;
1738 p.ch = ch;
1739 p.line = line;
1740 p.u.off = off;
1741 if (dsrc == DATA_SRC_MEM && line != 0)
1743 if (sz != 0 && str[sz - 1] == '\n')
1745 sz--;
1747 if (sz > 0)
1748 p.p = g_strndup (str, sz);
1749 p.u.len = sz;
1751 g_array_append_val (a, p);
1753 else if (dsrc == DATA_SRC_MEM)
1755 DIFFLN *p;
1756 p = &g_array_index (a, DIFFLN, a->len - 1);
1757 if (sz != 0 && str[sz - 1] == '\n')
1759 sz--;
1761 if (sz != 0)
1763 size_t new_size = p->u.len + sz;
1764 char *q = g_realloc (p->p, new_size);
1765 memcpy (q + p->u.len, str, sz);
1766 p->p = q;
1768 p->u.len += sz;
1770 if (dsrc == DATA_SRC_TMP && (line != 0 || ch == 0))
1772 FBUF *f = ((PRINTER_CTX *) ctx)->f;
1773 f_write (f, str, sz);
1775 return 0;
1778 /* --------------------------------------------------------------------------------------------- */
1780 static int
1781 redo_diff (WDiff * dview)
1783 FBUF *const *f = dview->f;
1785 PRINTER_CTX ctx;
1786 GArray *ops;
1787 int ndiff;
1788 int rv;
1790 char extra[256];
1792 extra[0] = '\0';
1793 if (dview->opt.quality == 2)
1795 strcat (extra, " -d");
1797 if (dview->opt.quality == 1)
1799 strcat (extra, " --speed-large-files");
1801 if (dview->opt.strip_trailing_cr)
1803 strcat (extra, " --strip-trailing-cr");
1805 if (dview->opt.ignore_tab_expansion)
1807 strcat (extra, " -E");
1809 if (dview->opt.ignore_space_change)
1811 strcat (extra, " -b");
1813 if (dview->opt.ignore_all_space)
1815 strcat (extra, " -w");
1817 if (dview->opt.ignore_case)
1819 strcat (extra, " -i");
1822 if (dview->dsrc != DATA_SRC_MEM)
1824 f_reset (f[0]);
1825 f_reset (f[1]);
1828 ops = g_array_new (FALSE, FALSE, sizeof (DIFFCMD));
1829 ndiff = dff_execute (dview->args, extra, dview->file[0], dview->file[1], ops);
1830 if (ndiff < 0)
1832 g_array_free (ops, TRUE);
1833 return -1;
1836 ctx.dsrc = dview->dsrc;
1838 rv = 0;
1839 ctx.a = dview->a[0];
1840 ctx.f = f[0];
1841 rv |= dff_reparse (0, dview->file[0], ops, printer, &ctx);
1843 ctx.a = dview->a[1];
1844 ctx.f = f[1];
1845 rv |= dff_reparse (1, dview->file[1], ops, printer, &ctx);
1847 g_array_free (ops, TRUE);
1849 if (rv != 0 || dview->a[0]->len != dview->a[1]->len)
1850 return -1;
1852 if (dview->dsrc == DATA_SRC_TMP)
1854 f_trunc (f[0]);
1855 f_trunc (f[1]);
1858 if (dview->dsrc == DATA_SRC_MEM && HDIFF_ENABLE)
1860 dview->hdiff = g_ptr_array_new ();
1861 if (dview->hdiff != NULL)
1863 size_t i;
1864 const DIFFLN *p;
1865 const DIFFLN *q;
1866 for (i = 0; i < dview->a[0]->len; i++)
1868 GArray *h = NULL;
1869 p = &g_array_index (dview->a[0], DIFFLN, i);
1870 q = &g_array_index (dview->a[1], DIFFLN, i);
1871 if (p->line && q->line && p->ch == CHG_CH)
1873 h = g_array_new (FALSE, FALSE, sizeof (BRACKET));
1874 if (h != NULL)
1876 gboolean runresult =
1877 hdiff_scan (p->p, p->u.len, q->p, q->u.len, HDIFF_MINCTX, h,
1878 HDIFF_DEPTH);
1879 if (!runresult)
1881 g_array_free (h, TRUE);
1882 h = NULL;
1886 g_ptr_array_add (dview->hdiff, h);
1890 return ndiff;
1893 /* --------------------------------------------------------------------------------------------- */
1895 static void
1896 destroy_hdiff (WDiff * dview)
1898 if (dview->hdiff != NULL)
1900 int i;
1901 int len = dview->a[0]->len;
1902 for (i = 0; i < len; i++)
1904 GArray *h = (GArray *) g_ptr_array_index (dview->hdiff, i);
1905 if (h != NULL)
1907 g_array_free (h, TRUE);
1910 g_ptr_array_free (dview->hdiff, TRUE);
1911 dview->hdiff = NULL;
1914 mc_search_free (dview->search.handle);
1915 dview->search.handle = NULL;
1916 g_free (dview->search.last_string);
1917 dview->search.last_string = NULL;
1920 /* --------------------------------------------------------------------------------------------- */
1921 /* stuff ******************************************************************** */
1923 static int
1924 get_digits (unsigned int n)
1926 int d = 1;
1927 while (n /= 10)
1929 d++;
1931 return d;
1934 /* --------------------------------------------------------------------------------------------- */
1936 static int
1937 get_line_numbers (const GArray * a, size_t pos, int *linenum, int *lineofs)
1939 const DIFFLN *p;
1941 *linenum = 0;
1942 *lineofs = 0;
1944 if (a->len != 0)
1946 if (pos >= a->len)
1948 pos = a->len - 1;
1951 p = &g_array_index (a, DIFFLN, pos);
1953 if (p->line == 0)
1955 int n;
1956 for (n = pos; n > 0; n--)
1958 p--;
1959 if (p->line != 0)
1961 break;
1964 *lineofs = pos - n + 1;
1967 *linenum = p->line;
1969 return 0;
1972 /* --------------------------------------------------------------------------------------------- */
1974 static int
1975 calc_nwidth (const GArray ** const a)
1977 int l1, o1;
1978 int l2, o2;
1979 get_line_numbers (a[0], a[0]->len - 1, &l1, &o1);
1980 get_line_numbers (a[1], a[1]->len - 1, &l2, &o2);
1981 if (l1 < l2)
1983 l1 = l2;
1985 return get_digits (l1);
1988 /* --------------------------------------------------------------------------------------------- */
1990 static int
1991 find_prev_hunk (const GArray * a, int pos)
1993 #if 1
1994 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
1996 pos--;
1998 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH)
2000 pos--;
2002 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
2004 pos--;
2006 if (pos > 0 && (size_t) pos < a->len)
2007 pos++;
2008 #else
2009 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH)
2011 pos--;
2013 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH)
2015 pos--;
2017 #endif
2019 return pos;
2022 /* --------------------------------------------------------------------------------------------- */
2024 static size_t
2025 find_next_hunk (const GArray * a, size_t pos)
2027 while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
2029 pos++;
2031 while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH)
2033 pos++;
2035 return pos;
2039 * Find start and end lines of the current hunk.
2041 * \param dview - widget WDiff
2042 * \return boolean and
2043 * start_line1 first line of current hunk (file[0])
2044 * end_line1 last line of current hunk (file[0])
2045 * start_line1 first line of current hunk (file[0])
2046 * end_line1 last line of current hunk (file[0])
2048 static int
2049 get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_line2, int *end_line2)
2051 const GArray *a0 = dview->a[0];
2052 const GArray *a1 = dview->a[1];
2053 size_t pos;
2054 int ch;
2055 int res = 0;
2057 *start_line1 = 1;
2058 *start_line2 = 1;
2059 *end_line1 = 1;
2060 *end_line2 = 1;
2062 pos = dview->skip_rows;
2063 ch = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch;
2064 if (ch != EQU_CH)
2066 switch (ch)
2068 case ADD_CH:
2069 res = DIFF_DEL;
2070 break;
2071 case DEL_CH:
2072 res = DIFF_ADD;
2073 break;
2074 case CHG_CH:
2075 res = DIFF_CHG;
2076 break;
2078 while (pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH)
2080 pos--;
2082 if (pos > 0)
2084 *start_line1 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line + 1;
2085 *start_line2 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line + 1;
2087 pos = dview->skip_rows;
2088 while (pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH)
2090 int l0, l1;
2091 l0 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line;
2092 l1 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line;
2093 if (l0 > 0)
2094 *end_line1 = max (*start_line1, l0);
2095 if (l1 > 0)
2096 *end_line2 = max (*start_line2, l1);
2097 pos++;
2100 return res;
2103 static void
2104 dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1)
2106 int line;
2107 char buf[BUF_10K];
2108 FILE *f0;
2109 f0 = fopen (dview->file[0], "r");
2110 line = 0;
2111 while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
2113 line++;
2114 fputs (buf, merge_file);
2116 while (fgets (buf, sizeof (buf), f0) != NULL)
2118 line++;
2119 if (line >= to1)
2120 fputs (buf, merge_file);
2122 fclose (f0);
2125 static void
2126 dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2)
2128 int line;
2129 char buf[BUF_10K];
2130 FILE *f0;
2131 FILE *f1;
2132 f0 = fopen (dview->file[0], "r");
2133 f1 = fopen (dview->file[1], "r");
2134 line = 0;
2135 while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
2137 line++;
2138 fputs (buf, merge_file);
2140 line = 0;
2141 while (fgets (buf, sizeof (buf), f1) != NULL && line <= to2)
2143 line++;
2144 if (line >= from2)
2145 fputs (buf, merge_file);
2147 while (fgets (buf, sizeof (buf), f0) != NULL)
2149 fputs (buf, merge_file);
2151 fclose (f0);
2152 fclose (f1);
2155 static void
2156 dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2)
2158 int line1, line2;
2159 char buf[BUF_10K];
2160 FILE *f0;
2161 FILE *f1;
2162 f0 = fopen (dview->file[0], "r");
2163 f1 = fopen (dview->file[1], "r");
2164 line1 = 0;
2165 while (fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1)
2167 line1++;
2168 fputs (buf, merge_file);
2170 line2 = 0;
2171 while (fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2)
2173 line2++;
2174 if (line2 >= from2)
2175 fputs (buf, merge_file);
2177 while (fgets (buf, sizeof (buf), f0) != NULL)
2179 line1++;
2180 if (line1 > to1)
2181 fputs (buf, merge_file);
2183 fclose (f0);
2184 fclose (f1);
2187 static void
2188 do_merge_hunk (WDiff * dview)
2190 int from1, to1, from2, to2;
2191 int res;
2192 int hunk;
2194 hunk = get_current_hunk (dview, &from1, &to1, &from2, &to2);
2195 if (hunk > 0)
2197 int merge_file_fd;
2198 FILE *merge_file;
2199 char *merge_file_name = NULL;
2201 if (!dview->merged)
2203 dview->merged = mc_util_make_backup_if_possible (dview->file[0], "~~~");
2204 if (!dview->merged)
2206 message (D_ERROR, MSG_ERROR,
2207 _("Cannot create backup file\n%s%s\n%s"),
2208 dview->file[0], "~~~", unix_error_string (errno));
2209 return;
2214 merge_file_fd = mc_mkstemps (&merge_file_name, "mcmerge", NULL);
2215 if (merge_file_fd == -1)
2217 message (D_ERROR, MSG_ERROR, _("Cannot create temporary merge file\n%s"),
2218 unix_error_string (errno));
2219 return;
2222 merge_file = fdopen (merge_file_fd, "w");
2224 switch (hunk)
2226 case DIFF_DEL:
2227 dview_remove_hunk (dview, merge_file, from1, to1);
2228 break;
2229 case DIFF_ADD:
2230 dview_add_hunk (dview, merge_file, from1, from2, to2);
2231 break;
2232 case DIFF_CHG:
2233 dview_replace_hunk (dview, merge_file, from1, to1, from2, to2);
2234 break;
2236 fflush (merge_file);
2237 fclose (merge_file);
2238 res = rewrite_backup_content (merge_file_name, dview->file[0]);
2239 unlink (merge_file_name);
2240 g_free (merge_file_name);
2244 /* --------------------------------------------------------------------------------------------- */
2245 /* view routines and callbacks ********************************************** */
2247 static void
2248 dview_compute_split (WDiff * dview, int i)
2250 dview->bias += i;
2251 if (dview->bias < 2 - dview->half1)
2253 dview->bias = 2 - dview->half1;
2255 if (dview->bias > dview->half2 - 2)
2257 dview->bias = dview->half2 - 2;
2261 /* --------------------------------------------------------------------------------------------- */
2263 static void
2264 dview_compute_areas (WDiff * dview)
2266 dview->height = LINES - 2;
2267 dview->half1 = COLS / 2;
2268 dview->half2 = COLS - dview->half1;
2270 dview_compute_split (dview, 0);
2273 /* --------------------------------------------------------------------------------------------- */
2275 static int
2276 dview_init (WDiff * dview, const char *args, const char *file1, const char *file2,
2277 const char *label1, const char *label2, DSRC dsrc)
2279 int ndiff;
2280 FBUF *f[2];
2282 f[0] = NULL;
2283 f[1] = NULL;
2285 if (dsrc == DATA_SRC_TMP)
2287 f[0] = f_temp ();
2288 if (f[0] == NULL)
2289 return -1;
2291 f[1] = f_temp ();
2292 if (f[1] == NULL)
2294 f_close (f[0]);
2295 return -1;
2298 else if (dsrc == DATA_SRC_ORG)
2300 f[0] = f_open (file1, O_RDONLY);
2301 if (f[0] == NULL)
2302 return -1;
2304 f[1] = f_open (file2, O_RDONLY);
2305 if (f[1] == NULL)
2307 f_close (f[0]);
2308 return -1;
2312 dview->args = args;
2313 dview->file[0] = file1;
2314 dview->file[1] = file2;
2315 dview->label[0] = g_strdup (label1);
2316 dview->label[1] = g_strdup (label2);
2317 dview->f[0] = f[0];
2318 dview->f[1] = f[1];
2319 dview->hdiff = NULL;
2320 dview->dsrc = dsrc;
2321 dview->converter = str_cnv_from_term;
2322 dview_set_codeset (dview);
2324 dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2325 dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2327 ndiff = redo_diff (dview);
2328 if (ndiff < 0)
2330 /* goto WIDGET_DESTROY stage: dview_fini() */
2331 return -1;
2334 dview->ndiff = ndiff;
2336 dview->view_quit = 0;
2338 dview->bias = 0;
2339 dview->new_frame = 1;
2340 dview->skip_rows = 0;
2341 dview->skip_cols = 0;
2342 dview->display_symbols = 0;
2343 dview->display_numbers = 0;
2344 dview->show_cr = 1;
2345 dview->tab_size = 8;
2346 dview->ord = 0;
2347 dview->full = 0;
2349 dview->search.handle = NULL;
2350 dview->search.last_string = NULL;
2351 dview->search.last_found_line = -1;
2352 dview->search.last_accessed_num_line = 0;
2354 dview->opt.quality = 0;
2355 dview->opt.strip_trailing_cr = 0;
2356 dview->opt.ignore_tab_expansion = 0;
2357 dview->opt.ignore_space_change = 0;
2358 dview->opt.ignore_all_space = 0;
2359 dview->opt.ignore_case = 0;
2361 dview_compute_areas (dview);
2363 return 0;
2366 /* --------------------------------------------------------------------------------------------- */
2368 static void
2369 dview_reread (WDiff * dview)
2371 int ndiff = dview->ndiff;
2372 destroy_hdiff (dview);
2374 g_array_foreach (dview->a[0], DIFFLN, cc_free_elt);
2375 g_array_free (dview->a[0], TRUE);
2376 g_array_foreach (dview->a[1], DIFFLN, cc_free_elt);
2377 g_array_free (dview->a[1], TRUE);
2379 dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2380 dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2382 ndiff = redo_diff (dview);
2383 if (ndiff >= 0)
2385 dview->ndiff = ndiff;
2389 /* --------------------------------------------------------------------------------------------- */
2390 static void
2391 dview_diff_options (WDiff * dview)
2393 const char *quality_str[] = {
2394 N_("&Normal"),
2395 N_("&Fastest (Assume large files)"),
2396 N_("&Minimal (Find a smaller set of change)")
2399 QuickWidget diffopt_widgets[] = {
2400 QUICK_BUTTON (6, 10, 14, OPTY, N_("&Cancel"), B_CANCEL, NULL),
2401 QUICK_BUTTON (2, 10, 14, OPTY, N_("&OK"), B_ENTER, NULL),
2403 QUICK_CHECKBOX (3, OPTX, 12, OPTY,
2404 N_("Strip &trailing carriage return"), &dview->opt.strip_trailing_cr),
2405 QUICK_CHECKBOX (3, OPTX, 11, OPTY,
2406 N_("Ignore all &whitespace"), &dview->opt.ignore_all_space),
2407 QUICK_CHECKBOX (3, OPTX, 10, OPTY,
2408 N_("Ignore &space change"), &dview->opt.ignore_space_change),
2409 QUICK_CHECKBOX (3, OPTX, 9, OPTY,
2410 N_("Ignore tab &expansion"), &dview->opt.ignore_tab_expansion),
2411 QUICK_CHECKBOX (3, OPTX, 8, OPTY,
2412 N_("&Ignore case"), &dview->opt.ignore_case),
2413 QUICK_LABEL (3, OPTX, 7, OPTY, N_("Diff extra options")),
2414 QUICK_RADIO (3, OPTX, 3, OPTY,
2415 3, (const char **) quality_str, (int *) &dview->opt.quality),
2416 QUICK_LABEL (3, OPTX, 2, OPTY, N_("Diff algorithm")),
2418 QUICK_END
2421 QuickDialog diffopt = {
2422 OPTX, OPTY, -1, -1,
2423 N_("Diff Options"), "[Diff Options]",
2424 diffopt_widgets, 0
2427 if (quick_dialog (&diffopt) != B_CANCEL)
2429 dview_reread (dview);
2433 /* --------------------------------------------------------------------------------------------- */
2435 static void
2436 dview_fini (WDiff * dview)
2438 if (dview->dsrc != DATA_SRC_MEM)
2440 f_close (dview->f[1]);
2441 f_close (dview->f[0]);
2444 if (dview->converter != str_cnv_from_term)
2445 str_close_conv (dview->converter);
2447 destroy_hdiff (dview);
2448 g_array_foreach (dview->a[0], DIFFLN, cc_free_elt);
2449 g_array_free (dview->a[0], TRUE);
2450 g_array_foreach (dview->a[1], DIFFLN, cc_free_elt);
2451 g_array_free (dview->a[1], TRUE);
2453 g_free (dview->label[0]);
2454 g_free (dview->label[1]);
2456 dview->a[1] = NULL;
2457 dview->a[0] = NULL;
2460 /* --------------------------------------------------------------------------------------------- */
2462 static int
2463 dview_display_file (const WDiff * dview, int ord, int r, int c, int height, int width)
2465 size_t i, k;
2466 int j;
2467 char buf[BUFSIZ];
2468 FBUF *f = dview->f[ord];
2469 int skip = dview->skip_cols;
2470 int display_symbols = dview->display_symbols;
2471 int display_numbers = dview->display_numbers;
2472 int show_cr = dview->show_cr;
2473 int tab_size = 8;
2474 const DIFFLN *p;
2475 int nwidth = display_numbers;
2476 int xwidth = display_symbols + display_numbers;
2477 if (dview->tab_size > 0 && dview->tab_size < 9)
2478 tab_size = dview->tab_size;
2480 if (xwidth)
2482 if (xwidth > width && display_symbols)
2484 xwidth--;
2485 display_symbols = 0;
2487 if (xwidth > width && display_numbers)
2489 xwidth = width;
2490 display_numbers = width;
2493 xwidth++;
2495 c += xwidth;
2496 width -= xwidth;
2498 if (width < 0)
2500 width = 0;
2504 if ((int) sizeof (buf) <= width || (int) sizeof (buf) <= nwidth)
2506 /* abnormal, but avoid buffer overflow */
2507 return -1;
2510 for (i = dview->skip_rows, j = 0; i < dview->a[ord]->len && j < height; j++, i++)
2512 int ch, next_ch, col;
2513 size_t cnt;
2514 p = (DIFFLN *) & g_array_index (dview->a[ord], DIFFLN, i);
2515 ch = p->ch;
2516 tty_setcolor (NORMAL_COLOR);
2517 if (display_symbols)
2519 tty_gotoyx (r + j, c - 2);
2520 tty_print_char (ch);
2522 if (p->line != 0)
2524 if (display_numbers)
2526 tty_gotoyx (r + j, c - xwidth);
2527 g_snprintf (buf, display_numbers + 1, "%*d", nwidth, p->line);
2528 tty_print_string (str_fit_to_term (buf, nwidth, J_LEFT_FIT));
2530 if (ch == ADD_CH)
2532 tty_setcolor (DFF_ADD_COLOR);
2534 if (ch == CHG_CH)
2536 tty_setcolor (DFF_CHG_COLOR);
2538 if (f == NULL)
2540 if (i == (size_t) dview->search.last_found_line)
2542 tty_setcolor (MARKED_SELECTED_COLOR);
2544 else
2546 if (dview->hdiff != NULL && g_ptr_array_index (dview->hdiff, i) != NULL)
2548 char att[BUFSIZ];
2549 if (dview->utf8)
2550 k = dview_str_utf8_offset_to_pos (p->p, width);
2551 else
2552 k = width;
2553 cvt_mgeta (p->p, p->u.len, buf, k, skip, tab_size, show_cr,
2554 g_ptr_array_index (dview->hdiff, i), ord, att);
2555 tty_gotoyx (r + j, c);
2556 col = 0;
2557 for (cnt = 0; cnt < strlen (buf) && col < width; cnt++)
2559 int w;
2560 gboolean ch_res;
2561 if (dview->utf8)
2563 next_ch = dview_get_utf (buf + cnt, &w, &ch_res);
2564 if (w > 1)
2565 cnt += w - 1;
2566 if (!g_unichar_isprint (next_ch))
2567 next_ch = '.';
2569 else
2570 next_ch = dview_get_byte (buf + cnt, &ch_res);
2571 if (ch_res)
2573 tty_setcolor (att[cnt] ? DFF_CHH_COLOR : DFF_CHG_COLOR);
2574 #ifdef HAVE_CHARSET
2575 if (utf8_display)
2577 if (!dview->utf8)
2579 next_ch =
2580 convert_from_8bit_to_utf_c ((unsigned char) next_ch,
2581 dview->converter);
2584 else if (dview->utf8)
2585 next_ch =
2586 convert_from_utf_to_current_c (next_ch, dview->converter);
2587 else
2588 #endif
2589 next_ch = convert_to_display_c (next_ch);
2591 tty_print_anychar (next_ch);
2592 col++;
2595 continue;
2597 else if (ch == CHG_CH)
2599 tty_setcolor (DFF_CHH_COLOR);
2602 if (dview->utf8)
2603 k = dview_str_utf8_offset_to_pos (p->p, width);
2604 else
2605 k = width;
2606 cvt_mget (p->p, p->u.len, buf, k, skip, tab_size, show_cr);
2608 else
2610 cvt_fget (f, p->u.off, buf, width, skip, tab_size, show_cr);
2613 else
2615 if (display_numbers)
2617 tty_gotoyx (r + j, c - xwidth);
2618 memset (buf, ' ', display_numbers);
2619 buf[display_numbers] = '\0';
2620 tty_print_string (buf);
2622 if (ch == DEL_CH)
2624 tty_setcolor (DFF_DEL_COLOR);
2626 if (ch == CHG_CH)
2628 tty_setcolor (DFF_CHD_COLOR);
2630 memset (buf, ' ', width);
2631 buf[width] = '\0';
2633 tty_gotoyx (r + j, c);
2634 /* tty_print_nstring (buf, width); */
2635 col = 0;
2636 for (cnt = 0; cnt < strlen (buf) && col < width; cnt++)
2638 int w;
2639 gboolean ch_res;
2640 if (dview->utf8)
2642 next_ch = dview_get_utf (buf + cnt, &w, &ch_res);
2643 if (w > 1)
2644 cnt += w - 1;
2645 if (!g_unichar_isprint (next_ch))
2646 next_ch = '.';
2648 else
2649 next_ch = dview_get_byte (buf + cnt, &ch_res);
2650 if (ch_res)
2652 #ifdef HAVE_CHARSET
2653 if (utf8_display)
2655 if (!dview->utf8)
2657 next_ch =
2658 convert_from_8bit_to_utf_c ((unsigned char) next_ch, dview->converter);
2661 else if (dview->utf8)
2662 next_ch = convert_from_utf_to_current_c (next_ch, dview->converter);
2663 else
2664 #endif
2665 next_ch = convert_to_display_c (next_ch);
2667 tty_print_anychar (next_ch);
2668 col++;
2671 continue;
2673 tty_setcolor (NORMAL_COLOR);
2674 k = width;
2675 if (width < xwidth - 1)
2677 k = xwidth - 1;
2679 memset (buf, ' ', k);
2680 buf[k] = '\0';
2681 for (; j < height; j++)
2683 if (xwidth)
2685 tty_gotoyx (r + j, c - xwidth);
2686 /* tty_print_nstring (buf, xwidth - 1); */
2687 tty_print_string (str_fit_to_term (buf, xwidth - 1, J_LEFT_FIT));
2689 tty_gotoyx (r + j, c);
2690 /* tty_print_nstring (buf, width); */
2691 tty_print_string (str_fit_to_term (buf, width, J_LEFT_FIT));
2694 return 0;
2697 /* --------------------------------------------------------------------------------------------- */
2699 static void
2700 dview_status (const WDiff * dview, int ord, int width, int c)
2702 int skip_rows = dview->skip_rows;
2703 int skip_cols = dview->skip_cols;
2705 char buf[BUFSIZ];
2706 int filename_width;
2707 int linenum, lineofs;
2709 tty_setcolor (SELECTED_COLOR);
2711 tty_gotoyx (0, c);
2712 get_line_numbers (dview->a[ord], skip_rows, &linenum, &lineofs);
2714 filename_width = width - 22;
2715 if (filename_width < 8)
2717 filename_width = 8;
2719 if (filename_width >= (int) sizeof (buf))
2721 /* abnormal, but avoid buffer overflow */
2722 filename_width = sizeof (buf) - 1;
2724 trim (strip_home_and_password (dview->label[ord]), buf, filename_width);
2725 if (ord == 0)
2727 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width, buf, linenum, lineofs, skip_cols);
2729 else
2731 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width, buf, linenum, lineofs, dview->ndiff);
2735 /* --------------------------------------------------------------------------------------------- */
2737 static void
2738 dview_redo (WDiff * dview)
2740 if (dview->display_numbers)
2742 int old = dview->display_numbers;
2743 dview->display_numbers = calc_nwidth ((const GArray **) dview->a);
2744 dview->new_frame = (old != dview->display_numbers);
2746 dview_reread (dview);
2749 /* --------------------------------------------------------------------------------------------- */
2751 static void
2752 dview_edit (WDiff * dview, int ord)
2754 Dlg_head *h;
2755 gboolean h_modal;
2756 int linenum, lineofs;
2758 if (dview->dsrc == DATA_SRC_TMP)
2760 error_dialog (_("Edit"), _("Edit is disabled"));
2761 return;
2764 h = ((Widget *) dview)->owner;
2765 h_modal = h->modal;
2767 get_line_numbers (dview->a[ord], dview->skip_rows, &linenum, &lineofs);
2768 h->modal = TRUE; /* not allow edit file in several editors */
2769 do_edit_at_line (dview->file[ord], linenum);
2770 h->modal = h_modal;
2771 dview_redo (dview);
2772 dview_update (dview);
2775 /* --------------------------------------------------------------------------------------------- */
2777 static void
2778 dview_goto_cmd (WDiff * dview, int ord)
2780 static const char *title[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2781 static char prev[256];
2782 /* XXX some statics here, to be remembered between runs */
2784 int newline;
2785 char *input;
2787 input = input_dialog (_(title[ord]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE, prev);
2788 if (input != NULL)
2790 const char *s = input;
2791 if (scan_deci (&s, &newline) == 0 && *s == '\0')
2793 size_t i = 0;
2794 if (newline > 0)
2796 const DIFFLN *p;
2797 for (; i < dview->a[ord]->len; i++)
2799 p = &g_array_index (dview->a[ord], DIFFLN, i);
2800 if (p->line == newline)
2802 break;
2806 dview->skip_rows = dview->search.last_accessed_num_line = i;
2807 g_snprintf (prev, sizeof (prev), "%d", newline);
2809 g_free (input);
2813 /* --------------------------------------------------------------------------------------------- */
2815 static void
2816 dview_labels (WDiff * dview)
2818 Dlg_head *h = dview->widget.owner;
2819 WButtonBar *b = find_buttonbar (h);
2821 buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), diff_map, (Widget *) dview);
2822 buttonbar_set_label (b, 2, Q_ ("ButtonBar|Save"), diff_map, (Widget *) dview);
2823 buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), diff_map, (Widget *) dview);
2824 buttonbar_set_label (b, 5, Q_ ("ButtonBar|Merge"), diff_map, (Widget *) dview);
2825 buttonbar_set_label (b, 7, Q_ ("ButtonBar|Search"), diff_map, (Widget *) dview);
2826 buttonbar_set_label (b, 9, Q_ ("ButtonBar|Options"), diff_map, (Widget *) dview);
2827 buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), diff_map, (Widget *) dview);
2831 /* --------------------------------------------------------------------------------------------- */
2833 static int
2834 dview_event (Gpm_Event * event, void *x)
2836 WDiff *dview = (WDiff *) x;
2837 int result = MOU_NORMAL;
2839 /* We are not interested in the release events */
2840 if ((event->type & (GPM_DOWN | GPM_DRAG)) == 0)
2842 return result;
2845 /* Wheel events */
2846 if ((event->buttons & GPM_B_UP) != 0 && (event->type & GPM_DOWN) != 0)
2848 dview->skip_rows -= 2;
2849 dview->search.last_accessed_num_line = dview->skip_rows;
2850 dview_update (dview);
2852 else if ((event->buttons & GPM_B_DOWN) != 0 && (event->type & GPM_DOWN) != 0)
2854 dview->skip_rows += 2;
2855 dview->search.last_accessed_num_line = dview->skip_rows;
2856 dview_update (dview);
2859 return result;
2862 static gboolean
2863 dview_save (WDiff * dview)
2865 gboolean res = TRUE;
2866 if (!dview->merged)
2867 return res;
2868 res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~");
2869 dview->merged = !res;
2870 return res;
2873 static void
2874 dview_do_save (WDiff * dview)
2876 (void) dview_save (dview);
2879 static void
2880 dview_save_options (WDiff * dview)
2882 mc_config_set_bool (mc_main_config, "DiffView", "show_symbols",
2883 dview->display_symbols != 0 ? TRUE : FALSE);
2884 mc_config_set_bool (mc_main_config, "DiffView", "show_numbers",
2885 dview->display_numbers != 0 ? TRUE : FALSE);
2886 mc_config_set_int (mc_main_config, "DiffView", "tab_size", dview->tab_size);
2888 mc_config_set_int (mc_main_config, "DiffView", "diff_quality", dview->opt.quality);
2890 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_tws",
2891 dview->opt.strip_trailing_cr);
2892 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_all_space",
2893 dview->opt.ignore_all_space);
2894 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_space_change",
2895 dview->opt.ignore_space_change);
2896 mc_config_set_bool (mc_main_config, "DiffView", "diff_tab_expansion",
2897 dview->opt.ignore_tab_expansion);
2898 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_case", dview->opt.ignore_case);
2901 static void
2902 dview_load_options (WDiff * dview)
2904 gboolean show_numbers, show_symbols;
2905 int tab_size;
2907 show_symbols = mc_config_get_bool (mc_main_config, "DiffView", "show_symbols", FALSE);
2908 if (show_symbols)
2909 dview->display_symbols = 1;
2910 show_numbers = mc_config_get_bool (mc_main_config, "DiffView", "show_numbers", FALSE);
2911 if (show_numbers)
2912 dview->display_numbers = calc_nwidth ((const GArray ** const) dview->a);
2913 tab_size = mc_config_get_int (mc_main_config, "DiffView", "tab_size", 8);
2914 if (tab_size > 0 && tab_size < 9)
2915 dview->tab_size = tab_size;
2916 else
2917 dview->tab_size = 8;
2919 dview->opt.quality = mc_config_get_int (mc_main_config, "DiffView", "diff_quality", 0);
2921 dview->opt.strip_trailing_cr =
2922 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_tws", FALSE);
2923 dview->opt.ignore_all_space =
2924 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_all_space", FALSE);
2925 dview->opt.ignore_space_change =
2926 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_space_change", FALSE);
2927 dview->opt.ignore_tab_expansion =
2928 mc_config_get_bool (mc_main_config, "DiffView", "diff_tab_expansion", FALSE);
2929 dview->opt.ignore_case =
2930 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_case", FALSE);
2932 dview->new_frame = 1;
2936 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2937 * ask user.
2939 static gboolean
2940 dview_ok_to_exit (WDiff * dview)
2942 gboolean res = TRUE;
2943 if (!dview->merged)
2944 return res;
2945 switch (query_dialog
2946 (_("Quit"), _("File was modified, Save with exit?"), D_NORMAL, 2, _("&Yes"),
2947 _("&No")))
2949 case -1:
2950 res = FALSE;
2951 break;
2952 case 0:
2953 res = TRUE;
2954 (void) dview_save (dview);
2955 break;
2956 case 1:
2957 res = TRUE;
2958 if (mc_util_restore_from_backup_if_possible (dview->file[0], "~~~"))
2959 res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~");
2960 break;
2962 return res;
2965 /* --------------------------------------------------------------------------------------------- */
2967 static cb_ret_t
2968 dview_execute_cmd (WDiff * dview, unsigned long command)
2970 cb_ret_t res = MSG_HANDLED;
2971 switch (command)
2973 case CK_DiffHelp:
2974 interactive_display (NULL, "[Diff Viewer]");
2975 break;
2976 case CK_DiffDisplaySymbols:
2977 dview->display_symbols ^= 1;
2978 dview->new_frame = 1;
2979 break;
2980 case CK_DiffDisplayNumbers:
2981 dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a);
2982 dview->new_frame = 1;
2983 break;
2984 case CK_DiffFull:
2985 dview->full ^= 1;
2986 dview->new_frame = 1;
2987 break;
2988 case CK_DiffEqual:
2989 if (!dview->full)
2991 dview->bias = 0;
2992 dview->new_frame = 1;
2994 break;
2995 case CK_DiffSplitMore:
2996 if (!dview->full)
2998 dview_compute_split (dview, 1);
2999 dview->new_frame = 1;
3001 break;
3003 case CK_DiffSplitLess:
3004 if (!dview->full)
3006 dview_compute_split (dview, -1);
3007 dview->new_frame = 1;
3009 break;
3010 case CK_DiffSetTab2:
3011 dview->tab_size = 2;
3012 break;
3013 case CK_DiffSetTab3:
3014 dview->tab_size = 3;
3015 break;
3016 case CK_DiffSetTab4:
3017 dview->tab_size = 4;
3018 break;
3019 case CK_DiffSetTab8:
3020 dview->tab_size = 8;
3021 break;
3022 case CK_DiffSwapPanel:
3023 dview->ord ^= 1;
3024 break;
3025 case CK_DiffRedo:
3026 dview_redo (dview);
3027 break;
3028 case CK_DiffNextHunk:
3029 dview->skip_rows = dview->search.last_accessed_num_line =
3030 find_next_hunk (dview->a[0], dview->skip_rows);
3031 break;
3032 case CK_DiffPrevHunk:
3033 dview->skip_rows = dview->search.last_accessed_num_line =
3034 find_prev_hunk (dview->a[0], dview->skip_rows);
3035 break;
3036 case CK_DiffGoto:
3037 dview_goto_cmd (dview, TRUE);
3038 break;
3039 case CK_DiffEditCurrent:
3040 dview_edit (dview, dview->ord);
3041 break;
3042 case CK_DiffMergeCurrentHunk:
3043 do_merge_hunk (dview);
3044 dview_redo (dview);
3045 break;
3046 case CK_DiffEditOther:
3047 dview_edit (dview, dview->ord ^ 1);
3048 break;
3049 case CK_DiffSearch:
3050 dview_search_cmd (dview);
3051 break;
3052 case CK_DiffContinueSearch:
3053 dview_continue_search_cmd (dview);
3054 break;
3055 case CK_DiffBOF:
3056 dview->skip_rows = dview->search.last_accessed_num_line = 0;
3057 break;
3058 case CK_DiffEOF:
3059 dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1;
3060 break;
3061 case CK_DiffUp:
3062 dview->skip_rows--;
3063 dview->search.last_accessed_num_line = dview->skip_rows;
3064 break;
3065 case CK_DiffDown:
3066 dview->skip_rows++;
3067 dview->search.last_accessed_num_line = dview->skip_rows;
3068 break;
3069 case CK_DiffPageDown:
3070 dview->skip_rows += dview->height - 2;
3071 dview->search.last_accessed_num_line = dview->skip_rows;
3072 break;
3073 case CK_DiffPageUp:
3074 dview->skip_rows -= dview->height - 2;
3075 dview->search.last_accessed_num_line = dview->skip_rows;
3076 break;
3077 case CK_DiffLeft:
3078 dview->skip_cols--;
3079 break;
3080 case CK_DiffRight:
3081 dview->skip_cols++;
3082 break;
3083 case CK_DiffQuickLeft:
3084 dview->skip_cols -= 8;
3085 break;
3086 case CK_DiffQuickRight:
3087 dview->skip_cols += 8;
3088 break;
3089 case CK_DiffHome:
3090 dview->skip_cols = 0;
3091 break;
3092 case CK_ShowCommandLine:
3093 view_other_cmd ();
3094 break;
3095 case CK_DiffQuit:
3096 dview->view_quit = 1;
3097 break;
3098 case CK_DiffSave:
3099 dview_do_save (dview);
3100 break;
3101 case CK_DiffOptions:
3102 dview_diff_options (dview);
3103 break;
3104 case CK_SelectCodepage:
3105 dview_select_encoding (dview);
3106 dview_reread (dview);
3107 tty_touch_screen ();
3108 repaint_screen ();
3109 break;
3110 default:
3111 res = MSG_NOT_HANDLED;
3113 return res;
3116 /* --------------------------------------------------------------------------------------------- */
3118 static cb_ret_t
3119 dview_handle_key (WDiff * dview, int key)
3121 unsigned long command;
3123 key = convert_from_input_c (key);
3125 command = lookup_keymap_command (diff_map, key);
3126 if ((command != CK_Ignore_Key) && (dview_execute_cmd (dview, command) == MSG_HANDLED))
3127 return MSG_HANDLED;
3129 /* Key not used */
3130 return MSG_NOT_HANDLED;
3133 /* --------------------------------------------------------------------------------------------- */
3135 static cb_ret_t
3136 dview_callback (Widget * w, widget_msg_t msg, int parm)
3138 WDiff *dview = (WDiff *) w;
3139 Dlg_head *h = dview->widget.owner;
3140 cb_ret_t i;
3142 switch (msg)
3144 case WIDGET_INIT:
3145 dview_labels (dview);
3146 dview_load_options (dview);
3147 dview_update (dview);
3148 return MSG_HANDLED;
3150 case WIDGET_DRAW:
3151 dview->new_frame = 1;
3152 dview_update (dview);
3153 return MSG_HANDLED;
3155 case WIDGET_KEY:
3156 i = dview_handle_key (dview, parm);
3157 if (dview->view_quit)
3158 dlg_stop (h);
3159 else
3160 dview_update (dview);
3161 return i;
3163 case WIDGET_COMMAND:
3164 i = dview_execute_cmd (dview, parm);
3165 if (dview->view_quit)
3166 dlg_stop (h);
3167 else
3168 dview_update (dview);
3169 return i;
3171 case WIDGET_DESTROY:
3172 dview_save_options (dview);
3173 dview_fini (dview);
3174 return MSG_HANDLED;
3176 default:
3177 return default_proc (msg, parm);
3181 /* --------------------------------------------------------------------------------------------- */
3183 static void
3184 dview_adjust_size (Dlg_head * h)
3186 WDiff *dview;
3187 WButtonBar *bar;
3189 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3190 dview = (WDiff *) find_widget_type (h, dview_callback);
3191 bar = find_buttonbar (h);
3192 widget_set_size (&dview->widget, 0, 0, LINES - 1, COLS);
3193 widget_set_size ((Widget *) bar, LINES - 1, 0, 1, COLS);
3195 dview_compute_areas (dview);
3198 /* --------------------------------------------------------------------------------------------- */
3200 static cb_ret_t
3201 dview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
3203 WDiff *dview = (WDiff *) data;
3205 switch (msg)
3207 case DLG_RESIZE:
3208 dview_adjust_size (h);
3209 return MSG_HANDLED;
3211 case DLG_ACTION:
3212 /* command from buttonbar */
3213 return send_message ((Widget *) dview, WIDGET_COMMAND, parm);
3215 case DLG_VALIDATE:
3216 dview = (WDiff *) find_widget_type (h, dview_callback);
3217 if (!dview_ok_to_exit (dview))
3218 h->state = DLG_ACTIVE;
3219 else
3220 h->state = DLG_CLOSED;
3222 return MSG_HANDLED;
3224 default:
3225 return default_dlg_callback (h, sender, msg, parm, data);
3229 /* --------------------------------------------------------------------------------------------- */
3231 static char *
3232 dview_get_title (const Dlg_head *h, size_t len)
3234 const WDiff *dview = (const WDiff *) find_widget_type (h, dview_callback);
3235 const char *modified = dview->merged ? " (*) " : " ";
3236 size_t len1;
3238 len -= (size_t) str_term_width1 (_("Diff:")) + strlen (modified);
3239 len1 = (len - 3)/2;
3241 return g_strconcat (_("Diff:"), modified,
3242 str_term_trim (dview->label[0], len1), " | ",
3243 str_term_trim (dview->label[1], len - len1), (char *) NULL);
3246 /*** public functions ****************************************************************************/
3247 /* --------------------------------------------------------------------------------------------- */
3250 diff_view (const char *file1, const char *file2, const char *label1, const char *label2)
3252 int error;
3253 WDiff *dview;
3254 Dlg_head *dview_dlg;
3256 /* Create dialog and widgets, put them on the dialog */
3257 dview_dlg =
3258 create_dlg (FALSE, 0, 0, LINES, COLS, NULL, dview_dialog_callback,
3259 "[Diff Viewer]", NULL, DLG_WANT_TAB);
3261 dview = g_new0 (WDiff, 1);
3263 init_widget (&dview->widget, 0, 0, LINES - 1, COLS,
3264 (callback_fn) dview_callback, (mouse_h) dview_event);
3266 widget_want_cursor (dview->widget, 0);
3268 add_widget (dview_dlg, dview);
3269 add_widget (dview_dlg, buttonbar_new (TRUE));
3271 dview_dlg->get_title = dview_get_title;
3273 error = dview_init (dview, "-a", file1, file2, label1, label2, DATA_SRC_MEM); /* XXX binary diff? */
3275 /* Please note that if you add another widget,
3276 * you have to modify dview_adjust_size to
3277 * be aware of it
3279 if (error == 0)
3280 run_dlg (dview_dlg);
3282 if ((error != 0) || (dview_dlg->state == DLG_CLOSED))
3283 destroy_dlg (dview_dlg);
3285 return error;
3288 /* --------------------------------------------------------------------------------------------- */
3290 #define GET_FILE_AND_STAMP(n) \
3291 do { \
3292 use_copy##n = 0; \
3293 real_file##n = file##n; \
3294 if (!vfs_file_is_local(file##n)) { \
3295 real_file##n = mc_getlocalcopy(file##n); \
3296 if (real_file##n != NULL) { \
3297 use_copy##n = 1; \
3298 if (mc_stat(real_file##n, &st##n) != 0) { \
3299 use_copy##n = -1; \
3303 } while (0)
3304 #define UNGET_FILE(n) \
3305 do { \
3306 if (use_copy##n) { \
3307 int changed = 0; \
3308 if (use_copy##n > 0) { \
3309 time_t mtime = st##n.st_mtime; \
3310 if (mc_stat(real_file##n, &st##n) == 0) { \
3311 changed = (mtime != st##n.st_mtime); \
3314 mc_ungetlocalcopy(file##n, real_file##n, changed); \
3315 g_free(real_file##n); \
3317 } while (0)
3319 void
3320 dview_diff_cmd (void)
3322 int rv = 0;
3323 char *file0 = NULL;
3324 char *file1 = NULL;
3325 int is_dir0 = 0;
3326 int is_dir1 = 0;
3328 if (mc_run_mode == MC_RUN_FULL)
3330 const WPanel *panel0 = current_panel;
3331 const WPanel *panel1 = other_panel;
3332 if (get_current_index ())
3334 panel0 = other_panel;
3335 panel1 = current_panel;
3337 file0 = concat_dir_and_file (panel0->cwd, selection (panel0)->fname);
3338 file1 = concat_dir_and_file (panel1->cwd, selection (panel1)->fname);
3339 is_dir0 = S_ISDIR (selection (panel0)->st.st_mode);
3340 is_dir1 = S_ISDIR (selection (panel1)->st.st_mode);
3343 if (rv == 0)
3345 rv = -1;
3346 if (file0 != NULL && !is_dir0 && file1 != NULL && !is_dir1)
3348 int use_copy0;
3349 int use_copy1;
3350 struct stat st0;
3351 struct stat st1;
3352 char *real_file0;
3353 char *real_file1;
3354 GET_FILE_AND_STAMP (0);
3355 GET_FILE_AND_STAMP (1);
3356 if (real_file0 != NULL && real_file1 != NULL)
3358 rv = diff_view (real_file0, real_file1, file0, file1);
3360 UNGET_FILE (1);
3361 UNGET_FILE (0);
3365 g_free (file1);
3366 g_free (file0);
3368 if (rv != 0)
3369 message (1, MSG_ERROR, _("Two files are needed to compare"));
3372 /* --------------------------------------------------------------------------------------------- */
3374 void
3375 dview_update (WDiff * dview)
3377 int height = dview->height;
3378 int width1;
3379 int width2;
3381 int last = dview->a[0]->len - 1;
3383 if (dview->skip_rows > last)
3385 dview->skip_rows = dview->search.last_accessed_num_line = last;
3387 if (dview->skip_rows < 0)
3389 dview->skip_rows = dview->search.last_accessed_num_line = 0;
3391 if (dview->skip_cols < 0)
3393 dview->skip_cols = 0;
3396 if (height < 2)
3398 return;
3401 width1 = dview->half1 + dview->bias;
3402 width2 = dview->half2 - dview->bias;
3403 if (dview->full)
3405 width1 = COLS;
3406 width2 = 0;
3409 if (dview->new_frame)
3411 int xwidth = dview->display_symbols + dview->display_numbers;
3413 tty_setcolor (NORMAL_COLOR);
3414 if (width1 > 1)
3416 tty_draw_box (1, 0, height, width1, FALSE);
3418 if (width2 > 1)
3420 tty_draw_box (1, width1, height, width2, FALSE);
3423 if (xwidth)
3425 xwidth++;
3426 if (xwidth < width1 - 1)
3428 tty_gotoyx (1, xwidth);
3429 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE);
3430 tty_gotoyx (height, xwidth);
3431 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE);
3432 tty_draw_vline (2, xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2);
3434 if (xwidth < width2 - 1)
3436 tty_gotoyx (1, width1 + xwidth);
3437 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE);
3438 tty_gotoyx (height, width1 + xwidth);
3439 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE);
3440 tty_draw_vline (2, width1 + xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2);
3443 dview->new_frame = 0;
3446 if (width1 > 2)
3448 dview_status (dview, dview->ord, width1, 0);
3449 dview_display_file (dview, dview->ord, 2, 1, height - 2, width1 - 2);
3451 if (width2 > 2)
3453 dview_status (dview, dview->ord ^ 1, width2, width1);
3454 dview_display_file (dview, dview->ord ^ 1, 2, width1 + 1, height - 2, width2 - 2);
3458 /* --------------------------------------------------------------------------------------------- */