Synchronised line endinge with release branch

1 files changed, 262 insertions, 262 deletions

diff --git a/libX11/src/FSWrap.c b/libX11/src/FSWrap.c
index d97c39504..0b7baffc9 100644
--- a/libX11/src/FSWrap.c
+++ b/libX11/src/FSWrap.c
@@ -1,262 +1,262 @@
-

-/*

- * Copyright 1991 by the Open Software Foundation

- * Copyright 1993 by the TOSHIBA Corp.

- *

- * 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 Open Software Foundation

- * not be used in advertising or publicity pertaining to distribution of the

- * software without specific, written prior permission.  Open Software

- * Foundation makes no representations about the suitability of this

- * software for any purpose.  It is provided "as is" without express or

- * implied warranty.

- *

- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO

- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN 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.

- *

- *		 M. Collins		OSF

- *

- *		 Katsuhisa Yano		TOSHIBA Corp.

- */

-

-/*

-

-Copyright 1991, 1998  The Open Group

-

-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.

-

-The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall

-not be used in advertising or otherwise to promote the sale, use or

-other dealings in this Software without prior written authorization

-from The Open Group.

-

-*/

-

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include "Xlcint.h"

-#include <ctype.h>

-#include <X11/Xos.h>

-#include <unistd.h>

-

-#define	XMAXLIST	256

-

-char **

-_XParseBaseFontNameList(

-    char           *str,

-    int            *num)

-{

-    char           *plist[XMAXLIST];

-    char          **list;

-    char           *ptr, *psave;

-

-    *num = 0;

-    if (!str || !*str) {

-	return (char **)NULL;

-    }

-    while (*str && isspace(*str))

-	str++;

-    if (!*str)

-	return (char **)NULL;

-

-    if (!(ptr = strdup(str))) {

-	return (char **)NULL;

-    }

-

-    psave = ptr;

-    /* somebody who specifies more than XMAXLIST basefontnames will lose */

-    while (*num < (sizeof plist / sizeof plist[0])) {

-	char	*back;

-

-	plist[*num] = ptr;

-	if ((ptr = strchr(ptr, ','))) {

-	    back = ptr;

-	} else {

-	    back = plist[*num] + strlen(plist[*num]);

-	}

-	while (isspace(*(back - 1)))

-	    back--;

-	*back = '\0';

-	(*num)++;

-	if (!ptr)

-	    break;

-	ptr++;

-	while (*ptr && isspace(*ptr))

-	    ptr++;

-	if (!*ptr)

-	    break;

-    }

-    if (!(list = (char **) Xmalloc((unsigned)sizeof(char *) * (*num + 1)))) {

-	Xfree(psave);

-	return (char **)NULL;

-    }

-    memcpy((char *)list, (char *)plist, sizeof(char *) * (*num));

-    *(list + *num) = NULL;

-

-    return list;

-}

-

-static char **

-copy_string_list(

-    char **string_list,

-    int list_count)

-{

-    char **string_list_ret, **list_src, **list_dst, *dst;

-    int length, count;

-

-    if (string_list == NULL || list_count == 0)

-	return (char **) NULL;

-

-    string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count);

-    if (string_list_ret == NULL)

-	return (char **) NULL;

-

-    list_src = string_list;

-    count = list_count;

-    for (length = 0; count-- > 0; list_src++)

-	length += strlen(*list_src) + 1;

-

-    dst = (char *) Xmalloc(length);

-    if (dst == NULL) {

-	Xfree(string_list_ret);

-	return (char **) NULL;

-    }

-

-    list_src = string_list;

-    count = list_count;

-    list_dst = string_list_ret;

-    for ( ;  count-- > 0; list_src++) {

-	strcpy(dst, *list_src);

-	*list_dst++ = dst;

-	dst += strlen(dst) + 1;

-    }

-

-    return string_list_ret;

-}

-

-XFontSet

-XCreateFontSet (

-    Display        *dpy,

-    _Xconst char   *base_font_name_list,

-    char         ***missing_charset_list,

-    int            *missing_charset_count,

-    char          **def_string)

