X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fvideo.c;h=3adb17d4a06065304dc5172bc57147e25f1fab06;hb=6516331968f11dd9e5c495572f27cc69fa3d4c48;hp=3793ce61bdcb8d864994ebcac61b2470f74e4cb4;hpb=08309c482bda11b6a86066409d08a99789ab2f5d;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c index 3793ce61..3adb17d4 100644 --- a/Usermode/Applications/axwin3_src/WM/video.c +++ b/Usermode/Applications/axwin3_src/WM/video.c @@ -12,18 +12,24 @@ #include "resources/cursor.h" #include #include +#include +#include + +// === IMPORTS === +extern int giTerminalFD_Input; // === PROTOTYPES === void Video_Setup(void); void Video_SetCursorPos(short X, short Y); void Video_Update(void); -void Video_FillRect(short X, short Y, short W, short H, uint32_t Color); -void Video_DrawRect(short X, short Y, short W, short H, uint32_t Color); +void Video_FillRect(int X, int Y, int W, int H, uint32_t Color); // === GLOBALS === int giVideo_CursorX; int giVideo_CursorY; uint32_t *gpScreenBuffer; + int giVideo_FirstDirtyLine; + int giVideo_LastDirtyLine; // === CODE === void Video_Setup(void) @@ -31,37 +37,36 @@ void Video_Setup(void) int tmpInt; // Open terminal + #if 0 giTerminalFD = open(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE); if( giTerminalFD == -1 ) { fprintf(stderr, "ERROR: Unable to open '%s' (%i)\n", gsTerminalDevice, _errno); exit(-1); } - - // Set width - tmpInt = giScreenWidth; - tmpInt = ioctl( giTerminalFD, TERM_IOCTL_WIDTH, &tmpInt ); - if(tmpInt != giScreenWidth) - { - fprintf(stderr, "Warning: Selected width (%i) is invalid, clipped to %i\n", - giScreenWidth, tmpInt); - giScreenWidth = tmpInt; - } - - // Set height - tmpInt = giScreenHeight; - tmpInt = ioctl( giTerminalFD, TERM_IOCTL_HEIGHT, &tmpInt ); - if(tmpInt != giScreenHeight) + #else + 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 ) { - fprintf(stderr, "Warning: Selected height (%i) is invalid, clipped to %i\n", - giScreenHeight, tmpInt); - giScreenHeight = tmpInt; + fprintf(stderr, "stdout is not an Acess VT, can't start"); + _SysDebug("stdout is not an Acess VT, can't start"); + exit(-1); } + #endif // Set mode to video tmpInt = TERM_MODE_FB; ioctl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt ); + // Get dimensions + giScreenWidth = ioctl( giTerminalFD, TERM_IOCTL_WIDTH, NULL ); + giScreenHeight = ioctl( giTerminalFD, TERM_IOCTL_HEIGHT, NULL ); + + giVideo_LastDirtyLine = giScreenHeight; + // Force VT to be shown ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL ); @@ -75,10 +80,19 @@ void Video_Setup(void) void Video_Update(void) { - _SysDebug("Video_Update - gpScreenBuffer[0] = 0x%x", gpScreenBuffer[0]); - seek(giTerminalFD, 0, 1); - write(giTerminalFD, gpScreenBuffer, giScreenWidth*giScreenHeight*4); + int ofs = giVideo_FirstDirtyLine*giScreenWidth; + int size = (giVideo_LastDirtyLine-giVideo_FirstDirtyLine)*giScreenWidth; + + if( giVideo_LastDirtyLine == 0 ) return; + + _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); _SysDebug("Video_Update - Done"); + giVideo_FirstDirtyLine = 0; + giVideo_LastDirtyLine = 0; } void Video_SetCursorPos(short X, short Y) @@ -92,17 +106,33 @@ void Video_SetCursorPos(short X, short Y) ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos); } +void Video_FillRect(int X, int Y, int W, int H, uint32_t Colour) +{ + uint32_t *dest; + int i; + + if(X < 0 || Y < 0) return; + if(W >= giScreenWidth) return; + if(H >= giScreenHeight) return; + if(X + W >= giScreenWidth) W = giScreenWidth - W; + if(Y + H >= giScreenHeight) W = giScreenHeight - H; + + dest = gpScreenBuffer + Y * giScreenWidth + X; + while(H --) + { + for( i = W; i --; dest ++ ) *dest = Colour; + dest += giScreenWidth - W; + } +} + /** * \brief Blit an entire buffer to the screen * \note Assumes Pitch = 4*W */ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H) { - int i; uint32_t *buf; -// _SysDebug("Video_Blit: (%p (%i, %i) %ix%i)", Source, DstX, DstY, W, H); - if( DstX >= giScreenWidth) return ; if( DstY >= giScreenHeight) return ; // TODO: Handle -ve X/Y by clipping @@ -113,15 +143,62 @@ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H) H = giScreenWidth - DstY; if( W <= 0 || H <= 0 ) return; + + if( DstX < giVideo_FirstDirtyLine ) + giVideo_FirstDirtyLine = DstY; + if( DstY + H > giVideo_LastDirtyLine ) + giVideo_LastDirtyLine = DstY + H; -// _SysDebug(" Clipped to (%i, %i) %ix%i", DstX, DstY, W, H); -// _SysDebug(" Source[0] = 0x%x", Source[0]); buf = gpScreenBuffer + DstY*giScreenWidth + DstX; - while( H -- ) + if(W != giScreenWidth) + { + while( H -- ) + { + memcpy(buf, Source, W*4); + Source += W; + buf += giScreenWidth; + } + } + else { - for( i = W; i --; ) - *buf++ = *Source++; - buf += giScreenWidth - W; + memcpy(buf, Source, giScreenWidth*H*4); + } +} + +tColour Video_AlphaBlend(tColour _orig, tColour _new, uint8_t _alpha) +{ + uint16_t ao,ro,go,bo; + uint16_t an,rn,gn,bn; + if( _alpha == 0 ) return _orig; + if( _alpha == 255 ) return _new; + + ao = (_orig >> 24) & 0xFF; + ro = (_orig >> 16) & 0xFF; + go = (_orig >> 8) & 0xFF; + bo = (_orig >> 0) & 0xFF; + + an = (_new >> 24) & 0xFF; + rn = (_new >> 16) & 0xFF; + gn = (_new >> 8) & 0xFF; + bn = (_new >> 0) & 0xFF; + + if( _alpha == 0x80 ) { + ao = (ao + an) / 2; + ro = (ro + rn) / 2; + go = (go + gn) / 2; + bo = (bo + bn) / 2; } + else { + ao = ao*(255-_alpha) + an*_alpha; + ro = ro*(255-_alpha) + rn*_alpha; + go = go*(255-_alpha) + gn*_alpha; + bo = bo*(255-_alpha) + bn*_alpha; + ao /= 255*2; + ro /= 255*2; + go /= 255*2; + bo /= 255*2; + } + + return (ao << 24) | (ro << 16) | (go << 8) | bo; }