Date: Fri, 9 Aug 2002 23:49:10 -0400 From: The Anarcat <anarcat@anarcat.ath.cx> To: libh@freebsd.org Subject: rhtvision port Message-ID: <20020810034910.GA84884@lenny.anarcat.ath.cx>
index | next in thread | raw e-mail
[-- Attachment #1 --] Hi all! I finished my "porting" of libh to rhtvision. I am less and less sure of the use of all this work now. :( I thought rhtvision might solve some bugs we have in text mode. However, no bug is solved by the switch. The output looks a bit better, but that's all. I include the patch here and I uploaded a screenshot for convenience. http://usw4.freebsd.org/~libh/screenshots/screenshot-rhtvision-2002-08-09.jpg ? compile ? rh.patch Index: Makefile.inc =================================================================== RCS file: /home/libh/cvs/libh/Makefile.inc,v retrieving revision 1.23 diff -u -r1.23 Makefile.inc --- Makefile.inc 14 Apr 2002 00:56:21 -0000 1.23 +++ Makefile.inc 10 Aug 2002 03:38:51 -0000 @@ -62,7 +62,7 @@ .endif .if !defined(NOTVISION) -TVINCLUDE?= $(LOCALBASE)/include +TVINCLUDE?= $(LOCALBASE)/include/rhtvision UI_CFLAGS+= -I$(TVINCLUDE) -DTVision UI_SRC+= HuiTVision.cc \ HuiTVision_ButtonWidget.cc \ Index: bin/tclh/Makefile =================================================================== RCS file: /home/libh/cvs/libh/bin/tclh/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- bin/tclh/Makefile 1 Jul 2002 15:51:22 -0000 1.24 +++ bin/tclh/Makefile 10 Aug 2002 03:38:51 -0000 @@ -70,7 +70,7 @@ LDADD+= -lX11 .endif .if !defined(NOTVISION) -LDADD+= -ltvision -lncurses +LDADD+= -lrhtv -lintl -lbiconv -lncurses .endif CXXFLAGS+= -DSTATIC .endif Index: include/hui/HuiTVision.hh =================================================================== RCS file: /home/libh/cvs/libh/include/hui/HuiTVision.hh,v retrieving revision 1.54 diff -u -r1.54 HuiTVision.hh --- include/hui/HuiTVision.hh 13 May 2002 16:29:41 -0000 1.54 +++ include/hui/HuiTVision.hh 10 Aug 2002 03:38:52 -0000 @@ -57,7 +57,7 @@ #define Uses_TMenuItem #define Uses_TSubMenu -#include <tvision/tv.h> +#include <tv.h> #if defined(H_BUILD_SYSTEMS) || defined(H_LIB_TCL_INTERFACE) #undef cstrlen #endif Index: lib/hui/HuiTVision.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision.cc,v retrieving revision 1.39 diff -u -r1.39 HuiTVision.cc --- lib/hui/HuiTVision.cc 13 May 2002 16:29:40 -0000 1.39 +++ lib/hui/HuiTVision.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_ButtonWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ButtonWidget.cc,v retrieving revision 1.37 diff -u -r1.37 HuiTVision_ButtonWidget.cc --- lib/hui/HuiTVision_ButtonWidget.cc 13 May 2002 10:21:35 -0000 1.37 +++ lib/hui/HuiTVision_ButtonWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_ButtonsGroupWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ButtonsGroupWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_ButtonsGroupWidget.cc --- lib/hui/HuiTVision_ButtonsGroupWidget.cc 13 May 2002 16:29:40 -0000 1.35 +++ lib/hui/HuiTVision_ButtonsGroupWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -103,7 +103,7 @@ void HuiTVision::ButtonsGroupWidget::disable_item( int boxno ) { if ( tcluster() ) { - tcluster()->setButtonState( 1L << boxno, Boolean( false ) ); + tcluster()->setState( 1L << boxno, Boolean( false ) ); } } // HuiTVision::ButtonsGroupWidget::disable_item @@ -113,7 +113,7 @@ void HuiTVision::ButtonsGroupWidget::enable_item( int boxno ) { if ( tcluster() ) { - tcluster()->setButtonState( 1L << boxno, Boolean( true ) ); + tcluster()->setState( 1L << boxno, Boolean( true ) ); } } // HuiTVision::ButtonsGroupWidget::enable_item Index: lib/hui/HuiTVision_CheckBoxesWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_CheckBoxesWidget.cc,v retrieving revision 1.38 diff -u -r1.38 HuiTVision_CheckBoxesWidget.cc --- lib/hui/HuiTVision_CheckBoxesWidget.cc 13 May 2002 10:21:35 -0000 1.38 +++ lib/hui/HuiTVision_CheckBoxesWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -129,7 +129,7 @@ virtual bool item_disabled( int boxno ) const { - return enableMask & ( 1L << boxno ); + return button[boxno]; } }; Index: lib/hui/HuiTVision_ContainerWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ContainerWidget.cc,v retrieving revision 1.37 diff -u -r1.37 HuiTVision_ContainerWidget.cc --- lib/hui/HuiTVision_ContainerWidget.cc 13 May 2002 16:29:40 -0000 1.37 +++ lib/hui/HuiTVision_ContainerWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_DialogWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_DialogWidget.cc,v retrieving revision 1.34 diff -u -r1.34 HuiTVision_DialogWidget.cc --- lib/hui/HuiTVision_DialogWidget.cc 13 May 2002 10:21:35 -0000 1.34 +++ lib/hui/HuiTVision_DialogWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_GroupWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_GroupWidget.cc,v retrieving revision 1.37 diff -u -r1.37 HuiTVision_GroupWidget.cc --- lib/hui/HuiTVision_GroupWidget.cc 13 May 2002 16:29:40 -0000 1.37 +++ lib/hui/HuiTVision_GroupWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_InputLineWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_InputLineWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_InputLineWidget.cc --- lib/hui/HuiTVision_InputLineWidget.cc 13 May 2002 10:21:35 -0000 1.35 +++ lib/hui/HuiTVision_InputLineWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -77,9 +77,9 @@ : TFilterValidator( 0 ), min( aMin ), max( aMax ) { if ( aMin < 0 ) - validChars = newStr( "-0123456789" ); + ValidChars = newStr( "-0123456789" ); else - validChars = newStr( "0123456789" ); + ValidChars = newStr( "0123456789" ); } virtual void error() @@ -90,7 +90,7 @@ virtual Boolean isValid(const char* s) { long value; - if ( TFilterValidator::isValid( s ) ) + if ( TFilterValidator::IsValid( s ) ) if ( sscanf( s, "%ld", &value ) == 1 ) if ( ( value >= min ) && ( value <= max ) ) return(True); @@ -107,7 +107,7 @@ TRealRangeValidator( double aMin, double aMax) : TFilterValidator( 0 ), min( aMin ), max( aMax ) { - validChars = newStr( "0123456789+-eE." ); + ValidChars = newStr( "0123456789+-eE." ); } virtual void error() @@ -118,7 +118,7 @@ virtual Boolean isValid(const char* s) { double value; - if ( TFilterValidator::isValid( s ) ) + if ( TFilterValidator::IsValid( s ) ) if ( sscanf( s, "%le", &value ) == 1 ) if ( ( value >= min ) && ( value <= max ) ) return(True); @@ -131,7 +131,7 @@ class HuiTVision::HuiTInputLine : public TInputLine { public: HuiTInputLine( const string& aText, int aMaxLength, const string& aValidator ) - : TInputLine( TRect( 1, 1, 11, 2 ), aMaxLength, 0 ) + : TInputLine( TRect( 1, 1, 11, 2 ), aMaxLength ) { setData( const_cast<char*>( aText.c_str() ) ); setValidator( aValidator ); @@ -154,8 +154,6 @@ TValidator* validator = 0; if ( aValidator == "none" || aValidator == "" ) validator = 0; - else if ( !strncmp( aValidator.c_str(), "picture", 7 ) ) - validator = new TPXPictureValidator( aValidator.c_str() + 8, True ); else if ( !strncmp( aValidator.c_str(), "valid_chars", 11 ) ) validator = new TFilterValidator( aValidator.c_str() + 12 ); else if ( !strncmp( aValidator.c_str(), "integer_range", 13 ) ) { @@ -181,7 +179,7 @@ validator = 0; } - TInputLine::setValidator( validator ); + TInputLine::SetValidator( validator ); } }; Index: lib/hui/HuiTVision_LabelWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_LabelWidget.cc,v retrieving revision 1.36 diff -u -r1.36 HuiTVision_LabelWidget.cc --- lib/hui/HuiTVision_LabelWidget.cc 13 May 2002 10:21:35 -0000 1.36 +++ lib/hui/HuiTVision_LabelWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_ListBoxWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ListBoxWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_ListBoxWidget.cc --- lib/hui/HuiTVision_ListBoxWidget.cc 12 May 2002 11:04:17 -0000 1.35 +++ lib/hui/HuiTVision_ListBoxWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -396,7 +396,7 @@ newItem = mFocused + 1; } } - if ( event.mouse.eventFlags & meDoubleClick ) + if ( event.mouse.doubleClick ) break; } while ( mouseEvent( event, evMouseMove | evMouseAuto ) ); if ( newItem != oldItem ) { Index: lib/hui/HuiTVision_MenuBarWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_MenuBarWidget.cc,v retrieving revision 1.33 diff -u -r1.33 HuiTVision_MenuBarWidget.cc --- lib/hui/HuiTVision_MenuBarWidget.cc 12 May 2002 11:04:17 -0000 1.33 +++ lib/hui/HuiTVision_MenuBarWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_MenuButtonWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_MenuButtonWidget.cc,v retrieving revision 1.33 diff -u -r1.33 HuiTVision_MenuButtonWidget.cc --- lib/hui/HuiTVision_MenuButtonWidget.cc 13 May 2002 10:21:35 -0000 1.33 +++ lib/hui/HuiTVision_MenuButtonWidget.cc 10 Aug 2002 03:38:52 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_MenuItemWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_MenuItemWidget.cc,v retrieving revision 1.33 diff -u -r1.33 HuiTVision_MenuItemWidget.cc --- lib/hui/HuiTVision_MenuItemWidget.cc 13 May 2002 10:21:35 -0000 1.33 +++ lib/hui/HuiTVision_MenuItemWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_MenuSeparatorWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_MenuSeparatorWidget.cc,v retrieving revision 1.33 diff -u -r1.33 HuiTVision_MenuSeparatorWidget.cc --- lib/hui/HuiTVision_MenuSeparatorWidget.cc 13 May 2002 10:21:35 -0000 1.33 +++ lib/hui/HuiTVision_MenuSeparatorWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_MenuSubmenuWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_MenuSubmenuWidget.cc,v retrieving revision 1.34 diff -u -r1.34 HuiTVision_MenuSubmenuWidget.cc --- lib/hui/HuiTVision_MenuSubmenuWidget.cc 13 May 2002 10:21:35 -0000 1.34 +++ lib/hui/HuiTVision_MenuSubmenuWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_ProgressIndicatorWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ProgressIndicatorWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_ProgressIndicatorWidget.cc --- lib/hui/HuiTVision_ProgressIndicatorWidget.cc 13 May 2002 10:21:35 -0000 1.35 +++ lib/hui/HuiTVision_ProgressIndicatorWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_RadioMenuWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_RadioMenuWidget.cc,v retrieving revision 1.36 diff -u -r1.36 HuiTVision_RadioMenuWidget.cc --- lib/hui/HuiTVision_RadioMenuWidget.cc 13 May 2002 10:21:35 -0000 1.36 +++ lib/hui/HuiTVision_RadioMenuWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -128,7 +128,7 @@ virtual bool item_disabled( int boxno ) const { - return enableMask & ( 1L << boxno ); + return button[boxno]; } private: Index: lib/hui/HuiTVision_TextEditWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_TextEditWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_TextEditWidget.cc --- lib/hui/HuiTVision_TextEditWidget.cc 13 May 2002 10:21:35 -0000 1.35 +++ lib/hui/HuiTVision_TextEditWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_TitledWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_TitledWidget.cc,v retrieving revision 1.36 diff -u -r1.36 HuiTVision_TitledWidget.cc --- lib/hui/HuiTVision_TitledWidget.cc 13 May 2002 16:29:40 -0000 1.36 +++ lib/hui/HuiTVision_TitledWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_ToplevelWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_ToplevelWidget.cc,v retrieving revision 1.33 diff -u -r1.33 HuiTVision_ToplevelWidget.cc --- lib/hui/HuiTVision_ToplevelWidget.cc 13 May 2002 10:21:35 -0000 1.33 +++ lib/hui/HuiTVision_ToplevelWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_Widget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_Widget.cc,v retrieving revision 1.34 diff -u -r1.34 HuiTVision_Widget.cc --- lib/hui/HuiTVision_Widget.cc 13 May 2002 16:29:40 -0000 1.34 +++ lib/hui/HuiTVision_Widget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" Index: lib/hui/HuiTVision_WindowWidget.cc =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/HuiTVision_WindowWidget.cc,v retrieving revision 1.35 diff -u -r1.35 HuiTVision_WindowWidget.cc --- lib/hui/HuiTVision_WindowWidget.cc 13 May 2002 10:21:35 -0000 1.35 +++ lib/hui/HuiTVision_WindowWidget.cc 10 Aug 2002 03:38:53 -0000 @@ -61,7 +61,7 @@ #define Uses_TEditor #define Uses_TIndicator -#include <tvision/tv.h> +#include <tv.h> #include "String.hh" @@ -101,8 +101,9 @@ virtual TPalette& getPalette() const { - static TPalette paletteCyan( cpCyanDialog, sizeof( cpCyanDialog )-1 ); - return(paletteCyan); + static char ch = 0; + static TPalette paletteCyan( &ch, 0 ); + return(paletteCyan); } private: Index: lib/hui/Makefile =================================================================== RCS file: /home/libh/cvs/libh/lib/hui/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- lib/hui/Makefile 19 Oct 2001 18:30:31 -0000 1.10 +++ lib/hui/Makefile 10 Aug 2002 03:38:53 -0000 @@ -13,7 +13,7 @@ $(UI_SRC) .if !defined(NOTVISION) -LDADD+= -ltvision -lncurses +LDADD+= -lrhtv -lintl -lncurses .endif .if !defined(NOQT) LDADD+= -lX11 -lqt2 -L$(X11BASE)/lib Index: lib/tcl/Makefile.inc1 =================================================================== RCS file: /home/libh/cvs/libh/lib/tcl/Makefile.inc1,v retrieving revision 1.28 diff -u -r1.28 Makefile.inc1 --- lib/tcl/Makefile.inc1 31 May 2002 18:45:27 -0000 1.28 +++ lib/tcl/Makefile.inc1 10 Aug 2002 03:38:53 -0000 @@ -33,7 +33,7 @@ -lfetch -lcom_err -ldisk .if !defined(NOTVISION) -LDADD+= -ltvision +LDADD+= -lrhtv -lintl .endif .if !defined(NOQT) -- Imagination is more important than knowledge - Albert Einstein [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQE9VI01ttcWHAnWiGcRAkxYAJ0VbABaZoDkd32WOMG1JST8ZLTaqwCggEFa yXBND65dZkaCSe0qpQVNgh0= =VS8p -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020810034910.GA84884>