2 Copyright (C) 2007, 2010 Free Software Foundation, Inc.
4 2007 Daniel Borca <dborca@yahoo.com>
6 2010 Slava Zanko <slavazanko@gmail.com>
7 2010 Andrew Borodin <aborodin@vmail.ru>
8 2010 Ilia Maslakov <il.smind@gmail.com>
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13 the Free Software Foundation; either version 2 of the License, or
14 (at your option) any later version.
16 This program is distributed in the hope that it will be useful,
17 but WITHOUT ANY WARRANTY; without even the implied warranty of
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 GNU General Public License for more details.
21 You should have received a copy of the GNU General Public License
22 along with this program; if not, write to the Free Software
23 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
33 #include <sys/types.h>
36 #include "lib/global.h"
37 #include "lib/tty/tty.h"
38 #include "lib/tty/color.h"
39 #include "lib/tty/key.h"
41 #include "lib/skin.h" /* EDITOR_NORMAL_COLOR */
42 #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
44 #include "src/cmddef.h"
45 #include "src/keybind.h"
47 #include "src/dialog.h"
49 #include "src/wtools.h"
50 #include "src/charsets.h"
51 #include "src/history.h"
52 #include "src/panel.h" /* Needed for current_panel and other_panel */
53 #include "src/layout.h" /* Needed for get_current_index and get_other_panel */
54 #include "src/main.h" /* mc_run_mode */
55 #include "src/selcodepage.h"
60 /*** global variables ****************************************************************************/
62 /*** file scope macro definitions ****************************************************************/
64 #define g_array_foreach(a, TP, cbf) \
66 size_t g_array_foreach_i;\
67 TP *g_array_foreach_var=NULL; \
68 for (g_array_foreach_i=0;g_array_foreach_i < a->len; g_array_foreach_i++) \
70 g_array_foreach_var = &g_array_index(a,TP,g_array_foreach_i); \
71 (*cbf) (g_array_foreach_var); \
75 #define FILE_READ_BUF 4096
76 #define FILE_FLAG_TEMP (1 << 0)
86 #define HDIFF_ENABLE 1
87 #define HDIFF_MINCTX 5
88 #define HDIFF_DEPTH 10
90 #define FILE_DIRTY(fs) \
97 /*** file scope type declarations ****************************************************************/
99 /*** file scope variables ************************************************************************/
101 /*** file scope functions ************************************************************************/
102 /* --------------------------------------------------------------------------------------------- */
105 TAB_SKIP (int ts
, int pos
)
107 if (ts
> 0 && ts
< 9)
108 return ts
- pos
% ts
;
113 /* --------------------------------------------------------------------------------------------- */
116 dview_set_codeset (WDiff
* dview
)
119 const char *encoding_id
= NULL
;
122 encoding_id
= get_codepage_id (source_codepage
>= 0 ? source_codepage
: display_codepage
);
123 if (encoding_id
!= NULL
)
126 conv
= str_crt_conv_from (encoding_id
);
127 if (conv
!= INVALID_CONV
)
129 if (dview
->converter
!= str_cnv_from_term
)
130 str_close_conv (dview
->converter
);
131 dview
->converter
= conv
;
133 dview
->utf8
= (gboolean
) str_isutf8 (encoding_id
);
140 /* --------------------------------------------------------------------------------------------- */
143 dview_select_encoding (WDiff
* dview
)
146 if (do_select_codepage ())
147 dview_set_codeset (dview
);
155 rewrite_backup_content (const char *from_file_name
, const char *to_file_name
)
161 if (!g_file_get_contents (from_file_name
, &contents
, &length
, NULL
))
164 backup_fd
= fopen (to_file_name
, "w");
165 if (backup_fd
== NULL
)
171 fwrite ((const void *) contents
, length
, 1, backup_fd
);
179 /* buffered I/O ************************************************************* */
182 * Try to open a temporary file.
184 * \param[out] name address of a pointer to store the temporary name
186 * \return file descriptor on success, negative on error
188 * \note the name is not altered if this function fails
192 open_temp (void **name
)
195 char *diff_file_name
= NULL
;
197 fd
= mc_mkstemps (&diff_file_name
, "mcdiff", NULL
);
200 message (D_ERROR
, MSG_ERROR
,
201 _("Cannot create temporary diff file\n%s"), unix_error_string (errno
));
204 *name
= diff_file_name
;
208 /* --------------------------------------------------------------------------------------------- */
211 * Alocate file structure and associate file descriptor to it.
213 * \param fd file descriptor
215 * \return file structure
225 fs
= g_try_malloc (sizeof (FBUF
));
229 fs
->buf
= g_try_malloc (FILE_READ_BUF
);
244 /* --------------------------------------------------------------------------------------------- */
247 * Free file structure without closing the file.
249 * \param fs file structure
251 * \return 0 on success, non-zero on error
257 if (fs
->flags
& FILE_FLAG_TEMP
)
259 rv
= unlink (fs
->data
);
268 /* --------------------------------------------------------------------------------------------- */
271 * Open a binary temporary file in R/W mode.
273 * \return file structure
275 * \note the file will be deleted when closed
289 fd
= open_temp (&fs
->data
);
297 fs
->flags
= FILE_FLAG_TEMP
;
301 /* --------------------------------------------------------------------------------------------- */
304 * Open a binary file in specified mode.
306 * \param filename file name
307 * \param flags open mode, a combination of O_RDONLY, O_WRONLY, O_RDWR
309 * \return file structure
312 f_open (const char *filename
, int flags
)
323 fd
= open (filename
, flags
);
334 /* --------------------------------------------------------------------------------------------- */
337 * Read a line of bytes from file until newline or EOF.
339 * \param buf destination buffer
340 * \param size size of buffer
341 * \param fs file structure
343 * \return number of bytes read
345 * \note does not stop on null-byte
346 * \note buf will not be null-terminated
349 f_gets (char *buf
, size_t size
, FBUF
* fs
)
358 for (i
= fs
->pos
; j
< size
&& i
< fs
->len
&& !stop
; i
++, j
++)
368 if (j
== size
|| stop
)
374 fs
->len
= read (fs
->fd
, fs
->buf
, FILE_READ_BUF
);
381 /* --------------------------------------------------------------------------------------------- */
386 * \param fs file structure
388 * \param whence seek directive: SEEK_SET, SEEK_CUR or SEEK_END
390 * \return position in file, starting from begginning
392 * \note avoids thrashing read cache when possible
395 f_seek (FBUF
* fs
, off_t off
, int whence
)
399 if (fs
->len
&& whence
!= SEEK_END
)
401 rv
= lseek (fs
->fd
, 0, SEEK_CUR
);
404 if (whence
== SEEK_CUR
)
407 off
+= rv
- fs
->len
+ fs
->pos
;
409 if (off
- rv
>= -fs
->len
&& off
- rv
<= 0)
411 fs
->pos
= fs
->len
+ off
- rv
;
417 rv
= lseek (fs
->fd
, off
, whence
);
425 /* --------------------------------------------------------------------------------------------- */
428 * Seek to the beginning of file, thrashing read cache.
430 * \param fs file structure
432 * \return 0 if success, non-zero on error
437 off_t rv
= lseek (fs
->fd
, 0, SEEK_SET
);
445 /* --------------------------------------------------------------------------------------------- */
448 * Write bytes to file.
450 * \param fs file structure
451 * \param buf source buffer
452 * \param size size of buffer
454 * \return number of written bytes, -1 on error
456 * \note thrashes read cache
459 f_write (FBUF
* fs
, const char *buf
, size_t size
)
461 ssize_t rv
= write (fs
->fd
, buf
, size
);
469 /* --------------------------------------------------------------------------------------------- */
472 * Truncate file to the current position.
474 * \param fs file structure
476 * \return current file size on success, negative on error
478 * \note thrashes read cache
483 off_t off
= lseek (fs
->fd
, 0, SEEK_CUR
);
486 int rv
= ftruncate (fs
->fd
, off
);
499 /* --------------------------------------------------------------------------------------------- */
504 * \param fs file structure
506 * \return 0 on success, non-zero on error
508 * \note if this is temporary file, it is deleted
513 int rv
= close (fs
->fd
);
518 /* --------------------------------------------------------------------------------------------- */
521 * Create pipe stream to process.
523 * \param cmd shell command line
524 * \param flags open mode, either O_RDONLY or O_WRONLY
526 * \return file structure
529 p_open (const char *cmd
, int flags
)
533 const char *type
= NULL
;
535 if (flags
== O_RDONLY
)
539 if (flags
== O_WRONLY
)
555 f
= popen (cmd
, type
);
567 /* --------------------------------------------------------------------------------------------- */
572 * \param fs structure
574 * \return 0 on success, non-zero on error
579 int rv
= pclose (fs
->data
);
585 * Get one char (byte) from string
587 * \param char * str, gboolean * result
589 * \return int as character or 0 and result == FALSE if fail
593 dview_get_byte (char *str
, gboolean
* result
)
601 return (unsigned char) *str
;
606 * Get utf multibyte char from string
608 * \param char * str, int * char_width, gboolean * result
610 * \return int as utf character or 0 and result == FALSE if fail
614 dview_get_utf (char *str
, int *char_width
, gboolean
* result
)
618 gchar
*next_ch
= NULL
;
630 res
= g_utf8_get_char_validated (str
, -1);
640 /* Calculate UTF-8 char width */
641 next_ch
= g_utf8_next_char (str
);
644 width
= next_ch
- str
;
657 dview_str_utf8_offset_to_pos (const char *text
, size_t length
)
660 if (text
== NULL
|| text
[0] == '\0')
662 if (g_utf8_validate (text
, -1, NULL
))
664 result
= g_utf8_offset_to_pointer (text
, length
) - text
;
669 char *tmpbuf
, *buffer
;
670 buffer
= tmpbuf
= g_strdup (text
);
671 while (tmpbuf
[0] != '\0')
673 uni
= g_utf8_get_char_validated (tmpbuf
, -1);
674 if ((uni
!= (gunichar
) (-1)) && (uni
!= (gunichar
) (-2)))
676 tmpbuf
= g_utf8_next_char (tmpbuf
);
685 result
= g_utf8_offset_to_pointer (tmpbuf
, length
) - tmpbuf
;
688 return max (length
, (size_t) result
);
692 /* --------------------------------------------------------------------------------------------- */
693 /* diff parse *************************************************************** */
696 * Read decimal number from string.
698 * \param[in,out] str string to parse
699 * \param[out] n extracted number
701 * \return 0 if success, otherwise non-zero
704 scan_deci (const char **str
, int *n
)
706 const char *p
= *str
;
709 *n
= strtol (p
, &q
, 10);
718 /* --------------------------------------------------------------------------------------------- */
721 * Parse line for diff statement.
723 * \param p string to parse
724 * \param ops list of diff statements
726 * \return 0 if success, otherwise non-zero
729 scan_line (const char *p
, GArray
* ops
)
739 /* handle the following cases:
741 * NUM[,NUM]cNUM[,NUM]
743 * where NUM is a positive integer
746 if (scan_deci (&p
, &f1
) != 0 || f1
< 0)
755 if (scan_deci (&p
, &f2
) != 0 || f2
< f1
)
770 else if (cmd
!= 'c' && cmd
!= 'd')
775 if (scan_deci (&p
, &t1
) != 0 || t1
< 0)
784 if (scan_deci (&p
, &t2
) != 0 || t2
< t1
)
804 g_array_append_val (ops
, op
);
808 /* --------------------------------------------------------------------------------------------- */
811 * Parse diff output and extract diff statements.
813 * \param f stream to read from
814 * \param ops list of diff statements to fill
816 * \return positive number indicating number of hunks, otherwise negative
819 scan_diff (FBUF
* f
, GArray
* ops
)
824 while ((sz
= f_gets (buf
, sizeof (buf
) - 1, f
)))
826 if (isdigit (buf
[0]))
828 if (buf
[sz
- 1] != '\n')
833 if (scan_line (buf
, ops
) != 0)
839 while (buf
[sz
- 1] != '\n' && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
847 /* --------------------------------------------------------------------------------------------- */
850 * Invoke diff and extract diff statements.
852 * \param args extra arguments to be passed to diff
853 * \param extra more arguments to be passed to diff
854 * \param file1 first file to compare
855 * \param file2 second file to compare
856 * \param ops list of diff statements to fill
858 * \return positive number indicating number of hunks, otherwise negative
861 dff_execute (const char *args
, const char *extra
, const char *file1
, const char *file2
,
864 static const char *opt
=
865 " --old-group-format='%df%(f=l?:,%dl)d%dE\n'"
866 " --new-group-format='%dea%dF%(F=L?:,%dL)\n'"
867 " --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)\n'"
868 " --unchanged-group-format=''";
875 cmd
= g_strdup_printf ("diff %s %s %s \"%s\" \"%s\"", args
, extra
, opt
, file1
, file2
);
879 f
= p_open (cmd
, O_RDONLY
);
885 rv
= scan_diff (f
, ops
);
888 if (rv
< 0 || code
== -1 || !WIFEXITED (code
) || WEXITSTATUS (code
) == 2)
894 /* --------------------------------------------------------------------------------------------- */
897 * Reparse and display file according to diff statements.
899 * \param ord 0 if displaying first file, 1 if displaying 2nd file
900 * \param filename file name to display
901 * \param ops list of diff statements
902 * \param printer printf-like function to be used for displaying
903 * \param ctx printer context
905 * \return 0 if success, otherwise non-zero
908 dff_reparse (int ord
, const char *filename
, const GArray
* ops
, DFUNC printer
, void *ctx
)
921 f
= f_open (filename
, O_RDONLY
);
939 #define T1 a[ ord^1 ][0]
940 #define T2 a[ ord^1 ][1]
941 for (i
= 0; i
< ops
->len
; i
++)
944 op
= &g_array_index (ops
, DIFFCMD
, i
);
945 n
= op
->F1
- (op
->cmd
!= add_cmd
);
946 while (line
< n
&& (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
949 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
951 while (buf
[sz
- 1] != '\n')
953 sz
= f_gets (buf
, sizeof (buf
), f
);
956 printer (ctx
, 0, 0, 0, 1, "\n");
959 printer (ctx
, 0, 0, 0, sz
, buf
);
968 if (op
->cmd
== add_cmd
)
970 n
= op
->T2
- op
->T1
+ 1;
973 printer (ctx
, DEL_CH
, 0, 0, 1, "\n");
977 if (op
->cmd
== del_cmd
)
979 n
= op
->F2
- op
->F1
+ 1;
980 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
983 printer (ctx
, ADD_CH
, line
, off
, sz
, buf
);
985 while (buf
[sz
- 1] != '\n')
987 sz
= f_gets (buf
, sizeof (buf
), f
);
990 printer (ctx
, 0, 0, 0, 1, "\n");
993 printer (ctx
, 0, 0, 0, sz
, buf
);
1005 n
= op
->F2
- op
->F1
+ 1;
1006 while (n
!= 0 && (sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1009 printer (ctx
, CHG_CH
, line
, off
, sz
, buf
);
1011 while (buf
[sz
- 1] != '\n')
1013 sz
= f_gets (buf
, sizeof (buf
), f
);
1016 printer (ctx
, 0, 0, 0, 1, "\n");
1019 printer (ctx
, 0, 0, 0, sz
, buf
);
1028 n
= op
->T2
- op
->T1
- (op
->F2
- op
->F1
);
1031 printer (ctx
, CHG_CH
, 0, 0, 1, "\n");
1041 while ((sz
= f_gets (buf
, sizeof (buf
), f
)) != 0)
1044 printer (ctx
, EQU_CH
, line
, off
, sz
, buf
);
1046 while (buf
[sz
- 1] != '\n')
1048 sz
= f_gets (buf
, sizeof (buf
), f
);
1051 printer (ctx
, 0, 0, 0, 1, "\n");
1054 printer (ctx
, 0, 0, 0, sz
, buf
);
1067 /* --------------------------------------------------------------------------------------------- */
1068 /* horizontal diff ********************************************************** */
1071 * Longest common substring.
1073 * \param s first string
1074 * \param m length of first string
1075 * \param t second string
1076 * \param n length of second string
1077 * \param ret list of offsets for longest common substrings inside each string
1078 * \param min minimum length of common substrings
1080 * \return 0 if success, nonzero otherwise
1083 lcsubstr (const char *s
, int m
, const char *t
, int n
, GArray
* ret
, int min
)
1091 if (m
< min
|| n
< min
)
1093 /* XXX early culling */
1097 Lprev
= g_new0 (int, n
+ 1);
1098 Lcurr
= g_new0 (int, n
+ 1);
1100 if (Lprev
== NULL
|| Lcurr
== NULL
)
1107 for (i
= 0; i
< m
; i
++)
1112 #ifdef USE_MEMSET_IN_LCS
1113 memset (Lcurr
, 0, (n
+ 1) * sizeof (int));
1115 for (j
= 0; j
< n
; j
++)
1117 #ifndef USE_MEMSET_IN_LCS
1122 int v
= Lprev
[j
] + 1;
1127 g_array_set_size (ret
, 0);
1129 if (z
== v
&& z
>= min
)
1131 int off0
= i
- z
+ 1;
1132 int off1
= j
- z
+ 1;
1134 for (k
= 0; k
< ret
->len
; k
++)
1136 PAIR
*p
= (PAIR
*) g_array_index (ret
, PAIR
, k
);
1137 if ((*p
)[0] == off0
)
1141 if ((*p
)[1] >= off1
)
1151 g_array_append_val (ret
, p2
);
1167 /* --------------------------------------------------------------------------------------------- */
1170 * Scan recursively for common substrings and build ranges.
1172 * \param s first string
1173 * \param t second string
1174 * \param bracket current limits for both of the strings
1175 * \param min minimum length of common substrings
1176 * \param hdiff list of horizontal diff ranges to fill
1177 * \param depth recursion depth
1179 * \return 0 if success, nonzero otherwise
1182 hdiff_multi (const char *s
, const char *t
, const BRACKET bracket
, int min
, GArray
* hdiff
,
1192 ret
= g_array_new (FALSE
, TRUE
, sizeof (PAIR
));
1196 len
= lcsubstr (s
+ bracket
[0].off
, bracket
[0].len
,
1197 t
+ bracket
[1].off
, bracket
[1].len
, ret
, min
);
1201 const PAIR
*data
= (const PAIR
*) &g_array_index (ret
, PAIR
, 0);
1204 b
[0].off
= bracket
[0].off
;
1205 b
[0].len
= (*data
)[0];
1206 b
[1].off
= bracket
[1].off
;
1207 b
[1].len
= (*data
)[1];
1208 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1211 for (k
= 0; k
< ret
->len
- 1; k
++)
1213 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1214 data2
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
+ 1);
1215 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1216 b
[0].len
= (*data2
)[0] - (*data
)[0] - len
;
1217 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1218 b
[1].len
= (*data2
)[1] - (*data
)[1] - len
;
1219 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1222 data
= (const PAIR
*) &g_array_index (ret
, PAIR
, k
);
1223 b
[0].off
= bracket
[0].off
+ (*data
)[0] + len
;
1224 b
[0].len
= bracket
[0].len
- (*data
)[0] - len
;
1225 b
[1].off
= bracket
[1].off
+ (*data
)[1] + len
;
1226 b
[1].len
= bracket
[1].len
- (*data
)[1] - len
;
1227 if (!hdiff_multi (s
, t
, b
, min
, hdiff
, depth
))
1230 g_array_free (ret
, TRUE
);
1235 p
[0].off
= bracket
[0].off
;
1236 p
[0].len
= bracket
[0].len
;
1237 p
[1].off
= bracket
[1].off
;
1238 p
[1].len
= bracket
[1].len
;
1239 g_array_append_val (hdiff
, p
);
1244 /* --------------------------------------------------------------------------------------------- */
1247 * Build list of horizontal diff ranges.
1249 * \param s first string
1250 * \param m length of first string
1251 * \param t second string
1252 * \param n length of second string
1253 * \param min minimum length of common substrings
1254 * \param hdiff list of horizontal diff ranges to fill
1255 * \param depth recursion depth
1257 * \return 0 if success, nonzero otherwise
1260 hdiff_scan (const char *s
, int m
, const char *t
, int n
, int min
, GArray
* hdiff
, unsigned int depth
)
1265 /* dumbscan (single horizontal diff) -- does not compress whitespace */
1266 for (i
= 0; i
< m
&& i
< n
&& s
[i
] == t
[i
]; i
++)
1268 for (; m
> i
&& n
> i
&& s
[m
- 1] == t
[n
- 1]; m
--, n
--)
1276 /* smartscan (multiple horizontal diff) */
1277 return hdiff_multi (s
, t
, b
, min
, hdiff
, depth
);
1280 /* --------------------------------------------------------------------------------------------- */
1281 /* read line **************************************************************** */
1284 * Check if character is inside horizontal diff limits.
1286 * \param k rank of character inside line
1287 * \param hdiff horizontal diff structure
1288 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1290 * \return TRUE if inside hdiff limits, FALSE otherwise
1293 is_inside (int k
, GArray
* hdiff
, int ord
)
1297 for (i
= 0; i
< hdiff
->len
; i
++)
1300 b
= &g_array_index (hdiff
, BRACKET
, i
);
1302 start
= (*b
)[ord
].off
;
1303 end
= start
+ (*b
)[ord
].len
;
1304 if (k
>= start
&& k
< end
)
1312 /* --------------------------------------------------------------------------------------------- */
1315 * Copy `src' to `dst' expanding tabs.
1317 * \param dst destination buffer
1318 * \param src source buffer
1319 * \param srcsize size of src buffer
1320 * \param base virtual base of this string, needed to calculate tabs
1321 * \param ts tab size
1323 * \return new virtual base
1325 * \note The procedure returns when all bytes are consumed from `src'
1328 cvt_cpy (char *dst
, const char *src
, size_t srcsize
, int base
, int ts
)
1331 for (i
= 0; srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1336 int j
= TAB_SKIP (ts
, i
+ base
);
1348 /* --------------------------------------------------------------------------------------------- */
1351 * Copy `src' to `dst' expanding tabs.
1353 * \param dst destination buffer
1354 * \param dstsize size of dst buffer
1355 * \param[in,out] _src source buffer
1356 * \param srcsize size of src buffer
1357 * \param base virtual base of this string, needed to calculate tabs
1358 * \param ts tab size
1360 * \return new virtual base
1362 * \note The procedure returns when all bytes are consumed from `src'
1363 * or `dstsize' bytes are written to `dst'
1364 * \note Upon return, `src' points to the first unwritten character in source
1367 cvt_ncpy (char *dst
, int dstsize
, const char **_src
, size_t srcsize
, int base
, int ts
)
1370 const char *src
= *_src
;
1371 for (i
= 0; i
< dstsize
&& srcsize
!= 0; i
++, src
++, dst
++, srcsize
--)
1376 int j
= TAB_SKIP (ts
, i
+ base
);
1377 if (j
> dstsize
- i
)
1393 /* --------------------------------------------------------------------------------------------- */
1396 * Read line from memory, converting tabs to spaces and padding with spaces.
1398 * \param src buffer to read from
1399 * \param srcsize size of src buffer
1400 * \param dst buffer to read to
1401 * \param dstsize size of dst buffer, excluding trailing null
1402 * \param skip number of characters to skip
1403 * \param ts tab size
1404 * \param show_cr show trailing carriage return as ^M
1406 * \return negative on error, otherwise number of bytes except padding
1409 cvt_mget (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
)
1417 for (i
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, src
++, srcsize
--)
1421 int j
= TAB_SKIP (ts
, i
+ base
);
1429 else if (dstsize
!= 0)
1436 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1438 if (skip
== 0 && show_cr
)
1463 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1466 if (!g_unichar_isprint (utf_ch
))
1478 while (dstsize
!= 0)
1487 /* --------------------------------------------------------------------------------------------- */
1490 * Read line from memory and build attribute array.
1492 * \param src buffer to read from
1493 * \param srcsize size of src buffer
1494 * \param dst buffer to read to
1495 * \param dstsize size of dst buffer, excluding trailing null
1496 * \param skip number of characters to skip
1497 * \param ts tab size
1498 * \param show_cr show trailing carriage return as ^M
1499 * \param hdiff horizontal diff structure
1500 * \param ord 0 if reading from first file, 1 if reading from 2nd file
1501 * \param att buffer of attributes
1503 * \return negative on error, otherwise number of bytes except padding
1506 cvt_mgeta (const char *src
, size_t srcsize
, char *dst
, int dstsize
, int skip
, int ts
, int show_cr
,
1507 GArray
* hdiff
, int ord
, char *att
)
1515 for (i
= 0, k
= 0; dstsize
!= 0 && srcsize
!= 0 && *src
!= '\n'; i
++, k
++, src
++, srcsize
--)
1519 int j
= TAB_SKIP (ts
, i
+ base
);
1527 else if (dstsize
!= 0)
1530 *att
++ = is_inside (k
, hdiff
, ord
);
1535 else if (src
[0] == '\r' && (srcsize
== 1 || src
[1] == '\n'))
1537 if (skip
== 0 && show_cr
)
1542 *att
++ = is_inside (k
, hdiff
, ord
);
1544 *att
++ = is_inside (k
, hdiff
, ord
);
1550 *att
++ = is_inside (k
, hdiff
, ord
);
1565 utf_ch
= dview_get_utf ((char *) src
, &w
, &res
);
1568 if (!g_unichar_isprint (utf_ch
))
1574 *att
++ = is_inside (k
, hdiff
, ord
);
1581 while (dstsize
!= 0)
1591 /* --------------------------------------------------------------------------------------------- */
1594 * Read line from file, converting tabs to spaces and padding with spaces.
1596 * \param f file stream to read from
1597 * \param off offset of line inside file
1598 * \param dst buffer to read to
1599 * \param dstsize size of dst buffer, excluding trailing null
1600 * \param skip number of characters to skip
1601 * \param ts tab size
1602 * \param show_cr show trailing carriage return as ^M
1604 * \return negative on error, otherwise number of bytes except padding
1607 cvt_fget (FBUF
* f
, off_t off
, char *dst
, size_t dstsize
, int skip
, int ts
, int show_cr
)
1610 int old_base
= base
;
1611 const int amount
= dstsize
;
1613 size_t useful
, offset
;
1620 const char *q
= NULL
;
1621 char tmp
[BUFSIZ
]; /* XXX capacity must be >= max{dstsize + 1, amount} */
1622 char cvt
[BUFSIZ
]; /* XXX capacity must be >= MAX_TAB_WIDTH * amount */
1624 if ((int) sizeof (tmp
) < amount
|| (int) sizeof (tmp
) <= dstsize
1625 || (int) sizeof (cvt
) < 8 * amount
)
1627 /* abnormal, but avoid buffer overflow */
1628 memset (dst
, ' ', dstsize
);
1629 dst
[dstsize
] = '\0';
1633 f_seek (f
, off
, SEEK_SET
);
1638 sz
= f_gets (tmp
, amount
, f
);
1642 base
= cvt_cpy (cvt
, tmp
, sz
, old_base
, ts
);
1643 if (cvt
[base
- old_base
- 1] == '\n')
1645 q
= &cvt
[base
- old_base
- 1];
1646 base
= old_base
+ q
- cvt
+ 1;
1651 useful
= base
- skip
;
1652 offset
= skip
- old_base
;
1656 memset (dst
, ' ', dstsize
);
1657 dst
[dstsize
] = '\0';
1661 if (useful
<= dstsize
)
1664 memmove (dst
, cvt
+ offset
, useful
);
1668 sz
= f_gets (tmp
, dstsize
- useful
+ 1, f
);
1671 const char *ptr
= tmp
;
1672 useful
+= cvt_ncpy (dst
+ useful
, dstsize
- useful
, &ptr
, sz
, base
, ts
) - base
;
1681 memmove (dst
, cvt
+ offset
, dstsize
);
1683 lastch
= cvt
[offset
+ dstsize
];
1687 for (i
= 0; i
< sz
&& dst
[i
] != '\n'; i
++)
1689 if (dst
[i
] == '\r' && dst
[i
+ 1] == '\n')
1693 if (i
+ 1 < dstsize
)
1706 for (; i
< dstsize
; i
++)
1714 /* --------------------------------------------------------------------------------------------- */
1715 /* diff printers et al ****************************************************** */
1718 cc_free_elt (void *elt
)
1727 /* --------------------------------------------------------------------------------------------- */
1730 printer (void *ctx
, int ch
, int line
, off_t off
, size_t sz
, const char *str
)
1732 GArray
*a
= ((PRINTER_CTX
*) ctx
)->a
;
1733 DSRC dsrc
= ((PRINTER_CTX
*) ctx
)->dsrc
;
1741 if (dsrc
== DATA_SRC_MEM
&& line
!= 0)
1743 if (sz
!= 0 && str
[sz
- 1] == '\n')
1748 p
.p
= g_strndup (str
, sz
);
1751 g_array_append_val (a
, p
);
1753 else if (dsrc
== DATA_SRC_MEM
)
1756 p
= &g_array_index (a
, DIFFLN
, a
->len
- 1);
1757 if (sz
!= 0 && str
[sz
- 1] == '\n')
1763 size_t new_size
= p
->u
.len
+ sz
;
1764 char *q
= g_realloc (p
->p
, new_size
);
1765 memcpy (q
+ p
->u
.len
, str
, sz
);
1770 if (dsrc
== DATA_SRC_TMP
&& (line
!= 0 || ch
== 0))
1772 FBUF
*f
= ((PRINTER_CTX
*) ctx
)->f
;
1773 f_write (f
, str
, sz
);
1778 /* --------------------------------------------------------------------------------------------- */
1781 redo_diff (WDiff
* dview
)
1783 FBUF
*const *f
= dview
->f
;
1793 if (dview
->opt
.quality
== 2)
1795 strcat (extra
, " -d");
1797 if (dview
->opt
.quality
== 1)
1799 strcat (extra
, " --speed-large-files");
1801 if (dview
->opt
.strip_trailing_cr
)
1803 strcat (extra
, " --strip-trailing-cr");
1805 if (dview
->opt
.ignore_tab_expansion
)
1807 strcat (extra
, " -E");
1809 if (dview
->opt
.ignore_space_change
)
1811 strcat (extra
, " -b");
1813 if (dview
->opt
.ignore_all_space
)
1815 strcat (extra
, " -w");
1817 if (dview
->opt
.ignore_case
)
1819 strcat (extra
, " -i");
1822 if (dview
->dsrc
!= DATA_SRC_MEM
)
1828 ops
= g_array_new (FALSE
, FALSE
, sizeof (DIFFCMD
));
1829 ndiff
= dff_execute (dview
->args
, extra
, dview
->file
[0], dview
->file
[1], ops
);
1832 g_array_free (ops
, TRUE
);
1836 ctx
.dsrc
= dview
->dsrc
;
1839 ctx
.a
= dview
->a
[0];
1841 rv
|= dff_reparse (0, dview
->file
[0], ops
, printer
, &ctx
);
1843 ctx
.a
= dview
->a
[1];
1845 rv
|= dff_reparse (1, dview
->file
[1], ops
, printer
, &ctx
);
1847 g_array_free (ops
, TRUE
);
1849 if (rv
!= 0 || dview
->a
[0]->len
!= dview
->a
[1]->len
)
1852 if (dview
->dsrc
== DATA_SRC_TMP
)
1858 if (dview
->dsrc
== DATA_SRC_MEM
&& HDIFF_ENABLE
)
1860 dview
->hdiff
= g_ptr_array_new ();
1861 if (dview
->hdiff
!= NULL
)
1866 for (i
= 0; i
< dview
->a
[0]->len
; i
++)
1869 p
= &g_array_index (dview
->a
[0], DIFFLN
, i
);
1870 q
= &g_array_index (dview
->a
[1], DIFFLN
, i
);
1871 if (p
->line
&& q
->line
&& p
->ch
== CHG_CH
)
1873 h
= g_array_new (FALSE
, FALSE
, sizeof (BRACKET
));
1876 gboolean runresult
=
1877 hdiff_scan (p
->p
, p
->u
.len
, q
->p
, q
->u
.len
, HDIFF_MINCTX
, h
,
1881 g_array_free (h
, TRUE
);
1886 g_ptr_array_add (dview
->hdiff
, h
);
1893 /* --------------------------------------------------------------------------------------------- */
1896 destroy_hdiff (WDiff
* dview
)
1898 if (dview
->hdiff
!= NULL
)
1901 int len
= dview
->a
[0]->len
;
1902 for (i
= 0; i
< len
; i
++)
1904 GArray
*h
= (GArray
*) g_ptr_array_index (dview
->hdiff
, i
);
1907 g_array_free (h
, TRUE
);
1910 g_ptr_array_free (dview
->hdiff
, TRUE
);
1911 dview
->hdiff
= NULL
;
1914 mc_search_free (dview
->search
.handle
);
1915 dview
->search
.handle
= NULL
;
1916 g_free (dview
->search
.last_string
);
1917 dview
->search
.last_string
= NULL
;
1920 /* --------------------------------------------------------------------------------------------- */
1921 /* stuff ******************************************************************** */
1924 get_digits (unsigned int n
)
1934 /* --------------------------------------------------------------------------------------------- */
1937 get_line_numbers (const GArray
* a
, size_t pos
, int *linenum
, int *lineofs
)
1951 p
= &g_array_index (a
, DIFFLN
, pos
);
1956 for (n
= pos
; n
> 0; n
--)
1964 *lineofs
= pos
- n
+ 1;
1972 /* --------------------------------------------------------------------------------------------- */
1975 calc_nwidth (const GArray
** const a
)
1979 get_line_numbers (a
[0], a
[0]->len
- 1, &l1
, &o1
);
1980 get_line_numbers (a
[1], a
[1]->len
- 1, &l2
, &o2
);
1985 return get_digits (l1
);
1988 /* --------------------------------------------------------------------------------------------- */
1991 find_prev_hunk (const GArray
* a
, int pos
)
1994 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
1998 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2002 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2006 if (pos
> 0 && (size_t) pos
< a
->len
)
2009 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
== EQU_CH
)
2013 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
- 1))->ch
!= EQU_CH
)
2022 /* --------------------------------------------------------------------------------------------- */
2025 find_next_hunk (const GArray
* a
, size_t pos
)
2027 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2031 while (pos
< a
->len
&& ((DIFFLN
*) & g_array_index (a
, DIFFLN
, pos
))->ch
== EQU_CH
)
2039 * Find start and end lines of the current hunk.
2041 * \param dview - widget WDiff
2042 * \return boolean and
2043 * start_line1 first line of current hunk (file[0])
2044 * end_line1 last line of current hunk (file[0])
2045 * start_line1 first line of current hunk (file[0])
2046 * end_line1 last line of current hunk (file[0])
2049 get_current_hunk (WDiff
* dview
, int *start_line1
, int *end_line1
, int *start_line2
, int *end_line2
)
2051 const GArray
*a0
= dview
->a
[0];
2052 const GArray
*a1
= dview
->a
[1];
2062 pos
= dview
->skip_rows
;
2063 ch
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
;
2078 while (pos
> 0 && ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2084 *start_line1
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
+ 1;
2085 *start_line2
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
+ 1;
2087 pos
= dview
->skip_rows
;
2088 while (pos
< a0
->len
&& ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->ch
!= EQU_CH
)
2091 l0
= ((DIFFLN
*) & g_array_index (a0
, DIFFLN
, pos
))->line
;
2092 l1
= ((DIFFLN
*) & g_array_index (a1
, DIFFLN
, pos
))->line
;
2094 *end_line1
= max (*start_line1
, l0
);
2096 *end_line2
= max (*start_line2
, l1
);
2104 dview_remove_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
)
2109 f0
= fopen (dview
->file
[0], "r");
2111 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2114 fputs (buf
, merge_file
);
2116 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2120 fputs (buf
, merge_file
);
2126 dview_add_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int from2
, int to2
)
2132 f0
= fopen (dview
->file
[0], "r");
2133 f1
= fopen (dview
->file
[1], "r");
2135 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line
< from1
- 1)
2138 fputs (buf
, merge_file
);
2141 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line
<= to2
)
2145 fputs (buf
, merge_file
);
2147 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2149 fputs (buf
, merge_file
);
2156 dview_replace_hunk (WDiff
* dview
, FILE * merge_file
, int from1
, int to1
, int from2
, int to2
)
2162 f0
= fopen (dview
->file
[0], "r");
2163 f1
= fopen (dview
->file
[1], "r");
2165 while (fgets (buf
, sizeof (buf
), f0
) != NULL
&& line1
< from1
- 1)
2168 fputs (buf
, merge_file
);
2171 while (fgets (buf
, sizeof (buf
), f1
) != NULL
&& line2
<= to2
)
2175 fputs (buf
, merge_file
);
2177 while (fgets (buf
, sizeof (buf
), f0
) != NULL
)
2181 fputs (buf
, merge_file
);
2188 do_merge_hunk (WDiff
* dview
)
2190 int from1
, to1
, from2
, to2
;
2194 hunk
= get_current_hunk (dview
, &from1
, &to1
, &from2
, &to2
);
2199 char *merge_file_name
= NULL
;
2203 dview
->merged
= mc_util_make_backup_if_possible (dview
->file
[0], "~~~");
2206 message (D_ERROR
, MSG_ERROR
,
2207 _("Cannot create backup file\n%s%s\n%s"),
2208 dview
->file
[0], "~~~", unix_error_string (errno
));
2214 merge_file_fd
= mc_mkstemps (&merge_file_name
, "mcmerge", NULL
);
2215 if (merge_file_fd
== -1)
2217 message (D_ERROR
, MSG_ERROR
, _("Cannot create temporary merge file\n%s"),
2218 unix_error_string (errno
));
2222 merge_file
= fdopen (merge_file_fd
, "w");
2227 dview_remove_hunk (dview
, merge_file
, from1
, to1
);
2230 dview_add_hunk (dview
, merge_file
, from1
, from2
, to2
);
2233 dview_replace_hunk (dview
, merge_file
, from1
, to1
, from2
, to2
);
2236 fflush (merge_file
);
2237 fclose (merge_file
);
2238 res
= rewrite_backup_content (merge_file_name
, dview
->file
[0]);
2239 unlink (merge_file_name
);
2240 g_free (merge_file_name
);
2244 /* --------------------------------------------------------------------------------------------- */
2245 /* view routines and callbacks ********************************************** */
2248 dview_compute_split (WDiff
* dview
, int i
)
2251 if (dview
->bias
< 2 - dview
->half1
)
2253 dview
->bias
= 2 - dview
->half1
;
2255 if (dview
->bias
> dview
->half2
- 2)
2257 dview
->bias
= dview
->half2
- 2;
2261 /* --------------------------------------------------------------------------------------------- */
2264 dview_compute_areas (WDiff
* dview
)
2266 dview
->height
= LINES
- 2;
2267 dview
->half1
= COLS
/ 2;
2268 dview
->half2
= COLS
- dview
->half1
;
2270 dview_compute_split (dview
, 0);
2273 /* --------------------------------------------------------------------------------------------- */
2276 dview_init (WDiff
* dview
, const char *args
, const char *file1
, const char *file2
,
2277 const char *label1
, const char *label2
, DSRC dsrc
)
2285 if (dsrc
== DATA_SRC_TMP
)
2298 else if (dsrc
== DATA_SRC_ORG
)
2300 f
[0] = f_open (file1
, O_RDONLY
);
2304 f
[1] = f_open (file2
, O_RDONLY
);
2313 dview
->file
[0] = file1
;
2314 dview
->file
[1] = file2
;
2315 dview
->label
[0] = g_strdup (label1
);
2316 dview
->label
[1] = g_strdup (label2
);
2319 dview
->hdiff
= NULL
;
2321 dview
->converter
= str_cnv_from_term
;
2322 dview_set_codeset (dview
);
2324 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2325 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2327 ndiff
= redo_diff (dview
);
2330 /* goto WIDGET_DESTROY stage: dview_fini() */
2334 dview
->ndiff
= ndiff
;
2336 dview
->view_quit
= 0;
2339 dview
->new_frame
= 1;
2340 dview
->skip_rows
= 0;
2341 dview
->skip_cols
= 0;
2342 dview
->display_symbols
= 0;
2343 dview
->display_numbers
= 0;
2345 dview
->tab_size
= 8;
2349 dview
->search
.handle
= NULL
;
2350 dview
->search
.last_string
= NULL
;
2351 dview
->search
.last_found_line
= -1;
2352 dview
->search
.last_accessed_num_line
= 0;
2354 dview
->opt
.quality
= 0;
2355 dview
->opt
.strip_trailing_cr
= 0;
2356 dview
->opt
.ignore_tab_expansion
= 0;
2357 dview
->opt
.ignore_space_change
= 0;
2358 dview
->opt
.ignore_all_space
= 0;
2359 dview
->opt
.ignore_case
= 0;
2361 dview_compute_areas (dview
);
2366 /* --------------------------------------------------------------------------------------------- */
2369 dview_reread (WDiff
* dview
)
2371 int ndiff
= dview
->ndiff
;
2372 destroy_hdiff (dview
);
2374 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2375 g_array_free (dview
->a
[0], TRUE
);
2376 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2377 g_array_free (dview
->a
[1], TRUE
);
2379 dview
->a
[0] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2380 dview
->a
[1] = g_array_new (FALSE
, FALSE
, sizeof (DIFFLN
));
2382 ndiff
= redo_diff (dview
);
2385 dview
->ndiff
= ndiff
;
2389 /* --------------------------------------------------------------------------------------------- */
2391 dview_diff_options (WDiff
* dview
)
2393 const char *quality_str
[] = {
2395 N_("&Fastest (Assume large files)"),
2396 N_("&Minimal (Find a smaller set of change)")
2399 QuickWidget diffopt_widgets
[] = {
2400 QUICK_BUTTON (6, 10, 14, OPTY
, N_("&Cancel"), B_CANCEL
, NULL
),
2401 QUICK_BUTTON (2, 10, 14, OPTY
, N_("&OK"), B_ENTER
, NULL
),
2403 QUICK_CHECKBOX (3, OPTX
, 12, OPTY
,
2404 N_("Strip &trailing carriage return"), &dview
->opt
.strip_trailing_cr
),
2405 QUICK_CHECKBOX (3, OPTX
, 11, OPTY
,
2406 N_("Ignore all &whitespace"), &dview
->opt
.ignore_all_space
),
2407 QUICK_CHECKBOX (3, OPTX
, 10, OPTY
,
2408 N_("Ignore &space change"), &dview
->opt
.ignore_space_change
),
2409 QUICK_CHECKBOX (3, OPTX
, 9, OPTY
,
2410 N_("Ignore tab &expansion"), &dview
->opt
.ignore_tab_expansion
),
2411 QUICK_CHECKBOX (3, OPTX
, 8, OPTY
,
2412 N_("&Ignore case"), &dview
->opt
.ignore_case
),
2413 QUICK_LABEL (3, OPTX
, 7, OPTY
, N_("Diff extra options")),
2414 QUICK_RADIO (3, OPTX
, 3, OPTY
,
2415 3, (const char **) quality_str
, (int *) &dview
->opt
.quality
),
2416 QUICK_LABEL (3, OPTX
, 2, OPTY
, N_("Diff algorithm")),
2421 QuickDialog diffopt
= {
2423 N_("Diff Options"), "[Diff Options]",
2427 if (quick_dialog (&diffopt
) != B_CANCEL
)
2429 dview_reread (dview
);
2433 /* --------------------------------------------------------------------------------------------- */
2436 dview_fini (WDiff
* dview
)
2438 if (dview
->dsrc
!= DATA_SRC_MEM
)
2440 f_close (dview
->f
[1]);
2441 f_close (dview
->f
[0]);
2444 if (dview
->converter
!= str_cnv_from_term
)
2445 str_close_conv (dview
->converter
);
2447 destroy_hdiff (dview
);
2448 g_array_foreach (dview
->a
[0], DIFFLN
, cc_free_elt
);
2449 g_array_free (dview
->a
[0], TRUE
);
2450 g_array_foreach (dview
->a
[1], DIFFLN
, cc_free_elt
);
2451 g_array_free (dview
->a
[1], TRUE
);
2453 g_free (dview
->label
[0]);
2454 g_free (dview
->label
[1]);
2460 /* --------------------------------------------------------------------------------------------- */
2463 dview_display_file (const WDiff
* dview
, int ord
, int r
, int c
, int height
, int width
)
2468 FBUF
*f
= dview
->f
[ord
];
2469 int skip
= dview
->skip_cols
;
2470 int display_symbols
= dview
->display_symbols
;
2471 int display_numbers
= dview
->display_numbers
;
2472 int show_cr
= dview
->show_cr
;
2475 int nwidth
= display_numbers
;
2476 int xwidth
= display_symbols
+ display_numbers
;
2477 if (dview
->tab_size
> 0 && dview
->tab_size
< 9)
2478 tab_size
= dview
->tab_size
;
2482 if (xwidth
> width
&& display_symbols
)
2485 display_symbols
= 0;
2487 if (xwidth
> width
&& display_numbers
)
2490 display_numbers
= width
;
2504 if ((int) sizeof (buf
) <= width
|| (int) sizeof (buf
) <= nwidth
)
2506 /* abnormal, but avoid buffer overflow */
2510 for (i
= dview
->skip_rows
, j
= 0; i
< dview
->a
[ord
]->len
&& j
< height
; j
++, i
++)
2512 int ch
, next_ch
, col
;
2514 p
= (DIFFLN
*) & g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2516 tty_setcolor (NORMAL_COLOR
);
2517 if (display_symbols
)
2519 tty_gotoyx (r
+ j
, c
- 2);
2520 tty_print_char (ch
);
2524 if (display_numbers
)
2526 tty_gotoyx (r
+ j
, c
- xwidth
);
2527 g_snprintf (buf
, display_numbers
+ 1, "%*d", nwidth
, p
->line
);
2528 tty_print_string (str_fit_to_term (buf
, nwidth
, J_LEFT_FIT
));
2532 tty_setcolor (DFF_ADD_COLOR
);
2536 tty_setcolor (DFF_CHG_COLOR
);
2540 if (i
== (size_t) dview
->search
.last_found_line
)
2542 tty_setcolor (MARKED_SELECTED_COLOR
);
2546 if (dview
->hdiff
!= NULL
&& g_ptr_array_index (dview
->hdiff
, i
) != NULL
)
2550 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2553 cvt_mgeta (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
,
2554 g_ptr_array_index (dview
->hdiff
, i
), ord
, att
);
2555 tty_gotoyx (r
+ j
, c
);
2557 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2563 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2566 if (!g_unichar_isprint (next_ch
))
2570 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2573 tty_setcolor (att
[cnt
] ? DFF_CHH_COLOR
: DFF_CHG_COLOR
);
2580 convert_from_8bit_to_utf_c ((unsigned char) next_ch
,
2584 else if (dview
->utf8
)
2586 convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2589 next_ch
= convert_to_display_c (next_ch
);
2591 tty_print_anychar (next_ch
);
2597 else if (ch
== CHG_CH
)
2599 tty_setcolor (DFF_CHH_COLOR
);
2603 k
= dview_str_utf8_offset_to_pos (p
->p
, width
);
2606 cvt_mget (p
->p
, p
->u
.len
, buf
, k
, skip
, tab_size
, show_cr
);
2610 cvt_fget (f
, p
->u
.off
, buf
, width
, skip
, tab_size
, show_cr
);
2615 if (display_numbers
)
2617 tty_gotoyx (r
+ j
, c
- xwidth
);
2618 memset (buf
, ' ', display_numbers
);
2619 buf
[display_numbers
] = '\0';
2620 tty_print_string (buf
);
2624 tty_setcolor (DFF_DEL_COLOR
);
2628 tty_setcolor (DFF_CHD_COLOR
);
2630 memset (buf
, ' ', width
);
2633 tty_gotoyx (r
+ j
, c
);
2634 /* tty_print_nstring (buf, width); */
2636 for (cnt
= 0; cnt
< strlen (buf
) && col
< width
; cnt
++)
2642 next_ch
= dview_get_utf (buf
+ cnt
, &w
, &ch_res
);
2645 if (!g_unichar_isprint (next_ch
))
2649 next_ch
= dview_get_byte (buf
+ cnt
, &ch_res
);
2658 convert_from_8bit_to_utf_c ((unsigned char) next_ch
, dview
->converter
);
2661 else if (dview
->utf8
)
2662 next_ch
= convert_from_utf_to_current_c (next_ch
, dview
->converter
);
2665 next_ch
= convert_to_display_c (next_ch
);
2667 tty_print_anychar (next_ch
);
2673 tty_setcolor (NORMAL_COLOR
);
2675 if (width
< xwidth
- 1)
2679 memset (buf
, ' ', k
);
2681 for (; j
< height
; j
++)
2685 tty_gotoyx (r
+ j
, c
- xwidth
);
2686 /* tty_print_nstring (buf, xwidth - 1); */
2687 tty_print_string (str_fit_to_term (buf
, xwidth
- 1, J_LEFT_FIT
));
2689 tty_gotoyx (r
+ j
, c
);
2690 /* tty_print_nstring (buf, width); */
2691 tty_print_string (str_fit_to_term (buf
, width
, J_LEFT_FIT
));
2697 /* --------------------------------------------------------------------------------------------- */
2700 dview_status (const WDiff
* dview
, int ord
, int width
, int c
)
2702 int skip_rows
= dview
->skip_rows
;
2703 int skip_cols
= dview
->skip_cols
;
2707 int linenum
, lineofs
;
2709 tty_setcolor (SELECTED_COLOR
);
2712 get_line_numbers (dview
->a
[ord
], skip_rows
, &linenum
, &lineofs
);
2714 filename_width
= width
- 22;
2715 if (filename_width
< 8)
2719 if (filename_width
>= (int) sizeof (buf
))
2721 /* abnormal, but avoid buffer overflow */
2722 filename_width
= sizeof (buf
) - 1;
2724 trim (strip_home_and_password (dview
->label
[ord
]), buf
, filename_width
);
2727 tty_printf ("%-*s %6d+%-4d Col %-4d ", filename_width
, buf
, linenum
, lineofs
, skip_cols
);
2731 tty_printf ("%-*s %6d+%-4d Dif %-4d ", filename_width
, buf
, linenum
, lineofs
, dview
->ndiff
);
2735 /* --------------------------------------------------------------------------------------------- */
2738 dview_redo (WDiff
* dview
)
2740 if (dview
->display_numbers
)
2742 int old
= dview
->display_numbers
;
2743 dview
->display_numbers
= calc_nwidth ((const GArray
**) dview
->a
);
2744 dview
->new_frame
= (old
!= dview
->display_numbers
);
2746 dview_reread (dview
);
2749 /* --------------------------------------------------------------------------------------------- */
2752 dview_edit (WDiff
* dview
, int ord
)
2756 int linenum
, lineofs
;
2758 if (dview
->dsrc
== DATA_SRC_TMP
)
2760 error_dialog (_("Edit"), _("Edit is disabled"));
2764 h
= ((Widget
*) dview
)->owner
;
2767 get_line_numbers (dview
->a
[ord
], dview
->skip_rows
, &linenum
, &lineofs
);
2768 h
->modal
= TRUE
; /* not allow edit file in several editors */
2769 do_edit_at_line (dview
->file
[ord
], linenum
);
2772 dview_update (dview
);
2775 /* --------------------------------------------------------------------------------------------- */
2778 dview_goto_cmd (WDiff
* dview
, int ord
)
2780 static const char *title
[2] = { N_("Goto line (left)"), N_("Goto line (right)") };
2781 static char prev
[256];
2782 /* XXX some statics here, to be remembered between runs */
2787 input
= input_dialog (_(title
[ord
]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE
, prev
);
2790 const char *s
= input
;
2791 if (scan_deci (&s
, &newline
) == 0 && *s
== '\0')
2797 for (; i
< dview
->a
[ord
]->len
; i
++)
2799 p
= &g_array_index (dview
->a
[ord
], DIFFLN
, i
);
2800 if (p
->line
== newline
)
2806 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= i
;
2807 g_snprintf (prev
, sizeof (prev
), "%d", newline
);
2813 /* --------------------------------------------------------------------------------------------- */
2816 dview_labels (WDiff
* dview
)
2818 Dlg_head
*h
= dview
->widget
.owner
;
2819 WButtonBar
*b
= find_buttonbar (h
);
2821 buttonbar_set_label (b
, 1, Q_ ("ButtonBar|Help"), diff_map
, (Widget
*) dview
);
2822 buttonbar_set_label (b
, 2, Q_ ("ButtonBar|Save"), diff_map
, (Widget
*) dview
);
2823 buttonbar_set_label (b
, 4, Q_ ("ButtonBar|Edit"), diff_map
, (Widget
*) dview
);
2824 buttonbar_set_label (b
, 5, Q_ ("ButtonBar|Merge"), diff_map
, (Widget
*) dview
);
2825 buttonbar_set_label (b
, 7, Q_ ("ButtonBar|Search"), diff_map
, (Widget
*) dview
);
2826 buttonbar_set_label (b
, 9, Q_ ("ButtonBar|Options"), diff_map
, (Widget
*) dview
);
2827 buttonbar_set_label (b
, 10, Q_ ("ButtonBar|Quit"), diff_map
, (Widget
*) dview
);
2831 /* --------------------------------------------------------------------------------------------- */
2834 dview_event (Gpm_Event
* event
, void *x
)
2836 WDiff
*dview
= (WDiff
*) x
;
2837 int result
= MOU_NORMAL
;
2839 /* We are not interested in the release events */
2840 if ((event
->type
& (GPM_DOWN
| GPM_DRAG
)) == 0)
2846 if ((event
->buttons
& GPM_B_UP
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2848 dview
->skip_rows
-= 2;
2849 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2850 dview_update (dview
);
2852 else if ((event
->buttons
& GPM_B_DOWN
) != 0 && (event
->type
& GPM_DOWN
) != 0)
2854 dview
->skip_rows
+= 2;
2855 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
2856 dview_update (dview
);
2863 dview_save (WDiff
* dview
)
2865 gboolean res
= TRUE
;
2868 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2869 dview
->merged
= !res
;
2874 dview_do_save (WDiff
* dview
)
2876 (void) dview_save (dview
);
2880 dview_save_options (WDiff
* dview
)
2882 mc_config_set_bool (mc_main_config
, "DiffView", "show_symbols",
2883 dview
->display_symbols
!= 0 ? TRUE
: FALSE
);
2884 mc_config_set_bool (mc_main_config
, "DiffView", "show_numbers",
2885 dview
->display_numbers
!= 0 ? TRUE
: FALSE
);
2886 mc_config_set_int (mc_main_config
, "DiffView", "tab_size", dview
->tab_size
);
2888 mc_config_set_int (mc_main_config
, "DiffView", "diff_quality", dview
->opt
.quality
);
2890 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_tws",
2891 dview
->opt
.strip_trailing_cr
);
2892 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_all_space",
2893 dview
->opt
.ignore_all_space
);
2894 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_space_change",
2895 dview
->opt
.ignore_space_change
);
2896 mc_config_set_bool (mc_main_config
, "DiffView", "diff_tab_expansion",
2897 dview
->opt
.ignore_tab_expansion
);
2898 mc_config_set_bool (mc_main_config
, "DiffView", "diff_ignore_case", dview
->opt
.ignore_case
);
2902 dview_load_options (WDiff
* dview
)
2904 gboolean show_numbers
, show_symbols
;
2907 show_symbols
= mc_config_get_bool (mc_main_config
, "DiffView", "show_symbols", FALSE
);
2909 dview
->display_symbols
= 1;
2910 show_numbers
= mc_config_get_bool (mc_main_config
, "DiffView", "show_numbers", FALSE
);
2912 dview
->display_numbers
= calc_nwidth ((const GArray
** const) dview
->a
);
2913 tab_size
= mc_config_get_int (mc_main_config
, "DiffView", "tab_size", 8);
2914 if (tab_size
> 0 && tab_size
< 9)
2915 dview
->tab_size
= tab_size
;
2917 dview
->tab_size
= 8;
2919 dview
->opt
.quality
= mc_config_get_int (mc_main_config
, "DiffView", "diff_quality", 0);
2921 dview
->opt
.strip_trailing_cr
=
2922 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_tws", FALSE
);
2923 dview
->opt
.ignore_all_space
=
2924 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_all_space", FALSE
);
2925 dview
->opt
.ignore_space_change
=
2926 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_space_change", FALSE
);
2927 dview
->opt
.ignore_tab_expansion
=
2928 mc_config_get_bool (mc_main_config
, "DiffView", "diff_tab_expansion", FALSE
);
2929 dview
->opt
.ignore_case
=
2930 mc_config_get_bool (mc_main_config
, "DiffView", "diff_ignore_case", FALSE
);
2932 dview
->new_frame
= 1;
2936 * Check if it's OK to close the diff viewer. If there are unsaved changes,
2940 dview_ok_to_exit (WDiff
* dview
)
2942 gboolean res
= TRUE
;
2945 switch (query_dialog
2946 (_("Quit"), _("File was modified, Save with exit?"), D_NORMAL
, 2, _("&Yes"),
2954 (void) dview_save (dview
);
2958 if (mc_util_restore_from_backup_if_possible (dview
->file
[0], "~~~"))
2959 res
= mc_util_unlink_backup_if_possible (dview
->file
[0], "~~~");
2965 /* --------------------------------------------------------------------------------------------- */
2968 dview_execute_cmd (WDiff
* dview
, unsigned long command
)
2970 cb_ret_t res
= MSG_HANDLED
;
2974 interactive_display (NULL
, "[Diff Viewer]");
2976 case CK_DiffDisplaySymbols
:
2977 dview
->display_symbols
^= 1;
2978 dview
->new_frame
= 1;
2980 case CK_DiffDisplayNumbers
:
2981 dview
->display_numbers
^= calc_nwidth ((const GArray
** const) dview
->a
);
2982 dview
->new_frame
= 1;
2986 dview
->new_frame
= 1;
2992 dview
->new_frame
= 1;
2995 case CK_DiffSplitMore
:
2998 dview_compute_split (dview
, 1);
2999 dview
->new_frame
= 1;
3003 case CK_DiffSplitLess
:
3006 dview_compute_split (dview
, -1);
3007 dview
->new_frame
= 1;
3010 case CK_DiffSetTab2
:
3011 dview
->tab_size
= 2;
3013 case CK_DiffSetTab3
:
3014 dview
->tab_size
= 3;
3016 case CK_DiffSetTab4
:
3017 dview
->tab_size
= 4;
3019 case CK_DiffSetTab8
:
3020 dview
->tab_size
= 8;
3022 case CK_DiffSwapPanel
:
3028 case CK_DiffNextHunk
:
3029 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3030 find_next_hunk (dview
->a
[0], dview
->skip_rows
);
3032 case CK_DiffPrevHunk
:
3033 dview
->skip_rows
= dview
->search
.last_accessed_num_line
=
3034 find_prev_hunk (dview
->a
[0], dview
->skip_rows
);
3037 dview_goto_cmd (dview
, TRUE
);
3039 case CK_DiffEditCurrent
:
3040 dview_edit (dview
, dview
->ord
);
3042 case CK_DiffMergeCurrentHunk
:
3043 do_merge_hunk (dview
);
3046 case CK_DiffEditOther
:
3047 dview_edit (dview
, dview
->ord
^ 1);
3050 dview_search_cmd (dview
);
3052 case CK_DiffContinueSearch
:
3053 dview_continue_search_cmd (dview
);
3056 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3059 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= dview
->a
[0]->len
- 1;
3063 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3067 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3069 case CK_DiffPageDown
:
3070 dview
->skip_rows
+= dview
->height
- 2;
3071 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3074 dview
->skip_rows
-= dview
->height
- 2;
3075 dview
->search
.last_accessed_num_line
= dview
->skip_rows
;
3083 case CK_DiffQuickLeft
:
3084 dview
->skip_cols
-= 8;
3086 case CK_DiffQuickRight
:
3087 dview
->skip_cols
+= 8;
3090 dview
->skip_cols
= 0;
3092 case CK_ShowCommandLine
:
3096 dview
->view_quit
= 1;
3099 dview_do_save (dview
);
3101 case CK_DiffOptions
:
3102 dview_diff_options (dview
);
3104 case CK_SelectCodepage
:
3105 dview_select_encoding (dview
);
3106 dview_reread (dview
);
3107 tty_touch_screen ();
3111 res
= MSG_NOT_HANDLED
;
3116 /* --------------------------------------------------------------------------------------------- */
3119 dview_handle_key (WDiff
* dview
, int key
)
3121 unsigned long command
;
3123 key
= convert_from_input_c (key
);
3125 command
= lookup_keymap_command (diff_map
, key
);
3126 if ((command
!= CK_Ignore_Key
) && (dview_execute_cmd (dview
, command
) == MSG_HANDLED
))
3130 return MSG_NOT_HANDLED
;
3133 /* --------------------------------------------------------------------------------------------- */
3136 dview_callback (Widget
* w
, widget_msg_t msg
, int parm
)
3138 WDiff
*dview
= (WDiff
*) w
;
3139 Dlg_head
*h
= dview
->widget
.owner
;
3145 dview_labels (dview
);
3146 dview_load_options (dview
);
3147 dview_update (dview
);
3151 dview
->new_frame
= 1;
3152 dview_update (dview
);
3156 i
= dview_handle_key (dview
, parm
);
3157 if (dview
->view_quit
)
3160 dview_update (dview
);
3163 case WIDGET_COMMAND
:
3164 i
= dview_execute_cmd (dview
, parm
);
3165 if (dview
->view_quit
)
3168 dview_update (dview
);
3171 case WIDGET_DESTROY
:
3172 dview_save_options (dview
);
3177 return default_proc (msg
, parm
);
3181 /* --------------------------------------------------------------------------------------------- */
3184 dview_adjust_size (Dlg_head
* h
)
3189 /* Look up the viewer and the buttonbar, we assume only two widgets here */
3190 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3191 bar
= find_buttonbar (h
);
3192 widget_set_size (&dview
->widget
, 0, 0, LINES
- 1, COLS
);
3193 widget_set_size ((Widget
*) bar
, LINES
- 1, 0, 1, COLS
);
3195 dview_compute_areas (dview
);
3198 /* --------------------------------------------------------------------------------------------- */
3201 dview_dialog_callback (Dlg_head
* h
, Widget
* sender
, dlg_msg_t msg
, int parm
, void *data
)
3203 WDiff
*dview
= (WDiff
*) data
;
3208 dview_adjust_size (h
);
3212 /* command from buttonbar */
3213 return send_message ((Widget
*) dview
, WIDGET_COMMAND
, parm
);
3216 dview
= (WDiff
*) find_widget_type (h
, dview_callback
);
3217 if (!dview_ok_to_exit (dview
))
3218 h
->state
= DLG_ACTIVE
;
3220 h
->state
= DLG_CLOSED
;
3225 return default_dlg_callback (h
, sender
, msg
, parm
, data
);
3229 /* --------------------------------------------------------------------------------------------- */
3232 dview_get_title (const Dlg_head
*h
, size_t len
)
3234 const WDiff
*dview
= (const WDiff
*) find_widget_type (h
, dview_callback
);
3235 const char *modified
= dview
->merged
? " (*) " : " ";
3238 len
-= (size_t) str_term_width1 (_("Diff:")) + strlen (modified
);
3241 return g_strconcat (_("Diff:"), modified
,
3242 str_term_trim (dview
->label
[0], len1
), " | ",
3243 str_term_trim (dview
->label
[1], len
- len1
), (char *) NULL
);
3246 /*** public functions ****************************************************************************/
3247 /* --------------------------------------------------------------------------------------------- */
3250 diff_view (const char *file1
, const char *file2
, const char *label1
, const char *label2
)
3254 Dlg_head
*dview_dlg
;
3256 /* Create dialog and widgets, put them on the dialog */
3258 create_dlg (FALSE
, 0, 0, LINES
, COLS
, NULL
, dview_dialog_callback
,
3259 "[Diff Viewer]", NULL
, DLG_WANT_TAB
);
3261 dview
= g_new0 (WDiff
, 1);
3263 init_widget (&dview
->widget
, 0, 0, LINES
- 1, COLS
,
3264 (callback_fn
) dview_callback
, (mouse_h
) dview_event
);
3266 widget_want_cursor (dview
->widget
, 0);
3268 add_widget (dview_dlg
, dview
);
3269 add_widget (dview_dlg
, buttonbar_new (TRUE
));
3271 dview_dlg
->get_title
= dview_get_title
;
3273 error
= dview_init (dview
, "-a", file1
, file2
, label1
, label2
, DATA_SRC_MEM
); /* XXX binary diff? */
3275 /* Please note that if you add another widget,
3276 * you have to modify dview_adjust_size to
3280 run_dlg (dview_dlg
);
3282 if ((error
!= 0) || (dview_dlg
->state
== DLG_CLOSED
))
3283 destroy_dlg (dview_dlg
);
3288 /* --------------------------------------------------------------------------------------------- */
3290 #define GET_FILE_AND_STAMP(n) \
3293 real_file##n = file##n; \
3294 if (!vfs_file_is_local(file##n)) { \
3295 real_file##n = mc_getlocalcopy(file##n); \
3296 if (real_file##n != NULL) { \
3298 if (mc_stat(real_file##n, &st##n) != 0) { \
3304 #define UNGET_FILE(n) \
3306 if (use_copy##n) { \
3308 if (use_copy##n > 0) { \
3309 time_t mtime = st##n.st_mtime; \
3310 if (mc_stat(real_file##n, &st##n) == 0) { \
3311 changed = (mtime != st##n.st_mtime); \
3314 mc_ungetlocalcopy(file##n, real_file##n, changed); \
3315 g_free(real_file##n); \
3320 dview_diff_cmd (void)
3328 if (mc_run_mode
== MC_RUN_FULL
)
3330 const WPanel
*panel0
= current_panel
;
3331 const WPanel
*panel1
= other_panel
;
3332 if (get_current_index ())
3334 panel0
= other_panel
;
3335 panel1
= current_panel
;
3337 file0
= concat_dir_and_file (panel0
->cwd
, selection (panel0
)->fname
);
3338 file1
= concat_dir_and_file (panel1
->cwd
, selection (panel1
)->fname
);
3339 is_dir0
= S_ISDIR (selection (panel0
)->st
.st_mode
);
3340 is_dir1
= S_ISDIR (selection (panel1
)->st
.st_mode
);
3346 if (file0
!= NULL
&& !is_dir0
&& file1
!= NULL
&& !is_dir1
)
3354 GET_FILE_AND_STAMP (0);
3355 GET_FILE_AND_STAMP (1);
3356 if (real_file0
!= NULL
&& real_file1
!= NULL
)
3358 rv
= diff_view (real_file0
, real_file1
, file0
, file1
);
3369 message (1, MSG_ERROR
, _("Two files are needed to compare"));
3372 /* --------------------------------------------------------------------------------------------- */
3375 dview_update (WDiff
* dview
)
3377 int height
= dview
->height
;
3381 int last
= dview
->a
[0]->len
- 1;
3383 if (dview
->skip_rows
> last
)
3385 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= last
;
3387 if (dview
->skip_rows
< 0)
3389 dview
->skip_rows
= dview
->search
.last_accessed_num_line
= 0;
3391 if (dview
->skip_cols
< 0)
3393 dview
->skip_cols
= 0;
3401 width1
= dview
->half1
+ dview
->bias
;
3402 width2
= dview
->half2
- dview
->bias
;
3409 if (dview
->new_frame
)
3411 int xwidth
= dview
->display_symbols
+ dview
->display_numbers
;
3413 tty_setcolor (NORMAL_COLOR
);
3416 tty_draw_box (1, 0, height
, width1
, FALSE
);
3420 tty_draw_box (1, width1
, height
, width2
, FALSE
);
3426 if (xwidth
< width1
- 1)
3428 tty_gotoyx (1, xwidth
);
3429 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3430 tty_gotoyx (height
, xwidth
);
3431 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3432 tty_draw_vline (2, xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3434 if (xwidth
< width2
- 1)
3436 tty_gotoyx (1, width1
+ xwidth
);
3437 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DTOPMIDDLE
], FALSE
);
3438 tty_gotoyx (height
, width1
+ xwidth
);
3439 tty_print_alt_char (mc_tty_frm
[MC_TTY_FRM_DBOTTOMMIDDLE
], FALSE
);
3440 tty_draw_vline (2, width1
+ xwidth
, mc_tty_frm
[MC_TTY_FRM_VERT
], height
- 2);
3443 dview
->new_frame
= 0;
3448 dview_status (dview
, dview
->ord
, width1
, 0);
3449 dview_display_file (dview
, dview
->ord
, 2, 1, height
- 2, width1
- 2);
3453 dview_status (dview
, dview
->ord
^ 1, width2
, width1
);
3454 dview_display_file (dview
, dview
->ord
^ 1, 2, width1
+ 1, height
- 2, width2
- 2);
3458 /* --------------------------------------------------------------------------------------------- */