From 39970a92154b93276f85f4e1cf99a43f65129508 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 23 Aug 2007 15:15:16 +0000 Subject: [PATCH] 2007-08-23 17:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gttrm/gttrm.c * set cursor position at beginning of new line on application exit * harbour/include/hbextern.ch + added missing functions (CDPs, LANGs, HSX, ...) * harbour/utils/hbdot/Makefile * harbour/utils/hbrun/Makefile + added codepage library --- harbour/ChangeLog | 11 ++ harbour/include/hbextern.ch | 173 ++++++++++++++++++++++++++++++- harbour/source/rtl/gttrm/gttrm.c | 2 + harbour/utils/hbdot/Makefile | 1 + harbour/utils/hbrun/Makefile | 1 + 5 files changed, 187 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9935046dec..1b26996e5e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-08-23 17:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/gttrm/gttrm.c + * set cursor position at beginning of new line on application exit + + * harbour/include/hbextern.ch + + added missing functions (CDPs, LANGs, HSX, ...) + + * harbour/utils/hbdot/Makefile + * harbour/utils/hbrun/Makefile + + added codepage library + 2007-08-23 14:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbgtcore.h * harbour/source/rtl/hbgtcore.c diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index ba026a8771..8b9deee89a 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -391,10 +391,10 @@ EXTERNAL HB_RELEASECPU EXTERNAL HB_OSNEWLINE EXTERNAL HB_APARAMS +EXTERNAL HB_PVALUE EXTERNAL HB_FORNEXT EXTERNAL HB_EXECFROMARRAY EXTERNAL HB_METHODNAME -EXTERNAL HB_PVALUE EXTERNAL HB_SETMACRO EXTERNAL HB_STOD EXTERNAL HB_WILDMATCH @@ -403,6 +403,8 @@ EXTERNAL HB_MATHERMODE EXTERNAL HB_MATHERBLOCK EXTERNAL HB_SERIALIZE EXTERNAL HB_DESERIALIZE +EXTERNAL HB_HEXTONUM +EXTERNAL HB_NUMTOHEX EXTERNAL HBCLASS EXTERNAL HBOBJECT @@ -416,6 +418,15 @@ EXTERNAL HB_RANDOM EXTERNAL HB_RANDOMINT EXTERNAL HB_RANDOMSEED +EXTERNAL HB_BITAND +EXTERNAL HB_BITOR +EXTERNAL HB_BITXOR +EXTERNAL HB_BITNOT +EXTERNAL HB_BITSET +EXTERNAL HB_BITRESET +EXTERNAL HB_BITTEST +EXTERNAL HB_BITSHIFT + EXTERNAL HB_ADLER32 EXTERNAL HB_CRC EXTERNAL HB_CRC16 @@ -441,6 +452,163 @@ EXTERNAL HB_GETSTDOUT EXTERNAL __DYNSN2PTR EXTERNAL __DYNSP2NAME +/* Codepage support */ +EXTERNAL HB_CODEPAGE_BG866 +EXTERNAL HB_CODEPAGE_BGISO +EXTERNAL HB_CODEPAGE_BGMIK +EXTERNAL HB_CODEPAGE_BGWIN +EXTERNAL HB_CODEPAGE_CS852 +EXTERNAL HB_CODEPAGE_CSISO +EXTERNAL HB_CODEPAGE_CSKAM +EXTERNAL HB_CODEPAGE_CSWIN +EXTERNAL HB_CODEPAGE_DE +EXTERNAL HB_CODEPAGE_DEWIN +EXTERNAL HB_CODEPAGE_EL +EXTERNAL HB_CODEPAGE_ELWIN +EXTERNAL HB_CODEPAGE_ES +EXTERNAL HB_CODEPAGE_ESMWIN +EXTERNAL HB_CODEPAGE_ESWIN +EXTERNAL HB_CODEPAGE_FR +EXTERNAL HB_CODEPAGE_HR1250 +EXTERNAL HB_CODEPAGE_HR437 +EXTERNAL HB_CODEPAGE_HR852 +EXTERNAL HB_CODEPAGE_HU852 +EXTERNAL HB_CODEPAGE_HU852S +EXTERNAL HB_CODEPAGE_HUISO +EXTERNAL HB_CODEPAGE_HUISOS +EXTERNAL HB_CODEPAGE_HUWIN +EXTERNAL HB_CODEPAGE_HUWINS +EXTERNAL HB_CODEPAGE_IT437 +EXTERNAL HB_CODEPAGE_IT850 +EXTERNAL HB_CODEPAGE_ITISB +EXTERNAL HB_CODEPAGE_ITISO +EXTERNAL HB_CODEPAGE_LT +EXTERNAL HB_CODEPAGE_PL852 +EXTERNAL HB_CODEPAGE_PLISO +EXTERNAL HB_CODEPAGE_PLMAZ +EXTERNAL HB_CODEPAGE_PLWIN +EXTERNAL HB_CODEPAGE_PT850 +EXTERNAL HB_CODEPAGE_PTISO +EXTERNAL HB_CODEPAGE_RU1251 +EXTERNAL HB_CODEPAGE_RU866 +EXTERNAL HB_CODEPAGE_RUKOI8 +EXTERNAL HB_CODEPAGE_SK852 +EXTERNAL HB_CODEPAGE_SKISO +EXTERNAL HB_CODEPAGE_SKKAM +EXTERNAL HB_CODEPAGE_SKWIN +EXTERNAL HB_CODEPAGE_SL437 +EXTERNAL HB_CODEPAGE_SL852 +EXTERNAL HB_CODEPAGE_SLISO +EXTERNAL HB_CODEPAGE_SLWIN +EXTERNAL HB_CODEPAGE_SRWIN +EXTERNAL HB_CODEPAGE_SV850 +EXTERNAL HB_CODEPAGE_SVCLIP +EXTERNAL HB_CODEPAGE_SVWIN +EXTERNAL HB_CODEPAGE_TR857 +EXTERNAL HB_CODEPAGE_TRWIN +EXTERNAL HB_CODEPAGE_UA1251 +EXTERNAL HB_CODEPAGE_UA866 +EXTERNAL HB_CODEPAGE_UAKOI8 + +/* lang support */ +EXTERNAL HB_LANG_BG866 +EXTERNAL HB_LANG_BGISO +EXTERNAL HB_LANG_BGWIN +EXTERNAL HB_LANG_CA +EXTERNAL HB_LANG_CS852 +EXTERNAL HB_LANG_CSISO +EXTERNAL HB_LANG_CSKAM +EXTERNAL HB_LANG_CSWIN +EXTERNAL HB_LANG_DE +EXTERNAL HB_LANG_DEWIN +EXTERNAL HB_LANG_EL +EXTERNAL HB_LANG_ELWIN +EXTERNAL HB_LANG_EN +EXTERNAL HB_LANG_EO +EXTERNAL HB_LANG_ES +EXTERNAL HB_LANG_ESWIN +EXTERNAL HB_LANG_EU +EXTERNAL HB_LANG_FR +EXTERNAL HB_LANG_GL +EXTERNAL HB_LANG_HE862 +EXTERNAL HB_LANG_HEWIN +EXTERNAL HB_LANG_HR852 +EXTERNAL HB_LANG_HRISO +EXTERNAL HB_LANG_HU852 +EXTERNAL HB_LANG_HUCWI +EXTERNAL HB_LANG_HUISO +EXTERNAL HB_LANG_HUWIN +EXTERNAL HB_LANG_ID +EXTERNAL HB_LANG_IS850 +EXTERNAL HB_LANG_IT +EXTERNAL HB_LANG_KO +EXTERNAL HB_LANG_NL +EXTERNAL HB_LANG_PL852 +EXTERNAL HB_LANG_PLISO +EXTERNAL HB_LANG_PLMAZ +EXTERNAL HB_LANG_PLWIN +EXTERNAL HB_LANG_PT +EXTERNAL HB_LANG_RO +EXTERNAL HB_LANG_RU866 +EXTERNAL HB_LANG_RUKOI8 +EXTERNAL HB_LANG_RUWIN +EXTERNAL HB_LANG_SL437 +EXTERNAL HB_LANG_SL852 +EXTERNAL HB_LANG_SLISO +EXTERNAL HB_LANG_SLWIN +EXTERNAL HB_LANG_SR852 +EXTERNAL HB_LANG_SRISO +EXTERNAL HB_LANG_SRWIN +EXTERNAL HB_LANG_TR857 +EXTERNAL HB_LANG_TRWIN +EXTERNAL HB_LANG_ZHB5 +EXTERNAL HB_LANG_ZHGB + + +/* HiPer-SEEK / CFTS compatible functions */ + +EXTERNAL HS_ADD +EXTERNAL HS_CLOSE +EXTERNAL HS_CREATE +EXTERNAL HS_DELETE +EXTERNAL HS_FILTER +EXTERNAL HS_IFDEL +EXTERNAL HS_INDEX +EXTERNAL HS_KEYCOUNT +EXTERNAL HS_NEXT +EXTERNAL HS_OPEN +EXTERNAL HS_REPLACE +EXTERNAL HS_SET +EXTERNAL HS_UNDELETE +EXTERNAL HS_VERIFY +EXTERNAL HS_VERSION + +EXTERNAL CFTSADD +EXTERNAL CFTSCLOSE +EXTERNAL CFTSCREA +EXTERNAL CFTSDELETE +EXTERNAL CFTSIFDEL +EXTERNAL CFTSNEXT +EXTERNAL CFTSOPEN +EXTERNAL CFTSRECN +EXTERNAL CFTSREPLAC +EXTERNAL CFTSSET +EXTERNAL CFTSUNDEL +EXTERNAL CFTSVERI +EXTERNAL CFTSVERS + +/* SIX3 compatible functions */ + +EXTERNAL _SX_STRCOMPRESS +EXTERNAL _SX_STRDECOMPRESS +EXTERNAL SX_FCOMPRESS +EXTERNAL SX_FDECOMPRESS +EXTERNAL SX_ENCRYPT +EXTERNAL SX_DECRYPT +EXTERNAL SX_DTOP +EXTERNAL SX_PTOD + + /* CA-Cl*pper compatible internal functions */ @@ -641,6 +809,7 @@ EXTERNAL __FLEDIT EXTERNAL __INPUT EXTERNAL __NONOALERT EXTERNAL __QQPUB +EXTERNAL _EINSTVAR EXTERNAL _NATMSGVER EXTERNAL _NATSORTVER EXTERNAL DBGSHADOW @@ -843,6 +1012,8 @@ EXTERNAL HB_HCASEMATCH EXTERNAL HB_HAUTOADD EXTERNAL HB_HALLOCATE EXTERNAL HB_HDEFAULT +EXTERNAL HB_HSETAUTOADD +EXTERNAL HB_HSETCASEMATCH EXTERNAL HB_REGEXCOMP EXTERNAL HB_ISREGEX diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c index 2e257207ed..ab982a6e35 100644 --- a/harbour/source/rtl/gttrm/gttrm.c +++ b/harbour/source/rtl/gttrm/gttrm.c @@ -2878,6 +2878,8 @@ static void hb_gt_trm_Exit( void ) removeAllKeyMap( &s_termState.pKeyTab ); s_termState.Exit(); + if( s_termState.fStdoutTTY && s_termState.iCol > 0 ) + hb_gt_trm_termOut( ( BYTE * ) "\n\r", 2 ); hb_gt_trm_termFlush(); HB_GTSUPER_EXIT(); diff --git a/harbour/utils/hbdot/Makefile b/harbour/utils/hbdot/Makefile index 800e5131e9..06c6e246bc 100644 --- a/harbour/utils/hbdot/Makefile +++ b/harbour/utils/hbdot/Makefile @@ -18,6 +18,7 @@ LIBS=\ vm \ rtl \ lang \ + codepage \ rdd \ rtl \ vm \ diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile index e5729d1ec6..42c35ff3e2 100644 --- a/harbour/utils/hbrun/Makefile +++ b/harbour/utils/hbrun/Makefile @@ -19,6 +19,7 @@ LIBS=\ vm \ rtl \ lang \ + codepage \ rdd \ rtl \ vm \