+ Fixed non standard fltk utf8 files headers.

Kept original author and copyright. Added standard fltk LGPL header notice + Added missing comment to fl_width() related to latest utf8 STR#2086 related fix in r6539 and r6540. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6542 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2008-12-04 20:20:30 +00:00 · 2008-12-04 20:20:30 +00:00 · 60335167b2
commit 60335167b2
parent 5182f58f01
7 changed files with 104 additions and 130 deletions
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@ -198,7 +198,9 @@ FL_EXPORT int   fl_descent();
 FL_EXPORT double fl_width(const char* txt);
 /** Return the typographical width of a sequence of \a n characters */
 FL_EXPORT double fl_width(const char* txt, int n);
-/** Return the typographical width of a single character */
+/** Return the typographical width of a single character : 
+    \note if a valid fl_gc is NOT found then it uses the first window gc, 
+    or the screen gc if no fltk window is available when called. */
 FL_EXPORT double fl_width(Fl_Unichar);
 /** Determine the minimum pixel dimensions of a nul-terminated string */
 FL_EXPORT void fl_text_extents(const char*, int& dx, int& dy, int& w, int& h); // NO fltk symbol expansion
--- a/FL/fl_utf8.h
+++ b/FL/fl_utf8.h
@ -1,25 +1,27 @@
+// "$Id: $"
 //
-// Copyright 1998-2008 by Bill Spitzak and others.
+// Author: Jean-Marc Lienher ( http://oksid.ch )
+// Copyright 2000-2003 by O'ksi'D.
 //
 // 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
-// with exceptions that allow sub-classing and static linking in
-// non-LGPL compliant software. These exceptions are subject to
-// conditions, see the FLTK License for more details.
+// 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 FLTK
-// License for more details.
+// 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 FLTK License along with
-// this library; if not, write to  OksiD Software, Jean-Marc Lienher,
-// Rue de la Cheminee 1, CH-2065 Savagnier, Switzerland.
+// 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 "oksid@bluewin.ch".
+// Please report all bugs and problems on the following page:
 //
+//     http://www.fltk.org/str.php
+

 // Merged in some functionality from the fltk-2 version. IMM.
 // The following code is an attempt to merge the functions incorporated in FLTK2
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@ -202,9 +202,9 @@ static HMODULE get_imm_module() {
 static int maxfd = 0;
 static fd_set fdsets[3];

-#define POLLIN 1
-#define POLLOUT 4
-#define POLLERR 8
+# define POLLIN 1
+# define POLLOUT 4
+# define POLLERR 8

 #if !defined(__GNUC__) || __GNUC__ >= 3
 extern IDropTarget *flIDropTarget;
--- a/src/fl_utf8.cxx
+++ b/src/fl_utf8.cxx
@ -1,40 +1,28 @@
-
 // "$Id: $"
 //
 // Unicode to UTF-8 conversion functions.
 //
-//                Copyright 2000-2003 by O'ksi'D.
-//                      All rights reserved.
+// Author: Jean-Marc Lienher ( http://oksid.ch )
+// Copyright 2000-2003 by O'ksi'D.
 //
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
+// 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.
 //
-//      Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
+// 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.
 //
-//      Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
+// 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.
 //
-//      Neither the name of O'ksi'D nor the names of its contributors
-//      may be used to endorse or promote products derived from this software
-//      without specific prior written permission.
+// Please report all bugs and problems on the following page:
 //
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
-// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
+//     http://www.fltk.org/str.php


 #include <config.h>
--- a/src/xutf8/case.c
+++ b/src/xutf8/case.c
@ -1,40 +1,26 @@
-/******************************************************************************
-              Copyright 2001 by O'ksi'D
- *                      All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *      Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *      Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- *      Neither the name of O'ksi'D nor the names of its contributors
- *      may be used to endorse or promote products derived from this software
- *      without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-
-
-        Author: Jean-Marc Lienher ( http://oksid.ch )
-
-******************************************************************************/
+// "$Id: $"
+//
+// Author: Jean-Marc Lienher ( http://oksid.ch )
+// Copyright 2000-2003 by O'ksi'D.
+//
+// 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 on the following page:
+//
+//     http://www.fltk.org/str.php

 /*
 * This file is required on all platforms for utf8 support
--- a/src/xutf8/is_right2left.c
+++ b/src/xutf8/is_right2left.c
@ -1,28 +1,26 @@
-/******************************************************************************
-              Copyright 2000-2001 by O'ksi'D
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of O'ksi'D
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-O'ksi'D makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-O'ksi'D DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL O'ksi'D BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-        Author: Jean-Marc Lienher ( http://oksid.ch )
-
-******************************************************************************/
+// "$Id: $"
+//
+// Author: Jean-Marc Lienher ( http://oksid.ch )
+// Copyright 2000-2003 by O'ksi'D.
+//
+// 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 on the following page:
+//
+//     http://www.fltk.org/str.php

 /*
 * This file is required on all platforms for utf8 support
--- a/src/xutf8/is_spacing.c
+++ b/src/xutf8/is_spacing.c
@ -1,28 +1,26 @@
-/******************************************************************************
-              Copyright 2000-2001 by O'ksi'D
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of O'ksi'D
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-O'ksi'D makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-O'ksi'D DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL O'ksi'D BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-        Author: Jean-Marc Lienher ( http://oksid.ch )
-
-******************************************************************************/
+// "$Id: $"
+//
+// Author: Jean-Marc Lienher ( http://oksid.ch )
+// Copyright 2000-2003 by O'ksi'D.
+//
+// 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 on the following page:
+//
+//     http://www.fltk.org/str.php

 /*
 * This file is required on all platforms for utf8 support