blindmaz.cmd

@@ -2,8 +2,7 @@
 
 #7 set $seed
 #execute-file maze.cmd
-#execute-file floodmaz.cmd
+execute-file floodmaz.cmd
-execute-file sharpmaz.cmd
 set %x 2
 set %y $curline
 end-of-line

display.c

@@ -136,13 +136,9 @@ static void vtalloc( int maxrow, int maxcol) {
 }
 
 void updmargin( void) {
-#define MINMARGIN 3	/* MINMARGIN - 1 enough for $ + prev before current */
-#if MINCOLS < 2 * MINMARGIN + 1
-# error	"MINCOLS and MINMARGIN are not consistent"
-#endif
 	term.t_margin = term.t_ncol / 10 ;
-	if( term.t_margin < MINMARGIN)
+	if( term.t_margin < 3) /* t_margin - 1 enough for $ + prev before current */
-		term.t_margin = MINMARGIN ;
+		term.t_margin = 3 ;
 
 	term.t_scrsiz = term.t_ncol - 2 * term.t_margin ;
 }
@@ -1331,11 +1327,11 @@ static void sizesignal( int signr) {
 static void newscreensize( int h, int w) {
 	chg_width = chg_height = 0 ;
 	vtfree() ;
-	if( h < MINROWS)
+	if( h < 3)
-		h = MINROWS ;
+		h = 3 ;
 
-	if( w < MINCOLS)
+	if( w < 10)
-		w = MINCOLS ;
+		w = 10 ;
 
 	vtalloc( h, w) ;
 	if( h <= term.t_mrow)

display.h

@@ -8,9 +8,6 @@
 #include "names.h"          /* BINDABLE() */
 #include "utf8.h"           /* unicode_t */
 
-#define MINROWS	3
-#define MINCOLS 10
-
 extern int mpresf ;         /* Stuff in message line */
 extern int scrollcount ;    /* number of lines to scroll */
 extern int discmd ;         /* display command flag         */

sharpmaz.cmd

@@ -1,51 +0,0 @@
-execute-file maze.cmd
-
-end-of-line
-set %ec &sub $curcol 1
-end-of-file
-set %el &sub $curline 1
-set $curline %el
-set %spaces $line
-set $curline 1
-set %old $line
-set $line %spaces
-set %l 2
-!while &less %l %el
-	set $curline %l
-	set %c 1
-	!while &less %c %ec
-		set $curcol %c
-		!if &not &equ $curchar 32
-			set %v 0
-			set $curline &sub %l 1
-			set $curcol %c
-			!if &not &equ $curchar 32
-				set %v &add %v 1
-			!endif
-			set $curline %l
-			set $curcol &sub %c 1
-			!if &not &equ $curchar 32
-				set %v &add %v 2
-			!endif
-			set $curcol &add %c 1
-			!if &not &equ $curchar 32
-				set %v &add %v 4
-			!endif
-			set $curline &add %l 1
-			set $curcol %c
-			!if &not &equ $curchar 32
-				set %v &add %v 8
-			!endif
-
-			set $curline %l
-			set $curcol %c
-			set $curchar &asc &mid "╳╵╴┘╶└─┴╷│┐┤┌├┬┼" &add %v 1 1
-		!endif
-		set %c &add %c 1
-	!endwhile
-	set %l &add %l 1
-!endwhile
-set $curline 1
-set $line %old
-set $curline 3
-set $curcol 1

window.c

@@ -561,11 +561,6 @@ BINDABLE( restwnd) {
 }
 
 
-static void adjust( window_p wp, int screenrows) {
-	wp->w_ntrows = screenrows - wp->w_toprow - 2 ;
-	wp->w_flag |= WFHARD | WFMODE ;
-}
-
 /* resize the screen, re-writing the screen
  *
  * int f;	default flag
@@ -579,7 +574,7 @@ BBINDABLE( newsize) {
 		n = term.t_mrow ;
 
 	/* make sure it's in range */
-	if( n < MINROWS || n > term.t_mrow)
+	if( n < 3 || n > term.t_mrow)
 		return mloutfail( "%%Screen size out of range") ;
 
 	if( term.t_nrow == n - 1)
@@ -592,7 +587,8 @@ BBINDABLE( newsize) {
 			;
 
 		/* and enlarge it as needed */
-		adjust( wp, n) ;
+		wp->w_ntrows = n - wp->w_toprow - 2 ;
+		wp->w_flag |= WFHARD | WFMODE ;
 	} else {
 	/* new size is smaller */
 		/* rebuild the window structure */
@@ -602,9 +598,10 @@ BBINDABLE( newsize) {
 			wp = nextwp ;
 			nextwp = wp->w_wndp ;
 
-			/* expand previous window if current would have zero lines */
+			if( wp->w_toprow == n - 2) {
-			if( wp->w_toprow == n - 2)
+				lastwp->w_ntrows = n - lastwp->w_toprow - 2 ;
-				adjust( lastwp, n) ;
+				lastwp->w_flag |= WFHARD | WFMODE ;
+			}
 
 			/* get rid of it if it is too low */
 			if( wp->w_toprow >= n - 2) {
@@ -627,8 +624,12 @@ BBINDABLE( newsize) {
 				lastwp->w_wndp = NULL ;
 			} else {
 			/* need to change this window size? */
-				if( (wp->w_toprow + wp->w_ntrows - 1) >= n - 2)
+				int lastline = wp->w_toprow + wp->w_ntrows - 1 ;
-					adjust( wp, n) ;
+				if( lastline >= n - 2) {
+					wp->w_ntrows = n - wp->w_toprow - 2 ;
+					assert( wp->w_ntrows) ;
+					wp->w_flag |= WFHARD | WFMODE ;
+				}
 
 				lastwp = wp ;
 			}
@@ -653,7 +654,7 @@ BBINDABLE( newwidth) {
 		n = term.t_mcol ;
 
 	/* make sure it's in range */
-	if( n < MINCOLS || n > term.t_mcol)
+	if( n < 10 || n > term.t_mcol)
 		return mloutfail( "%%Screen width out of range") ;
 
 	/* otherwise, just re-width it (no big deal) */