X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fvideo.c;h=393d5bf43772de2cc9223a4c5c3417a4ee283f79;hb=d2e9501431148e85345cefe6315f0eace0dfd777;hp=6a400a807f773aa070adcbfd4397050f1f318f84;hpb=e2256d66964923bc4c01ac067b7cbb7544429051;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c index 6a400a80..393d5bf4 100644 --- a/Usermode/Applications/axwin3_src/WM/video.c +++ b/Usermode/Applications/axwin3_src/WM/video.c @@ -12,6 +12,7 @@ #include "resources/cursor.h" #include #include +#include // === PROTOTYPES === void Video_Setup(void); @@ -38,42 +39,24 @@ void Video_Setup(void) 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) - { - fprintf(stderr, "Warning: Selected height (%i) is invalid, clipped to %i\n", - giScreenHeight, tmpInt); - giScreenHeight = tmpInt; - } // 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 ); + // Force VT to be shown ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL ); // Create local framebuffer (back buffer) gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 ); - Video_FillRect(0, 0, giScreenWidth, giScreenHeight, 0x8080FF); // Set cursor position and bitmap ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap); Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 ); - - Video_Update(); } void Video_Update(void) @@ -95,36 +78,6 @@ void Video_SetCursorPos(short X, short Y) ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos); } -void Video_FillRect(short X, short Y, short W, short H, uint32_t Color) -{ - int i; - uint32_t *buf = gpScreenBuffer + Y*giScreenWidth + X; - - _SysDebug("Video_FillRect: (X=%i, Y=%i, W=%i, H=%i, Color=%08x)", - X, Y, W, H, Color); - - if(W < 0 || X < 0 || X >= giScreenWidth) return ; - if(X + W > giScreenWidth) W = giScreenWidth - X; - - if(H < 0 || Y < 0 || Y >= giScreenHeight) return ; - if(Y + H > giScreenHeight) H = giScreenHeight - Y; - - while( H -- ) - { - for( i = W; i --; ) - *buf++ = Color; - buf += giScreenWidth - W; - } -} - -void Video_DrawRect(short X, short Y, short W, short H, uint32_t Color) -{ - Video_FillRect(X, Y, W, 1, Color); - Video_FillRect(X, Y+H-1, W, 1, Color); - Video_FillRect(X, Y, 1, H, Color); - Video_FillRect(X+W-1, Y, 1, H, Color); -} - /** * \brief Blit an entire buffer to the screen * \note Assumes Pitch = 4*W @@ -134,18 +87,21 @@ 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); +// _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 if( DstX < 0 || DstY < 0 ) return ; // TODO: Handle out of bounds by clipping too if( DstX + W > giScreenWidth ) return; - if( DstY + H > giScreenHeight ) return; + if( DstY + H > giScreenHeight ) + H = giScreenWidth - DstY; if( W <= 0 || H <= 0 ) return; - _SysDebug(" Clipped to (%i, %i) %ix%i", DstX, DstY, W, H); - _SysDebug(" Source[0] = 0x%x", Source[0]); +// _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 -- ) { @@ -155,88 +111,40 @@ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H) } } -/** - * \brief Draw an image to the screen - * \todo Maybe have support for an offset in the image - */ -void Video_DrawImage(short X, short Y, short W, short H, tImage *Image) +tColour Video_AlphaBlend(tColour _orig, tColour _new, uint8_t _alpha) { - int x, y; - uint8_t *buf = (uint8_t *)(gpScreenBuffer + Y*giScreenWidth + X); - uint8_t *data; - - // Sanity please - if( !Image ) - return ; - - // Bounds Check - if( X >= giScreenWidth ) return ; - if( Y >= giScreenHeight ) return ; - - // Wrap to image size - if( W > Image->Width ) W = Image->Width; - if( H > Image->Height ) H = Image->Height; - - // Wrap to screen size - if( X + W > giScreenWidth ) W = giScreenWidth - X; - if( Y + H > giScreenHeight ) H = giScreenHeight - Y; - - // Do the render - data = Image->Data; - switch( Image->Format ) - { - case IMGFMT_BGRA: - for( y = 0; y < H; y ++ ) - { - int r, g, b, a; // New - int or, og, ob; // Original - for( x = 0; x < W; x ++ ) - { - b = data[x*4+0]; g = data[x*4+1]; r = data[x*4+2]; a = data[x*4+3]; - if( a == 0 ) continue; // 100% transparent - ob = buf[x*4+0]; og = buf[x*4+1]; or = buf[x*4+2]; - // Handle Alpha - switch(a) - { - // Transparent: Handled above - // Solid - case 0xFF: break; - // Half - case 0x80: - r = (or + r) / 2; - g = (og + g) / 2; - b = (ob + b) / 2; - break; - // General - default: - r = (or * (255-a) + r * a) / 255; - g = (og * (255-a) + g * a) / 255; - b = (ob * (255-a) + b * a) / 255; - break; - } - buf[x*4+0] = b; buf[x*4+1] = g; buf[x*4+2] = r; - } - data += Image->Width * 4; - buf += giScreenWidth * 4; - } - break; - - // RGB - case IMGFMT_RGB: - for( y = 0; y < H; y ++ ) - { - for( x = 0; x < W; x ++ ) - { - buf[x*4+0] = data[x*3+2]; // Blue - buf[x*4+1] = data[x*3+1]; // Green - buf[x*4+2] = data[x*3+0]; // Red - } - data += W * 3; - buf += giScreenWidth * 4; - } - break; - default: - _SysDebug("ERROR: Unknown image format %i\n", Image->Format); - break; + 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; } +