From 4c53a5d8f4f23358a101ef6bda4b6b8ea4b95274 Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Sun, 31 Jan 1999 07:43:16 +0000 Subject: Added optimization for SGI builds (mike: please run autoconf before making a distribution). Documentation fixes. git-svn-id: file:///fltk/svn/fltk/trunk@259 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- configure.in | 19 ++++++++--------- documentation/Fl_Browser_.html | 2 ++ documentation/Fl_Float_Input.html | 4 ++-- documentation/Fl_Group.html | 38 +++++++++++++++++---------------- documentation/Fl_Int_Input.html | 4 ++-- documentation/Fl_Slider.html | 2 +- documentation/Fl_Valuator.html | 2 +- documentation/Fl_Value_Input.html | 4 ++-- documentation/Fl_Window.html | 16 +++++++++++++- documentation/basics.html | 44 +++++++++++++++++++++++--------------- documentation/common.html | 6 ++++-- documentation/drawing.html | 45 ++++++--------------------------------- documentation/enumerations.html | 23 +++++++++++--------- documentation/events.html | 1 + documentation/opengl.html | 30 +++++++++++++------------- documentation/subclassing.html | 38 ++++++++++++++++----------------- documentation/widgets.html | 4 ++-- fluid/Makefile | 16 ++++++-------- src/Makefile | 15 ++++++------- test/Makefile | 27 +++++++++-------------- 20 files changed, 164 insertions(+), 176 deletions(-) diff --git a/configure.in b/configure.in index 2be4849ab..1d39379d8 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl# -*- sh -*- dnl# the "configure" script is made from this by running GNU "autoconf" dnl# -dnl# "$Id: configure.in,v 1.18 1999/01/27 17:52:23 mike Exp $" +dnl# "$Id: configure.in,v 1.19 1999/01/31 07:43:08 bill Exp $" dnl# dnl# Configuration script for the Fast Light Tool Kit (FLTK). dnl# @@ -39,7 +39,7 @@ fi DEBUGFLAG="" AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],if eval "test x$enable_debug = xyes"; then - DEBUGFLAG="-g" + DEBUGFLAG="-g " fi) AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[ if eval "test x$enable_shared = xyes"; then @@ -70,9 +70,6 @@ if eval "test x$enable_shared = xyes"; then esac fi]) -CFLAGS="$DEBUGFLAG $CFLAGS" -CXXFLAGS="$DEBUGFLAG $CXXFLAGS" - AC_PROG_CC AC_PROG_CXX dnl# AC_PROG_INSTALL @@ -148,17 +145,19 @@ dnl# Uncomment these if you don't have IDO 7.2 or higher dnl# CXX="CC -n32" dnl# CC="cc -n32" dnl# LD="ld -n32" - MAKEDEPEND="CC -M" +dnl# MAKEDEPEND="CC -M" # -woff 3322 is necessary due to errors in Xlib headers on IRIX - CFLAGS="-fullwarn $CFLAGS" - CXXFLAGS="-fullwarn -woff 1685 -woff 3322 $CXXFLAGS" - MAKEDEPEND="CC -M" + CFLAGS="-O2 -fullwarn $CFLAGS" + CXXFLAGS="-O2 -fullwarn -woff 1685 -woff 3322 $CXXFLAGS" else CXXFLAGS="+w +pp $CXXFLAGS" fi fi fi +CFLAGS="$DEBUGFLAG$CFLAGS" +CXXFLAGS="$DEBUGFLAG$CXXFLAGS" + AC_SUBST(LIBNAME) AC_SUBST(LIBCOMMAND) AC_SUBST(MAKEDEPEND) @@ -166,5 +165,5 @@ AC_CONFIG_HEADER(config.h:configh.in) AC_OUTPUT(makeinclude) dnl# -dnl# End of "$Id: configure.in,v 1.18 1999/01/27 17:52:23 mike Exp $". +dnl# End of "$Id: configure.in,v 1.19 1999/01/31 07:43:08 bill Exp $". dnl# diff --git a/documentation/Fl_Browser_.html b/documentation/Fl_Browser_.html index 037fd211f..ad5c4ef1e 100644 --- a/documentation/Fl_Browser_.html +++ b/documentation/Fl_Browser_.html @@ -93,6 +93,7 @@ other slow operation.

