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

ChangeLog 20000318-21:30 GMT+1 -second attempt

Browse Source
This commit is contained in:
Ryszard Glab
2000-03-19 11:59:39 +00:00
parent 9084495b6a
commit 4041084ad8
11 changed files with 241 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
harbour/source/macro/Makefile
View File

@@ -34,6 +34,9 @@ LEX_HEADERS=\
hbmacro.h \
C_SOURCES=macro.c \
macroa.c \
macrob.c \
macroc.c \
LIBNAME=macro

9
harbour/source/macro/macro.c
View File

@@ -1247,13 +1247,4 @@ void hb_compCodeBlockEnd( HB_MACRO_DECL )
hb_xfree( ( void * ) pCodeblock );
}
/* ************************************************************************ */
/* Include the common part of expression optimalizer
* NOTE: It cannot be compiled into a single library because the code
* required for macro compiler differs a little - we are passing additional
* parameter that holds macro compiler internal data
* 3 - ignore this magic number - it forces the compilation of this file
*/
#include "hbexpr.c"

2
harbour/source/macro/macro.l
View File

@@ -47,6 +47,8 @@ NOTE: -C controls the speed/size ratio of generated scanner
-Cem = slowest/smallest
*/
#define HB_MACRO_SUPPORT
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

12
harbour/source/macro/macroa.c Normal file
View File

@@ -0,0 +1,12 @@
/*
* $Id$
*/
/* hbexpra.c is also included from ../compiler/expropta.c
* However it produces a slighty different code if used in
* macro compiler (there is an additional parameter passed to some functions)
* 0 - ignore this magic number - this is used to force compilation
*/
#define HB_MACRO_SUPPORT
#include "hbmacro.h"
#include "hbexpra.c"

12
harbour/source/macro/macrob.c Normal file
View File

@@ -0,0 +1,12 @@
/*
* $Id$
*/
/* hbexprb.c is also included from ../compiler/exproptb.c
* However it produces a slighty different code if used in
* macro compiler (there is an additional parameter passed to some functions)
* 0 - ignore this magic number - this is used to force compilation
*/
#define HB_MACRO_SUPPORT
#include "hbmacro.h"
#include "hbexprb.c"

12
harbour/source/macro/macroc.c Normal file
View File

@@ -0,0 +1,12 @@
/*
* $Id$
*/
/* hbexprc.c is also included from ../compiler/exproptc.c
* However it produces a slighty different code if used in
* macro compiler (there is an additional parameter passed to some functions)
* 0 - ignore this magic number - this is used to force compilation
*/
#define HB_MACRO_SUPPORT
#include "hbmacro.h"
#include "hbexprc.c"

4
harbour/source/rtl/console.c
View File

@@ -67,7 +67,9 @@
#if defined(__GNUC__) && ! defined(__MINGW32__)
#include <unistd.h>
#endif
#include <io.h>
#if !defined( OS_UNIX_COMPATIBLE )
#include <io.h>
#endif
#if defined(OS_UNIX_COMPATIBLE)
#define CRLF_BUFFER_LEN 2 /*length of buffer for CR/LF characters */

2
harbour/source/rtl/filesys.c
View File

@@ -87,7 +87,9 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#if !defined( OS_UNIX_COMPATIBLE )
#include <io.h>
#endif
#if defined(__DJGPP__)
#include <dir.h>

6
harbour/source/rtl/fssize.c
View File

