diff --git a/harbour/ChangeLog b/harbour/ChangeLog index afcc0e5211..60097ef85f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,34 +17,52 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-04 01:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * harbour.spec + * mpkg_rpm.sh + + Added freeimage to mainstream package now that + it finally builds on *nix systems. + + * contrib/gtwvg/gtwvg.c + * src/rtl/gtwvt/gtwvt.c + * Deleted unnecessary cast. + + * contrib/hbmisc/hbeditc.c + * Cleaned constant usage. + + * contrib/hbide/ideparseexpr.c + * int -> HB_ISIZ + % Minor optimization. + 2010-03-03 07:31 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) ! In continuation of previous message: - ; WARNIING: the original format of your existing .hbp - project file will be changed if you make use - of "Project Properties" docking window and + ; WARNIING: the original format of your existing .hbp + project file will be changed if you make use + of "Project Properties" docking window and then click on "Save & Exit" or "Save". For contents viewing it will be ok. - + In the new format, if you save it via wizard, - all sources will follow flags and comments + all sources will follow flags and comments will be deleted. ; NOTE: now onwards, trace dump of command line operations - and hbIDE output console will be the same which + and hbIDE output console will be the same which will facilitates to resolve build issues effectively. - ; APPRECIATION: hbmk2 is an excellent build tool I have seen + ; APPRECIATION: hbmk2 is an excellent build tool I have seen so far in my development namespace. We owe heavily to Viktor for this great contribution. 2010-03-03 01:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_garbage.h * contrib/hbqt/THbQtUI.prg - ! A massive effort to stream-line GPF at exit. - At least now I know that it is caused by the way + ! A massive effort to stream-line GPF at exit. + At least now I know that it is caused by the way QLayout has relation with parent and children both. - To some extent I am been able to cover it, but not + To some extent I am been able to cover it, but not completely, at least till now. * contrib/hbxbp/xbptreeview.prg @@ -77,30 +95,30 @@ * contrib/hbide/idethemes.prg + Restructured project management. - + + Implemented: .hbp as project definition protocol. Exploited -3rd= token to keep hbIDE specific data. - Now you can open any existing .hbp and build it + Now you can open any existing .hbp and build it out of the box. You must have set the build env beforehand OR take use of hbIDE's .env protocol. + Implemented: relative paths. The relative paths are are computed downwards and from .hbp location. - Upper level paths still remain absolute. If your - projects structure is well thought of, then this - feature means this project tree is transferable + Upper level paths still remain absolute. If your + projects structure is well thought of, then this + feature means this project tree is transferable across different OS's and drives. - The relative paths posed many difficulties. The + The relative paths posed many difficulties. The facts had to be resolved while search operations, while opening the files from Project Tree, and more. Now all are in perfect syncronization. - + Managed: .hbp filters on source level and are + + Managed: .hbp filters on source level and are handelled transparently. In Project Tree source - is shown without filters. Search operations are + is shown without filters. Search operations are also transparent. So, an entry like: - {msvc|bcc}vouch/scandocument.prg + {msvc|bcc}vouch/scandocument.prg is respected by hbIDE. ! The other changes: @@ -110,14 +128,14 @@ - Concept of meta-data is eliminated. - The output executable is automatically recognized - from linker output. So "Destination folder" is + from linker output. So "Destination folder" is kept for only "Launch" option which, in fact, does not know where executable is located. "Build & Launch" and "Rebuild & Launch" options do not look for "Destination folder" at all. - Project location is always pulled from .hbp file. - It is not retained anywhere to make the project + It is not retained anywhere to make the project portable. - Many more facts I cannot recollect at present. @@ -127,13 +145,13 @@ ; NOTE: delete hbide.ini, idesettings.ini, all .hbi's and start with clean state. - - Regression is highly possible and I am eager - to hear from you. This commit is just for - stramlining project management, though there + + Regression is highly possible and I am eager + to hear from you. This commit is just for + stramlining project management, though there few other features implemented less important to mention. - + 2010-03-03 03:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmisc/hbeditc.c ! One fix to prev right away. (in former strcpy) diff --git a/harbour/INSTALL b/harbour/INSTALL index b837da62e6..917c9f17be 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -225,7 +225,7 @@ HARBOUR --with cairo - build components dependent on cairo (hbcairo) --with curl - build components dependent on libcurl (hbcurl) --with firebird - build components dependent on firebird (hbfbird, sddfb) - --with freeimage - build components dependent on freeimage (hbfimage) [TOFIX] + --with freeimage - build components dependent on freeimage (hbfimage) --with gd - build components dependent on gd (hbgd) --with mysql - build components dependent on mysql (hbmysql, sddmy) --with odbc - build components dependent on odbc (hbodbc, sddodbc) @@ -1197,7 +1197,7 @@ HARBOUR x win -> wce/msvcmips mips (not supported yet) x win -> wce/msvcsh sh (not supported yet) x win -> wce/msvc x86 (not supported yet) - x win -> dos/djgpp x86 (on Windows x86 only) + x win -> dos/djgpp x86 (on Windows x86 hosts only) x win -> dos/watcom x86 x win -> os2/watcom x86 x win -> linux/watcom x86 diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 0f12a3f9c6..5355187fef 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -448,7 +448,7 @@ static int hb_gt_wvt_FireEvent( PHB_GTWVT pWVT, int nEvent, PHB_ITEM pParams ) { PHB_ITEM pEvent = hb_itemPutNI( NULL, nEvent ); - nResult = hb_itemGetNI( hb_vmEvalBlockV( ( PHB_ITEM ) pWVT->pGT->pNotifierBlock, 2, pEvent, pParams ) ); + nResult = hb_itemGetNI( hb_vmEvalBlockV( pWVT->pGT->pNotifierBlock, 2, pEvent, pParams ) ); hb_itemRelease( pEvent ); diff --git a/harbour/contrib/hbide/ideparseexpr.c b/harbour/contrib/hbide/ideparseexpr.c index 91aef6f0cd..1a47e35d08 100644 --- a/harbour/contrib/hbide/ideparseexpr.c +++ b/harbour/contrib/hbide/ideparseexpr.c @@ -48,6 +48,7 @@ * If you do not wish that, delete this exception notice. * */ + /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ @@ -71,9 +72,9 @@ /*----------------------------------------------------------------------*/ -static int ide_linearfind( const char ** array, const char * pszText, int lenarray, int lentext, HB_BOOL bMatchCase ) +static HB_ISIZ ide_linearfind( const char ** array, const char * pszText, HB_ISIZ lenarray, HB_ISIZ lentext, HB_BOOL bMatchCase ) { - int i; + HB_ISIZ i; if( bMatchCase ) { @@ -92,6 +93,7 @@ static int ide_linearfind( const char ** array, const char * pszText, int lenarr } } + return 0; } @@ -99,7 +101,7 @@ static int ide_linearfind( const char ** array, const char * pszText, int lenarr static HB_BOOL ide_strempty( const char * pszString ) { - int i = 0; + HB_ISIZ i = 0; while( pszString[ i ] != 0 ) { @@ -112,12 +114,12 @@ static HB_BOOL ide_strempty( const char * pszString ) /*----------------------------------------------------------------------*/ -static int ide_atbuff( const char * pszChars, const char * pszString, int StartFrom, int Target, int len_chars, int len ) +static HB_ISIZ ide_atbuff( const char * pszChars, const char * pszString, HB_ISIZ StartFrom, HB_ISIZ Target, HB_ISIZ len_chars, HB_ISIZ len ) { if( len >= len_chars && StartFrom <= len - len_chars ) { - int x; - int counter = 0; + HB_ISIZ x; + HB_ISIZ counter = 0; for( x = StartFrom; x <= ( len - len_chars ); x++ ) { @@ -134,19 +136,19 @@ static int ide_atbuff( const char * pszChars, const char * pszString, int StartF /*----------------------------------------------------------------------*/ -static int ide_getword( const char * pszText, HB_BOOL bHonorSpacing, char * pszWord, int * pnpos ) +static HB_ISIZ ide_getword( const char * pszText, HB_BOOL bHonorSpacing, char * pszWord, HB_ISIZ * pnpos ) { static const char s_szGood[] = "''_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890."; static const char * s_szDoubleList[] = { "*/", "/*", "//", "->", "::", "||", "++", "--", "**", ":=", "<=", ">=", "<>", "!=", "==", "+=", "-=", "*=", "/=", "%=", "^=", "&&", "^^", ">>", "<<", "=>", "&=", "|=" }; - static int s_lengood = HB_SIZEOFARRAY( s_szGood ) - 1; - static int s_lendouble = HB_SIZEOFARRAY( s_szDoubleList ); + static HB_ISIZ s_lengood = HB_SIZEOFARRAY( s_szGood ) - 1; + static HB_ISIZ s_lendouble = HB_SIZEOFARRAY( s_szDoubleList ); - int maxlen = strlen( pszText ); - int npos = 0; - int wordlen = 0; + HB_ISIZ maxlen = strlen( pszText ); + HB_ISIZ npos = 0; + HB_ISIZ wordlen = 0; if( maxlen > 0 ) { @@ -185,13 +187,13 @@ static int ide_getword( const char * pszText, HB_BOOL bHonorSpacing, char * pszW szSingle[ 0 ] = ch; if( ide_atbuff( szSingle, s_szGood, 0, 1, 1, s_lengood ) ) /* ch $ s_szGood ) // variables, commands, function names */ { - while( npos < maxlen && ide_atbuff( szSingle, s_szGood, 0, 1, 1, s_lengood ) ) - { - pszWord[ wordlen++ ] = ch; - npos++; - ch = pszText[ npos ]; - szSingle[ 0 ] = ch; - } + while( npos < maxlen && ide_atbuff( szSingle, s_szGood, 0, 1, 1, s_lengood ) ) + { + pszWord[ wordlen++ ] = ch; + npos++; + ch = pszText[ npos ]; + szSingle[ 0 ] = ch; + } } else if( ch == ' ' ) { @@ -240,18 +242,19 @@ HB_FUNC( PARSEXPR ) /* ( c, bHonorSpacing, bInRemark, bUpperKeyWord, bKeepCommen { const char * pszExpr = hb_parcx( 1 ); - HB_BOOL bHonorSpacing = hb_parl( 2 ); - HB_BOOL bInRemark = HB_ISLOG( 3 ) ? hb_parl( 3 ) : HB_FALSE; - HB_BOOL bKeepComments = HB_ISLOG( 5 ) ? hb_parl( 5 ) : HB_TRUE; - HB_BOOL bPRG = HB_ISLOG( 6 ) ? hb_parl( 6 ) : HB_TRUE; - HB_BOOL bKeepSpaces = HB_ISLOG( 7 ) ? hb_parl( 7 ) : HB_TRUE; - PHB_ITEM paExpr = hb_itemArrayNew( 0 ); - PHB_ITEM pTemp = hb_itemNew( NULL ); - HB_BOOL bFirst = HB_TRUE; - int lenprocessed = 0; - int lenwords = 0; - int wordlen; - int npos; + PHB_ITEM paExpr = hb_itemArrayNew( 0 ); + PHB_ITEM pTemp = hb_itemNew( NULL ); + + HB_BOOL bHonorSpacing = hb_parl( 2 ); + HB_BOOL bInRemark = hb_parl( 3 ); + HB_BOOL bKeepComments = HB_ISLOG( 5 ) ? hb_parl( 5 ) : HB_TRUE; + HB_BOOL bPRG = HB_ISLOG( 6 ) ? hb_parl( 6 ) : HB_TRUE; + HB_BOOL bKeepSpaces = HB_ISLOG( 7 ) ? hb_parl( 7 ) : HB_TRUE; + HB_BOOL bFirst = HB_TRUE; + HB_ISIZ lenprocessed = 0; + HB_ISIZ lenwords = 0; + HB_ISIZ wordlen; + HB_ISIZ npos; char szNextWord[ 2048 ]; diff --git a/harbour/contrib/hbmisc/hbeditc.c b/harbour/contrib/hbmisc/hbeditc.c index 5317378e9a..a84ad3e6b2 100644 --- a/harbour/contrib/hbmisc/hbeditc.c +++ b/harbour/contrib/hbmisc/hbeditc.c @@ -25,24 +25,10 @@ #include "hbapigt.h" #include "hbapierr.h" -#define Eof '\0' -#define SOFT 141 -#define HARD '\r' -#define END 'í' +#define _STABILIZE_UP 1 +#define _STABILIZE_DOWN 0 -#define LOWER 0 -#define UPPER 1 -#define SPOKO 2 - -#define UP 1 -#define DOWN 0 -#define YES 1 -#define NO 0 - -#define REWRITE 1 -#define NO_WRITE 0 - -#define MAX_LINE_LEN 254 +#define _MAX_LINE_LEN 254 typedef struct @@ -81,14 +67,14 @@ typedef struct static void KillText( PHB_EDITOR pEd ); -static unsigned int Clear( PHB_EDITOR pEd, long, unsigned int * ); -static void BackSpace( PHB_EDITOR pEd, int ); +static unsigned int Clear( PHB_EDITOR pEd, long, unsigned int * nEsc ); +static void BackSpace( PHB_EDITOR pEd, int INS ); static void NextWord( PHB_EDITOR pEd ); -static void Return( PHB_EDITOR pEd, int ); -static void GoTo( PHB_EDITOR pEd, int ); -static int format_line( PHB_EDITOR pEd, int, unsigned int ); -static void MoveText( PHB_EDITOR pEd, long, long, long ); -static unsigned int GetLineLength( PHB_EDITOR pEd, long, int * ); +static void Return( PHB_EDITOR pEd, int INS ); +static void GoTo( PHB_EDITOR pEd, int line ); +static int format_line( PHB_EDITOR pEd, int Karetka, unsigned int LineDl ); +static void MoveText( PHB_EDITOR pEd, long source, long dest, long ilb ); +static unsigned int GetLineLength( PHB_EDITOR pEd, long off, int * wsk ); @@ -216,8 +202,8 @@ HB_FUNC( ED_NEW ) long bufferSize; ll = hb_parni( 1 ); - if( ll > MAX_LINE_LEN ) - ll = MAX_LINE_LEN; + if( ll > _MAX_LINE_LEN ) + ll = _MAX_LINE_LEN; tab = hb_parni( 2 ); pEd = ( PHB_EDITOR ) hb_xgrab( sizeof( HB_EDITOR ) ); @@ -275,7 +261,7 @@ static void FormatText( PHB_EDITOR pEd ) nLen = Clear( pEd, pEd->current_line, &nEsc ); - if( ! format_line( pEd, HARD, nLen ) ) + if( ! format_line( pEd, HB_CHAR_HARD1, nLen ) ) pEd->current_line = Next( pEd, pEd->current_line ); } @@ -309,7 +295,7 @@ static void NewText( PHB_EDITOR pEd ) pEd->current_stabil = 0; pEd->first_display = pEd->last_display = 0; pEd->next_stabil = 0; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->stabil = pEd->bottom - pEd->top + 1; for( i = 0; i < pEd->stabil; i++ ) @@ -404,7 +390,7 @@ static long GoToLine( PHB_EDITOR pEd, int linia ) /* Counts the number of printable characters in given line */ -static unsigned int GetLineLength( PHB_EDITOR pEd, long off, int *wsk ) +static unsigned int GetLineLength( PHB_EDITOR pEd, long off, int * wsk ) { unsigned int i, j; char * p; @@ -608,12 +594,12 @@ HB_FUNC( ED_CONFIG ) { j = Next( pEd, pEd->last_display ); if( j >= 0 ) - pEd->last_display = j; + pEd->last_display = j; } } else { - pEd->first_display = pEd->first_line; + pEd->first_display = pEd->first_line; /* find the last line for display */ nwys = pEd->bottom - pEd->top; @@ -621,7 +607,7 @@ HB_FUNC( ED_CONFIG ) { j = Next( pEd, pEd->last_display ); if( j >= 0 ) - pEd->last_display = j; + pEd->last_display = j; } /* check if this line is empty */ if( strlen( pEd->begin + ( unsigned int ) pEd->last_display ) == 0 ) @@ -713,7 +699,7 @@ HB_FUNC( ED_CONFIG ) pEd->fStable = HB_FALSE; pEd->current_stabil = 0; pEd->next_stabil = pEd->first_display; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; } else hb_errRT_BASE( EG_ARG, 3001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); @@ -739,7 +725,7 @@ HB_FUNC( ED_GETTEXT ) hb_strncpy( buffer, pEd->begin, dl - 1 ); help = buffer; - if( mietka != SOFT ) + if( mietka != HB_CHAR_SOFT1 ) { while( help !=NULL ) { @@ -935,7 +921,7 @@ HB_FUNC( ED_STABILIZE ) int nLeft, nTop; char * EscPtr; char * cPtr; - char adres[ MAX_LINE_LEN + 2 ]; + char adres[ _MAX_LINE_LEN + 2 ]; while( --pEd->stabil >= 0 ) { @@ -1007,12 +993,12 @@ HB_FUNC( ED_STABILIZE ) /* find next line for displaying */ switch( pEd->dir ) { - case DOWN: + case _STABILIZE_DOWN: pEd->next_stabil = Next( pEd, pEd->next_stabil ); nRow = pEd->current_stabil++; break; - case UP: + case _STABILIZE_UP: pEd->next_stabil = Prev( pEd, pEd->next_stabil ); nRow = pEd->current_stabil--; break; @@ -1053,10 +1039,10 @@ HB_FUNC( ED_STABILIZE ) */ switch( pEd->dir ) { - case DOWN: + case _STABILIZE_DOWN: nRow = pEd->current_stabil++; break; - case UP: + case _STABILIZE_UP: nRow = pEd->current_stabil--; break; } @@ -1131,7 +1117,7 @@ static void Down( PHB_EDITOR pEd ) { /* attempt to move to the line that was not visible yet */ - pEd->stabil = 1; /* only one line needs to be redisplayed */ + pEd->stabil = 1; /* only one line needs to be redisplayed */ pEd->cursor_row = pEd->bottom - pEd->top; pEd->first_display = Next( pEd, pEd->first_display ); @@ -1139,7 +1125,7 @@ static void Down( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->last_display; - pEd->dir = UP; + pEd->dir = _STABILIZE_UP; pEd->current_stabil = pEd->cursor_row; } else @@ -1218,7 +1204,7 @@ static void Up( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->current_line; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -1304,7 +1290,7 @@ HB_FUNC( ED_PGDOWN ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else @@ -1371,7 +1357,7 @@ HB_FUNC( ED_PGUP ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->last_display; pEd->stabil = bt + 1; - pEd->dir = UP; + pEd->dir = _STABILIZE_UP; pEd->current_stabil = bt; } else @@ -1407,7 +1393,7 @@ HB_FUNC( ED_TOP ) pEd->active = 1; pEd->fStable = HB_FALSE; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->first_col = pEd->cursor_col = 0; } else @@ -1450,7 +1436,7 @@ HB_FUNC( ED_BOTTOM ) pEd->active = pEd->line_number; pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; pEd->first_col = pEd->cursor_col = 0; pEd->cursor_row = j; @@ -1494,7 +1480,7 @@ static void GoTo( PHB_EDITOR pEd, int line ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->current_line; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = pEd->cursor_row; pEd->first_col = 0; } @@ -1529,7 +1515,7 @@ static void Left( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } /* else no wrap allowed */ @@ -1567,7 +1553,7 @@ static void Right( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -1595,7 +1581,7 @@ static void Home( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else @@ -1634,7 +1620,7 @@ static void End( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else if( ( ll - pEd->first_col ) > ( pEd->right - pEd->left ) ) @@ -1645,7 +1631,7 @@ static void End( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else @@ -1670,7 +1656,7 @@ static void FormatParagraph ( PHB_EDITOR pEd ) { int rdl, cc, cr, cor; long dl, source, CrLine; - char pom[ MAX_LINE_LEN * 2 ]; + char pom[ _MAX_LINE_LEN * 2 ]; char * tmp; unsigned int nEsc; @@ -1678,7 +1664,7 @@ static void FormatParagraph ( PHB_EDITOR pEd ) cr = pEd->cursor_row; cor = 0; - rdl = format_line( pEd, SOFT, 0 ); + rdl = format_line( pEd, HB_CHAR_SOFT1, 0 ); pEd->stabil = 1; /* at least one line will be redisplayed */ /* if( rdl ) @@ -1703,7 +1689,7 @@ static void FormatParagraph ( PHB_EDITOR pEd ) MoveText( pEd, source + 2, source + 1, pEd->buffer_size - source + 2 ); pEd->begin[ ( unsigned int ) ( source + 1 ) ] = ' '; - rdl = format_line( pEd, SOFT, 0 ); + rdl = format_line( pEd, HB_CHAR_SOFT1, 0 ); Clear( pEd, pEd->current_line, &nEsc ); pEd->current_line = Next( pEd, pEd->current_line ); @@ -1733,7 +1719,7 @@ static void FormatParagraph ( PHB_EDITOR pEd ) } pEd->fStable = HB_FALSE; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->cursor_col = cc; pEd->cursor_row = cr; pEd->line_number-= cor; @@ -1762,7 +1748,7 @@ static void DelChar( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->current_line; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = pEd->cursor_row; FormatParagraph( pEd ); @@ -1775,7 +1761,7 @@ static void DelChar( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -1807,7 +1793,7 @@ HB_FUNC( ED_DELCHAR ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -1834,8 +1820,8 @@ HB_FUNC( ED_DELCHAR ) */ static void BackSpace( PHB_EDITOR pEd, int INS ) { - char tmp[ MAX_LINE_LEN + 2 ]; - char tmp1[ MAX_LINE_LEN + 2 ]; + char tmp[ _MAX_LINE_LEN + 2 ]; + char tmp1[ _MAX_LINE_LEN + 2 ]; char * w; long ww, j, ccc, kk; int rdl, nLen; @@ -1843,7 +1829,7 @@ static void BackSpace( PHB_EDITOR pEd, int INS ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->current_line; pEd->stabil = 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = pEd->cursor_row; if( INS ) @@ -1915,7 +1901,7 @@ static void BackSpace( PHB_EDITOR pEd, int INS ) pEd->last_display = Prev( pEd, pEd->last_display ); /* split the new line if it is too long */ - format_line( pEd, HARD, 0 ); + format_line( pEd, HB_CHAR_HARD1, 0 ); j = Next( pEd, pEd->current_line ); if( j < 0 ) @@ -1926,7 +1912,7 @@ static void BackSpace( PHB_EDITOR pEd, int INS ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -1936,7 +1922,7 @@ static void BackSpace( PHB_EDITOR pEd, int INS ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else @@ -2001,7 +1987,7 @@ static void GotoNextNonEmptyLine( PHB_EDITOR pEd ) static void NextWord( PHB_EDITOR pEd ) { char * adr; - char tmp[ MAX_LINE_LEN + 2 ]; + char tmp[ _MAX_LINE_LEN + 2 ]; int ccc; unsigned int nEsc, nLen; @@ -2022,7 +2008,7 @@ static void NextWord( PHB_EDITOR pEd ) { pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -2037,7 +2023,7 @@ static void NextWord( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -2103,7 +2089,7 @@ static void PreviousWord( PHB_EDITOR pEd ) { pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -2120,7 +2106,7 @@ static void PreviousWord( PHB_EDITOR pEd ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } } @@ -2147,7 +2133,7 @@ HB_FUNC( ED_PWORD ) */ static int format_line( PHB_EDITOR pEd, int Karetka, unsigned int LineDl ) { - char pom[ MAX_LINE_LEN * 2 ]; + char pom[ _MAX_LINE_LEN * 2 ]; char * p; int podz, jj, status, i; long j; @@ -2235,7 +2221,7 @@ static int AppendChar( PHB_EDITOR pEd, int znak, int podz ) /* the last line always have to end with the hard carriage return */ pEd->begin[ ( unsigned int ) pEd->text_length - 2 ] = '\r'; - status = format_line( pEd, SOFT, 0 ); + status = format_line( pEd, HB_CHAR_SOFT1, 0 ); cl = pEd->current_line; ccol = pEd->cursor_col; @@ -2298,7 +2284,7 @@ static void PutChar( PHB_EDITOR pEd, int INS, int znak ) MoveText( pEd, i, i + 1, pEd->buffer_size - pEd->current_line - cc - 1 ); pEd->begin[ ( unsigned int ) i ] = ( char ) znak; - jj = format_line( pEd, SOFT, 0 ); + jj = format_line( pEd, HB_CHAR_SOFT1, 0 ); cl = pEd->current_line; ccol = pEd->cursor_col; @@ -2314,7 +2300,7 @@ static void PutChar( PHB_EDITOR pEd, int INS, int znak ) SetLastLine( pEd ); } else /* the cursor is located after the last character in the line */ - jj = AppendChar( pEd, znak, SOFT ); + jj = AppendChar( pEd, znak, HB_CHAR_SOFT1 ); if( !jj ) Right( pEd ); @@ -2333,7 +2319,7 @@ static void PutChar( PHB_EDITOR pEd, int INS, int znak ) else if( Check_length( pEd, 1 ) ) { - jj = AppendChar( pEd, znak, SOFT ); + jj = AppendChar( pEd, znak, HB_CHAR_SOFT1 ); if( ! jj ) Right( pEd ); else @@ -2359,7 +2345,7 @@ static void PutChar( PHB_EDITOR pEd, int INS, int znak ) } pEd->fStable = HB_FALSE; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; } @@ -2424,7 +2410,7 @@ static void DelLine( PHB_EDITOR pEd ) tmp = 0; pEd->stabil = pEd->bottom - pEd->top + 1 - pEd->cursor_row; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; MoveText( pEd, tmp, pEd->current_line, pEd->buffer_size - pEd->current_line - 2 ); @@ -2445,7 +2431,7 @@ static void DelLine( PHB_EDITOR pEd ) pEd->last_display = pEd->last_line; pEd->stabil = 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->next_stabil = pEd->current_line; pEd->current_stabil = pEd->cursor_row; pEd->fStable = HB_FALSE; @@ -2486,7 +2472,7 @@ HB_FUNC( ED_DELWORD ) if( pEd->begin[ ( unsigned int ) j ] != ' ' ) { if( ( unsigned int ) ( pEd->cursor_col + pEd->first_col ) < - ( unsigned int ) ( GetLineLength( pEd, pEd->current_line, &rdl ) )) + ( unsigned int ) ( GetLineLength( pEd, pEd->current_line, &rdl ) ) ) { cc = pEd->cursor_col; cr = pEd->cursor_row; @@ -2515,7 +2501,7 @@ HB_FUNC( ED_DELWORD ) pEd->fStable = HB_FALSE; pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; pEd->current_stabil = 0; } else @@ -2612,7 +2598,7 @@ static void Return( PHB_EDITOR pEd, int INS ) if( Check_length( pEd, 0 ) ) { pEd->fStable = HB_FALSE; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; Down( pEd ); Home( pEd ); } @@ -2622,7 +2608,7 @@ static void Return( PHB_EDITOR pEd, int INS ) pEd->next_stabil = pEd->first_display; pEd->stabil = pEd->bottom - pEd->top + 1; pEd->current_stabil = 0; - pEd->dir = DOWN; + pEd->dir = _STABILIZE_DOWN; } } diff --git a/harbour/harbour.spec b/harbour/harbour.spec index ef5789367f..d5570a210b 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -69,7 +69,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_edir export HB_ETC_INSTALL=%{hb_etcdir} %define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc hbfoxpro hbfship hbxpp xhb rddbmcdx rddsql hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql} %{?_with_odbc:hbodbc} %{?_with_pgsql:hbpgsql} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}" +%define hb_ctrb export HB_CONTRIBLIBS="hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc hbfoxpro hbfship hbxpp xhb rddbmcdx rddsql hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql} %{?_with_odbc:hbodbc} %{?_with_pgsql:hbpgsql} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}" %define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index c285052efc..224387b396 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -65,6 +65,7 @@ do fi [ "$1" = "pgsql" ] && NEED_RPM="${NEED_RPM} postgresql-devel" [ "$1" = "firebird" ] && NEED_RPM="${NEED_RPM} firebird-devel" + [ "$1" = "freeimage" ] && NEED_RPM="${NEED_RPM} freeimage-devel" [ "$1" = "allegro" ] && NEED_RPM="${NEED_RPM} allegro-devel" [ "$1" = "qt" ] && NEED_RPM="${NEED_RPM} libqt4-devel" fi diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c index 2ecc4c52fa..6d4eacc746 100644 --- a/harbour/src/rtl/gtwvt/gtwvt.c +++ b/harbour/src/rtl/gtwvt/gtwvt.c @@ -363,7 +363,7 @@ static int hb_gt_wvt_FireEvent( PHB_GTWVT pWVT, int nEvent ) { PHB_ITEM pEvent = hb_itemPutNI( NULL, nEvent ); - nResult = hb_itemGetNI( hb_vmEvalBlockV( ( PHB_ITEM ) pWVT->pGT->pNotifierBlock, 1, pEvent ) ); + nResult = hb_itemGetNI( hb_vmEvalBlockV( pWVT->pGT->pNotifierBlock, 1, pEvent ) ); hb_itemRelease( pEvent );