X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FVESA%2Fmain.c;h=479be3028d905fb3da2a511145d18986b4116dbb;hb=8c50e4a0672bdf9e9f6266fa5f485ad7f8b74f5b;hp=43b7147fbff9c8d9a3855e7a1726751393dc1910;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Modules/Display/VESA/main.c b/Modules/Display/VESA/main.c
index 43b7147f..479be302 100644
--- a/Modules/Display/VESA/main.c
+++ b/Modules/Display/VESA/main.c
@@ -2,7 +2,7 @@
  * AcessOS 1
  * Video BIOS Extensions (Vesa) Driver
  */
-#define DEBUG	0
+#define DEBUG	1
 #define VERSION	0x100
 
 #include <acess.h>
@@ -16,6 +16,10 @@
 // === CONSTANTS ===
 #define	FLAG_LFB	0x1
 #define VESA_DEFAULT_FRAMEBUFFER	(KERNEL_BASE|0xA0000)
+#define BLINKING_CURSOR	1
+#if BLINKING_CURSOR
+# define VESA_CURSOR_PERIOD	1000
+#endif
 
 // === PROTOTYPES ===
  int	Vesa_Install(char **Arguments);
@@ -25,6 +29,7 @@ Uint64	Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
  int	Vesa_Int_SetMode(int Mode);
  int	Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);
  int	Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);
+void	Vesa_FlipCursor(void *Arg);
 // --- 2D Acceleration Functions --
 void	Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);
 void	Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H);
@@ -39,22 +44,30 @@ tDevFS_Driver	gVesa_DriverStruct = {
 	.IOCtl = Vesa_Ioctl
 	}
 };
-tSpinlock	glVesa_Lock;
+tMutex	glVesa_Lock;
 tVM8086	*gpVesa_BiosState;
+ int	giVesaDriverId = -1;
+// --- Video Modes ---
  int	giVesaCurrentMode = 0;
  int	giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;
- int	giVesaDriverId = -1;
-char	*gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;
 tVesa_Mode	*gVesa_Modes;
+tVesa_Mode	*gpVesaCurMode;
  int	giVesaModeCount = 0;
- int	giVesaPageCount = 0;
+// --- Framebuffer ---
+char	*gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;
+ int	giVesaPageCount = 0;	//!< Framebuffer size in pages
+// --- Cursor Control ---
+ int	giVesaCursorX = -1;
+ int	giVesaCursorY = -1;
+ int	giVesaCursorTimer = -1;	// Invalid timer
+// --- 2D Video Stream Handlers ---
 tDrvUtil_Video_2DHandlers	gVesa_2DFunctions = {
 	NULL,
 	Vesa_2D_Fill,
 	Vesa_2D_Blit
 };
 
-//CODE
+// === CODE ===
 int Vesa_Install(char **Arguments)
 {
 	tVesa_CallInfo	*info;
@@ -80,13 +93,15 @@ int Vesa_Install(char **Arguments)
 		return MODULE_ERR_NOTNEEDED;
 	}
 	
-	Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);
+	//Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);
 	modes = (Uint16 *) VM8086_GetPointer(gpVesa_BiosState, info->VideoModes.seg, info->VideoModes.ofs);
 	
 	// Read Modes
 	for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );
 	gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) );
 	
+	Log_Debug("VESA", "%i Modes", giVesaModeCount);
+	
 	// Insert Text Mode
 	gVesa_Modes[0].width = 80;
 	gVesa_Modes[0].height = 25;
@@ -240,12 +255,17 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 			);
 		
 		// Sanity Check
-		if(y > heightInChars) {
+		if( Offset > (Uint64)(heightInChars*widthInChars) ) {
+			LEAVE('i', 0);
+			return 0;
+		}
+		if(y >= heightInChars) {
 			LEAVE('i', 0);
 			return 0;
 		}
 		
-		if( Offset + Length > heightInChars*widthInChars ) {
+		
+		if( (int)Offset + (int)Length > heightInChars*widthInChars ) {
 			Log_Debug("VESA", "%i + %i > %i*%i (%i)",
 				(int)Offset, (int)Length, heightInChars, widthInChars, heightInChars*widthInChars);
 			Length = heightInChars*widthInChars - Offset;
@@ -257,7 +277,7 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		
 		LOG("dest = %p", dest);
 		
-		for( i = 0; i < Length; i++ )
+		for( i = 0; i < (int)Length; i++ )
 		{
 			VT_Font_Render(
 				chars->Ch,
@@ -348,6 +368,37 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 		return ret;
 	
 	case VIDEO_IOCTL_SETCURSOR:	// Set cursor position
+		#if !BLINKING_CURSOR
+		if(giVesaCursorX > 0)
+			Vesa_FlipCursor(Node);
+		#endif
+		giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;
+		giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;
+		//Log_Debug("VESA", "Cursor position (%i,%i)", giVesaCursorX, giVesaCursorY);
+		if(
+			giVesaCursorX < 0 || giVesaCursorY < 0
+		||	giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth
+		||	giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)
+		{
+			#if BLINKING_CURSOR
+			if(giVesaCursorTimer != -1) {
+				Time_RemoveTimer(giVesaCursorTimer);
+				giVesaCursorTimer = -1;
+			}
+			#endif
+			giVesaCursorX = -1;
+			giVesaCursorY = -1;
+		}
+		else {
+			#if BLINKING_CURSOR
+		//	Log_Debug("VESA", "Updating timer %i?", giVesaCursorTimer);
+			if(giVesaCursorTimer == -1)
+				giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);
+			#else
+			Vesa_FlipCursor(Node);
+			#endif
+		}
+		//Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);
 		return 0;
 	
 	case VIDEO_IOCTL_REQLFB:	// Request Linear Framebuffer
@@ -356,6 +407,9 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 	return 0;
 }
 
+/**
+ * \brief Updates the video mode
+ */
 int Vesa_Int_SetMode(int mode)
 {
 	Log_Log("VESA", "Setting mode to %i", mode);
@@ -366,7 +420,10 @@ int Vesa_Int_SetMode(int mode)
 	// Check for fast return
 	if(mode == giVesaCurrentMode)	return 1;
 	
-	LOCK( &glVesa_Lock );
+	Time_RemoveTimer(giVesaCursorTimer);
+	giVesaCursorTimer = -1;
+	
+	Mutex_Acquire( &glVesa_Lock );
 	
 	gpVesa_BiosState->AX = 0x4F02;
 	gpVesa_BiosState->BX = gVesa_Modes[mode].code;
@@ -389,8 +446,9 @@ int Vesa_Int_SetMode(int mode)
 	
 	// Record Mode Set
 	giVesaCurrentMode = mode;
+	gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];
 	
-	RELEASE( &glVesa_Lock );
+	Mutex_Release( &glVesa_Lock );
 	
 	return 1;
 }
@@ -446,57 +504,91 @@ int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)
 	return 1;
 }
 
