From 5b622a2a0639a3cb9f67ffa9963160a57645bfa2 Mon Sep 17 00:00:00 2001
From: hauke <hauke@NetBSD.org>
Date: Sat, 24 May 2008 21:42:52 +0000
Subject: [PATCH] Attempting to fix display problems of PR mac68k/37874

(1) By moving the "Choose your partition" menu up one line, we gain two
lines, since the scroll... message is gone.
(2) With the mac68k MAXPARTITIONS == 8, we only need 7 lines for the
partition table, which does not display the 'c' partition.

After both changes, the display fits nicely on an 80x24 screen even
for a full partition table. Should mac68k want to bump MAXPARTITIONS,
though, the partition table needs to be scrollable.
---
 distrib/utils/sysinst/arch/mac68k/md.c        | 10 ++++++++--
 distrib/utils/sysinst/arch/mac68k/menus.md.de |  4 ++--
 distrib/utils/sysinst/arch/mac68k/menus.md.en |  4 ++--
 distrib/utils/sysinst/arch/mac68k/menus.md.es |  4 ++--
 distrib/utils/sysinst/arch/mac68k/menus.md.pl |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/distrib/utils/sysinst/arch/mac68k/md.c b/distrib/utils/sysinst/arch/mac68k/md.c
index 28f47e0fcf35..a02b5d9526e4 100644
--- a/distrib/utils/sysinst/arch/mac68k/md.c
+++ b/distrib/utils/sysinst/arch/mac68k/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.51 2008/01/28 02:47:15 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.52 2008/05/24 21:42:52 hauke Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -498,7 +498,13 @@ sortmerge(void)
     for (i=0,j=0;i<map.in_use_cnt;i++) {
         map.blk[i].pmSig = APPLE_PART_MAP_ENTRY_MAGIC;
         map.blk[i].pmMapBlkCnt = map.in_use_cnt;
-        if (whichType(&map.blk[i]) && (j < MAXPARTITIONS)) {
+	/*
+	 * Since MAXPARTITIONS == 8 for mac68k, and we do not display
+	 * the c partition, we only need 7 partition slots on the screen.
+	 * If/when MAXPARTITIONS is changed, the "Edit Disk Partition Map"
+	 * needs to be a scrollable view of the partition table.
+	 */
+        if (whichType(&map.blk[i]) && (j < MAXPARTITIONS - 1)) {
 		map.mblk[j++] = i;
 		map.usable_cnt += 1;
 	}
diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.de b/distrib/utils/sysinst/arch/mac68k/menus.md.de
index 3fb52e445c27..10ef5b84bb1f 100644
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.de
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.de
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.de,v 1.2 2004/10/21 12:14:22 martin Exp $	*/
+/*	$NetBSD: menus.md.de,v 1.3 2008/05/24 21:42:52 hauke Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@ menu nodiskmap, title "Bitte w
 			 sizeof(struct apple_part_map_entry));
  	};
 
-menu editparttable, title  "Wählen Sie eine Partition", exit, y=15;
+menu editparttable, title  "Wählen Sie eine Partition", exit, y=14;
 	display action  { msg_display (MSG_editparttable);
 			  sortmerge();
 			  if (map.selected >= map.usable_cnt)
diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.en b/distrib/utils/sysinst/arch/mac68k/menus.md.en
index d3fe09935d08..ba411db61bda 100644
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.en
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.en,v 1.20 2006/08/04 05:30:13 mhitch Exp $	*/
+/*	$NetBSD: menus.md.en,v 1.21 2008/05/24 21:42:52 hauke Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@ menu nodiskmap, title "Choose an option", y=16;
 			 sizeof(struct apple_part_map_entry));
  	};
 
-menu editparttable, title  "Choose your partition", exit, y=15;
+menu editparttable, title  "Choose your partition", exit, y=14;
 	display action  { msg_display (MSG_editparttable);
 			  sortmerge();
 			  if (map.selected >= map.usable_cnt)
diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.es b/distrib/utils/sysinst/arch/mac68k/menus.md.es
index 1d2e127f208c..3dff3764dce3 100644
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.es
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.es
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.es,v 1.1 2005/08/26 15:44:44 xtraeme Exp $	*/
+/*	$NetBSD: menus.md.es,v 1.2 2008/05/24 21:42:52 hauke Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@ menu nodiskmap, title "Escoja una opcion", y=16;
 			 sizeof(struct apple_part_map_entry));
  	};
 
-menu editparttable, title  "Escoja su particion", exit, y=15;
+menu editparttable, title  "Escoja su particion", exit, y=14;
 	display action  { msg_display (MSG_editparttable);
 			  sortmerge();
 			  if (map.selected >= map.usable_cnt)
diff --git a/distrib/utils/sysinst/arch/mac68k/menus.md.pl b/distrib/utils/sysinst/arch/mac68k/menus.md.pl
index 3be252bb8c85..74f77fab69ec 100644
--- a/distrib/utils/sysinst/arch/mac68k/menus.md.pl
+++ b/distrib/utils/sysinst/arch/mac68k/menus.md.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.pl,v 1.7 2003/06/11 21:35:43 dsl Exp $	*/
+/*	$NetBSD: menus.md.pl,v 1.8 2008/05/24 21:42:52 hauke Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: menus.md.en,v 1.13 2001/11/29 23:20:58 thorpej Exp 	*/
 
@@ -68,7 +68,7 @@ menu nodiskmap, title "Wybierz opcje", y=16;
                         sizeof(struct apple_part_map_entry));
        };
 
-menu editparttable, title  "Wybierz swoje partycje", exit, y=15;
+menu editparttable, title  "Wybierz swoje partycje", exit, y=14;
 	display action  { msg_display (MSG_editparttable);
                          sortmerge();
                          if (map.selected >= map.usable_cnt)