From b7321e3a01ae15482ee06f800794d6f7f533ec44 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Wed, 28 Sep 2005 11:20:52 +0000 Subject: [PATCH] 2005-09-28 13:05 UTC+0100 Ryszard Glab * makefile.bc * makefile.nt * makefile.vc * makefile64.nt - removed references to DBFDBT library * source/debug/dbgtmenu.prg * source/debug/dbgtmitm.prg * source/debug/dbgtwin.prg * source/debug/debugger.prg * source/rtl/alert.prg * fixed displaying of boxes under the xterm (use @ ... TO ... instead of @ ... BOX) * source/rtl/gtcrs/gtcrs.c * fixed restoring of alternate characters flag --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/makefile.bc | 27 --------------------------- harbour/makefile.nt | 24 ------------------------ harbour/makefile.vc | 23 ----------------------- harbour/makefile64.nt | 24 ------------------------ harbour/source/debug/dbgtmenu.prg | 7 ++++--- harbour/source/debug/dbgtmitm.prg | 7 ++++++- harbour/source/debug/dbgtwin.prg | 28 +++++++++++++++++++--------- harbour/source/debug/debugger.prg | 6 +++--- harbour/source/rtl/alert.prg | 5 ++++- harbour/source/rtl/gtcrs/gtcrs.c | 4 +++- 11 files changed, 58 insertions(+), 116 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9f8b596e24..8b97857b14 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2005-09-28 13:05 UTC+0100 Ryszard Glab + * makefile.bc + * makefile.nt + * makefile.vc + * makefile64.nt + - removed references to DBFDBT library + + * source/debug/dbgtmenu.prg + * source/debug/dbgtmitm.prg + * source/debug/dbgtwin.prg + * source/debug/debugger.prg + * source/rtl/alert.prg + * fixed displaying of boxes under the xterm + (use @ ... TO ... instead of @ ... BOX) + + * source/rtl/gtcrs/gtcrs.c + * fixed restoring of alternate characters flag + + 2005-09-27 15:10 UTC-0800 Luis Krause Mantilla * harbour/contrib/rdd_ads/adsfunc.c ! added missing functions hb_oemansi & hb_ansioem required with diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 8347cbecca..956ba9877c 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -147,7 +147,6 @@ LDFLAGS = $(LDFLAGS) COMMON_LIB = $(LIB_DIR)\common.lib DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DBFDBT_LIB = $(LIB_DIR)\dbfdbt.lib DBFFPT_LIB = $(LIB_DIR)\dbffpt.lib HBSIX_LIB = $(LIB_DIR)\hbsix.lib HSX_LIB = $(LIB_DIR)\hsx.lib @@ -551,11 +550,6 @@ DBFCDX_LIB_OBJS = \ $(OBJ_DIR)\sixcdx1.obj \ $(OBJ_DIR)\sixcdx0.obj -DBFDBT_LIB_OBJS = \ - $(OBJ_DIR)\dbfdbt1.obj \ - \ - $(OBJ_DIR)\dbfdbt0.obj - DBFFPT_LIB_OBJS = \ $(OBJ_DIR)\dbffpt1.obj \ \ @@ -823,7 +817,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -841,7 +834,6 @@ all: \ $(COMMON_LIB) : $(COMMON_LIB_OBJS) $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) -$(DBFDBT_LIB) : $(DBFDBT_LIB_OBJS) $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) $(HBSIX_LIB) : $(HBSIX_LIB_OBJS) $(HSX_LIB) : $(HSX_LIB_OBJS) @@ -2634,21 +2626,6 @@ $(OBJ_DIR)\sixcdx1.obj : $(RDD_DIR)\dbfcdx\sixcdx1.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(DBFCDX_LIB) $(ARFLAGS) -+$@,, -# -# DBFDBT.LIB dependencies -# - -$(OBJ_DIR)\dbfdbt0.c : $(RDD_DIR)\dbfdbt\dbfdbt0.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ - -$(OBJ_DIR)\dbfdbt0.obj : $(OBJ_DIR)\dbfdbt0.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFDBT_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\dbfdbt1.obj : $(RDD_DIR)\dbfdbt\dbfdbt1.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFDBT_LIB) $(ARFLAGS) -+$@,, - # # DBFFPT.LIB dependencies # @@ -2870,7 +2847,6 @@ $(HBRUN_EXE) : $(HBRUN_EXE_OBJS) $(ECHO) $(DEBUG_LIB) >> make.tmp $(ECHO) $(DBFNTX_LIB) >> make.tmp $(ECHO) $(DBFCDX_LIB) >> make.tmp - $(ECHO) $(DBFDBT_LIB) >> make.tmp $(ECHO) $(DBFFPT_LIB) >> make.tmp $(ECHO) $(HBSIX_LIB) >> make.tmp $(ECHO) $(HSX_LIB) >> make.tmp @@ -2918,7 +2894,6 @@ $(HBTEST_EXE) : $(HBTEST_EXE_OBJS) $(ECHO) $(DEBUG_LIB) >> make.tmp $(ECHO) $(DBFNTX_LIB) >> make.tmp $(ECHO) $(DBFCDX_LIB) >> make.tmp - $(ECHO) $(DBFDBT_LIB) >> make.tmp $(ECHO) $(DBFFPT_LIB) >> make.tmp $(ECHO) $(HBSIX_LIB) >> make.tmp $(ECHO) $(HSX_LIB) >> make.tmp @@ -3026,7 +3001,6 @@ $(HBDOC_EXE) : $(HBDOC_EXE_OBJS) $(ECHO) $(DEBUG_LIB) >> make.tmp $(ECHO) $(DBFNTX_LIB) >> make.tmp $(ECHO) $(DBFCDX_LIB) >> make.tmp - $(ECHO) $(DBFDBT_LIB) >> make.tmp $(ECHO) $(DBFFPT_LIB) >> make.tmp $(ECHO) $(HBSIX_LIB) >> make.tmp $(ECHO) $(HSX_LIB) >> make.tmp @@ -3177,7 +3151,6 @@ $(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS) $(ECHO) $(DEBUG_LIB) >> make.tmp $(ECHO) $(DBFNTX_LIB) >> make.tmp $(ECHO) $(DBFCDX_LIB) >> make.tmp - $(ECHO) $(DBFDBT_LIB) >> make.tmp $(ECHO) $(DBFFPT_LIB) >> make.tmp $(ECHO) $(HBSIX_LIB) >> make.tmp $(ECHO) $(HSX_LIB) >> make.tmp diff --git a/harbour/makefile.nt b/harbour/makefile.nt index 853c0d7a6e..d8433dc13e 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -150,7 +150,6 @@ CODEPAGE_LIB = $(LIB_DIR)\codepage.lib COMMON_LIB = $(LIB_DIR)\common.lib DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DBFDBT_LIB = $(LIB_DIR)\dbfdbt.lib DBFFPT_LIB = $(LIB_DIR)\dbffpt.lib HBSIX_LIB = $(LIB_DIR)\hbsix.lib HSX_LIB = $(LIB_DIR)\hsx.lib @@ -225,7 +224,6 @@ LIBLIST = \ $(RDD_LIB) \ $(DBFCDX_LIB) \ $(DBFNTX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -672,22 +670,6 @@ HSX_LIB_OBJS = \ $(OBJ_DIR)\hsx.obj \ $(OBJ_DIR)\cftsfunc.obj -# -# DBFDBT.LIB rules -# - -{$(RDD_DIR)\dbfdbt}.c{$(OBJ_DIR)}.obj:: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< - -{$(RDD_DIR)\dbfdbt}.prg{$(OBJ_DIR)}.obj:: - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(MAKE) -nologo /$(MK_FLAGS)f$(MK_FILE) $(DBFDBT_LIB)2 - -DBFDBT_LIB_OBJS = \ - $(OBJ_DIR)\dbfdbt1.obj \ - \ - $(OBJ_DIR)\dbfdbt0.obj - # # DBFFPT.LIB rules # @@ -883,7 +865,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -913,7 +894,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -1154,9 +1134,6 @@ $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) lib /out:$@ $** -$(DBFDBT_LIB) : $(DBFDBT_LIB_OBJS) - lib /out:$@ $** - $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) lib /out:$@ $** @@ -1258,7 +1235,6 @@ $(PP_LIB)2 : $(PP_LIB_OBJS) $(RDD_LIB)2 : $(RDD_LIB_OBJS) $(DBFCDX_LIB)2 : $(DBFCDX_LIB_OBJS) $(DBFNTX_LIB)2 : $(DBFNTX_LIB_OBJS) -$(DBFDBT_LIB)2 : $(DBFDBT_LIB_OBJS) $(DBFFPT_LIB)2 : $(DBFFPT_LIB_OBJS) $(HBSIX_LIB)2 : $(HBSIX_LIB_OBJS) $(HSX_LIB)2 : $(HSX_LIB_OBJS) diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 3b6aa59d9e..8abaced94d 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -127,7 +127,6 @@ CODEPAGE_LIB = $(LIB_DIR)\codepage.lib COMMON_LIB = $(LIB_DIR)\common.lib DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DBFDBT_LIB = $(LIB_DIR)\dbfdbt.lib DBFFPT_LIB = $(LIB_DIR)\dbffpt.lib HBSIX_LIB = $(LIB_DIR)\hbsix.lib HSX_LIB = $(LIB_DIR)\hsx.lib @@ -202,7 +201,6 @@ LIBLIST = \ $(RDD_LIB) \ $(DBFCDX_LIB) \ $(DBFNTX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -636,22 +634,6 @@ HBSIX_LIB_OBJS = \ $(OBJ_DIR)\cftsfunc.obj \ $(OBJ_DIR)\hsx.obj -# -# DBFDBT.LIB rules -# - -{$(RDD_DIR)\dbfdbt}.c{$(OBJ_DIR)}.obj: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< - -{$(RDD_DIR)\dbfdbt}.prg{$(OBJ_DIR)}.obj: - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $*.c - -DBFDBT_LIB_OBJS = \ - $(OBJ_DIR)\dbfdbt1.obj \ - \ - $(OBJ_DIR)\dbfdbt0.obj - # # DBFFPT.LIB rules # @@ -846,7 +828,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -876,7 +857,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -1117,9 +1097,6 @@ $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) lib /out:$@ $** -$(DBFDBT_LIB) : $(DBFDBT_LIB_OBJS) - lib /out:$@ $** - $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) lib /out:$@ $** diff --git a/harbour/makefile64.nt b/harbour/makefile64.nt index dfb8022162..c3d04c510b 100644 --- a/harbour/makefile64.nt +++ b/harbour/makefile64.nt @@ -150,7 +150,6 @@ CODEPAGE_LIB = $(LIB_DIR)\codepage.lib COMMON_LIB = $(LIB_DIR)\common.lib DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DBFDBT_LIB = $(LIB_DIR)\dbfdbt.lib DBFFPT_LIB = $(LIB_DIR)\dbffpt.lib HBSIX_LIB = $(LIB_DIR)\hbsix.lib HSX_LIB = $(LIB_DIR)\hsx.lib @@ -225,7 +224,6 @@ LIBLIST = \ $(RDD_LIB) \ $(DBFCDX_LIB) \ $(DBFNTX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -649,22 +647,6 @@ DBFCDX_LIB_OBJS = \ $(OBJ_DIR)\dbfcdx0.obj \ $(OBJ_DIR)\sixcdx0.obj -# -# DBFDBT.LIB rules -# - -{$(RDD_DIR)\dbfdbt}.c{$(OBJ_DIR)}.obj:: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< - -{$(RDD_DIR)\dbfdbt}.prg{$(OBJ_DIR)}.obj:: - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(MAKE) -nologo /$(MK_FLAGS)f$(MK_FILE) $(DBFDBT_LIB)2 - -DBFDBT_LIB_OBJS = \ - $(OBJ_DIR)\dbfdbt1.obj \ - \ - $(OBJ_DIR)\dbfdbt0.obj - # # DBFFPT.LIB rules # @@ -883,7 +865,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -913,7 +894,6 @@ all: \ $(NULSYS_LIB) \ $(DBFNTX_LIB) \ $(DBFCDX_LIB) \ - $(DBFDBT_LIB) \ $(DBFFPT_LIB) \ $(HBSIX_LIB) \ $(HSX_LIB) \ @@ -1160,9 +1140,6 @@ $(HSX_LIB) : $(HSX_LIB_OBJS) $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) lib /out:$@ $** -$(DBFDBT_LIB) : $(DBFDBT_LIB_OBJS) - lib /out:$@ $** - $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) lib /out:$@ $** @@ -1258,7 +1235,6 @@ $(PP_LIB)2 : $(PP_LIB_OBJS) $(RDD_LIB)2 : $(RDD_LIB_OBJS) $(DBFCDX_LIB)2 : $(DBFCDX_LIB_OBJS) $(DBFNTX_LIB)2 : $(DBFNTX_LIB_OBJS) -$(DBFDBT_LIB)2 : $(DBFDBT_LIB_OBJS) $(DBFFPT_LIB)2 : $(DBFFPT_LIB_OBJS) $(HBSIX_LIB)2 : $(HBSIX_LIB_OBJS) $(HSX_LIB)2 : $(HSX_LIB_OBJS) diff --git a/harbour/source/debug/dbgtmenu.prg b/harbour/source/debug/dbgtmenu.prg index ed41167a39..678e844ad3 100644 --- a/harbour/source/debug/dbgtmenu.prg +++ b/harbour/source/debug/dbgtmenu.prg @@ -210,14 +210,15 @@ METHOD Display() CLASS TDbMenu SetPos( 0, 0 ) else ::cBackImage := SaveScreen( ::nTop, ::nLeft, ::nBottom + 1, ::nRight + 2 ) - @ ::nTop, ::nLeft, ::nBottom, ::nRight BOX B_SINGLE + @ ::nTop, ::nLeft TO ::nBottom, ::nRight hb_Shadow( ::nTop, ::nLeft, ::nBottom, ::nRight ) endif for n := 1 to Len( ::aItems ) if ::aItems[ n ]:cPrompt == "-" // Separator - DispOutAt( ::aItems[ n ]:nRow, ::nLeft,; - Chr( 195 ) + Replicate( Chr( 196 ), ::nRight - ::nLeft - 1 ) + Chr( 180 ) ) + @ ::aItems[ n ]:nRow, ::nLeft+1 TO ::aItems[ n ]:nRow, ::nRight - 1 +// DispOutAt( ::aItems[ n ]:nRow, ::nLeft,; +// Chr( 195 ) + Replicate( Chr( 196 ), ::nRight - ::nLeft - 1 ) + Chr( 180 ) ) else ::aItems[ n ]:Display( ::cClrPopup, ::cClrHotKey ) endif diff --git a/harbour/source/debug/dbgtmitm.prg b/harbour/source/debug/dbgtmitm.prg index 1803604a85..96165840ba 100644 --- a/harbour/source/debug/dbgtmitm.prg +++ b/harbour/source/debug/dbgtmitm.prg @@ -64,6 +64,7 @@ CLASS TDbMenuItem DATA bAction DATA lChecked DATA Ident + DATA cCheckMark ACCESS Checked() INLINE ::lChecked ASSIGN Checked(lOnOff) INLINE ::lChecked:=lOnOff @@ -82,6 +83,8 @@ METHOD New( cPrompt, bAction, lChecked, xIdent ) CLASS TDbMenuItem ::bAction := bAction ::lChecked := lChecked ::Ident := xIdent + //Check mark should be different under xterm terminal + ::cCheckMark := IIF( AT("TERM",UPPER(GETENV("TERM")))>0, 'v', CHR(251) ) return Self @@ -96,6 +99,8 @@ METHOD Display( cClrText, cClrHotKey ) CLASS TDbMenuItem ( nAt := At( "~", ::cPrompt ) ) - 1,; SubStr( ::cPrompt, nAt + 1, 1 ), cClrHotKey ) - DispOutAt( ::nRow, ::nCol, iif( ::lChecked, Chr( 251 ), "" ), cClrText ) + IF( ::lChecked ) + DispOutAt( ::nRow, ::nCol, ::cCheckMark, cClrText ) + ENDIF return Self diff --git a/harbour/source/debug/dbgtwin.prg b/harbour/source/debug/dbgtwin.prg index 208f979487..27d7e22438 100644 --- a/harbour/source/debug/dbgtwin.prg +++ b/harbour/source/debug/dbgtwin.prg @@ -64,8 +64,8 @@ CLASS TDbWindow // Debugger windows and dialogs DATA nTop, nLeft, nBottom, nRight - DATA cCaption - DATA cBackImage, cColor + DATA cCaption, cMark + DATA cBackImage, cColor, cColorFocus DATA lFocused, bGotFocus, bLostFocus DATA bKeyPressed, bPainted, bLButtonDown, bLDblClick DATA lShadow, lVisible @@ -104,9 +104,12 @@ METHOD New( nTop, nLeft, nBottom, nRight, cCaption, cColor ) CLASS TDbWindow ::nRight := nRight ::cCaption := cCaption ::cColor := cColor + ::cColorFocus := __DbgColors()[ 12 ] ::lShadow := .f. ::lVisible := .f. ::lFocused := .f. + //Check mark should be different under xterm terminal + ::cMark := '['+ IIF( AT("TERM",UPPER(GETENV("TERM")))>0, 'X', CHR(254) )+ ']' return Self @@ -150,7 +153,8 @@ METHOD ShowCaption CLASS TDbWindow if ! Empty( ::cCaption ) DispOutAt( ::nTop, ::nLeft + ( ( ::nRight - ::nLeft ) / 2 ) - ; ( ( Len( ::cCaption ) + 2 ) / 2 ),; - " " + ::cCaption + " ", ::cColor ) + " " + ::cCaption + " ", ; + IIF( ::lFocused, ::cColorFocus, ::cColor ) ) endif return nil @@ -165,10 +169,13 @@ METHOD SetFocus( lOnOff ) CLASS TDbWindow ::lFocused := lOnOff - @ ::nTop, ::nLeft, ::nBottom, ::nRight BOX iif( lOnOff, B_DOUBLE, B_SINGLE ) ; - COLOR ::cColor + IF( lOnOff ) + @ ::nTop, ::nLeft TO ::nBottom, ::nRight DOUBLE COLOR ::cColorFocus + ELSE + @ ::nTop, ::nLeft TO ::nBottom, ::nRight COLOR ::cColor + ENDIF - DispOutAt( ::nTop, ::nLeft + 1, "[" + Chr( 254 ) + "]", ::cColor ) + DispOutAt( ::nTop, ::nLeft + 1, ::cMark, IIF(lOnOff,::cColorFocus,::cColor) ) if ! Empty( ::cCaption ) ::ShowCaption( ::cCaption ) @@ -190,10 +197,13 @@ METHOD Refresh() CLASS TDbWindow DispBegin() - @ ::nTop, ::nLeft, ::nBottom, ::nRight BOX iif( ::lFocused, B_DOUBLE, B_SINGLE ) ; - COLOR ::cColor + IF( ::lFocused ) + @ ::nTop, ::nLeft TO ::nBottom, ::nRight DOUBLE COLOR ::cColorFocus + ELSE + @ ::nTop, ::nLeft TO ::nBottom, ::nRight COLOR ::cColor + ENDIF - DispOutAt( ::nTop, ::nLeft + 1, "[" + Chr( 254 ) + "]", ::cColor ) + DispOutAt( ::nTop, ::nLeft + 1, ::cMark, IIF(::lFocused,::cColorFocus,::cColor) ) if ! Empty( ::cCaption ) ::ShowCaption( ::cCaption ) diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg index 172415633a..4fafd04e10 100644 --- a/harbour/source/debug/debugger.prg +++ b/harbour/source/debug/debugger.prg @@ -453,7 +453,7 @@ METHOD New() CLASS TDebugger s_oDebugger := Self - ::aColors := {"W+/BG","N/BG","R/BG","N+/BG","W+/B","GR+/B","W/B","N/W","R/W","N/BG","R/BG"} + ::aColors := {"W+/BG","N/BG","R/BG","N+/BG","W+/B","GR+/B","W/B","N/W","R/W","N/BG","R/BG", "GR+/BG"} ::lMonoDisplay := .f. ::aWindows := {} ::nCurrentWindow := 1 @@ -3251,8 +3251,8 @@ RETURN .T. function __DbgColors() return iif( ! s_oDebugger:lMonoDisplay, s_oDebugger:aColors,; - { "W+/N", "W+/N", "N/W", "N/W", "N/W", "N/W", "W+/N",; - "N/W", "W+/W", "W/N", "W+/N" } ) + { "W/N", "W+/N", "N/W", "N/W", "N/W", "N/W", "W+/N",; + "N/W", "W+/W", "W/N", "W+/N", "W+/N" } ) function __Dbg() diff --git a/harbour/source/rtl/alert.prg b/harbour/source/rtl/alert.prg index 4a6bb1d46d..d8c3e08a05 100644 --- a/harbour/source/rtl/alert.prg +++ b/harbour/source/rtl/alert.prg @@ -264,7 +264,10 @@ FUNCTION Alert( xMessage, aOptions, cColorNorm, nDelay ) cOldScreen := SaveScreen( nInitRow, nInitCol, nInitRow + Len( aSay ) + 3, nInitCol + nWidth + 1 ) /* draw box */ - DispBox( nInitRow, nInitCol, nInitRow + Len( aSay ) + 3, nInitCol + nWidth + 1, B_SINGLE + ' ', cColorNorm ) + //Fixed box characters cannot be displayed correctly on some terminals + //(e.g. xterm) + //DispBox( nInitRow, nInitCol, nInitRow + Len( aSay ) + 3, nInitCol + nWidth + 1, B_SINGLE + ' ', cColorNorm ) + @ nInitRow, nInitCol TO nInitRow + Len( aSay ) + 3, nInitCol + nWidth + 1 COLOR cColorNorm FOR nEval := 1 TO Len( aSay ) DispOutAt( nInitRow + nEval, nInitCol + 1 + Int( ( ( nWidth - Len( aSay[ nEval ] ) ) / 2 ) + .5 ), aSay[ nEval ], cColorNorm ) diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c index c96f889442..ad257298e4 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.c +++ b/harbour/source/rtl/gtcrs/gtcrs.c @@ -320,7 +320,8 @@ static void hb_gt_xPutch( USHORT uiRow, USHORT uiCol, BYTE byAttr, BYTE byChar ) HB_TRACE(HB_TR_DEBUG, ("hb_gt_xPutch(%hu, %hu, %d, %i)", uiRow, uiCol, (int) byAttr, byChar)); move( uiRow, uiCol ); - addch( s_charmap_table[ byChar ] | s_alternate_char_set | s_color_table[ byAttr ] ); + addch( s_charmap_table[ byChar ] | + s_alternate_char_set | s_color_table[ byAttr ] ); } void hb_gt_PutCharAttr( SHORT uiRow, SHORT uiCol, BYTE byChar, BYTE byAttr ) @@ -807,6 +808,7 @@ USHORT hb_gt_Box( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, ret = 0; } + s_alternate_char_set = l_alternate_char_set; return ret; }