+/**
+ * \brief Updates the state of the text cursor
+ * \note Just does a bitwise not on the cursor region
+ */
+void Vesa_FlipCursor(void *Arg)
+{
+	 int	pitch = gpVesaCurMode->pitch/4;
+	 int	x = giVesaCursorX*giVT_CharWidth;
+	 int	y = giVesaCursorY*giVT_CharHeight;
+	 int	i;
+	Uint32	*fb = (void*)gpVesa_Framebuffer;
+	
+	//Debug("Cursor flip");
+	
+	// Sanity check
+	if(giVesaCursorX < 0 || giVesaCursorY < 0
+	|| y*pitch + x + (giVT_CharHeight-1)*pitch > (int)gpVesaCurMode->fbSize/4) {
+		Log_Notice("VESA", "Cursor OOB (%i,%i)", x, y);
+		giVesaCursorTimer = -1;
+		return;
+	}
+	
+	// Draw cursor
+	fb += (y+1)*pitch + x;
+	for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch )
+		*fb = ~*fb;
+	
+	#if BLINKING_CURSOR
+	giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);
+	#endif
+}
+
 // ------------------------
 // --- 2D Accelleration ---
 // ------------------------
 void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)
 {
-	 int	scrnwidth = gVesa_Modes[giVesaCurrentMode].width;
-	Uint32	*buf = (Uint32*)gpVesa_Framebuffer + Y*scrnwidth + X;
+	 int	pitch = gpVesaCurMode->pitch/4;
+	Uint32	*buf = (Uint32*)gpVesa_Framebuffer + Y*pitch + X;
 	while( H -- ) {
 		memsetd(buf, Colour, W);
-		buf += scrnwidth;
+		buf += pitch;
 	}
 }
 
 void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)
 {
-	 int	scrnwidth = gVesa_Modes[giVesaCurrentMode].width;
-	 int	dst = DstY*scrnwidth + DstX;
-	 int	src = SrcY*scrnwidth + SrcX;
+	 int	scrnpitch = gVesa_Modes[giVesaCurrentMode].pitch;
+	 int	dst = DstY*scrnpitch + DstX;
+	 int	src = SrcY*scrnpitch + SrcX;
 	 int	tmp;
 	
 	//Log("Vesa_2D_Blit: (Ent=%p, DstX=%i, DstY=%i, SrcX=%i, SrcY=%i, W=%i, H=%i)",
 	//	Ent, DstX, DstY, SrcX, SrcY, W, H);
 	
-	if(SrcX + W > scrnwidth)
-		W = scrnwidth - SrcX;
-	if(DstX + W > scrnwidth)
-		W = scrnwidth - DstX;
+	if(SrcX + W > gVesa_Modes[giVesaCurrentMode].width)
+		W = gVesa_Modes[giVesaCurrentMode].width - SrcX;
+	if(DstX + W > gVesa_Modes[giVesaCurrentMode].width)
+		W = gVesa_Modes[giVesaCurrentMode].width - DstX;
 	if(SrcY + H > gVesa_Modes[giVesaCurrentMode].height)
 		H = gVesa_Modes[giVesaCurrentMode].height - SrcY;
 	if(DstY + H > gVesa_Modes[giVesaCurrentMode].height)
 		H = gVesa_Modes[giVesaCurrentMode].height - DstY;
 	
+	//Debug("W = %i, H = %i", W, H);
+	
 	if( dst > src ) {
 		// Reverse copy
-		dst += H*scrnwidth;
-		src += H*scrnwidth;
+		dst += H*scrnpitch;
+		src += H*scrnpitch;
 		while( H -- ) {
-			dst -= scrnwidth;
-			src -= scrnwidth;
+			dst -= scrnpitch;
+			src -= scrnpitch;
 			tmp = W;
 			for( tmp = W; tmp --; ) {
-				*((Uint32*)gpVesa_Framebuffer + dst + tmp) = *((Uint32*)gpVesa_Framebuffer + src + tmp);
+				*(Uint32*)(gpVesa_Framebuffer + dst + tmp) = *(Uint32*)(gpVesa_Framebuffer + src + tmp);
 			}
 		}
 	}
 	else {
 		// Normal copy is OK
 		while( H -- ) {
-			memcpyd((Uint32*)gpVesa_Framebuffer + dst, (Uint32*)gpVesa_Framebuffer + src, W);
-			dst += scrnwidth;
-			src += scrnwidth;
+			memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*sizeof(Uint32));
+			dst += scrnpitch;
+			src += scrnpitch;
 		}
 	}
 }