Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
hauke 2008-05-24 21:42:52 +00:00
parent be85d6f928
commit 5b622a2a06
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/utils/sysinst/arch/mac68k/md.c
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -498,7 +498,13 @@ sortmerge(void)
for (i=0,j=0;i<map.in_use_cnt;i++) { for (i=0,j=0;i<map.in_use_cnt;i++) {
map.blk[i].pmSig = APPLE_PART_MAP_ENTRY_MAGIC; map.blk[i].pmSig = APPLE_PART_MAP_ENTRY_MAGIC;
map.blk[i].pmMapBlkCnt = map.in_use_cnt; 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.mblk[j++] = i;
map.usable_cnt += 1; map.usable_cnt += 1;
} }

4
distrib/utils/sysinst/arch/mac68k/menus.md.de
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -66,7 +66,7 @@ menu nodiskmap, title "Bitte w
sizeof(struct apple_part_map_entry)); 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); display action { msg_display (MSG_editparttable);
sortmerge(); sortmerge();
if (map.selected >= map.usable_cnt) if (map.selected >= map.usable_cnt)

4
distrib/utils/sysinst/arch/mac68k/menus.md.en
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -66,7 +66,7 @@ menu nodiskmap, title "Choose an option", y=16;
sizeof(struct apple_part_map_entry)); 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); display action { msg_display (MSG_editparttable);
sortmerge(); sortmerge();
if (map.selected >= map.usable_cnt) if (map.selected >= map.usable_cnt)

4
distrib/utils/sysinst/arch/mac68k/menus.md.es
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -66,7 +66,7 @@ menu nodiskmap, title "Escoja una opcion", y=16;
sizeof(struct apple_part_map_entry)); 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); display action { msg_display (MSG_editparttable);
sortmerge(); sortmerge();
if (map.selected >= map.usable_cnt) if (map.selected >= map.usable_cnt)

4
distrib/utils/sysinst/arch/mac68k/menus.md.pl
View File

@ -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: */ /* Based on english version: */
/* NetBSD: menus.md.en,v 1.13 2001/11/29 23:20:58 thorpej Exp */ /* 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)); 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); display action { msg_display (MSG_editparttable);
sortmerge(); sortmerge();
if (map.selected >= map.usable_cnt) if (map.selected >= map.usable_cnt)