* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.prg
+ Added -tshead=<file> option to create a .ch header with
build timestamp information in it: _HBMK_BUILD_DATE,
_HBMK_BUILD_TIME_, HB_BUILD_TIMESTAMP_.
* -opt/-noopt -> -optim/-nooptim to avoid name ambiguity.
+ Added feature to -vcshead= to create a locally rolled
build number if there is no version control system detected.
In this case _HBMK_VCS_TYPE_ will be defined as "hbmk"
and _HBMK_VCS_ID_ will be initialized with a string, starting
with "1" and incremented on each hbmk2 call.
* Internal change to componentize hbmk2 functionality, clearing
away all STATIC vars and some parameter passing hacks.
Work in progress, TODO added.
! Fixed cosmetic bug in debug output when making .po.
* source/rtl/mlcfunc.c
! Fixed warning appeard in latest change.
* source/rtl/trim.c
* source/compiler/hbfunchk.c
- Removed HB_EXTENSION protected second extended parameters
from RTRIM() and ALLTRIM(). If you miss this option, please
report it on the list, we may readd such functionality under
some different name.
INCOMPATIBLE for HB_EXTENSION builds.
* doc/dirstruc.txt
* bin/hb-func.sh
* utils/hbmk2/examples/contribf.hbp
- contrib/hbole
* contrib/Makefile
+ contrib/hbwin/oleinit.c
+ contrib/hbwin/olecore.c
+ contrib/hbwin/hbwinole.h
+ contrib/hbwin/oleauto.prg
+ contrib/hbwin/tests/sample.odt
* contrib/hbwin/tests/testole.prg
- contrib/hbwin/win_tole.prg
- contrib/hbwin/win_ole.c
+ contrib/examples/hboleold
+ contrib/examples/hboleold/tests
+ contrib/examples/hboleold/tests/testole.prg
+ contrib/examples/hboleold/win_tole.prg
+ contrib/examples/hboleold/win_ole.c
+ contrib/examples/hboleold/Makefile
* Replaced old hbwin OLE implementation with
new implementation in hbole. Thanks to
Mindaugas Kavaliauskas for the new implementation.
Those who need the old implementation in the
meantime for any reason, can find it in contrib/example/hboleold.
; TODO: Fill the few missing features (ActiveX/FiveWin
compatibility).
* ChangeLog
* Marked two TODO/TOFIX done.
407 lines
12 KiB
C
407 lines
12 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* memo line functions: MEMOLINE(), MLCOUNT(), MLPOS(), MLCTOPOS(), MPOSTOLC()
|
|
*
|
|
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbset.h"
|
|
|
|
typedef struct
|
|
{
|
|
char * szEOL;
|
|
ULONG ulLen;
|
|
} HB_EOL_INFO, * PHB_EOL_INFO;
|
|
|
|
static int hb_mlEol( char * pszString, ULONG ulLen,
|
|
PHB_EOL_INFO pEOLs, int iEOLs )
|
|
{
|
|
int i;
|
|
for( i = 0; i < iEOLs; ++i )
|
|
{
|
|
if( ulLen >= pEOLs[ i ].ulLen &&
|
|
memcmp( pszString, pEOLs[ i ].szEOL, pEOLs[ i ].ulLen ) == 0 )
|
|
return i;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
static ULONG hb_mlGetLine( char * pszString, ULONG ulLen, ULONG ulOffset,
|
|
ULONG ulLineLength, ULONG ulTabSize, ULONG ulMaxPos,
|
|
BOOL fWordWrap, PHB_EOL_INFO pEOLs, int iEOLs,
|
|
ULONG * pulLen, ULONG * pulEOL )
|
|
{
|
|
ULONG ulCol = 0, ulBlankCol = 0, ulBlankPos = 0;
|
|
int i;
|
|
|
|
if( pulEOL )
|
|
* pulEOL = 0;
|
|
|
|
while( ulOffset < ulLen && ( ulMaxPos == 0 || ulOffset < ulMaxPos ) )
|
|
{
|
|
if( pszString[ ulOffset ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulOffset + 1 ] == HB_CHAR_SOFT2 )
|
|
{
|
|
ulOffset += 2;
|
|
if( !fWordWrap )
|
|
break;
|
|
continue;
|
|
}
|
|
|
|
i = hb_mlEol( pszString + ulOffset, ulLen - ulOffset, pEOLs, iEOLs );
|
|
if( i >= 0 )
|
|
{
|
|
if( ulMaxPos )
|
|
ulCol += pEOLs[ i ].ulLen;
|
|
else
|
|
ulOffset += pEOLs[ i ].ulLen;
|
|
if( pulEOL )
|
|
* pulEOL = pEOLs[ i ].ulLen;
|
|
break;
|
|
}
|
|
|
|
if( pszString[ ulOffset ] == ' ' || pszString[ ulOffset ] == HB_CHAR_HT )
|
|
{
|
|
ulBlankCol = ulCol;
|
|
ulBlankPos = ulOffset;
|
|
}
|
|
|
|
if( ulCol >= ulLineLength )
|
|
{
|
|
if( fWordWrap )
|
|
{
|
|
if( ulBlankCol == 0 || pszString[ ulOffset ] == ' ' ||
|
|
pszString[ ulOffset ] == HB_CHAR_HT )
|
|
{
|
|
ulCol = ulLineLength;
|
|
if( pszString[ ulOffset ] == ' ' )
|
|
++ulOffset;
|
|
if( pszString[ ulOffset ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulOffset + 1 ] == HB_CHAR_SOFT2 )
|
|
ulOffset += 2;
|
|
}
|
|
else
|
|
{
|
|
ulCol = ulBlankCol;
|
|
ulOffset = ulBlankPos + 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if( ulCol > ulLineLength )
|
|
--ulOffset;
|
|
ulCol = ulLineLength;
|
|
}
|
|
break;
|
|
}
|
|
|
|
ulCol += pszString[ ulOffset ] == HB_CHAR_HT ?
|
|
ulTabSize - ( ulCol % ulTabSize ) : 1;
|
|
ulOffset++;
|
|
}
|
|
* pulLen = ulCol;
|
|
|
|
return ulOffset;
|
|
}
|
|
|
|
static PHB_EOL_INFO hb_mlGetEOLs( int * piEOLs )
|
|
{
|
|
PHB_EOL_INFO pEOLs;
|
|
|
|
pEOLs = ( PHB_EOL_INFO ) hb_xgrab( sizeof( HB_EOL_INFO ) );
|
|
pEOLs->szEOL = hb_setGetEOL();
|
|
if( !pEOLs->szEOL || !pEOLs->szEOL[ 0 ] )
|
|
pEOLs->szEOL = hb_conNewLine();
|
|
pEOLs->ulLen = strlen( pEOLs->szEOL );
|
|
|
|
* piEOLs = pEOLs->ulLen ? 1 : 0;
|
|
|
|
return pEOLs;
|
|
}
|
|
|
|
static char * hb_mlGetParams( int iParAdd, ULONG * pulLen, ULONG * pulLineLength,
|
|
ULONG * pulTabSize, BOOL * pfWordWrap,
|
|
PHB_EOL_INFO * pEOLs, int * piEOLs )
|
|
{
|
|
char * pszString = hb_parc( 1 );
|
|
if( pszString )
|
|
{
|
|
if( ISNUM( 2 ) )
|
|
{
|
|
if( hb_parnd( 2 ) <= 0 )
|
|
return NULL;
|
|
* pulLineLength = hb_parnl( 2 );
|
|
}
|
|
else
|
|
* pulLineLength = 79;
|
|
* pulLen = hb_parclen( 1 );
|
|
* pulTabSize = ISNUM( 3 + iParAdd ) ? hb_parnl( 3 + iParAdd ) : 4;
|
|
* pfWordWrap = ISLOG( 4 + iParAdd ) ? hb_parl( 4 + iParAdd ) : TRUE;
|
|
* pEOLs = hb_mlGetEOLs( piEOLs );
|
|
#ifdef HB_C52_STRICT
|
|
if( * pulLineLength > 254 )
|
|
* pulLineLength = 79;
|
|
#endif
|
|
if( * pulTabSize >= * pulLineLength )
|
|
* pulTabSize = * pulLineLength - 1;
|
|
else if( * pulTabSize == 0 )
|
|
* pulTabSize = 1;
|
|
}
|
|
return pszString;
|
|
}
|
|
|
|
HB_FUNC( MEMOLINE )
|
|
{
|
|
ULONG ulLen, ulLineLength, ulTabSize;
|
|
BOOL fWordWrap;
|
|
PHB_EOL_INFO pEOLs;
|
|
int iEOLs;
|
|
char * pszString = hb_mlGetParams( 1, &ulLen, &ulLineLength,
|
|
&ulTabSize, &fWordWrap, &pEOLs, &iEOLs );
|
|
char * szLine;
|
|
ULONG ulLine = hb_parnl( 3 );
|
|
ULONG ulOffset = 0;
|
|
ULONG ulCols = 0;
|
|
|
|
if( !pszString )
|
|
{
|
|
hb_retc( NULL );
|
|
return;
|
|
}
|
|
|
|
if( ulLine == 0 )
|
|
ulLine = 1;
|
|
|
|
while( --ulLine && ulOffset < ulLen )
|
|
{
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, 0, fWordWrap,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
}
|
|
if( ulOffset < ulLen )
|
|
{
|
|
ULONG ulCol = 0;
|
|
hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, 0, fWordWrap,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
szLine = ( char * ) hb_xgrab( ulLineLength + 1 );
|
|
while( ulCol < ulCols )
|
|
{
|
|
if( pszString[ ulOffset ] == HB_CHAR_HT )
|
|
{
|
|
ULONG ul = ulTabSize - ( ulCol % ulTabSize );
|
|
do
|
|
szLine[ ulCol++ ] = ' ';
|
|
while( --ul && ulCol < ulCols );
|
|
}
|
|
else if( pszString[ ulOffset ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulOffset + 1 ] == HB_CHAR_SOFT2 )
|
|
ulOffset++;
|
|
else
|
|
szLine[ ulCol++ ] = pszString[ ulOffset ];
|
|
ulOffset++;
|
|
}
|
|
if( ulCols < ulLineLength )
|
|
memset( szLine + ulCols, ' ', ulLineLength - ulCols );
|
|
szLine[ ulLineLength ] = 0;
|
|
hb_retclen_buffer( szLine, ulLineLength );
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
hb_xfree( pEOLs );
|
|
}
|
|
|
|
HB_FUNC( MLCOUNT )
|
|
{
|
|
ULONG ulLen, ulLineLength, ulTabSize;
|
|
BOOL fWordWrap;
|
|
PHB_EOL_INFO pEOLs;
|
|
int iEOLs;
|
|
char * pszString = hb_mlGetParams( 0, &ulLen, &ulLineLength,
|
|
&ulTabSize, &fWordWrap, &pEOLs, &iEOLs );
|
|
ULONG ulLines = 0;
|
|
ULONG ulOffset = 0;
|
|
ULONG ulCols = 0;
|
|
|
|
if( pszString )
|
|
{
|
|
while( ulOffset < ulLen )
|
|
{
|
|
++ulLines;
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, 0, fWordWrap,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
}
|
|
hb_xfree( pEOLs );
|
|
}
|
|
hb_retnl( ulLines );
|
|
}
|
|
|
|
HB_FUNC( MLPOS )
|
|
{
|
|
ULONG ulLen, ulLineLength, ulTabSize;
|
|
BOOL fWordWrap;
|
|
PHB_EOL_INFO pEOLs;
|
|
int iEOLs;
|
|
char * pszString = hb_mlGetParams( 1, &ulLen, &ulLineLength,
|
|
&ulTabSize, &fWordWrap, &pEOLs, &iEOLs );
|
|
ULONG ulLine = hb_parnl( 3 );
|
|
ULONG ulOffset = 0;
|
|
ULONG ulCols = 0;
|
|
|
|
if( pszString )
|
|
{
|
|
if( ulLine == 0 )
|
|
ulLine = 1;
|
|
while( --ulLine && ulOffset < ulLen )
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, 0, fWordWrap,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
if( ulOffset < ulLen )
|
|
++ulOffset;
|
|
hb_xfree( pEOLs );
|
|
}
|
|
hb_retnl( ulOffset );
|
|
}
|
|
|
|
HB_FUNC( MLCTOPOS )
|
|
{
|
|
ULONG ulLen, ulLineLength, ulTabSize;
|
|
BOOL fWordWrap;
|
|
PHB_EOL_INFO pEOLs;
|
|
int iEOLs;
|
|
char * pszString = hb_mlGetParams( 2, &ulLen, &ulLineLength,
|
|
&ulTabSize, &fWordWrap, &pEOLs, &iEOLs );
|
|
ULONG ulLine = hb_parnl( 3 );
|
|
ULONG ulCol = hb_parnl( 4 );
|
|
ULONG ulOffset = 0;
|
|
ULONG ulCols = 0;
|
|
|
|
if( pszString )
|
|
{
|
|
if( ulLineLength > 4 && ulLine && ISNUM( 4 ) )
|
|
{
|
|
while( --ulLine && ulOffset < ulLen )
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, 0, fWordWrap,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
if( ulOffset < ulLen && ulCol )
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulCol, ulTabSize, ulLen, FALSE,
|
|
pEOLs, iEOLs, &ulCols, NULL );
|
|
}
|
|
hb_xfree( pEOLs );
|
|
}
|
|
++ulOffset;
|
|
hb_retnl( ulOffset );
|
|
}
|
|
|
|
HB_FUNC( MPOSTOLC )
|
|
{
|
|
ULONG ulLen, ulLineLength, ulTabSize;
|
|
BOOL fWordWrap;
|
|
PHB_EOL_INFO pEOLs;
|
|
int iEOLs;
|
|
char * pszString = hb_mlGetParams( 1, &ulLen, &ulLineLength,
|
|
&ulTabSize, &fWordWrap, &pEOLs, &iEOLs );
|
|
ULONG ulPos = hb_parnl( 3 );
|
|
ULONG ulOffset = 0;
|
|
ULONG ulLine = 0;
|
|
ULONG ulCol = 0;
|
|
ULONG ulEOL = 0;
|
|
|
|
if( pszString )
|
|
{
|
|
if( ulPos && ulLen )
|
|
{
|
|
if( --ulPos )
|
|
{
|
|
do
|
|
{
|
|
++ulLine;
|
|
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,
|
|
ulLineLength, ulTabSize, ulPos, fWordWrap,
|
|
pEOLs, iEOLs, &ulCol, &ulEOL );
|
|
if( ulEOL )
|
|
{
|
|
if( ulOffset + ulEOL == ulPos )
|
|
{
|
|
ulCol = 0;
|
|
++ulLine;
|
|
break;
|
|
}
|
|
ulOffset += ulEOL;
|
|
}
|
|
}
|
|
while( ulOffset < ulLen && ulOffset < ulPos );
|
|
|
|
if( ulLine && ulCol == ulLineLength && ulPos <= ulLen &&
|
|
( hb_mlEol( pszString + ulPos, ulLen - ulPos, pEOLs, iEOLs ) >= 0 ||
|
|
( pszString[ ulPos ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulPos + 1 ] == HB_CHAR_SOFT2 ) ||
|
|
( ulPos > 0 && pszString[ ulPos - 1 ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulPos ] == HB_CHAR_SOFT2 ) ||
|
|
( ulPos > 1 && pszString[ ulPos - 2 ] == HB_CHAR_SOFT1 &&
|
|
pszString[ ulPos - 1 ] == HB_CHAR_SOFT2 ) ) )
|
|
{
|
|
ulCol = 0;
|
|
++ulLine;
|
|
}
|
|
}
|
|
else
|
|
++ulLine;
|
|
}
|
|
hb_xfree( pEOLs );
|
|
}
|
|
hb_reta( 2 );
|
|
hb_stornl( ulLine, -1, 1 );
|
|
hb_stornl( ulCol, -1, 2 );
|
|
}
|