-{

-    XOM om;

-    XOC oc;

-    XOMCharSetList *list;

-

-    *missing_charset_list = NULL;

-    *missing_charset_count = 0;

-

-    om = XOpenOM(dpy, NULL, NULL, NULL);

-    if (om == NULL)

-	return (XFontSet) NULL;

-

-    if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {

-	list = &oc->core.missing_list;

-	oc->core.om_automatic = True;

-    } else

-	list = &om->core.required_charset;

-

-    *missing_charset_list = copy_string_list(list->charset_list,

-					     list->charset_count);

-    *missing_charset_count = list->charset_count;

-

-    if (list->charset_list && *missing_charset_list == NULL)

-	oc = NULL;

-

-    if (oc && def_string) {

-	*def_string = oc->core.default_string;

-	if (!*def_string)

-	    *def_string = "";

-    }

-

-    if (oc == NULL)

-	XCloseOM(om);

-

-    return (XFontSet) oc;

-}

-

-int

-XFontsOfFontSet(

-    XFontSet        font_set,

-    XFontStruct  ***font_struct_list,

-    char         ***font_name_list)

-{

-    *font_name_list   = font_set->core.font_info.font_name_list;

-    *font_struct_list = font_set->core.font_info.font_struct_list;

-    return font_set->core.font_info.num_font;

-}

-

-char *

-XBaseFontNameListOfFontSet(XFontSet font_set)

-{

-    return font_set->core.base_name_list;

-}

-

-char *

-XLocaleOfFontSet(XFontSet font_set)

-{

-    return font_set->core.om->core.lcd->core->name;

-}

-

-Bool

-XContextDependentDrawing(XFontSet font_set)

-{

-    return font_set->core.om->core.context_dependent;

-}

-

-Bool

-XDirectionalDependentDrawing(XFontSet font_set)

-{

-    return font_set->core.om->core.directional_dependent;

-}

-

-Bool

-XContextualDrawing(XFontSet font_set)

-{

-    return font_set->core.om->core.contextual_drawing;

-}

-

-XFontSetExtents *

-XExtentsOfFontSet(XFontSet font_set)

-{

-    if (!font_set)

-	return NULL;

-    return &font_set->core.font_set_extents;

-}

-

-void

-XFreeFontSet(

-    Display        *dpy,

-    XFontSet        font_set)

-{

-    XCloseOM(font_set->core.om);

-}

