Changeset 2135 for trunk/gui/src

Timestamp:

Mar 14, 2011 11:00:49 AM (13 years ago)

Author:

mmc

Message:

Changes for the regression tester. Fixed the Diffview widget to show
the highlight properly as the window is widened. Also, fixed the way
changes are handled at the very end after the last common line.

Added an "xml" method to the Tool object, so we can access the underlying
XML data for each run.

File:

• trunk/gui/src/RpDiffview.c (modified) (3 diffs)

trunk/gui/src/RpDiffview.c

@@ -1583 +1583 @@
           - dvPtr->yOffset;
     x = dvPtr->inset - dvPtr->xOffset;
-    width = Tk_Width(tkwin);
+
+    if (Tk_Width(tkwin) > dvPtr->maxWidth) {
+        width = Tk_Width(tkwin)+10;
+    } else {
+        width = dvPtr->maxWidth+10;
+    }
 
     for (i=dvPtr->topLine;
@@ -2346 +2351 @@
     DiffviewLines *lineLimitsPtr;   /* data structure being freed */
 {
-    if (lineLimitsPtr->startPtr) {
-        ckfree((char*)lineLimitsPtr->startPtr);
-    }
-    if (lineLimitsPtr->lenPtr) {
-        ckfree((char*)lineLimitsPtr->lenPtr);
-    }
-    ckfree((char*)lineLimitsPtr);
+    if (lineLimitsPtr) {
+        if (lineLimitsPtr->startPtr) {
+            ckfree((char*)lineLimitsPtr->startPtr);
+        }
+        if (lineLimitsPtr->lenPtr) {
+            ckfree((char*)lineLimitsPtr->lenPtr);
+        }
+        ckfree((char*)lineLimitsPtr);
+    }
 }
 
@@ -2594 +2601 @@
         i++; j++;
     }
+
+    /* lines left over? mark as many "changed" as possible */
+    if (limsPtr1->numLines-i > 0 && limsPtr2->numLines-j > 0) {
+        del = (limsPtr1->numLines-i < limsPtr2->numLines-j)
+                ? limsPtr1->numLines-i : limsPtr2->numLines-j;
+        DiffviewDiffsAppend(diffPtr, 'c', i, i+del-1, j, j+del-1);
+        i += del;
+        j += del;
+    }
+
+    /* still have lines left over? then mark them added or deleted */
     if (i < limsPtr1->numLines) {
         del = limsPtr1->numLines - i;