*/
#include <common.h>
#include <acess/sys.h>
-#include <acess/devices/terminal.h>
+#include <acess/devices/pty.h>
+#include <acess/devices/pty_cmds.h>
#include <image.h>
#include "resources/cursor.h"
#include <stdio.h>
+#include <video.h>
+#include <wm.h>
+#include <string.h>
+#include "include/lowlevel.h"
+
+// === IMPORTS ===
+extern int giTerminalFD_Input;
// === PROTOTYPES ===
void Video_Setup(void);
+void Video_int_SetBufFmt(int NewFmt);
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)
{
- int tmpInt;
+ int rv;
// Open terminal
- giTerminalFD = open(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
+ #if 0
+ giTerminalFD = _SysOpen(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 PTY
+ // - _SysIOCtl(..., 0, NULL) returns the type, which should be 2
+ rv = _SysIOCtl(1, DRV_IOCTL_TYPE, NULL);
+ if( rv != DRV_TYPE_TERMINAL )
{
- fprintf(stderr, "Warning: Selected height (%i) is invalid, clipped to %i\n",
- giScreenHeight, tmpInt);
- giScreenHeight = tmpInt;
+ fprintf(stderr, "stdout is not a PTY, can't start (%i exp, %i got)\n",
+ DRV_TYPE_TERMINAL, rv);
+ _SysDebug("stdout is not an PTY, can't start");
+ exit(-1);
}
-
+ #endif
+
+ // TODO: Check terminal echoback that it does support graphical modes
+ // And/or have terminal flags fetchable by the client
+
// Set mode to video
- tmpInt = TERM_MODE_FB;
- ioctl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt );
-
- // Force VT to be shown
- ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
+ Video_int_SetBufFmt(PTYBUFFMT_FB);
+
+ // Get dimensions
+ struct ptydims dims;
+ rv = _SysIOCtl( giTerminalFD, PTY_IOCTL_GETDIMS, &dims );
+ if( rv ) {
+ perror("Can't get terminal dimensions (WTF?)");
+ exit(-1);
+ }
+ giScreenWidth = dims.PW;
+ giScreenHeight = dims.PH;
+ if( giScreenWidth < 640 || giScreenHeight < 480 ) {
+ Video_int_SetBufFmt(PTYBUFFMT_TEXT);
+ _SysDebug("Resoltion too small, 640x480 reqd but %ix%i avail",
+ giScreenWidth, giScreenHeight);
+ exit(-1);
+ }
+ _SysDebug("AxWin3 running at %ix%i", dims.PW, dims.PH);
+
+ giVideo_LastDirtyLine = giScreenHeight;
// Create local framebuffer (back buffer)
gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
- Video_FillRect(0, 0, giScreenWidth, giScreenHeight, 0x8080FF);
+ //gpScreenBuffer = _SysMemMap( giTerminalFD, 0, giScreenWidth*giScreenHeight*4, NULL);
// Set cursor position and bitmap
- ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
+ {
+ Video_int_SetBufFmt(PTYBUFFMT_2DCMD);
+ struct ptycmd_header hdr = {PTY2D_CMD_SETCURSORBMP,0,0};
+ size_t size = sizeof(hdr) + sizeof(cCursorBitmap) + cCursorBitmap.W*cCursorBitmap.H*4;
+ hdr.len_low = size / 4;
+ hdr.len_hi = size / (256*4);
+ _SysWrite(giTerminalFD, &hdr, sizeof(hdr));
+ _SysDebug("size = %i (%04x:%02x * 4)", size, hdr.len_hi, hdr.len_low);
+ _SysWrite(giTerminalFD, &cCursorBitmap, size-sizeof(hdr));
+ }
Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 );
-
- Video_Update();
}
void Video_Update(void)
{
- //seek(giTerminalFD, 0, SEEK_SET);
- seek(giTerminalFD, 0, 1);
- write(giTerminalFD, gpScreenBuffer, giScreenWidth*giScreenHeight*4);
-}
+ #if 0
+ int ofs = giVideo_FirstDirtyLine*giScreenWidth;
+ int size = (giVideo_LastDirtyLine-giVideo_FirstDirtyLine)*giScreenWidth;
+
+ if( giVideo_LastDirtyLine == 0 ) return;
-void Video_SetCursorPos(short X, short Y)
-{
- struct {
- uint16_t x;
- uint16_t y;
- } pos;
- pos.x = giVideo_CursorX = X;
- pos.y = giVideo_CursorY = Y;
- ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
+ _SysDebug("Video_Update - Updating lines %i to %i (0x%x+0x%x px)",
+ giVideo_FirstDirtyLine, giVideo_LastDirtyLine, ofs, size);
+ _SysSeek(giTerminalFD, ofs*4, SEEK_SET);
+ _SysDebug("Video_Update - Sending FD %i %p 0x%x", giTerminalFD, gpScreenBuffer+ofs, size*4);
+ _SysWrite(giTerminalFD, gpScreenBuffer+ofs, size*4);
+ _SysDebug("Video_Update - Done");
+ giVideo_FirstDirtyLine = giScreenHeight;
+ giVideo_LastDirtyLine = 0;
+ #else
+ size_t size = giScreenHeight * giScreenWidth;
+ Video_int_SetBufFmt(PTYBUFFMT_FB);
+ _SysWrite(giTerminalFD, gpScreenBuffer, size*4);
+ #endif
}
-void Video_FillRect(short X, short Y, short W, short H, uint32_t Color)
+void Video_int_SetBufFmt(int NewFmt)
{
- int i;
- uint32_t *buf = gpScreenBuffer + Y*giScreenWidth + X;
+ static int current_fmt;
- _SysDebug("Video_FillRect: (X=%i, Y=%i, W=%i, H=%i, Color=%08x)",
- X, Y, W, H, Color);
+ if( current_fmt == NewFmt )
+ return ;
- if(W < 0 || X < 0 || X >= giScreenWidth) return ;
- if(X + W > giScreenWidth) W = giScreenWidth - X;
+ struct ptymode mode = {.InputMode = 0, .OutputMode = NewFmt};
+ int rv = _SysIOCtl( giTerminalFD, PTY_IOCTL_SETMODE, &mode );
+ if( rv ) {
+ perror("Can't set PTY to framebuffer mode");
+ exit(-1);
+ }
- if(H < 0 || Y < 0 || Y >= giScreenHeight) return ;
- if(Y + H > giScreenHeight) H = giScreenHeight - Y;
+ current_fmt = NewFmt;
+}
+
+void Video_SetCursorPos(short X, short Y)
+{
+ struct ptycmd_setcursorpos cmd;
+ cmd.hdr.cmd = PTY2D_CMD_SETCURSORPOS;
+ cmd.hdr.len_low = sizeof(cmd)/4;
+ cmd.hdr.len_hi = 0;
+ cmd.x = giVideo_CursorX = X;
+ cmd.y = giVideo_CursorY = Y;
+
+ Video_int_SetBufFmt(PTYBUFFMT_2DCMD);
+ _SysWrite(giTerminalFD, &cmd, sizeof(cmd));
+}
+
+void Video_FillRect(int X, int Y, int W, int H, uint32_t Colour)
+{
+ if(X < 0 || Y < 0) return;
+ if(W < 0 || H < 0) return;
+ if(W >= giScreenWidth) return;
+ if(H >= giScreenHeight) return;
+ if(X + W >= giScreenWidth) W = giScreenWidth - W;
+ if(Y + H >= giScreenHeight) W = giScreenHeight - H;
- while( H -- )
+ uint32_t *dest = gpScreenBuffer + Y * giScreenWidth + X;
+ while(H --)
{
- for( i = W; i --; )
- *buf++ = Color;
- buf += giScreenWidth - W;
+ for( int i = W; i --; dest ++ ) *dest = Colour;
+ dest += 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 Draw an image to the screen
- * \todo Maybe have support for an offset in the image
+ * \brief Blit an entire buffer to the screen
+ * \note Assumes Pitch = 4*W
*/
-void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
+void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
{
- 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;
+ uint32_t *buf;
+ short drawW = W;
+
+ if( DstX >= giScreenWidth) return ;
+ if( DstY >= giScreenHeight) return ;
+ // Drawing oob to left/top, clip
+ if( DstX < 0 ) {
+ Source += -DstX;
+ drawW -= -DstX;
+ DstX = 0;
+ }
+ if( DstY < 0 ) {
+ Source += (-DstY)*W;
+ H -= -DstY;
+ DstY = 0;
+ }
+ if( drawW < 0 ) return ;
+ // Drawing oob to the right, clip
+ if( DstX + drawW > giScreenWidth ) {
+ //int oldw = drawW;
+ drawW = giScreenWidth - DstX;
+ }
+ if( DstY + H > giScreenHeight )
+ H = giScreenHeight - DstY;
+
+ if( W <= 0 || H <= 0 ) return;
+
+ giVideo_FirstDirtyLine = MIN(DstY, giVideo_FirstDirtyLine);
+ giVideo_LastDirtyLine = MAX(DstY+H, giVideo_LastDirtyLine);
- // Do the render
- data = Image->Data;
- switch( Image->Format )
+ buf = gpScreenBuffer + DstY*giScreenWidth + DstX;
+ if(drawW != giScreenWidth || W != giScreenWidth)
{
- case IMGFMT_BGRA:
- for( y = 0; y < H; y ++ )
+ while( H -- )
{
- 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;
+ memcpy(buf, Source, drawW*4);
+ Source += W;
+ buf += giScreenWidth;
}
- break;
+ }
+ else
+ {
+ // Only valid if copying full scanlines on both ends
+ 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;
- // 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;
+ 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;
}
+
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au