Make Fl_Output a subclass of Fl_Input, and add input_type and readonly

methods/constants to support Fl_Output as a special case of Fl_Input
(you can do everything but change the text in Fl_Output...)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

FL/Fl_Input_.H

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Input_.H,v 1.6.2.4.2.3 2002/03/07 19:22:56 spitzak Exp $"
+// "$Id: Fl_Input_.H,v 1.6.2.4.2.4 2002/04/11 11:52:40 easysw Exp $"
 //
 // Input base class header file for the Fast Light Tool Kit (FLTK).
 //
@@ -36,6 +36,10 @@
 #define FL_HIDDEN_INPUT		3
 #define FL_MULTILINE_INPUT	4
 #define FL_SECRET_INPUT		5
+#define FL_INPUT_TYPE		7
+#define FL_INPUT_READONLY	8
+#define FL_NORMAL_OUTPUT	(FL_NORMAL_INPUT | FL_INPUT_READONLY)
+#define FL_MULTILINE_OUTPUT	(FL_MULTILINE_INPUT | FL_INPUT_READONLY)
 
 class Fl_Input_ : public Fl_Widget {
 
@@ -117,10 +121,16 @@ public:
   void textcolor(unsigned n) {textcolor_ = n;}
   Fl_Color cursor_color() const {return (Fl_Color)cursor_color_;}
   void cursor_color(unsigned n) {cursor_color_ = n;}
+
+  int input_type() const {return type() & FL_INPUT_TYPE; }
+  void input_type(int t) { type(t | readonly()); }
+  int readonly() const { return type() & FL_INPUT_READONLY; }
+  void readonly(int b) { if (b) type(type() | FL_INPUT_READONLY);
+                         else type(type() & FL_INPUT_TYPE); }
 };
 
 #endif 
 
 //
-// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.3 2002/03/07 19:22:56 spitzak Exp $".
+// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.4 2002/04/11 11:52:40 easysw Exp $".
 //

FL/Fl_Multiline_Output.H

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Multiline_Output.H,v 1.4.2.3.2.1 2002/01/01 15:11:28 easysw Exp $"
+// "$Id: Fl_Multiline_Output.H,v 1.4.2.3.2.2 2002/04/11 11:52:41 easysw Exp $"
 //
 // Multi line output header file for the Fast Light Tool Kit (FLTK).
 //
@@ -31,11 +31,11 @@
 class Fl_Multiline_Output : public Fl_Output {
 public:
     Fl_Multiline_Output(int x,int y,int w,int h,const char *l = 0)
-	: Fl_Output(x,y,w,h,l) {type(FL_MULTILINE_INPUT);}
+	: Fl_Output(x,y,w,h,l) {type(FL_MULTILINE_OUTPUT);}
 };
 
 #endif
 
 //
-// End of "$Id: Fl_Multiline_Output.H,v 1.4.2.3.2.1 2002/01/01 15:11:28 easysw Exp $".
+// End of "$Id: Fl_Multiline_Output.H,v 1.4.2.3.2.2 2002/04/11 11:52:41 easysw Exp $".
 //

FL/Fl_Output.H

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Output.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $"
+// "$Id: Fl_Output.H,v 1.5.2.3.2.2 2002/04/11 11:52:41 easysw Exp $"
 //
 // Output header file for the Fast Light Tool Kit (FLTK).
 //
@@ -26,19 +26,16 @@
 #ifndef Fl_Output_H
 #define Fl_Output_H
 
-#include "Fl_Input_.H"
+#include "Fl_Input.H"
 
