4 Copyright (C) 2007-2025
5 Free Software Foundation, Inc.
8 Daniel Borca <dborca@yahoo.com>, 2007
9 Slava Zanko <slavazanko@gmail.com>, 2010, 2013
10 Andrew Borodin <aborodin@vmail.ru>, 2010-2022
11 Ilia Maslakov <il.smind@gmail.com>, 2010
13 This file is part of the Midnight Commander.
15 The Midnight Commander is free software: you can redistribute it
16 and/or modify it under the terms of the GNU General Public License as
17 published by the Free Software Foundation, either version 3 of the License,
18 or (at your option) any later version.
20 The Midnight Commander is distributed in the hope that it will be useful,
21 but WITHOUT ANY WARRANTY; without even the implied warranty of
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 GNU General Public License for more details.
25 You should have received a copy of the GNU General Public License
26 along with this program. If not, see <https://www.gnu.org/licenses/>.
33 #include <stddef.h> // ptrdiff_t
36 #include <sys/types.h>
39 #include "lib/global.h"
40 #include "lib/tty/tty.h"
41 #include "lib/tty/color.h"
42 #include "lib/tty/key.h"
43 #include "lib/skin.h" // EDITOR_NORMAL_COLOR
44 #include "lib/vfs/vfs.h"
46 #include "lib/widget.h"
47 #include "lib/strutil.h"
49 # include "lib/charsets.h"
51 #include "lib/event.h" // mc_event_raise()
53 #include "src/filemanager/cmd.h" // edit_file_at_line()
54 #include "src/filemanager/panel.h"
55 #include "src/filemanager/layout.h" // Needed for get_current_index and get_other_panel
57 #include "src/execute.h" // toggle_subshell()
58 #include "src/keymap.h"
59 #include "src/setup.h"
60 #include "src/history.h"
62 # include "src/selcodepage.h"
68 /*** global variables ****************************************************************************/
70 /*** file scope macro definitions ****************************************************************/
72 #define FILE_READ_BUF 4096
73 #define FILE_FLAG_TEMP (1 << 0)
80 #define HDIFF_ENABLE 1
81 #define HDIFF_MINCTX 5
82 #define HDIFF_DEPTH 10
84 #define FILE_DIRTY(fs) \
92 /*** file scope type declarations ****************************************************************/
100 /*** forward declarations (file scope functions) *************************************************/
102 /*** file scope variables ************************************************************************/
104 /* --------------------------------------------------------------------------------------------- */
105 /*** file scope functions ************************************************************************/
106 /* --------------------------------------------------------------------------------------------- */
109 TAB_SKIP (int ts
, int pos
)
111 if (ts
> 0 && ts
< 9)
112 return ts
- pos
% ts
;
117 /* --------------------------------------------------------------------------------------------- */
120 * Fill buffer by spaces
123 * @param n number of spaces
124 * @param zero_terminate add a nul after @n spaces
127 fill_by_space (char *buf
, size_t n
, gboolean zero_terminate
)
129 memset (buf
, ' ', n
);
134 /* --------------------------------------------------------------------------------------------- */
137 rewrite_backup_content (const vfs_path_t
*from_file_name_vpath
, const char *to_file_name
)
142 const char *from_file_name
;
144 from_file_name
= vfs_path_get_last_path_str (from_file_name_vpath
);
145 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
148 backup_fd
= fopen (to_file_name
, "w");
149 if (backup_fd
== NULL
)
155 length
= fwrite ((const void *) contents
, length
, 1, backup_fd
);
163 /* buffered I/O ************************************************************* */
166 * Try to open a temporary file.
167 * @note the name is not altered if this function fails
169 * @param[out] name address of a pointer to store the temporary name
170 * @return file descriptor on success, negative on error
174 open_temp (void **name
)
177 vfs_path_t
*diff_file_name
= NULL
;
179 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
182 message (D_ERROR
, MSG_ERROR
, _ ("Cannot create temporary diff file\n%s"),
183 unix_error_string (errno
));
187 *name
= vfs_path_free (diff_file_name
, FALSE
);
191 /* --------------------------------------------------------------------------------------------- */
194 * Allocate file structure and associate file descriptor to it.
196 * @param fd file descriptor
197 * @return file structure
201 dview_fdopen (int fd
)
208 fs
= g_try_malloc (sizeof (FBUF
));
212 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
227 /* --------------------------------------------------------------------------------------------- */
230 * Free file structure without closing the file.
232 * @param fs file structure
233 * @return 0 on success, non-zero on error
237 dview_ffree (FBUF
*fs
)
241 if ((fs
->flags
& FILE_FLAG_TEMP
) != 0)
243 rv
= unlink (fs
->data
);
251 /* --------------------------------------------------------------------------------------------- */
254 * Open a binary temporary file in R/W mode.
255 * @note the file will be deleted when closed
257 * @return file structure
265 fs
= dview_fdopen (0);
269 fd
= open_temp (&fs
->data
);
277 fs
->flags
= FILE_FLAG_TEMP
;
281 /* --------------------------------------------------------------------------------------------- */
284 * Open a binary file in specified mode.
286 * @param filename file name
287 * @param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
289 * @return file structure
293 dview_fopen (const char *filename
, int flags
)
298 fs
= dview_fdopen (0);
302 fd
= open (filename
, flags
);
313 /* --------------------------------------------------------------------------------------------- */
316 * Read a line of bytes from file until newline or EOF.
317 * @note does not stop on null-byte
318 * @note buf will not be null-terminated
320 * @param buf destination buffer
321 * @param size size of buffer
322 * @param fs file structure
324 * @return number of bytes read
328 dview_fgets (char *buf
, size_t size
, FBUF
*fs
)
335 gboolean stop
= FALSE
;
337 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
345 if (j
== size
|| stop
)
349 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
356 /* --------------------------------------------------------------------------------------------- */
360 * @note avoids thrashing read cache when possible
362 * @param fs file structure
364 * @param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
366 * @return position in file, starting from beginning
370 dview_fseek (FBUF
*fs
, off_t off
, int whence
)
374 if (fs
->len
!= 0 && whence
!= SEEK_END
)
376 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
379 if (whence
== SEEK_CUR
)
382 off
+= rv
- fs
->len
+ fs
->pos
;
384 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
386 fs
->pos
= fs
->len
+ off
- rv
;
392 rv
= lseek (fs
->fd
, off
, whence
);
398 /* --------------------------------------------------------------------------------------------- */
401 * Seek to the beginning of file, thrashing read cache.
403 * @param fs file structure
405 * @return 0 if success, non-zero on error
409 dview_freset (FBUF
*fs
)
413 rv
= lseek (fs
->fd
, 0, SEEK_SET
);
419 /* --------------------------------------------------------------------------------------------- */
422 * Write bytes to file.
423 * @note thrashes read cache
425 * @param fs file structure
426 * @param buf source buffer
427 * @param size size of buffer
429 * @return number of written bytes, -1 on error
433 dview_fwrite (FBUF
*fs
, const char *buf
, size_t size
)
437 rv
= write (fs
->fd
, buf
, size
);
443 /* --------------------------------------------------------------------------------------------- */
446 * Truncate file to the current position.
447 * @note thrashes read cache
449 * @param fs file structure
451 * @return current file size on success, negative on error
455 dview_ftrunc (FBUF
*fs
)
459 off
= lseek (fs
->fd
, 0, SEEK_CUR
);
464 rv
= ftruncate (fs
->fd
, off
);
473 /* --------------------------------------------------------------------------------------------- */
477 * @note if this is temporary file, it is deleted
479 * @param fs file structure
480 * @return 0 on success, non-zero on error
484 dview_fclose (FBUF
*fs
)
497 /* --------------------------------------------------------------------------------------------- */
500 * Create pipe stream to process.
502 * @param cmd shell command line
503 * @param flags open mode, either O_RDONLY or O_WRONLY
505 * @return file structure
509 dview_popen (const char *cmd
, int flags
)
513 const char *type
= NULL
;
515 if (flags
== O_RDONLY
)
517 else if (flags
== O_WRONLY
)
523 fs
= dview_fdopen (0);
527 f
= popen (cmd
, type
);
539 /* --------------------------------------------------------------------------------------------- */
544 * @param fs structure
545 * @return 0 on success, non-zero on error
549 dview_pclose (FBUF
*fs
)
555 rv
= pclose (fs
->data
);
562 /* --------------------------------------------------------------------------------------------- */
565 * Get one char (byte) from string
569 * @return TRUE on success, FALSE otherwise
573 dview_get_byte (const char *str
, int *ch
)
578 *ch
= (unsigned char) (*str
);
582 /* --------------------------------------------------------------------------------------------- */
586 * Get utf multibyte char from string
590 * @param ch_length ...
591 * @return TRUE on success, FALSE otherwise
595 dview_get_utf (const char *str
, int *ch
, int *ch_length
)
600 *ch
= g_utf8_get_char_validated (str
, -1);
604 *ch
= (unsigned char) (*str
);
611 // Calculate UTF-8 char length
612 next_ch
= g_utf8_next_char (str
);
613 *ch_length
= next_ch
- str
;
619 /* --------------------------------------------------------------------------------------------- */
622 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
626 if (text
== NULL
|| text
[0] == '\0')
629 if (g_utf8_validate (text
, -1, NULL
))
630 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
634 char *tmpbuf
, *buffer
;
636 buffer
= tmpbuf
= g_strdup (text
);
637 while (tmpbuf
[0] != '\0')
639 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
640 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
641 tmpbuf
= g_utf8_next_char (tmpbuf
);
648 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
651 return MAX (length
, (size_t) result
);
655 /* --------------------------------------------------------------------------------------------- */
657 /* diff parse *************************************************************** */
660 * Read decimal number from string.
662 * @param[in,out] str string to parse
663 * @param[out] n extracted number
664 * @return 0 if success, otherwise non-zero
668 scan_deci (const char **str
, int *n
)
670 const char *p
= *str
;
674 *n
= strtol (p
, &q
, 10);
675 if (errno
!= 0 || p
== q
)
681 /* --------------------------------------------------------------------------------------------- */
684 * Parse line for diff statement.
686 * @param p string to parse
687 * @param ops list of diff statements
688 * @return 0 if success, otherwise non-zero
692 scan_line (const char *p
, GArray
*ops
)
699 gboolean range
= FALSE
;
701 /* handle the following cases:
703 * NUM[,NUM]cNUM[,NUM]
705 * where NUM is a positive integer
708 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
715 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
727 else if (cmd
!= 'c' && cmd
!= 'd')
730 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
738 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
744 if (cmd
== 'd' && range
)
752 g_array_append_val (ops
, op
);
756 /* --------------------------------------------------------------------------------------------- */
759 * Parse diff output and extract diff statements.
761 * @param f stream to read from
762 * @param ops list of diff statements to fill
763 * @return positive number indicating number of hunks, otherwise negative
767 scan_diff (FBUF
*f
, GArray
*ops
)
772 while ((sz
= dview_fgets (buf
, sizeof (buf
) - 1, f
)) != 0)
774 if (isdigit (buf
[0]))
776 if (buf
[sz
- 1] != '\n')
780 if (scan_line (buf
, ops
) != 0)
784 while (buf
[sz
- 1] != '\n' && (sz
= dview_fgets (buf
, sizeof (buf
), f
)) != 0)
791 /* --------------------------------------------------------------------------------------------- */
794 * Invoke diff and extract diff statements.
796 * @param args extra arguments to be passed to diff
797 * @param extra more arguments to be passed to diff
798 * @param file1 first file to compare
799 * @param file2 second file to compare
800 * @param ops list of diff statements to fill
802 * @return positive number indicating number of hunks, otherwise negative
806 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
, GArray
*ops
)
808 static const char *opt
= " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
809 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
810 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
811 " --unchanged-group-format=''";
817 char *file1_esc
, *file2_esc
;
819 // escape potential $ to avoid shell variable substitutions in popen()
820 file1_esc
= str_shell_escape (file1
);
821 file2_esc
= str_shell_escape (file2
);
822 cmd
= g_strdup_printf ("diff %s %s %s %s %s", args
, extra
, opt
, file1_esc
, file2_esc
);
829 f
= dview_popen (cmd
, O_RDONLY
);
835 rv
= scan_diff (f
, ops
);
836 code
= dview_pclose (f
);
838 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
844 /* --------------------------------------------------------------------------------------------- */
847 printer_for (char ch
, DFUNC printer
, void *ctx
, FBUF
*f
, int *line
, off_t
*off
)
852 sz
= dview_fgets (buf
, sizeof (buf
), f
);
857 printer (ctx
, ch
, *line
, *off
, sz
, buf
);
860 while (buf
[sz
- 1] != '\n')
862 sz
= dview_fgets (buf
, sizeof (buf
), f
);
865 printer (ctx
, 0, 0, 0, 1, "\n");
869 printer (ctx
, 0, 0, 0, sz
, buf
);
876 /* --------------------------------------------------------------------------------------------- */
879 * Reparse and display file according to diff statements.
881 * @param ord DIFF_LEFT if 1st file is displayed , DIFF_RIGHT if 2nd file is displayed.
882 * @param filename file name to display
883 * @param ops list of diff statements
884 * @param printer printf-like function to be used for displaying
885 * @param ctx printer context
887 * @return 0 if success, otherwise non-zero
891 dff_reparse (diff_place_t ord
, const char *filename
, const GArray
*ops
, DFUNC printer
, void *ctx
)
899 int add_cmd
, del_cmd
;
901 f
= dview_fopen (filename
, O_RDONLY
);
905 if (ord
!= DIFF_LEFT
)
909 if (ord
!= DIFF_LEFT
)
921 #define T1 a[ord ^ 1][0]
922 #define T2 a[ord ^ 1][1]
923 for (i
= 0; i
< ops
->len
; i
++)
927 op
= &g_array_index (ops
, DIFFCMD
, i
);
930 if (op
->cmd
!= add_cmd
)
933 while (line
< n
&& printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
939 if (op
->cmd
== add_cmd
)
940 for (n
= op
->T2
- op
->T1
+ 1; n
!= 0; n
--)
941 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
943 if (op
->cmd
== del_cmd
)
945 for (n
= op
->F2
- op
->F1
+ 1;
946 n
!= 0 && printer_for (ADD_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
955 for (n
= op
->F2
- op
->F1
+ 1;
956 n
!= 0 && printer_for (CHG_CH
, printer
, ctx
, f
, &line
, &off
); n
--)
962 for (n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
); n
> 0; n
--)
963 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
971 while (printer_for (EQU_CH
, printer
, ctx
, f
, &line
, &off
))
982 /* --------------------------------------------------------------------------------------------- */
984 /* horizontal diff ********************************************************** */
987 * Longest common substring.
989 * @param s first string
990 * @param m length of first string
991 * @param t second string
992 * @param n length of second string
993 * @param ret list of offsets for longest common substrings inside each string
994 * @param min minimum length of common substrings
996 * @return 0 if success, nonzero otherwise
1000 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
*ret
, int min
)
1006 if (m
< min
|| n
< min
)
1008 // XXX early culling
1012 Lprev
= g_try_new0 (int, n
+ 1);
1016 Lcurr
= g_try_new0 (int, n
+ 1);
1023 for (i
= 0; i
< m
; i
++)
1030 #ifdef USE_MEMSET_IN_LCS
1031 memset (Lcurr
, 0, (n
+ 1) * sizeof (*Lcurr
));
1033 for (j
= 0; j
< n
; j
++)
1035 #ifndef USE_MEMSET_IN_LCS
1047 g_array_set_size (ret
, 0);
1049 if (z
== v
&& z
>= min
)
1057 for (k
= 0; k
< ret
->len
; k
++)
1059 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1060 if ((*p
)[0] == off0
|| (*p
)[1] >= off1
)
1069 g_array_append_val (ret
, p2
);
1081 /* --------------------------------------------------------------------------------------------- */
1084 * Scan recursively for common substrings and build ranges.
1086 * @param s first string
1087 * @param t second string
1088 * @param bracket current limits for both of the strings
1089 * @param min minimum length of common substrings
1090 * @param hdiff list of horizontal diff ranges to fill
1091 * @param depth recursion depth
1093 * @return 0 if success, nonzero otherwise
1097 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
*hdiff
,
1108 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1110 len
= lcsubstr (s
+ bracket
[DIFF_LEFT
].off
, bracket
[DIFF_LEFT
].len
,
1111 t
+ bracket
[DIFF_RIGHT
].off
, bracket
[DIFF_RIGHT
].len
, ret
, min
);
1115 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1118 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1119 b
[DIFF_LEFT
].len
= (*data
)[0];
1120 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1121 b
[DIFF_RIGHT
].len
= (*data
)[1];
1122 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1125 for (k
= 0; k
< ret
->len
- 1; k
++)
1127 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1128 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1129 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1130 b
[DIFF_LEFT
].len
= (*data2
)[0] - (*data
)[0] - len
;
1131 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1132 b
[DIFF_RIGHT
].len
= (*data2
)[1] - (*data
)[1] - len
;
1133 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1136 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1137 b
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
+ (*data
)[0] + len
;
1138 b
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
- (*data
)[0] - len
;
1139 b
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
+ (*data
)[1] + len
;
1140 b
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
- (*data
)[1] - len
;
1141 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1144 g_array_free (ret
, TRUE
);
1149 p
[DIFF_LEFT
].off
= bracket
[DIFF_LEFT
].off
;
1150 p
[DIFF_LEFT
].len
= bracket
[DIFF_LEFT
].len
;
1151 p
[DIFF_RIGHT
].off
= bracket
[DIFF_RIGHT
].off
;
1152 p
[DIFF_RIGHT
].len
= bracket
[DIFF_RIGHT
].len
;
1153 g_array_append_val (hdiff
, p
);
1158 /* --------------------------------------------------------------------------------------------- */
1161 * Build list of horizontal diff ranges.
1163 * @param s first string
1164 * @param m length of first string
1165 * @param t second string
1166 * @param n length of second string
1167 * @param min minimum length of common substrings
1168 * @param hdiff list of horizontal diff ranges to fill
1169 * @param depth recursion depth
1171 * @return 0 if success, nonzero otherwise
1175 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
*hdiff
, unsigned int depth
)
1180 // dumbscan (single horizontal diff) -- does not compress whitespace
1181 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1183 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1186 b
[DIFF_LEFT
].off
= i
;
1187 b
[DIFF_LEFT
].len
= m
- i
;
1188 b
[DIFF_RIGHT
].off
= i
;
1189 b
[DIFF_RIGHT
].len
= n
- i
;
1191 // smartscan (multiple horizontal diff)
1192 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1195 /* --------------------------------------------------------------------------------------------- */
1197 /* read line **************************************************************** */
1200 * Check if character is inside horizontal diff limits.
1202 * @param k rank of character inside line
1203 * @param hdiff horizontal diff structure
1204 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1206 * @return TRUE if inside hdiff limits, FALSE otherwise
1210 is_inside (int k
, GArray
*hdiff
, diff_place_t ord
)
1215 for (i
= 0; i
< hdiff
->len
; i
++)
1219 b
= &g_array_index (hdiff
, BRACKET
, i
);
1220 start
= (*b
)[ord
].off
;
1221 end
= start
+ (*b
)[ord
].len
;
1222 if (k
>= start
&& k
< end
)
1228 /* --------------------------------------------------------------------------------------------- */
1231 * Copy 'src' to 'dst' expanding tabs.
1232 * @note The procedure returns when all bytes are consumed from 'src'
1234 * @param dst destination buffer
1235 * @param src source buffer
1236 * @param srcsize size of src buffer
1237 * @param base virtual base of this string, needed to calculate tabs
1238 * @param ts tab size
1240 * @return new virtual base
1244 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1248 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1255 j
= TAB_SKIP (ts
, i
+ base
);
1257 fill_by_space (dst
, j
, FALSE
);
1264 /* --------------------------------------------------------------------------------------------- */
1267 * Copy 'src' to 'dst' expanding tabs.
1269 * @param dst destination buffer
1270 * @param dstsize size of dst buffer
1271 * @param[in,out] _src source buffer
1272 * @param srcsize size of src buffer
1273 * @param base virtual base of this string, needed to calculate tabs
1274 * @param ts tab size
1276 * @return new virtual base
1278 * @note The procedure returns when all bytes are consumed from 'src'
1279 * or 'dstsize' bytes are written to 'dst'
1280 * @note Upon return, 'src' points to the first unwritten character in source
1284 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1287 const char *src
= *_src
;
1289 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1296 j
= TAB_SKIP (ts
, i
+ base
);
1297 if (j
> dstsize
- i
)
1300 fill_by_space (dst
, j
, FALSE
);
1308 /* --------------------------------------------------------------------------------------------- */
1311 * Read line from memory, converting tabs to spaces and padding with spaces.
1313 * @param src buffer to read from
1314 * @param srcsize size of src buffer
1315 * @param dst buffer to read to
1316 * @param dstsize size of dst buffer, excluding trailing null
1317 * @param skip number of characters to skip
1318 * @param ts tab size
1319 * @param show_cr show trailing carriage return as ^M
1321 * @return negative on error, otherwise number of bytes except padding
1325 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1336 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1342 j
= TAB_SKIP (ts
, i
+ base
);
1348 else if (dstsize
!= 0)
1355 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1357 if (skip
== 0 && show_cr
)
1379 (void) dview_get_utf (src
, &ch
, &ch_length
);
1382 skip
+= ch_length
- 1;
1396 fill_by_space (dst
, dstsize
, TRUE
);
1401 /* --------------------------------------------------------------------------------------------- */
1404 * Read line from memory and build attribute array.
1406 * @param src buffer to read from
1407 * @param srcsize size of src buffer
1408 * @param dst buffer to read to
1409 * @param dstsize size of dst buffer, excluding trailing null
1410 * @param skip number of characters to skip
1411 * @param ts tab size
1412 * @param show_cr show trailing carriage return as ^M
1413 * @param hdiff horizontal diff structure
1414 * @param ord DIFF_LEFT if reading from first file, DIFF_RIGHT if reading from 2nd file
1415 * @param att buffer of attributes
1417 * @return negative on error, otherwise number of bytes except padding
1421 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
,
1422 gboolean show_cr
, GArray
*hdiff
, diff_place_t ord
, char *att
)
1432 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1438 j
= TAB_SKIP (ts
, i
+ base
);
1444 else if (dstsize
!= 0)
1447 *att
++ = is_inside (k
, hdiff
, ord
);
1452 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1454 if (skip
== 0 && show_cr
)
1459 *att
++ = is_inside (k
, hdiff
, ord
);
1461 *att
++ = is_inside (k
, hdiff
, ord
);
1467 *att
++ = is_inside (k
, hdiff
, ord
);
1479 (void) dview_get_utf (src
, &ch
, &ch_length
);
1481 skip
+= ch_length
- 1;
1489 *att
++ = is_inside (k
, hdiff
, ord
);
1496 memset (att
, '\0', dstsize
);
1497 fill_by_space (dst
, dstsize
, TRUE
);
1502 /* --------------------------------------------------------------------------------------------- */
1505 * Read line from file, converting tabs to spaces and padding with spaces.
1507 * @param f file stream to read from
1508 * @param off offset of line inside file
1509 * @param dst buffer to read to
1510 * @param dstsize size of dst buffer, excluding trailing null
1511 * @param skip number of characters to skip
1512 * @param ts tab size
1513 * @param show_cr show trailing carriage return as ^M
1515 * @return negative on error, otherwise number of bytes except padding
1519 cvt_fget (FBUF
*f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, gboolean show_cr
)
1522 int old_base
= base
;
1523 size_t amount
= dstsize
;
1524 size_t useful
, offset
;
1528 const char *q
= NULL
;
1529 char tmp
[BUFSIZ
]; // XXX capacity must be >= MAX{dstsize + 1, amount}
1530 char cvt
[BUFSIZ
]; // XXX capacity must be >= MAX_TAB_WIDTH * amount
1532 if (sizeof (tmp
) < amount
|| sizeof (tmp
) <= dstsize
|| sizeof (cvt
) < 8 * amount
)
1534 // abnormal, but avoid buffer overflow
1535 fill_by_space (dst
, dstsize
, TRUE
);
1539 dview_fseek (f
, off
, SEEK_SET
);
1544 sz
= dview_fgets (tmp
, amount
, f
);
1548 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1549 if (cvt
[base
- old_base
- 1] == '\n')
1551 q
= &cvt
[base
- old_base
- 1];
1552 base
= old_base
+ q
- cvt
+ 1;
1559 fill_by_space (dst
, dstsize
, TRUE
);
1563 useful
= base
- skip
;
1564 offset
= skip
- old_base
;
1566 if (useful
<= dstsize
)
1569 memmove (dst
, cvt
+ offset
, useful
);
1573 sz
= dview_fgets (tmp
, dstsize
- useful
+ 1, f
);
1576 const char *ptr
= tmp
;
1578 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1587 memmove (dst
, cvt
+ offset
, dstsize
);
1589 lastch
= cvt
[offset
+ dstsize
];
1593 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1594 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1598 if (i
+ 1 < dstsize
)
1609 fill_by_space (dst
, dstsize
, TRUE
);
1614 /* --------------------------------------------------------------------------------------------- */
1615 /* diff printers et al ****************************************************** */
1618 cc_free_elt (gpointer elt
)
1620 DIFFLN
*p
= (DIFFLN
*) elt
;
1626 /* --------------------------------------------------------------------------------------------- */
1629 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1631 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1632 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1642 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1644 if (sz
!= 0 && str
[sz
- 1] == '\n')
1647 p
.p
= g_strndup (str
, sz
);
1650 g_array_append_val (a
, p
);
1652 else if (dsrc
== DATA_SRC_MEM
)
1656 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1657 if (sz
!= 0 && str
[sz
- 1] == '\n')
1664 new_size
= p
->u
.len
+ sz
;
1665 q
= g_realloc (p
->p
, new_size
);
1666 memcpy (q
+ p
->u
.len
, str
, sz
);
1671 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1673 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1674 dview_fwrite (f
, str
, sz
);
1679 /* --------------------------------------------------------------------------------------------- */
1682 redo_diff (WDiff
*dview
)
1684 FBUF
*const *f
= dview
->f
;
1689 char extra
[BUF_MEDIUM
];
1692 if (dview
->opt
.quality
== 2)
1693 strcat (extra
, " -d");
1694 if (dview
->opt
.quality
== 1)
1695 strcat (extra
, " --speed-large-files");
1696 if (dview
->opt
.strip_trailing_cr
)
1697 strcat (extra
, " --strip-trailing-cr");
1698 if (dview
->opt
.ignore_tab_expansion
)
1699 strcat (extra
, " -E");
1700 if (dview
->opt
.ignore_space_change
)
1701 strcat (extra
, " -b");
1702 if (dview
->opt
.ignore_all_space
)
1703 strcat (extra
, " -w");
1704 if (dview
->opt
.ignore_case
)
1705 strcat (extra
, " -i");
1707 if (dview
->dsrc
!= DATA_SRC_MEM
)
1709 dview_freset (f
[DIFF_LEFT
]);
1710 dview_freset (f
[DIFF_RIGHT
]);
1713 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1714 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[DIFF_LEFT
], dview
->file
[DIFF_RIGHT
], ops
);
1718 g_array_free (ops
, TRUE
);
1722 ctx
.dsrc
= dview
->dsrc
;
1723 ctx
.a
= dview
->a
[DIFF_LEFT
];
1724 ctx
.f
= f
[DIFF_LEFT
];
1725 rv
|= dff_reparse (DIFF_LEFT
, dview
->file
[DIFF_LEFT
], ops
, printer
, &ctx
);
1727 ctx
.a
= dview
->a
[DIFF_RIGHT
];
1728 ctx
.f
= f
[DIFF_RIGHT
];
1729 rv
|= dff_reparse (DIFF_RIGHT
, dview
->file
[DIFF_RIGHT
], ops
, printer
, &ctx
);
1732 g_array_free (ops
, TRUE
);
1734 if (rv
!= 0 || dview
->a
[DIFF_LEFT
]->len
!= dview
->a
[DIFF_RIGHT
]->len
)
1737 if (dview
->dsrc
== DATA_SRC_TMP
)
1739 dview_ftrunc (f
[DIFF_LEFT
]);
1740 dview_ftrunc (f
[DIFF_RIGHT
]);
1743 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1747 dview
->hdiff
= g_ptr_array_new ();
1749 for (i
= 0; i
< dview
->a
[DIFF_LEFT
]->len
; i
++)
1755 p
= &g_array_index (dview
->a
[DIFF_LEFT
], DIFFLN
, i
);
1756 q
= &g_array_index (dview
->a
[DIFF_RIGHT
], DIFFLN
, i
);
1757 if (p
->line
!= 0 && q
->line
!= 0 && p
->ch
== CHG_CH
)
1761 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1764 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
, HDIFF_DEPTH
);
1767 g_array_free (h
, TRUE
);
1772 g_ptr_array_add (dview
->hdiff
, h
);
1778 /* --------------------------------------------------------------------------------------------- */
1781 destroy_hdiff (WDiff
*dview
)
1783 if (dview
->hdiff
!= NULL
)
1788 len
= dview
->a
[DIFF_LEFT
]->len
;
1790 for (i
= 0; i
< len
; i
++)
1794 h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1796 g_array_free (h
, TRUE
);
1798 g_ptr_array_free (dview
->hdiff
, TRUE
);
1799 dview
->hdiff
= NULL
;
1802 mc_search_free (dview
->search
.handle
);
1803 dview
->search
.handle
= NULL
;
1804 MC_PTR_FREE (dview
->search
.last_string
);
1807 /* --------------------------------------------------------------------------------------------- */
1808 /* stuff ******************************************************************** */
1811 get_digits (unsigned int n
)
1815 while ((n
/= 10) != 0)
1820 /* --------------------------------------------------------------------------------------------- */
1823 get_line_numbers (const GArray
*a
, size_t pos
, int *linenum
, int *lineofs
)
1835 p
= &g_array_index (a
, DIFFLN
, pos
);
1841 for (n
= pos
; n
> 0; n
--)
1847 *lineofs
= pos
- n
+ 1;
1855 /* --------------------------------------------------------------------------------------------- */
1858 calc_nwidth (const GArray
*const *a
)
1863 get_line_numbers (a
[DIFF_LEFT
], a
[DIFF_LEFT
]->len
- 1, &l1
, &o1
);
1864 get_line_numbers (a
[DIFF_RIGHT
], a
[DIFF_RIGHT
]->len
- 1, &l2
, &o2
);
1867 return get_digits (l1
);
1870 /* --------------------------------------------------------------------------------------------- */
1873 find_prev_hunk (const GArray
*a
, int pos
)
1876 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1878 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
--)
1880 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1882 if (pos
> 0 && (size_t) pos
< a
->len
)
1885 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
; pos
--)
1887 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
; pos
--)
1894 /* --------------------------------------------------------------------------------------------- */
1897 find_next_hunk (const GArray
*a
, size_t pos
)
1899 for (; pos
< a
->len
&& ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1901 for (; pos
< a
->len
&& ((DIFFLN
*) &g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
; pos
++)
1906 /* --------------------------------------------------------------------------------------------- */
1908 * Find start and end lines of the current hunk.
1910 * @param dview WDiff widget
1911 * @return boolean and
1912 * start_line1 first line of current hunk (file[0])
1913 * end_line1 last line of current hunk (file[0])
1914 * start_line1 first line of current hunk (file[0])
1915 * end_line1 last line of current hunk (file[0])
1919 get_current_hunk (WDiff
*dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
1921 const GArray
*a0
= dview
->a
[DIFF_LEFT
];
1922 const GArray
*a1
= dview
->a
[DIFF_RIGHT
];
1936 pos
= dview
->skip_rows
;
1937 ch
= ((DIFFLN
*) &g_array_index (a0
, DIFFLN
, pos
))->ch
;
1955 for (; pos
> 0 && ((DIFFLN
*) &g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
--)
1959 *start_line1
= ((DIFFLN
*) &g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
1960 *start_line2
= ((DIFFLN
*) &g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
1963 for (pos
= dview
->skip_rows
;
1964 pos
< a0
->len
&& ((DIFFLN
*) &g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
; pos
++)
1968 l0
= ((DIFFLN
*) &g_array_index (a0
, DIFFLN
, pos
))->line
;
1969 l1
= ((DIFFLN
*) &g_array_index (a1
, DIFFLN
, pos
))->line
;
1971 *end_line1
= MAX (*start_line1
, l0
);
1973 *end_line2
= MAX (*start_line2
, l1
);
1979 /* --------------------------------------------------------------------------------------------- */
1981 * Remove hunk from file.
1983 * @param dview WDiff widget
1984 * @param merge_file file stream for writing data
1985 * @param from1 first line of hunk
1986 * @param to1 last line of hunk
1987 * @param merge_direction in what direction files should be merged
1991 dview_remove_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int to1
,
1992 action_direction_t merge_direction
)
1998 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
1999 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2001 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2003 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2004 fputs (buf
, merge_file
);
2006 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2010 fputs (buf
, merge_file
);
2015 /* --------------------------------------------------------------------------------------------- */
2019 * @param dview WDiff widget
2020 * @param merge_file file stream for writing data
2021 * @param from1 first line of source hunk
2022 * @param from2 first line of destination hunk
2023 * @param to1 last line of source hunk
2024 * @param merge_direction in what direction files should be merged
2028 dview_add_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int from2
, int to2
,
2029 action_direction_t merge_direction
)
2035 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2037 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2038 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2042 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2043 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2046 for (line
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1; line
++)
2047 fputs (buf
, merge_file
);
2048 for (line
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
;)
2052 fputs (buf
, merge_file
);
2054 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2055 fputs (buf
, merge_file
);
2061 /* --------------------------------------------------------------------------------------------- */
2063 * Replace hunk in file.
2065 * @param dview WDiff widget
2066 * @param merge_file file stream for writing data
2067 * @param from1 first line of source hunk
2068 * @param to1 last line of source hunk
2069 * @param from2 first line of destination hunk
2070 * @param to2 last line of destination hunk
2071 * @param merge_direction in what direction files should be merged
2075 dview_replace_hunk (WDiff
*dview
, FILE *merge_file
, int from1
, int to1
, int from2
, int to2
,
2076 action_direction_t merge_direction
)
2082 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2084 f0
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2085 f1
= fopen (dview
->file
[DIFF_LEFT
], "r");
2089 f0
= fopen (dview
->file
[DIFF_LEFT
], "r");
2090 f1
= fopen (dview
->file
[DIFF_RIGHT
], "r");
2093 for (line1
= 0; fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1; line1
++)
2094 fputs (buf
, merge_file
);
2095 for (line2
= 0; fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
;)
2099 fputs (buf
, merge_file
);
2101 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2105 fputs (buf
, merge_file
);
2111 /* --------------------------------------------------------------------------------------------- */
2115 * @param dview WDiff widget
2116 * @param merge_direction in what direction files should be merged
2120 do_merge_hunk (WDiff
*dview
, action_direction_t merge_direction
)
2122 int from1
, to1
, from2
, to2
;
2124 diff_place_t n_merge
= (merge_direction
== FROM_RIGHT_TO_LEFT
) ? DIFF_RIGHT
: DIFF_LEFT
;
2126 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2127 hunk
= get_current_hunk (dview
, &from2
, &to2
, &from1
, &to1
);
2129 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2135 vfs_path_t
*merge_file_name_vpath
= NULL
;
2137 if (!dview
->merged
[n_merge
])
2139 dview
->merged
[n_merge
] = mc_util_make_backup_if_possible (dview
->file
[n_merge
], "~~~");
2140 if (!dview
->merged
[n_merge
])
2142 message (D_ERROR
, MSG_ERROR
, _ ("Cannot create backup file\n%s%s\n%s"),
2143 dview
->file
[n_merge
], "~~~", unix_error_string (errno
));
2148 merge_file_fd
= mc_mkstemps (&merge_file_name_vpath
, "mcmerge", NULL
);
2149 if (merge_file_fd
== -1)
2151 message (D_ERROR
, MSG_ERROR
, _ ("Cannot create temporary merge file\n%s"),
2152 unix_error_string (errno
));
2156 merge_file
= fdopen (merge_file_fd
, "w");
2161 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2162 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_RIGHT_TO_LEFT
);
2164 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_LEFT_TO_RIGHT
);
2167 if (merge_direction
== FROM_RIGHT_TO_LEFT
)
2168 dview_remove_hunk (dview
, merge_file
, from1
, to1
, FROM_RIGHT_TO_LEFT
);
2170 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
, FROM_LEFT_TO_RIGHT
);
2173 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
, merge_direction
);
2178 fflush (merge_file
);
2179 fclose (merge_file
);
2183 res
= rewrite_backup_content (merge_file_name_vpath
, dview
->file
[n_merge
]);
2186 mc_unlink (merge_file_name_vpath
);
2187 vfs_path_free (merge_file_name_vpath
, TRUE
);
2191 /* --------------------------------------------------------------------------------------------- */
2192 /* view routines and callbacks ********************************************** */
2195 dview_compute_split (WDiff
*dview
, int i
)
2198 if (dview
->bias
< 2 - dview
->half1
)
2199 dview
->bias
= 2 - dview
->half1
;
2200 if (dview
->bias
> dview
->half2
- 2)
2201 dview
->bias
= dview
->half2
- 2;
2204 /* --------------------------------------------------------------------------------------------- */
2207 dview_compute_areas (WDiff
*dview
)
2209 Widget
*w
= WIDGET (dview
);
2211 dview
->height
= w
->rect
.lines
- 1;
2212 dview
->half1
= w
->rect
.cols
/ 2;
2213 dview
->half2
= w
->rect
.cols
- dview
->half1
;
2215 dview_compute_split (dview
, 0);
2218 /* --------------------------------------------------------------------------------------------- */
2221 dview_reread (WDiff
*dview
)
2225 destroy_hdiff (dview
);
2226 if (dview
->a
[DIFF_LEFT
] != NULL
)
2227 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2228 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2229 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2231 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2232 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2233 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2234 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2236 ndiff
= redo_diff (dview
);
2238 dview
->ndiff
= ndiff
;
2241 /* --------------------------------------------------------------------------------------------- */
2245 dview_set_codeset (WDiff
*dview
)
2247 const char *encoding_id
= NULL
;
2250 encoding_id
= get_codepage_id (mc_global
.source_codepage
>= 0 ? mc_global
.source_codepage
2251 : mc_global
.display_codepage
);
2252 if (encoding_id
!= NULL
)
2256 conv
= str_crt_conv_from (encoding_id
);
2257 if (conv
!= INVALID_CONV
)
2259 if (dview
->converter
!= str_cnv_from_term
)
2260 str_close_conv (dview
->converter
);
2261 dview
->converter
= conv
;
2263 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
2267 /* --------------------------------------------------------------------------------------------- */
2270 dview_select_encoding (WDiff
*dview
)
2272 if (do_select_codepage ())
2273 dview_set_codeset (dview
);
2274 dview_reread (dview
);
2275 tty_touch_screen ();
2280 /* --------------------------------------------------------------------------------------------- */
2283 dview_load_options (WDiff
*dview
)
2285 gboolean show_numbers
;
2288 dview
->display_symbols
=
2289 mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_symbols", FALSE
);
2290 show_numbers
= mc_config_get_bool (mc_global
.main_config
, "DiffView", "show_numbers", FALSE
);
2292 dview
->display_numbers
= 1;
2293 tab_size
= mc_config_get_int (mc_global
.main_config
, "DiffView", "tab_size", 8);
2294 if (tab_size
> 0 && tab_size
< 9)
2295 dview
->tab_size
= tab_size
;
2297 dview
->tab_size
= 8;
2299 dview
->opt
.quality
= mc_config_get_int (mc_global
.main_config
, "DiffView", "diff_quality", 0);
2301 dview
->opt
.strip_trailing_cr
=
2302 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2303 dview
->opt
.ignore_all_space
=
2304 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2305 dview
->opt
.ignore_space_change
=
2306 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2307 dview
->opt
.ignore_tab_expansion
=
2308 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2309 dview
->opt
.ignore_case
=
2310 mc_config_get_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case", FALSE
);
2312 dview
->new_frame
= TRUE
;
2315 /* --------------------------------------------------------------------------------------------- */
2318 dview_save_options (WDiff
*dview
)
2320 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_symbols", dview
->display_symbols
);
2321 mc_config_set_bool (mc_global
.main_config
, "DiffView", "show_numbers",
2322 dview
->display_numbers
!= 0);
2323 mc_config_set_int (mc_global
.main_config
, "DiffView", "tab_size", dview
->tab_size
);
2325 mc_config_set_int (mc_global
.main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2327 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_tws",
2328 dview
->opt
.strip_trailing_cr
);
2329 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_all_space",
2330 dview
->opt
.ignore_all_space
);
2331 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_space_change",
2332 dview
->opt
.ignore_space_change
);
2333 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_tab_expansion",
2334 dview
->opt
.ignore_tab_expansion
);
2335 mc_config_set_bool (mc_global
.main_config
, "DiffView", "diff_ignore_case",
2336 dview
->opt
.ignore_case
);
2339 /* --------------------------------------------------------------------------------------------- */
2342 dview_diff_options (WDiff
*dview
)
2344 const char *quality_str
[] = {
2346 N_ ("&Fastest (Assume large files)"),
2347 N_ ("&Minimal (Find a smaller set of change)"),
2350 quick_widget_t quick_widgets
[] = {
2352 QUICK_START_GROUPBOX (N_ ("Diff algorithm")),
2353 QUICK_RADIO (3, (const char **) quality_str
, (int *) &dview
->opt
.quality
, NULL
),
2354 QUICK_STOP_GROUPBOX
,
2355 QUICK_START_GROUPBOX (N_ ("Diff extra options")),
2356 QUICK_CHECKBOX (N_ ("&Ignore case"), &dview
->opt
.ignore_case
, NULL
),
2357 QUICK_CHECKBOX (N_ ("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
, NULL
),
2358 QUICK_CHECKBOX (N_ ("Ignore &space change"), &dview
->opt
.ignore_space_change
, NULL
),
2359 QUICK_CHECKBOX (N_ ("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
, NULL
),
2360 QUICK_CHECKBOX (N_ ("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
,
2362 QUICK_STOP_GROUPBOX
,
2363 QUICK_BUTTONS_OK_CANCEL
,
2368 WRect r
= { -1, -1, 0, 56 };
2370 quick_dialog_t qdlg
= {
2372 .title
= N_ ("Diff Options"),
2373 .help
= "[Diff Options]",
2374 .widgets
= quick_widgets
,
2376 .mouse_callback
= NULL
,
2379 if (quick_dialog (&qdlg
) != B_CANCEL
)
2380 dview_reread (dview
);
2383 /* --------------------------------------------------------------------------------------------- */
2386 dview_init (WDiff
*dview
, const char *args
, const char *file1
, const char *file2
,
2387 const char *label1
, const char *label2
, DSRC dsrc
)
2389 FBUF
*f
[DIFF_COUNT
];
2391 f
[DIFF_LEFT
] = NULL
;
2392 f
[DIFF_RIGHT
] = NULL
;
2394 if (dsrc
== DATA_SRC_TMP
)
2396 f
[DIFF_LEFT
] = dview_ftemp ();
2397 if (f
[DIFF_LEFT
] == NULL
)
2400 f
[DIFF_RIGHT
] = dview_ftemp ();
2401 if (f
[DIFF_RIGHT
] == NULL
)
2403 dview_fclose (f
[DIFF_LEFT
]);
2407 else if (dsrc
== DATA_SRC_ORG
)
2409 f
[DIFF_LEFT
] = dview_fopen (file1
, O_RDONLY
);
2410 if (f
[DIFF_LEFT
] == NULL
)
2413 f
[DIFF_RIGHT
] = dview_fopen (file2
, O_RDONLY
);
2414 if (f
[DIFF_RIGHT
] == NULL
)
2416 dview_fclose (f
[DIFF_LEFT
]);
2421 dview
->view_quit
= FALSE
;
2424 dview
->new_frame
= TRUE
;
2425 dview
->skip_rows
= 0;
2426 dview
->skip_cols
= 0;
2427 dview
->display_symbols
= FALSE
;
2428 dview
->display_numbers
= 0;
2429 dview
->show_cr
= TRUE
;
2430 dview
->tab_size
= 8;
2431 dview
->ord
= DIFF_LEFT
;
2432 dview
->full
= FALSE
;
2434 dview
->search
.handle
= NULL
;
2435 dview
->search
.last_string
= NULL
;
2436 dview
->search
.last_found_line
= -1;
2437 dview
->search
.last_accessed_num_line
= -1;
2439 dview_load_options (dview
);
2442 dview
->file
[DIFF_LEFT
] = file1
;
2443 dview
->file
[DIFF_RIGHT
] = file2
;
2444 dview
->label
[DIFF_LEFT
] = g_strdup (label1
);
2445 dview
->label
[DIFF_RIGHT
] = g_strdup (label2
);
2446 dview
->f
[DIFF_LEFT
] = f
[0];
2447 dview
->f
[DIFF_RIGHT
] = f
[1];
2448 dview
->merged
[DIFF_LEFT
] = FALSE
;
2449 dview
->merged
[DIFF_RIGHT
] = FALSE
;
2450 dview
->hdiff
= NULL
;
2453 dview
->converter
= str_cnv_from_term
;
2454 dview_set_codeset (dview
);
2456 dview
->a
[DIFF_LEFT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2457 g_array_set_clear_func (dview
->a
[DIFF_LEFT
], cc_free_elt
);
2458 dview
->a
[DIFF_RIGHT
] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2459 g_array_set_clear_func (dview
->a
[DIFF_RIGHT
], cc_free_elt
);
2464 /* --------------------------------------------------------------------------------------------- */
2467 dview_fini (WDiff
*dview
)
2469 if (dview
->dsrc
!= DATA_SRC_MEM
)
2471 dview_fclose (dview
->f
[DIFF_RIGHT
]);
2472 dview_fclose (dview
->f
[DIFF_LEFT
]);
2476 if (dview
->converter
!= str_cnv_from_term
)
2477 str_close_conv (dview
->converter
);
2480 destroy_hdiff (dview
);
2481 if (dview
->a
[DIFF_LEFT
] != NULL
)
2483 g_array_free (dview
->a
[DIFF_LEFT
], TRUE
);
2484 dview
->a
[DIFF_LEFT
] = NULL
;
2486 if (dview
->a
[DIFF_RIGHT
] != NULL
)
2488 g_array_free (dview
->a
[DIFF_RIGHT
], TRUE
);
2489 dview
->a
[DIFF_RIGHT
] = NULL
;
2492 g_free (dview
->label
[DIFF_LEFT
]);
2493 g_free (dview
->label
[DIFF_RIGHT
]);
2496 /* --------------------------------------------------------------------------------------------- */
2499 dview_display_file (const WDiff
*dview
, diff_place_t ord
, int r
, int c
, int height
, int width
)
2504 FBUF
*f
= dview
->f
[ord
];
2505 int skip
= dview
->skip_cols
;
2506 gboolean display_symbols
= dview
->display_symbols
;
2507 int display_numbers
= dview
->display_numbers
;
2508 gboolean show_cr
= dview
->show_cr
;
2511 int nwidth
= display_numbers
;
2514 xwidth
= display_numbers
;
2515 if (display_symbols
)
2517 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2518 tab_size
= dview
->tab_size
;
2522 if (xwidth
> width
&& display_symbols
)
2525 display_symbols
= FALSE
;
2527 if (xwidth
> width
&& display_numbers
!= 0)
2530 display_numbers
= width
;
2540 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2542 // abnormal, but avoid buffer overflow
2546 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2553 p
= (DIFFLN
*) &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2555 tty_setcolor (NORMAL_COLOR
);
2556 if (display_symbols
)
2558 tty_gotoyx (r
+ j
, c
- 2);
2559 tty_print_char (ch
);
2563 if (display_numbers
!= 0)
2565 tty_gotoyx (r
+ j
, c
- xwidth
);
2566 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2567 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2570 tty_setcolor (DFF_ADD_COLOR
);
2572 tty_setcolor (DFF_CHG_COLOR
);
2575 if (i
== (size_t) dview
->search
.last_found_line
)
2576 tty_setcolor (MARKED_SELECTED_COLOR
);
2577 else if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2583 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2588 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2589 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2590 tty_gotoyx (r
+ j
, c
);
2593 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2602 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2604 cnt
+= ch_length
- 1;
2605 if (!g_unichar_isprint (next_ch
))
2610 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2614 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2616 if (mc_global
.utf8_display
)
2620 next_ch
= convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2624 else if (dview
->utf8
)
2625 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2627 next_ch
= convert_to_display_c (next_ch
);
2629 tty_print_anychar (next_ch
);
2637 tty_setcolor (DFF_CHH_COLOR
);
2641 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2645 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2648 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2652 if (display_numbers
!= 0)
2654 tty_gotoyx (r
+ j
, c
- xwidth
);
2655 fill_by_space (buf
, display_numbers
, TRUE
);
2656 tty_print_string (buf
);
2659 tty_setcolor (DFF_DEL_COLOR
);
2661 tty_setcolor (DFF_CHD_COLOR
);
2662 fill_by_space (buf
, width
, TRUE
);
2664 tty_gotoyx (r
+ j
, c
);
2665 // tty_print_nstring (buf, width);
2667 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2676 ch_res
= dview_get_utf (buf
+ cnt
, &next_ch
, &ch_length
);
2678 cnt
+= ch_length
- 1;
2679 if (!g_unichar_isprint (next_ch
))
2684 ch_res
= dview_get_byte (buf
+ cnt
, &next_ch
);
2689 if (mc_global
.utf8_display
)
2693 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2695 else if (dview
->utf8
)
2696 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2698 next_ch
= convert_to_display_c (next_ch
);
2701 tty_print_anychar (next_ch
);
2706 tty_setcolor (NORMAL_COLOR
);
2708 if (width
< xwidth
- 1)
2710 fill_by_space (buf
, k
, TRUE
);
2711 for (; j
< height
; j
++)
2715 tty_gotoyx (r
+ j
, c
- xwidth
);
2716 // tty_print_nstring (buf, xwidth - 1);
2717 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2719 tty_gotoyx (r
+ j
, c
);
2720 // tty_print_nstring (buf, width);
2721 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2727 /* --------------------------------------------------------------------------------------------- */
2730 dview_status (const WDiff
*dview
, diff_place_t ord
, int width
, int c
)
2734 int linenum
, lineofs
;
2738 tty_setcolor (STATUSBAR_COLOR
);
2741 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2743 filename_width
= width
- 24;
2744 if (filename_width
< 8)
2747 vpath
= vfs_path_from_str (dview
->label
[ord
]);
2748 path
= vfs_path_to_str_flags (vpath
, 0, VPF_STRIP_HOME
| VPF_STRIP_PASSWORD
);
2749 vfs_path_free (vpath
, TRUE
);
2750 buf
= str_term_trim (path
, filename_width
);
2751 if (ord
== DIFF_LEFT
)
2752 tty_printf ("%s%-*s %6d+%-4d Col %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2753 buf
, linenum
, lineofs
, dview
->skip_cols
);
2755 tty_printf ("%s%-*s %6d+%-4d Dif %-4d ", dview
->merged
[ord
] ? "* " : " ", filename_width
,
2756 buf
, linenum
, lineofs
, dview
->ndiff
);
2760 /* --------------------------------------------------------------------------------------------- */
2763 dview_redo (WDiff
*dview
)
2765 if (dview
->display_numbers
!= 0)
2769 old
= dview
->display_numbers
;
2770 dview
->display_numbers
= calc_nwidth ((const GArray
*const *) dview
->a
);
2771 dview
->new_frame
= (old
!= dview
->display_numbers
);
2773 dview_reread (dview
);
2776 /* --------------------------------------------------------------------------------------------- */
2779 dview_update (WDiff
*dview
)
2781 int height
= dview
->height
;
2785 last
= dview
->a
[DIFF_LEFT
]->len
- 1;
2787 if (dview
->skip_rows
> last
)
2788 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
2789 if (dview
->skip_rows
< 0)
2790 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
2791 if (dview
->skip_cols
< 0)
2792 dview
->skip_cols
= 0;
2797 // use an actual length of dview->a
2798 if (dview
->display_numbers
!= 0)
2799 dview
->display_numbers
= calc_nwidth ((const GArray
*const *) dview
->a
);
2801 width1
= dview
->half1
+ dview
->bias
;
2802 width2
= dview
->half2
- dview
->bias
;
2809 if (dview
->new_frame
)
2813 tty_setcolor (NORMAL_COLOR
);
2814 xwidth
= dview
->display_numbers
;
2815 if (dview
->display_symbols
)
2818 tty_draw_box (1, 0, height
, width1
, FALSE
);
2820 tty_draw_box (1, width1
, height
, width2
, FALSE
);
2825 if (xwidth
< width1
- 1)
2827 tty_gotoyx (1, xwidth
);
2828 tty_print_alt_char (ACS_TTEE
, FALSE
);
2829 tty_gotoyx (height
, xwidth
);
2830 tty_print_alt_char (ACS_BTEE
, FALSE
);
2831 tty_draw_vline (2, xwidth
, ACS_VLINE
, height
- 2);
2833 if (xwidth
< width2
- 1)
2835 tty_gotoyx (1, width1
+ xwidth
);
2836 tty_print_alt_char (ACS_TTEE
, FALSE
);
2837 tty_gotoyx (height
, width1
+ xwidth
);
2838 tty_print_alt_char (ACS_BTEE
, FALSE
);
2839 tty_draw_vline (2, width1
+ xwidth
, ACS_VLINE
, height
- 2);
2842 dview
->new_frame
= FALSE
;
2847 dview_status (dview
, dview
->ord
, width1
, 0);
2848 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
2854 ord
= dview
->ord
== DIFF_LEFT
? DIFF_RIGHT
: DIFF_LEFT
;
2855 dview_status (dview
, ord
, width2
, width1
);
2856 dview_display_file (dview
, ord
, 2, width1
+ 1, height
- 2, width2
- 2);
2860 /* --------------------------------------------------------------------------------------------- */
2863 dview_edit (WDiff
*dview
, diff_place_t ord
)
2867 int linenum
, lineofs
;
2869 if (dview
->dsrc
== DATA_SRC_TMP
)
2871 error_dialog (_ ("Edit"), _ ("Edit is disabled"));
2875 h
= WIDGET (WIDGET (dview
)->owner
);
2876 h_modal
= widget_get_state (h
, WST_MODAL
);
2878 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2880 // disallow edit file in several editors
2881 widget_set_state (h
, WST_MODAL
, TRUE
);
2884 vfs_path_t
*tmp_vpath
;
2886 tmp_vpath
= vfs_path_from_str (dview
->file
[ord
]);
2887 edit_file_at_line (tmp_vpath
, use_internal_edit
, linenum
);
2888 vfs_path_free (tmp_vpath
, TRUE
);
2891 widget_set_state (h
, WST_MODAL
, h_modal
);
2893 dview_update (dview
);
2896 /* --------------------------------------------------------------------------------------------- */
2899 dview_goto_cmd (WDiff
*dview
, diff_place_t ord
)
2901 static gboolean first_run
= TRUE
;
2903 static const char *title
[2] = {
2904 N_ ("Goto line (left)"),
2905 N_ ("Goto line (right)"),
2911 input
= input_dialog (_ (title
[ord
]), _ ("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
,
2912 first_run
? NULL
: INPUT_LAST_TEXT
, INPUT_COMPLETE_NONE
);
2915 const char *s
= input
;
2917 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2922 for (; i
< dview
->a
[ord
]->len
; i
++)
2926 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2927 if (p
->line
== newline
)
2931 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= (ssize_t
) i
;
2940 /* --------------------------------------------------------------------------------------------- */
2943 dview_labels (WDiff
*dview
)
2945 Widget
*d
= WIDGET (dview
);
2948 b
= buttonbar_find (DIALOG (d
->owner
));
2950 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), d
->keymap
, d
);
2951 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), d
->keymap
, d
);
2952 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), d
->keymap
, d
);
2953 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), d
->keymap
, d
);
2954 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), d
->keymap
, d
);
2955 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), d
->keymap
, d
);
2956 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), d
->keymap
, d
);
2959 /* --------------------------------------------------------------------------------------------- */
2962 dview_save (WDiff
*dview
)
2964 gboolean res
= TRUE
;
2966 if (dview
->merged
[DIFF_LEFT
])
2968 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
2969 dview
->merged
[DIFF_LEFT
] = !res
;
2971 if (dview
->merged
[DIFF_RIGHT
])
2973 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
2974 dview
->merged
[DIFF_RIGHT
] = !res
;
2979 /* --------------------------------------------------------------------------------------------- */
2982 dview_do_save (WDiff
*dview
)
2984 (void) dview_save (dview
);
2987 /* --------------------------------------------------------------------------------------------- */
2990 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2994 dview_ok_to_exit (WDiff
*dview
)
2996 gboolean res
= TRUE
;
2999 if (!dview
->merged
[DIFF_LEFT
] && !dview
->merged
[DIFF_RIGHT
])
3002 act
= query_dialog (_ ("Quit"),
3003 !mc_global
.midnight_shutdown
3004 ? _ ("File(s) was modified. Save with exit?")
3005 : _ ("Midnight Commander is being shut down.\nSave modified file(s)?"),
3006 D_NORMAL
, 2, _ ("&Yes"), _ ("&No"));
3009 if (mc_global
.midnight_shutdown
|| (act
== -1))
3018 (void) dview_save (dview
);
3022 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~"))
3023 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_LEFT
], "~~~");
3024 if (mc_util_restore_from_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~"))
3025 res
= mc_util_unlink_backup_if_possible (dview
->file
[DIFF_RIGHT
], "~~~");
3034 /* --------------------------------------------------------------------------------------------- */
3037 dview_execute_cmd (WDiff
*dview
, long command
)
3039 cb_ret_t res
= MSG_HANDLED
;
3043 case CK_ShowSymbols
:
3044 dview
->display_symbols
= !dview
->display_symbols
;
3045 dview
->new_frame
= TRUE
;
3047 case CK_ShowNumbers
:
3048 dview
->display_numbers
^= calc_nwidth ((const GArray
*const *) dview
->a
);
3049 dview
->new_frame
= TRUE
;
3052 dview
->full
= !dview
->full
;
3053 dview
->new_frame
= TRUE
;
3059 dview
->new_frame
= TRUE
;
3065 dview_compute_split (dview
, 1);
3066 dview
->new_frame
= TRUE
;
3073 dview_compute_split (dview
, -1);
3074 dview
->new_frame
= TRUE
;
3078 dview
->tab_size
= 2;
3081 dview
->tab_size
= 3;
3084 dview
->tab_size
= 4;
3087 dview
->tab_size
= 8;
3096 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3097 find_next_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3100 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3101 find_prev_hunk (dview
->a
[DIFF_LEFT
], dview
->skip_rows
);
3104 dview_goto_cmd (dview
, DIFF_RIGHT
);
3107 dview_edit (dview
, dview
->ord
);
3110 do_merge_hunk (dview
, FROM_LEFT_TO_RIGHT
);
3114 do_merge_hunk (dview
, FROM_RIGHT_TO_LEFT
);
3118 dview_edit (dview
, dview
->ord
^ 1);
3121 dview_search_cmd (dview
);
3123 case CK_SearchContinue
:
3124 dview_continue_search_cmd (dview
);
3127 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3130 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[DIFF_LEFT
]->len
- 1;
3133 if (dview
->skip_rows
> 0)
3136 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3141 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3144 if (dview
->height
> 2)
3146 dview
->skip_rows
+= dview
->height
- 2;
3147 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3151 if (dview
->height
> 2)
3153 dview
->skip_rows
-= dview
->height
- 2;
3154 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3164 dview
->skip_cols
-= 8;
3167 dview
->skip_cols
+= 8;
3170 dview
->skip_cols
= 0;
3176 dview
->view_quit
= TRUE
;
3179 dview_do_save (dview
);
3182 dview_diff_options (dview
);
3185 case CK_SelectCodepage
:
3186 dview_select_encoding (dview
);
3190 // don't close diffviewer due to SIGINT
3193 res
= MSG_NOT_HANDLED
;
3198 /* --------------------------------------------------------------------------------------------- */
3201 dview_handle_key (WDiff
*dview
, int key
)
3206 key
= convert_from_input_c (key
);
3209 command
= widget_lookup_key (WIDGET (dview
), key
);
3210 if (command
== CK_IgnoreKey
)
3211 return MSG_NOT_HANDLED
;
3213 return dview_execute_cmd (dview
, command
);
3216 /* --------------------------------------------------------------------------------------------- */
3219 dview_callback (Widget
*w
, Widget
*sender
, widget_msg_t msg
, int parm
, void *data
)
3221 WDiff
*dview
= (WDiff
*) w
;
3222 WDialog
*h
= DIALOG (w
->owner
);
3228 dview_labels (dview
);
3229 dview_update (dview
);
3233 dview
->new_frame
= TRUE
;
3234 dview_update (dview
);
3238 i
= dview_handle_key (dview
, parm
);
3239 if (dview
->view_quit
)
3242 dview_update (dview
);
3246 i
= dview_execute_cmd (dview
, parm
);
3247 if (dview
->view_quit
)
3250 dview_update (dview
);
3254 widget_default_callback (w
, NULL
, MSG_RESIZE
, 0, data
);
3255 dview_compute_areas (dview
);
3259 dview_save_options (dview
);
3264 return widget_default_callback (w
, sender
, msg
, parm
, data
);
3268 /* --------------------------------------------------------------------------------------------- */
3271 dview_mouse_callback (Widget
*w
, mouse_msg_t msg
, mouse_event_t
*event
)
3273 WDiff
*dview
= (WDiff
*) w
;
3279 case MSG_MOUSE_SCROLL_UP
:
3280 case MSG_MOUSE_SCROLL_DOWN
:
3281 if (msg
== MSG_MOUSE_SCROLL_UP
)
3282 dview
->skip_rows
-= 2;
3284 dview
->skip_rows
+= 2;
3286 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3287 dview_update (dview
);
3295 /* --------------------------------------------------------------------------------------------- */
3298 dview_dialog_callback (Widget
*w
, Widget
*sender
, widget_msg_t msg
, int parm
, void *data
)
3301 WDialog
*h
= DIALOG (w
);
3306 // Handle shortcuts.
3308 /* Note: the buttonbar sends messages directly to the the WDiff, not to
3309 * here, which is why we can pass NULL in the following call. */
3310 return dview_execute_cmd (NULL
, parm
);
3313 dview
= (WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3314 // don't stop the dialog before final decision
3315 widget_set_state (w
, WST_ACTIVE
, TRUE
);
3316 if (dview_ok_to_exit (dview
))
3321 return dlg_default_callback (w
, sender
, msg
, parm
, data
);
3325 /* --------------------------------------------------------------------------------------------- */
3328 dview_get_title (const WDialog
*h
, size_t len
)
3331 const char *modified
= " (*) ";
3332 const char *notmodified
= " ";
3336 dview
= (const WDiff
*) widget_find_by_type (CONST_WIDGET (h
), dview_callback
);
3337 len1
= (len
- str_term_width1 (_ ("Diff:")) - strlen (modified
) - 3) / 2;
3339 title
= g_string_sized_new (len
);
3340 g_string_append (title
, _ ("Diff:"));
3341 g_string_append (title
, dview
->merged
[DIFF_LEFT
] ? modified
: notmodified
);
3342 g_string_append (title
, str_term_trim (dview
->label
[DIFF_LEFT
], len1
));
3343 g_string_append (title
, " | ");
3344 g_string_append (title
, dview
->merged
[DIFF_RIGHT
] ? modified
: notmodified
);
3345 g_string_append (title
, str_term_trim (dview
->label
[DIFF_RIGHT
], len1
));
3347 return g_string_free (title
, FALSE
);
3350 /* --------------------------------------------------------------------------------------------- */
3353 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3363 // Create dialog and widgets, put them on the dialog
3364 dview_dlg
= dlg_create (FALSE
, 0, 0, 1, 1, WPOS_FULLSCREEN
, FALSE
, NULL
, dview_dialog_callback
,
3365 NULL
, "[Diff Viewer]", NULL
);
3366 dw
= WIDGET (dview_dlg
);
3367 widget_want_tab (dw
, TRUE
);
3370 g
= GROUP (dview_dlg
);
3372 dview
= g_new0 (WDiff
, 1);
3375 widget_init (w
, &r
, dview_callback
, dview_mouse_callback
);
3376 w
->options
|= WOP_SELECTABLE
;
3377 w
->keymap
= diff_map
;
3378 group_add_widget_autopos (g
, w
, WPOS_KEEP_ALL
, NULL
);
3380 w
= WIDGET (buttonbar_new ());
3381 group_add_widget_autopos (g
, w
, w
->pos_flags
, NULL
);
3383 dview_dlg
->get_title
= dview_get_title
;
3386 dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); // XXX binary diff?
3388 error
= redo_diff (dview
);
3391 dview
->ndiff
= error
;
3392 dview_compute_areas (dview
);
3397 dlg_run (dview_dlg
);
3399 if (error
!= 0 || widget_get_state (dw
, WST_CLOSED
))
3400 widget_destroy (dw
);
3402 return error
== 0 ? 1 : 0;
3405 /*** public functions ****************************************************************************/
3406 /* --------------------------------------------------------------------------------------------- */
3408 #define GET_FILE_AND_STAMP(n) \
3412 real_file##n = file##n; \
3413 if (!vfs_file_is_local (file##n)) \
3415 real_file##n = mc_getlocalcopy (file##n); \
3416 if (real_file##n != NULL) \
3419 if (mc_stat (real_file##n, &st##n) != 0) \
3426 #define UNGET_FILE(n) \
3429 if (use_copy##n != 0) \
3431 gboolean changed = FALSE; \
3432 if (use_copy##n > 0) \
3435 mtime = st##n.st_mtime; \
3436 if (mc_stat (real_file##n, &st##n) == 0) \
3437 changed = (mtime != st##n.st_mtime); \
3439 mc_ungetlocalcopy (file##n, real_file##n, changed); \
3440 vfs_path_free (real_file##n, TRUE); \
3446 dview_diff_cmd (const void *f0
, const void *f1
)
3449 vfs_path_t
*file0
= NULL
;
3450 vfs_path_t
*file1
= NULL
;
3451 gboolean is_dir0
= FALSE
;
3452 gboolean is_dir1
= FALSE
;
3454 switch (mc_global
.mc_run_mode
)
3459 const WPanel
*panel0
= (const WPanel
*) f0
;
3460 const WPanel
*panel1
= (const WPanel
*) f1
;
3461 const file_entry_t
*fe0
, *fe1
;
3463 fe0
= panel_current_entry (panel0
);
3466 message (D_ERROR
, MSG_ERROR
, "%s", _ ("File name is empty!"));
3470 file0
= vfs_path_append_new (panel0
->cwd_vpath
, fe0
->fname
->str
, (char *) NULL
);
3471 is_dir0
= S_ISDIR (fe0
->st
.st_mode
);
3474 message (D_ERROR
, MSG_ERROR
, _ ("\"%s\" is a directory"),
3475 path_trunc (fe0
->fname
->str
, 30));
3479 fe1
= panel_current_entry (panel1
);
3482 message (D_ERROR
, MSG_ERROR
, "%s", _ ("File name is empty!"));
3485 file1
= vfs_path_append_new (panel1
->cwd_vpath
, fe1
->fname
->str
, (char *) NULL
);
3486 is_dir1
= S_ISDIR (fe1
->st
.st_mode
);
3489 message (D_ERROR
, MSG_ERROR
, _ ("\"%s\" is a directory"),
3490 path_trunc (fe1
->fname
->str
, 30));
3496 case MC_RUN_DIFFVIEWER
:
3498 // run from command line
3499 const char *p0
= (const char *) f0
;
3500 const char *p1
= (const char *) f1
;
3503 file0
= vfs_path_from_str (p0
);
3504 if (mc_stat (file0
, &st
) == 0)
3506 is_dir0
= S_ISDIR (st
.st_mode
);
3509 message (D_ERROR
, MSG_ERROR
, _ ("\"%s\" is a directory"), path_trunc (p0
, 30));
3515 message (D_ERROR
, MSG_ERROR
, _ ("Cannot stat \"%s\"\n%s"), path_trunc (p0
, 30),
3516 unix_error_string (errno
));
3520 file1
= vfs_path_from_str (p1
);
3521 if (mc_stat (file1
, &st
) == 0)
3523 is_dir1
= S_ISDIR (st
.st_mode
);
3526 message (D_ERROR
, MSG_ERROR
, _ ("\"%s\" is a directory"), path_trunc (p1
, 30));
3532 message (D_ERROR
, MSG_ERROR
, _ ("Cannot stat \"%s\"\n%s"), path_trunc (p1
, 30),
3533 unix_error_string (errno
));
3540 // this should not happened
3541 message (D_ERROR
, MSG_ERROR
, _ ("Diff viewer: invalid mode"));
3548 if (file0
!= NULL
&& file1
!= NULL
)
3550 int use_copy0
, use_copy1
;
3551 struct stat st0
, st1
;
3552 vfs_path_t
*real_file0
, *real_file1
;
3554 GET_FILE_AND_STAMP (0);
3555 GET_FILE_AND_STAMP (1);
3557 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3558 rv
= diff_view (vfs_path_as_str (real_file0
), vfs_path_as_str (real_file1
),
3559 vfs_path_as_str (file0
), vfs_path_as_str (file1
));
3567 message (D_ERROR
, MSG_ERROR
, _ ("Two files are needed to compare"));
3570 vfs_path_free (file1
, TRUE
);
3571 vfs_path_free (file0
, TRUE
);
3576 #undef GET_FILE_AND_STAMP
3579 /* --------------------------------------------------------------------------------------------- */