@@ -34,6 +34,9 @@
*
*/
#include "hbapi.h"
#include "hbapifs.h"
#include <errno.h>
#if defined( OS_UNIX_COMPATIBLE )
#include <sys/stat.h>
@@ -41,9 +44,6 @@
#include <sys\stat.h>
#endif
#include "hbapi.h"
#include "hbapifs.h"
ULONG hb_fsFSize( BYTE * pszFileName, BOOL bUseDirEntry )
{
if( bUseDirEntry )

360
harbour/source/rtl/gt/gtcrs.c
View File

@@ -7,6 +7,7 @@
* Video subsystem based on ncurses.
*
* Copyright 1999 Gonzalo Diethelm <gonzalo.diethelm@iname.com>
*
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -35,29 +36,86 @@
#include <curses.h>
#include "hbapigt.h"
#include "gtapi.h"
#include "inkey.ch"
static void gt_GetMaxRC(int* r, int* c);
static void gt_GetRC(int* r, int* c);
static void gt_SetRC(int r, int c);
static int iKeyTable[] = {
KEY_DOWN, K_DOWN,
KEY_UP, K_UP,
KEY_LEFT, K_LEFT,
KEY_RIGHT, K_RIGHT,
KEY_HOME, K_HOME,
KEY_END, K_END,
KEY_BACKSPACE, K_BS,
KEY_IC, K_INS,
KEY_DC, K_DEL,
KEY_NPAGE, K_PGDN,
KEY_PPAGE, K_PGUP,
KEY_F(1), K_F1,
KEY_F(2), K_F2,
KEY_F(3), K_F3,
KEY_F(4), K_F4,
KEY_F(5), K_F5,
KEY_F(6), K_F6,
KEY_F(7), K_F7,
KEY_F(8), K_F8,
KEY_F(9), K_F9,
KEY_F(10), K_F10,
KEY_F(11), K_SH_F1,
KEY_F(12), K_SH_F2,
KEY_F(13), K_SH_F3,
KEY_F(14), K_SH_F4,
KEY_F(15), K_SH_F5,
KEY_F(16), K_SH_F6,
KEY_F(17), K_SH_F7,
KEY_F(18), K_SH_F8,
KEY_F(19), K_SH_F9,
KEY_F(20), K_SH_F10,
KEY_F(21), K_CTRL_F1,
KEY_BTAB, K_SH_TAB
};
void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr )
void hb_gt_Init( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Init()"));
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Init()"));
initscr();
cbreak();
noecho();
nodelay(stdscr, 1);
initscr();
if( has_colors() )
{
int i;
start_color();
for( i = 1; i <= COLOR_PAIRS; i++ )
{
init_pair( i, i % COLORS, i / COLORS );
}
/* NOTE: color order=
COLOR_BLACK
COLOR_RED
COLOR_GREEN
COLOR_YELLOW
COLOR_BLUE
COLOR_MAGENTA
COLOR_CYAN
COLOR_WHITE
*/
}
cbreak();
noecho();
nodelay(stdscr, 1);
keypad( stdscr, TRUE );
}
void hb_gt_Done( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Done()"));
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Done()"));
refresh();
endwin();
refresh();
endwin();
}
int hb_gt_ReadKey( void )
@@ -70,129 +128,90 @@ int hb_gt_ReadKey( void )
if (ch == ERR) {
ch = 0;
}
return ch;
}
BOOL hb_gt_AdjustPos( BYTE * pStr, ULONG ulLen )
{
int row, col, max_row, max_col;
ULONG ulCount;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_AdjustPos(%s, %lu)", pStr, ulLen ));
gt_GetRC( &row, &col );
gt_GetMaxRC( &max_row, &max_col );
for( ulCount = 0; ulCount < ulLen; ulCount++ )
else
{
switch( *pStr++ )
{
case HB_CHAR_BEL:
break;
case HB_CHAR_BS:
if( col )
col--;
else
{
col = max_col;
if( row )
row--;
}
break;
case HB_CHAR_LF:
if( row < max_row )
row++;
break;
case HB_CHAR_CR:
col = 0;
break;
default:
if( col < max_col )
col++;
else
{
col = 0;
if( row < max_row )
row++;
}
}
int i;
for( i=0; i<(sizeof(iKeyTable)/sizeof(int)); i++ )
if( iKeyTable[ i++ ] == ch )
return iKeyTable[ i ];
}
gt_SetRC( row, col );
return TRUE;
return ch;
}
BOOL hb_gt_IsColor( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_IsColor()"));
HB_TRACE(HB_TR_DEBUG, ("hb_gt_IsColor()"));
/* TODO: How to detect this? */
return TRUE;
return has_colors(); /* returns TRUE or FALSE */
}
USHORT hb_gt_GetScreenWidth( void )
{
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenWidth()"));
gt_GetMaxRC(&r, &c);
return c;
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenWidth()"));
gt_GetMaxRC(&r, &c);
return c;
}
USHORT hb_gt_GetScreenHeight( void )
{
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenHeight()"));
gt_GetMaxRC(&r, &c);
return r;
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetScreenHeight()"));
gt_GetMaxRC(&r, &c);
return r;
}
void hb_gt_SetPos( SHORT iRow, SHORT iCol )
void hb_gt_SetPos( USHORT uiRow, USHORT uiCol )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetPos(%hd, %hd)", iRow, iCol));
gt_SetRC(iRow, iCol);
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetPos(%hu, %hu)", uiRow, uiCol));
gt_SetRC(uiRow, uiCol);
}
SHORT hb_gt_Col( void )
USHORT hb_gt_Col( void )
{
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Col()"));
gt_GetRC(&r, &c);
return c;
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Col()"));
gt_GetRC(&r, &c);
return c;
}
SHORT hb_gt_Row( void )
USHORT hb_gt_Row( void )
{
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Row()"));
gt_GetRC(&r, &c);
return r;
int r, c;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Row()"));
gt_GetRC(&r, &c);
return r;
}
USHORT hb_gt_GetCursorStyle( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetCursorStyle()"));
USHORT usOldCursor = curs_set( 0 );
/* TODO: What shape is the cursor? */
return 0;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetCursorStyle()"));
curs_set( usOldCursor );
return (usOldCursor ? SC_INSERT : SC_NONE);
}
void hb_gt_SetCursorStyle( USHORT uiStyle )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetCursorStyle(%hu)", uiStyle));
/* TODO: How to set the cursor shape? */
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetCursorStyle(%hu)", uiStyle));
/* TODO: How to set the cursor shape? */
if( uiStyle == SC_NONE )
curs_set( 0 );
else
curs_set( 1 );
}
void hb_gt_Puts( USHORT uiRow,
@@ -201,13 +220,15 @@ void hb_gt_Puts( USHORT uiRow,
BYTE * pbyStr,
ULONG ulLen )
{
ULONG i;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Puts(%hu, %hu, %d, %p, %lu)", uiRow, uiCol, (int) byAttr, pbyStr, ulLen));
move( uiRow, uiCol );
for( i = 0; i < ulLen; ++i )
addch( pbyStr[ i ] );
ULONG i;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Puts(%hu, %hu, %d, %p, %lu)", uiRow, uiCol, (int) byAttr, pbyStr, ulLen));
move(uiRow, uiCol);
attron( COLOR_PAIR( byAttr ) );
for (i = 0; i < ulLen; ++i) {
addch(pbyStr[i]);
}
}
void hb_gt_GetText( USHORT uiTop,
@@ -216,9 +237,9 @@ void hb_gt_GetText( USHORT uiTop,
USHORT uiRight,
BYTE * pbyDst )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetText(%hu, %hu, %hu, %hu, %p)", uiTop, uiLeft, uiBottom, uiRight, pbyDst));
/* TODO */
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetText(%hu, %hu, %hu, %hu, %p)", uiTop, uiLeft, uiBottom, uiRight, pbyDst));
/* TODO */
}
void hb_gt_PutText( USHORT uiTop,
@@ -227,9 +248,9 @@ void hb_gt_PutText( USHORT uiTop,
USHORT uiRight,
BYTE * pbySrc )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_PutText(%hu, %hu, %hu, %hu, %p)", uiTop, uiLeft, uiBottom, uiRight, pbySrc));
HB_TRACE(HB_TR_DEBUG, ("hb_gt_PutText(%hu, %hu, %hu, %hu, %p)", uiTop, uiLeft, uiBottom, uiRight, pbySrc));
/* TODO */
/* TODO */
}
void hb_gt_SetAttribute( USHORT uiTop,
@@ -238,12 +259,12 @@ void hb_gt_SetAttribute( USHORT uiTop,
USHORT uiRight,
BYTE byAttr )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetAttribute(%hu, %hu, %hu, %hu, %d)", uiTop, uiLeft, uiBottom, uiRight, (int) byAttr));
/* TODO: we want to take a screen that is say bright white on blue,
and change the attributes only for a section of the screen
to white on black.
*/
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetAttribute(%hu, %hu, %hu, %hu, %d)", uiTop, uiLeft, uiBottom, uiRight, (int) byAttr));
/* TODO: we want to take a screen that is say bright white on blue,
and change the attributes only for a section of the screen
to white on black.
*/
}
void hb_gt_Scroll( USHORT uiTop,
@@ -254,95 +275,90 @@ void hb_gt_Scroll( USHORT uiTop,
SHORT iRows,
SHORT iCols )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", uiTop, uiLeft, uiBottom, uiRight, (int) byAttr, iRows, iCols));
/* TODO */
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", uiTop, uiLeft, uiBottom, uiRight, (int) byAttr, iRows, iCols));
/* TODO */
}
void hb_gt_DispBegin( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispBegin()"));
/* TODO: Is there a way to change screen buffers?
ie: can we write somewhere without it going to the screen
and then update the screen from this buffer at a later time?
We will initially want to copy the current screen to this buffer.
*/
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispBegin()"));
/* TODO: Is there a way to change screen buffers?
ie: can we write somewhere without it going to the screen
and then update the screen from this buffer at a later time?
We will initially want to copy the current screen to this buffer.
*/
}
void hb_gt_DispEnd()
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispEnd()"));
/* TODO: here we flush the buffer, and restore normal screen writes */
HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispEnd()"));
/* TODO: here we flush the buffer, and restore normal screen writes */
}
BOOL hb_gt_SetMode( USHORT uiRows, USHORT uiCols )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetMode(%hu, %hu)", uiRows, uiCols));
/* TODO: How to change the size of the screen? */
return TRUE;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetMode(%hu, %hu)", uiRows, uiCols));
/* TODO: How to change the size of the screen? */
return TRUE;
}
void hb_gt_Replicate( BYTE byChar, ULONG ulLen )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%d, %lu)", (int) byChar, ulLen));
/* TODO: this will write character c nlength times to the screen.
Note that it is not used yet
If there is no native function that supports this, it is
already handled in a generic way by higher level functions.
*/
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%d, %lu)", (int) byChar, ulLen));
/* TODO: this will write character c nlength times to the screen.
Note that it is not used yet
If there is no native function that supports this, it is
already handled in a generic way by higher level functions.
*/
}
BOOL hb_gt_GetBlink()
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetBlink()"));
/* TODO: under dos, the background 'intensity' bit can be switched
from intensity to 'blinking'
does this work under your platform?
*/
return FALSE;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetBlink()"));
/* TODO: under dos, the background 'intensity' bit can be switched
from intensity to 'blinking'
does this work under your platform?
*/
return FALSE;
}
void hb_gt_SetBlink( BOOL bBlink )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetBlink(%d)", (int) bBlink));
/* TODO: set the bit if it's supported */
HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetBlink(%d)", (int) bBlink));
/* TODO: set the bit if it's supported */
if( bBlink )
attron( A_BLINK );
else
attroff( A_BLINK );
}
void hb_gt_Tone( double dFrequency, double dDuration )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_Tone(%lf, %lf)", dFrequency, dDuration));
/* TODO: Implement this */
HB_SYMBOL_UNUSED( dFrequency );
HB_SYMBOL_UNUSED( dDuration );
}
static void gt_GetMaxRC(int* r, int* c)
{
int y, x;
getmaxyx(stdscr, y, x);
*r = y;
*c = x;
int y, x;
getmaxyx(stdscr, y, x);
*r = y;
*c = x;
}
static void gt_GetRC(int* r, int* c)
{
int y, x;
getyx(stdscr, y, x);
*r = y;
*c = x;
int y, x;
getyx(stdscr, y, x);
*r = y;
*c = x;
}
static void gt_SetRC(int r, int c)
{
move(r, c);
refresh();
move(r, c);
refresh();
}

5
harbour/source/rtl/gtapi.c
View File

@@ -55,10 +55,13 @@
*
*/
#include "hbsetup.h" /* this have to be included to get OS_xxx defined */
#if defined(__GNUC__) && ! defined(__MINGW32__)
#include <unistd.h>
#endif
#include <io.h>
#if !defined( OS_UNIX_COMPATIBLE )
#include <io.h>
#endif
#include <ctype.h>