+
+/*
+ * Copyright 1991 by the Open Software Foundation
+ * Copyright 1993 by the TOSHIBA Corp.
+ *
+ * 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 Open Software Foundation
+ * not be used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  Open Software
+ * Foundation makes no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+ *
+ * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN 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.
+ *
+ *		 M. Collins		OSF
+ *
+ *		 Katsuhisa Yano		TOSHIBA Corp.
+ */
+
+/*
+
+Copyright 1991, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include <ctype.h>
+#include <X11/Xos.h>
+#include <unistd.h>
+
+#define	XMAXLIST	256
+
+char **
+_XParseBaseFontNameList(
+    char           *str,
+    int            *num)
+{
+    char           *plist[XMAXLIST];
+    char          **list;
+    char           *ptr, *psave;
+
+    *num = 0;
+    if (!str || !*str) {
+	return (char **)NULL;
+    }
+    while (*str && isspace(*str))
+	str++;
+    if (!*str)
+	return (char **)NULL;
+
+    if (!(ptr = strdup(str))) {
+	return (char **)NULL;
+    }
+
+    psave = ptr;
+    /* somebody who specifies more than XMAXLIST basefontnames will lose */
+    while (*num < (sizeof plist / sizeof plist[0])) {
+	char	*back;
+
+	plist[*num] = ptr;
+	if ((ptr = strchr(ptr, ','))) {
+	    back = ptr;
+	} else {
+	    back = plist[*num] + strlen(plist[*num]);
+	}
+	while (isspace(*(back - 1)))
+	    back--;
+	*back = '\0';
+	(*num)++;
+	if (!ptr)
+	    break;
+	ptr++;
+	while (*ptr && isspace(*ptr))
+	    ptr++;
+	if (!*ptr)
+	    break;
+    }
+    if (!(list = (char **) Xmalloc((unsigned)sizeof(char *) * (*num + 1)))) {
+	Xfree(psave);
+	return (char **)NULL;
+    }
+    memcpy((char *)list, (char *)plist, sizeof(char *) * (*num));
+    *(list + *num) = NULL;
+
+    return list;
+}
+
+static char **
+copy_string_list(
+    char **string_list,
+    int list_count)
+{
+    char **string_list_ret, **list_src, **list_dst, *dst;
+    int length, count;
+
+    if (string_list == NULL || list_count == 0)
+	return (char **) NULL;
+
+    string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count);
+    if (string_list_ret == NULL)
+	return (char **) NULL;
+
+    list_src = string_list;
+    count = list_count;
+    for (length = 0; count-- > 0; list_src++)
+	length += strlen(*list_src) + 1;
+
+    dst = (char *) Xmalloc(length);
+    if (dst == NULL) {
+	Xfree(string_list_ret);
+	return (char **) NULL;
+    }
+
+    list_src = string_list;
+    count = list_count;
+    list_dst = string_list_ret;
+    for ( ;  count-- > 0; list_src++) {
+	strcpy(dst, *list_src);
+	*list_dst++ = dst;
+	dst += strlen(dst) + 1;
+    }
+
+    return string_list_ret;
+}
+
+XFontSet
+XCreateFontSet (
+    Display        *dpy,
+    _Xconst char   *base_font_name_list,
+    char         ***missing_charset_list,
+    int            *missing_charset_count,
+    char          **def_string)
+{
+    XOM om;
+    XOC oc;
+    XOMCharSetList *list;
+
+    *missing_charset_list = NULL;
+    *missing_charset_count = 0;
+
+    om = XOpenOM(dpy, NULL, NULL, NULL);
+    if (om == NULL)
+	return (XFontSet) NULL;
+
+    if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {
+	list = &oc->core.missing_list;
+	oc->core.om_automatic = True;
+    } else
+	list = &om->core.required_charset;
+
+    *missing_charset_list = copy_string_list(list->charset_list,
+					     list->charset_count);
+    *missing_charset_count = list->charset_count;
+
+    if (list->charset_list && *missing_charset_list == NULL)
+	oc = NULL;
+
+    if (oc && def_string) {
+	*def_string = oc->core.default_string;
+	if (!*def_string)
+	    *def_string = "";
+    }
+
+    if (oc == NULL)
+	XCloseOM(om);
+
+    return (XFontSet) oc;
+}
+
+int
+XFontsOfFontSet(
+    XFontSet        font_set,
+    XFontStruct  ***font_struct_list,
+    char         ***font_name_list)
+{
+    *font_name_list   = font_set->core.font_info.font_name_list;
+    *font_struct_list = font_set->core.font_info.font_struct_list;
+    return font_set->core.font_info.num_font;
+}
+
+char *
+XBaseFontNameListOfFontSet(XFontSet font_set)
+{
+    return font_set->core.base_name_list;
+}
+
+char *
+XLocaleOfFontSet(XFontSet font_set)
+{
+    return font_set->core.om->core.lcd->core->name;
+}
+
+Bool
+XContextDependentDrawing(XFontSet font_set)
+{
+    return font_set->core.om->core.context_dependent;
+}
+
+Bool
+XDirectionalDependentDrawing(XFontSet font_set)
+{
+    return font_set->core.om->core.directional_dependent;
+}
+
+Bool
+XContextualDrawing(XFontSet font_set)
+{
+    return font_set->core.om->core.contextual_drawing;
+}
+
+XFontSetExtents *
+XExtentsOfFontSet(XFontSet font_set)
+{
+    if (!font_set)
+	return NULL;
+    return &font_set->core.font_set_extents;
+}
+
+void
+XFreeFontSet(
+    Display        *dpy,
+    XFontSet        font_set)
+{
+    XCloseOM(font_set->core.om);
+}