X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fvideo.c;h=1b9ffaba96956ec76026764e9acda1683c665672;hb=9f005838b3165a84f6ed2a6cb6336be8ec9920d4;hp=fe37964820cdaecef15accf7ad26cf28c8d3d06a;hpb=fa0ff18a7f85c7dc637aef2dfe5c1ed3dea7aee5;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c
index fe379648..1b9ffaba 100644
--- a/Usermode/Applications/axwin3_src/WM/video.c
+++ b/Usermode/Applications/axwin3_src/WM/video.c
@@ -38,7 +38,7 @@ void Video_Setup(void)
 	
 	// Open terminal
 	#if 0
-	giTerminalFD = open(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
+	giTerminalFD = _SysOpen(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
 	if( giTerminalFD == -1 )
 	{
 		fprintf(stderr, "ERROR: Unable to open '%s' (%i)\n", gsTerminalDevice, _errno);
@@ -48,8 +48,8 @@ void Video_Setup(void)
 	giTerminalFD = 1;
 	giTerminalFD_Input = 0;
 	// Check that the console is a VT
-	// - ioctl(..., 0, NULL) returns the type, which should be 2
-	if( ioctl(1, 0, NULL) != 2 )
+	// - _SysIOCtl(..., 0, NULL) returns the type, which should be 2
+	if( _SysIOCtl(1, 0, NULL) != 2 )
 	{
 		fprintf(stderr, "stdout is not an Acess VT, can't start");
 		_SysDebug("stdout is not an Acess VT, can't start");
@@ -59,22 +59,22 @@ void Video_Setup(void)
 	
 	// Set mode to video
 	tmpInt = TERM_MODE_FB;
-	ioctl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt );
+	_SysIOCtl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt );
 	
 	// Get dimensions
-	giScreenWidth = ioctl( giTerminalFD, TERM_IOCTL_WIDTH, NULL );
-	giScreenHeight = ioctl( giTerminalFD, TERM_IOCTL_HEIGHT, NULL );
+	giScreenWidth = _SysIOCtl( giTerminalFD, TERM_IOCTL_WIDTH, NULL );
+	giScreenHeight = _SysIOCtl( giTerminalFD, TERM_IOCTL_HEIGHT, NULL );
 
 	giVideo_LastDirtyLine = giScreenHeight;
 	
 	// Force VT to be shown
-	ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
+	_SysIOCtl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
 	
 	// Create local framebuffer (back buffer)
 	gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
 
 	// Set cursor position and bitmap
-	ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
+	_SysIOCtl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
 	Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 );
 }
 
@@ -87,9 +87,9 @@ void Video_Update(void)
 
 	_SysDebug("Video_Update - Updating lines %i to %i (0x%x+0x%x px)",
 		giVideo_FirstDirtyLine, giVideo_LastDirtyLine, ofs, size);
-	seek(giTerminalFD, ofs*4, 1);
-	_SysDebug("Video_Update - Sending");
-	write(giTerminalFD, gpScreenBuffer+ofs, size*4);
+	_SysSeek(giTerminalFD, ofs*4, SEEK_SET);
+	_SysDebug("Video_Update - Sending FD %i %p 0x%x", giTerminalFD, gpScreenBuffer+ofs, size*4);
+	_SysWrite(giTerminalFD, gpScreenBuffer+ofs, size*4);
 	_SysDebug("Video_Update - Done");
 	giVideo_FirstDirtyLine = 0;
 	giVideo_LastDirtyLine = 0;
@@ -103,7 +103,7 @@ void Video_SetCursorPos(short X, short Y)
 	} pos;
 	pos.x = giVideo_CursorX = X;
 	pos.y = giVideo_CursorY = Y;
-	ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
+	_SysIOCtl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
 }
 
 void Video_FillRect(int X, int Y, int W, int H, uint32_t Colour)
@@ -132,39 +132,50 @@ void Video_FillRect(int X, int Y, int W, int H, uint32_t Colour)
 void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
 {
 	uint32_t	*buf;
-
-	_SysDebug("Video_Blit: (%p, %i, %i, %i, %i)", Source, DstX, DstY, W, H);
+	short	drawW = W;
 
 	if( DstX >= giScreenWidth)	return ;
 	if( DstY >= giScreenHeight)	return ;
-	// TODO: Handle -ve X/Y by clipping
-	if( DstX < 0 || DstY < 0 )	return ;
-	// TODO: Handle out of bounds by clipping too
-	if( DstX + W > giScreenWidth )	return;
+	// Drawing oob to left/top, clip
+	if( DstX < 0 ) {
+		Source += -DstX;
+		drawW -= -DstX;
+		DstX = 0;
+	}
+	if( DstY < 0 ) {
+		Source += (-DstY)*W;
+		H -= -DstY;
+		DstY = 0;
+	}
+	if( drawW < 0 )	return ;
+	// Drawing oob to the right, clip
+	if( DstX + drawW > giScreenWidth ) {
+		//int oldw = drawW;
+		drawW = giScreenWidth - DstX;
+	}
 	if( DstY + H > giScreenHeight )
 		H = giScreenHeight - DstY;
 
 	if( W <= 0 || H <= 0 )	return;
 
-	_SysDebug(" - Resolved to (%p, %i, %i, %i, %i)", Source, DstX, DstY, W, H);
-
-	if( DstX < giVideo_FirstDirtyLine )
+	if( DstY < giVideo_FirstDirtyLine )
 		giVideo_FirstDirtyLine = DstY;
 	if( DstY + H > giVideo_LastDirtyLine )
 		giVideo_LastDirtyLine = DstY + H;
 	
 	buf = gpScreenBuffer + DstY*giScreenWidth + DstX;
-	if(W != giScreenWidth)
+	if(drawW != giScreenWidth || W != giScreenWidth)
 	{
 		while( H -- )
 		{
-			memcpy(buf, Source, W*4);
+			memcpy(buf, Source, drawW*4);
 			Source += W;
 			buf += giScreenWidth;
 		}
 	}
 	else
 	{
+		// Only valid if copying full scanlines on both ends
 		memcpy(buf, Source, giScreenWidth*H*4);
 	}
 }