\r
#include <acess.h>\r
#include <vfs.h>\r
-#include <tpl_drv_video.h>\r
+#include <api_drv_video.h>\r
#include <fs_devfs.h>\r
#include <modules.h>\r
#include <vm8086.h>\r
int Vesa_Install(char **Arguments);\r
Uint64 Vesa_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
- int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data);\r
+ int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data);\r
int Vesa_Int_SetMode(int Mode);\r
int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);\r
int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);\r
+void Vesa_int_HideCursor(void);\r
+void Vesa_int_ShowCursor(void);\r
void Vesa_FlipCursor(void *Arg);\r
-// --- 2D Acceleration Functions --\r
-void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);\r
-void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H);\r
\r
// === GLOBALS ===\r
MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);\r
{\r
.Read = Vesa_Read,\r
.Write = Vesa_Write,\r
- .IOCtl = Vesa_Ioctl\r
+ .IOCtl = Vesa_IOCtl\r
}\r
};\r
tMutex glVesa_Lock;\r
int giVesaDriverId = -1;\r
// --- Video Modes ---\r
int giVesaCurrentMode = 0;\r
- int giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;\r
tVesa_Mode *gVesa_Modes;\r
tVesa_Mode *gpVesaCurMode;\r
int giVesaModeCount = 0;\r
+ int gbVesaModesChecked;\r
// --- Framebuffer ---\r
char *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\r
int giVesaPageCount = 0; //!< Framebuffer size in pages\r
int giVesaCursorX = -1;\r
int giVesaCursorY = -1;\r
int giVesaCursorTimer = -1; // Invalid timer\r
+ int gbVesa_CursorVisible = 0;\r
// --- 2D Video Stream Handlers ---\r
-tDrvUtil_Video_2DHandlers gVesa_2DFunctions = {\r
- NULL,\r
- Vesa_2D_Fill,\r
- Vesa_2D_Blit\r
-};\r
+tDrvUtil_Video_BufInfo gVesa_BufInfo;\r
\r
// === CODE ===\r
int Vesa_Install(char **Arguments)\r
{\r
tVesa_CallInfo *info;\r
tFarPtr infoPtr;\r
- tVesa_CallModeInfo *modeinfo;\r
- tFarPtr modeinfoPtr;\r
Uint16 *modes;\r
int i;\r
\r
// Allocate Info Block\r
gpVesa_BiosState = VM8086_Init();\r
info = VM8086_Allocate(gpVesa_BiosState, 512, &infoPtr.seg, &infoPtr.ofs);\r
- modeinfo = VM8086_Allocate(gpVesa_BiosState, 512, &modeinfoPtr.seg, &modeinfoPtr.ofs);\r
// Set Requested Version\r
memcpy(info->signature, "VBE2", 4);\r
// Set Registers\r
for( i = 1; i < giVesaModeCount; i++ )\r
{\r
gVesa_Modes[i].code = modes[i];\r
- // Get Mode info\r
- gpVesa_BiosState->AX = 0x4F01;\r
- gpVesa_BiosState->CX = gVesa_Modes[i].code;\r
- gpVesa_BiosState->ES = modeinfoPtr.seg;\r
- gpVesa_BiosState->DI = modeinfoPtr.ofs;\r
- VM8086_Int(gpVesa_BiosState, 0x10);\r
- \r
- // Parse Info\r
- gVesa_Modes[i].flags = 0;\r
- if ( (modeinfo->attributes & 0x90) == 0x90 )\r
- {\r
- gVesa_Modes[i].flags |= FLAG_LFB;\r
- gVesa_Modes[i].framebuffer = modeinfo->physbase;\r
- gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch;\r
- } else {\r
- gVesa_Modes[i].framebuffer = 0;\r
- gVesa_Modes[i].fbSize = 0;\r
- }\r
- \r
- gVesa_Modes[i].pitch = modeinfo->pitch;\r
- gVesa_Modes[i].width = modeinfo->Xres;\r
- gVesa_Modes[i].height = modeinfo->Yres;\r
- gVesa_Modes[i].bpp = modeinfo->bpp;\r
- \r
- #if DEBUG\r
- Log_Log("VESA", "0x%x - %ix%ix%i",\r
- gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
- #endif\r
}\r
- \r
+\r
+// VM8086_Deallocate( info );\r
\r
// Install Device\r
giVesaDriverId = DevFS_AddDevice( &gVesa_DriverStruct );\r
return MODULE_ERR_OK;\r
}\r
\r
+void Vesa_int_FillModeList(void)\r
+{\r
+ if( !gbVesaModesChecked )\r
+ {\r
+ int i;\r
+ tVesa_CallModeInfo *modeinfo;\r
+ tFarPtr modeinfoPtr;\r
+ \r
+ modeinfo = VM8086_Allocate(gpVesa_BiosState, 512, &modeinfoPtr.seg, &modeinfoPtr.ofs);\r
+ for( i = 1; i < giVesaModeCount; i ++ )\r
+ {\r
+ // Get Mode info\r
+ gpVesa_BiosState->AX = 0x4F01;\r
+ gpVesa_BiosState->CX = gVesa_Modes[i].code;\r
+ gpVesa_BiosState->ES = modeinfoPtr.seg;\r
+ gpVesa_BiosState->DI = modeinfoPtr.ofs;\r
+ VM8086_Int(gpVesa_BiosState, 0x10);\r
+ \r
+ // Parse Info\r
+ gVesa_Modes[i].flags = 0;\r
+ if ( (modeinfo->attributes & 0x90) == 0x90 )\r
+ {\r
+ gVesa_Modes[i].flags |= FLAG_LFB;\r
+ gVesa_Modes[i].framebuffer = modeinfo->physbase;\r
+ gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch;\r
+ } else {\r
+ gVesa_Modes[i].framebuffer = 0;\r
+ gVesa_Modes[i].fbSize = 0;\r
+ }\r
+ \r
+ gVesa_Modes[i].pitch = modeinfo->pitch;\r
+ gVesa_Modes[i].width = modeinfo->Xres;\r
+ gVesa_Modes[i].height = modeinfo->Yres;\r
+ gVesa_Modes[i].bpp = modeinfo->bpp;\r
+ \r
+ #if DEBUG\r
+ Log_Log("VESA", "0x%x - %ix%ix%i",\r
+ gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
+ #endif\r
+ }\r
+ \r
+// VM8086_Deallocate( modeinfo );\r
+ \r
+ gbVesaModesChecked = 1;\r
+ }\r
+}\r
+\r
/* Read from the framebuffer\r
*/\r
Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)\r
*/\r
Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
{\r
- ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);\r
-\r
- if(Buffer == NULL) {\r
- LEAVE('i', 0);\r
- return 0;\r
- }\r
-\r
- // Default Text mode\r
- if( giVesaCurrentMode == 0 )\r
- {\r
- Uint16 *fb = (Uint16*)(KERNEL_BASE|0xB8000);\r
- tVT_Char *chars = Buffer;\r
- int rem;\r
- \r
- Length /= sizeof(tVT_Char);\r
- Offset /= sizeof(tVT_Char);\r
- \r
- if( giVesaCurrentFormat != VIDEO_BUFFMT_TEXT ) {\r
- Log_Warning("VESA", "Vesa_Write - Mode 0 is not framebuffer");\r
- LEAVE('i', -1);\r
- return -1;\r
- }\r
- \r
- if( Offset + Length > 25*80 ) {\r
- Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
- LEAVE('i', 0);\r
- return 0;\r
- }\r
- \r
- fb += 2*Offset;\r
- LOG("fb = %p", fb);\r
- for(rem = Length; rem --; fb ++, chars++)\r
- {\r
- if( chars->Ch < 0x80 )\r
- *fb = chars->Ch & 0x7F;\r
- else\r
- *fb = 0x00;\r
- \r
- *fb |= (chars->FGCol & 0x888) == 0x888 ? 0x8 : 0;\r
- *fb |= (chars->FGCol & 0x700) > 0x300 ? 0x4 : 0;\r
- *fb |= (chars->FGCol & 0x070) > 0x030 ? 0x2 : 0;\r
- *fb |= (chars->FGCol & 0x007) > 0x003 ? 0x1 : 0;\r
- *fb |= (chars->BGCol & 0x888) == 0x888 ? 0x80 : 0;\r
- *fb |= (chars->BGCol & 0x700) > 0x300 ? 0x40 : 0;\r
- *fb |= (chars->BGCol & 0x070) > 0x030 ? 0x20 : 0;\r
- *fb |= (chars->BGCol & 0x007) > 0x003 ? 0x10 : 0;\r
- //LOG("%08x (%03x,%03x) = %04x",\r
- // chars->Ch, chars->BGCol, chars->FGCol, *fb);\r
- }\r
- Length *= sizeof(tVT_Char);\r
- LEAVE('X', Length);\r
- return Length;\r
- }\r
-\r
if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) {\r
Log_Warning("VESA", "Vesa_Write - Non-LFB Modes not yet supported.");\r
- LEAVE('i', 0);\r
return 0;\r
}\r
- \r
- // Text Mode\r
- switch( giVesaCurrentFormat )\r
- {\r
- case VIDEO_BUFFMT_TEXT:\r
- {\r
- tVT_Char *chars = Buffer;\r
- int pitch = gVesa_Modes[giVesaCurrentMode].pitch;\r
- int depth = gVesa_Modes[giVesaCurrentMode].bpp;\r
- int widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;\r
- int heightInChars = gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight;\r
- int x, y;\r
- Uint8 *dest = (void*)gpVesa_Framebuffer;\r
- int i;\r
- \r
- Length /= sizeof(tVT_Char);\r
- Offset /= sizeof(tVT_Char);\r
- \r
- LOG("gVesa_Modes[%i] = {height:%i, width:%i, pitch:%i}",\r
- giVesaCurrentMode,\r
- gVesa_Modes[giVesaCurrentMode].height,\r
- gVesa_Modes[giVesaCurrentMode].width,\r
- gVesa_Modes[giVesaCurrentMode].pitch\r
- );\r
- x = Offset % widthInChars;\r
- y = Offset / widthInChars;\r
- LOG("(x,y) = (%i,%i) = [%i,%i]",\r
- x,\r
- y,\r
- x * giVT_CharWidth * depth / 8,\r
- y * giVT_CharHeight * pitch\r
- );\r
- LOG("(w,h) = (%i,%i) = [%i,%i]",\r
- (int)(Length % widthInChars),\r
- (int)(Length / widthInChars),\r
- (int)((Length % widthInChars) * giVT_CharWidth * depth / 8),\r
- (int)((Length / widthInChars) * giVT_CharHeight * pitch)\r
- );\r
- \r
- // Sanity Check\r
- if( Offset > (Uint64)(heightInChars*widthInChars) ) {\r
- LEAVE('i', 0);\r
- return 0;\r
- }\r
- if(y >= heightInChars) {\r
- LEAVE('i', 0);\r
- return 0;\r
- }\r
- \r
- \r
- if( (int)Offset + (int)Length > heightInChars*widthInChars ) {\r
- Log_Debug("VESA", "%i + %i > %i*%i (%i)",\r
- (int)Offset, (int)Length, heightInChars, widthInChars, heightInChars*widthInChars);\r
- Length = heightInChars*widthInChars - Offset;\r
- Log_Notice("VESA", "Clipping write size to %i characters", (int)Length);\r
- }\r
- \r
- dest += y * giVT_CharHeight * pitch;\r
- \r
- LOG("dest = %p", dest);\r
- \r
- for( i = 0; i < (int)Length; i++ )\r
- {\r
- if(\r
- !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*depth/8 )\r
- // || !MM_GetPhysAddr( (tVAddr)dest + x*giVT_CharWidth*depth/8 + pitch*giVT_CharHeight-1)\r
- )\r
- {\r
- Log_Notice("VESA", "Stopped at %i, not mapped", i);\r
- break;\r
- }\r
- if( y >= heightInChars )\r
- {\r
- Log_Notice("VESA", "Stopped at %i", i);\r
- break;\r
- }\r
- \r
- VT_Font_Render(\r
- chars->Ch,\r
- dest + x*giVT_CharWidth*depth/8, depth, pitch,\r
- VT_Colour12toN(chars->BGCol, depth),\r
- VT_Colour12toN(chars->FGCol, depth)\r
- );\r
- \r
- chars ++;\r
- x ++;\r
- if( x >= widthInChars )\r
- {\r
- x = 0;\r
- y ++;\r
- dest += pitch*giVT_CharHeight;\r
- }\r
- }\r
- Length = i * sizeof(tVT_Char);\r
- }\r
- break;\r
- \r
- case VIDEO_BUFFMT_FRAMEBUFFER:\r
- {\r
- Uint8 *destBuf = (Uint8*) ((Uint)gpVesa_Framebuffer + (Uint)Offset);\r
- \r
- if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)\r
- {\r
- Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
- LEAVE('i', 0);\r
- return 0;\r
- }\r
- \r
- LOG("buffer = %p", Buffer);\r
- LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);\r
- \r
- //TODO: Handle non 32-bpp framebuffer modes\r
- \r
- // Copy to Frambuffer\r
- memcpy(destBuf, Buffer, Length);\r
- \r
- LOG("BGA Framebuffer updated");\r
- }\r
- break;\r
- \r
- case VIDEO_BUFFMT_2DSTREAM:\r
- Length = DrvUtil_Video_2DStream(\r
- NULL, // Single framebuffer, so Ent is unused\r
- Buffer, Length, &gVesa_2DFunctions, sizeof(gVesa_2DFunctions)\r
- );\r
- break;\r
- \r
- default:\r
- LEAVE('i', -1);\r
- return -1;\r
- }\r
- \r
- LEAVE('X', Length);\r
- return Length;\r
+\r
+ return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer);\r
}\r
\r
+const char *csaVESA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL};\r
/**\r
- * \fn int Vesa_Ioctl(vfs_node *node, int id, void *data)\r
* \brief Handle messages to the device\r
*/\r
-int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)\r
+int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data)\r
{\r
int ret;\r
//Log_Debug("VESA", "Vesa_Ioctl: (Node=%p, ID=%i, Data=%p)", Node, ID, Data);\r
switch(ID)\r
{\r
- case DRV_IOCTL_TYPE: return DRV_TYPE_VIDEO;\r
- case DRV_IOCTL_IDENT: memcpy("VESA", Data, 4); return 1;\r
- case DRV_IOCTL_VERSION: return VERSION;\r
- \r
+ BASE_IOCTLS(DRV_TYPE_VIDEO, "VESA", VERSION, csaVESA_IOCtls);\r
+\r
case VIDEO_IOCTL_GETSETMODE:\r
if( !Data ) return giVesaCurrentMode;\r
return Vesa_Int_SetMode( *(int*)Data );\r
return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
\r
case VIDEO_IOCTL_SETBUFFORMAT:\r
- ret = giVesaCurrentFormat;\r
- if(Data) {\r
- //Log_Log("VESA", "Buffer mode to %i", *(int*)Data);\r
- giVesaCurrentFormat = *(int*)Data;\r
- }\r
+ Vesa_int_HideCursor();\r
+ ret = gVesa_BufInfo.BufferFormat;\r
+ if(Data) gVesa_BufInfo.BufferFormat = *(int*)Data;\r
+ if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
+ DrvUtil_Video_SetCursor( &gVesa_BufInfo, &gDrvUtil_TextModeCursor );\r
+ Vesa_int_ShowCursor();\r
return ret;\r
\r
case VIDEO_IOCTL_SETCURSOR: // Set cursor position\r
- #if !BLINKING_CURSOR\r
- if(giVesaCursorX > 0)\r
- Vesa_FlipCursor(Node);\r
- #endif\r
+ Vesa_int_HideCursor();\r
giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\r
giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;\r
- //Log_Debug("VESA", "Cursor position (%i,%i)", giVesaCursorX, giVesaCursorY);\r
- if(\r
- giVesaCursorX < 0 || giVesaCursorY < 0\r
- || giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth\r
- || giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)\r
- {\r
- #if BLINKING_CURSOR\r
- if(giVesaCursorTimer != -1) {\r
- Time_RemoveTimer(giVesaCursorTimer);\r
- giVesaCursorTimer = -1;\r
- }\r
- #endif\r
- giVesaCursorX = -1;\r
- giVesaCursorY = -1;\r
- }\r
- else {\r
- #if BLINKING_CURSOR\r
- // Log_Debug("VESA", "Updating timer %i?", giVesaCursorTimer);\r
- if(giVesaCursorTimer == -1)\r
- giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);\r
- #else\r
- Vesa_FlipCursor(Node);\r
- #endif\r
- }\r
- //Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);\r
+ Vesa_int_ShowCursor();\r
return 0;\r
\r
- case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer\r
+ case VIDEO_IOCTL_SETCURSORBITMAP:\r
+ DrvUtil_Video_SetCursor( &gVesa_BufInfo, Data );\r
return 0;\r
}\r
return 0;\r
// Sanity Check values\r
if(mode < 0 || mode > giVesaModeCount) return -1;\r
\r
- Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp)",\r
- mode,\r
- gVesa_Modes[mode].width, gVesa_Modes[mode].height,\r
- gVesa_Modes[mode].bpp\r
- );\r
- \r
// Check for fast return\r
if(mode == giVesaCurrentMode) return 1;\r
\r
+ Vesa_int_FillModeList();\r
+\r
Time_RemoveTimer(giVesaCursorTimer);\r
giVesaCursorTimer = -1;\r
\r
gpVesa_BiosState->AX = 0x4F02;\r
gpVesa_BiosState->BX = gVesa_Modes[mode].code;\r
if(gVesa_Modes[mode].flags & FLAG_LFB) {\r
- Log_Log("VESA", "Using LFB");\r
gpVesa_BiosState->BX |= 0x4000; // Bit 14 - Use LFB\r
}\r
\r
giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;\r
gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
\r
- Log_Log("VESA", "Framebuffer (Phys) = 0x%x, (Virt) = 0x%x, Size = 0x%x",\r
- gVesa_Modes[mode].framebuffer, gpVesa_Framebuffer, giVesaPageCount << 12);\r
+ Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp) %p[0x%x] maps %P",\r
+ mode,\r
+ gVesa_Modes[mode].width, gVesa_Modes[mode].height,\r
+ gVesa_Modes[mode].bpp,\r
+ gpVesa_Framebuffer, giVesaPageCount << 12, gVesa_Modes[mode].framebuffer\r
+ );\r
\r
// Record Mode Set\r
giVesaCurrentMode = mode;\r
gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];\r
\r
Mutex_Release( &glVesa_Lock );\r
- \r
+\r
+ gVesa_BufInfo.Framebuffer = gpVesa_Framebuffer;\r
+ gVesa_BufInfo.Pitch = gVesa_Modes[mode].pitch;\r
+ gVesa_BufInfo.Width = gVesa_Modes[mode].width;\r
+ gVesa_BufInfo.Height = gVesa_Modes[mode].height;\r
+ gVesa_BufInfo.Depth = gVesa_Modes[mode].bpp; \r
+\r
return 1;\r
}\r
\r
int factor, tmp;\r
\r
ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp);\r
+\r
+ Vesa_int_FillModeList();\r
\r
for(i=0;i<giVesaModeCount;i++)\r
{\r
\r
if(gVesa_Modes[i].width == data->width && gVesa_Modes[i].height == data->height)\r
{\r
- if( (data->bpp == 32 || data->bpp == 24)\r
- && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )\r
+ //if( (data->bpp == 32 || data->bpp == 24)\r
+ // && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )\r
+ if( data->bpp == gVesa_Modes[i].bpp )\r
{\r
LOG("Perfect!");\r
best = i;\r
tmp = gVesa_Modes[i].width * gVesa_Modes[i].height;\r
tmp -= data->width * data->height;\r
tmp = tmp < 0 ? -tmp : tmp;\r
- factor = tmp * 100 / (data->width * data->height);\r
+ factor = tmp * 1000 / (data->width * data->height);\r
+ \r
+ if( data->bpp == 8 && gVesa_Modes[i].bpp != 8 ) continue;\r
+ if( data->bpp == 16 && gVesa_Modes[i].bpp != 16 ) continue;\r
\r
if( (data->bpp == 32 || data->bpp == 24)\r
&& (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) )\r
{\r
- \r
+ if( data->bpp == gVesa_Modes[i].bpp )\r
+ factor /= 2;\r
}\r
else {\r
- factor *= 10;\r
+ if( data->bpp != gVesa_Modes[i].bpp )\r
+ continue ;\r
}\r
\r
LOG("factor = %i", factor);\r
int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)\r
{\r
if(data->id < 0 || data->id > giVesaModeCount) return -1;\r
+\r
+ Vesa_int_FillModeList();\r
+\r
data->width = gVesa_Modes[data->id].width;\r
data->height = gVesa_Modes[data->id].height;\r
data->bpp = gVesa_Modes[data->id].bpp;\r
return 1;\r
}\r
\r
-/**\r
- * \brief Updates the state of the text cursor\r
- * \note Just does a bitwise not on the cursor region\r
- */\r
-void Vesa_FlipCursor(void *Arg)\r
+void Vesa_int_HideCursor(void)\r
{\r
- int pitch = gpVesaCurMode->pitch;\r
- int bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;\r
- int x = giVesaCursorX*giVT_CharWidth;\r
- int y = giVesaCursorY*giVT_CharHeight;\r
- int i;\r
- Uint8 *fb = (void*)gpVesa_Framebuffer;\r
- \r
- //Debug("Cursor flip");\r
- \r
- // Sanity check\r
- if(giVesaCursorX < 0 || giVesaCursorY < 0\r
- || y*pitch + x + (giVT_CharHeight-1)*pitch > (int)gpVesaCurMode->fbSize) {\r
- Log_Notice("VESA", "Cursor OOB (%i,%i)", x, y);\r
- giVesaCursorTimer = -1;\r
- return;\r
- }\r
- \r
- // Draw cursor\r
- fb += (y+1)*pitch + x*bytes_per_px;\r
- \r
- switch(bytes_per_px)\r
- {\r
- case 1:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch )\r
- *fb = ~*fb;\r
- break;\r
- case 2:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- }\r
- break;\r
- case 3:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- fb[2] = ~fb[2];\r
- }\r
- break;\r
- case 4:\r
- for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch ) {\r
- fb[0] = ~fb[0];\r
- fb[1] = ~fb[1];\r
- fb[2] = ~fb[2];\r
- fb[3] = ~fb[3];\r
- }\r
- break;\r
- default:\r
- Log_Error("VESA", "Vesa_FlipCursor - Bug Report, unknown bytes_per_px (%i)", bytes_per_px);\r
+ DrvUtil_Video_RemoveCursor( &gVesa_BufInfo );\r
+ #if BLINKING_CURSOR\r
+ if(giVesaCursorTimer != -1) {\r
+ Time_RemoveTimer(giVesaCursorTimer);\r
giVesaCursorTimer = -1;\r
- return ;\r
}\r
- \r
- #if BLINKING_CURSOR\r
- giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);\r
#endif\r
}\r
\r
-// ------------------------\r
-// --- 2D Accelleration ---\r
-// ------------------------\r
-void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)\r
+void Vesa_int_ShowCursor(void)\r
{\r
- // TODO: Handle non-32bit modes\r
- int pitch = gpVesaCurMode->pitch/4;\r
- Uint32 *buf = (Uint32*)gpVesa_Framebuffer + Y*pitch + X;\r
- while( H -- ) {\r
- memsetd(buf, Colour, W);\r
- buf += pitch;\r
+ gbVesa_CursorVisible = (giVesaCursorX >= 0);\r
+ if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT)\r
+ {\r
+ DrvUtil_Video_DrawCursor(\r
+ &gVesa_BufInfo,\r
+ giVesaCursorX*giVT_CharWidth,\r
+ giVesaCursorY*giVT_CharHeight\r
+ );\r
+ #if BLINKING_CURSOR\r
+ giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, NULL);\r
+ #endif\r
}\r
+ else\r
+ DrvUtil_Video_DrawCursor(\r
+ &gVesa_BufInfo,\r
+ giVesaCursorX,\r
+ giVesaCursorY\r
+ );\r
}\r
\r
-void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)\r
+/**\r
+ * \brief Swaps the text cursor on/off\r
+ */\r
+void Vesa_FlipCursor(void *Arg)\r
{\r
- int scrnpitch = gpVesaCurMode->pitch;\r
- int bytes_per_px = (gpVesaCurMode->bpp + 7) / 8;\r
- int dst = DstY*scrnpitch + DstX;\r
- int src = SrcY*scrnpitch + SrcX;\r
- int tmp;\r
- \r
- //Log("Vesa_2D_Blit: (Ent=%p, DstX=%i, DstY=%i, SrcX=%i, SrcY=%i, W=%i, H=%i)",\r
- // Ent, DstX, DstY, SrcX, SrcY, W, H);\r
- \r
- if(SrcX + W > gpVesaCurMode->width)\r
- W = gpVesaCurMode->width - SrcX;\r
- if(DstX + W > gpVesaCurMode->width)\r
- W = gpVesaCurMode->width - DstX;\r
- if(SrcY + H > gpVesaCurMode->height)\r
- H = gpVesaCurMode->height - SrcY;\r
- if(DstY + H > gpVesaCurMode->height)\r
- H = gpVesaCurMode->height - DstY;\r
- \r
- //Debug("W = %i, H = %i", W, H);\r
- \r
- if( dst > src ) {\r
- // Reverse copy\r
- dst += H*scrnpitch;\r
- src += H*scrnpitch;\r
- while( H -- ) {\r
- dst -= scrnpitch;\r
- src -= scrnpitch;\r
- tmp = W*bytes_per_px;\r
- for( tmp = W; tmp --; ) {\r
- *(Uint8*)(gpVesa_Framebuffer + dst + tmp) = *(Uint8*)(gpVesa_Framebuffer + src + tmp);\r
- }\r
- }\r
- }\r
- else {\r
- // Normal copy is OK\r
- while( H -- ) {\r
- memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*bytes_per_px);\r
- dst += scrnpitch;\r
- src += scrnpitch;\r
- }\r
- }\r
- //Log("Vesa_2D_Blit: RETURN");\r
+ if( gVesa_BufInfo.BufferFormat != VIDEO_BUFFMT_TEXT )\r
+ return ;\r
+\r
+ if( gbVesa_CursorVisible )\r
+ DrvUtil_Video_RemoveCursor(&gVesa_BufInfo);\r
+ else\r
+ DrvUtil_Video_DrawCursor(&gVesa_BufInfo,\r
+ giVesaCursorX*giVT_CharWidth,\r
+ giVesaCursorY*giVT_CharHeight\r
+ );\r
+ gbVesa_CursorVisible = !gbVesa_CursorVisible;\r
+ \r
+ #if BLINKING_CURSOR\r
+ giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);\r
+ #endif\r
}\r
+\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au