fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2001-08-22 01:25 GMT+2 Maurilio Longo <maurilio.longo@libero.it>

Browse Source 
* source/rtl/gtos2.c
     + Driver tries to set codepage 437 on startup. Needed by box drawing functions
     * hb_gt_isColor(), hb_gt_GetScreenWidth(), hb_gt_GetScreenHeight(),
       hb_gt_GetCellSize() now are faster since use a static VIDEOMODEINFO variable
       and this variable should be tilable.
     ! hb_gt_xPutch(), hb_gt_Replicate() and hb_gt_Box() were simply broken

     NOTE: Never call hb_gt_DispBegin()/hb_gt_DispEnd() from inside gtos2.c
           if you do you'll slow down everything and you will not respect harbour level
           DispBegin()/DispEnd() calls.
This commit is contained in:
Maurilio Longo
2001-08-21 23:32:23 +00:00
parent 814f2d2836
commit a2bee8b2b3
2 changed files with 131 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -1,3 +1,15 @@
2001-08-22 01:25 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
* source/rtl/gtos2.c
+ Driver tries to set codepage 437 on startup. Needed by box drawing functions
* hb_gt_isColor(), hb_gt_GetScreenWidth(), hb_gt_GetScreenHeight(),
hb_gt_GetCellSize() now are faster since use a static VIDEOMODEINFO variable
and this variable should be tilable.
! hb_gt_xPutch(), hb_gt_Replicate() and hb_gt_Box() were simply broken
NOTE: Never call hb_gt_DispBegin()/hb_gt_DispEnd() from inside gtos2.c
if you do you'll slow down everything and you will not respect harbour level
DispBegin()/DispEnd() calls.
2001-08-21 16:45 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* source/rtl/gtcgi/gtcgi.c
@@ -22,7 +34,7 @@
* Fixed bugs 453424 (compiler core dumps on GNU/Linux when no
harbour.cfg can be found) and 45325 (an empty harbour.cfg fails to
correctly report that no compiler command has been specified.
2001-08-21 01:30 UTC-0800 Brian Hays <bhays@abacuslaw.com>
* contrib/libgt/bitflags.c
added the cvs header
@@ -179,7 +191,7 @@
* contrib/libct/Makefile
* contrib/libct/makefile.bc
* contrib/libct/makefile.vc
+ numat.c, pad.c, range.c, remove.c, replace.c,
+ numat.c, pad.c, range.c, remove.c, replace.c,
strswap.c and wordtoch.c added
* contrib/libct/ctflist.txt

175
harbour/source/rtl/gtos2/gtos2.c
View File

@@ -135,6 +135,13 @@ static PKBDKEYINFO s_key;
/* keyboard handle, 0 == default */
static PHKBD s_hk;
/* Code page ID of active codepage at the time harbour program was start */
static USHORT s_usOldCodePage;
/* Instead of calling VioGetMode() every time I need MaxRow() or MaxCol() I
use this static which contains active mode info */
static VIOMODEINFO s_vi;
void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr )
{
@@ -142,6 +149,9 @@ void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr )
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Init()"));
s_vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &s_vi, 0 ); /* fill structure with current video mode settings */
s_uiDispCount = 0;
if(VioGetBuf(&s_ulLVBptr, &s_usLVBlength, 0) == NO_ERROR) {
@@ -179,8 +189,21 @@ void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr )
chars are "wrong". So we need to set code page of
box drawing chars. (Maurilio Longo - maurilio.longo@libero.it)
*/
/* 21/08/2001 - <maurilio.longo@libero.it>
NOTE: Box drawing characters need page 437 to show correctly, so, in your config.sys you
need to have a CODEPAGE=x,y statement where x or y is equal to 437
*/
VioGetCp(0, &s_usOldCodePage, 0);
/* If I could not set codepage 437 I reset previous codepage, maybe I do not need to do this */
if (VioSetCp(0, 437, 0) != NO_ERROR) {
VioSetCp(0, s_usOldCodePage, 0);
}
}
void hb_gt_Exit( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Exit()"));
@@ -189,9 +212,12 @@ void hb_gt_Exit( void )
DosFreeMem(s_hk);
hb_mouse_Exit();
VioSetCp(0, s_usOldCodePage, 0);
/* TODO: */
}
BOOL hb_gt_AdjustPos( BYTE * pStr, ULONG ulLen )
{
USHORT x, y;
@@ -207,11 +233,13 @@ BOOL hb_gt_AdjustPos( BYTE * pStr, ULONG ulLen )
return TRUE;
}
int hb_gt_ExtendedKeySupport()
{
return 0;
}
int hb_gt_ReadKey( HB_inkey_enum eventmask )
{
int ch; /* next char if any */
@@ -225,7 +253,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
KbdCharIn(s_key, IO_NOWAIT, (HKBD) * s_hk);
/* extended key codes have 00h or E0h as chChar */
if ((s_key->fbStatus & KBDTRF_EXTENDED_CODE) && (s_key->chChar == 0x00 || s_key->chChar == 0xE0)) {
if ((s_key->fbStatus & KBDTRF_EXTENDED_CODE) && (s_key->chChar == 0x00 || s_key->chChar == 0xE0)) {
/* It was an extended function key lead-in code, so read the actual function key and then offset it by 256,
unless extended keyboard events are allowed, in which case offset it by 512 */
@@ -359,37 +387,28 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
BOOL hb_gt_IsColor( void )
{
VIOMODEINFO vi;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_IsColor()"));
vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &vi, 0 );
return vi.fbType != 0; /* 0 = monochrom-compatible mode */
return s_vi.fbType != 0; /* 0 = monochrom-compatible mode */
}
USHORT hb_gt_GetScreenWidth( void )
{
VIOMODEINFO vi;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenWidth()"));
vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &vi, 0 );
return vi.col;
return s_vi.col;
}
USHORT hb_gt_GetScreenHeight( void )
{
VIOMODEINFO vi;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenHeight()"));
vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &vi, 0 );
return vi.row;
return s_vi.row;
}
void hb_gt_SetPos( SHORT iRow, SHORT iCol, SHORT iMethod )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetPos(%hd, %hd, %hd)", iRow, iCol, iMethod));
@@ -399,6 +418,7 @@ void hb_gt_SetPos( SHORT iRow, SHORT iCol, SHORT iMethod )
VioSetCurPos( ( USHORT ) iRow, ( USHORT ) iCol, 0 );
}
SHORT hb_gt_Row( void )
{
USHORT x, y;
@@ -409,6 +429,7 @@ SHORT hb_gt_Row( void )
return ( SHORT ) y;
}
SHORT hb_gt_Col( void )
{
USHORT x, y;
@@ -494,17 +515,21 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight,
bCell [ 0 ] = ' ';
bCell [ 1 ] = attr;
if( ( sVert | sHoriz ) == 0 ) /* both zero, clear region */
VioScrollUp ( usTop, usLeft, usBottom, usRight, 0xFFFF, bCell, 0 );
VioScrollUp ( usTop, usLeft, usBottom, usRight, 0xFFFF, bCell, 0 );
else
{
if( sVert > 0 ) /* scroll up */
VioScrollUp ( usTop, usLeft, usBottom, usRight, sVert, bCell, 0 );
else if( sVert < 0 ) /* scroll down */
VioScrollDn ( usTop, usLeft, usBottom, usRight, -sVert, bCell, 0 );
if( sHoriz > 0 ) /* scroll left */
VioScrollLf ( usTop, usLeft, usBottom, usRight, sHoriz, bCell, 0 );
else if( sHoriz < 0 ) /* scroll right */
VioScrollRt ( usTop, usLeft, usBottom, usRight, -sHoriz, bCell, 0 );
}
@@ -528,6 +553,7 @@ static void hb_gt_GetCursorSize( char * start, char * end )
}
*/
static void hb_gt_SetCursorSize( char start, char end, int visible )
{
VIOCURSORINFO vi;
@@ -541,19 +567,15 @@ static void hb_gt_SetCursorSize( char start, char end, int visible )
VioSetCurType( &vi, 0 );
}
static char hb_gt_GetCellSize()
{
char rc ;
VIOMODEINFO vi;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetCellSize()"));
vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &vi, 0 );
rc = ( char )( vi.row ? ( vi.vres / vi.row ) - 1 : 0 );
return rc;
return ( char )( s_vi.row ? ( s_vi.vres / s_vi.row ) - 1 : 0 );
}
USHORT hb_gt_GetCursorStyle( void )
{
int rc;
@@ -592,6 +614,7 @@ USHORT hb_gt_GetCursorStyle( void )
return rc;
}
void hb_gt_SetCursorStyle( USHORT style )
{
char cellsize;
@@ -635,6 +658,10 @@ static char * hb_gt_ScreenPtr( USHORT cRow, USHORT cCol )
}
/* TODO: 21/08/2001 - <maurilio.longo@libero.it>
This function works even if a DispBegin() has been issued, but should be corrected
to use VioXXX calls if not
*/
static void hb_gt_xGetXY( USHORT cRow, USHORT cCol, BYTE * attr, BYTE * ch )
{
char * p;
@@ -651,9 +678,13 @@ static void hb_gt_xPutch( USHORT cRow, USHORT cCol, BYTE attr, BYTE ch )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_xPutch(%hu, %hu, %d, %d", cRow, cCol, (int) attr, (int) ch));
{
USHORT FAR * p = (USHORT FAR *) hb_gt_ScreenPtr( cRow, cCol );
if (s_uiDispCount > 0) {
USHORT * p = (USHORT *) hb_gt_ScreenPtr( cRow, cCol );
*p = (attr << 8) + ch;
} else {
USHORT Cell = (attr << 8) + ch;
VioWrtNCell((PBYTE) &Cell, 1, cRow, cCol, 0);
}
}
@@ -662,30 +693,34 @@ void hb_gt_Puts( USHORT usRow, USHORT usCol, BYTE attr, BYTE * str, ULONG len )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Puts(%hu, %hu, %d, %p, %lu)", usRow, usCol, (int) attr, str, len));
if(s_uiDispCount > 0) {
USHORT FAR *p;
if (s_uiDispCount > 0) {
USHORT *p;
register USHORT byAttr = attr << 8;
p = (USHORT FAR *) hb_gt_ScreenPtr( usRow, usCol );
p = (USHORT *) hb_gt_ScreenPtr( usRow, usCol );
while( len-- )
{
*p++ = byAttr + (*str++);
}
} else {
VioWrtCharStrAtt( ( char * ) str, ( USHORT ) len, usRow, usCol, ( BYTE * ) &attr, 0 );
}
}
int hb_gt_RectSize( USHORT rows, USHORT cols )
{
return rows * cols * 2;
}
void hb_gt_GetText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE *dest )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRight, dest));
if(s_uiDispCount > 0) {
if (s_uiDispCount > 0) {
USHORT x, y;
for( y = usTop; y <= usBottom; y++ ) {
@@ -694,6 +729,7 @@ void hb_gt_GetText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight
dest += 2;
}
}
} else {
USHORT width, y;
@@ -706,11 +742,12 @@ void hb_gt_GetText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight
}
}
void hb_gt_PutText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE *srce )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_PutText(%hu, %hu, %hu, %hu, %p)", usTop, usLeft, usBottom, usRight, srce));
if(s_uiDispCount > 0) {
if (s_uiDispCount > 0) {
USHORT x, y;
for( y = usTop; y <= usBottom; y++ ) {
@@ -719,6 +756,7 @@ void hb_gt_PutText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight
srce += 2;
}
}
} else {
USHORT width, y;
@@ -730,6 +768,7 @@ void hb_gt_PutText( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight
}
}
void hb_gt_SetAttribute( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE attr )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetAttribute(%hu, %hu, %hu, %hu, %d)", usTop, usLeft, usBottom, usRight, (int) attr));
@@ -763,15 +802,19 @@ void hb_gt_SetAttribute( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT us
}
}
/* NOTE: 21/08/2001 - <maurilio.longo@libero.it>
If you need to call this function from inside gtos2.c then there is
something WRONG with your code :-)
*/
void hb_gt_DispBegin( void )
{
/* 02/04/2000 - maurilio.longo@libero.it
added support for DispBegin() and DispEnd() functions.
OS/2 has an off screen buffer for every vio session. When a program calls DispBegin()
every function dealing with screen writes/reads uses this buffer. DispEnd() resyncronizes
off screen buffer with screen
/* NOTE: 02/04/2000 - <maurilio.longo@libero.it>
added support for DispBegin() and DispEnd() functions.
OS/2 has an off screen buffer for every vio session. When a program calls DispBegin()
every function dealing with screen writes/reads uses this buffer. DispEnd() resyncronizes
off screen buffer with screen
*/
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispBegin()"));
/* pointer to the only one available screen buffer is set on startup,
@@ -779,6 +822,7 @@ void hb_gt_DispBegin( void )
++s_uiDispCount;
}
void hb_gt_DispEnd( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispEnd()"));
@@ -788,19 +832,19 @@ void hb_gt_DispEnd( void )
}
}
BOOL hb_gt_SetMode( USHORT uiRows, USHORT uiCols )
{
VIOMODEINFO vi;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetMode(%hu, %hu)", uiRows, uiCols));
vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &vi, 0 ); /* fill structure with current settings */
vi.row = uiRows;
vi.col = uiCols;
return ! ( BOOL ) VioSetMode( &vi, 0 ); /* 0 = Ok, other = Fail */
s_vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &s_vi, 0 ); /* fill structure with current settings */
s_vi.row = uiRows;
s_vi.col = uiCols;
return ! ( BOOL ) VioSetMode( &s_vi, 0 ); /* 0 = Ok, other = Fail */
}
BOOL hb_gt_GetBlink()
{
VIOINTENSITY vi;
@@ -813,6 +857,7 @@ BOOL hb_gt_GetBlink()
return ( vi.fs == 0 ); /* 0 = blink, 1 = intens */
}
void hb_gt_SetBlink( BOOL bBlink )
{
VIOINTENSITY vi;
@@ -825,6 +870,7 @@ void hb_gt_SetBlink( BOOL bBlink )
VioSetState( &vi, 0 );
}
void hb_gt_Tone( double dFrequency, double dDuration )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Tone(%lf, %lf)", dFrequency, dDuration));
@@ -853,33 +899,41 @@ void hb_gt_Tone( double dFrequency, double dDuration )
}
}
char * hb_gt_Version( void )
{
return "Harbour Terminal: OS/2 console";
}
USHORT hb_gt_DispCount()
{
return s_uiDispCount;
}
void hb_gt_Replicate( USHORT uiRow, USHORT uiCol, BYTE byAttr, BYTE byChar, ULONG nLength )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%hu, %hu, %i, %i, %lu)", uiRow, uiCol, byAttr, byChar, nLength));
{
USHORT FAR *p;
USHORT byte = (byAttr << 8) + byChar;
USHORT byte = (byAttr << 8) + byChar;
p = (USHORT FAR *) hb_gt_ScreenPtr( uiRow, uiCol );
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%hu, %hu, %i, %i, %lu)", uiRow, uiCol, byAttr, byChar, nLength));
if (s_uiDispCount > 0) {
register USHORT *p;
p = (USHORT *) hb_gt_ScreenPtr( uiRow, uiCol );
while( nLength-- )
{
*p++ = byte;
}
} else {
VioWrtNCell((PBYTE) &byte, nLength, uiRow, uiCol, 0);
}
}
USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
BYTE * szBox, BYTE byAttr )
USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * szBox, BYTE byAttr )
{
USHORT ret = 1;
SHORT Row;
@@ -888,9 +942,9 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
SHORT Width;
if( Left >= 0 || Left < hb_gt_GetScreenWidth()
|| Right >= 0 || Right < hb_gt_GetScreenWidth()
|| Top >= 0 || Top < hb_gt_GetScreenHeight()
|| Bottom >= 0 || Bottom < hb_gt_GetScreenHeight() )
|| Right >= 0 || Right < hb_gt_GetScreenWidth()
|| Top >= 0 || Top < hb_gt_GetScreenHeight()
|| Bottom >= 0 || Bottom < hb_gt_GetScreenHeight() )
{
/* Ensure that box is drawn from top left to bottom right. */
@@ -911,8 +965,6 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
Height = Bottom - Top + 1;
Width = Right - Left + 1;
hb_gt_DispBegin();
if( Height > 1 && Width > 1 && Top >= 0 && Top < hb_gt_GetScreenHeight() && Left >= 0 && Left < hb_gt_GetScreenWidth() )
hb_gt_xPutch( Top, Left, byAttr, szBox[ 0 ] ); /* Upper left corner */
@@ -979,23 +1031,25 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right,
if( Right < hb_gt_GetScreenWidth() && Bottom < hb_gt_GetScreenHeight() )
hb_gt_xPutch( Bottom, Right, byAttr, szBox[ 4 ] ); /* Bottom right corner */
}
hb_gt_DispEnd();
ret = 0;
}
return ret;
}
USHORT hb_gt_BoxD( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame, BYTE byAttr )
{
return hb_gt_Box( Top, Left, Bottom, Right, pbyFrame, byAttr );
}
USHORT hb_gt_BoxS( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame, BYTE byAttr )
{
return hb_gt_Box( Top, Left, Bottom, Right, pbyFrame, byAttr );
}
USHORT hb_gt_HorizLine( SHORT Row, SHORT Left, SHORT Right, BYTE byChar, BYTE byAttr )
{
USHORT ret = 1;
@@ -1005,7 +1059,7 @@ USHORT hb_gt_HorizLine( SHORT Row, SHORT Left, SHORT Right, BYTE byChar, BYTE by
Left = 0;
else if( Left >= hb_gt_GetScreenWidth() )
Left = hb_gt_GetScreenWidth() - 1;
if( Right < 0 )
Right = 0;
else if( Right >= hb_gt_GetScreenWidth() )
@@ -1020,6 +1074,7 @@ USHORT hb_gt_HorizLine( SHORT Row, SHORT Left, SHORT Right, BYTE byChar, BYTE by
return ret;
}
USHORT hb_gt_VertLine( SHORT Col, SHORT Top, SHORT Bottom, BYTE byChar, BYTE byAttr )
{
USHORT ret = 1;
@@ -1051,21 +1106,25 @@ USHORT hb_gt_VertLine( SHORT Col, SHORT Top, SHORT Bottom, BYTE byChar, BYTE byA
return ret;
}
BOOL hb_gt_PreExt()
{
return TRUE;
}
BOOL hb_gt_PostExt()
{
return TRUE;
}
BOOL hb_gt_Suspend()
{
return TRUE;
}
BOOL hb_gt_Resume()
{
return TRUE;