*/
#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(int X, int Y, int W, int H, uint32_t Color);
// === CODE ===
void Video_Setup(void)
{
- int tmpInt;
+ int rv;
// Open terminal
#if 0
- giTerminalFD = open(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
+ giTerminalFD = _SysOpen(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
if( giTerminalFD == -1 )
{
fprintf(stderr, "ERROR: Unable to open '%s' (%i)\n", gsTerminalDevice, _errno);
#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 )
+ // 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, "stdout is not an Acess VT, can't start");
- _SysDebug("stdout is not an Acess VT, can't start");
+ 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 );
-
+ Video_int_SetBufFmt(PTYBUFFMT_FB);
+
// Get dimensions
- giScreenWidth = ioctl( giTerminalFD, TERM_IOCTL_WIDTH, NULL );
- giScreenHeight = ioctl( giTerminalFD, TERM_IOCTL_HEIGHT, NULL );
+ 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;
- // Force VT to be shown
- ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
-
// Create local framebuffer (back buffer)
gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
+ //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 );
}
void Video_Update(void)
{
+ #if 0
int ofs = giVideo_FirstDirtyLine*giScreenWidth;
int size = (giVideo_LastDirtyLine-giVideo_FirstDirtyLine)*giScreenWidth;
_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);
+ _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 = 0;
+ 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_int_SetBufFmt(int NewFmt)
+{
+ static int current_fmt;
+
+ if( current_fmt == NewFmt )
+ return ;
+
+ 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);
+ }
+
+ current_fmt = NewFmt;
}
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);
+ 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)
{
- uint32_t *dest;
- int i;
-
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;
- dest = gpScreenBuffer + Y * giScreenWidth + X;
+ uint32_t *dest = gpScreenBuffer + Y * giScreenWidth + X;
while(H --)
{
- for( i = W; i --; dest ++ ) *dest = Colour;
+ for( int i = W; i --; dest ++ ) *dest = Colour;
dest += giScreenWidth - W;
}
}
void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
{
uint32_t *buf;
+ short drawW = W;
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;
+ // 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 = giScreenWidth - DstY;
+ H = giScreenHeight - DstY;
if( W <= 0 || H <= 0 ) return;
- if( DstX < giVideo_FirstDirtyLine )
- giVideo_FirstDirtyLine = DstY;
- if( DstY + H > giVideo_LastDirtyLine )
- giVideo_LastDirtyLine = DstY + H;
+ giVideo_FirstDirtyLine = MIN(DstY, giVideo_FirstDirtyLine);
+ giVideo_LastDirtyLine = MAX(DstY+H, giVideo_LastDirtyLine);
buf = gpScreenBuffer + DstY*giScreenWidth + DstX;
- if(W != giScreenWidth)
+ if(drawW != giScreenWidth || W != giScreenWidth)
{
while( H -- )
{
- memcpy(buf, Source, W*4);
+ memcpy(buf, Source, drawW*4);
Source += W;
buf += giScreenWidth;
}
}
else
{
+ // Only valid if copying full scanlines on both ends
memcpy(buf, Source, giScreenWidth*H*4);
}
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au