shithub: map

Download patch

ref: 99e6eda7182651155b2baa3957242898fa489f37
parent: 955586843da9b416a0ffbf00ac4fe3956f5cb560
author: sirjofri <sirjofri@sirjofri.de>
date: Sun Mar 30 11:31:37 EDT 2025 

updates to new libnate version, fixes mapimage rect bug


--- a/map.c
+++ b/map.c
@@ -209,11 +209,13 @@
 initimage(void)
 {
 	Rectangle r;
+	lockmapimage();
 	if (mapimage) {
 		freeimage(mapimage);
 		mapimage = nil;
 	}
 	ncallcalcrect(mainwindow, screen, screen->r);
+	r.min = ZP;
 	r.max.x = Dx(nimage->slot.r);
 	r.max.y = Dy(nimage->slot.r);
 	mapimagesize = r.max;
@@ -220,8 +222,9 @@
 	
 	mapimage = allocimage(display, r, screen->chan, 0, DWhite);
 	nimage->image = mapimage;
+	unlockmapimage();
 	
-	debugprint("initimage: %P\n", mapimagesize);
+	debugprint("initimage: %R %p\n", r, mapimage);
 }
 
 void
@@ -374,7 +377,7 @@
 	
 	runchecks();
 	
-	if (debug)
+	if (debug == 1)
 		traperrout();
 
 	initmapfs();
@@ -393,7 +396,7 @@
 	
 	nateinit();
 	
-	NAssign(NWindow, &mainwindow, New_Window(nil))
+	NAssign(NWindowAccessors, &mainwindow, New_Window(nil))
 	->MakeRoot()
 	->Slot(NSlot(),
 		New_VBox(nil)
@@ -415,7 +418,7 @@
 			New_Box(nil)
 			->Border(1, display->black)
 			->Slot(NSlot(),
-				NAssign(NImage, &nimage, New_Image("map"))
+				NAssign(NImageAccessors, &nimage, New_Image("map"))
 			)
 		)
 		->Slot(NSlotx(LEFT, FILLX),