dselect: Add new architecture columns to package list view

The new columns, shown by default, can be turned off with the new ‘A’
key, or bound to another key via the new “archdisplay” keybinding.

1 files changed, 18 insertions, 0 deletions

diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 5e596aa62..dde30b7f8 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -208,6 +208,19 @@ void packagelist::redraw1itemsel(int index, int selected) {
 
     waddch(listpad, ' ');
 
+    if (col_archinstalled.width) {
+      draw_column_sep(col_archinstalled, screenline);
+      draw_column_item(col_archinstalled, screenline, pkg->installed.arch->name);
+
+      waddch(listpad, ' ');
+    }
+    if (col_archavailable.width) {
+      draw_column_sep(col_archavailable, screenline);
+      draw_column_item(col_archavailable, screenline, pkg->available.arch->name);
+
+      waddch(listpad, ' ');
+    }
+
     if (col_versioninstalled.width) {
       draw_column_item(col_versioninstalled, screenline,
                        versiondescribe(&pkg->installed.version, vdew_nonambig));
@@ -279,6 +292,11 @@ void packagelist::redrawcolheads() {
     draw_column_head(col_priority);
     draw_column_head(col_package);
 
+    if (col_archinstalled.width)
+      draw_column_head(col_archinstalled);
+    if (col_archavailable.width)
+      draw_column_head(col_archavailable);
+
     if (col_versioninstalled.width)
       draw_column_head(col_versioninstalled);
     if (col_versionavailable.width)