[Plib-cvs] plib/src/pui pu.cxx,1.60,1.61 pu.h,1.131,1.132 puFont.cxx,1.21,1.22 puInput.cxx,1.28,1.29
Brought to you by:
sjbaker
Menu
▾
▴
[Plib-cvs] plib/src/pui pu.cxx,1.60,1.61 pu.h,1.131,1.132 puFont.cxx,1.21,1.22 puInput.cxx,1.28,1.29 puLargeInput.cxx,1.40,1.41 puLocal.h,1.10,1.11 puObject.cxx,1.48,1.49
|
From: Sebastian U. <ud...@us...> - 2002-09-19 23:33:01
|
Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv6238
Modified Files:
pu.cxx pu.h puFont.cxx puInput.cxx puLargeInput.cxx puLocal.h
puObject.cxx
Log Message:
Moved some internal stuff from pu.h to puLocal.h; Const-correctness
Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- pu.cxx 19 Sep 2002 22:33:51 -0000 1.60
+++ pu.cxx 19 Sep 2002 23:32:57 -0000 1.61
@@ -101,16 +101,6 @@
#endif
-puColour _puDefaultColourTable[] =
-{
- { 0.5f, 0.5f, 0.5f, 1.0f }, /* PUCOL_FOREGROUND */
- { 0.3f, 0.3f, 0.3f, 1.0f }, /* PUCOL_BACKGROUND */
- { 0.7f, 0.7f, 0.7f, 1.0f }, /* PUCOL_HIGHLIGHT */
- { 0.0f, 0.0f, 0.0f, 1.0f }, /* PUCOL_LABEL */
- { 1.0f, 1.0f, 1.0f, 1.0f }, /* PUCOL_LEGEND */
- { 0.0f, 0.0f, 0.0f, 1.0f } /* PUCOL_MISC */
-} ;
-
static bool glIsValidContext ( void )
{
@@ -256,9 +246,9 @@
// No GLUT fonts, try some corresponding textured fonts
- if ( ( PUFONT_TXF_TYPEWRITER.load ( "Courier.txf" ) == FALSE ) |
- ( PUFONT_TXF_TIMES.load ( "Times-Roman.txf" ) == FALSE ) |
- ( PUFONT_TXF_HELVETICA.load ( "Helvetica.txf" ) == FALSE ) )
+ if ( ( _puCourierFont.load ( "Courier.txf" ) == FALSE ) ||
+ ( _puTimesFont.load ( "Times-Roman.txf" ) == FALSE ) ||
+ ( _puHelveticaFont.load ( "Helvetica.txf" ) == FALSE ) )
{
// Exit
ulSetError ( UL_FATAL, "PUI: Could not load default fonts." ) ;
@@ -460,7 +450,7 @@
puObject *puActiveWidget ( void ) { return active_widget ; }
-void puSetPasteBuffer ( char *ch )
+void puSetPasteBuffer ( const char *ch )
{
delete [] input_paste_buffer ;
input_paste_buffer = ulStrDup ( ch ) ;
Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- pu.h 18 Sep 2002 14:38:26 -0000 1.131
+++ pu.h 19 Sep 2002 23:32:58 -0000 1.132
@@ -45,10 +45,6 @@
#ifdef _PU_USE_GLUT_FONTS
typedef void *GlutFont ;
-#else
-extern fntTexFont PUFONT_TXF_TYPEWRITER ;
-extern fntTexFont PUFONT_TXF_TIMES ;
-extern fntTexFont PUFONT_TXF_HELVETICA ;
#endif
class puFont
@@ -329,14 +325,12 @@
/* With many memory managers, allocating powers of two is more efficient */
#define PUSTRING_INITIAL 64
-extern puColour _puDefaultColourTable[] ;
-
-inline void puSetColour ( puColour dst, puColour src )
+inline void puSetColour ( puColour dst, const puColour src )
{
dst[0] = src[0] ; dst[1] = src[1] ; dst[2] = src[2] ; dst[3] = src[3] ;
}
-inline void puSetColor ( puColour dst, puColour src )
+inline void puSetColor ( puColour dst, const puColour src )
{
dst[0] = src[0] ; dst[1] = src[1] ; dst[2] = src[2] ; dst[3] = src[3] ;
}
Index: puFont.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFont.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- puFont.cxx 2 Sep 2002 06:05:45 -0000 1.21
+++ puFont.cxx 19 Sep 2002 23:32:58 -0000 1.22
@@ -40,17 +40,17 @@
#else // No GLUT fonts, try some corresponding textured fonts
-fntTexFont PUFONT_TXF_TYPEWRITER ;
-fntTexFont PUFONT_TXF_TIMES ;
-fntTexFont PUFONT_TXF_HELVETICA ;
+fntTexFont _puCourierFont ;
+fntTexFont _puTimesFont ;
+fntTexFont _puHelveticaFont ;
-puFont PUFONT_8_BY_13 ( &PUFONT_TXF_TYPEWRITER, 13 ) ;
-puFont PUFONT_9_BY_15 ( &PUFONT_TXF_TYPEWRITER, 15 ) ;
-puFont PUFONT_TIMES_ROMAN_10 ( &PUFONT_TXF_TIMES, 10 ) ;
-puFont PUFONT_TIMES_ROMAN_24 ( &PUFONT_TXF_TIMES, 24 ) ;
-puFont PUFONT_HELVETICA_10 ( &PUFONT_TXF_HELVETICA, 10 ) ;
-puFont PUFONT_HELVETICA_12 ( &PUFONT_TXF_HELVETICA, 12 ) ;
-puFont PUFONT_HELVETICA_18 ( &PUFONT_TXF_HELVETICA, 18 ) ;
+puFont PUFONT_8_BY_13 ( &_puCourierFont, 13 ) ;
+puFont PUFONT_9_BY_15 ( &_puCourierFont, 15 ) ;
+puFont PUFONT_TIMES_ROMAN_10 ( &_puTimesFont, 10 ) ;
+puFont PUFONT_TIMES_ROMAN_24 ( &_puTimesFont, 24 ) ;
+puFont PUFONT_HELVETICA_10 ( &_puHelveticaFont, 10 ) ;
+puFont PUFONT_HELVETICA_12 ( &_puHelveticaFont, 12 ) ;
+puFont PUFONT_HELVETICA_18 ( &_puHelveticaFont, 18 ) ;
#endif // #ifdef _PU_USE_GLUT_FONTS
@@ -61,7 +61,7 @@
glut_font_handle = GLUT_BITMAP_8_BY_13 ;
fnt_font_handle = NULL ;
#else
- fnt_font_handle = &PUFONT_TXF_TYPEWRITER ;
+ fnt_font_handle = &_puCourierFont ;
pointsize = 13 ;
slant = 0 ;
#endif
Index: puInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puInput.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- puInput.cxx 2 Sep 2002 06:05:45 -0000 1.28
+++ puInput.cxx 19 Sep 2002 23:32:58 -0000 1.29
@@ -289,9 +289,6 @@
int puInput::checkKey ( int key, int /* updown */ )
{
- extern void puSetPasteBuffer ( char *ch ) ;
- extern char *puGetPasteBuffer ( void ) ;
-
if ( ! isAcceptingInput() || ! isActive () || ! isVisible () || ( window != puGetWindow () ) )
return FALSE ;
Index: puLargeInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLargeInput.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- puLargeInput.cxx 17 Sep 2002 22:42:12 -0000 1.40
+++ puLargeInput.cxx 19 Sep 2002 23:32:58 -0000 1.41
@@ -871,9 +871,6 @@
int puLargeInput::checkKey ( int key, int /* updown */ )
{
- extern void puSetPasteBuffer ( char *ch ) ;
- extern char *puGetPasteBuffer () ;
-
if ( !isAcceptingInput () || !isActive () || !isVisible () || ( window != puGetWindow () ) )
return FALSE ;
Index: puLocal.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLocal.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- puLocal.h 2 Sep 2002 06:05:46 -0000 1.10
+++ puLocal.h 19 Sep 2002 23:32:58 -0000 1.11
@@ -40,3 +40,14 @@
# endif
#endif
+
+#ifndef _PU_USE_GLUT_FONTS
+extern fntTexFont _puCourierFont ;
+extern fntTexFont _puTimesFont ;
+extern fntTexFont _puHelveticaFont ;
+#endif
+
+
+void puSetPasteBuffer ( const char *ch ) ;
+char *puGetPasteBuffer () ;
+
Index: puObject.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puObject.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- puObject.cxx 17 Sep 2002 22:48:28 -0000 1.48
+++ puObject.cxx 19 Sep 2002 23:32:58 -0000 1.49
@@ -27,10 +27,21 @@
UL_RTTI_DEF1(puObject,puValue)
-inline float clamp01 ( float x )
+static inline float clamp01 ( float x )
{
return (x >= 1.0f) ? 1.0f : x ;
}
+
+static puColour _puDefaultColourTable[] =
+{
+ { 0.5f, 0.5f, 0.5f, 1.0f }, /* PUCOL_FOREGROUND */
+ { 0.3f, 0.3f, 0.3f, 1.0f }, /* PUCOL_BACKGROUND */
+ { 0.7f, 0.7f, 0.7f, 1.0f }, /* PUCOL_HIGHLIGHT */
+ { 0.0f, 0.0f, 0.0f, 1.0f }, /* PUCOL_LABEL */
+ { 1.0f, 1.0f, 1.0f, 1.0f }, /* PUCOL_LEGEND */
+ { 0.0f, 0.0f, 0.0f, 1.0f } /* PUCOL_MISC */
+} ;
+
static void load_colour_scheme ( float col[][4], float r, float g,
float b, float a )
|
