Ticket #2877: code cleanup before 4.8.1.6 release.
[midnight-commander.git] / src / diffviewer / ydiff.c
blob44497202630263b3edecd6ce1843bf26cafe6cac
1 /*
2 Copyright (C) 2007, 2010, 2011
3 The Free Software Foundation, Inc.
5 Written by:
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/>.
28 #include <config.h>
29 #include <ctype.h>
30 #include <errno.h>
31 #include <fcntl.h>
32 #include <stdlib.h>
33 #include <sys/stat.h>
34 #include <sys/types.h>
35 #include <sys/wait.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, */
43 #include "lib/util.h"
44 #include "lib/widget.h"
45 #include "lib/strutil.h"
46 #ifdef HAVE_CHARSET
47 #include "lib/charsets.h"
48 #endif
49 #include "lib/event.h" /* mc_event_raise() */
51 #include "src/filemanager/cmd.h" /* do_edit_at_line(), view_other_cmd() */
52 #include "src/filemanager/panel.h"
53 #include "src/filemanager/layout.h" /* Needed for get_current_index and get_other_panel */
55 #include "src/keybind-defaults.h"
56 #include "src/history.h"
57 #ifdef HAVE_CHARSET
58 #include "src/selcodepage.h"
59 #endif
61 #include "ydiff.h"
62 #include "internal.h"
64 /*** global variables ****************************************************************************/
66 /*** file scope macro definitions ****************************************************************/
68 #define g_array_foreach(a, TP, cbf) \
69 do { \
70 size_t g_array_foreach_i;\
71 TP *g_array_foreach_var=NULL; \
72 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
73 { \
74 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
75 (*cbf) (g_array_foreach_var); \
76 } \
77 } while (0)
79 #define FILE_READ_BUF 4096
80 #define FILE_FLAG_TEMP (1 << 0)
82 #define OPTX 56
83 #define OPTY 17
85 #define ADD_CH '+'
86 #define DEL_CH '-'
87 #define CHG_CH '*'
88 #define EQU_CH ' '
90 #define HDIFF_ENABLE 1
91 #define HDIFF_MINCTX 5
92 #define HDIFF_DEPTH 10
94 #define FILE_DIRTY(fs) \
95 do \
96 { \
97 (fs)->pos = 0; \
98 (fs)->len = 0; \
99 } \
100 while (0)
102 /*** file scope type declarations ****************************************************************/
104 /*** file scope variables ************************************************************************/
106 /*** file scope functions ************************************************************************/
107 /* --------------------------------------------------------------------------------------------- */
109 static inline int
110 TAB_SKIP (int ts, int pos)
112 if (ts > 0 && ts < 9)
113 return ts - pos % ts;
114 else
115 return 8 - pos % 8;
118 /* --------------------------------------------------------------------------------------------- */
120 #ifdef HAVE_CHARSET
121 static void
122 dview_set_codeset (WDiff * dview)
124 const char *encoding_id = NULL;
126 dview->utf8 = TRUE;
127 encoding_id =
128 get_codepage_id (mc_global.source_codepage >=
129 0 ? mc_global.source_codepage : mc_global.display_codepage);
130 if (encoding_id != NULL)
132 GIConv conv;
134 conv = str_crt_conv_from (encoding_id);
135 if (conv != INVALID_CONV)
137 if (dview->converter != str_cnv_from_term)
138 str_close_conv (dview->converter);
139 dview->converter = conv;
141 dview->utf8 = (gboolean) str_isutf8 (encoding_id);
145 /* --------------------------------------------------------------------------------------------- */
147 static void
148 dview_select_encoding (WDiff * dview)
150 if (do_select_codepage ())
151 dview_set_codeset (dview);
152 dview_reread (dview);
153 tty_touch_screen ();
154 repaint_screen ();
156 #endif /* HAVE_CHARSET */
158 /* --------------------------------------------------------------------------------------------- */
160 static gboolean
161 rewrite_backup_content (const vfs_path_t * from_file_name_vpath, const char *to_file_name)
163 FILE *backup_fd;
164 char *contents;
165 gsize length;
166 const char *from_file_name;
168 from_file_name = vfs_path_get_by_index (from_file_name_vpath, -1)->path;
169 if (!g_file_get_contents (from_file_name, &contents, &length, NULL))
170 return FALSE;
172 backup_fd = fopen (to_file_name, "w");
173 if (backup_fd == NULL)
175 g_free (contents);
176 return FALSE;
179 length = fwrite ((const void *) contents, length, 1, backup_fd);
181 fflush (backup_fd);
182 fclose (backup_fd);
183 g_free (contents);
184 return TRUE;
187 /* buffered I/O ************************************************************* */
190 * Try to open a temporary file.
192 * \param[out] name address of a pointer to store the temporary name
194 * \return file descriptor on success, negative on error
196 * \note the name is not altered if this function fails
199 static int
200 open_temp (void **name)
202 int fd;
203 vfs_path_t *diff_file_name = NULL;
205 fd = mc_mkstemps (&diff_file_name, "mcdiff", NULL);
206 if (fd == -1)
208 message (D_ERROR, MSG_ERROR,
209 _("Cannot create temporary diff file\n%s"), unix_error_string (errno));
210 return -1;
212 *name = vfs_path_to_str (diff_file_name);
213 vfs_path_free (diff_file_name);
214 return fd;
217 /* --------------------------------------------------------------------------------------------- */
220 * Alocate file structure and associate file descriptor to it.
222 * \param fd file descriptor
224 * \return file structure
226 static FBUF *
227 f_dopen (int fd)
229 FBUF *fs;
231 if (fd < 0)
232 return NULL;
234 fs = g_try_malloc (sizeof (FBUF));
235 if (fs == NULL)
236 return NULL;
238 fs->buf = g_try_malloc (FILE_READ_BUF);
239 if (fs->buf == NULL)
241 g_free (fs);
242 return NULL;
245 fs->fd = fd;
246 FILE_DIRTY (fs);
247 fs->flags = 0;
248 fs->data = NULL;
250 return fs;
253 /* --------------------------------------------------------------------------------------------- */
256 * Free file structure without closing the file.
258 * \param fs file structure
260 * \return 0 on success, non-zero on error
262 static int
263 f_free (FBUF * fs)
265 int rv = 0;
266 if (fs->flags & FILE_FLAG_TEMP)
268 rv = unlink (fs->data);
269 g_free (fs->data);
271 g_free (fs->buf);
272 g_free (fs);
273 return rv;
277 /* --------------------------------------------------------------------------------------------- */
280 * Open a binary temporary file in R/W mode.
282 * \return file structure
284 * \note the file will be deleted when closed
286 static FBUF *
287 f_temp (void)
289 int fd;
290 FBUF *fs;
292 fs = f_dopen (0);
293 if (fs == NULL)
295 return NULL;
298 fd = open_temp (&fs->data);
299 if (fd < 0)
301 f_free (fs);
302 return NULL;
305 fs->fd = fd;
306 fs->flags = FILE_FLAG_TEMP;
307 return fs;
310 /* --------------------------------------------------------------------------------------------- */
313 * Open a binary file in specified mode.
315 * \param filename file name
316 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
318 * \return file structure
320 static FBUF *
321 f_open (const char *filename, int flags)
323 int fd;
324 FBUF *fs;
326 fs = f_dopen (0);
327 if (fs == NULL)
329 return NULL;
332 fd = open (filename, flags);
333 if (fd < 0)
335 f_free (fs);
336 return NULL;
339 fs->fd = fd;
340 return fs;
343 /* --------------------------------------------------------------------------------------------- */
346 * Read a line of bytes from file until newline or EOF.
348 * \param buf destination buffer
349 * \param size size of buffer
350 * \param fs file structure
352 * \return number of bytes read
354 * \note does not stop on null-byte
355 * \note buf will not be null-terminated
357 static size_t
358 f_gets (char *buf, size_t size, FBUF * fs)
360 size_t j = 0;
364 int i;
365 int stop = 0;
367 for (i = fs->pos; j < size && i < fs->len && !stop; i++, j++)
369 buf[j] = fs->buf[i];
370 if (buf[j] == '\n')
372 stop = 1;
375 fs->pos = i;
377 if (j == size || stop)
379 break;
382 fs->pos = 0;
383 fs->len = read (fs->fd, fs->buf, FILE_READ_BUF);
385 while (fs->len > 0);
387 return j;
390 /* --------------------------------------------------------------------------------------------- */
393 * Seek into file.
395 * \param fs file structure
396 * \param off offset
397 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
399 * \return position in file, starting from begginning
401 * \note avoids thrashing read cache when possible
403 static off_t
404 f_seek (FBUF * fs, off_t off, int whence)
406 off_t rv;
408 if (fs->len && whence != SEEK_END)
410 rv = lseek (fs->fd, 0, SEEK_CUR);
411 if (rv != -1)
413 if (whence == SEEK_CUR)
415 whence = SEEK_SET;
416 off += rv - fs->len + fs->pos;
418 if (off - rv >= -fs->len && off - rv <= 0)
420 fs->pos = fs->len + off - rv;
421 return off;
426 rv = lseek (fs->fd, off, whence);
427 if (rv != -1)
429 FILE_DIRTY (fs);
431 return rv;
434 /* --------------------------------------------------------------------------------------------- */
437 * Seek to the beginning of file, thrashing read cache.
439 * \param fs file structure
441 * \return 0 if success, non-zero on error
443 static off_t
444 f_reset (FBUF * fs)
446 off_t rv = lseek (fs->fd, 0, SEEK_SET);
447 if (rv != -1)
449 FILE_DIRTY (fs);
451 return rv;
454 /* --------------------------------------------------------------------------------------------- */
457 * Write bytes to file.
459 * \param fs file structure
460 * \param buf source buffer
461 * \param size size of buffer
463 * \return number of written bytes, -1 on error
465 * \note thrashes read cache
467 static ssize_t
468 f_write (FBUF * fs, const char *buf, size_t size)
470 ssize_t rv = write (fs->fd, buf, size);
471 if (rv >= 0)
473 FILE_DIRTY (fs);
475 return rv;
478 /* --------------------------------------------------------------------------------------------- */
481 * Truncate file to the current position.
483 * \param fs file structure
485 * \return current file size on success, negative on error
487 * \note thrashes read cache
489 static off_t
490 f_trunc (FBUF * fs)
492 off_t off = lseek (fs->fd, 0, SEEK_CUR);
493 if (off != -1)
495 int rv = ftruncate (fs->fd, off);
496 if (rv != 0)
498 off = -1;
500 else
502 FILE_DIRTY (fs);
505 return off;
508 /* --------------------------------------------------------------------------------------------- */
511 * Close file.
513 * \param fs file structure
515 * \return 0 on success, non-zero on error
517 * \note if this is temporary file, it is deleted
519 static int
520 f_close (FBUF * fs)
522 int rv = close (fs->fd);
523 f_free (fs);
524 return rv;
527 /* --------------------------------------------------------------------------------------------- */
530 * Create pipe stream to process.
532 * \param cmd shell command line
533 * \param flags open mode, either O_RDONLY or O_WRONLY
535 * \return file structure
537 static FBUF *
538 p_open (const char *cmd, int flags)
540 FILE *f;
541 FBUF *fs;
542 const char *type = NULL;
544 if (flags == O_RDONLY)
546 type = "r";
548 if (flags == O_WRONLY)
550 type = "w";
553 if (type == NULL)
555 return NULL;
558 fs = f_dopen (0);
559 if (fs == NULL)
561 return NULL;
564 f = popen (cmd, type);
565 if (f == NULL)
567 f_free (fs);
568 return NULL;
571 fs->fd = fileno (f);
572 fs->data = f;
573 return fs;
576 /* --------------------------------------------------------------------------------------------- */
579 * Close pipe stream.
581 * \param fs structure
583 * \return 0 on success, non-zero on error
585 static int
586 p_close (FBUF * fs)
588 int rv = pclose (fs->data);
589 f_free (fs);
590 return rv;
593 /* --------------------------------------------------------------------------------------------- */
595 * Get one char (byte) from string
597 * \param char * str, gboolean * result
599 * \return int as character or 0 and result == FALSE if fail
602 static int
603 dview_get_byte (char *str, gboolean * result)
605 if (str == NULL)
607 *result = FALSE;
608 return 0;
610 *result = TRUE;
611 return (unsigned char) *str;
614 /* --------------------------------------------------------------------------------------------- */
616 * Get utf multibyte char from string
618 * \param char * str, int * char_width, gboolean * result
620 * \return int as utf character or 0 and result == FALSE if fail
623 static int
624 dview_get_utf (char *str, int *char_width, gboolean * result)
626 int res = -1;
627 gunichar ch;
628 gchar *next_ch = NULL;
629 int width = 0;
631 *result = TRUE;
633 if (str == NULL)
635 *result = FALSE;
636 return 0;
639 res = g_utf8_get_char_validated (str, -1);
641 if (res < 0)
642 ch = *str;
643 else
645 ch = res;
646 /* Calculate UTF-8 char width */
647 next_ch = g_utf8_next_char (str);
648 if (next_ch != NULL)
649 width = next_ch - str;
650 else
651 ch = 0;
653 *char_width = width;
654 return ch;
657 /* --------------------------------------------------------------------------------------------- */
659 static int
660 dview_str_utf8_offset_to_pos (const char *text, size_t length)
662 ptrdiff_t result;
663 if (text == NULL || text[0] == '\0')
664 return length;
665 if (g_utf8_validate (text, -1, NULL))
667 result = g_utf8_offset_to_pointer (text, length) - text;
669 else
671 gunichar uni;
672 char *tmpbuf, *buffer;
673 buffer = tmpbuf = g_strdup (text);
674 while (tmpbuf[0] != '\0')
676 uni = g_utf8_get_char_validated (tmpbuf, -1);
677 if ((uni != (gunichar) (-1)) && (uni != (gunichar) (-2)))
679 tmpbuf = g_utf8_next_char (tmpbuf);
681 else
683 tmpbuf[0] = '.';
684 tmpbuf++;
688 result = g_utf8_offset_to_pointer (tmpbuf, length) - tmpbuf;
689 g_free (buffer);
691 return max (length, (size_t) result);
694 /* --------------------------------------------------------------------------------------------- */
695 /* diff parse *************************************************************** */
698 * Read decimal number from string.
700 * \param[in,out] str string to parse
701 * \param[out] n extracted number
703 * \return 0 if success, otherwise non-zero
705 static int
706 scan_deci (const char **str, int *n)
708 const char *p = *str;
709 char *q;
710 errno = 0;
711 *n = strtol (p, &q, 10);
712 if (errno || p == q)
714 return -1;
716 *str = q;
717 return 0;
720 /* --------------------------------------------------------------------------------------------- */
723 * Parse line for diff statement.
725 * \param p string to parse
726 * \param ops list of diff statements
728 * \return 0 if success, otherwise non-zero
730 static int
731 scan_line (const char *p, GArray * ops)
733 DIFFCMD op;
735 int f1, f2;
736 int t1, t2;
737 int cmd;
739 int range;
741 /* handle the following cases:
742 * NUMaNUM[,NUM]
743 * NUM[,NUM]cNUM[,NUM]
744 * NUM[,NUM]dNUM
745 * where NUM is a positive integer
748 if (scan_deci (&p, &f1) != 0 || f1 < 0)
750 return -1;
752 f2 = f1;
753 range = 0;
754 if (*p == ',')
756 p++;
757 if (scan_deci (&p, &f2) != 0 || f2 < f1)
759 return -1;
761 range = 1;
764 cmd = *p++;
765 if (cmd == 'a')
767 if (range)
769 return -1;
772 else if (cmd != 'c' && cmd != 'd')
774 return -1;
777 if (scan_deci (&p, &t1) != 0 || t1 < 0)
779 return -1;
781 t2 = t1;
782 range = 0;
783 if (*p == ',')
785 p++;
786 if (scan_deci (&p, &t2) != 0 || t2 < t1)
788 return -1;
790 range = 1;
793 if (cmd == 'd')
795 if (range)
797 return -1;
801 op.a[0][0] = f1;
802 op.a[0][1] = f2;
803 op.cmd = cmd;
804 op.a[1][0] = t1;
805 op.a[1][1] = t2;
806 g_array_append_val (ops, op);
807 return 0;
810 /* --------------------------------------------------------------------------------------------- */
813 * Parse diff output and extract diff statements.
815 * \param f stream to read from
816 * \param ops list of diff statements to fill
818 * \return positive number indicating number of hunks, otherwise negative
820 static int
821 scan_diff (FBUF * f, GArray * ops)
823 int sz;
824 char buf[BUFSIZ];
826 while ((sz = f_gets (buf, sizeof (buf) - 1, f)))
828 if (isdigit (buf[0]))
830 if (buf[sz - 1] != '\n')
832 return -1;
834 buf[sz] = '\0';
835 if (scan_line (buf, ops) != 0)
837 return -1;
839 continue;
841 while (buf[sz - 1] != '\n' && (sz = f_gets (buf, sizeof (buf), f)) != 0)
846 return ops->len;
849 /* --------------------------------------------------------------------------------------------- */
852 * Invoke diff and extract diff statements.
854 * \param args extra arguments to be passed to diff
855 * \param extra more arguments to be passed to diff
856 * \param file1 first file to compare
857 * \param file2 second file to compare
858 * \param ops list of diff statements to fill
860 * \return positive number indicating number of hunks, otherwise negative
862 static int
863 dff_execute (const char *args, const char *extra, const char *file1, const char *file2,
864 GArray * ops)
866 static const char *opt =
867 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
868 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
869 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
870 " --unchanged-group-format=''";
872 int rv;
873 FBUF *f;
874 char *cmd;
875 int code;
877 cmd = g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args, extra, opt, file1, file2);
878 if (cmd == NULL)
879 return -1;
881 f = p_open (cmd, O_RDONLY);
882 g_free (cmd);
884 if (f == NULL)
885 return -1;
887 rv = scan_diff (f, ops);
888 code = p_close (f);
890 if (rv < 0 || code == -1 || !WIFEXITED (code) || WEXITSTATUS (code) == 2)
891 return -1;
893 return rv;
896 /* --------------------------------------------------------------------------------------------- */
899 * Reparse and display file according to diff statements.
901 * \param ord 0 if displaying first file, 1 if displaying 2nd file
902 * \param filename file name to display
903 * \param ops list of diff statements
904 * \param printer printf-like function to be used for displaying
905 * \param ctx printer context
907 * \return 0 if success, otherwise non-zero
909 static int
910 dff_reparse (int ord, const char *filename, const GArray * ops, DFUNC printer, void *ctx)
912 size_t i;
913 FBUF *f;
914 size_t sz;
915 char buf[BUFSIZ];
916 int line = 0;
917 off_t off = 0;
918 const DIFFCMD *op;
919 int eff;
920 int add_cmd;
921 int del_cmd;
923 f = f_open (filename, O_RDONLY);
924 if (f == NULL)
926 return -1;
929 ord &= 1;
930 eff = ord;
932 add_cmd = 'a';
933 del_cmd = 'd';
934 if (ord)
936 add_cmd = 'd';
937 del_cmd = 'a';
939 #define F1 a[eff][0]
940 #define F2 a[eff][1]
941 #define T1 a[ ord^1 ][0]
942 #define T2 a[ ord^1 ][1]
943 for (i = 0; i < ops->len; i++)
945 int n;
946 op = &g_array_index (ops, DIFFCMD, i);
947 n = op->F1 - (op->cmd != add_cmd);
948 while (line < n && (sz = f_gets (buf, sizeof (buf), f)) != 0)
950 line++;
951 printer (ctx, EQU_CH, line, off, sz, buf);
952 off += sz;
953 while (buf[sz - 1] != '\n')
955 sz = f_gets (buf, sizeof (buf), f);
956 if (sz == 0)
958 printer (ctx, 0, 0, 0, 1, "\n");
959 break;
961 printer (ctx, 0, 0, 0, sz, buf);
962 off += sz;
965 if (line != n)
967 goto err;
970 if (op->cmd == add_cmd)
972 n = op->T2 - op->T1 + 1;
973 while (n)
975 printer (ctx, DEL_CH, 0, 0, 1, "\n");
976 n--;
979 if (op->cmd == del_cmd)
981 n = op->F2 - op->F1 + 1;
982 while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0)
984 line++;
985 printer (ctx, ADD_CH, line, off, sz, buf);
986 off += sz;
987 while (buf[sz - 1] != '\n')
989 sz = f_gets (buf, sizeof (buf), f);
990 if (sz == 0)
992 printer (ctx, 0, 0, 0, 1, "\n");
993 break;
995 printer (ctx, 0, 0, 0, sz, buf);
996 off += sz;
998 n--;
1000 if (n)
1002 goto err;
1005 if (op->cmd == 'c')
1007 n = op->F2 - op->F1 + 1;
1008 while (n != 0 && (sz = f_gets (buf, sizeof (buf), f)) != 0)
1010 line++;
1011 printer (ctx, CHG_CH, line, off, sz, buf);
1012 off += sz;
1013 while (buf[sz - 1] != '\n')
1015 sz = f_gets (buf, sizeof (buf), f);
1016 if (sz == 0)
1018 printer (ctx, 0, 0, 0, 1, "\n");
1019 break;
1021 printer (ctx, 0, 0, 0, sz, buf);
1022 off += sz;
1024 n--;
1026 if (n)
1028 goto err;
1030 n = op->T2 - op->T1 - (op->F2 - op->F1);
1031 while (n > 0)
1033 printer (ctx, CHG_CH, 0, 0, 1, "\n");
1034 n--;
1038 #undef T2
1039 #undef T1
1040 #undef F2
1041 #undef F1
1043 while ((sz = f_gets (buf, sizeof (buf), f)) != 0)
1045 line++;
1046 printer (ctx, EQU_CH, line, off, sz, buf);
1047 off += sz;
1048 while (buf[sz - 1] != '\n')
1050 sz = f_gets (buf, sizeof (buf), f);
1051 if (sz == 0)
1053 printer (ctx, 0, 0, 0, 1, "\n");
1054 break;
1056 printer (ctx, 0, 0, 0, sz, buf);
1057 off += sz;
1061 f_close (f);
1062 return 0;
1064 err:
1065 f_close (f);
1066 return -1;
1069 /* --------------------------------------------------------------------------------------------- */
1070 /* horizontal diff ********************************************************** */
1073 * Longest common substring.
1075 * \param s first string
1076 * \param m length of first string
1077 * \param t second string
1078 * \param n length of second string
1079 * \param ret list of offsets for longest common substrings inside each string
1080 * \param min minimum length of common substrings
1082 * \return 0 if success, nonzero otherwise
1084 static int
1085 lcsubstr (const char *s, int m, const char *t, int n, GArray * ret, int min)
1087 int i, j;
1089 int *Lprev, *Lcurr;
1091 int z = 0;
1093 if (m < min || n < min)
1095 /* XXX early culling */
1096 return 0;
1099 Lprev = g_new0 (int, n + 1);
1100 Lcurr = g_new0 (int, n + 1);
1102 if (Lprev == NULL || Lcurr == NULL)
1104 g_free (Lprev);
1105 g_free (Lcurr);
1106 return -1;
1109 for (i = 0; i < m; i++)
1111 int *L = Lprev;
1112 Lprev = Lcurr;
1113 Lcurr = L;
1114 #ifdef USE_MEMSET_IN_LCS
1115 memset (Lcurr, 0, (n + 1) * sizeof (int));
1116 #endif
1117 for (j = 0; j < n; j++)
1119 #ifndef USE_MEMSET_IN_LCS
1120 Lcurr[j + 1] = 0;
1121 #endif
1122 if (s[i] == t[j])
1124 int v = Lprev[j] + 1;
1125 Lcurr[j + 1] = v;
1126 if (z < v)
1128 z = v;
1129 g_array_set_size (ret, 0);
1131 if (z == v && z >= min)
1133 int off0 = i - z + 1;
1134 int off1 = j - z + 1;
1135 size_t k;
1136 for (k = 0; k < ret->len; k++)
1138 PAIR *p = (PAIR *) g_array_index (ret, PAIR, k);
1139 if ((*p)[0] == off0)
1141 break;
1143 if ((*p)[1] >= off1)
1145 break;
1148 if (k == ret->len)
1150 PAIR p2;
1151 p2[0] = off0;
1152 p2[1] = off1;
1153 g_array_append_val (ret, p2);
1160 free (Lcurr);
1161 free (Lprev);
1162 return z;
1164 free (Lcurr);
1165 free (Lprev);
1166 return -1;
1169 /* --------------------------------------------------------------------------------------------- */
1172 * Scan recursively for common substrings and build ranges.
1174 * \param s first string
1175 * \param t second string
1176 * \param bracket current limits for both of the strings
1177 * \param min minimum length of common substrings
1178 * \param hdiff list of horizontal diff ranges to fill
1179 * \param depth recursion depth
1181 * \return 0 if success, nonzero otherwise
1183 static gboolean
1184 hdiff_multi (const char *s, const char *t, const BRACKET bracket, int min, GArray * hdiff,
1185 unsigned int depth)
1187 BRACKET p;
1189 if (depth--)
1191 GArray *ret;
1192 BRACKET b;
1193 int len;
1194 ret = g_array_new (FALSE, TRUE, sizeof (PAIR));
1195 if (ret == NULL)
1196 return FALSE;
1198 len = lcsubstr (s + bracket[0].off, bracket[0].len,
1199 t + bracket[1].off, bracket[1].len, ret, min);
1200 if (ret->len != 0)
1202 size_t k = 0;
1203 const PAIR *data = (const PAIR *) &g_array_index (ret, PAIR, 0);
1204 const PAIR *data2;
1206 b[0].off = bracket[0].off;
1207 b[0].len = (*data)[0];
1208 b[1].off = bracket[1].off;
1209 b[1].len = (*data)[1];
1210 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1211 return FALSE;
1213 for (k = 0; k < ret->len - 1; k++)
1215 data = (const PAIR *) &g_array_index (ret, PAIR, k);
1216 data2 = (const PAIR *) &g_array_index (ret, PAIR, k + 1);
1217 b[0].off = bracket[0].off + (*data)[0] + len;
1218 b[0].len = (*data2)[0] - (*data)[0] - len;
1219 b[1].off = bracket[1].off + (*data)[1] + len;
1220 b[1].len = (*data2)[1] - (*data)[1] - len;
1221 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1222 return FALSE;
1224 data = (const PAIR *) &g_array_index (ret, PAIR, k);
1225 b[0].off = bracket[0].off + (*data)[0] + len;
1226 b[0].len = bracket[0].len - (*data)[0] - len;
1227 b[1].off = bracket[1].off + (*data)[1] + len;
1228 b[1].len = bracket[1].len - (*data)[1] - len;
1229 if (!hdiff_multi (s, t, b, min, hdiff, depth))
1230 return FALSE;
1232 g_array_free (ret, TRUE);
1233 return TRUE;
1237 p[0].off = bracket[0].off;
1238 p[0].len = bracket[0].len;
1239 p[1].off = bracket[1].off;
1240 p[1].len = bracket[1].len;
1241 g_array_append_val (hdiff, p);
1243 return TRUE;
1246 /* --------------------------------------------------------------------------------------------- */
1249 * Build list of horizontal diff ranges.
1251 * \param s first string
1252 * \param m length of first string
1253 * \param t second string
1254 * \param n length of second string
1255 * \param min minimum length of common substrings
1256 * \param hdiff list of horizontal diff ranges to fill
1257 * \param depth recursion depth
1259 * \return 0 if success, nonzero otherwise
1261 static gboolean
1262 hdiff_scan (const char *s, int m, const char *t, int n, int min, GArray * hdiff, unsigned int depth)
1264 int i;
1265 BRACKET b;
1267 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1268 for (i = 0; i < m && i < n && s[i] == t[i]; i++)
1270 for (; m > i && n > i && s[m - 1] == t[n - 1]; m--, n--)
1273 b[0].off = i;
1274 b[0].len = m - i;
1275 b[1].off = i;
1276 b[1].len = n - i;
1278 /* smartscan (multiple horizontal diff) */
1279 return hdiff_multi (s, t, b, min, hdiff, depth);
1282 /* --------------------------------------------------------------------------------------------- */
1283 /* read line **************************************************************** */
1286 * Check if character is inside horizontal diff limits.
1288 * \param k rank of character inside line
1289 * \param hdiff horizontal diff structure
1290 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1292 * \return TRUE if inside hdiff limits, FALSE otherwise
1294 static int
1295 is_inside (int k, GArray * hdiff, int ord)
1297 size_t i;
1298 BRACKET *b;
1299 for (i = 0; i < hdiff->len; i++)
1301 int start, end;
1302 b = &g_array_index (hdiff, BRACKET, i);
1304 start = (*b)[ord].off;
1305 end = start + (*b)[ord].len;
1306 if (k >= start && k < end)
1308 return 1;
1311 return 0;
1314 /* --------------------------------------------------------------------------------------------- */
1317 * Copy `src' to `dst' expanding tabs.
1319 * \param dst destination buffer
1320 * \param src source buffer
1321 * \param srcsize size of src buffer
1322 * \param base virtual base of this string, needed to calculate tabs
1323 * \param ts tab size
1325 * \return new virtual base
1327 * \note The procedure returns when all bytes are consumed from `src'
1329 static int
1330 cvt_cpy (char *dst, const char *src, size_t srcsize, int base, int ts)
1332 int i;
1333 for (i = 0; srcsize != 0; i++, src++, dst++, srcsize--)
1335 *dst = *src;
1336 if (*src == '\t')
1338 int j = TAB_SKIP (ts, i + base);
1339 i += j - 1;
1340 while (j-- > 0)
1342 *dst++ = ' ';
1344 dst--;
1347 return i + base;
1350 /* --------------------------------------------------------------------------------------------- */
1353 * Copy `src' to `dst' expanding tabs.
1355 * \param dst destination buffer
1356 * \param dstsize size of dst buffer
1357 * \param[in,out] _src source buffer
1358 * \param srcsize size of src buffer
1359 * \param base virtual base of this string, needed to calculate tabs
1360 * \param ts tab size
1362 * \return new virtual base
1364 * \note The procedure returns when all bytes are consumed from `src'
1365 * or `dstsize' bytes are written to `dst'
1366 * \note Upon return, `src' points to the first unwritten character in source
1368 static int
1369 cvt_ncpy (char *dst, int dstsize, const char **_src, size_t srcsize, int base, int ts)
1371 int i;
1372 const char *src = *_src;
1373 for (i = 0; i < dstsize && srcsize != 0; i++, src++, dst++, srcsize--)
1375 *dst = *src;
1376 if (*src == '\t')
1378 int j = TAB_SKIP (ts, i + base);
1379 if (j > dstsize - i)
1381 j = dstsize - i;
1383 i += j - 1;
1384 while (j-- > 0)
1386 *dst++ = ' ';
1388 dst--;
1391 *_src = src;
1392 return i + base;
1395 /* --------------------------------------------------------------------------------------------- */
1398 * Read line from memory, converting tabs to spaces and padding with spaces.
1400 * \param src buffer to read from
1401 * \param srcsize size of src buffer
1402 * \param dst buffer to read to
1403 * \param dstsize size of dst buffer, excluding trailing null
1404 * \param skip number of characters to skip
1405 * \param ts tab size
1406 * \param show_cr show trailing carriage return as ^M
1408 * \return negative on error, otherwise number of bytes except padding
1410 static int
1411 cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr)
1413 int sz = 0;
1414 if (src != NULL)
1416 int i;
1417 char *tmp = dst;
1418 const int base = 0;
1419 for (i = 0; dstsize != 0 && srcsize != 0 && *src != '\n'; i++, src++, srcsize--)
1421 if (*src == '\t')
1423 int j = TAB_SKIP (ts, i + base);
1424 i += j - 1;
1425 while (j-- > 0)
1427 if (skip > 0)
1429 skip--;
1431 else if (dstsize != 0)
1433 dstsize--;
1434 *dst++ = ' ';
1438 else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n'))
1440 if (skip == 0 && show_cr)
1442 if (dstsize > 1)
1444 dstsize -= 2;
1445 *dst++ = '^';
1446 *dst++ = 'M';
1448 else
1450 dstsize--;
1451 *dst++ = '.';
1454 break;
1456 else
1458 if (skip > 0)
1460 int utf_ch = 0;
1461 gboolean res;
1462 int w;
1464 skip--;
1465 utf_ch = dview_get_utf ((char *) src, &w, &res);
1466 if (w > 1)
1467 skip += w - 1;
1468 if (!g_unichar_isprint (utf_ch))
1469 utf_ch = '.';
1471 else
1473 dstsize--;
1474 *dst++ = *src;
1478 sz = dst - tmp;
1480 while (dstsize != 0)
1482 dstsize--;
1483 *dst++ = ' ';
1485 *dst = '\0';
1486 return sz;
1489 /* --------------------------------------------------------------------------------------------- */
1492 * Read line from memory and build attribute array.
1494 * \param src buffer to read from
1495 * \param srcsize size of src buffer
1496 * \param dst buffer to read to
1497 * \param dstsize size of dst buffer, excluding trailing null
1498 * \param skip number of characters to skip
1499 * \param ts tab size
1500 * \param show_cr show trailing carriage return as ^M
1501 * \param hdiff horizontal diff structure
1502 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1503 * \param att buffer of attributes
1505 * \return negative on error, otherwise number of bytes except padding
1507 static int
1508 cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr,
1509 GArray * hdiff, int ord, char *att)
1511 int sz = 0;
1512 if (src != NULL)
1514 int i, k;
1515 char *tmp = dst;
1516 const int base = 0;
1517 for (i = 0, k = 0; dstsize != 0 && srcsize != 0 && *src != '\n'; i++, k++, src++, srcsize--)
1519 if (*src == '\t')
1521 int j = TAB_SKIP (ts, i + base);
1522 i += j - 1;
1523 while (j-- > 0)
1525 if (skip != 0)
1527 skip--;
1529 else if (dstsize != 0)
1531 dstsize--;
1532 *att++ = is_inside (k, hdiff, ord);
1533 *dst++ = ' ';
1537 else if (src[0] == '\r' && (srcsize == 1 || src[1] == '\n'))
1539 if (skip == 0 && show_cr)
1541 if (dstsize > 1)
1543 dstsize -= 2;
1544 *att++ = is_inside (k, hdiff, ord);
1545 *dst++ = '^';
1546 *att++ = is_inside (k, hdiff, ord);
1547 *dst++ = 'M';
1549 else
1551 dstsize--;
1552 *att++ = is_inside (k, hdiff, ord);
1553 *dst++ = '.';
1556 break;
1558 else
1560 if (skip != 0)
1562 int utf_ch = 0;
1563 gboolean res;
1564 int w;
1566 skip--;
1567 utf_ch = dview_get_utf ((char *) src, &w, &res);
1568 if (w > 1)
1569 skip += w - 1;
1570 if (!g_unichar_isprint (utf_ch))
1571 utf_ch = '.';
1573 else
1575 dstsize--;
1576 *att++ = is_inside (k, hdiff, ord);
1577 *dst++ = *src;
1581 sz = dst - tmp;
1583 while (dstsize != 0)
1585 dstsize--;
1586 *att++ = 0;
1587 *dst++ = ' ';
1589 *dst = '\0';
1590 return sz;
1593 /* --------------------------------------------------------------------------------------------- */
1596 * Read line from file, converting tabs to spaces and padding with spaces.
1598 * \param f file stream to read from
1599 * \param off offset of line inside file
1600 * \param dst buffer to read to
1601 * \param dstsize size of dst buffer, excluding trailing null
1602 * \param skip number of characters to skip
1603 * \param ts tab size
1604 * \param show_cr show trailing carriage return as ^M
1606 * \return negative on error, otherwise number of bytes except padding
1608 static int
1609 cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, int show_cr)
1611 int base = 0;
1612 int old_base = base;
1613 const int amount = dstsize;
1615 size_t useful, offset;
1617 size_t i;
1618 size_t sz;
1620 int lastch = '\0';
1622 const char *q = NULL;
1623 char tmp[BUFSIZ]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1624 char cvt[BUFSIZ]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1626 if ((int) sizeof (tmp) < amount || (int) sizeof (tmp) <= dstsize
1627 || (int) sizeof (cvt) < 8 * amount)
1629 /* abnormal, but avoid buffer overflow */
1630 memset (dst, ' ', dstsize);
1631 dst[dstsize] = '\0';
1632 return 0;
1635 f_seek (f, off, SEEK_SET);
1637 while (skip > base)
1639 old_base = base;
1640 sz = f_gets (tmp, amount, f);
1641 if (sz == 0)
1642 break;
1644 base = cvt_cpy (cvt, tmp, sz, old_base, ts);
1645 if (cvt[base - old_base - 1] == '\n')
1647 q = &cvt[base - old_base - 1];
1648 base = old_base + q - cvt + 1;
1649 break;
1653 if (base < skip)
1655 memset (dst, ' ', dstsize);
1656 dst[dstsize] = '\0';
1657 return 0;
1660 useful = base - skip;
1661 offset = skip - old_base;
1663 if (useful <= dstsize)
1665 if (useful != 0)
1666 memmove (dst, cvt + offset, useful);
1668 if (q == NULL)
1670 sz = f_gets (tmp, dstsize - useful + 1, f);
1671 if (sz != 0)
1673 const char *ptr = tmp;
1674 useful += cvt_ncpy (dst + useful, dstsize - useful, &ptr, sz, base, ts) - base;
1675 if (ptr < tmp + sz)
1676 lastch = *ptr;
1679 sz = useful;
1681 else
1683 memmove (dst, cvt + offset, dstsize);
1684 sz = dstsize;
1685 lastch = cvt[offset + dstsize];
1688 dst[sz] = lastch;
1689 for (i = 0; i < sz && dst[i] != '\n'; i++)
1691 if (dst[i] == '\r' && dst[i + 1] == '\n')
1693 if (show_cr)
1695 if (i + 1 < dstsize)
1697 dst[i++] = '^';
1698 dst[i++] = 'M';
1700 else
1702 dst[i++] = '*';
1705 break;
1708 for (; i < dstsize; i++)
1710 dst[i] = ' ';
1712 dst[i] = '\0';
1713 return sz;
1716 /* --------------------------------------------------------------------------------------------- */
1717 /* diff printers et al ****************************************************** */
1719 static void
1720 cc_free_elt (void *elt)
1722 DIFFLN *p = elt;
1723 if (p != NULL)
1725 g_free (p->p);
1729 /* --------------------------------------------------------------------------------------------- */
1731 static int
1732 printer (void *ctx, int ch, int line, off_t off, size_t sz, const char *str)
1734 GArray *a = ((PRINTER_CTX *) ctx)->a;
1735 DSRC dsrc = ((PRINTER_CTX *) ctx)->dsrc;
1736 if (ch)
1738 DIFFLN p;
1739 p.p = NULL;
1740 p.ch = ch;
1741 p.line = line;
1742 p.u.off = off;
1743 if (dsrc == DATA_SRC_MEM && line != 0)
1745 if (sz != 0 && str[sz - 1] == '\n')
1747 sz--;
1749 if (sz > 0)
1750 p.p = g_strndup (str, sz);
1751 p.u.len = sz;
1753 g_array_append_val (a, p);
1755 else if (dsrc == DATA_SRC_MEM)
1757 DIFFLN *p;
1758 p = &g_array_index (a, DIFFLN, a->len - 1);
1759 if (sz != 0 && str[sz - 1] == '\n')
1761 sz--;
1763 if (sz != 0)
1765 size_t new_size = p->u.len + sz;
1766 char *q = g_realloc (p->p, new_size);
1767 memcpy (q + p->u.len, str, sz);
1768 p->p = q;
1770 p->u.len += sz;
1772 if (dsrc == DATA_SRC_TMP && (line != 0 || ch == 0))
1774 FBUF *f = ((PRINTER_CTX *) ctx)->f;
1775 f_write (f, str, sz);
1777 return 0;
1780 /* --------------------------------------------------------------------------------------------- */
1782 static int
1783 redo_diff (WDiff * dview)
1785 FBUF *const *f = dview->f;
1787 PRINTER_CTX ctx;
1788 GArray *ops;
1789 int ndiff;
1790 int rv;
1792 char extra[256];
1794 extra[0] = '\0';
1795 if (dview->opt.quality == 2)
1797 strcat (extra, " -d");
1799 if (dview->opt.quality == 1)
1801 strcat (extra, " --speed-large-files");
1803 if (dview->opt.strip_trailing_cr)
1805 strcat (extra, " --strip-trailing-cr");
1807 if (dview->opt.ignore_tab_expansion)
1809 strcat (extra, " -E");
1811 if (dview->opt.ignore_space_change)
1813 strcat (extra, " -b");
1815 if (dview->opt.ignore_all_space)
1817 strcat (extra, " -w");
1819 if (dview->opt.ignore_case)
1821 strcat (extra, " -i");
1824 if (dview->dsrc != DATA_SRC_MEM)
1826 f_reset (f[0]);
1827 f_reset (f[1]);
1830 ops = g_array_new (FALSE, FALSE, sizeof (DIFFCMD));
1831 ndiff = dff_execute (dview->args, extra, dview->file[0], dview->file[1], ops);
1832 if (ndiff < 0)
1834 if (ops != NULL)
1835 g_array_free (ops, TRUE);
1836 return -1;
1839 ctx.dsrc = dview->dsrc;
1841 rv = 0;
1842 ctx.a = dview->a[0];
1843 ctx.f = f[0];
1844 rv |= dff_reparse (0, dview->file[0], ops, printer, &ctx);
1846 ctx.a = dview->a[1];
1847 ctx.f = f[1];
1848 rv |= dff_reparse (1, dview->file[1], ops, printer, &ctx);
1850 if (ops != NULL)
1851 g_array_free (ops, TRUE);
1853 if (rv != 0 || dview->a[0]->len != dview->a[1]->len)
1854 return -1;
1856 if (dview->dsrc == DATA_SRC_TMP)
1858 f_trunc (f[0]);
1859 f_trunc (f[1]);
1862 if (dview->dsrc == DATA_SRC_MEM && HDIFF_ENABLE)
1864 dview->hdiff = g_ptr_array_new ();
1865 if (dview->hdiff != NULL)
1867 size_t i;
1868 const DIFFLN *p;
1869 const DIFFLN *q;
1870 for (i = 0; i < dview->a[0]->len; i++)
1872 GArray *h = NULL;
1873 p = &g_array_index (dview->a[0], DIFFLN, i);
1874 q = &g_array_index (dview->a[1], DIFFLN, i);
1875 if (p->line && q->line && p->ch == CHG_CH)
1877 h = g_array_new (FALSE, FALSE, sizeof (BRACKET));
1878 if (h != NULL)
1880 gboolean runresult =
1881 hdiff_scan (p->p, p->u.len, q->p, q->u.len, HDIFF_MINCTX, h,
1882 HDIFF_DEPTH);
1883 if (!runresult)
1885 g_array_free (h, TRUE);
1886 h = NULL;
1890 g_ptr_array_add (dview->hdiff, h);
1894 return ndiff;
1897 /* --------------------------------------------------------------------------------------------- */
1899 static void
1900 destroy_hdiff (WDiff * dview)
1902 if (dview->hdiff != NULL)
1904 int i;
1905 int len = dview->a[0]->len;
1906 for (i = 0; i < len; i++)
1908 GArray *h = (GArray *) g_ptr_array_index (dview->hdiff, i);
1909 if (h != NULL)
1910 g_array_free (h, TRUE);
1912 g_ptr_array_free (dview->hdiff, TRUE);
1913 dview->hdiff = NULL;
1916 mc_search_free (dview->search.handle);
1917 dview->search.handle = NULL;
1918 g_free (dview->search.last_string);
1919 dview->search.last_string = NULL;
1922 /* --------------------------------------------------------------------------------------------- */
1923 /* stuff ******************************************************************** */
1925 static int
1926 get_digits (unsigned int n)
1928 int d = 1;
1929 while (n /= 10)
1931 d++;
1933 return d;
1936 /* --------------------------------------------------------------------------------------------- */
1938 static int
1939 get_line_numbers (const GArray * a, size_t pos, int *linenum, int *lineofs)
1941 const DIFFLN *p;
1943 *linenum = 0;
1944 *lineofs = 0;
1946 if (a->len != 0)
1948 if (pos >= a->len)
1950 pos = a->len - 1;
1953 p = &g_array_index (a, DIFFLN, pos);
1955 if (p->line == 0)
1957 int n;
1958 for (n = pos; n > 0; n--)
1960 p--;
1961 if (p->line != 0)
1963 break;
1966 *lineofs = pos - n + 1;
1969 *linenum = p->line;
1971 return 0;
1974 /* --------------------------------------------------------------------------------------------- */
1976 static int
1977 calc_nwidth (const GArray ** const a)
1979 int l1, o1;
1980 int l2, o2;
1981 get_line_numbers (a[0], a[0]->len - 1, &l1, &o1);
1982 get_line_numbers (a[1], a[1]->len - 1, &l2, &o2);
1983 if (l1 < l2)
1985 l1 = l2;
1987 return get_digits (l1);
1990 /* --------------------------------------------------------------------------------------------- */
1992 static int
1993 find_prev_hunk (const GArray * a, int pos)
1995 #if 1
1996 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
1998 pos--;
2000 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH)
2002 pos--;
2004 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
2006 pos--;
2008 if (pos > 0 && (size_t) pos < a->len)
2009 pos++;
2010 #else
2011 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH)
2013 pos--;
2015 while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH)
2017 pos--;
2019 #endif
2021 return pos;
2024 /* --------------------------------------------------------------------------------------------- */
2026 static size_t
2027 find_next_hunk (const GArray * a, size_t pos)
2029 while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH)
2031 pos++;
2033 while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH)
2035 pos++;
2037 return pos;
2041 * Find start and end lines of the current hunk.
2043 * \param dview - widget WDiff
2044 * \return boolean and
2045 * start_line1 first line of current hunk (file[0])
2046 * end_line1 last line of current hunk (file[0])
2047 * start_line1 first line of current hunk (file[0])
2048 * end_line1 last line of current hunk (file[0])
2050 static int
2051 get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_line2, int *end_line2)
2053 const GArray *a0 = dview->a[0];
2054 const GArray *a1 = dview->a[1];
2055 size_t pos;
2056 int ch;
2057 int res = 0;
2059 *start_line1 = 1;
2060 *start_line2 = 1;
2061 *end_line1 = 1;
2062 *end_line2 = 1;
2064 pos = dview->skip_rows;
2065 ch = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch;
2066 if (ch != EQU_CH)
2068 switch (ch)
2070 case ADD_CH:
2071 res = DIFF_DEL;
2072 break;
2073 case DEL_CH:
2074 res = DIFF_ADD;
2075 break;
2076 case CHG_CH:
2077 res = DIFF_CHG;
2078 break;
2080 while (pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH)
2082 pos--;
2084 if (pos > 0)
2086 *start_line1 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line + 1;
2087 *start_line2 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line + 1;
2089 pos = dview->skip_rows;
2090 while (pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH)
2092 int l0, l1;
2093 l0 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line;
2094 l1 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line;
2095 if (l0 > 0)
2096 *end_line1 = max (*start_line1, l0);
2097 if (l1 > 0)
2098 *end_line2 = max (*start_line2, l1);
2099 pos++;
2102 return res;
2105 static void
2106 dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1)
2108 int line;
2109 char buf[BUF_10K];
2110 FILE *f0;
2111 f0 = fopen (dview->file[0], "r");
2112 line = 0;
2113 while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
2115 line++;
2116 fputs (buf, merge_file);
2118 while (fgets (buf, sizeof (buf), f0) != NULL)
2120 line++;
2121 if (line >= to1)
2122 fputs (buf, merge_file);
2124 fclose (f0);
2127 static void
2128 dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2)
2130 int line;
2131 char buf[BUF_10K];
2132 FILE *f0;
2133 FILE *f1;
2134 f0 = fopen (dview->file[0], "r");
2135 f1 = fopen (dview->file[1], "r");
2136 line = 0;
2137 while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
2139 line++;
2140 fputs (buf, merge_file);
2142 line = 0;
2143 while (fgets (buf, sizeof (buf), f1) != NULL && line <= to2)
2145 line++;
2146 if (line >= from2)
2147 fputs (buf, merge_file);
2149 while (fgets (buf, sizeof (buf), f0) != NULL)
2151 fputs (buf, merge_file);
2153 fclose (f0);
2154 fclose (f1);
2157 static void
2158 dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2)
2160 int line1, line2;
2161 char buf[BUF_10K];
2162 FILE *f0;
2163 FILE *f1;
2164 f0 = fopen (dview->file[0], "r");
2165 f1 = fopen (dview->file[1], "r");
2166 line1 = 0;
2167 while (fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1)
2169 line1++;
2170 fputs (buf, merge_file);
2172 line2 = 0;
2173 while (fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2)
2175 line2++;
2176 if (line2 >= from2)
2177 fputs (buf, merge_file);
2179 while (fgets (buf, sizeof (buf), f0) != NULL)
2181 line1++;
2182 if (line1 > to1)
2183 fputs (buf, merge_file);
2185 fclose (f0);
2186 fclose (f1);
2189 static void
2190 do_merge_hunk (WDiff * dview)
2192 int from1, to1, from2, to2;
2193 int res;
2194 int hunk;
2196 hunk = get_current_hunk (dview, &from1, &to1, &from2, &to2);
2197 if (hunk > 0)
2199 int merge_file_fd;
2200 FILE *merge_file;
2201 vfs_path_t *merge_file_name_vpath = NULL;
2203 if (!dview->merged)
2205 dview->merged = mc_util_make_backup_if_possible (dview->file[0], "~~~");
2206 if (!dview->merged)
2208 message (D_ERROR, MSG_ERROR,
2209 _("Cannot create backup file\n%s%s\n%s"),
2210 dview->file[0], "~~~", unix_error_string (errno));
2211 return;
2216 merge_file_fd = mc_mkstemps (&merge_file_name_vpath, "mcmerge", NULL);
2217 if (merge_file_fd == -1)
2219 message (D_ERROR, MSG_ERROR, _("Cannot create temporary merge file\n%s"),
2220 unix_error_string (errno));
2221 return;
2224 merge_file = fdopen (merge_file_fd, "w");
2226 switch (hunk)
2228 case DIFF_DEL:
2229 dview_remove_hunk (dview, merge_file, from1, to1);
2230 break;
2231 case DIFF_ADD:
2232 dview_add_hunk (dview, merge_file, from1, from2, to2);
2233 break;
2234 case DIFF_CHG:
2235 dview_replace_hunk (dview, merge_file, from1, to1, from2, to2);
2236 break;
2238 fflush (merge_file);
2239 fclose (merge_file);
2240 res = rewrite_backup_content (merge_file_name_vpath, dview->file[0]);
2241 mc_unlink (merge_file_name_vpath);
2242 vfs_path_free (merge_file_name_vpath);
2246 /* --------------------------------------------------------------------------------------------- */
2247 /* view routines and callbacks ********************************************** */
2249 static void
2250 dview_compute_split (WDiff * dview, int i)
2252 dview->bias += i;
2253 if (dview->bias < 2 - dview->half1)
2255 dview->bias = 2 - dview->half1;
2257 if (dview->bias > dview->half2 - 2)
2259 dview->bias = dview->half2 - 2;
2263 /* --------------------------------------------------------------------------------------------- */
2265 static void
2266 dview_compute_areas (WDiff * dview)
2268 dview->height = LINES - 2;
2269 dview->half1 = COLS / 2;
2270 dview->half2 = COLS - dview->half1;
2272 dview_compute_split (dview, 0);
2275 /* --------------------------------------------------------------------------------------------- */
2277 static int
2278 dview_init (WDiff * dview, const char *args, const char *file1, const char *file2,
2279 const char *label1, const char *label2, DSRC dsrc)
2281 int ndiff;
2282 FBUF *f[2];
2284 f[0] = NULL;
2285 f[1] = NULL;
2287 if (dsrc == DATA_SRC_TMP)
2289 f[0] = f_temp ();
2290 if (f[0] == NULL)
2291 return -1;
2293 f[1] = f_temp ();
2294 if (f[1] == NULL)
2296 f_close (f[0]);
2297 return -1;
2300 else if (dsrc == DATA_SRC_ORG)
2302 f[0] = f_open (file1, O_RDONLY);
2303 if (f[0] == NULL)
2304 return -1;
2306 f[1] = f_open (file2, O_RDONLY);
2307 if (f[1] == NULL)
2309 f_close (f[0]);
2310 return -1;
2314 dview->args = args;
2315 dview->file[0] = file1;
2316 dview->file[1] = file2;
2317 dview->label[0] = g_strdup (label1);
2318 dview->label[1] = g_strdup (label2);
2319 dview->f[0] = f[0];
2320 dview->f[1] = f[1];
2321 dview->hdiff = NULL;
2322 dview->dsrc = dsrc;
2323 dview->converter = str_cnv_from_term;
2324 #ifdef HAVE_CHARSET
2325 dview_set_codeset (dview);
2326 #endif
2328 dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2329 dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2331 ndiff = redo_diff (dview);
2332 if (ndiff < 0)
2334 /* goto WIDGET_DESTROY stage: dview_fini() */
2335 return -1;
2338 dview->ndiff = ndiff;
2340 dview->view_quit = 0;
2342 dview->bias = 0;
2343 dview->new_frame = 1;
2344 dview->skip_rows = 0;
2345 dview->skip_cols = 0;
2346 dview->display_symbols = 0;
2347 dview->display_numbers = 0;
2348 dview->show_cr = 1;
2349 dview->tab_size = 8;
2350 dview->ord = 0;
2351 dview->full = 0;
2353 dview->search.handle = NULL;
2354 dview->search.last_string = NULL;
2355 dview->search.last_found_line = -1;
2356 dview->search.last_accessed_num_line = -1;
2358 dview->opt.quality = 0;
2359 dview->opt.strip_trailing_cr = 0;
2360 dview->opt.ignore_tab_expansion = 0;
2361 dview->opt.ignore_space_change = 0;
2362 dview->opt.ignore_all_space = 0;
2363 dview->opt.ignore_case = 0;
2365 dview_compute_areas (dview);
2367 return 0;
2370 /* --------------------------------------------------------------------------------------------- */
2372 static void
2373 dview_reread (WDiff * dview)
2375 int ndiff;
2377 destroy_hdiff (dview);
2378 if (dview->a[0] != NULL)
2380 g_array_foreach (dview->a[0], DIFFLN, cc_free_elt);
2381 g_array_free (dview->a[0], TRUE);
2383 if (dview->a[1] != NULL)
2385 g_array_foreach (dview->a[1], DIFFLN, cc_free_elt);
2386 g_array_free (dview->a[1], TRUE);
2389 dview->a[0] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2390 dview->a[1] = g_array_new (FALSE, FALSE, sizeof (DIFFLN));
2392 ndiff = redo_diff (dview);
2393 if (ndiff >= 0)
2394 dview->ndiff = ndiff;
2397 /* --------------------------------------------------------------------------------------------- */
2398 static void
2399 dview_diff_options (WDiff * dview)
2401 const char *quality_str[] = {
2402 N_("No&rmal"),
2403 N_("&Fastest (Assume large files)"),
2404 N_("&Minimal (Find a smaller set of change)")
2407 QuickWidget diffopt_widgets[] = {
2408 QUICK_BUTTON (6, 10, 14, OPTY, N_("&Cancel"), B_CANCEL, NULL),
2409 QUICK_BUTTON (2, 10, 14, OPTY, N_("&OK"), B_ENTER, NULL),
2411 QUICK_CHECKBOX (3, OPTX, 12, OPTY,
2412 N_("Strip &trailing carriage return"), &dview->opt.strip_trailing_cr),
2413 QUICK_CHECKBOX (3, OPTX, 11, OPTY,
2414 N_("Ignore all &whitespace"), &dview->opt.ignore_all_space),
2415 QUICK_CHECKBOX (3, OPTX, 10, OPTY,
2416 N_("Ignore &space change"), &dview->opt.ignore_space_change),
2417 QUICK_CHECKBOX (3, OPTX, 9, OPTY,
2418 N_("Ignore tab &expansion"), &dview->opt.ignore_tab_expansion),
2419 QUICK_CHECKBOX (3, OPTX, 8, OPTY,
2420 N_("&Ignore case"), &dview->opt.ignore_case),
2421 QUICK_LABEL (3, OPTX, 7, OPTY, N_("Diff extra options")),
2422 QUICK_RADIO (3, OPTX, 3, OPTY,
2423 3, (const char **) quality_str, (int *) &dview->opt.quality),
2424 QUICK_LABEL (3, OPTX, 2, OPTY, N_("Diff algorithm")),
2426 QUICK_END
2429 QuickDialog diffopt = {
2430 OPTX, OPTY, -1, -1,
2431 N_("Diff Options"), "[Diff Options]",
2432 diffopt_widgets, NULL, FALSE
2435 if (quick_dialog (&diffopt) != B_CANCEL)
2437 dview_reread (dview);
2441 /* --------------------------------------------------------------------------------------------- */
2443 static void
2444 dview_fini (WDiff * dview)
2446 if (dview->dsrc != DATA_SRC_MEM)
2448 f_close (dview->f[1]);
2449 f_close (dview->f[0]);
2452 if (dview->converter != str_cnv_from_term)
2453 str_close_conv (dview->converter);
2455 destroy_hdiff (dview);
2456 if (dview->a[0] != NULL)
2458 g_array_foreach (dview->a[0], DIFFLN, cc_free_elt);
2459 g_array_free (dview->a[0], TRUE);
2460 dview->a[0] = NULL;
2462 if (dview->a[1] != NULL)
2464 g_array_foreach (dview->a[1], DIFFLN, cc_free_elt);
2465 g_array_free (dview->a[1], TRUE);
2466 dview->a[1] = NULL;
2469 g_free (dview->label[0]);
2470 g_free (dview->label[1]);
2474 /* --------------------------------------------------------------------------------------------- */
2476 static int
2477 dview_display_file (const WDiff * dview, int ord, int r, int c, int height, int width)
2479 size_t i, k;
2480 int j;
2481 char buf[BUFSIZ];
2482 FBUF *f = dview->f[ord];
2483 int skip = dview->skip_cols;
2484 int display_symbols = dview->display_symbols;
2485 int display_numbers = dview->display_numbers;
2486 int show_cr = dview->show_cr;
2487 int tab_size = 8;
2488 const DIFFLN *p;
2489 int nwidth = display_numbers;
2490 int xwidth = display_symbols + display_numbers;
2491 if (dview->tab_size > 0 && dview->tab_size < 9)
2492 tab_size = dview->tab_size;
2494 if (xwidth)
2496 if (xwidth > width && display_symbols)
2498 xwidth--;
2499 display_symbols = 0;
2501 if (xwidth > width && display_numbers)
2503 xwidth = width;
2504 display_numbers = width;
2507 xwidth++;
2509 c += xwidth;
2510 width -= xwidth;
2512 if (width < 0)
2514 width = 0;
2518 if ((int) sizeof (buf) <= width || (int) sizeof (buf) <= nwidth)
2520 /* abnormal, but avoid buffer overflow */
2521 return -1;
2524 for (i = dview->skip_rows, j = 0; i < dview->a[ord]->len && j < height; j++, i++)
2526 int ch, next_ch, col;
2527 size_t cnt;
2528 p = (DIFFLN *) & g_array_index (dview->a[ord], DIFFLN, i);
2529 ch = p->ch;
2530 tty_setcolor (NORMAL_COLOR);
2531 if (display_symbols)
2533 tty_gotoyx (r + j, c - 2);
2534 tty_print_char (ch);
2536 if (p->line != 0)
2538 if (display_numbers)
2540 tty_gotoyx (r + j, c - xwidth);
2541 g_snprintf (buf, display_numbers + 1, "%*d", nwidth, p->line);
2542 tty_print_string (str_fit_to_term (buf, nwidth, J_LEFT_FIT));
2544 if (ch == ADD_CH)
2546 tty_setcolor (DFF_ADD_COLOR);
2548 if (ch == CHG_CH)
2550 tty_setcolor (DFF_CHG_COLOR);
2552 if (f == NULL)
2554 if (i == (size_t) dview->search.last_found_line)
2556 tty_setcolor (MARKED_SELECTED_COLOR);
2558 else
2560 if (dview->hdiff != NULL && g_ptr_array_index (dview->hdiff, i) != NULL)
2562 char att[BUFSIZ];
2563 if (dview->utf8)
2564 k = dview_str_utf8_offset_to_pos (p->p, width);
2565 else
2566 k = width;
2567 cvt_mgeta (p->p, p->u.len, buf, k, skip, tab_size, show_cr,
2568 g_ptr_array_index (dview->hdiff, i), ord, att);
2569 tty_gotoyx (r + j, c);
2570 col = 0;
2571 for (cnt = 0; cnt < strlen (buf) && col < width; cnt++)
2573 int w;
2574 gboolean ch_res;
2575 if (dview->utf8)
2577 next_ch = dview_get_utf (buf + cnt, &w, &ch_res);
2578 if (w > 1)
2579 cnt += w - 1;
2580 if (!g_unichar_isprint (next_ch))
2581 next_ch = '.';
2583 else
2584 next_ch = dview_get_byte (buf + cnt, &ch_res);
2585 if (ch_res)
2587 tty_setcolor (att[cnt] ? DFF_CHH_COLOR : DFF_CHG_COLOR);
2588 #ifdef HAVE_CHARSET
2589 if (mc_global.utf8_display)
2591 if (!dview->utf8)
2593 next_ch =
2594 convert_from_8bit_to_utf_c ((unsigned char) next_ch,
2595 dview->converter);
2598 else if (dview->utf8)
2599 next_ch =
2600 convert_from_utf_to_current_c (next_ch, dview->converter);
2601 else
2602 next_ch = convert_to_display_c (next_ch);
2603 #endif
2605 tty_print_anychar (next_ch);
2606 col++;
2609 continue;
2611 else if (ch == CHG_CH)
2613 tty_setcolor (DFF_CHH_COLOR);
2616 if (dview->utf8)
2617 k = dview_str_utf8_offset_to_pos (p->p, width);
2618 else
2619 k = width;
2620 cvt_mget (p->p, p->u.len, buf, k, skip, tab_size, show_cr);
2622 else
2624 cvt_fget (f, p->u.off, buf, width, skip, tab_size, show_cr);
2627 else
2629 if (display_numbers)
2631 tty_gotoyx (r + j, c - xwidth);
2632 memset (buf, ' ', display_numbers);
2633 buf[display_numbers] = '\0';
2634 tty_print_string (buf);
2636 if (ch == DEL_CH)
2638 tty_setcolor (DFF_DEL_COLOR);
2640 if (ch == CHG_CH)
2642 tty_setcolor (DFF_CHD_COLOR);
2644 memset (buf, ' ', width);
2645 buf[width] = '\0';
2647 tty_gotoyx (r + j, c);
2648 /* tty_print_nstring (buf, width); */
2649 col = 0;
2650 for (cnt = 0; cnt < strlen (buf) && col < width; cnt++)
2652 int w;
2653 gboolean ch_res;
2654 if (dview->utf8)
2656 next_ch = dview_get_utf (buf + cnt, &w, &ch_res);
2657 if (w > 1)
2658 cnt += w - 1;
2659 if (!g_unichar_isprint (next_ch))
2660 next_ch = '.';
2662 else
2663 next_ch = dview_get_byte (buf + cnt, &ch_res);
2664 if (ch_res)
2666 #ifdef HAVE_CHARSET
2667 if (mc_global.utf8_display)
2669 if (!dview->utf8)
2671 next_ch =
2672 convert_from_8bit_to_utf_c ((unsigned char) next_ch, dview->converter);
2675 else if (dview->utf8)
2676 next_ch = convert_from_utf_to_current_c (next_ch, dview->converter);
2677 else
2678 next_ch = convert_to_display_c (next_ch);
2679 #endif
2681 tty_print_anychar (next_ch);
2682 col++;
2685 continue;
2687 tty_setcolor (NORMAL_COLOR);
2688 k = width;
2689 if (width < xwidth - 1)
2691 k = xwidth - 1;
2693 memset (buf, ' ', k);
2694 buf[k] = '\0';
2695 for (; j < height; j++)
2697 if (xwidth)
2699 tty_gotoyx (r + j, c - xwidth);
2700 /* tty_print_nstring (buf, xwidth - 1); */
2701 tty_print_string (str_fit_to_term (buf, xwidth - 1, J_LEFT_FIT));
2703 tty_gotoyx (r + j, c);
2704 /* tty_print_nstring (buf, width); */
2705 tty_print_string (str_fit_to_term (buf, width, J_LEFT_FIT));
2708 return 0;
2711 /* --------------------------------------------------------------------------------------------- */
2713 static void
2714 dview_status (const WDiff * dview, int ord, int width, int c)
2716 const char *buf;
2717 int filename_width;
2718 int linenum, lineofs;
2719 vfs_path_t *vpath;
2720 char *path;
2722 tty_setcolor (STATUSBAR_COLOR);
2724 tty_gotoyx (0, c);
2725 get_line_numbers (dview->a[ord], dview->skip_rows, &linenum, &lineofs);
2727 filename_width = width - 22;
2728 if (filename_width < 8)
2729 filename_width = 8;
2731 vpath = vfs_path_from_str (dview->label[ord]);
2732 path = vfs_path_to_str_flags (vpath, 0, VPF_STRIP_HOME | VPF_STRIP_PASSWORD);
2733 vfs_path_free (vpath);
2734 buf = str_term_trim (path, filename_width);
2735 if (ord == 0)
2736 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width, buf, linenum, lineofs,
2737 dview->skip_cols);
2738 else
2739 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width, buf, linenum, lineofs, dview->ndiff);
2740 g_free (path);
2743 /* --------------------------------------------------------------------------------------------- */
2745 static void
2746 dview_redo (WDiff * dview)
2748 if (dview->display_numbers)
2750 int old = dview->display_numbers;
2751 dview->display_numbers = calc_nwidth ((const GArray **) dview->a);
2752 dview->new_frame = (old != dview->display_numbers);
2754 dview_reread (dview);
2757 /* --------------------------------------------------------------------------------------------- */
2759 static void
2760 dview_edit (WDiff * dview, int ord)
2762 Dlg_head *h;
2763 gboolean h_modal;
2764 int linenum, lineofs;
2766 if (dview->dsrc == DATA_SRC_TMP)
2768 error_dialog (_("Edit"), _("Edit is disabled"));
2769 return;
2772 h = ((Widget *) dview)->owner;
2773 h_modal = h->modal;
2775 get_line_numbers (dview->a[ord], dview->skip_rows, &linenum, &lineofs);
2776 h->modal = TRUE; /* not allow edit file in several editors */
2778 vfs_path_t *tmp_vpath;
2780 tmp_vpath = vfs_path_from_str (dview->file[ord]);
2781 do_edit_at_line (tmp_vpath, use_internal_edit, linenum);
2782 vfs_path_free (tmp_vpath);
2784 h->modal = h_modal;
2785 dview_redo (dview);
2786 dview_update (dview);
2789 /* --------------------------------------------------------------------------------------------- */
2791 static void
2792 dview_goto_cmd (WDiff * dview, int ord)
2794 static const char *title[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2795 static char prev[256];
2796 /* XXX some statics here, to be remembered between runs */
2798 int newline;
2799 char *input;
2801 input = input_dialog (_(title[ord]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE, prev);
2802 if (input != NULL)
2804 const char *s = input;
2805 if (scan_deci (&s, &newline) == 0 && *s == '\0')
2807 size_t i = 0;
2808 if (newline > 0)
2810 const DIFFLN *p;
2811 for (; i < dview->a[ord]->len; i++)
2813 p = &g_array_index (dview->a[ord], DIFFLN, i);
2814 if (p->line == newline)
2816 break;
2820 dview->skip_rows = dview->search.last_accessed_num_line = (ssize_t) i;
2821 g_snprintf (prev, sizeof (prev), "%d", newline);
2823 g_free (input);
2827 /* --------------------------------------------------------------------------------------------- */
2829 static void
2830 dview_labels (WDiff * dview)
2832 Dlg_head *h = dview->widget.owner;
2833 WButtonBar *b = find_buttonbar (h);
2835 buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), diff_map, (Widget *) dview);
2836 buttonbar_set_label (b, 2, Q_ ("ButtonBar|Save"), diff_map, (Widget *) dview);
2837 buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), diff_map, (Widget *) dview);
2838 buttonbar_set_label (b, 5, Q_ ("ButtonBar|Merge"), diff_map, (Widget *) dview);
2839 buttonbar_set_label (b, 7, Q_ ("ButtonBar|Search"), diff_map, (Widget *) dview);
2840 buttonbar_set_label (b, 9, Q_ ("ButtonBar|Options"), diff_map, (Widget *) dview);
2841 buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), diff_map, (Widget *) dview);
2845 /* --------------------------------------------------------------------------------------------- */
2847 static int
2848 dview_event (Gpm_Event * event, void *x)
2850 WDiff *dview = (WDiff *) x;
2851 int result = MOU_NORMAL;
2853 /* We are not interested in the release events */
2854 if ((event->type & (GPM_DOWN | GPM_DRAG)) == 0)
2856 return result;
2859 /* Wheel events */
2860 if ((event->buttons & GPM_B_UP) != 0 && (event->type & GPM_DOWN) != 0)
2862 dview->skip_rows -= 2;
2863 dview->search.last_accessed_num_line = dview->skip_rows;
2864 dview_update (dview);
2866 else if ((event->buttons & GPM_B_DOWN) != 0 && (event->type & GPM_DOWN) != 0)
2868 dview->skip_rows += 2;
2869 dview->search.last_accessed_num_line = dview->skip_rows;
2870 dview_update (dview);
2873 return result;
2876 static gboolean
2877 dview_save (WDiff * dview)
2879 gboolean res = TRUE;
2880 if (!dview->merged)
2881 return res;
2882 res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~");
2883 dview->merged = !res;
2884 return res;
2887 static void
2888 dview_do_save (WDiff * dview)
2890 (void) dview_save (dview);
2893 static void
2894 dview_save_options (WDiff * dview)
2896 mc_config_set_bool (mc_main_config, "DiffView", "show_symbols",
2897 dview->display_symbols != 0 ? TRUE : FALSE);
2898 mc_config_set_bool (mc_main_config, "DiffView", "show_numbers",
2899 dview->display_numbers != 0 ? TRUE : FALSE);
2900 mc_config_set_int (mc_main_config, "DiffView", "tab_size", dview->tab_size);
2902 mc_config_set_int (mc_main_config, "DiffView", "diff_quality", dview->opt.quality);
2904 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_tws",
2905 dview->opt.strip_trailing_cr);
2906 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_all_space",
2907 dview->opt.ignore_all_space);
2908 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_space_change",
2909 dview->opt.ignore_space_change);
2910 mc_config_set_bool (mc_main_config, "DiffView", "diff_tab_expansion",
2911 dview->opt.ignore_tab_expansion);
2912 mc_config_set_bool (mc_main_config, "DiffView", "diff_ignore_case", dview->opt.ignore_case);
2915 static void
2916 dview_load_options (WDiff * dview)
2918 gboolean show_numbers, show_symbols;
2919 int tab_size;
2921 show_symbols = mc_config_get_bool (mc_main_config, "DiffView", "show_symbols", FALSE);
2922 if (show_symbols)
2923 dview->display_symbols = 1;
2924 show_numbers = mc_config_get_bool (mc_main_config, "DiffView", "show_numbers", FALSE);
2925 if (show_numbers)
2926 dview->display_numbers = calc_nwidth ((const GArray ** const) dview->a);
2927 tab_size = mc_config_get_int (mc_main_config, "DiffView", "tab_size", 8);
2928 if (tab_size > 0 && tab_size < 9)
2929 dview->tab_size = tab_size;
2930 else
2931 dview->tab_size = 8;
2933 dview->opt.quality = mc_config_get_int (mc_main_config, "DiffView", "diff_quality", 0);
2935 dview->opt.strip_trailing_cr =
2936 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_tws", FALSE);
2937 dview->opt.ignore_all_space =
2938 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_all_space", FALSE);
2939 dview->opt.ignore_space_change =
2940 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_space_change", FALSE);
2941 dview->opt.ignore_tab_expansion =
2942 mc_config_get_bool (mc_main_config, "DiffView", "diff_tab_expansion", FALSE);
2943 dview->opt.ignore_case =
2944 mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_case", FALSE);
2946 dview->new_frame = 1;
2950 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2951 * ask user.
2953 static gboolean
2954 dview_ok_to_exit (WDiff * dview)
2956 gboolean res = TRUE;
2957 int act;
2959 if (!dview->merged)
2960 return res;
2962 act = query_dialog (_("Quit"), !mc_global.midnight_shutdown ?
2963 _("File was modified. Save with exit?") :
2964 _("Midnight Commander is being shut down.\nSave modified file?"),
2965 D_NORMAL, 2, _("&Yes"), _("&No"));
2967 /* Esc is No */
2968 if (mc_global.midnight_shutdown || (act == -1))
2969 act = 1;
2971 switch (act)
2973 case -1: /* Esc */
2974 res = FALSE;
2975 break;
2976 case 0: /* Yes */
2977 (void) dview_save (dview);
2978 res = TRUE;
2979 break;
2980 case 1: /* No */
2981 if (mc_util_restore_from_backup_if_possible (dview->file[0], "~~~"))
2982 res = mc_util_unlink_backup_if_possible (dview->file[0], "~~~");
2983 /* fall through */
2984 default:
2985 res = TRUE;
2986 break;
2988 return res;
2991 /* --------------------------------------------------------------------------------------------- */
2993 static cb_ret_t
2994 dview_execute_cmd (WDiff * dview, unsigned long command)
2996 cb_ret_t res = MSG_HANDLED;
2997 switch (command)
2999 case CK_ShowSymbols:
3000 dview->display_symbols ^= 1;
3001 dview->new_frame = 1;
3002 break;
3003 case CK_ShowNumbers:
3004 dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a);
3005 dview->new_frame = 1;
3006 break;
3007 case CK_SplitFull:
3008 dview->full ^= 1;
3009 dview->new_frame = 1;
3010 break;
3011 case CK_SplitEqual:
3012 if (!dview->full)
3014 dview->bias = 0;
3015 dview->new_frame = 1;
3017 break;
3018 case CK_SplitMore:
3019 if (!dview->full)
3021 dview_compute_split (dview, 1);
3022 dview->new_frame = 1;
3024 break;
3026 case CK_SplitLess:
3027 if (!dview->full)
3029 dview_compute_split (dview, -1);
3030 dview->new_frame = 1;
3032 break;
3033 case CK_Tab2:
3034 dview->tab_size = 2;
3035 break;
3036 case CK_Tab3:
3037 dview->tab_size = 3;
3038 break;
3039 case CK_Tab4:
3040 dview->tab_size = 4;
3041 break;
3042 case CK_Tab8:
3043 dview->tab_size = 8;
3044 break;
3045 case CK_Swap:
3046 dview->ord ^= 1;
3047 break;
3048 case CK_Redo:
3049 dview_redo (dview);
3050 break;
3051 case CK_HunkNext:
3052 dview->skip_rows = dview->search.last_accessed_num_line =
3053 find_next_hunk (dview->a[0], dview->skip_rows);
3054 break;
3055 case CK_HunkPrev:
3056 dview->skip_rows = dview->search.last_accessed_num_line =
3057 find_prev_hunk (dview->a[0], dview->skip_rows);
3058 break;
3059 case CK_Goto:
3060 dview_goto_cmd (dview, TRUE);
3061 break;
3062 case CK_Edit:
3063 dview_edit (dview, dview->ord);
3064 break;
3065 case CK_Merge:
3066 do_merge_hunk (dview);
3067 dview_redo (dview);
3068 break;
3069 case CK_EditOther:
3070 dview_edit (dview, dview->ord ^ 1);
3071 break;
3072 case CK_Search:
3073 dview_search_cmd (dview);
3074 break;
3075 case CK_SearchContinue:
3076 dview_continue_search_cmd (dview);
3077 break;
3078 case CK_Top:
3079 dview->skip_rows = dview->search.last_accessed_num_line = 0;
3080 break;
3081 case CK_Bottom:
3082 dview->skip_rows = dview->search.last_accessed_num_line = dview->a[0]->len - 1;
3083 break;
3084 case CK_Up:
3085 if (dview->skip_rows > 0)
3087 dview->skip_rows--;
3088 dview->search.last_accessed_num_line = dview->skip_rows;
3090 break;
3091 case CK_Down:
3092 dview->skip_rows++;
3093 dview->search.last_accessed_num_line = dview->skip_rows;
3094 break;
3095 case CK_PageDown:
3096 if (dview->height > 2)
3098 dview->skip_rows += dview->height - 2;
3099 dview->search.last_accessed_num_line = dview->skip_rows;
3101 break;
3102 case CK_PageUp:
3103 if (dview->height > 2)
3105 dview->skip_rows -= dview->height - 2;
3106 dview->search.last_accessed_num_line = dview->skip_rows;
3108 break;
3109 case CK_Left:
3110 dview->skip_cols--;
3111 break;
3112 case CK_Right:
3113 dview->skip_cols++;
3114 break;
3115 case CK_LeftQuick:
3116 dview->skip_cols -= 8;
3117 break;
3118 case CK_RightQuick:
3119 dview->skip_cols += 8;
3120 break;
3121 case CK_Home:
3122 dview->skip_cols = 0;
3123 break;
3124 case CK_Shell:
3125 view_other_cmd ();
3126 break;
3127 case CK_Quit:
3128 dview->view_quit = 1;
3129 break;
3130 case CK_Save:
3131 dview_do_save (dview);
3132 break;
3133 case CK_Options:
3134 dview_diff_options (dview);
3135 break;
3136 #ifdef HAVE_CHARSET
3137 case CK_SelectCodepage:
3138 dview_select_encoding (dview);
3139 break;
3140 #endif
3141 case CK_Cancel:
3142 /* don't close diffviewer due to SIGINT */
3143 break;
3144 default:
3145 res = MSG_NOT_HANDLED;
3147 return res;
3150 /* --------------------------------------------------------------------------------------------- */
3152 static cb_ret_t
3153 dview_handle_key (WDiff * dview, int key)
3155 unsigned long command;
3157 #ifdef HAVE_CHARSET
3158 key = convert_from_input_c (key);
3159 #endif
3161 command = keybind_lookup_keymap_command (diff_map, key);
3162 if ((command != CK_IgnoreKey) && (dview_execute_cmd (dview, command) == MSG_HANDLED))
3163 return MSG_HANDLED;
3165 /* Key not used */
3166 return MSG_NOT_HANDLED;
3169 /* --------------------------------------------------------------------------------------------- */
3171 static cb_ret_t
3172 dview_callback (Widget * w, widget_msg_t msg, int parm)
3174 WDiff *dview = (WDiff *) w;
3175 Dlg_head *h = dview->widget.owner;
3176 cb_ret_t i;
3178 switch (msg)
3180 case WIDGET_INIT:
3181 dview_labels (dview);
3182 dview_load_options (dview);
3183 dview_update (dview);
3184 return MSG_HANDLED;
3186 case WIDGET_DRAW:
3187 dview->new_frame = 1;
3188 dview_update (dview);
3189 return MSG_HANDLED;
3191 case WIDGET_KEY:
3192 i = dview_handle_key (dview, parm);
3193 if (dview->view_quit)
3194 dlg_stop (h);
3195 else
3196 dview_update (dview);
3197 return i;
3199 case WIDGET_COMMAND:
3200 i = dview_execute_cmd (dview, parm);
3201 if (dview->view_quit)
3202 dlg_stop (h);
3203 else
3204 dview_update (dview);
3205 return i;
3207 case WIDGET_DESTROY:
3208 dview_save_options (dview);
3209 dview_fini (dview);
3210 return MSG_HANDLED;
3212 default:
3213 return default_proc (msg, parm);
3217 /* --------------------------------------------------------------------------------------------- */
3219 static void
3220 dview_adjust_size (Dlg_head * h)
3222 WDiff *dview;
3223 WButtonBar *bar;
3225 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3226 dview = (WDiff *) find_widget_type (h, dview_callback);
3227 bar = find_buttonbar (h);
3228 widget_set_size (&dview->widget, 0, 0, LINES - 1, COLS);
3229 widget_set_size ((Widget *) bar, LINES - 1, 0, 1, COLS);
3231 dview_compute_areas (dview);
3234 /* --------------------------------------------------------------------------------------------- */
3236 static cb_ret_t
3237 dview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
3239 WDiff *dview = (WDiff *) data;
3241 switch (msg)
3243 case DLG_RESIZE:
3244 dview_adjust_size (h);
3245 return MSG_HANDLED;
3247 case DLG_ACTION:
3248 /* shortcut */
3249 if (sender == NULL)
3250 return dview_execute_cmd (NULL, parm);
3251 /* message from buttonbar */
3252 if (sender == (Widget *) find_buttonbar (h))
3254 if (data != NULL)
3255 return send_message ((Widget *) data, WIDGET_COMMAND, parm);
3257 dview = (WDiff *) find_widget_type (h, dview_callback);
3258 return dview_execute_cmd (dview, parm);
3260 return MSG_NOT_HANDLED;
3262 case DLG_VALIDATE:
3263 dview = (WDiff *) find_widget_type (h, dview_callback);
3264 h->state = DLG_ACTIVE; /* don't stop the dialog before final decision */
3265 if (dview_ok_to_exit (dview))
3266 h->state = DLG_CLOSED;
3267 return MSG_HANDLED;
3269 default:
3270 return default_dlg_callback (h, sender, msg, parm, data);
3274 /* --------------------------------------------------------------------------------------------- */
3276 static char *
3277 dview_get_title (const Dlg_head * h, size_t len)
3279 const WDiff *dview = (const WDiff *) find_widget_type (h, dview_callback);
3280 const char *modified = dview->merged ? " (*) " : " ";
3281 size_t len1;
3282 GString *title;
3284 len1 = (len - str_term_width1 (_("Diff:")) - strlen (modified) - 3) / 2;
3286 title = g_string_sized_new (len);
3287 g_string_append (title, _("Diff:"));
3288 g_string_append (title, modified);
3289 g_string_append (title, str_term_trim (dview->label[0], len1));
3290 g_string_append (title, " | ");
3291 g_string_append (title, str_term_trim (dview->label[1], len1));
3293 return g_string_free (title, FALSE);
3296 /* --------------------------------------------------------------------------------------------- */
3298 static int
3299 diff_view (const char *file1, const char *file2, const char *label1, const char *label2)
3301 int error;
3302 WDiff *dview;
3303 Dlg_head *dview_dlg;
3305 /* Create dialog and widgets, put them on the dialog */
3306 dview_dlg =
3307 create_dlg (FALSE, 0, 0, LINES, COLS, NULL, dview_dialog_callback,
3308 "[Diff Viewer]", NULL, DLG_WANT_TAB);
3310 dview = g_new0 (WDiff, 1);
3312 init_widget (&dview->widget, 0, 0, LINES - 1, COLS,
3313 (callback_fn) dview_callback, (mouse_h) dview_event);
3315 widget_want_cursor (dview->widget, 0);
3317 add_widget (dview_dlg, dview);
3318 add_widget (dview_dlg, buttonbar_new (TRUE));
3320 dview_dlg->get_title = dview_get_title;
3322 error = dview_init (dview, "-a", file1, file2, label1, label2, DATA_SRC_MEM); /* XXX binary diff? */
3324 /* Please note that if you add another widget,
3325 * you have to modify dview_adjust_size to
3326 * be aware of it
3328 if (error == 0)
3329 run_dlg (dview_dlg);
3331 if ((error != 0) || (dview_dlg->state == DLG_CLOSED))
3332 destroy_dlg (dview_dlg);
3334 return error == 0 ? 1 : 0;
3337 /*** public functions ****************************************************************************/
3338 /* --------------------------------------------------------------------------------------------- */
3340 #define GET_FILE_AND_STAMP(n) \
3341 do \
3343 use_copy##n = 0; \
3344 real_file##n = file##n; \
3345 if (!vfs_file_is_local (file##n)) \
3347 real_file##n = mc_getlocalcopy (file##n); \
3348 if (real_file##n != NULL) \
3350 use_copy##n = 1; \
3351 if (mc_stat (real_file##n, &st##n) != 0) \
3352 use_copy##n = -1; \
3356 while (0)
3358 #define UNGET_FILE(n) \
3359 do \
3361 if (use_copy##n) \
3363 int changed = 0; \
3364 if (use_copy##n > 0) \
3366 time_t mtime; \
3367 mtime = st##n.st_mtime; \
3368 if (mc_stat (real_file##n, &st##n) == 0) \
3369 changed = (mtime != st##n.st_mtime); \
3371 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3372 vfs_path_free (real_file##n); \
3375 while (0)
3378 dview_diff_cmd (const void *f0, const void *f1)
3380 int rv = 0;
3381 vfs_path_t *file0 = NULL;
3382 vfs_path_t *file1 = NULL;
3383 gboolean is_dir0 = FALSE;
3384 gboolean is_dir1 = FALSE;
3386 switch (mc_global.mc_run_mode)
3388 case MC_RUN_FULL:
3390 /* run from panels */
3391 const WPanel *panel0 = (const WPanel *) f0;
3392 const WPanel *panel1 = (const WPanel *) f1;
3394 file0 = vfs_path_append_new (panel0->cwd_vpath, selection (panel0)->fname, NULL);
3395 is_dir0 = S_ISDIR (selection (panel0)->st.st_mode);
3396 if (is_dir0)
3398 message (D_ERROR, MSG_ERROR, _("\"%s\" is a directory"),
3399 path_trunc (selection (panel0)->fname, 30));
3400 goto ret;
3403 file1 = vfs_path_append_new (panel1->cwd_vpath, selection (panel1)->fname, NULL);
3404 is_dir1 = S_ISDIR (selection (panel1)->st.st_mode);
3405 if (is_dir1)
3407 message (D_ERROR, MSG_ERROR, _("\"%s\" is a directory"),
3408 path_trunc (selection (panel1)->fname, 30));
3409 goto ret;
3411 break;
3414 case MC_RUN_DIFFVIEWER:
3416 /* run from command line */
3417 const char *p0 = (const char *) f0;
3418 const char *p1 = (const char *) f1;
3419 struct stat st;
3421 file0 = vfs_path_from_str (p0);
3422 if (mc_stat (file0, &st) == 0)
3424 is_dir0 = S_ISDIR (st.st_mode);
3425 if (is_dir0)
3427 message (D_ERROR, MSG_ERROR, _("\"%s\" is a directory"), path_trunc (p0, 30));
3428 goto ret;
3431 else
3433 message (D_ERROR, MSG_ERROR, _("Cannot stat \"%s\"\n%s"),
3434 path_trunc (p0, 30), unix_error_string (errno));
3435 goto ret;
3438 file1 = vfs_path_from_str (p1);
3439 if (mc_stat (file1, &st) == 0)
3441 is_dir1 = S_ISDIR (st.st_mode);
3442 if (is_dir1)
3444 message (D_ERROR, MSG_ERROR, _("\"%s\" is a directory"), path_trunc (p1, 30));
3445 goto ret;
3448 else
3450 message (D_ERROR, MSG_ERROR, _("Cannot stat \"%s\"\n%s"),
3451 path_trunc (p1, 30), unix_error_string (errno));
3452 goto ret;
3454 break;
3457 default:
3458 /* this should not happaned */
3459 message (D_ERROR, MSG_ERROR, _("Diff viewer: invalid mode"));
3460 return 0;
3463 if (rv == 0)
3465 rv = -1;
3466 if (file0 != NULL && file1 != NULL)
3468 int use_copy0;
3469 int use_copy1;
3470 struct stat st0;
3471 struct stat st1;
3472 vfs_path_t *real_file0;
3473 vfs_path_t *real_file1;
3475 GET_FILE_AND_STAMP (0);
3476 GET_FILE_AND_STAMP (1);
3477 if (real_file0 != NULL && real_file1 != NULL)
3479 char *real_file0_str, *real_file1_str;
3480 char *file0_str, *file1_str;
3482 real_file0_str = vfs_path_to_str (real_file0);
3483 real_file1_str = vfs_path_to_str (real_file1);
3484 file0_str = vfs_path_to_str (file0);
3485 file1_str = vfs_path_to_str (file1);
3486 rv = diff_view (real_file0_str, real_file1_str, file0_str, file1_str);
3487 g_free (real_file0_str);
3488 g_free (real_file1_str);
3489 g_free (file0_str);
3490 g_free (file1_str);
3492 UNGET_FILE (1);
3493 UNGET_FILE (0);
3497 if (rv == 0)
3498 message (D_ERROR, MSG_ERROR, _("Two files are needed to compare"));
3500 ret:
3501 vfs_path_free (file1);
3502 vfs_path_free (file0);
3504 return (rv != 0) ? 1 : 0;
3507 /* --------------------------------------------------------------------------------------------- */
3509 void
3510 dview_update (WDiff * dview)
3512 int height = dview->height;
3513 int width1;
3514 int width2;
3516 int last = dview->a[0]->len - 1;
3518 if (dview->skip_rows > last)
3520 dview->skip_rows = dview->search.last_accessed_num_line = last;
3522 if (dview->skip_rows < 0)
3524 dview->skip_rows = dview->search.last_accessed_num_line = 0;
3526 if (dview->skip_cols < 0)
3528 dview->skip_cols = 0;
3531 if (height < 2)
3533 return;
3536 width1 = dview->half1 + dview->bias;
3537 width2 = dview->half2 - dview->bias;
3538 if (dview->full)
3540 width1 = COLS;
3541 width2 = 0;
3544 if (dview->new_frame)
3546 int xwidth = dview->display_symbols + dview->display_numbers;
3548 tty_setcolor (NORMAL_COLOR);
3549 if (width1 > 1)
3551 tty_draw_box (1, 0, height, width1, FALSE);
3553 if (width2 > 1)
3555 tty_draw_box (1, width1, height, width2, FALSE);
3558 if (xwidth)
3560 xwidth++;
3561 if (xwidth < width1 - 1)
3563 tty_gotoyx (1, xwidth);
3564 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE);
3565 tty_gotoyx (height, xwidth);
3566 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE);
3567 tty_draw_vline (2, xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2);
3569 if (xwidth < width2 - 1)
3571 tty_gotoyx (1, width1 + xwidth);
3572 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DTOPMIDDLE], FALSE);
3573 tty_gotoyx (height, width1 + xwidth);
3574 tty_print_alt_char (mc_tty_frm[MC_TTY_FRM_DBOTTOMMIDDLE], FALSE);
3575 tty_draw_vline (2, width1 + xwidth, mc_tty_frm[MC_TTY_FRM_VERT], height - 2);
3578 dview->new_frame = 0;
3581 if (width1 > 2)
3583 dview_status (dview, dview->ord, width1, 0);
3584 dview_display_file (dview, dview->ord, 2, 1, height - 2, width1 - 2);
3586 if (width2 > 2)
3588 dview_status (dview, dview->ord ^ 1, width2, width1);
3589 dview_display_file (dview, dview->ord ^ 1, 2, width1 + 1, height - 2, width2 - 2);
3593 /* --------------------------------------------------------------------------------------------- */