From bbc8782b6a13c897035948b5ca7493cfb508a8f3 Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <cand@gmx.com>
Date: Sat, 23 Aug 2014 08:41:58 +0000
Subject: Move Xutf8.h to src/, update includes, refresh makedepends

This is an internal header.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10248 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Xutf8.h   | 184 -----------------------------------------------------------
 FL/fl_utf8.h |   1 -
 FL/x.H       |   1 -
 3 files changed, 186 deletions(-)
 delete mode 100644 FL/Xutf8.h

(limited to 'FL')

diff --git a/FL/Xutf8.h b/FL/Xutf8.h
deleted file mode 100644
index 51fc28291..000000000
--- a/FL/Xutf8.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* "$Id$"
- *
- * Author: Jean-Marc Lienher ( http://oksid.ch )
- * Copyright 2000-2010 by O'ksi'D.
- *
- * This library is free software. Distribution and use rights are outlined in
- * the file "COPYING" which should have been included with this file.  If this
- * file is missing or damaged, see the license at:
- *
- *     http://www.fltk.org/COPYING.php
- *
- * Please report all bugs and problems on the following page:
- *
- *     http://www.fltk.org/str.php
- */
-
-#if ! ( defined(_Xutf8_h) || defined(FL_DOXYGEN) )
-#define _Xutf8_h
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xlocale.h>
-#include <X11/Xutil.h>
-
-typedef struct {
-	int nb_font;
-	char **font_name_list;
-	int *encodings;
-	XFontStruct **fonts;
-	Font fid;
-	int ascent;
-	int descent;
-	int *ranges;
-} XUtf8FontStruct;
-
-XUtf8FontStruct *
-XCreateUtf8FontStruct (
-	Display         *dpy,
-	const char      *base_font_name_list);
-
-void
-XUtf8DrawString(
-        Display         	*display,
-        Drawable        	d,
-        XUtf8FontStruct  *font_set,
-        GC              	gc,
-        int             	x,
-        int             	y,
-        const char      	*string,
-        int             	num_bytes);
-
-void
-XUtf8_measure_extents(
-        Display         	*display,
-        Drawable        	d,
-        XUtf8FontStruct  *font_set,
-        GC              	gc,
-        int             	*xx,
-        int             	*yy,
-        int             	*ww,
-        int             	*hh,
-        const char      	*string,
-        int             	num_bytes);
-
-void
-XUtf8DrawRtlString(
-        Display         	*display,
-        Drawable        	d,
-        XUtf8FontStruct  *font_set,
-        GC              	gc,
-        int             	x,
-        int             	y,
-        const char      	*string,
-        int             	num_bytes);
-
-void
-XUtf8DrawImageString(
-        Display         *display,
-        Drawable        d,
-        XUtf8FontStruct         *font_set,
-        GC              gc,
-        int             x,
-        int             y,
-        const char      *string,
-        int             num_bytes);
-
-int
-XUtf8TextWidth(
-        XUtf8FontStruct  *font_set,
-        const char      	*string,
-        int             	num_bytes);
-int
-XUtf8UcsWidth(
-	XUtf8FontStruct  *font_set,
-	unsigned int            ucs);
-
-int
-XGetUtf8FontAndGlyph(
-        XUtf8FontStruct  *font_set,
-        unsigned int            ucs,
-        XFontStruct     **fnt,
-        unsigned short  *id);
-
-void
-XFreeUtf8FontStruct(
-        Display         	*dpy,
-        XUtf8FontStruct 	*font_set);
-
-
-int
-XConvertUtf8ToUcs(
-	const unsigned char 	*buf,
-	int 			len,
-	unsigned int 		*ucs);
-
-int
-XConvertUcsToUtf8(
-	unsigned int 		ucs,
-	char 			*buf);
-
-int
-XUtf8CharByteLen(
-	const unsigned char 	*buf,
-	int 			len);
-
-int
-XCountUtf8Char(
-	const unsigned char *buf,
-	int len);
-
-int
-XFastConvertUtf8ToUcs(
-	const unsigned char 	*buf,
-	int 			len,
-	unsigned int 		*ucs);
-
-long
-XKeysymToUcs(
-	KeySym 	keysym);
-
-#ifdef X_HAVE_UTF8_STRING
-#define XUtf8LookupString Xutf8LookupString
-#else
-int
-XUtf8LookupString(
-    XIC                 ic,
-    XKeyPressedEvent*   event,
-    char*               buffer_return,
-    int                 bytes_buffer,
-    KeySym*             keysym,
-    Status*             status_return);
-#endif
-
-unsigned short
-XUtf8IsNonSpacing(
-	unsigned int ucs);
-
-unsigned short
-XUtf8IsRightToLeft(
-        unsigned int ucs);
-
-
-int
-XUtf8Tolower(
-        int ucs);
-
-int
-XUtf8Toupper(
-        int ucs);
-
-
-#  ifdef __cplusplus
-}
-#  endif
-
-#endif
-
-/*
- *  End of "$Id$".
- */
diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h
index 3ab2daabc..ec82dbded 100644
--- a/FL/fl_utf8.h
+++ b/FL/fl_utf8.h
@@ -61,7 +61,6 @@
 #else /* X11 */
 #  include <sys/types.h>
 #  include <sys/stat.h>
-#  include "Xutf8.h"
 #  include <X11/Xlocale.h>
 #  include <X11/Xlib.h>
 #  include <locale.h>
diff --git a/FL/x.H b/FL/x.H
index 91f888126..37e361ffc 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -52,7 +52,6 @@
 #    endif
 #    include <X11/Xatom.h>
 #    include "Fl_Window.H"
-#    include "Xutf8.h"
 // Mirror X definition of Region to Fl_Region, for portability...
 typedef Region Fl_Region;
 
-- 
cgit v1.2.3