+Sorry, documentation is incomplete at this time

Fl_Browser::Fl_Browser(int, int, int, int, const char * = 0)

@@ -131,4 +132,5 @@ browser. The first form gets the default text size for the lines in the browser.

The second form sets the default text size to size

+ \ No newline at end of file diff --git a/documentation/Fl_Float_Input.html b/documentation/Fl_Float_Input.html index fe52eadfe..00c1731f6 100644 --- a/documentation/Fl_Float_Input.html +++ b/documentation/Fl_Float_Input.html @@ -18,8 +18,8 @@

Description

The Fl_Float_Input class is a subclass of Fl_Input - that displays its input in red when the value string is not a legal -floating point value. + that only allows the user to type floating point numbers (sign, + digits, decimal point, more digits, 'E' or 'e', sign, digits).

Methods

Description

The Fl_Int_Input class is a subclass of Fl_Input - that displays its input in red when the value string is not a legal -integer value. + that only allows the user to type decimal digits (or hex numbers of + the form 0xaef).

Methods

 Microsoft Windows developers please note: case *is* significant under other operating systems, and the C standard uses the forward -slash (/) to separate directories. The following #include - directives are *not* recommended for portability reasons: +slash (/) to separate directories. Do not do any of the following:

Compiling Programs with Standard Compilers

