1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
|
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
|
-
+
|
}
return z&&*z ? fdb__outf(b, "%s", z) : 0;
}
static int fdb__splittxt_side(fsl_diff_builder * const b,
SplitTxt * const sst,
bool isLeft,
fsl_dline const * pLine){
fsl_dline const * const pLine){
int rc = fdb__splittxt_lineno(b, sst, isLeft,
pLine ? (isLeft ? b->lnLHS : b->lnRHS) : 0U);
if(0==rc){
uint32_t const w = maxColWidth(b, sst, isLeft ? STC_TEXT1 : STC_TEXT2);
if(pLine){
fsl_size_t const nU =
/* Measure column width in UTF8 characters, not bytes! */
|
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
|
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
|
-
+
-
+
+
-
+
+
-
+
+
-
-
+
+
|
if(0==rc && !isLeft) rc = fdb__out(b, "\n", 1);
}
return rc;
}
static void fdb__splittext_update_maxlen(SplitTxt * const sst,
int col,
char const * z,
char const * const z,
uint32_t n){
if(sst->maxWidths[col]<n){
#if 0
sst->maxWidths[col] = n;
#else
n = (uint32_t)fsl_strlen_utf8(z, (fsl_int_t)n);
if(sst->maxWidths[col]<n) sst->maxWidths[col] = n;
#endif
}
}
static int fdb__splittxt_common(fsl_diff_builder * const b, fsl_dline const * pLine){
static int fdb__splittxt_common(fsl_diff_builder * const b,
fsl_dline const * const pLine){
int rc = 0;
SPLITSTATE(sst);
++b->lnLHS;
++b->lnRHS;
if(1==b->passNumber){
fdb__splittext_update_maxlen(sst, STC_TEXT1, pLine->z, pLine->n);
fdb__splittext_update_maxlen(sst, STC_TEXT2, pLine->z, pLine->n);
return 0;
}
rc = fdb__splittxt_side(b, sst, true, pLine);
if(0==rc) rc = fdb__splittxt_mod(b, ' ');
if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine);
return rc;
}
static int fdb__splittxt_insertion(fsl_diff_builder * const b, fsl_dline const * pLine){
static int fdb__splittxt_insertion(fsl_diff_builder * const b,
fsl_dline const * const pLine){
int rc = 0;
SPLITSTATE(sst);
++b->lnRHS;
if(1==b->passNumber){
fdb__splittext_update_maxlen(sst, STC_TEXT1, pLine->z, pLine->n);
return rc;
}
rc = fdb__splittxt_color(b, 'i');
if(0==rc) rc = fdb__splittxt_side(b, sst, true, NULL);
if(0==rc) rc = fdb__splittxt_mod(b, '>');
if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine);
if(0==rc) rc = fdb__splittxt_color(b, 0);
return rc;
}
static int fdb__splittxt_deletion(fsl_diff_builder * const b, fsl_dline const * pLine){
static int fdb__splittxt_deletion(fsl_diff_builder * const b,
fsl_dline const * const pLine){
int rc = 0;
SPLITSTATE(sst);
++b->lnLHS;
if(1==b->passNumber){
fdb__splittext_update_maxlen(sst, STC_TEXT2, pLine->z, pLine->n);
return rc;
}
rc = fdb__splittxt_color(b, 'd');
if(0==rc) rc = fdb__splittxt_side(b, sst, true, pLine);
if(0==rc) rc = fdb__splittxt_mod(b, '<');
if(0==rc) rc = fdb__splittxt_side(b, sst, false, NULL);
if(0==rc) rc = fdb__splittxt_color(b, 0);
return rc;
}
static int fdb__splittxt_replacement(fsl_diff_builder * const b,
fsl_dline const * lineLhs,
fsl_dline const * lineRhs) {
fsl_dline const * const lineLhs,
fsl_dline const * const lineRhs) {
#if 0
int rc = b->deletion(b, lineLhs);
if(0==rc) rc = b->insertion(b, lineRhs);
return rc;
#else
int rc = 0;
SPLITSTATE(sst);
|