X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FBochsGA%2Fbochsvbe.c;h=58a024f96f9dae93b91ecc44078d8ea2a73c1e19;hb=de37bdfbcd4814c20babda4a7198736bf0effd3e;hp=d9aada9154c76b686aec2333411f112e9369a9e6;hpb=15442765f459f04d9bcd6eac6726221272cc0a96;p=tpg%2Facess2.git

diff --git a/Modules/Display/BochsGA/bochsvbe.c b/Modules/Display/BochsGA/bochsvbe.c
index d9aada91..58a024f9 100644
--- a/Modules/Display/BochsGA/bochsvbe.c
+++ b/Modules/Display/BochsGA/bochsvbe.c
@@ -193,14 +193,29 @@ int BGA_IOCtl(tVFS_Node *Node, int ID, void *Data)
 		break;
 	
 	case VIDEO_IOCTL_SETBUFFORMAT:
+		DrvUtil_Video_RemoveCursor( &gBGA_DrvUtil_BufInfo );
 		ret = gBGA_DrvUtil_BufInfo.BufferFormat;
 		if(Data)
 			gBGA_DrvUtil_BufInfo.BufferFormat = *(int*)Data;
+		if(gBGA_DrvUtil_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)
+			DrvUtil_Video_SetCursor( &gBGA_DrvUtil_BufInfo, &gDrvUtil_TextModeCursor );
 		break;
 	
 	case VIDEO_IOCTL_SETCURSOR:
+		DrvUtil_Video_RemoveCursor( &gBGA_DrvUtil_BufInfo );
 		gBGA_CursorPos.x = ((tVideo_IOCtl_Pos*)Data)->x;
 		gBGA_CursorPos.y = ((tVideo_IOCtl_Pos*)Data)->y;
+		if(gBGA_DrvUtil_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)
+			DrvUtil_Video_DrawCursor(
+				&gBGA_DrvUtil_BufInfo,
+				gBGA_CursorPos.x*giVT_CharWidth,
+				gBGA_CursorPos.y*giVT_CharHeight
+				);
+		else
+			DrvUtil_Video_DrawCursor(
+				&gBGA_DrvUtil_BufInfo,
+				gBGA_CursorPos.x, gBGA_CursorPos.y
+				);
 		break;
 	
 	default:
@@ -239,7 +254,6 @@ void BGA_int_SetMode(Uint16 Width, Uint16 Height)
 	BGA_int_WriteRegister(VBE_DISPI_INDEX_YRES, Height);
 	BGA_int_WriteRegister(VBE_DISPI_INDEX_BPP, 32);
 	BGA_int_WriteRegister(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | VBE_DISPI_NOCLEARMEM | VBE_DISPI_LFB_ENABLED);
-	MAGIC_BREAK();
 	LEAVE('-');
 }