@@ -75,7 +74,8 @@ display the window. int main(int argc, char **argv) { Fl_Window *window = new Fl_Window(300,180); - Fl_Box *box = new Fl_Box(FL_UP_BOX,20,40,260,100,"Hello, World!"); + Fl_Box *box = new Fl_Box(20,40,260,100,"Hello, World!"); + box->box(FL_UP_BOX); box->labelsize(36); box->labelfont(FL_BOLD+FL_ITALIC); box->labeltype(FL_SHADOW_LABEL); @@ -95,12 +95,13 @@ Fl_Window *window = new Fl_Window(300,180); and a box with the "Hello, World!" string in it: - Next, we set the size, font, and style of the label: + Next, we set the type of box and the size, font, and style of the label:

FLTK Drawing Functions

To use the drawing functions you must first include the @@ -33,7 +31,6 @@ drawing functions:
  • Complex Shapes
  • Text
  • Images
    • -
  • Cursor
  • Overlay

    • Clipping

    @@ -72,7 +69,7 @@ is completely outside the region. is not the X or WIN32 pixel, it is an index into an internal table! The table provides several general colors, a 24-entry gray ramp, and a 5x8x5 color cube. All of these are named with -symbols in +symbols in <FL/Enumerations.H>.

    For colormapped displays, a color cell will be allocated out of fl_colormap the first time you use a color. If the colormap fills @@ -144,9 +141,9 @@ w - 1 and h - 1.

    transformations. The functionality matches that found in Adobe® PostScriptTM. The exact pixels that are filled is less defined than for the previous calls so that FLTK can take advantage of drawing -hardware. The transformed vertices are rounded to integers before -drawing the line segments. This severely limits the accuracy of these -functions for complex graphics. Use OpenGL when greater accuracy +hardware. On both X and WIN32 the transformed vertices are rounded to integers before +drawing the line segments: this severely limits the accuracy of these +functions for complex graphics, so use OpenGL when greater accuracy and/or performance is required.

    void fl_push_matrix()
    void fl_pop_matrix()

    @@ -249,9 +246,8 @@ value points at a static buffer that is overwritten with each call. above. You may call this outside a draw context if necessary to call fl_width(), but on X this will open the display.

    The font is identified by a face and a size. The -size of the font is measured in pixels (i.e. it is not -"resolution [in]dependent"). Lines should be spaced size - pixels apart (or more).

    +size of the font is measured in pixels (not "points"). Lines + should be spaced size pixels apart (or more).

    The face is an index into an internal table. Initially only the first 16 faces are filled in. There are symbolic names for them: FL_HELVETICA, FL_TIMES, FL_COURIER, @@ -263,33 +259,6 @@ since it stores the index as a byte.


    int fl_size() Returns the face and size set by the most recent call to fl_font(a,b). This can be used to save/restore the font. -

    Cursor

    -

    void fl_cursor(Fl_Cursor, Fl_Color = FL_WHITE, Fl_Color = FL_BLACK)

    - Change the cursor. Depending on the system this may affect the cursor -everywhere, or only when it is pointing at the window that is current -when you call this. For portability you should change the cursor back -to the default in response to FL_LEAVE events. -

    The type Fl_Cursor is an enumeration defined in -<Enumerations.H>. The double-headed arrows are bitmaps -provided by FLTK on X, the others are provided by system-defined -cursors. Under X you can get any XC_cursor value by passing -Fl_Cursor((XC_foo/2)+1).

    -

    The following standard cursors are available:

    -

    Overlays

    void fl_overlay_rect(int x, int y, int w, int h)
    void fl_overlay_clear()

    diff --git a/documentation/enumerations.html b/documentation/enumerations.html index be8d012c7..4fe408d27 100644 --- a/documentation/enumerations.html +++ b/documentation/enumerations.html @@ -1,5 +1,5 @@ -

    C - FLTK Enumerations

    +

    C - FLTK Enumerations

    This appendix lists the enumerations provided in the <FL/Enumerations.H> header file, organized by section. Constants whose value is zero are marked with "(0)", this is often @@ -14,7 +14,7 @@ constants:
  • FL_VERSION - A combined floating-point version number for the major and minor release numbers, currently 1.0.
    • -

    Events

    +

    Events

    Events are identified by an Fl_Event enumeration value. The following events are currently defined: -

    Callback "When" Conditions

    +

    Callback "When" Conditions

    The following constants determine when a callback is performed: -

    Alignment Values

    +

    Alignment Values

    The following constants define bits that can be used with Fl_Widget::align() to control the positioning of the label: @@ -138,7 +138,7 @@ label: label inside the widget. -

    Fonts

    +

    Fonts

    The following constants define the standard FLTK fonts: -

    Colors

    +

    Colors

    The following color constants can be used to access the colors in the FLTK standard color palette: -

    void Fl_Group::draw_child(Fl_Widget&)

    +

    void Fl_Group::draw_child(Fl_Widget&)

    This will force the child's damage() bits all to one and call draw() on it, then clear the damage(). You should call this on all children if a total redraw of your widget is requested, or if you draw something (like a background box) that damages the child. Nothing is done if the child is not visible() or if it is clipped. -

    void -Fl_Group::draw_outside_label(Fl_Widget&) const

    +

    void +Fl_Group::draw_outside_label(Fl_Widget&) const

    Draw the labels that are not drawn by draw_label(). If you want more control over the label positions you might want to call child->draw_label(x,y,w,h,a). -

    void Fl_Group::update_child(Fl_Widget&)

    +

    void Fl_Group::update_child(Fl_Widget&)

    Draws the child only if its damage() is non-zero. You should call this on all the children if your own damage is equal to FL_DAMAGE_CHILD. Nothing is done if the child is not visible() @@ -377,7 +377,7 @@ can be useful if your widget wants to occupy an entire window, and can also be used to take advantage of system-provided clipping, or to work with a library that expects a system window ID to indicate where to draw. -

    Subclassing Fl_Window is almost exactly like subclassing +

    Subclassing Fl_Window is almost exactly like subclassing Fl_Widget, and in fact you can easily switch a subclass back and forth. Watch out for the following differences:

      diff --git a/documentation/widgets.html b/documentation/widgets.html index 78f1c93cc..bb8f825d4 100644 --- a/documentation/widgets.html +++ b/documentation/widgets.html @@ -76,6 +76,7 @@ see Appendix B.
      • Fl_End +
      • Fl_Menu_Item
      • Fl_Widget
      • Fl_Chart
      • Fl_Clock -
      • Fl_Color_Chooser
      • Fl_Free
      • Fl_Group -
      • Fl_Menu_Item
      • Fl_Positioner
      • Fl_Timer
      • Fl_Valuator diff --git a/fluid/Makefile b/fluid/Makefile index 0eb4da023..ad94d8aeb 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.7 1999/01/07 18:49:36 mike Exp $" +# "$Id: Makefile,v 1.8 1999/01/31 07:43:14 bill Exp $" # # Fluid makefile for the Fast Light Tool Kit (FLTK). # @@ -52,18 +52,14 @@ include ../makeinclude .SUFFIXES : .cxx .c .o .cxx.o : - @echo $<: - @$(CXX) -I.. $(CXXFLAGS) -c $< + $(CXX) -I.. $(CXXFLAGS) -c $< .c.o : - @echo $<: - @$(CC) -I.. $(CFLAGS) -c $< + $(CC) -I.. $(CFLAGS) -c $< .cxx : - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS) $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) - @echo linking $@: - @$(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS) + $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS) clean : -@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend @@ -94,5 +90,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.7 1999/01/07 18:49:36 mike Exp $". +# End of "$Id: Makefile,v 1.8 1999/01/31 07:43:14 bill Exp $". # diff --git a/src/Makefile b/src/Makefile index d64414222..54481d7cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.9 1999/01/27 14:44:32 mike Exp $" +# "$Id: Makefile,v 1.10 1999/01/31 07:43:15 bill Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -150,26 +150,23 @@ LIBRARY = ../lib/$(LIBNAME) OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(LIBRARY) : $(OBJECTS) - @echo Building $(LIBRARY) + @echo $(LIBCOMMAND) $(LIBRARY) ... @$(LIBCOMMAND) $(LIBRARY) $(OBJECTS) @$(RANLIB) $(LIBRARY) .SUFFIXES: .cxx .h .o .cxx.o : - @echo $<: - @$(CXX) -I.. $(CXXFLAGS) -c $< + $(CXX) -I.. $(CXXFLAGS) -c $< .c.o : - @echo $<: - @$(CC) -I.. $(CFLAGS) -c -o $@ $< + $(CC) -I.. $(CFLAGS) -c -o $@ $< clean : -@ rm -f *.o *.do $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap @touch makedepend depend: - @echo Making makedepend - @$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend + $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend include makedepend ################################################################ @@ -185,5 +182,5 @@ install: ../lib/$(LIBNAME) -ln -s FL $(includedir)/Fl # -# End of "$Id: Makefile,v 1.9 1999/01/27 14:44:32 mike Exp $". +# End of "$Id: Makefile,v 1.10 1999/01/31 07:43:15 bill Exp $". # diff --git a/test/Makefile b/test/Makefile index 623e6e82a..5fad8ffd3 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.15 1999/01/07 19:17:48 mike Exp $" +# "$Id: Makefile,v 1.16 1999/01/31 07:43:16 bill Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -52,34 +52,27 @@ $(ALL): ../lib/$(LIBNAME) .SUFFIXES: .cxx .c .o .fl .H .cxx: - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@ .fl.cxx: - @echo $@: - @../fluid/fluid -c $< + ../fluid/fluid -c $< .fl: - @echo $@: - @../fluid/fluid -c $< - @$(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@ + ../fluid/fluid -c $< + $(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@ # Other programs needing special "help"... shiny: shiny.cxx shiny_panel.cxx - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(LDLIBS) -o $@ keyboard: keyboard.cxx keyboard_ui.cxx - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@ mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@ # If you have libjpeg installed, you might want to try this test program: jpeg_image: jpeg_image.cxx - @echo $@: - @$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -L../lib -lfltk $(LDLIBS) -ljpeg -lXext -o $@ + $(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -L../lib -lfltk $(LDLIBS) -ljpeg -lXext -o $@ depend: $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend @@ -91,5 +84,5 @@ install: @echo Nothing to install in test directory. # -# End of "$Id: Makefile,v 1.15 1999/01/07 19:17:48 mike Exp $". +# End of "$Id: Makefile,v 1.16 1999/01/31 07:43:16 bill Exp $". # -- cgit v1.2.3