Merge branch 'master' of ted.mutabah.net:acess2

[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / video.c

diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c
index 3e6af58..5b513de 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/video.c
+++ b/Usermode/Applications/axwin3_src/WM/video.c
@@ -34,13 +34,24 @@ 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);
        }
-       
+       #else
+       giTerminalFD = 1;
+       // 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, "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;
@@ -70,11 +81,12 @@ void Video_Update(void)
        
        if( giVideo_LastDirtyLine == 0 )        return; 
 
-//     _SysDebug("Video_Update - Updating lines %i to %i (0x%x+0x%x px)",
-//             giVideo_FirstDirtyLine, giVideo_LastDirtyLine, ofs, size);
+       _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");
+       _SysDebug("Video_Update - Done");
        giVideo_FirstDirtyLine = 0;
        giVideo_LastDirtyLine = 0;
 }