label.c (29501) | label.c (29628) |
---|---|
1/* 2 * The new sysinstall program. 3 * 4 * This is probably the last program in the `sysinstall' line - the next 5 * generation being essentially a complete rewrite. 6 * | 1/* 2 * The new sysinstall program. 3 * 4 * This is probably the last program in the `sysinstall' line - the next 5 * generation being essentially a complete rewrite. 6 * |
7 * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $ | 7 * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $ |
8 * 9 * Copyright (c) 1995 10 * Jordan Hubbard. All rights reserved. 11 * 12 * Redistribution and use in source and binary forms, with or without 13 * modification, are permitted provided that the following conditions 14 * are met: 15 * 1. Redistributions of source code must retain the above copyright --- 217 unchanged lines hidden (view full) --- 233 label_chunk_info[j].c = c1; 234 ++j; 235 } 236 } 237 } 238 label_chunk_info[j].c = NULL; 239 if (here >= j) { 240 here = j ? j - 1 : 0; | 8 * 9 * Copyright (c) 1995 10 * Jordan Hubbard. All rights reserved. 11 * 12 * Redistribution and use in source and binary forms, with or without 13 * modification, are permitted provided that the following conditions 14 * are met: 15 * 1. Redistributions of source code must retain the above copyright --- 217 unchanged lines hidden (view full) --- 233 label_chunk_info[j].c = c1; 234 ++j; 235 } 236 } 237 } 238 label_chunk_info[j].c = NULL; 239 if (here >= j) { 240 here = j ? j - 1 : 0; |
241 pslice_focus = here; /* VEG 09/05/97 */ 242 label_focus = here; /* VEG 09/05/97 */ | |
243 } 244 if (ChunkWin) { 245 wclear(ChunkWin); 246 wrefresh(ChunkWin); 247 } 248 else 249 ChunkWin = newwin(CHUNK_ROW_MAX - ChunkPartStartRow, 76, ChunkPartStartRow, 0); 250} --- 351 unchanged lines hidden (view full) --- 602 int sz, key = 0; 603 Boolean labeling; 604 char *msg = NULL; 605 PartInfo *p, *oldp; 606 PartType type; 607 Device **devs; 608 int override_focus_adjust = 0; 609 | 241 } 242 if (ChunkWin) { 243 wclear(ChunkWin); 244 wrefresh(ChunkWin); 245 } 246 else 247 ChunkWin = newwin(CHUNK_ROW_MAX - ChunkPartStartRow, 76, ChunkPartStartRow, 0); 248} --- 351 unchanged lines hidden (view full) --- 600 int sz, key = 0; 601 Boolean labeling; 602 char *msg = NULL; 603 PartInfo *p, *oldp; 604 PartType type; 605 Device **devs; 606 int override_focus_adjust = 0; 607 |
608 label_focus = 0; 609 pslice_focus = 0; |
|
610 devs = deviceFind(NULL, DEVICE_TYPE_DISK); 611 if (!devs) { 612 msgConfirm("No disks found!"); 613 return DITEM_FAILURE; 614 } 615 616 labeling = TRUE; 617 keypad(stdscr, TRUE); --- 444 unchanged lines hidden (view full) --- 1062 break; 1063 1064 default: 1065 beep(); 1066 sprintf(_msg, "Invalid key %d - Type F1 or ? for help", key); 1067 msg = _msg; 1068 break; 1069 } | 610 devs = deviceFind(NULL, DEVICE_TYPE_DISK); 611 if (!devs) { 612 msgConfirm("No disks found!"); 613 return DITEM_FAILURE; 614 } 615 616 labeling = TRUE; 617 keypad(stdscr, TRUE); --- 444 unchanged lines hidden (view full) --- 1062 break; 1063 1064 default: 1065 beep(); 1066 sprintf(_msg, "Invalid key %d - Type F1 or ? for help", key); 1067 msg = _msg; 1068 break; 1069 } |
1070 if (override_focus_adjust) { | 1070 if (!override_focus_adjust) { |
1071 if (label_chunk_info[here].type == PART_SLICE) 1072 pslice_focus = here; 1073 else 1074 label_focus = here; 1075 } 1076 } 1077 return DITEM_SUCCESS | DITEM_RESTORE; 1078} --- 120 unchanged lines hidden --- | 1071 if (label_chunk_info[here].type == PART_SLICE) 1072 pslice_focus = here; 1073 else 1074 label_focus = here; 1075 } 1076 } 1077 return DITEM_SUCCESS | DITEM_RESTORE; 1078} --- 120 unchanged lines hidden --- |