summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog1
-rw-r--r--dselect/methlist.cc2
-rw-r--r--dselect/pkgdisplay.cc2
4 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5035f1af6..93e4c41ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 8 10:14:27 GMT 2004 Colin Watson <cjwatson@debian.org>
+
+ * dselect/methlist.cc, dselect/pkgdisplay.cc: Set the total display width
+ to the maximum of TOTAL_LIST_WIDTH and COLS, improving display on wide
+ terminals.
+
Thu Mar 4 13:28:11 GMT 2004 Scott James Remnant <scott@netsplit.com>
* lib/tarfn.c: Copy the Name and LinkName elements and ensure they
diff --git a/debian/changelog b/debian/changelog
index 9a1c4ae11..ab9226286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.10.19) unstable; urgency=low
* Distinguish unmet build dependencies from build conflicts.
Closes: #217943, #235266.
* Force NULL-termination of all tar file entry names. Closes: #232025.
+ * Allow dselect to use the full window width. Closes: #139781.
-- Scott James Remnant <scott@netsplit.com> UNRELEASED
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 7761c49af..054e590d0 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -67,6 +67,8 @@ void methodlist::setwidths() {
description_column= name_column + name_width + gap_width;
total_width= TOTAL_LIST_WIDTH;
+ if (total_width < COLS)
+ total_width= COLS;
description_width= total_width - description_column;
}
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 2fc178092..a1f99b690 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -186,6 +186,8 @@ void packagelist::setwidths() {
}
total_width= TOTAL_LIST_WIDTH;
+ if (total_width < COLS)
+ total_width= COLS;
description_width= total_width - description_column;
}