-class Fl_Output : public Fl_Input_ {
+class Fl_Output : public Fl_Input {
-protected:
-  FL_EXPORT void draw();
 public:
-  FL_EXPORT int handle(int);
   Fl_Output(int x, int y, int w, int h, const char *l = 0)
-    : Fl_Input_(x, y, w, h, l) {}
+    : Fl_Input(x, y, w, h, l) {type(FL_NORMAL_OUTPUT);}
 };
 
 #endif 
 
 //
-// End of "$Id: Fl_Output.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $".
+// End of "$Id: Fl_Output.H,v 1.5.2.3.2.2 2002/04/11 11:52:41 easysw Exp $".
 //

documentation/Fl_Input.html

@@ -10,7 +10,8 @@
    +----<B>Fl_Input</B>
            |
            +----<A href=Fl_Float_Input.html#Fl_Float_Input>Fl_Float_Input</A>, <A href=Fl_Int_Input.html#Fl_Int_Input>Fl_Int_Input</A>,
-                <A href=Fl_Multiline_Input.html#Fl_Multiline_Input>Fl_Multiline_Input</A>, <A href=Fl_Secret_Input.html#Fl_Secret_Input>Fl_Secret_Input</A>
+                <A href=Fl_Multiline_Input.html#Fl_Multiline_Input>Fl_Multiline_Input</A>, <A href=Fl_Output.html#Fl_Output>Fl_Output</A>,
+		<A href=Fl_Secret_Input.html#Fl_Secret_Input>Fl_Secret_Input</A>
 </PRE>
 </UL>
 <H3>Include Files</H3>

documentation/Fl_Input_.html

@@ -9,7 +9,7 @@
    |
    +----<B>Fl_Input_</B>
            |
-	   +----<A href=Fl_Input.html#Fl_Input>Fl_Input</A>, <A href=Fl_Output.html#Fl_Output>Fl_Output</A>
+	   +----<A href=Fl_Input.html#Fl_Input>Fl_Input</A>
 </PRE>
 </UL>
 <H3>Include Files</H3>

documentation/Fl_Output.html

@@ -5,7 +5,7 @@
 <H3>Class Hierarchy</H3>
 <UL>
 <PRE>
-<A href=Fl_Input_.html#Fl_Input_>Fl_Input_</A>
+<A href="Fl_Input.html#Fl_Input">Fl_Input</A>
    |
    +----<B>Fl_Output</B>
            |

documentation/Fl_Widget.html

@@ -376,8 +376,8 @@ buttons that work as displays rather than input devices.
 
 <H4><A name=Fl_Widget.takesevents>int Fl_Widget::takesevents() const</A></H4>
 
-<P>This is the same as <TT>(active() &amp;&amp; visible() &amp;&amp;
+<P>This is the same as <TT>(active() &amp;&amp; !output()
-!output())</TT> but is faster.
+&amp;&amp; visible())</TT> but is faster.
 
 <H4><A name=Fl_Widget.redraw>void Fl_Widget::redraw()</A></H4>
 

fluid/factory.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.6 2002/04/11 11:52:41 easysw Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -539,8 +539,8 @@ static Fl_Scrollbar_Type Fl_Scrollbar_type;
 
 #include <FL/Fl_Output.H>
 static Fl_Menu_Item output_type_menu[] = {
-  {"Normal",0,0,(void*)FL_NORMAL_INPUT},
+  {"Normal",0,0,(void*)FL_NORMAL_OUTPUT},
-  {"Multiline",0,0,(void*)FL_MULTILINE_INPUT},
+  {"Multiline",0,0,(void*)FL_MULTILINE_OUTPUT},
   {0}};
 class Fl_Output_Type : public Fl_Input_Type {
   Fl_Menu_Item *subtypes() {return output_type_menu;}
@@ -894,5 +894,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.6 2002/04/11 11:52:41 easysw Exp $".
 //

fluid/makedepend

@@ -23,8 +23,8 @@ Fl_Menu_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
 Fl_Menu_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H
 Fl_Menu_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/fl_message.H
-Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H Shortcut_Button.h
+Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H ../FL/Fl_Input.H
-Fl_Menu_Type.o: ../FL/fl_draw.H
+Fl_Menu_Type.o: Shortcut_Button.h ../FL/fl_draw.H
 Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H
 Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
@@ -114,7 +114,7 @@ factory.o: ../FL/fl_draw.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
 factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_Help_View.H
 factory.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H
 factory.o: ../FL/Fl_Dial.H ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H
-factory.o: ../FL/Fl_Output.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
+factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H
 factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H
 file.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 file.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H

src/Fl_Bitmap.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.9 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.10 2002/04/11 11:52:41 easysw Exp $"
 //
 // Bitmap drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -29,7 +29,7 @@
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Menu_Item.H>
 #include <FL/Fl_Bitmap.H>
-#include <string.h>
+#include "flstring.h"
 
 #ifdef __APPLE__ // MacOS bitmask functions
 Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *array) {
@@ -340,5 +340,5 @@ Fl_Image *Fl_Bitmap::copy(int W, int H) {
 
 
 //
-// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.9 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: Fl_Bitmap.cxx,v 1.5.2.4.2.10 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Browser.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Browser.cxx,v 1.9.2.12.2.4 2002/03/05 10:42:13 easysw Exp $"
+// "$Id: Fl_Browser.cxx,v 1.9.2.12.2.5 2002/04/11 11:52:41 easysw Exp $"
 //
 // Browser widget for the Fast Light Tool Kit (FLTK).
 //
@@ -26,7 +26,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Browser.H>
 #include <FL/fl_draw.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdlib.h>
 #include <math.h>
 
@@ -495,5 +495,5 @@ int Fl_Browser::value() const {
 }
 
 //
-// End of "$Id: Fl_Browser.cxx,v 1.9.2.12.2.4 2002/03/05 10:42:13 easysw Exp $".
+// End of "$Id: Fl_Browser.cxx,v 1.9.2.12.2.5 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Chart.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.5 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.6 2002/04/11 11:52:41 easysw Exp $"
 //
 // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK).
 //
@@ -27,7 +27,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Chart.H>
 #include <FL/fl_draw.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdlib.h>
 
 #define ARCINC	(2.0*M_PI/360.0)
@@ -378,5 +378,5 @@ void Fl_Chart::maxsize(int m) {
 }
 
 //
-// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.5 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.6 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Check_Browser.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Check_Browser.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Check_Browser.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $"
 //
 // Fl_Check_Browser header file for the Fast Light Tool Kit (FLTK).
 //
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <FL/fl_draw.H>
 #include <FL/Fl_Check_Browser.H>
 
@@ -259,5 +259,5 @@ void Fl_Check_Browser::check_none() {
 
 
 //
-// End of "$Id: Fl_Check_Browser.cxx,v 1.1.2.3 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Check_Browser.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_File_Icon.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Icon.cxx,v 1.1.2.9 2002/03/29 14:16:03 easysw Exp $"
+// "$Id: Fl_File_Icon.cxx,v 1.1.2.10 2002/04/11 11:52:41 easysw Exp $"
 //
 // Fl_File_Icon routines.
 //
@@ -42,7 +42,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif // HAVE_STRINGS_H
@@ -471,5 +471,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o,	// I - Label data
 
 
 //
-// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.9 2002/03/29 14:16:03 easysw Exp $".
+// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.10 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_GIF_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_GIF_Image.cxx,v 1.1.2.10 2002/01/07 20:40:02 easysw Exp $"
+// "$Id: Fl_GIF_Image.cxx,v 1.1.2.11 2002/04/11 11:52:41 easysw Exp $"
 //
 // Fl_GIF_Image routines.
 //
@@ -35,7 +35,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 // Read a .gif file and convert it to a "xpm" format (actually my
 // modified one with compressed colormaps).
@@ -374,5 +374,5 @@ Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
 
 
 //
-// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.10 2002/01/07 20:40:02 easysw Exp $".
+// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.11 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Gl_Window.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.9 2002/01/03 08:08:21 matthiaswm Exp $"
+// "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.10 2002/04/11 11:52:41 easysw Exp $"
 //
 // OpenGL window code for the Fast Light Tool Kit (FLTK).
 //
@@ -31,7 +31,7 @@
 #include "Fl_Gl_Choice.H"
 #include <FL/Fl_Gl_Window.H>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 ////////////////////////////////////////////////////////////////
 
@@ -368,5 +368,5 @@ void Fl_Gl_Window::draw_overlay() {}
 #endif
 
 //
-// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.9 2002/01/03 08:08:21 matthiaswm Exp $".
+// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.10 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Image.cxx,v 1.5.2.3.2.15 2002/01/07 20:40:02 easysw Exp $"
+// "$Id: Fl_Image.cxx,v 1.5.2.3.2.16 2002/04/11 11:52:41 easysw Exp $"
 //
 // Image drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -29,7 +29,7 @@
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Menu_Item.H>
 #include <FL/Fl_Image.H>
-#include <string.h>
+#include "flstring.h"
 
 
 void fl_restore_clip(); // in fl_rect.cxx
@@ -379,5 +379,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) {
 
 
 //
-// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.15 2002/01/07 20:40:02 easysw Exp $".
+// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.16 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Input.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Input.cxx,v 1.10.2.15.2.7 2002/03/07 19:22:56 spitzak Exp $"
+// "$Id: Fl_Input.cxx,v 1.10.2.15.2.8 2002/04/11 11:52:41 easysw Exp $"
 //
 // Input widget for the Fast Light Tool Kit (FLTK).
 //
@@ -32,12 +32,14 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Input.H>
 #include <FL/fl_draw.H>
-#include <string.h>
+#include <FL/fl_ask.H>
+#include "flstring.h"
+#include <stdio.h>
 
 #define DND_OUT 1
 
 void Fl_Input::draw() {
-  if (type() == FL_HIDDEN_INPUT) return;
+  if (input_type() == FL_HIDDEN_INPUT) return;
   Fl_Boxtype b = box();
   if (damage() & FL_DAMAGE_ALL) draw_box(b, color());
   Fl_Input_::drawtext(x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b),
@@ -70,22 +72,27 @@ int Fl_Input::handle_key() {
   if (Fl::compose(del)) {
 
     // Insert characters into numeric fields after checking for legality:
-    if (type() == FL_FLOAT_INPUT || type() == FL_INT_INPUT) {
+    if (input_type() == FL_FLOAT_INPUT || input_type() == FL_INT_INPUT) {
       Fl::compose_reset(); // ignore any foreign letters...
+
       // This is complex to allow "0xff12" hex to be typed:
       if (!position() && (ascii == '+' || ascii == '-') ||
 	  (ascii >= '0' && ascii <= '9') ||
 	  (position()==1 && index(0)=='0' && (ascii=='x' || ascii == 'X')) ||
 	  (position()>1 && index(0)=='0' && (index(1)=='x'||index(1)=='X')
 	   && (ascii>='A'&& ascii<='F' || ascii>='a'&& ascii<='f')) ||
-	  type()==FL_FLOAT_INPUT && ascii && strchr(".eE+-", ascii))
+	  input_type()==FL_FLOAT_INPUT && ascii && strchr(".eE+-", ascii)) {
-	replace(position(), mark(), &ascii, 1);
+	if (readonly()) fl_beep();
+	else replace(position(), mark(), &ascii, 1);
+      }
       return 1;
     }
 
-    if (del || Fl::event_length())
+    if (del || Fl::event_length()) {
-      replace(position(), del ? position()-del : mark(),
+      if (readonly()) fl_beep();
-	      Fl::event_text(), Fl::event_length());
+      else replace(position(), del ? position()-del : mark(),
+	           Fl::event_text(), Fl::event_length());
+    }
     return 1;
   }
 
@@ -134,12 +141,12 @@ int Fl_Input::handle_key() {
       position(size(), 0);
       maybe_do_callback();
       return 1;
-    } else if (type() == FL_MULTILINE_INPUT)
+    } else if (input_type() == FL_MULTILINE_INPUT)
       return replace(position(), mark(), "\n", 1);
     else 
       return 0;	// reserved for shortcuts
   case FL_Tab:
-    if (Fl::event_state(FL_CTRL|FL_SHIFT) || type()!=FL_MULTILINE_INPUT) return 0;
+    if (Fl::event_state(FL_CTRL|FL_SHIFT) || input_type()!=FL_MULTILINE_INPUT || readonly()) return 0;
     return replace(position(), mark(), &ascii, 1);
   }
 
@@ -153,6 +160,10 @@ int Fl_Input::handle_key() {
     return copy(1);
   case ctrl('D'):
   case ctrl('?'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     if (mark() != position()) return cut();
     else return cut(1);
   case ctrl('E'):
@@ -160,10 +171,18 @@ int Fl_Input::handle_key() {
   case ctrl('F'):
     return shift_position(position()+1) + NORMAL_INPUT_MOVE;
   case ctrl('H'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     if (mark() != position()) cut();
     else cut(-1);
     return 1;
   case ctrl('K'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     if (position()>=size()) return 0;
     i = line_end(position());
     if (i == position() && i < size()) i++;
@@ -188,24 +207,44 @@ int Fl_Input::handle_key() {
     shift_up_down_position(line_start(i));
     return 1;
   case ctrl('U'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     return cut(0, size());
   case ctrl('V'):
   case ctrl('Y'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     Fl::paste(*this, 1);
     return 1;
   case ctrl('X'):
   case ctrl('W'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     copy(1);
     return cut();
   case ctrl('Z'):
   case ctrl('_'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     return undo();
   case ctrl('I'):
   case ctrl('J'):
   case ctrl('L'):
   case ctrl('M'):
+    if (readonly()) {
+      fl_beep();
+      return 1;
+    }
     // insert a few selected control characters literally:
-    if (type() != FL_FLOAT_INPUT && type() != FL_INT_INPUT)
+    if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT)
       return replace(position(), mark(), &ascii, 1);
   }
 
@@ -260,7 +299,7 @@ int Fl_Input::handle(int event) {
 	w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b), 0);
       newpos = position(); 
       position( oldpos, oldmark );
-      if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && type()!=FL_SECRET_INPUT &&
+      if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT &&
 	  (newpos >= mark() && newpos < position() ||
 	  newpos >= position() && newpos < mark())) {
 	// user clicked int the selection, may be trying to drag
@@ -354,5 +393,5 @@ Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l)
 }
 
 //
-// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.7 2002/03/07 19:22:56 spitzak Exp $".
+// End of "$Id: Fl_Input.cxx,v 1.10.2.15.2.8 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Input_.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $"
+// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.10 2002/04/11 11:52:41 easysw Exp $"
 //
 // Common input widget routines for the Fast Light Tool Kit (FLTK).
 //
@@ -33,7 +33,7 @@
 #include <FL/fl_draw.H>
 #include <FL/fl_ask.H>
 #include <math.h>
-#include <string.h>
+#include "flstring.h"
 #include <stdlib.h>
 #include <ctype.h>
 
@@ -61,7 +61,7 @@ const char* Fl_Input_::expand(const char* p, char* buf) const {
   int width_to_lastspace = 0;
   int word_count = 0;
 #endif
-  if (type()==FL_SECRET_INPUT) {
+  if (input_type()==FL_SECRET_INPUT) {
     while (o<e && p < value_+size_) {*o++ = '*'; p++;}
   } else while (o<e) {
 #ifdef WORDWRAP
@@ -80,8 +80,8 @@ const char* Fl_Input_::expand(const char* p, char* buf) const {
     if (p >= value_+size_) break;
     int c = *p++ & 255;
     if (c < ' ' || c == 127) {
-      if (c=='\n' && type()==FL_MULTILINE_INPUT) {p--; break;}
+      if (c=='\n' && input_type()==FL_MULTILINE_INPUT) {p--; break;}
-      if (c == '\t' && type()==FL_MULTILINE_INPUT) {
+      if (c == '\t' && input_type()==FL_MULTILINE_INPUT) {
 	for (c = (o-buf)%8; c<8 && o<e; c++) *o++ = ' ';
       } else {
 	*o++ = '^';
@@ -114,11 +114,11 @@ double Fl_Input_::expandpos(
   int* returnn		// return offset into buf here
 ) const {
   int n = 0;
-  if (type()==FL_SECRET_INPUT) n = e-p;
+  if (input_type()==FL_SECRET_INPUT) n = e-p;
   else while (p<e) {
     int c = *p++ & 255;
     if (c < ' ' || c == 127) {
-      if (c == '\t' && type()==FL_MULTILINE_INPUT) n += 8-(n%8);
+      if (c == '\t' && input_type()==FL_MULTILINE_INPUT) n += 8-(n%8);
       else n += 2;
     } else if (c >= 128 && c < 0xA0) {
       n += 4;
@@ -185,7 +185,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
 
   setfont();
 #ifdef WORDWRAP
-  if (type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0;
+  if (input_type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0;
 #endif
 
   const char *p, *e;
@@ -225,7 +225,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
   }
 
   // adjust the scrolling:
-  if (type()==FL_MULTILINE_INPUT) {
+  if (input_type()==FL_MULTILINE_INPUT) {
     int newy = yscroll_;
     if (cury < newy) newy = cury;
     if (cury > newy+H-height) newy = cury-H+height;
@@ -304,7 +304,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
   }
 
   // for minimal update, erase all lines below last one if necessary:
-  if (type()==FL_MULTILINE_INPUT && do_mu && ypos<H
+  if (input_type()==FL_MULTILINE_INPUT && do_mu && ypos<H
       && (!erase_cursor_only || p <= value()+mu_p)) {
     if (ypos < 0) ypos = 0;
     fl_color(this->color());
@@ -319,14 +319,14 @@ static int isword(char c) {
 }
 
 int Fl_Input_::word_end(int i) const {
-  if (type() == FL_SECRET_INPUT) return size();
+  if (input_type() == FL_SECRET_INPUT) return size();
   //while (i < size() && !isword(index(i))) i++;
   while (i < size() && isword(index(i))) i++;
   return i;
 }
 
 int Fl_Input_::word_start(int i) const {
-  if (type() == FL_SECRET_INPUT) return 0;
+  if (input_type() == FL_SECRET_INPUT) return 0;
 //   if (i >= size() || !isword(index(i)))
 //     while (i > 0 && !isword(index(i-1))) i--;
   while (i > 0 && isword(index(i-1))) i--;
@@ -334,7 +334,7 @@ int Fl_Input_::word_start(int i) const {
 }
 
 int Fl_Input_::line_end(int i) const {
-  if (type() != FL_MULTILINE_INPUT) return size();
+  if (input_type() != FL_MULTILINE_INPUT) return size();
 #ifdef WORDWRAP
   // go to the start of the paragraph:
   int j = i;
@@ -355,7 +355,7 @@ int Fl_Input_::line_end(int i) const {
 }
 
 int Fl_Input_::line_start(int i) const {
-  if (type() != FL_MULTILINE_INPUT) return 0;
+  if (input_type() != FL_MULTILINE_INPUT) return 0;
   int j = i;
   while (j > 0 && index(j-1) != '\n') j--;
 #ifdef WORDWRAP
@@ -387,12 +387,12 @@ void Fl_Input_::handle_mouse(int X, int Y,
   const char *p, *e;
   char buf[MAXBUF];
 
-  int theline = (type()==FL_MULTILINE_INPUT) ?
+  int theline = (input_type()==FL_MULTILINE_INPUT) ?
     (Fl::event_y()-Y+yscroll_)/fl_height() : 0;
 
   int newpos = 0;
 #ifdef WORDWRAP
-  if (type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0;
+  if (input_type()==FL_MULTILINE_INPUT) wordwrap = W; else wordwrap = 0;
 #endif
   for (p=value();; ) {
     e = expand(p, buf);
@@ -481,7 +481,7 @@ int Fl_Input_::up_down_position(int i, int keepmark) {
 
   setfont();
 #ifdef WORDWRAP
-  if (type()==FL_MULTILINE_INPUT)
+  if (input_type()==FL_MULTILINE_INPUT)
     wordwrap = w()-Fl::box_dw(box())-6;
   else wordwrap = 0;
 #endif
@@ -505,7 +505,7 @@ int Fl_Input_::copy(int clipboard) {
   int e = mark();
   if (b != e) {
     if (b > e) {b = mark(); e = position();}
-    if (type() == FL_SECRET_INPUT) e = b;
+    if (input_type() == FL_SECRET_INPUT) e = b;
     Fl::copy(value()+b, e-b, clipboard);
     return 1;
   }
@@ -575,7 +575,7 @@ int Fl_Input_::replace(int b, int e, const char* text, int ilen) {
     size_ -= e-b;
     undowidget = this;
     undoat = b;
-    if (type() == FL_SECRET_INPUT) yankcut = 0; else yankcut = undocut;
+    if (input_type() == FL_SECRET_INPUT) yankcut = 0; else yankcut = undocut;
   }
 
   if (ilen) {
@@ -598,7 +598,7 @@ int Fl_Input_::replace(int b, int e, const char* text, int ilen) {
   // right after the whitespace before the current word.  This will
   // result in sub-optimal update when such wrapping does not happen
   // but it is too hard to figure out for now...
-  if (type() == FL_MULTILINE_INPUT)
+  if (input_type() == FL_MULTILINE_INPUT)
     while (b > 0 && !isspace(index(b))) b--;
 #endif
 
@@ -661,7 +661,7 @@ int Fl_Input_::yank() {
 
 int Fl_Input_::copy_cuts() {
   // put the yank buffer into the X clipboard
-  if (!yankcut || type()==FL_SECRET_INPUT) return 0;
+  if (!yankcut || input_type()==FL_SECRET_INPUT) return 0;
   Fl::copy(undobuffer, yankcut, 1);
   return 1;
 }
@@ -722,8 +722,8 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) {
     // strip trailing control characters and spaces before pasting:
     const char* t = Fl::event_text();
     const char* e = t+Fl::event_length();
-    if (type() != FL_MULTILINE_INPUT) while (e > t && isspace(*(e-1))) e--;
+    if (input_type() != FL_MULTILINE_INPUT) while (e > t && isspace(*(e-1))) e--;
-    if (type() == FL_INT_INPUT) {
+    if (input_type() == FL_INT_INPUT) {
       while (isspace(*t) && t < e) t ++;
       const char *p = t;
       if (*p == '+' || *p == '-') p ++;
@@ -737,7 +737,7 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) {
         fl_beep(FL_BEEP_ERROR);
         return 1;
       } else return replace(0, size(), t, e - t);
-    } else if (type() == FL_FLOAT_INPUT) {
+    } else if (input_type() == FL_FLOAT_INPUT) {
       while (isspace(*t) && t < e) t ++;
       const char *p = t;
       if (*p == '+' || *p == '-') p ++;
@@ -864,5 +864,5 @@ Fl_Input_::~Fl_Input_() {
 }
 
 //
-// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.9 2002/04/11 10:46:19 easysw Exp $".
+// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.10 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Menu_.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.2 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.3 2002/04/11 11:52:41 easysw Exp $"
 //
 // Common menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -32,7 +32,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Menu_.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -172,5 +172,5 @@ void Fl_Menu_::clear() {
 }
 
 //
-// End of "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.2 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Menu_.cxx,v 1.7.2.8.2.3 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Menu_add.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.1 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $"
 //
 // Menu utilities for the Fast Light Tool Kit (FLTK).
 //
@@ -34,7 +34,7 @@
 // string with a % sign in it!
 
 #include <FL/Fl_Menu_.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -261,5 +261,5 @@ void Fl_Menu_::remove(int i) {
 }
 
 //
-// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.1 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Output.cxx

@@ -1,53 +0,0 @@
-//
-// "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $"
-//
-// Output widget for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2002 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems to "fltk-bugs@fltk.org".
-//
-
-// This subclass of Fl_Input_ does not allow user to edit the output.
-// Used to display output.
-
-#include <FL/Fl.H>
-#include <FL/Fl_Output.H>
-#include <FL/fl_draw.H>
-
-void Fl_Output::draw() {
-  Fl_Boxtype b = box() ? box() : FL_DOWN_BOX;
-  if (damage() & FL_DAMAGE_ALL) draw_box(b, color());
-  Fl_Input_::drawtext(x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b),
-		      w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b));
-}
-
-int Fl_Output::handle(int event) {
-  if (event == FL_KEYBOARD && Fl::event_text()[0] == 0x03) {
-    // Handle CTRL-C for copy...
-    return copy(1);
-  }
-  Fl_Boxtype b = box() ? box() : FL_DOWN_BOX;
-  return Fl_Input_::handletext(event,
-	x()+Fl::box_dx(b)+3, y()+Fl::box_dy(b),
-	w()-Fl::box_dw(b)-6, h()-Fl::box_dh(b));
-}
-
-//
-// End of "$Id: Fl_Output.cxx,v 1.6.2.3.2.2 2002/04/08 18:32:16 easysw Exp $".
-//

src/Fl_PNM_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_PNM_Image.cxx,v 1.1.2.5 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_PNM_Image.cxx,v 1.1.2.6 2002/04/11 11:52:41 easysw Exp $"
 //
 // Fl_PNM_Image routines.
 //
@@ -36,7 +36,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 
 
@@ -166,5 +166,5 @@ Fl_PNM_Image::Fl_PNM_Image(const char *name)	// I - File to read
 
 
 //
-// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.5 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_PNM_Image.cxx,v 1.1.2.6 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Pixmap.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.14 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.15 2002/04/11 11:52:41 easysw Exp $"
 //
 // Pixmap drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -38,7 +38,7 @@
 #include <FL/Fl_Pixmap.H>
 
 #include <stdio.h>
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 
 extern uchar **fl_mask_bitmap; // used by fl_draw_pixmap.cxx to store mask
@@ -467,5 +467,5 @@ void Fl_Pixmap::desaturate() {
 }
 
 //
-// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.14 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.15 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Shared_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Shared_Image.cxx,v 1.23.2.8 2002/03/29 11:59:56 easysw Exp $"
+// "$Id: Fl_Shared_Image.cxx,v 1.23.2.9 2002/04/11 11:52:41 easysw Exp $"
 //
 // Shared image code for the Fast Light Tool Kit (FLTK).
 //
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Shared_Image.H>
@@ -455,5 +455,5 @@ Fl_Shared_Image::remove_handler(Fl_Shared_Handler *f) {
 
 
 //
-// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.8 2002/03/29 11:59:56 easysw Exp $".
+// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.9 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Sys_Menu_Bar.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $"
 //
 // MacOS system menu bar widget for the Fast Light Tool Kit (FLTK).
 //
@@ -52,7 +52,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Sys_Menu_Bar.H>
 
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 #include <ctype.h>
 
@@ -310,5 +310,5 @@ int Fl_Menu_Bar::handle(int event) {
 */
 
 //
-// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.4 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Text_Buffer.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $"
 //
 // Copyright 2001-2002 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 #include <FL/Fl_Text_Buffer.H>
 
@@ -2285,5 +2285,5 @@ Fl_Text_Buffer::outputfile(const char *file, int start, int end, int buflen) {
 
 
 //
-// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $".
 //

src/Fl_Text_Display.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $"
+// "$Id: Fl_Text_Display.cxx,v 1.12.2.13 2002/04/11 11:52:42 easysw Exp $"
 //
 // Copyright 2001-2002 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -28,7 +28,7 @@
 #include <FL/Fl_Text_Display.H>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <limits.h>
 #include <ctype.h>
 
@@ -1958,5 +1958,5 @@ int Fl_Text_Display::handle(int event) {
 
 
 //
-// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.12 2002/04/11 10:46:19 easysw Exp $".
+// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.13 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_Text_Editor.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Editor.cxx,v 1.9.2.5 2002/03/07 19:22:56 spitzak Exp $"
+// "$Id: Fl_Text_Editor.cxx,v 1.9.2.6 2002/04/11 11:52:42 easysw Exp $"
 //
 // Copyright 2001-2002 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -27,7 +27,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Text_Editor.H>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 
 
@@ -439,5 +439,5 @@ int Fl_Text_Editor::handle(int event) {
 }
 
 //
-// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.5 2002/03/07 19:22:56 spitzak Exp $".
+// End of "$Id: Fl_Text_Editor.cxx,v 1.9.2.6 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_XBM_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_XBM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_XBM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $"
 //
 // Fl_XBM_Image routines.
 //
@@ -36,7 +36,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 //
 // 'Fl_XBM_Image::Fl_XBM_Image()' - Load an XBM file.
@@ -98,5 +98,5 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) {
 
 
 //
-// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_XPM_Image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_XPM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_XPM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $"
 //
 // Fl_XPM_Image routines.
 //
@@ -35,7 +35,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 
 
@@ -125,5 +125,5 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) {
 
 
 //
-// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.4 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_arg.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $"
+// "$Id: Fl_arg.cxx,v 1.5.2.8.2.8 2002/04/11 11:52:42 easysw Exp $"
 //
 // Optional argument initialization code for the Fast Light Tool Kit (FLTK).
 //
@@ -32,7 +32,7 @@
 #include <FL/filename.H>
 #include <FL/fl_draw.H>
 #include <ctype.h>
-#include <string.h>
+#include "flstring.h"
 
 #if defined(WIN32) || defined(__APPLE__)
 int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*);
@@ -364,5 +364,5 @@ int XParseGeometry(const char* string, int* x, int* y,
 #endif // ifdef WIN32
 
 //
-// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.7 2002/03/25 21:08:41 easysw Exp $".
+// End of "$Id: Fl_arg.cxx,v 1.5.2.8.2.8 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_display.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_display.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $"
 //
 // Display function for the Fast Light Tool Kit (FLTK).
 //
@@ -28,7 +28,7 @@
 
 #include <FL/Fl.H>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 void Fl::display(const char *d) {
 #if defined(__APPLE__) || defined(WIN32)
@@ -49,5 +49,5 @@ void Fl::display(const char *d) {
 }
 
 //
-// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_mac.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_mac.cxx,v 1.1.2.18 2002/04/07 18:31:55 easysw Exp $"
+// "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $"
 //
 // MacOS specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -50,7 +50,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #include <unistd.h>
 
 // external functions
@@ -1359,6 +1359,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
 
 
 //
-// End of "$Id: Fl_mac.cxx,v 1.1.2.18 2002/04/07 18:31:55 easysw Exp $".
+// End of "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $".
 //
 

src/Fl_win32.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.25 2002/04/10 15:01:20 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.26 2002/04/11 11:52:42 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -31,7 +31,7 @@
 #include <FL/Fl.H>
 #include <FL/win32.H>
 #include <FL/Fl_Window.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -1170,5 +1170,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.25 2002/04/10 15:01:20 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.26 2002/04/11 11:52:42 easysw Exp $".
 //

src/Fl_x.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.24.2.24.2.18 2002/04/10 01:32:03 easysw Exp $"
+// "$Id: Fl_x.cxx,v 1.24.2.24.2.19 2002/04/11 11:52:42 easysw Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -40,7 +40,7 @@
 #  include <ctype.h>
 #  include <stdio.h>
 #  include <stdlib.h>
-#  include <string.h>
+#  include "flstring.h"
 #  include <unistd.h>
 #  include <sys/time.h>
 
@@ -1229,5 +1229,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.18 2002/04/10 01:32:03 easysw Exp $".
+// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.19 2002/04/11 11:52:42 easysw Exp $".
 //

src/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.39 2002/04/11 11:52:42 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -64,7 +64,6 @@ CPPFILES = \
 	Fl_Menu_add.cxx \
 	Fl_Menu_global.cxx \
 	Fl_Multi_Label.cxx \
-	Fl_Output.cxx \
 	Fl_Overlay_Window.cxx \
 	Fl_Pack.cxx \
 	Fl_Pixmap.cxx \
@@ -428,5 +427,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.39 2002/04/11 11:52:42 easysw Exp $".
 #

src/filename_expand.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $"
+// "$Id: filename_expand.cxx,v 1.4.2.4.2.5 2002/04/11 11:52:42 easysw Exp $"
 //
 // Filename expansion routines for the Fast Light Tool Kit (FLTK).
 //
@@ -30,7 +30,7 @@
 
 #include <FL/filename.H>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 #if defined(WIN32) && !defined(__CYGWIN__)
 #else
 # include <unistd.h>
@@ -106,5 +106,5 @@ int fl_filename_expand(char *to,int tolen, const char *from) {
 
 
 //
-// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.4 2002/03/25 21:08:42 easysw Exp $".
+// End of "$Id: filename_expand.cxx,v 1.4.2.4.2.5 2002/04/11 11:52:42 easysw Exp $".
 //

src/filename_setext.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $"
+// "$Id: filename_setext.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $"
 //
 // Filename extension routines for the Fast Light Tool Kit (FLTK).
 //
@@ -28,7 +28,7 @@
 // If new extension is null, act like it is ""
 
 #include <FL/filename.H>
-#include <string.h>
+#include "flstring.h"
 
 char *fl_filename_setext(char *buf, int buflen, const char *ext) {
   char *q = (char *)fl_filename_ext(buf);
@@ -41,5 +41,5 @@ char *fl_filename_setext(char *buf, int buflen, const char *ext) {
 
 
 //
-// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.3 2002/03/25 21:08:42 easysw Exp $".
+// End of "$Id: filename_setext.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_dnd_win32.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_dnd_win32.cxx,v 1.5.2.6 2002/04/10 15:01:22 easysw Exp $"
+// "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $"
 //
 // Drag & Drop code for the Fast Light Tool Kit (FLTK).
 //
@@ -30,7 +30,7 @@
 #include <FL/Fl.H>
 #include <FL/win32.H>
 #include <FL/Fl_Window.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -349,5 +349,5 @@ int Fl::dnd()
 
 
 //
-// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.6 2002/04/10 15:01:22 easysw Exp $".
+// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_draw.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $"
+// "$Id: fl_draw.cxx,v 1.6.2.4.2.11 2002/04/11 11:52:42 easysw Exp $"
 //
 // Label drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -34,7 +34,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl_Image.H>
 
-#include <string.h>
+#include "flstring.h"
 #include <ctype.h>
 
 #define MAXBUF 1024
@@ -327,5 +327,5 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
 }
 
 //
-// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.10 2002/01/23 16:58:01 easysw Exp $".
+// End of "$Id: fl_draw.cxx,v 1.6.2.4.2.11 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_draw_image.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw_image.cxx,v 1.5.2.6.2.3 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_draw_image.cxx,v 1.5.2.6.2.4 2002/04/11 11:52:42 easysw Exp $"
 //
 // Image drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -61,7 +61,7 @@
 #  include <FL/fl_draw.H>
 #  include <FL/x.H>
 #  include "Fl_XColor.H"
-#  include <string.h>
+#  include "flstring.h"
 
 static XImage i;	// template used to pass info to X
 static int bytes_per_pixel;
@@ -570,5 +570,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) {
 #endif
 
 //
-// End of "$Id: fl_draw_image.cxx,v 1.5.2.6.2.3 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_draw_image.cxx,v 1.5.2.6.2.4 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_draw_pixmap.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.7 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.8 2002/04/11 11:52:42 easysw Exp $"
 //
 // Pixmap drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -39,7 +39,7 @@
 #include <FL/x.H>
 #include <ctype.h>
 #include <stdio.h>
-#include <string.h>
+#include "flstring.h"
 
 static int ncolors, chars_per_pixel;
 
@@ -262,5 +262,5 @@ int fl_draw_pixmap(const char*const* di, int x, int y, Fl_Color bg) {
 }
 
 //
-// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.7 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.8 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_font.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_font.cxx,v 1.9.2.5.2.4 2002/03/06 18:11:01 easysw Exp $"
+// "$Id: fl_font.cxx,v 1.9.2.5.2.5 2002/04/11 11:52:42 easysw Exp $"
 //
 // Font selection code for the Fast Light Tool Kit (FLTK).
 //
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 #ifdef WIN32
 #  include "fl_font_win32.cxx"
@@ -56,5 +56,5 @@ void fl_draw(const char* str, int x, int y) {
 }
 
 //
-// End of "$Id: fl_font.cxx,v 1.9.2.5.2.4 2002/03/06 18:11:01 easysw Exp $".
+// End of "$Id: fl_font.cxx,v 1.9.2.5.2.5 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_line_style.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_line_style.cxx,v 1.3.2.3.2.9 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_line_style.cxx,v 1.3.2.3.2.10 2002/04/11 11:52:42 easysw Exp $"
 //
 // Line style code for the Fast Light Tool Kit (FLTK).
 //
@@ -25,7 +25,7 @@
 
 #include <FL/fl_draw.H>
 #include <FL/x.H>
-#include <string.h>
+#include "flstring.h"
 #include <stdio.h>
 
 void fl_line_style(int style, int width, char* dashes) {
@@ -104,5 +104,5 @@ void fl_line_style(int style, int width, char* dashes) {
 
 
 //
-// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.9 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.10 2002/04/11 11:52:42 easysw Exp $".
 //

src/fl_plastic.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $"
+// "$Id: fl_plastic.cxx,v 1.1.2.11 2002/04/11 11:52:43 easysw Exp $"
 //
 // "Plastic" drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -32,7 +32,7 @@
 
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
-#include <string.h>
+#include "flstring.h"
 
 
 extern uchar *fl_gray_ramp();
@@ -173,5 +173,5 @@ Fl_Boxtype fl_define_FL_PLASTIC_UP_BOX() {
 
 
 //
-// End of "$Id: fl_plastic.cxx,v 1.1.2.10 2002/03/25 21:08:42 easysw Exp $".
+// End of "$Id: fl_plastic.cxx,v 1.1.2.11 2002/04/11 11:52:43 easysw Exp $".
 //

src/fl_set_font.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_set_font.cxx,v 1.5.2.3.2.4 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_set_font.cxx,v 1.5.2.3.2.5 2002/04/11 11:52:43 easysw Exp $"
 //
 // Font utilities for the Fast Light Tool Kit (FLTK).
 //
@@ -31,7 +31,7 @@
 #include <FL/x.H>
 #include "Fl_Font.H"
 #include <stdlib.h>
-#include <string.h>
+#include "flstring.h"
 
 static int table_size;
 
@@ -75,5 +75,5 @@ void Fl::set_font(Fl_Font fnum, Fl_Font from) {
 const char* Fl::get_font(Fl_Font fnum) {return fl_fonts[fnum].name;}
 
 //
-// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.4 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_set_font.cxx,v 1.5.2.3.2.5 2002/04/11 11:52:43 easysw Exp $".
 //

src/fl_set_fonts.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.4 2002/03/06 18:11:01 easysw Exp $"
+// "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.5 2002/04/11 11:52:43 easysw Exp $"
 //
 // More font utilities for the Fast Light Tool Kit (FLTK).
 //
@@ -28,7 +28,7 @@
 #include <FL/x.H>
 #include "Fl_Font.H"
 #include <ctype.h>
-#include <string.h>
+#include "flstring.h"
 #include <stdlib.h>
 
 #ifdef WIN32
@@ -42,5 +42,5 @@
 #endif // WIN32
 
 //
-// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.4 2002/03/06 18:11:01 easysw Exp $".
+// End of "$Id: fl_set_fonts.cxx,v 1.6.2.5.2.5 2002/04/11 11:52:43 easysw Exp $".
 //

src/fl_shortcut.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.4 2002/01/03 08:08:21 matthiaswm Exp $"
+// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.5 2002/04/11 11:52:43 easysw Exp $"
 //
 // Shortcut support routines for the Fast Light Tool Kit (FLTK).
 //
@@ -44,7 +44,7 @@
 #include <FL/Fl_Button.H>
 #include <FL/fl_draw.H>
 #include <ctype.h>
-#include <string.h>
+#include "flstring.h"
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <FL/x.H>
 #endif
@@ -200,5 +200,5 @@ int Fl_Widget::test_shortcut() {
 }
 
 //
-// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.4 2002/01/03 08:08:21 matthiaswm Exp $".
+// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.5 2002/04/11 11:52:43 easysw Exp $".
 //

src/fl_symbols.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fl_symbols.cxx,v 1.8.2.3.2.2 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: fl_symbols.cxx,v 1.8.2.3.2.3 2002/04/11 11:52:43 easysw Exp $"
 //
 // Symbol drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -34,7 +34,7 @@
 
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
-#include <string.h>
+#include "flstring.h"
 
 typedef struct {
   const char *name;
@@ -361,5 +361,5 @@ static void fl_init_symbols(void) {
 }
 
 //
-// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.2 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.3 2002/04/11 11:52:43 easysw Exp $".
 //