Remove dependency on GLUT
Consequently only work under X11, so drop Windows support
This commit is contained in:
malc
parent
c57d1d299b
commit
71ab02020b
20
BUILDING
20
BUILDING
|
|
@ -5,19 +5,19 @@ be found here[3], dependencies here[4]
|
|||
|
||||
Note that MuPDF is a moving target therefore bellow is the commit id
|
||||
of the git version of MuPDF that this version of llpp is known to work
|
||||
with:
|
||||
with:
|
||||
7d181099272d9c0e92c4488ceaa95b0d8bd10f1e
|
||||
|
||||
llpp also depends on OCaml[5], lablGL[6] and GLUT[7], having a C
|
||||
compiler wouldn't hurt either.
|
||||
llpp also depends on OCaml[5], lablGL[6], having a C compiler wouldn't
|
||||
hurt either.
|
||||
|
||||
To build llpp "the easy way" one can invoke `sh buildall.sh' which
|
||||
will first attempt to automatically fetch lablGL, mupdf, mupdf's
|
||||
prerequisites[8] and build them, then, if everything goes fine, it
|
||||
will proceed building llpp itself. Note that OCaml and GLUT still need
|
||||
to be installed separately, also, in addition to the usual suspects
|
||||
(i.e. GCC, make, binutils, OCaml) you will need `wget' and `unzip'for
|
||||
this script to work.
|
||||
prerequisites[7] and build them, then, if everything goes fine, it
|
||||
will proceed building llpp itself. Note that OCaml still needs to be
|
||||
installed separately, also, in addition to the usual suspects (i.e.
|
||||
GCC, make, binutils, OCaml) you will need `wget' and `unzip'for this
|
||||
script to work.
|
||||
|
||||
Otherwise, provided that all prereqs are already built, one should
|
||||
invoke `sh build.sh' from the top of llpp's directory, prior to that
|
||||
|
|
@ -36,9 +36,7 @@ $ ./llpp -p password /path/to/some.password.protected.pdf
|
|||
[4] http://mupdf.com/download/source/mupdf-thirdparty.zip
|
||||
[5] http://caml.inria.fr/
|
||||
[6] http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html
|
||||
[7] http://www.opengl.org/resources/libraries/glut/
|
||||
http://freeglut.sourceforge.net/
|
||||
[8] mupdf-7d181099272d9c0e92c4488ceaa95b0d8bd10f1e.tgz (4064792 bytes)
|
||||
[7] mupdf-7d181099272d9c0e92c4488ceaa95b0d8bd10f1e.tgz (4064792 bytes)
|
||||
mupdf-thirdparty-2012-01-27.zip (7288384 bytes)
|
||||
lablgl-1.04.tar.gz (410525 bytes)
|
||||
|
||||
|
|
|
|||
2
KEYS
2
KEYS
|
|
@ -125,5 +125,3 @@ Caveat emptor:
|
|||
|
||||
o Selection can not cross page boundaries
|
||||
o Text searching is very naive
|
||||
o Most of the Ctrl keys do not work on Windows and native OSX (X11 version
|
||||
is fine though)
|
||||
|
|
|
|||
16
build.ml
16
build.ml
|
|
@ -25,15 +25,21 @@ let libs = getdef "libs" "";;
|
|||
let boc flags src =
|
||||
let o = src ^ ".o" in
|
||||
let c = src ^ ".c" in
|
||||
let d =
|
||||
(* Since we are using ocaml instead of gcc to compile this
|
||||
the dep scanning passs is not done, hence this cludge *)
|
||||
List.fold_left
|
||||
(fun s p -> StrSet.add (Filename.concat srcdir p) s)
|
||||
StrSet.empty
|
||||
["glfont.c"; "keysym2ucs.c"]
|
||||
in
|
||||
ocaml
|
||||
"ocamlc.opt"
|
||||
("-cc '" ^ cc ^ "' -ccopt '" ^ flags ^ " " ^ ccopt ^ " -o " ^ o ^ "'")
|
||||
o
|
||||
(StrSet.singleton o)
|
||||
[Filename.concat srcdir c]
|
||||
(* Since we are using ocaml instead of gcc to compile this
|
||||
the dep scanning passs is not done, hence this cludge *)
|
||||
(StrSet.singleton (Filename.concat srcdir "glfont.c"))
|
||||
d
|
||||
;
|
||||
;;
|
||||
|
||||
|
|
@ -120,7 +126,7 @@ let () =
|
|||
let prog name cmos =
|
||||
ocaml
|
||||
"ocamlc.opt"
|
||||
("-g -I +lablGL lablgl.cma lablglut.cma str.cma unix.cma -dllpath "
|
||||
("-g -I +lablGL lablgl.cma str.cma unix.cma -dllpath "
|
||||
^ Sys.getcwd ())
|
||||
name
|
||||
(StrSet.singleton name)
|
||||
|
|
@ -132,7 +138,7 @@ let () =
|
|||
cmopp ~flags:"-g -w A-7-6-4 -I +lablGL -thread" ~dirname name;
|
||||
(name ^ ".cmo")
|
||||
in
|
||||
let cmos = so :: List.map mkcmo ["help"; "parser"; "main"] in
|
||||
let cmos = so :: List.map mkcmo ["help"; "parser"; "wsi"; "main"] in
|
||||
prog "llpp" cmos;
|
||||
;;
|
||||
|
||||
|
|
|
|||
12
buildall.sh
12
buildall.sh
|
|
@ -36,7 +36,7 @@ make=$(gmake -v >/dev/null 2>&1 && echo gmake || echo make)
|
|||
|
||||
(cd lablGL-1.04 \
|
||||
&& cat Makefile.config.linux.mdk > Makefile.config \
|
||||
&& $make glut glutopt \
|
||||
&& $make lib libopt \
|
||||
&& $make install \
|
||||
BINDIR=$root/bin \
|
||||
LIBDIR=$root/lib/ocaml \
|
||||
|
|
@ -74,30 +74,36 @@ if test "$1" = "opt"; then
|
|||
cclib="$cclib -lpthread"
|
||||
ocamlopt -c -o link.o -ccopt "$ccopt" $srcpath/link.c
|
||||
ocamlopt -c -o help.cmx help.ml
|
||||
ocamlopt -c -o wsi.cmi $srcpath/wsi.mli
|
||||
ocamlopt -c -o wsi.cmx $srcpath/wsi.ml
|
||||
ocamlopt -c -o parser.cmx $srcpath/parser.ml
|
||||
ocamlopt -c -o main.cmx -I $root/lib/ocaml/lablGL $srcpath/main.ml
|
||||
|
||||
ocamlopt -o llpp \
|
||||
-I $root/lib/ocaml/lablGL \
|
||||
str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa \
|
||||
str.cmxa unix.cmxa lablgl.cmxa \
|
||||
link.o \
|
||||
-cclib "$cclib" \
|
||||
help.cmx \
|
||||
parser.cmx \
|
||||
wsi.cmx \
|
||||
main.cmx
|
||||
else
|
||||
ocamlc -c -o link.o -ccopt "$ccopt" $srcpath/link.c
|
||||
ocamlc -c -o help.cmo help.ml
|
||||
ocamlc -c -o wsi.cmi $srcpath/wsi.mli
|
||||
ocamlc -c -o wsi.cmo $srcpath/wsi.ml
|
||||
ocamlc -c -o parser.cmo $srcpath/parser.ml
|
||||
ocamlc -c -o main.cmo -I $root/lib/ocaml/lablGL $srcpath/main.ml
|
||||
|
||||
ocamlc -custom -o llpp \
|
||||
-I $root/lib/ocaml/lablGL \
|
||||
str.cma unix.cma lablgl.cma lablglut.cma \
|
||||
str.cma unix.cma lablgl.cma \
|
||||
link.o \
|
||||
-cclib "$cclib" \
|
||||
help.cmo \
|
||||
parser.cmo \
|
||||
wsi.cmo \
|
||||
main.cmo
|
||||
fi
|
||||
echo All done
|
||||
|
|
|
|||
849
keysym2ucs.c
Normal file
849
keysym2ucs.c
Normal file
|
|
@ -0,0 +1,849 @@
|
|||
/* This is a (despite a fat warning) slightly modified:
|
||||
www.cl.cam.ac.uk/~mgk25/ucs/keysym2ucs.c
|
||||
by Markus G. Kuhn */
|
||||
/* $XFree86$
|
||||
* This module converts keysym values into the corresponding ISO 10646
|
||||
* (UCS, Unicode) values.
|
||||
*
|
||||
* The array keysymtab[] contains pairs of X11 keysym values for graphical
|
||||
* characters and the corresponding Unicode value. The function
|
||||
* keysym2ucs() maps a keysym onto a Unicode value using a binary search,
|
||||
* therefore keysymtab[] must remain SORTED by keysym value.
|
||||
*
|
||||
* The keysym -> UTF-8 conversion will hopefully one day be provided
|
||||
* by Xlib via XmbLookupString() and should ideally not have to be
|
||||
* done in X applications. But we are not there yet.
|
||||
*
|
||||
* We allow to represent any UCS character in the range U-00000000 to
|
||||
* U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff.
|
||||
* This admittedly does not cover the entire 31-bit space of UCS, but
|
||||
* it does cover all of the characters up to U-10FFFF, which can be
|
||||
* represented by UTF-16, and more, and it is very unlikely that higher
|
||||
* UCS codes will ever be assigned by ISO. So to get Unicode character
|
||||
* U+ABCD you can directly use keysym 0x0100abcd.
|
||||
*
|
||||
* NOTE: The comments in the table below contain the actual character
|
||||
* encoded in UTF-8, so for viewing and editing best use an editor in
|
||||
* UTF-8 mode.
|
||||
*
|
||||
* Author: Markus G. Kuhn <http://www.cl.cam.ac.uk/~mgk25/>,
|
||||
* University of Cambridge, April 2001
|
||||
*
|
||||
* Special thanks to Richard Verhoeven <river@win.tue.nl> for preparing
|
||||
* an initial draft of the mapping table.
|
||||
*
|
||||
* This software is in the public domain. Share and enjoy!
|
||||
*
|
||||
* AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
|
||||
*/
|
||||
|
||||
struct codepair {
|
||||
unsigned short keysym;
|
||||
unsigned short ucs;
|
||||
} keysymtab[] = {
|
||||
{ 0x01a1, 0x0104 }, /* Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */
|
||||
{ 0x01a2, 0x02d8 }, /* breve ˘ BREVE */
|
||||
{ 0x01a3, 0x0141 }, /* Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */
|
||||
{ 0x01a5, 0x013d }, /* Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */
|
||||
{ 0x01a6, 0x015a }, /* Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */
|
||||
{ 0x01a9, 0x0160 }, /* Scaron Š LATIN CAPITAL LETTER S WITH CARON */
|
||||
{ 0x01aa, 0x015e }, /* Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */
|
||||
{ 0x01ab, 0x0164 }, /* Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */
|
||||
{ 0x01ac, 0x0179 }, /* Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */
|
||||
{ 0x01ae, 0x017d }, /* Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */
|
||||
{ 0x01af, 0x017b }, /* Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */
|
||||
{ 0x01b1, 0x0105 }, /* aogonek ą LATIN SMALL LETTER A WITH OGONEK */
|
||||
{ 0x01b2, 0x02db }, /* ogonek ˛ OGONEK */
|
||||
{ 0x01b3, 0x0142 }, /* lstroke ł LATIN SMALL LETTER L WITH STROKE */
|
||||
{ 0x01b5, 0x013e }, /* lcaron ľ LATIN SMALL LETTER L WITH CARON */
|
||||
{ 0x01b6, 0x015b }, /* sacute ś LATIN SMALL LETTER S WITH ACUTE */
|
||||
{ 0x01b7, 0x02c7 }, /* caron ˇ CARON */
|
||||
{ 0x01b9, 0x0161 }, /* scaron š LATIN SMALL LETTER S WITH CARON */
|
||||
{ 0x01ba, 0x015f }, /* scedilla ş LATIN SMALL LETTER S WITH CEDILLA */
|
||||
{ 0x01bb, 0x0165 }, /* tcaron ť LATIN SMALL LETTER T WITH CARON */
|
||||
{ 0x01bc, 0x017a }, /* zacute ź LATIN SMALL LETTER Z WITH ACUTE */
|
||||
{ 0x01bd, 0x02dd }, /* doubleacute ˝ DOUBLE ACUTE ACCENT */
|
||||
{ 0x01be, 0x017e }, /* zcaron ž LATIN SMALL LETTER Z WITH CARON */
|
||||
{ 0x01bf, 0x017c }, /* zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */
|
||||
{ 0x01c0, 0x0154 }, /* Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */
|
||||
{ 0x01c3, 0x0102 }, /* Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */
|
||||
{ 0x01c5, 0x0139 }, /* Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */
|
||||
{ 0x01c6, 0x0106 }, /* Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */
|
||||
{ 0x01c8, 0x010c }, /* Ccaron Č LATIN CAPITAL LETTER C WITH CARON */
|
||||
{ 0x01ca, 0x0118 }, /* Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */
|
||||
{ 0x01cc, 0x011a }, /* Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */
|
||||
{ 0x01cf, 0x010e }, /* Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */
|
||||
{ 0x01d0, 0x0110 }, /* Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */
|
||||
{ 0x01d1, 0x0143 }, /* Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */
|
||||
{ 0x01d2, 0x0147 }, /* Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */
|
||||
{ 0x01d5, 0x0150 }, /* Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
|
||||
{ 0x01d8, 0x0158 }, /* Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */
|
||||
{ 0x01d9, 0x016e }, /* Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */
|
||||
{ 0x01db, 0x0170 }, /* Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
|
||||
{ 0x01de, 0x0162 }, /* Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */
|
||||
{ 0x01e0, 0x0155 }, /* racute ŕ LATIN SMALL LETTER R WITH ACUTE */
|
||||
{ 0x01e3, 0x0103 }, /* abreve ă LATIN SMALL LETTER A WITH BREVE */
|
||||
{ 0x01e5, 0x013a }, /* lacute ĺ LATIN SMALL LETTER L WITH ACUTE */
|
||||
{ 0x01e6, 0x0107 }, /* cacute ć LATIN SMALL LETTER C WITH ACUTE */
|
||||
{ 0x01e8, 0x010d }, /* ccaron č LATIN SMALL LETTER C WITH CARON */
|
||||
{ 0x01ea, 0x0119 }, /* eogonek ę LATIN SMALL LETTER E WITH OGONEK */
|
||||
{ 0x01ec, 0x011b }, /* ecaron ě LATIN SMALL LETTER E WITH CARON */
|
||||
{ 0x01ef, 0x010f }, /* dcaron ď LATIN SMALL LETTER D WITH CARON */
|
||||
{ 0x01f0, 0x0111 }, /* dstroke đ LATIN SMALL LETTER D WITH STROKE */
|
||||
{ 0x01f1, 0x0144 }, /* nacute ń LATIN SMALL LETTER N WITH ACUTE */
|
||||
{ 0x01f2, 0x0148 }, /* ncaron ň LATIN SMALL LETTER N WITH CARON */
|
||||
{ 0x01f5, 0x0151 }, /* odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */
|
||||
{ 0x01f8, 0x0159 }, /* rcaron ř LATIN SMALL LETTER R WITH CARON */
|
||||
{ 0x01f9, 0x016f }, /* uring ů LATIN SMALL LETTER U WITH RING ABOVE */
|
||||
{ 0x01fb, 0x0171 }, /* udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */
|
||||
{ 0x01fe, 0x0163 }, /* tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */
|
||||
{ 0x01ff, 0x02d9 }, /* abovedot ˙ DOT ABOVE */
|
||||
{ 0x02a1, 0x0126 }, /* Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */
|
||||
{ 0x02a6, 0x0124 }, /* Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
|
||||
{ 0x02a9, 0x0130 }, /* Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */
|
||||
{ 0x02ab, 0x011e }, /* Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */
|
||||
{ 0x02ac, 0x0134 }, /* Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
|
||||
{ 0x02b1, 0x0127 }, /* hstroke ħ LATIN SMALL LETTER H WITH STROKE */
|
||||
{ 0x02b6, 0x0125 }, /* hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */
|
||||
{ 0x02b9, 0x0131 }, /* idotless ı LATIN SMALL LETTER DOTLESS I */
|
||||
{ 0x02bb, 0x011f }, /* gbreve ğ LATIN SMALL LETTER G WITH BREVE */
|
||||
{ 0x02bc, 0x0135 }, /* jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */
|
||||
{ 0x02c5, 0x010a }, /* Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */
|
||||
{ 0x02c6, 0x0108 }, /* Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
|
||||
{ 0x02d5, 0x0120 }, /* Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */
|
||||
{ 0x02d8, 0x011c }, /* Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
|
||||
{ 0x02dd, 0x016c }, /* Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */
|
||||
{ 0x02de, 0x015c }, /* Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
|
||||
{ 0x02e5, 0x010b }, /* cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */
|
||||
{ 0x02e6, 0x0109 }, /* ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */
|
||||
{ 0x02f5, 0x0121 }, /* gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */
|
||||
{ 0x02f8, 0x011d }, /* gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */
|
||||
{ 0x02fd, 0x016d }, /* ubreve ŭ LATIN SMALL LETTER U WITH BREVE */
|
||||
{ 0x02fe, 0x015d }, /* scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */
|
||||
{ 0x03a2, 0x0138 }, /* kra ĸ LATIN SMALL LETTER KRA */
|
||||
{ 0x03a3, 0x0156 }, /* Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */
|
||||
{ 0x03a5, 0x0128 }, /* Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */
|
||||
{ 0x03a6, 0x013b }, /* Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */
|
||||
{ 0x03aa, 0x0112 }, /* Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */
|
||||
{ 0x03ab, 0x0122 }, /* Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */
|
||||
{ 0x03ac, 0x0166 }, /* Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */
|
||||
{ 0x03b3, 0x0157 }, /* rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */
|
||||
{ 0x03b5, 0x0129 }, /* itilde ĩ LATIN SMALL LETTER I WITH TILDE */
|
||||
{ 0x03b6, 0x013c }, /* lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */
|
||||
{ 0x03ba, 0x0113 }, /* emacron ē LATIN SMALL LETTER E WITH MACRON */
|
||||
{ 0x03bb, 0x0123 }, /* gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */
|
||||
{ 0x03bc, 0x0167 }, /* tslash ŧ LATIN SMALL LETTER T WITH STROKE */
|
||||
{ 0x03bd, 0x014a }, /* ENG Ŋ LATIN CAPITAL LETTER ENG */
|
||||
{ 0x03bf, 0x014b }, /* eng ŋ LATIN SMALL LETTER ENG */
|
||||
{ 0x03c0, 0x0100 }, /* Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */
|
||||
{ 0x03c7, 0x012e }, /* Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */
|
||||
{ 0x03cc, 0x0116 }, /* Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */
|
||||
{ 0x03cf, 0x012a }, /* Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */
|
||||
{ 0x03d1, 0x0145 }, /* Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */
|
||||
{ 0x03d2, 0x014c }, /* Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */
|
||||
{ 0x03d3, 0x0136 }, /* Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */
|
||||
{ 0x03d9, 0x0172 }, /* Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */
|
||||
{ 0x03dd, 0x0168 }, /* Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */
|
||||
{ 0x03de, 0x016a }, /* Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */
|
||||
{ 0x03e0, 0x0101 }, /* amacron ā LATIN SMALL LETTER A WITH MACRON */
|
||||
{ 0x03e7, 0x012f }, /* iogonek į LATIN SMALL LETTER I WITH OGONEK */
|
||||
{ 0x03ec, 0x0117 }, /* eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */
|
||||
{ 0x03ef, 0x012b }, /* imacron ī LATIN SMALL LETTER I WITH MACRON */
|
||||
{ 0x03f1, 0x0146 }, /* ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */
|
||||
{ 0x03f2, 0x014d }, /* omacron ō LATIN SMALL LETTER O WITH MACRON */
|
||||
{ 0x03f3, 0x0137 }, /* kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */
|
||||
{ 0x03f9, 0x0173 }, /* uogonek ų LATIN SMALL LETTER U WITH OGONEK */
|
||||
{ 0x03fd, 0x0169 }, /* utilde ũ LATIN SMALL LETTER U WITH TILDE */
|
||||
{ 0x03fe, 0x016b }, /* umacron ū LATIN SMALL LETTER U WITH MACRON */
|
||||
{ 0x047e, 0x203e }, /* overline ‾ OVERLINE */
|
||||
{ 0x04a1, 0x3002 }, /* kana_fullstop 。 IDEOGRAPHIC FULL STOP */
|
||||
{ 0x04a2, 0x300c }, /* kana_openingbracket 「 LEFT CORNER BRACKET */
|
||||
{ 0x04a3, 0x300d }, /* kana_closingbracket 」 RIGHT CORNER BRACKET */
|
||||
{ 0x04a4, 0x3001 }, /* kana_comma 、 IDEOGRAPHIC COMMA */
|
||||
{ 0x04a5, 0x30fb }, /* kana_conjunctive ・ KATAKANA MIDDLE DOT */
|
||||
{ 0x04a6, 0x30f2 }, /* kana_WO ヲ KATAKANA LETTER WO */
|
||||
{ 0x04a7, 0x30a1 }, /* kana_a ァ KATAKANA LETTER SMALL A */
|
||||
{ 0x04a8, 0x30a3 }, /* kana_i ィ KATAKANA LETTER SMALL I */
|
||||
{ 0x04a9, 0x30a5 }, /* kana_u ゥ KATAKANA LETTER SMALL U */
|
||||
{ 0x04aa, 0x30a7 }, /* kana_e ェ KATAKANA LETTER SMALL E */
|
||||
{ 0x04ab, 0x30a9 }, /* kana_o ォ KATAKANA LETTER SMALL O */
|
||||
{ 0x04ac, 0x30e3 }, /* kana_ya ャ KATAKANA LETTER SMALL YA */
|
||||
{ 0x04ad, 0x30e5 }, /* kana_yu ュ KATAKANA LETTER SMALL YU */
|
||||
{ 0x04ae, 0x30e7 }, /* kana_yo ョ KATAKANA LETTER SMALL YO */
|
||||
{ 0x04af, 0x30c3 }, /* kana_tsu ッ KATAKANA LETTER SMALL TU */
|
||||
{ 0x04b0, 0x30fc }, /* prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */
|
||||
{ 0x04b1, 0x30a2 }, /* kana_A ア KATAKANA LETTER A */
|
||||
{ 0x04b2, 0x30a4 }, /* kana_I イ KATAKANA LETTER I */
|
||||
{ 0x04b3, 0x30a6 }, /* kana_U ウ KATAKANA LETTER U */
|
||||
{ 0x04b4, 0x30a8 }, /* kana_E エ KATAKANA LETTER E */
|
||||
{ 0x04b5, 0x30aa }, /* kana_O オ KATAKANA LETTER O */
|
||||
{ 0x04b6, 0x30ab }, /* kana_KA カ KATAKANA LETTER KA */
|
||||
{ 0x04b7, 0x30ad }, /* kana_KI キ KATAKANA LETTER KI */
|
||||
{ 0x04b8, 0x30af }, /* kana_KU ク KATAKANA LETTER KU */
|
||||
{ 0x04b9, 0x30b1 }, /* kana_KE ケ KATAKANA LETTER KE */
|
||||
{ 0x04ba, 0x30b3 }, /* kana_KO コ KATAKANA LETTER KO */
|
||||
{ 0x04bb, 0x30b5 }, /* kana_SA サ KATAKANA LETTER SA */
|
||||
{ 0x04bc, 0x30b7 }, /* kana_SHI シ KATAKANA LETTER SI */
|
||||
{ 0x04bd, 0x30b9 }, /* kana_SU ス KATAKANA LETTER SU */
|
||||
{ 0x04be, 0x30bb }, /* kana_SE セ KATAKANA LETTER SE */
|
||||
{ 0x04bf, 0x30bd }, /* kana_SO ソ KATAKANA LETTER SO */
|
||||
{ 0x04c0, 0x30bf }, /* kana_TA タ KATAKANA LETTER TA */
|
||||
{ 0x04c1, 0x30c1 }, /* kana_CHI チ KATAKANA LETTER TI */
|
||||
{ 0x04c2, 0x30c4 }, /* kana_TSU ツ KATAKANA LETTER TU */
|
||||
{ 0x04c3, 0x30c6 }, /* kana_TE テ KATAKANA LETTER TE */
|
||||
{ 0x04c4, 0x30c8 }, /* kana_TO ト KATAKANA LETTER TO */
|
||||
{ 0x04c5, 0x30ca }, /* kana_NA ナ KATAKANA LETTER NA */
|
||||
{ 0x04c6, 0x30cb }, /* kana_NI ニ KATAKANA LETTER NI */
|
||||
{ 0x04c7, 0x30cc }, /* kana_NU ヌ KATAKANA LETTER NU */
|
||||
{ 0x04c8, 0x30cd }, /* kana_NE ネ KATAKANA LETTER NE */
|
||||
{ 0x04c9, 0x30ce }, /* kana_NO ノ KATAKANA LETTER NO */
|
||||
{ 0x04ca, 0x30cf }, /* kana_HA ハ KATAKANA LETTER HA */
|
||||
{ 0x04cb, 0x30d2 }, /* kana_HI ヒ KATAKANA LETTER HI */
|
||||
{ 0x04cc, 0x30d5 }, /* kana_FU フ KATAKANA LETTER HU */
|
||||
{ 0x04cd, 0x30d8 }, /* kana_HE ヘ KATAKANA LETTER HE */
|
||||
{ 0x04ce, 0x30db }, /* kana_HO ホ KATAKANA LETTER HO */
|
||||
{ 0x04cf, 0x30de }, /* kana_MA マ KATAKANA LETTER MA */
|
||||
{ 0x04d0, 0x30df }, /* kana_MI ミ KATAKANA LETTER MI */
|
||||
{ 0x04d1, 0x30e0 }, /* kana_MU ム KATAKANA LETTER MU */
|
||||
{ 0x04d2, 0x30e1 }, /* kana_ME メ KATAKANA LETTER ME */
|
||||
{ 0x04d3, 0x30e2 }, /* kana_MO モ KATAKANA LETTER MO */
|
||||
{ 0x04d4, 0x30e4 }, /* kana_YA ヤ KATAKANA LETTER YA */
|
||||
{ 0x04d5, 0x30e6 }, /* kana_YU ユ KATAKANA LETTER YU */
|
||||
{ 0x04d6, 0x30e8 }, /* kana_YO ヨ KATAKANA LETTER YO */
|
||||
{ 0x04d7, 0x30e9 }, /* kana_RA ラ KATAKANA LETTER RA */
|
||||
{ 0x04d8, 0x30ea }, /* kana_RI リ KATAKANA LETTER RI */
|
||||
{ 0x04d9, 0x30eb }, /* kana_RU ル KATAKANA LETTER RU */
|
||||
{ 0x04da, 0x30ec }, /* kana_RE レ KATAKANA LETTER RE */
|
||||
{ 0x04db, 0x30ed }, /* kana_RO ロ KATAKANA LETTER RO */
|
||||
{ 0x04dc, 0x30ef }, /* kana_WA ワ KATAKANA LETTER WA */
|
||||
{ 0x04dd, 0x30f3 }, /* kana_N ン KATAKANA LETTER N */
|
||||
{ 0x04de, 0x309b }, /* voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */
|
||||
{ 0x04df, 0x309c }, /* semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
|
||||
{ 0x05ac, 0x060c }, /* Arabic_comma ، ARABIC COMMA */
|
||||
{ 0x05bb, 0x061b }, /* Arabic_semicolon ؛ ARABIC SEMICOLON */
|
||||
{ 0x05bf, 0x061f }, /* Arabic_question_mark ؟ ARABIC QUESTION MARK */
|
||||
{ 0x05c1, 0x0621 }, /* Arabic_hamza ء ARABIC LETTER HAMZA */
|
||||
{ 0x05c2, 0x0622 }, /* Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */
|
||||
{ 0x05c3, 0x0623 }, /* Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */
|
||||
{ 0x05c4, 0x0624 }, /* Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */
|
||||
{ 0x05c5, 0x0625 }, /* Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */
|
||||
{ 0x05c6, 0x0626 }, /* Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */
|
||||
{ 0x05c7, 0x0627 }, /* Arabic_alef ا ARABIC LETTER ALEF */
|
||||
{ 0x05c8, 0x0628 }, /* Arabic_beh ب ARABIC LETTER BEH */
|
||||
{ 0x05c9, 0x0629 }, /* Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */
|
||||
{ 0x05ca, 0x062a }, /* Arabic_teh ت ARABIC LETTER TEH */
|
||||
{ 0x05cb, 0x062b }, /* Arabic_theh ث ARABIC LETTER THEH */
|
||||
{ 0x05cc, 0x062c }, /* Arabic_jeem ج ARABIC LETTER JEEM */
|
||||
{ 0x05cd, 0x062d }, /* Arabic_hah ح ARABIC LETTER HAH */
|
||||
{ 0x05ce, 0x062e }, /* Arabic_khah خ ARABIC LETTER KHAH */
|
||||
{ 0x05cf, 0x062f }, /* Arabic_dal د ARABIC LETTER DAL */
|
||||
{ 0x05d0, 0x0630 }, /* Arabic_thal ذ ARABIC LETTER THAL */
|
||||
{ 0x05d1, 0x0631 }, /* Arabic_ra ر ARABIC LETTER REH */
|
||||
{ 0x05d2, 0x0632 }, /* Arabic_zain ز ARABIC LETTER ZAIN */
|
||||
{ 0x05d3, 0x0633 }, /* Arabic_seen س ARABIC LETTER SEEN */
|
||||
{ 0x05d4, 0x0634 }, /* Arabic_sheen ش ARABIC LETTER SHEEN */
|
||||
{ 0x05d5, 0x0635 }, /* Arabic_sad ص ARABIC LETTER SAD */
|
||||
{ 0x05d6, 0x0636 }, /* Arabic_dad ض ARABIC LETTER DAD */
|
||||
{ 0x05d7, 0x0637 }, /* Arabic_tah ط ARABIC LETTER TAH */
|
||||
{ 0x05d8, 0x0638 }, /* Arabic_zah ظ ARABIC LETTER ZAH */
|
||||
{ 0x05d9, 0x0639 }, /* Arabic_ain ع ARABIC LETTER AIN */
|
||||
{ 0x05da, 0x063a }, /* Arabic_ghain غ ARABIC LETTER GHAIN */
|
||||
{ 0x05e0, 0x0640 }, /* Arabic_tatweel ـ ARABIC TATWEEL */
|
||||
{ 0x05e1, 0x0641 }, /* Arabic_feh ف ARABIC LETTER FEH */
|
||||
{ 0x05e2, 0x0642 }, /* Arabic_qaf ق ARABIC LETTER QAF */
|
||||
{ 0x05e3, 0x0643 }, /* Arabic_kaf ك ARABIC LETTER KAF */
|
||||
{ 0x05e4, 0x0644 }, /* Arabic_lam ل ARABIC LETTER LAM */
|
||||
{ 0x05e5, 0x0645 }, /* Arabic_meem م ARABIC LETTER MEEM */
|
||||
{ 0x05e6, 0x0646 }, /* Arabic_noon ن ARABIC LETTER NOON */
|
||||
{ 0x05e7, 0x0647 }, /* Arabic_ha ه ARABIC LETTER HEH */
|
||||
{ 0x05e8, 0x0648 }, /* Arabic_waw و ARABIC LETTER WAW */
|
||||
{ 0x05e9, 0x0649 }, /* Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */
|
||||
{ 0x05ea, 0x064a }, /* Arabic_yeh ي ARABIC LETTER YEH */
|
||||
{ 0x05eb, 0x064b }, /* Arabic_fathatan ً ARABIC FATHATAN */
|
||||
{ 0x05ec, 0x064c }, /* Arabic_dammatan ٌ ARABIC DAMMATAN */
|
||||
{ 0x05ed, 0x064d }, /* Arabic_kasratan ٍ ARABIC KASRATAN */
|
||||
{ 0x05ee, 0x064e }, /* Arabic_fatha َ ARABIC FATHA */
|
||||
{ 0x05ef, 0x064f }, /* Arabic_damma ُ ARABIC DAMMA */
|
||||
{ 0x05f0, 0x0650 }, /* Arabic_kasra ِ ARABIC KASRA */
|
||||
{ 0x05f1, 0x0651 }, /* Arabic_shadda ّ ARABIC SHADDA */
|
||||
{ 0x05f2, 0x0652 }, /* Arabic_sukun ْ ARABIC SUKUN */
|
||||
{ 0x06a1, 0x0452 }, /* Serbian_dje ђ CYRILLIC SMALL LETTER DJE */
|
||||
{ 0x06a2, 0x0453 }, /* Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */
|
||||
{ 0x06a3, 0x0451 }, /* Cyrillic_io ё CYRILLIC SMALL LETTER IO */
|
||||
{ 0x06a4, 0x0454 }, /* Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */
|
||||
{ 0x06a5, 0x0455 }, /* Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */
|
||||
{ 0x06a6, 0x0456 }, /* Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
|
||||
{ 0x06a7, 0x0457 }, /* Ukrainian_yi ї CYRILLIC SMALL LETTER YI */
|
||||
{ 0x06a8, 0x0458 }, /* Cyrillic_je ј CYRILLIC SMALL LETTER JE */
|
||||
{ 0x06a9, 0x0459 }, /* Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */
|
||||
{ 0x06aa, 0x045a }, /* Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */
|
||||
{ 0x06ab, 0x045b }, /* Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */
|
||||
{ 0x06ac, 0x045c }, /* Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */
|
||||
{ 0x06ae, 0x045e }, /* Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */
|
||||
{ 0x06af, 0x045f }, /* Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */
|
||||
{ 0x06b0, 0x2116 }, /* numerosign № NUMERO SIGN */
|
||||
{ 0x06b1, 0x0402 }, /* Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */
|
||||
{ 0x06b2, 0x0403 }, /* Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */
|
||||
{ 0x06b3, 0x0401 }, /* Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */
|
||||
{ 0x06b4, 0x0404 }, /* Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */
|
||||
{ 0x06b5, 0x0405 }, /* Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */
|
||||
{ 0x06b6, 0x0406 }, /* Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
|
||||
{ 0x06b7, 0x0407 }, /* Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */
|
||||
{ 0x06b8, 0x0408 }, /* Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */
|
||||
{ 0x06b9, 0x0409 }, /* Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */
|
||||
{ 0x06ba, 0x040a }, /* Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */
|
||||
{ 0x06bb, 0x040b }, /* Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */
|
||||
{ 0x06bc, 0x040c }, /* Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */
|
||||
{ 0x06be, 0x040e }, /* Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */
|
||||
{ 0x06bf, 0x040f }, /* Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */
|
||||
{ 0x06c0, 0x044e }, /* Cyrillic_yu ю CYRILLIC SMALL LETTER YU */
|
||||
{ 0x06c1, 0x0430 }, /* Cyrillic_a а CYRILLIC SMALL LETTER A */
|
||||
{ 0x06c2, 0x0431 }, /* Cyrillic_be б CYRILLIC SMALL LETTER BE */
|
||||
{ 0x06c3, 0x0446 }, /* Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */
|
||||
{ 0x06c4, 0x0434 }, /* Cyrillic_de д CYRILLIC SMALL LETTER DE */
|
||||
{ 0x06c5, 0x0435 }, /* Cyrillic_ie е CYRILLIC SMALL LETTER IE */
|
||||
{ 0x06c6, 0x0444 }, /* Cyrillic_ef ф CYRILLIC SMALL LETTER EF */
|
||||
{ 0x06c7, 0x0433 }, /* Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */
|
||||
{ 0x06c8, 0x0445 }, /* Cyrillic_ha х CYRILLIC SMALL LETTER HA */
|
||||
{ 0x06c9, 0x0438 }, /* Cyrillic_i и CYRILLIC SMALL LETTER I */
|
||||
{ 0x06ca, 0x0439 }, /* Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */
|
||||
{ 0x06cb, 0x043a }, /* Cyrillic_ka к CYRILLIC SMALL LETTER KA */
|
||||
{ 0x06cc, 0x043b }, /* Cyrillic_el л CYRILLIC SMALL LETTER EL */
|
||||
{ 0x06cd, 0x043c }, /* Cyrillic_em м CYRILLIC SMALL LETTER EM */
|
||||
{ 0x06ce, 0x043d }, /* Cyrillic_en н CYRILLIC SMALL LETTER EN */
|
||||
{ 0x06cf, 0x043e }, /* Cyrillic_o о CYRILLIC SMALL LETTER O */
|
||||
{ 0x06d0, 0x043f }, /* Cyrillic_pe п CYRILLIC SMALL LETTER PE */
|
||||
{ 0x06d1, 0x044f }, /* Cyrillic_ya я CYRILLIC SMALL LETTER YA */
|
||||
{ 0x06d2, 0x0440 }, /* Cyrillic_er р CYRILLIC SMALL LETTER ER */
|
||||
{ 0x06d3, 0x0441 }, /* Cyrillic_es с CYRILLIC SMALL LETTER ES */
|
||||
{ 0x06d4, 0x0442 }, /* Cyrillic_te т CYRILLIC SMALL LETTER TE */
|
||||
{ 0x06d5, 0x0443 }, /* Cyrillic_u у CYRILLIC SMALL LETTER U */
|
||||
{ 0x06d6, 0x0436 }, /* Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */
|
||||
{ 0x06d7, 0x0432 }, /* Cyrillic_ve в CYRILLIC SMALL LETTER VE */
|
||||
{ 0x06d8, 0x044c }, /* Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */
|
||||
{ 0x06d9, 0x044b }, /* Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */
|
||||
{ 0x06da, 0x0437 }, /* Cyrillic_ze з CYRILLIC SMALL LETTER ZE */
|
||||
{ 0x06db, 0x0448 }, /* Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */
|
||||
{ 0x06dc, 0x044d }, /* Cyrillic_e э CYRILLIC SMALL LETTER E */
|
||||
{ 0x06dd, 0x0449 }, /* Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */
|
||||
{ 0x06de, 0x0447 }, /* Cyrillic_che ч CYRILLIC SMALL LETTER CHE */
|
||||
{ 0x06df, 0x044a }, /* Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */
|
||||
{ 0x06e0, 0x042e }, /* Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */
|
||||
{ 0x06e1, 0x0410 }, /* Cyrillic_A А CYRILLIC CAPITAL LETTER A */
|
||||
{ 0x06e2, 0x0411 }, /* Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */
|
||||
{ 0x06e3, 0x0426 }, /* Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */
|
||||
{ 0x06e4, 0x0414 }, /* Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */
|
||||
{ 0x06e5, 0x0415 }, /* Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */
|
||||
{ 0x06e6, 0x0424 }, /* Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */
|
||||
{ 0x06e7, 0x0413 }, /* Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */
|
||||
{ 0x06e8, 0x0425 }, /* Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */
|
||||
{ 0x06e9, 0x0418 }, /* Cyrillic_I И CYRILLIC CAPITAL LETTER I */
|
||||
{ 0x06ea, 0x0419 }, /* Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */
|
||||
{ 0x06eb, 0x041a }, /* Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */
|
||||
{ 0x06ec, 0x041b }, /* Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */
|
||||
{ 0x06ed, 0x041c }, /* Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */
|
||||
{ 0x06ee, 0x041d }, /* Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */
|
||||
{ 0x06ef, 0x041e }, /* Cyrillic_O О CYRILLIC CAPITAL LETTER O */
|
||||
{ 0x06f0, 0x041f }, /* Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */
|
||||
{ 0x06f1, 0x042f }, /* Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */
|
||||
{ 0x06f2, 0x0420 }, /* Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */
|
||||
{ 0x06f3, 0x0421 }, /* Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */
|
||||
{ 0x06f4, 0x0422 }, /* Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */
|
||||
{ 0x06f5, 0x0423 }, /* Cyrillic_U У CYRILLIC CAPITAL LETTER U */
|
||||
{ 0x06f6, 0x0416 }, /* Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */
|
||||
{ 0x06f7, 0x0412 }, /* Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */
|
||||
{ 0x06f8, 0x042c }, /* Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */
|
||||
{ 0x06f9, 0x042b }, /* Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */
|
||||
{ 0x06fa, 0x0417 }, /* Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */
|
||||
{ 0x06fb, 0x0428 }, /* Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */
|
||||
{ 0x06fc, 0x042d }, /* Cyrillic_E Э CYRILLIC CAPITAL LETTER E */
|
||||
{ 0x06fd, 0x0429 }, /* Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */
|
||||
{ 0x06fe, 0x0427 }, /* Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */
|
||||
{ 0x06ff, 0x042a }, /* Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */
|
||||
{ 0x07a1, 0x0386 }, /* Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */
|
||||
{ 0x07a2, 0x0388 }, /* Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
|
||||
{ 0x07a3, 0x0389 }, /* Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
|
||||
{ 0x07a4, 0x038a }, /* Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
|
||||
{ 0x07a5, 0x03aa }, /* Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
|
||||
{ 0x07a7, 0x038c }, /* Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
|
||||
{ 0x07a8, 0x038e }, /* Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */
|
||||
{ 0x07a9, 0x03ab }, /* Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
|
||||
{ 0x07ab, 0x038f }, /* Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */
|
||||
{ 0x07ae, 0x0385 }, /* Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */
|
||||
{ 0x07af, 0x2015 }, /* Greek_horizbar ― HORIZONTAL BAR */
|
||||
{ 0x07b1, 0x03ac }, /* Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
|
||||
{ 0x07b2, 0x03ad }, /* Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
|
||||
{ 0x07b3, 0x03ae }, /* Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */
|
||||
{ 0x07b4, 0x03af }, /* Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */
|
||||
{ 0x07b5, 0x03ca }, /* Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */
|
||||
{ 0x07b6, 0x0390 }, /* Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
|
||||
{ 0x07b7, 0x03cc }, /* Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */
|
||||
{ 0x07b8, 0x03cd }, /* Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */
|
||||
{ 0x07b9, 0x03cb }, /* Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
|
||||
{ 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
|
||||
{ 0x07bb, 0x03ce }, /* Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */
|
||||
{ 0x07c1, 0x0391 }, /* Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */
|
||||
{ 0x07c2, 0x0392 }, /* Greek_BETA Β GREEK CAPITAL LETTER BETA */
|
||||
{ 0x07c3, 0x0393 }, /* Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */
|
||||
{ 0x07c4, 0x0394 }, /* Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */
|
||||
{ 0x07c5, 0x0395 }, /* Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */
|
||||
{ 0x07c6, 0x0396 }, /* Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */
|
||||
{ 0x07c7, 0x0397 }, /* Greek_ETA Η GREEK CAPITAL LETTER ETA */
|
||||
{ 0x07c8, 0x0398 }, /* Greek_THETA Θ GREEK CAPITAL LETTER THETA */
|
||||
{ 0x07c9, 0x0399 }, /* Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */
|
||||
{ 0x07ca, 0x039a }, /* Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */
|
||||
{ 0x07cb, 0x039b }, /* Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */
|
||||
{ 0x07cc, 0x039c }, /* Greek_MU Μ GREEK CAPITAL LETTER MU */
|
||||
{ 0x07cd, 0x039d }, /* Greek_NU Ν GREEK CAPITAL LETTER NU */
|
||||
{ 0x07ce, 0x039e }, /* Greek_XI Ξ GREEK CAPITAL LETTER XI */
|
||||
{ 0x07cf, 0x039f }, /* Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */
|
||||
{ 0x07d0, 0x03a0 }, /* Greek_PI Π GREEK CAPITAL LETTER PI */
|
||||
{ 0x07d1, 0x03a1 }, /* Greek_RHO Ρ GREEK CAPITAL LETTER RHO */
|
||||
{ 0x07d2, 0x03a3 }, /* Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */
|
||||
{ 0x07d4, 0x03a4 }, /* Greek_TAU Τ GREEK CAPITAL LETTER TAU */
|
||||
{ 0x07d5, 0x03a5 }, /* Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */
|
||||
{ 0x07d6, 0x03a6 }, /* Greek_PHI Φ GREEK CAPITAL LETTER PHI */
|
||||
{ 0x07d7, 0x03a7 }, /* Greek_CHI Χ GREEK CAPITAL LETTER CHI */
|
||||
{ 0x07d8, 0x03a8 }, /* Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
|
||||
{ 0x07d9, 0x03a9 }, /* Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
|
||||
{ 0x07e1, 0x03b1 }, /* Greek_alpha α GREEK SMALL LETTER ALPHA */
|
||||
{ 0x07e2, 0x03b2 }, /* Greek_beta β GREEK SMALL LETTER BETA */
|
||||
{ 0x07e3, 0x03b3 }, /* Greek_gamma γ GREEK SMALL LETTER GAMMA */
|
||||
{ 0x07e4, 0x03b4 }, /* Greek_delta δ GREEK SMALL LETTER DELTA */
|
||||
{ 0x07e5, 0x03b5 }, /* Greek_epsilon ε GREEK SMALL LETTER EPSILON */
|
||||
{ 0x07e6, 0x03b6 }, /* Greek_zeta ζ GREEK SMALL LETTER ZETA */
|
||||
{ 0x07e7, 0x03b7 }, /* Greek_eta η GREEK SMALL LETTER ETA */
|
||||
{ 0x07e8, 0x03b8 }, /* Greek_theta θ GREEK SMALL LETTER THETA */
|
||||
{ 0x07e9, 0x03b9 }, /* Greek_iota ι GREEK SMALL LETTER IOTA */
|
||||
{ 0x07ea, 0x03ba }, /* Greek_kappa κ GREEK SMALL LETTER KAPPA */
|
||||
{ 0x07eb, 0x03bb }, /* Greek_lambda λ GREEK SMALL LETTER LAMDA */
|
||||
{ 0x07ec, 0x03bc }, /* Greek_mu μ GREEK SMALL LETTER MU */
|
||||
{ 0x07ed, 0x03bd }, /* Greek_nu ν GREEK SMALL LETTER NU */
|
||||
{ 0x07ee, 0x03be }, /* Greek_xi ξ GREEK SMALL LETTER XI */
|
||||
{ 0x07ef, 0x03bf }, /* Greek_omicron ο GREEK SMALL LETTER OMICRON */
|
||||
{ 0x07f0, 0x03c0 }, /* Greek_pi π GREEK SMALL LETTER PI */
|
||||
{ 0x07f1, 0x03c1 }, /* Greek_rho ρ GREEK SMALL LETTER RHO */
|
||||
{ 0x07f2, 0x03c3 }, /* Greek_sigma σ GREEK SMALL LETTER SIGMA */
|
||||
{ 0x07f3, 0x03c2 }, /* Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */
|
||||
{ 0x07f4, 0x03c4 }, /* Greek_tau τ GREEK SMALL LETTER TAU */
|
||||
{ 0x07f5, 0x03c5 }, /* Greek_upsilon υ GREEK SMALL LETTER UPSILON */
|
||||
{ 0x07f6, 0x03c6 }, /* Greek_phi φ GREEK SMALL LETTER PHI */
|
||||
{ 0x07f7, 0x03c7 }, /* Greek_chi χ GREEK SMALL LETTER CHI */
|
||||
{ 0x07f8, 0x03c8 }, /* Greek_psi ψ GREEK SMALL LETTER PSI */
|
||||
{ 0x07f9, 0x03c9 }, /* Greek_omega ω GREEK SMALL LETTER OMEGA */
|
||||
{ 0x08a1, 0x23b7 }, /* leftradical ⎷ ??? */
|
||||
{ 0x08a2, 0x250c }, /* topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
|
||||
{ 0x08a3, 0x2500 }, /* horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */
|
||||
{ 0x08a4, 0x2320 }, /* topintegral ⌠ TOP HALF INTEGRAL */
|
||||
{ 0x08a5, 0x2321 }, /* botintegral ⌡ BOTTOM HALF INTEGRAL */
|
||||
{ 0x08a6, 0x2502 }, /* vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
|
||||
{ 0x08a7, 0x23a1 }, /* topleftsqbracket ⎡ ??? */
|
||||
{ 0x08a8, 0x23a3 }, /* botleftsqbracket ⎣ ??? */
|
||||
{ 0x08a9, 0x23a4 }, /* toprightsqbracket ⎤ ??? */
|
||||
{ 0x08aa, 0x23a6 }, /* botrightsqbracket ⎦ ??? */
|
||||
{ 0x08ab, 0x239b }, /* topleftparens ⎛ ??? */
|
||||
{ 0x08ac, 0x239d }, /* botleftparens ⎝ ??? */
|
||||
{ 0x08ad, 0x239e }, /* toprightparens ⎞ ??? */
|
||||
{ 0x08ae, 0x23a0 }, /* botrightparens ⎠ ??? */
|
||||
{ 0x08af, 0x23a8 }, /* leftmiddlecurlybrace ⎨ ??? */
|
||||
{ 0x08b0, 0x23ac }, /* rightmiddlecurlybrace ⎬ ??? */
|
||||
/* 0x08b1 topleftsummation ? ??? */
|
||||
/* 0x08b2 botleftsummation ? ??? */
|
||||
/* 0x08b3 topvertsummationconnector ? ??? */
|
||||
/* 0x08b4 botvertsummationconnector ? ??? */
|
||||
/* 0x08b5 toprightsummation ? ??? */
|
||||
/* 0x08b6 botrightsummation ? ??? */
|
||||
/* 0x08b7 rightmiddlesummation ? ??? */
|
||||
{ 0x08bc, 0x2264 }, /* lessthanequal ≤ LESS-THAN OR EQUAL TO */
|
||||
{ 0x08bd, 0x2260 }, /* notequal ≠ NOT EQUAL TO */
|
||||
{ 0x08be, 0x2265 }, /* greaterthanequal ≥ GREATER-THAN OR EQUAL TO */
|
||||
{ 0x08bf, 0x222b }, /* integral ∫ INTEGRAL */
|
||||
{ 0x08c0, 0x2234 }, /* therefore ∴ THEREFORE */
|
||||
{ 0x08c1, 0x221d }, /* variation ∝ PROPORTIONAL TO */
|
||||
{ 0x08c2, 0x221e }, /* infinity ∞ INFINITY */
|
||||
{ 0x08c5, 0x2207 }, /* nabla ∇ NABLA */
|
||||
{ 0x08c8, 0x223c }, /* approximate ∼ TILDE OPERATOR */
|
||||
{ 0x08c9, 0x2243 }, /* similarequal ≃ ASYMPTOTICALLY EQUAL TO */
|
||||
{ 0x08cd, 0x21d4 }, /* ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
|
||||
{ 0x08ce, 0x21d2 }, /* implies ⇒ RIGHTWARDS DOUBLE ARROW */
|
||||
{ 0x08cf, 0x2261 }, /* identical ≡ IDENTICAL TO */
|
||||
{ 0x08d6, 0x221a }, /* radical √ SQUARE ROOT */
|
||||
{ 0x08da, 0x2282 }, /* includedin ⊂ SUBSET OF */
|
||||
{ 0x08db, 0x2283 }, /* includes ⊃ SUPERSET OF */
|
||||
{ 0x08dc, 0x2229 }, /* intersection ∩ INTERSECTION */
|
||||
{ 0x08dd, 0x222a }, /* union ∪ UNION */
|
||||
{ 0x08de, 0x2227 }, /* logicaland ∧ LOGICAL AND */
|
||||
{ 0x08df, 0x2228 }, /* logicalor ∨ LOGICAL OR */
|
||||
{ 0x08ef, 0x2202 }, /* partialderivative ∂ PARTIAL DIFFERENTIAL */
|
||||
{ 0x08f6, 0x0192 }, /* function ƒ LATIN SMALL LETTER F WITH HOOK */
|
||||
{ 0x08fb, 0x2190 }, /* leftarrow ← LEFTWARDS ARROW */
|
||||
{ 0x08fc, 0x2191 }, /* uparrow ↑ UPWARDS ARROW */
|
||||
{ 0x08fd, 0x2192 }, /* rightarrow → RIGHTWARDS ARROW */
|
||||
{ 0x08fe, 0x2193 }, /* downarrow ↓ DOWNWARDS ARROW */
|
||||
/* 0x09df blank ? ??? */
|
||||
{ 0x09e0, 0x25c6 }, /* soliddiamond ◆ BLACK DIAMOND */
|
||||
{ 0x09e1, 0x2592 }, /* checkerboard ▒ MEDIUM SHADE */
|
||||
{ 0x09e2, 0x2409 }, /* ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
|
||||
{ 0x09e3, 0x240c }, /* ff ␌ SYMBOL FOR FORM FEED */
|
||||
{ 0x09e4, 0x240d }, /* cr ␍ SYMBOL FOR CARRIAGE RETURN */
|
||||
{ 0x09e5, 0x240a }, /* lf ␊ SYMBOL FOR LINE FEED */
|
||||
{ 0x09e8, 0x2424 }, /* nl  SYMBOL FOR NEWLINE */
|
||||
{ 0x09e9, 0x240b }, /* vt ␋ SYMBOL FOR VERTICAL TABULATION */
|
||||
{ 0x09ea, 0x2518 }, /* lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */
|
||||
{ 0x09eb, 0x2510 }, /* uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */
|
||||
{ 0x09ec, 0x250c }, /* upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
|
||||
{ 0x09ed, 0x2514 }, /* lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
|
||||
{ 0x09ee, 0x253c }, /* crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
|
||||
{ 0x09ef, 0x23ba }, /* horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */
|
||||
{ 0x09f0, 0x23bb }, /* horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */
|
||||
{ 0x09f1, 0x2500 }, /* horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
|
||||
{ 0x09f2, 0x23bc }, /* horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
|
||||
{ 0x09f3, 0x23bd }, /* horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
|
||||
{ 0x09f4, 0x251c }, /* leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
|
||||
{ 0x09f5, 0x2524 }, /* rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
|
||||
{ 0x09f6, 0x2534 }, /* bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
|
||||
{ 0x09f7, 0x252c }, /* topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
|
||||
{ 0x09f8, 0x2502 }, /* vertbar │ BOX DRAWINGS LIGHT VERTICAL */
|
||||
{ 0x0aa1, 0x2003 }, /* emspace EM SPACE */
|
||||
{ 0x0aa2, 0x2002 }, /* enspace EN SPACE */
|
||||
{ 0x0aa3, 0x2004 }, /* em3space THREE-PER-EM SPACE */
|
||||
{ 0x0aa4, 0x2005 }, /* em4space FOUR-PER-EM SPACE */
|
||||
{ 0x0aa5, 0x2007 }, /* digitspace FIGURE SPACE */
|
||||
{ 0x0aa6, 0x2008 }, /* punctspace PUNCTUATION SPACE */
|
||||
{ 0x0aa7, 0x2009 }, /* thinspace THIN SPACE */
|
||||
{ 0x0aa8, 0x200a }, /* hairspace HAIR SPACE */
|
||||
{ 0x0aa9, 0x2014 }, /* emdash — EM DASH */
|
||||
{ 0x0aaa, 0x2013 }, /* endash – EN DASH */
|
||||
/* 0x0aac signifblank ? ??? */
|
||||
{ 0x0aae, 0x2026 }, /* ellipsis … HORIZONTAL ELLIPSIS */
|
||||
{ 0x0aaf, 0x2025 }, /* doubbaselinedot ‥ TWO DOT LEADER */
|
||||
{ 0x0ab0, 0x2153 }, /* onethird ⅓ VULGAR FRACTION ONE THIRD */
|
||||
{ 0x0ab1, 0x2154 }, /* twothirds ⅔ VULGAR FRACTION TWO THIRDS */
|
||||
{ 0x0ab2, 0x2155 }, /* onefifth ⅕ VULGAR FRACTION ONE FIFTH */
|
||||
{ 0x0ab3, 0x2156 }, /* twofifths ⅖ VULGAR FRACTION TWO FIFTHS */
|
||||
{ 0x0ab4, 0x2157 }, /* threefifths ⅗ VULGAR FRACTION THREE FIFTHS */
|
||||
{ 0x0ab5, 0x2158 }, /* fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */
|
||||
{ 0x0ab6, 0x2159 }, /* onesixth ⅙ VULGAR FRACTION ONE SIXTH */
|
||||
{ 0x0ab7, 0x215a }, /* fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */
|
||||
{ 0x0ab8, 0x2105 }, /* careof ℅ CARE OF */
|
||||
{ 0x0abb, 0x2012 }, /* figdash ‒ FIGURE DASH */
|
||||
{ 0x0abc, 0x2329 }, /* leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
|
||||
/* 0x0abd decimalpoint ? ??? */
|
||||
{ 0x0abe, 0x232a }, /* rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
|
||||
/* 0x0abf marker ? ??? */
|
||||
{ 0x0ac3, 0x215b }, /* oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */
|
||||
{ 0x0ac4, 0x215c }, /* threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
|
||||
{ 0x0ac5, 0x215d }, /* fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */
|
||||
{ 0x0ac6, 0x215e }, /* seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */
|
||||
{ 0x0ac9, 0x2122 }, /* trademark ™ TRADE MARK SIGN */
|
||||
{ 0x0aca, 0x2613 }, /* signaturemark ☓ SALTIRE */
|
||||
/* 0x0acb trademarkincircle ? ??? */
|
||||
{ 0x0acc, 0x25c1 }, /* leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */
|
||||
{ 0x0acd, 0x25b7 }, /* rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */
|
||||
{ 0x0ace, 0x25cb }, /* emopencircle ○ WHITE CIRCLE */
|
||||
{ 0x0acf, 0x25af }, /* emopenrectangle ▯ WHITE VERTICAL RECTANGLE */
|
||||
{ 0x0ad0, 0x2018 }, /* leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
|
||||
{ 0x0ad1, 0x2019 }, /* rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
|
||||
{ 0x0ad2, 0x201c }, /* leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
|
||||
{ 0x0ad3, 0x201d }, /* rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */
|
||||
{ 0x0ad4, 0x211e }, /* prescription ℞ PRESCRIPTION TAKE */
|
||||
{ 0x0ad6, 0x2032 }, /* minutes ′ PRIME */
|
||||
{ 0x0ad7, 0x2033 }, /* seconds ″ DOUBLE PRIME */
|
||||
{ 0x0ad9, 0x271d }, /* latincross ✝ LATIN CROSS */
|
||||
/* 0x0ada hexagram ? ??? */
|
||||
{ 0x0adb, 0x25ac }, /* filledrectbullet ▬ BLACK RECTANGLE */
|
||||
{ 0x0adc, 0x25c0 }, /* filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */
|
||||
{ 0x0add, 0x25b6 }, /* filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
|
||||
{ 0x0ade, 0x25cf }, /* emfilledcircle ● BLACK CIRCLE */
|
||||
{ 0x0adf, 0x25ae }, /* emfilledrect ▮ BLACK VERTICAL RECTANGLE */
|
||||
{ 0x0ae0, 0x25e6 }, /* enopencircbullet ◦ WHITE BULLET */
|
||||
{ 0x0ae1, 0x25ab }, /* enopensquarebullet ▫ WHITE SMALL SQUARE */
|
||||
{ 0x0ae2, 0x25ad }, /* openrectbullet ▭ WHITE RECTANGLE */
|
||||
{ 0x0ae3, 0x25b3 }, /* opentribulletup △ WHITE UP-POINTING TRIANGLE */
|
||||
{ 0x0ae4, 0x25bd }, /* opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */
|
||||
{ 0x0ae5, 0x2606 }, /* openstar ☆ WHITE STAR */
|
||||
{ 0x0ae6, 0x2022 }, /* enfilledcircbullet • BULLET */
|
||||
{ 0x0ae7, 0x25aa }, /* enfilledsqbullet ▪ BLACK SMALL SQUARE */
|
||||
{ 0x0ae8, 0x25b2 }, /* filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */
|
||||
{ 0x0ae9, 0x25bc }, /* filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */
|
||||
{ 0x0aea, 0x261c }, /* leftpointer ☜ WHITE LEFT POINTING INDEX */
|
||||
{ 0x0aeb, 0x261e }, /* rightpointer ☞ WHITE RIGHT POINTING INDEX */
|
||||
{ 0x0aec, 0x2663 }, /* club ♣ BLACK CLUB SUIT */
|
||||
{ 0x0aed, 0x2666 }, /* diamond ♦ BLACK DIAMOND SUIT */
|
||||
{ 0x0aee, 0x2665 }, /* heart ♥ BLACK HEART SUIT */
|
||||
{ 0x0af0, 0x2720 }, /* maltesecross ✠ MALTESE CROSS */
|
||||
{ 0x0af1, 0x2020 }, /* dagger † DAGGER */
|
||||
{ 0x0af2, 0x2021 }, /* doubledagger ‡ DOUBLE DAGGER */
|
||||
{ 0x0af3, 0x2713 }, /* checkmark ✓ CHECK MARK */
|
||||
{ 0x0af4, 0x2717 }, /* ballotcross ✗ BALLOT X */
|
||||
{ 0x0af5, 0x266f }, /* musicalsharp ♯ MUSIC SHARP SIGN */
|
||||
{ 0x0af6, 0x266d }, /* musicalflat ♭ MUSIC FLAT SIGN */
|
||||
{ 0x0af7, 0x2642 }, /* malesymbol ♂ MALE SIGN */
|
||||
{ 0x0af8, 0x2640 }, /* femalesymbol ♀ FEMALE SIGN */
|
||||
{ 0x0af9, 0x260e }, /* telephone ☎ BLACK TELEPHONE */
|
||||
{ 0x0afa, 0x2315 }, /* telephonerecorder ⌕ TELEPHONE RECORDER */
|
||||
{ 0x0afb, 0x2117 }, /* phonographcopyright ℗ SOUND RECORDING COPYRIGHT */
|
||||
{ 0x0afc, 0x2038 }, /* caret ‸ CARET */
|
||||
{ 0x0afd, 0x201a }, /* singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */
|
||||
{ 0x0afe, 0x201e }, /* doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */
|
||||
/* 0x0aff cursor ? ??? */
|
||||
{ 0x0ba3, 0x003c }, /* leftcaret < LESS-THAN SIGN */
|
||||
{ 0x0ba6, 0x003e }, /* rightcaret > GREATER-THAN SIGN */
|
||||
{ 0x0ba8, 0x2228 }, /* downcaret ∨ LOGICAL OR */
|
||||
{ 0x0ba9, 0x2227 }, /* upcaret ∧ LOGICAL AND */
|
||||
{ 0x0bc0, 0x00af }, /* overbar ¯ MACRON */
|
||||
{ 0x0bc2, 0x22a5 }, /* downtack ⊥ UP TACK */
|
||||
{ 0x0bc3, 0x2229 }, /* upshoe ∩ INTERSECTION */
|
||||
{ 0x0bc4, 0x230a }, /* downstile ⌊ LEFT FLOOR */
|
||||
{ 0x0bc6, 0x005f }, /* underbar _ LOW LINE */
|
||||
{ 0x0bca, 0x2218 }, /* jot ∘ RING OPERATOR */
|
||||
{ 0x0bcc, 0x2395 }, /* quad ⎕ APL FUNCTIONAL SYMBOL QUAD */
|
||||
{ 0x0bce, 0x22a4 }, /* uptack ⊤ DOWN TACK */
|
||||
{ 0x0bcf, 0x25cb }, /* circle ○ WHITE CIRCLE */
|
||||
{ 0x0bd3, 0x2308 }, /* upstile ⌈ LEFT CEILING */
|
||||
{ 0x0bd6, 0x222a }, /* downshoe ∪ UNION */
|
||||
{ 0x0bd8, 0x2283 }, /* rightshoe ⊃ SUPERSET OF */
|
||||
{ 0x0bda, 0x2282 }, /* leftshoe ⊂ SUBSET OF */
|
||||
{ 0x0bdc, 0x22a2 }, /* lefttack ⊢ RIGHT TACK */
|
||||
{ 0x0bfc, 0x22a3 }, /* righttack ⊣ LEFT TACK */
|
||||
{ 0x0cdf, 0x2017 }, /* hebrew_doublelowline ‗ DOUBLE LOW LINE */
|
||||
{ 0x0ce0, 0x05d0 }, /* hebrew_aleph א HEBREW LETTER ALEF */
|
||||
{ 0x0ce1, 0x05d1 }, /* hebrew_bet ב HEBREW LETTER BET */
|
||||
{ 0x0ce2, 0x05d2 }, /* hebrew_gimel ג HEBREW LETTER GIMEL */
|
||||
{ 0x0ce3, 0x05d3 }, /* hebrew_dalet ד HEBREW LETTER DALET */
|
||||
{ 0x0ce4, 0x05d4 }, /* hebrew_he ה HEBREW LETTER HE */
|
||||
{ 0x0ce5, 0x05d5 }, /* hebrew_waw ו HEBREW LETTER VAV */
|
||||
{ 0x0ce6, 0x05d6 }, /* hebrew_zain ז HEBREW LETTER ZAYIN */
|
||||
{ 0x0ce7, 0x05d7 }, /* hebrew_chet ח HEBREW LETTER HET */
|
||||
{ 0x0ce8, 0x05d8 }, /* hebrew_tet ט HEBREW LETTER TET */
|
||||
{ 0x0ce9, 0x05d9 }, /* hebrew_yod י HEBREW LETTER YOD */
|
||||
{ 0x0cea, 0x05da }, /* hebrew_finalkaph ך HEBREW LETTER FINAL KAF */
|
||||
{ 0x0ceb, 0x05db }, /* hebrew_kaph כ HEBREW LETTER KAF */
|
||||
{ 0x0cec, 0x05dc }, /* hebrew_lamed ל HEBREW LETTER LAMED */
|
||||
{ 0x0ced, 0x05dd }, /* hebrew_finalmem ם HEBREW LETTER FINAL MEM */
|
||||
{ 0x0cee, 0x05de }, /* hebrew_mem מ HEBREW LETTER MEM */
|
||||
{ 0x0cef, 0x05df }, /* hebrew_finalnun ן HEBREW LETTER FINAL NUN */
|
||||
{ 0x0cf0, 0x05e0 }, /* hebrew_nun נ HEBREW LETTER NUN */
|
||||
{ 0x0cf1, 0x05e1 }, /* hebrew_samech ס HEBREW LETTER SAMEKH */
|
||||
{ 0x0cf2, 0x05e2 }, /* hebrew_ayin ע HEBREW LETTER AYIN */
|
||||
{ 0x0cf3, 0x05e3 }, /* hebrew_finalpe ף HEBREW LETTER FINAL PE */
|
||||
{ 0x0cf4, 0x05e4 }, /* hebrew_pe פ HEBREW LETTER PE */
|
||||
{ 0x0cf5, 0x05e5 }, /* hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */
|
||||
{ 0x0cf6, 0x05e6 }, /* hebrew_zade צ HEBREW LETTER TSADI */
|
||||
{ 0x0cf7, 0x05e7 }, /* hebrew_qoph ק HEBREW LETTER QOF */
|
||||
{ 0x0cf8, 0x05e8 }, /* hebrew_resh ר HEBREW LETTER RESH */
|
||||
{ 0x0cf9, 0x05e9 }, /* hebrew_shin ש HEBREW LETTER SHIN */
|
||||
{ 0x0cfa, 0x05ea }, /* hebrew_taw ת HEBREW LETTER TAV */
|
||||
{ 0x0da1, 0x0e01 }, /* Thai_kokai ก THAI CHARACTER KO KAI */
|
||||
{ 0x0da2, 0x0e02 }, /* Thai_khokhai ข THAI CHARACTER KHO KHAI */
|
||||
{ 0x0da3, 0x0e03 }, /* Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */
|
||||
{ 0x0da4, 0x0e04 }, /* Thai_khokhwai ค THAI CHARACTER KHO KHWAI */
|
||||
{ 0x0da5, 0x0e05 }, /* Thai_khokhon ฅ THAI CHARACTER KHO KHON */
|
||||
{ 0x0da6, 0x0e06 }, /* Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */
|
||||
{ 0x0da7, 0x0e07 }, /* Thai_ngongu ง THAI CHARACTER NGO NGU */
|
||||
{ 0x0da8, 0x0e08 }, /* Thai_chochan จ THAI CHARACTER CHO CHAN */
|
||||
{ 0x0da9, 0x0e09 }, /* Thai_choching ฉ THAI CHARACTER CHO CHING */
|
||||
{ 0x0daa, 0x0e0a }, /* Thai_chochang ช THAI CHARACTER CHO CHANG */
|
||||
{ 0x0dab, 0x0e0b }, /* Thai_soso ซ THAI CHARACTER SO SO */
|
||||
{ 0x0dac, 0x0e0c }, /* Thai_chochoe ฌ THAI CHARACTER CHO CHOE */
|
||||
{ 0x0dad, 0x0e0d }, /* Thai_yoying ญ THAI CHARACTER YO YING */
|
||||
{ 0x0dae, 0x0e0e }, /* Thai_dochada ฎ THAI CHARACTER DO CHADA */
|
||||
{ 0x0daf, 0x0e0f }, /* Thai_topatak ฏ THAI CHARACTER TO PATAK */
|
||||
{ 0x0db0, 0x0e10 }, /* Thai_thothan ฐ THAI CHARACTER THO THAN */
|
||||
{ 0x0db1, 0x0e11 }, /* Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */
|
||||
{ 0x0db2, 0x0e12 }, /* Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */
|
||||
{ 0x0db3, 0x0e13 }, /* Thai_nonen ณ THAI CHARACTER NO NEN */
|
||||
{ 0x0db4, 0x0e14 }, /* Thai_dodek ด THAI CHARACTER DO DEK */
|
||||
{ 0x0db5, 0x0e15 }, /* Thai_totao ต THAI CHARACTER TO TAO */
|
||||
{ 0x0db6, 0x0e16 }, /* Thai_thothung ถ THAI CHARACTER THO THUNG */
|
||||
{ 0x0db7, 0x0e17 }, /* Thai_thothahan ท THAI CHARACTER THO THAHAN */
|
||||
{ 0x0db8, 0x0e18 }, /* Thai_thothong ธ THAI CHARACTER THO THONG */
|
||||
{ 0x0db9, 0x0e19 }, /* Thai_nonu น THAI CHARACTER NO NU */
|
||||
{ 0x0dba, 0x0e1a }, /* Thai_bobaimai บ THAI CHARACTER BO BAIMAI */
|
||||
{ 0x0dbb, 0x0e1b }, /* Thai_popla ป THAI CHARACTER PO PLA */
|
||||
{ 0x0dbc, 0x0e1c }, /* Thai_phophung ผ THAI CHARACTER PHO PHUNG */
|
||||
{ 0x0dbd, 0x0e1d }, /* Thai_fofa ฝ THAI CHARACTER FO FA */
|
||||
{ 0x0dbe, 0x0e1e }, /* Thai_phophan พ THAI CHARACTER PHO PHAN */
|
||||
{ 0x0dbf, 0x0e1f }, /* Thai_fofan ฟ THAI CHARACTER FO FAN */
|
||||
{ 0x0dc0, 0x0e20 }, /* Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */
|
||||
{ 0x0dc1, 0x0e21 }, /* Thai_moma ม THAI CHARACTER MO MA */
|
||||
{ 0x0dc2, 0x0e22 }, /* Thai_yoyak ย THAI CHARACTER YO YAK */
|
||||
{ 0x0dc3, 0x0e23 }, /* Thai_rorua ร THAI CHARACTER RO RUA */
|
||||
{ 0x0dc4, 0x0e24 }, /* Thai_ru ฤ THAI CHARACTER RU */
|
||||
{ 0x0dc5, 0x0e25 }, /* Thai_loling ล THAI CHARACTER LO LING */
|
||||
{ 0x0dc6, 0x0e26 }, /* Thai_lu ฦ THAI CHARACTER LU */
|
||||
{ 0x0dc7, 0x0e27 }, /* Thai_wowaen ว THAI CHARACTER WO WAEN */
|
||||
{ 0x0dc8, 0x0e28 }, /* Thai_sosala ศ THAI CHARACTER SO SALA */
|
||||
{ 0x0dc9, 0x0e29 }, /* Thai_sorusi ษ THAI CHARACTER SO RUSI */
|
||||
{ 0x0dca, 0x0e2a }, /* Thai_sosua ส THAI CHARACTER SO SUA */
|
||||
{ 0x0dcb, 0x0e2b }, /* Thai_hohip ห THAI CHARACTER HO HIP */
|
||||
{ 0x0dcc, 0x0e2c }, /* Thai_lochula ฬ THAI CHARACTER LO CHULA */
|
||||
{ 0x0dcd, 0x0e2d }, /* Thai_oang อ THAI CHARACTER O ANG */
|
||||
{ 0x0dce, 0x0e2e }, /* Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */
|
||||
{ 0x0dcf, 0x0e2f }, /* Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */
|
||||
{ 0x0dd0, 0x0e30 }, /* Thai_saraa ะ THAI CHARACTER SARA A */
|
||||
{ 0x0dd1, 0x0e31 }, /* Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */
|
||||
{ 0x0dd2, 0x0e32 }, /* Thai_saraaa า THAI CHARACTER SARA AA */
|
||||
{ 0x0dd3, 0x0e33 }, /* Thai_saraam ำ THAI CHARACTER SARA AM */
|
||||
{ 0x0dd4, 0x0e34 }, /* Thai_sarai ิ THAI CHARACTER SARA I */
|
||||
{ 0x0dd5, 0x0e35 }, /* Thai_saraii ี THAI CHARACTER SARA II */
|
||||
{ 0x0dd6, 0x0e36 }, /* Thai_saraue ึ THAI CHARACTER SARA UE */
|
||||
{ 0x0dd7, 0x0e37 }, /* Thai_sarauee ื THAI CHARACTER SARA UEE */
|
||||
{ 0x0dd8, 0x0e38 }, /* Thai_sarau ุ THAI CHARACTER SARA U */
|
||||
{ 0x0dd9, 0x0e39 }, /* Thai_sarauu ู THAI CHARACTER SARA UU */
|
||||
{ 0x0dda, 0x0e3a }, /* Thai_phinthu ฺ THAI CHARACTER PHINTHU */
|
||||
/* 0x0dde Thai_maihanakat_maitho ? ??? */
|
||||
{ 0x0ddf, 0x0e3f }, /* Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */
|
||||
{ 0x0de0, 0x0e40 }, /* Thai_sarae เ THAI CHARACTER SARA E */
|
||||
{ 0x0de1, 0x0e41 }, /* Thai_saraae แ THAI CHARACTER SARA AE */
|
||||
{ 0x0de2, 0x0e42 }, /* Thai_sarao โ THAI CHARACTER SARA O */
|
||||
{ 0x0de3, 0x0e43 }, /* Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */
|
||||
{ 0x0de4, 0x0e44 }, /* Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */
|
||||
{ 0x0de5, 0x0e45 }, /* Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */
|
||||
{ 0x0de6, 0x0e46 }, /* Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */
|
||||
{ 0x0de7, 0x0e47 }, /* Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */
|
||||
{ 0x0de8, 0x0e48 }, /* Thai_maiek ่ THAI CHARACTER MAI EK */
|
||||
{ 0x0de9, 0x0e49 }, /* Thai_maitho ้ THAI CHARACTER MAI THO */
|
||||
{ 0x0dea, 0x0e4a }, /* Thai_maitri ๊ THAI CHARACTER MAI TRI */
|
||||
{ 0x0deb, 0x0e4b }, /* Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */
|
||||
{ 0x0dec, 0x0e4c }, /* Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */
|
||||
{ 0x0ded, 0x0e4d }, /* Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */
|
||||
{ 0x0df0, 0x0e50 }, /* Thai_leksun ๐ THAI DIGIT ZERO */
|
||||
{ 0x0df1, 0x0e51 }, /* Thai_leknung ๑ THAI DIGIT ONE */
|
||||
{ 0x0df2, 0x0e52 }, /* Thai_leksong ๒ THAI DIGIT TWO */
|
||||
{ 0x0df3, 0x0e53 }, /* Thai_leksam ๓ THAI DIGIT THREE */
|
||||
{ 0x0df4, 0x0e54 }, /* Thai_leksi ๔ THAI DIGIT FOUR */
|
||||
{ 0x0df5, 0x0e55 }, /* Thai_lekha ๕ THAI DIGIT FIVE */
|
||||
{ 0x0df6, 0x0e56 }, /* Thai_lekhok ๖ THAI DIGIT SIX */
|
||||
{ 0x0df7, 0x0e57 }, /* Thai_lekchet ๗ THAI DIGIT SEVEN */
|
||||
{ 0x0df8, 0x0e58 }, /* Thai_lekpaet ๘ THAI DIGIT EIGHT */
|
||||
{ 0x0df9, 0x0e59 }, /* Thai_lekkao ๙ THAI DIGIT NINE */
|
||||
{ 0x0ea1, 0x3131 }, /* Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */
|
||||
{ 0x0ea2, 0x3132 }, /* Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */
|
||||
{ 0x0ea3, 0x3133 }, /* Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */
|
||||
{ 0x0ea4, 0x3134 }, /* Hangul_Nieun ㄴ HANGUL LETTER NIEUN */
|
||||
{ 0x0ea5, 0x3135 }, /* Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */
|
||||
{ 0x0ea6, 0x3136 }, /* Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */
|
||||
{ 0x0ea7, 0x3137 }, /* Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */
|
||||
{ 0x0ea8, 0x3138 }, /* Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */
|
||||
{ 0x0ea9, 0x3139 }, /* Hangul_Rieul ㄹ HANGUL LETTER RIEUL */
|
||||
{ 0x0eaa, 0x313a }, /* Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */
|
||||
{ 0x0eab, 0x313b }, /* Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */
|
||||
{ 0x0eac, 0x313c }, /* Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */
|
||||
{ 0x0ead, 0x313d }, /* Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */
|
||||
{ 0x0eae, 0x313e }, /* Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */
|
||||
{ 0x0eaf, 0x313f }, /* Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */
|
||||
{ 0x0eb0, 0x3140 }, /* Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */
|
||||
{ 0x0eb1, 0x3141 }, /* Hangul_Mieum ㅁ HANGUL LETTER MIEUM */
|
||||
{ 0x0eb2, 0x3142 }, /* Hangul_Pieub ㅂ HANGUL LETTER PIEUP */
|
||||
{ 0x0eb3, 0x3143 }, /* Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */
|
||||
{ 0x0eb4, 0x3144 }, /* Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */
|
||||
{ 0x0eb5, 0x3145 }, /* Hangul_Sios ㅅ HANGUL LETTER SIOS */
|
||||
{ 0x0eb6, 0x3146 }, /* Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */
|
||||
{ 0x0eb7, 0x3147 }, /* Hangul_Ieung ㅇ HANGUL LETTER IEUNG */
|
||||
{ 0x0eb8, 0x3148 }, /* Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */
|
||||
{ 0x0eb9, 0x3149 }, /* Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */
|
||||
{ 0x0eba, 0x314a }, /* Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */
|
||||
{ 0x0ebb, 0x314b }, /* Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */
|
||||
{ 0x0ebc, 0x314c }, /* Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */
|
||||
{ 0x0ebd, 0x314d }, /* Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */
|
||||
{ 0x0ebe, 0x314e }, /* Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */
|
||||
{ 0x0ebf, 0x314f }, /* Hangul_A ㅏ HANGUL LETTER A */
|
||||
{ 0x0ec0, 0x3150 }, /* Hangul_AE ㅐ HANGUL LETTER AE */
|
||||
{ 0x0ec1, 0x3151 }, /* Hangul_YA ㅑ HANGUL LETTER YA */
|
||||
{ 0x0ec2, 0x3152 }, /* Hangul_YAE ㅒ HANGUL LETTER YAE */
|
||||
{ 0x0ec3, 0x3153 }, /* Hangul_EO ㅓ HANGUL LETTER EO */
|
||||
{ 0x0ec4, 0x3154 }, /* Hangul_E ㅔ HANGUL LETTER E */
|
||||
{ 0x0ec5, 0x3155 }, /* Hangul_YEO ㅕ HANGUL LETTER YEO */
|
||||
{ 0x0ec6, 0x3156 }, /* Hangul_YE ㅖ HANGUL LETTER YE */
|
||||
{ 0x0ec7, 0x3157 }, /* Hangul_O ㅗ HANGUL LETTER O */
|
||||
{ 0x0ec8, 0x3158 }, /* Hangul_WA ㅘ HANGUL LETTER WA */
|
||||
{ 0x0ec9, 0x3159 }, /* Hangul_WAE ㅙ HANGUL LETTER WAE */
|
||||
{ 0x0eca, 0x315a }, /* Hangul_OE ㅚ HANGUL LETTER OE */
|
||||
{ 0x0ecb, 0x315b }, /* Hangul_YO ㅛ HANGUL LETTER YO */
|
||||
{ 0x0ecc, 0x315c }, /* Hangul_U ㅜ HANGUL LETTER U */
|
||||
{ 0x0ecd, 0x315d }, /* Hangul_WEO ㅝ HANGUL LETTER WEO */
|
||||
{ 0x0ece, 0x315e }, /* Hangul_WE ㅞ HANGUL LETTER WE */
|
||||
{ 0x0ecf, 0x315f }, /* Hangul_WI ㅟ HANGUL LETTER WI */
|
||||
{ 0x0ed0, 0x3160 }, /* Hangul_YU ㅠ HANGUL LETTER YU */
|
||||
{ 0x0ed1, 0x3161 }, /* Hangul_EU ㅡ HANGUL LETTER EU */
|
||||
{ 0x0ed2, 0x3162 }, /* Hangul_YI ㅢ HANGUL LETTER YI */
|
||||
{ 0x0ed3, 0x3163 }, /* Hangul_I ㅣ HANGUL LETTER I */
|
||||
{ 0x0ed4, 0x11a8 }, /* Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */
|
||||
{ 0x0ed5, 0x11a9 }, /* Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */
|
||||
{ 0x0ed6, 0x11aa }, /* Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */
|
||||
{ 0x0ed7, 0x11ab }, /* Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */
|
||||
{ 0x0ed8, 0x11ac }, /* Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */
|
||||
{ 0x0ed9, 0x11ad }, /* Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */
|
||||
{ 0x0eda, 0x11ae }, /* Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */
|
||||
{ 0x0edb, 0x11af }, /* Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */
|
||||
{ 0x0edc, 0x11b0 }, /* Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */
|
||||
{ 0x0edd, 0x11b1 }, /* Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */
|
||||
{ 0x0ede, 0x11b2 }, /* Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */
|
||||
{ 0x0edf, 0x11b3 }, /* Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */
|
||||
{ 0x0ee0, 0x11b4 }, /* Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */
|
||||
{ 0x0ee1, 0x11b5 }, /* Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */
|
||||
{ 0x0ee2, 0x11b6 }, /* Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */
|
||||
{ 0x0ee3, 0x11b7 }, /* Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */
|
||||
{ 0x0ee4, 0x11b8 }, /* Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */
|
||||
{ 0x0ee5, 0x11b9 }, /* Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */
|
||||
{ 0x0ee6, 0x11ba }, /* Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */
|
||||
{ 0x0ee7, 0x11bb }, /* Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */
|
||||
{ 0x0ee8, 0x11bc }, /* Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */
|
||||
{ 0x0ee9, 0x11bd }, /* Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */
|
||||
{ 0x0eea, 0x11be }, /* Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */
|
||||
{ 0x0eeb, 0x11bf }, /* Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */
|
||||
{ 0x0eec, 0x11c0 }, /* Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */
|
||||
{ 0x0eed, 0x11c1 }, /* Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */
|
||||
{ 0x0eee, 0x11c2 }, /* Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
|
||||
{ 0x0eef, 0x316d }, /* Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */
|
||||
{ 0x0ef0, 0x3171 }, /* Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
|
||||
{ 0x0ef1, 0x3178 }, /* Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
|
||||
{ 0x0ef2, 0x317f }, /* Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
|
||||
{ 0x0ef3, 0x3181 }, /* Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */
|
||||
{ 0x0ef4, 0x3184 }, /* Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
|
||||
{ 0x0ef5, 0x3186 }, /* Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
|
||||
{ 0x0ef6, 0x318d }, /* Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
|
||||
{ 0x0ef7, 0x318e }, /* Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
|
||||
{ 0x0ef8, 0x11eb }, /* Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
|
||||
{ 0x0ef9, 0x11f0 }, /* Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */
|
||||
{ 0x0efa, 0x11f9 }, /* Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
|
||||
{ 0x0eff, 0x20a9 }, /* Korean_Won ₩ WON SIGN */
|
||||
{ 0x13a4, 0x20ac }, /* Euro € EURO SIGN */
|
||||
{ 0x13bc, 0x0152 }, /* OE ΠLATIN CAPITAL LIGATURE OE */
|
||||
{ 0x13bd, 0x0153 }, /* oe œ LATIN SMALL LIGATURE OE */
|
||||
{ 0x13be, 0x0178 }, /* Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
|
||||
{ 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */
|
||||
};
|
||||
|
||||
static long keysym2ucs(KeySym keysym)
|
||||
{
|
||||
int min = 0;
|
||||
int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
|
||||
int mid;
|
||||
|
||||
/* first check for Latin-1 characters (1:1 mapping) */
|
||||
if ((keysym >= 0x0020 && keysym <= 0x007e) ||
|
||||
(keysym >= 0x00a0 && keysym <= 0x00ff))
|
||||
return keysym;
|
||||
|
||||
/* also check for directly encoded 24-bit UCS characters */
|
||||
if ((keysym & 0xff000000) == 0x01000000)
|
||||
return keysym & 0x00ffffff;
|
||||
|
||||
/* binary search in table */
|
||||
while (max >= min) {
|
||||
mid = (min + max) / 2;
|
||||
if (keysymtab[mid].keysym < keysym)
|
||||
min = mid + 1;
|
||||
else if (keysymtab[mid].keysym > keysym)
|
||||
max = mid - 1;
|
||||
else {
|
||||
/* found it */
|
||||
return keysymtab[mid].ucs;
|
||||
}
|
||||
}
|
||||
|
||||
/* no matching Unicode value found */
|
||||
return -1;
|
||||
}
|
||||
484
link.c
484
link.c
|
|
@ -4,18 +4,40 @@
|
|||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#include <regex.h>
|
||||
#include <ctype.h>
|
||||
#include <stdarg.h>
|
||||
#include <limits.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
#include <caml/fail.h>
|
||||
#include <caml/alloc.h>
|
||||
#include <caml/memory.h>
|
||||
#include <caml/unixsupport.h>
|
||||
|
||||
#include <fitz.h>
|
||||
#include <mupdf.h>
|
||||
#include <muxps.h>
|
||||
#include <mucbz.h>
|
||||
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#define PIGGYBACK
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (disable:4244)
|
||||
#pragma warning (disable:4996)
|
||||
#pragma warning (disable:4995)
|
||||
#define NORETURN __declspec (noreturn)
|
||||
#define UNUSED
|
||||
#define OPTIMIZE(n)
|
||||
#define GCC_FMT_ATTR(a, b)
|
||||
#elif defined __GNUC__
|
||||
#if defined __GNUC__
|
||||
#define NORETURN __attribute__ ((noreturn))
|
||||
#define UNUSED __attribute__ ((unused))
|
||||
#define OPTIMIZE(n) __attribute__ ((optimize ("O"#n)))
|
||||
|
|
@ -27,52 +49,11 @@
|
|||
#define GCC_FMT_ATTR(a, b)
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#ifdef _WIN64
|
||||
#define FMT_s "i64u"
|
||||
#else
|
||||
#define FMT_s "u"
|
||||
#endif
|
||||
static void NORETURN GCC_FMT_ATTR (2, 3)
|
||||
winerr (int exitcode, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
DWORD savederror = GetLastError ();
|
||||
|
||||
va_start (ap, fmt);
|
||||
vfprintf (stderr, fmt, ap);
|
||||
va_end (ap);
|
||||
fprintf (stderr, ": 0x%lx\n", savederror);
|
||||
fflush (stderr);
|
||||
_exit (exitcode);
|
||||
}
|
||||
#else
|
||||
#define FMT_s "zu"
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#ifdef __MINGW32__
|
||||
/* some versions of MingW have non idempotent %p */
|
||||
#include <inttypes.h>
|
||||
#define FMT_ptr PRIxPTR
|
||||
#define FMT_ptr_cast(p) ((intptr_t *) (p))
|
||||
#define FMT_ptr_cast2(p) ((intptr_t) (p))
|
||||
#else
|
||||
#define FMT_ptr "p"
|
||||
#define FMT_ptr_cast(p) (p)
|
||||
#define FMT_ptr_cast2(p) (p)
|
||||
#endif
|
||||
|
||||
#include <regex.h>
|
||||
#include <ctype.h>
|
||||
#include <stdarg.h>
|
||||
#include <limits.h>
|
||||
|
||||
static void NORETURN GCC_FMT_ATTR (2, 3)
|
||||
err (int exitcode, const char *fmt, ...)
|
||||
|
|
@ -102,12 +83,6 @@ static void NORETURN GCC_FMT_ATTR (2, 3)
|
|||
_exit (exitcode);
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
#ifndef GL_TEXTURE_RECTANGLE_ARB
|
||||
#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
|
||||
#endif
|
||||
|
|
@ -124,18 +99,6 @@ static void NORETURN GCC_FMT_ATTR (2, 3)
|
|||
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
|
||||
#endif
|
||||
|
||||
#include <caml/fail.h>
|
||||
#include <caml/alloc.h>
|
||||
#include <caml/memory.h>
|
||||
#include <caml/unixsupport.h>
|
||||
|
||||
#include <fitz.h>
|
||||
#include <mupdf.h>
|
||||
#include <muxps.h>
|
||||
#include <mucbz.h>
|
||||
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#if 0
|
||||
#define lprintf printf
|
||||
#else
|
||||
|
|
@ -236,13 +199,8 @@ struct {
|
|||
fz_bbox trimfuzz;
|
||||
fz_pixmap *pig;
|
||||
|
||||
#ifdef _WIN32
|
||||
HANDLE thread;
|
||||
HANDLE cr, cw;
|
||||
#else
|
||||
pthread_t thread;
|
||||
int cr, cw;
|
||||
#endif
|
||||
FT_Face face;
|
||||
|
||||
void (*closedoc) (void);
|
||||
|
|
@ -265,59 +223,6 @@ static void UNUSED debug_matrix (const char *cap, fz_matrix m)
|
|||
m.a, m.b, m.c, m.d, m.e, m.f);
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
static CRITICAL_SECTION critsec;
|
||||
|
||||
static void lock (void *unused)
|
||||
{
|
||||
(void) unused;
|
||||
EnterCriticalSection (&critsec);
|
||||
}
|
||||
|
||||
static void unlock (void *unused)
|
||||
{
|
||||
(void) unused;
|
||||
LeaveCriticalSection (&critsec);
|
||||
}
|
||||
|
||||
static int trylock (void *unused)
|
||||
{
|
||||
return TryEnterCriticalSection (&critsec) == 0;
|
||||
}
|
||||
|
||||
CAMLprim value ml_seterrhandle (value is_gui_v, value handle_v)
|
||||
{
|
||||
/* http://stackoverflow.com/questions/5115569/c-win32-api-getstdhandlestd-output-handle-is-invalid-very-perplexing */
|
||||
CAMLparam2 (is_gui_v, handle_v);
|
||||
int fd;
|
||||
|
||||
if (!SetStdHandle (STD_ERROR_HANDLE, Handle_val (handle_v))) {
|
||||
win32_maperr (GetLastError ());
|
||||
uerror ("SetStdHandle", Nothing);
|
||||
}
|
||||
|
||||
if (Bool_val (is_gui_v)) {
|
||||
if (stderr) {
|
||||
fclose (stderr);
|
||||
}
|
||||
fd = _open_osfhandle ((intptr_t) Handle_val (handle_v), 0);
|
||||
if (fd < 0) {
|
||||
uerror ("_open_osfhandle", Nothing);
|
||||
}
|
||||
*stderr = *_fdopen (fd, "w");
|
||||
if (!stderr) {
|
||||
int save;
|
||||
_close (fd);
|
||||
errno = save;
|
||||
uerror ("_fd_open", Nothing);
|
||||
}
|
||||
if (setvbuf (stderr, NULL, _IONBF, 0)) {
|
||||
uerror ("stvbuf", Nothing);
|
||||
}
|
||||
}
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
#else
|
||||
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
static void lock (const char *cap)
|
||||
|
|
@ -346,15 +251,6 @@ static int trylock (const char *cap)
|
|||
return ret == EBUSY;
|
||||
}
|
||||
|
||||
CAMLprim value ml_seterrhandle (value is_gui_v, value handle_v)
|
||||
{
|
||||
CAMLparam2 (is_gui_v, handle_v);
|
||||
(void) handle_v;
|
||||
(void) is_gui_v;
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void *parse_pointer (const char *cap, const char *s)
|
||||
{
|
||||
int ret;
|
||||
|
|
@ -367,63 +263,6 @@ static void *parse_pointer (const char *cap, const char *s)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
static double now (void)
|
||||
{
|
||||
FILETIME ft;
|
||||
uint64 tmp;
|
||||
|
||||
GetSystemTimeAsFileTime (&ft);
|
||||
tmp = ft.dwHighDateTime;
|
||||
tmp <<= 32;
|
||||
tmp |= ft.dwLowDateTime;
|
||||
return tmp * 1e-7;
|
||||
}
|
||||
|
||||
static int hasdata (void)
|
||||
{
|
||||
BOOL okay;
|
||||
DWORD avail;
|
||||
|
||||
okay = PeekNamedPipe (state.cr, NULL, 0, NULL, &avail, NULL);
|
||||
if (!okay) winerr (1, "PeekNamedPipe");
|
||||
return avail > 0;
|
||||
}
|
||||
|
||||
static void readdata (void *p, int size)
|
||||
{
|
||||
BOOL okay;
|
||||
DWORD nread;
|
||||
|
||||
okay = ReadFile (state.cr, p, size, &nread, NULL);
|
||||
if (!okay || nread - size) {
|
||||
err (1, "ReadFile (req %d, okay %d, ret %ld)", size, okay, nread);
|
||||
}
|
||||
}
|
||||
|
||||
static void writedata (char *p, int size)
|
||||
{
|
||||
BOOL okay;
|
||||
char buf[4];
|
||||
DWORD nwritten;
|
||||
|
||||
buf[0] = (size >> 24) & 0xff;
|
||||
buf[1] = (size >> 16) & 0xff;
|
||||
buf[2] = (size >> 8) & 0xff;
|
||||
buf[3] = (size >> 0) & 0xff;
|
||||
|
||||
okay = WriteFile (state.cw, buf, 4, &nwritten, NULL);
|
||||
if (!okay || nwritten != 4) {
|
||||
winerr (1, "WriteFile okay %d ret %ld", okay, nwritten);
|
||||
}
|
||||
|
||||
okay = WriteFile (state.cw, p, size, &nwritten, NULL);
|
||||
if (!okay || nwritten - size) {
|
||||
winerr (1, "WriteFile (req %d, okay %d, ret %ld)",
|
||||
size, okay, nwritten);
|
||||
}
|
||||
}
|
||||
#else
|
||||
static double now (void)
|
||||
{
|
||||
struct timeval tv;
|
||||
|
|
@ -442,6 +281,16 @@ static int hasdata (void)
|
|||
return avail > 0;
|
||||
}
|
||||
|
||||
CAMLprim value ml_hasdata (value fd_v)
|
||||
{
|
||||
CAMLparam1 (fd_v);
|
||||
int ret, avail;
|
||||
|
||||
ret = ioctl (Int_val (fd_v), FIONREAD, &avail);
|
||||
if (ret) uerror ("ioctl (FIONREAD)", Nothing);
|
||||
CAMLreturn (Val_bool (avail > 0));
|
||||
}
|
||||
|
||||
static void readdata (void *p, int size)
|
||||
{
|
||||
ssize_t n;
|
||||
|
|
@ -475,7 +324,6 @@ static void writedata (char *p, int size)
|
|||
err (1, "write (req %d, ret %zd)", size, n);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static int readlen (void)
|
||||
{
|
||||
|
|
@ -1292,7 +1140,10 @@ static void search (regex_t *re, int pageno, int y, int forward)
|
|||
span = pspan[j];
|
||||
j += forward ? 1 : -1;
|
||||
p = buf;
|
||||
for (i = 0; i < MIN (span->len, (int) sizeof (buf) - 1); ++i) {
|
||||
for (i = 0; i < span->len; ++i) {
|
||||
int len;
|
||||
char cbuf[4];
|
||||
|
||||
if (forward) {
|
||||
if (span->text[i].bbox.y0 < y + 1) {
|
||||
continue;
|
||||
|
|
@ -1303,11 +1154,14 @@ static void search (regex_t *re, int pageno, int y, int forward)
|
|||
continue;
|
||||
}
|
||||
}
|
||||
if (span->text[i].c < 256) {
|
||||
*p++ = span->text[i].c;
|
||||
len = runetochar (cbuf, &span->text[i].c);
|
||||
if (sizeof (buf) - 1 - (p - buf) > len) {
|
||||
int k;
|
||||
for (k = 0; k < len; ++k)
|
||||
*p++ = cbuf[k];
|
||||
}
|
||||
else {
|
||||
*p++ = '?';
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (p == buf) {
|
||||
|
|
@ -1332,9 +1186,17 @@ static void search (regex_t *re, int pageno, int y, int forward)
|
|||
else {
|
||||
fz_bbox *sb, *eb;
|
||||
fz_point p1, p2, p3, p4;
|
||||
int a, b, p;
|
||||
|
||||
sb = &span->text[rm.rm_so].bbox;
|
||||
eb = &span->text[rm.rm_eo - 1].bbox;
|
||||
for (a = 0, p = 0; p < rm.rm_so; a++) {
|
||||
p += runelen (span->text[a].c);
|
||||
}
|
||||
for (b = a; p < rm.rm_eo - 1; b++) {
|
||||
p += runelen (span->text[b].c);
|
||||
}
|
||||
|
||||
sb = &span->text[a].bbox;
|
||||
eb = &span->text[b].bbox;
|
||||
|
||||
p1.x = sb->x0;
|
||||
p1.y = sb->y0;
|
||||
|
|
@ -1467,13 +1329,7 @@ static void realloctexts (int texcount)
|
|||
state.texindex = 0;
|
||||
}
|
||||
|
||||
static
|
||||
#ifdef _WIN32
|
||||
DWORD _stdcall
|
||||
#else
|
||||
void *
|
||||
#endif
|
||||
mainloop (void *unused)
|
||||
static void * mainloop (void *unused)
|
||||
{
|
||||
char *p = NULL;
|
||||
int len, ret, oldlen = 0;
|
||||
|
|
@ -2542,62 +2398,85 @@ CAMLprim value ml_setaalevel (value level_v)
|
|||
CAMLreturn (Val_unit);
|
||||
}
|
||||
|
||||
#if !defined _WIN32 && !defined __APPLE__
|
||||
#undef pixel
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <GL/glx.h>
|
||||
|
||||
static void set_wm_class (void)
|
||||
{
|
||||
static struct {
|
||||
Display *dpy;
|
||||
Window win;
|
||||
XClassHint hint;
|
||||
char *display;
|
||||
GLXContext ctx;
|
||||
GLXDrawable drawable;
|
||||
} glx;
|
||||
|
||||
display = getenv ("DISPLAY");
|
||||
dpy = XOpenDisplay (display);
|
||||
if (!dpy) {
|
||||
fprintf (stderr, "XOpenDisplay `%s' failed\n",
|
||||
display ? display : "null");
|
||||
return;
|
||||
}
|
||||
hint.res_name = "llpp";
|
||||
hint.res_class = "llpp";
|
||||
win = glXGetCurrentDrawable ();
|
||||
if (win == None) {
|
||||
fprintf (stderr, "glXGetCurrentDrawable returned None\n");
|
||||
XCloseDisplay (dpy);
|
||||
return;
|
||||
}
|
||||
XSetClassHint (dpy, win, &hint);
|
||||
XCloseDisplay (dpy);
|
||||
}
|
||||
#define HAS_WM_CLASS_HACK
|
||||
#endif
|
||||
#include "keysym2ucs.c"
|
||||
|
||||
enum { piunknown, pilinux, piwindows, pwindowsgui, piosx,
|
||||
pisun, pifreebsd, pidragonflybsd, piopenbsd, pinetbsd,
|
||||
pimingw, pmingwgui, picygwin };
|
||||
|
||||
#define NOZOMBIESPLEASE
|
||||
|
||||
#ifdef _WIN32
|
||||
static int isgui (void)
|
||||
CAMLprim value ml_keysymtoutf8 (value keysym_v)
|
||||
{
|
||||
/* http://www.opensc.ws/c-snippets/12714-c-getprocaddressex.html
|
||||
and MSDN */
|
||||
char *p = (char *) GetModuleHandle (NULL);
|
||||
if (p) {
|
||||
IMAGE_DOS_HEADER *dh = (IMAGE_DOS_HEADER *) p;
|
||||
IMAGE_NT_HEADERS *nh = (IMAGE_NT_HEADERS *) (p + dh->e_lfanew);
|
||||
CAMLparam1 (keysym_v);
|
||||
CAMLlocal1 (str_v);
|
||||
KeySym keysym = Int_val (keysym_v);
|
||||
Rune rune;
|
||||
int len;
|
||||
char buf[5];
|
||||
|
||||
return nh->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI;
|
||||
}
|
||||
return 0;
|
||||
rune = keysym2ucs (keysym);
|
||||
len = runetochar (buf, &rune);
|
||||
buf[len] = 0;
|
||||
str_v = caml_copy_string (buf);
|
||||
CAMLreturn (str_v);
|
||||
}
|
||||
#endif
|
||||
|
||||
CAMLprim value ml_glx (value win_v)
|
||||
{
|
||||
CAMLparam1 (win_v);
|
||||
int screen;
|
||||
XVisualInfo *visual;
|
||||
int attributes[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
|
||||
|
||||
glx.dpy = XOpenDisplay (NULL);
|
||||
if (!glx.dpy) {
|
||||
caml_failwith ("XOpenDisplay failed");
|
||||
}
|
||||
|
||||
screen = DefaultScreen (glx.dpy);
|
||||
visual = glXChooseVisual (glx.dpy, screen, attributes);
|
||||
if (!visual) {
|
||||
XCloseDisplay (glx.dpy);
|
||||
glx.dpy = NULL;
|
||||
caml_failwith ("glXChooseVisual");
|
||||
}
|
||||
|
||||
glx.ctx = glXCreateContext (glx.dpy, visual, NULL, True);
|
||||
if (!glx.ctx) {
|
||||
XCloseDisplay (glx.dpy);
|
||||
XFree (visual);
|
||||
glx.dpy = NULL;
|
||||
caml_failwith ("glXCreateContext");
|
||||
}
|
||||
|
||||
XFree (visual);
|
||||
if (!glXMakeCurrent (glx.dpy, Int_val (win_v), glx.ctx)) {
|
||||
glXDestroyContext (glx.dpy, glx.ctx);
|
||||
XCloseDisplay (glx.dpy);
|
||||
glx.dpy = NULL;
|
||||
glx.ctx = NULL;
|
||||
caml_failwith ("glXMakeCurrent");
|
||||
}
|
||||
glx.drawable = Int_val (win_v);
|
||||
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
|
||||
CAMLprim value ml_swapb (value unit_v)
|
||||
{
|
||||
CAMLparam1 (unit_v);
|
||||
/* glXWaitGL (); */
|
||||
glXSwapBuffers (glx.dpy, glx.drawable);
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
|
||||
enum { piunknown, pilinux, piosx, pisun, pifreebsd,
|
||||
pidragonflybsd, piopenbsd, pinetbsd, picygwin };
|
||||
|
||||
CAMLprim value ml_platform (value unit_v)
|
||||
{
|
||||
|
|
@ -2607,14 +2486,7 @@ CAMLprim value ml_platform (value unit_v)
|
|||
#if defined __linux__
|
||||
platid = pilinux;
|
||||
#elif defined __CYGWIN__
|
||||
#undef NOZOMBIESPLEASE
|
||||
platid = picygwin;
|
||||
#elif defined __MINGW32__
|
||||
#undef NOZOMBIESPLEASE
|
||||
platid = pimingw + isgui ();
|
||||
#elif defined _WIN32
|
||||
#undef NOZOMBIESPLEASE
|
||||
platid = piwindows + isgui ();
|
||||
#elif defined __DragonFly__
|
||||
platid = pidragonflybsd;
|
||||
#elif defined __FreeBSD__
|
||||
|
|
@ -2631,39 +2503,42 @@ CAMLprim value ml_platform (value unit_v)
|
|||
CAMLreturn (Val_int (platid));
|
||||
}
|
||||
|
||||
#ifdef NOZOMBIESPLEASE
|
||||
#include <signal.h>
|
||||
#endif
|
||||
CAMLprim value ml_cloexec (value fd_v)
|
||||
{
|
||||
CAMLparam1 (fd_v);
|
||||
int fd = Int_val (fd_v);
|
||||
|
||||
if (fcntl (fd, F_SETFD, FD_CLOEXEC, 1)) {
|
||||
uerror ("fcntl", Nothing);
|
||||
}
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
|
||||
CAMLprim value ml_init (value pipe_v, value params_v)
|
||||
{
|
||||
CAMLparam2 (pipe_v, params_v);
|
||||
CAMLlocal2 (trim_v, fuzz_v);
|
||||
char *fontpath;
|
||||
int ret;
|
||||
int texcount;
|
||||
int wmclasshack;
|
||||
char *fontpath;
|
||||
int colorspace;
|
||||
int mustoresize;
|
||||
struct sigaction sa;
|
||||
|
||||
#ifdef _WIN32
|
||||
state.cr = Handle_val (Field (pipe_v, 0));
|
||||
state.cw = Handle_val (Field (pipe_v, 1));
|
||||
#else
|
||||
state.cr = Int_val (Field (pipe_v, 0));
|
||||
state.cw = Int_val (Field (pipe_v, 1));
|
||||
#endif
|
||||
state.rotate = Int_val (Field (params_v, 0));
|
||||
state.cr = Int_val (Field (pipe_v, 0));
|
||||
state.cw = Int_val (Field (pipe_v, 1));
|
||||
state.rotate = Int_val (Field (params_v, 0));
|
||||
state.proportional = Bool_val (Field (params_v, 1));
|
||||
trim_v = Field (params_v, 2);
|
||||
texcount = Int_val (Field (params_v, 3));
|
||||
state.sliceheight = Int_val (Field (params_v, 4));
|
||||
mustoresize = Int_val (Field (params_v, 5));
|
||||
state.ctx = fz_new_context (NULL, NULL, mustoresize);
|
||||
colorspace = Int_val (Field (params_v, 6));
|
||||
wmclasshack = Bool_val (Field (params_v, 7));
|
||||
fontpath = String_val (Field (params_v, 8));
|
||||
trim_v = Field (params_v, 2);
|
||||
texcount = Int_val (Field (params_v, 3));
|
||||
state.sliceheight = Int_val (Field (params_v, 4));
|
||||
mustoresize = Int_val (Field (params_v, 5));
|
||||
colorspace = Int_val (Field (params_v, 6));
|
||||
fontpath = String_val (Field (params_v, 7));
|
||||
|
||||
state.ctx = fz_new_context (NULL, NULL, mustoresize);
|
||||
state.trimmargins = Bool_val (Field (trim_v, 0));
|
||||
|
||||
state.trimmargins = Bool_val (Field (trim_v, 0));
|
||||
fuzz_v = Field (trim_v, 1);
|
||||
state.trimfuzz.x0 = Int_val (Field (fuzz_v, 0));
|
||||
state.trimfuzz.y0 = Int_val (Field (fuzz_v, 1));
|
||||
|
|
@ -2671,13 +2546,6 @@ CAMLprim value ml_init (value pipe_v, value params_v)
|
|||
state.trimfuzz.y1 = Int_val (Field (fuzz_v, 3));
|
||||
|
||||
set_tex_params (colorspace);
|
||||
#ifdef HAS_WM_CLASS_HACK
|
||||
if (wmclasshack) {
|
||||
set_wm_class ();
|
||||
}
|
||||
#else
|
||||
(void) wmclasshack;
|
||||
#endif
|
||||
|
||||
if (*fontpath) {
|
||||
state.face = load_font (fontpath);
|
||||
|
|
@ -2692,35 +2560,19 @@ CAMLprim value ml_init (value pipe_v, value params_v)
|
|||
|
||||
realloctexts (texcount);
|
||||
|
||||
#ifdef NOZOMBIESPLEASE
|
||||
{
|
||||
struct sigaction sa;
|
||||
sa.sa_handler = SIG_DFL;
|
||||
if (sigemptyset (&sa.sa_mask)) {
|
||||
err (1, "sigemptyset");
|
||||
}
|
||||
sa.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_NOCLDWAIT;
|
||||
if (sigaction (SIGCHLD, &sa, NULL)) {
|
||||
err (1, "sigaction");
|
||||
}
|
||||
|
||||
sa.sa_handler = SIG_DFL;
|
||||
if (sigemptyset (&sa.sa_mask)) {
|
||||
err (1, "sigemptyset");
|
||||
}
|
||||
sa.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_NOCLDWAIT;
|
||||
if (sigaction (SIGCHLD, &sa, NULL)) {
|
||||
err (1, "sigaction");
|
||||
}
|
||||
ret = pthread_create (&state.thread, NULL, mainloop, NULL);
|
||||
if (ret) {
|
||||
errx (1, "pthread_create: %s", strerror (ret));
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
InitializeCriticalSection (&critsec);
|
||||
state.thread = CreateThread (NULL, 0, mainloop, NULL, 0, NULL);
|
||||
if (state.thread == INVALID_HANDLE_VALUE) {
|
||||
errx (1, "CreateThread failed: %lx", GetLastError ());
|
||||
}
|
||||
#else
|
||||
{
|
||||
int ret = pthread_create (&state.thread, NULL, mainloop, NULL);
|
||||
if (ret) {
|
||||
errx (1, "pthread_create: %s", strerror (ret));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
CAMLreturn (Val_unit);
|
||||
}
|
||||
|
|
|
|||
71
wsel.c
71
wsel.c
|
|
@ -1,71 +0,0 @@
|
|||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <windows.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define NORETURN __declspec (noreturn)
|
||||
#elif defined __GNUC__
|
||||
#define NORETURN __attribute__ ((noreturn))
|
||||
#else
|
||||
#define NORETURN
|
||||
#endif
|
||||
|
||||
static void NORETURN winerr (int exitcode, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
va_start (ap, fmt);
|
||||
vfprintf (stderr, fmt, ap);
|
||||
va_end (ap);
|
||||
fprintf (stderr, ": winerror 0x%lx\n", GetLastError ());
|
||||
exit (exitcode);
|
||||
}
|
||||
|
||||
int main (void)
|
||||
{
|
||||
HANDLE h;
|
||||
LPWSTR tp;
|
||||
size_t n, m, k;
|
||||
char buf[4096];
|
||||
|
||||
if (!OpenClipboard (NULL)) winerr (1, "OpenClipboard");
|
||||
EmptyClipboard ();
|
||||
|
||||
n = fread (buf, 1, 4096, stdin);
|
||||
if (n < 0) {
|
||||
fprintf (stderr, "fread failed: %s\n", strerror (errno));
|
||||
return 2;
|
||||
}
|
||||
if (!n) return 3;
|
||||
|
||||
m = MultiByteToWideChar (
|
||||
CP_UTF8,
|
||||
MB_ERR_INVALID_CHARS,
|
||||
buf,
|
||||
n,
|
||||
NULL,
|
||||
0
|
||||
);
|
||||
if (m <= 0) winerr (4, "MultiByteToWideChar %d", m);
|
||||
|
||||
h = GlobalAlloc (GMEM_MOVEABLE, (m+1) * sizeof (*tp));
|
||||
if (!h) winerr (5, "GlobalAlloc");
|
||||
|
||||
tp = GlobalLock (h);
|
||||
k = MultiByteToWideChar (
|
||||
CP_UTF8,
|
||||
MB_ERR_INVALID_CHARS,
|
||||
buf,
|
||||
n,
|
||||
tp,
|
||||
m
|
||||
);
|
||||
if (k != m) winerr (6, "MultiByteToWideChar %d %d", k, m);
|
||||
tp[k] = 0;
|
||||
GlobalUnlock (h);
|
||||
if (!SetClipboardData (CF_UNICODETEXT, h)) winerr (7, "SetClipboardData");
|
||||
if (GlobalFree (h)) winerr (8, "GlobalFree");
|
||||
if (!CloseClipboard ()) winerr (9, "CloseClipboard");
|
||||
return 0;
|
||||
}
|
||||
718
wsi.ml
Normal file
718
wsi.ml
Normal file
|
|
@ -0,0 +1,718 @@
|
|||
type cursor =
|
||||
| CURSOR_INHERIT
|
||||
| CURSOR_INFO
|
||||
| CURSOR_CYCLE
|
||||
| CURSOR_CROSSHAIR
|
||||
| CURSOR_TEXT
|
||||
;;
|
||||
|
||||
external cloexec : Unix.file_descr -> unit = "ml_cloexec";;
|
||||
external glx : int -> unit = "ml_glx";;
|
||||
external swapb : unit -> unit = "ml_swapb";;
|
||||
external hasdata : Unix.file_descr -> bool = "ml_hasdata";;
|
||||
external toutf8 : int -> string = "ml_keysymtoutf8";;
|
||||
|
||||
let dolog fmt = Format.kprintf prerr_endline fmt;;
|
||||
let vlog fmt = Format.kprintf ignore fmt;;
|
||||
|
||||
exception Quit;;
|
||||
|
||||
let onot = object
|
||||
method display = ()
|
||||
method reshape _ _ = ()
|
||||
method mouse _ _ _ _ _ = ()
|
||||
method motion _ _ = ()
|
||||
method pmotion _ _ = ()
|
||||
method key _ _ = ()
|
||||
end;;
|
||||
|
||||
class type t = object
|
||||
method display : unit
|
||||
method reshape : int -> int -> unit
|
||||
method mouse : int -> bool -> int -> int -> int -> unit
|
||||
method motion : int -> int -> unit
|
||||
method pmotion : int -> int -> unit
|
||||
method key : int -> int -> unit
|
||||
end;;
|
||||
|
||||
type state =
|
||||
{ mutable mink : int
|
||||
; mutable maxk : int
|
||||
; mutable keymap : int array array
|
||||
; fifo : (string -> unit) Queue.t
|
||||
; mutable seq : int
|
||||
; mutable protoatom : int
|
||||
; mutable deleatom : int
|
||||
; mutable idbase : int
|
||||
; mutable fullscreen : (int -> unit)
|
||||
; mutable title : (int -> string -> unit)
|
||||
; mutable t : t
|
||||
; mutable sock : Unix.file_descr
|
||||
; mutable w : int
|
||||
; mutable h : int
|
||||
; mutable fs : bool
|
||||
}
|
||||
;;
|
||||
|
||||
let state =
|
||||
{ mink = max_int
|
||||
; maxk = min_int
|
||||
; keymap = [||]
|
||||
; fifo = Queue.create ()
|
||||
; seq = 0
|
||||
; protoatom = -1
|
||||
; deleatom = -1
|
||||
; idbase = -1
|
||||
; fullscreen = (fun _ -> ())
|
||||
; title = (fun _ _ -> ())
|
||||
; sock = Unix.stdin
|
||||
; t = onot
|
||||
; w = -1
|
||||
; h = -1
|
||||
; fs = false
|
||||
}
|
||||
;;
|
||||
|
||||
let w8 s pos i = String.set s pos (Char.chr (i land 0xff));;
|
||||
|
||||
let w16 s pos i =
|
||||
w8 s pos i;
|
||||
w8 s (pos+1) (i lsr 8);
|
||||
;;
|
||||
|
||||
let w32 s pos i =
|
||||
w16 s pos i;
|
||||
w16 s (pos+2) (i lsr 16);
|
||||
;;
|
||||
|
||||
let r16 s pos =
|
||||
let rb pos1 = Char.code (String.get s (pos + pos1)) in
|
||||
(rb 0) lor ((rb 1) lsl 8)
|
||||
;;
|
||||
|
||||
let r16s s pos =
|
||||
let i = r16 s pos in
|
||||
i - ((i land 0x8000) lsl 1);
|
||||
;;
|
||||
|
||||
let r8 s pos = Char.code (String.get s pos);;
|
||||
|
||||
let r32 s pos =
|
||||
let rb pos1 = Char.code (String.get s (pos + pos1)) in
|
||||
let l = (rb 0) lor ((rb 1) lsl 8)
|
||||
and u = (rb 2) lor ((rb 3) lsl 8) in
|
||||
(u lsl 16) lor l
|
||||
;;
|
||||
|
||||
let error fmt = Printf.kprintf failwith fmt;;
|
||||
|
||||
let readstr sock n =
|
||||
let s = String.create n in
|
||||
let rec loop pos n =
|
||||
let m = Unix.read sock s pos n in
|
||||
if n != m
|
||||
then (
|
||||
ignore (Unix.select [sock] [] [] 0.01);
|
||||
loop (pos + m) (n - m)
|
||||
)
|
||||
(* error "read %d returned %d" n m; *)
|
||||
in
|
||||
loop 0 n;
|
||||
s;
|
||||
;;
|
||||
|
||||
let sendstr s ?(pos=0) ?(len=String.length s) sock =
|
||||
vlog "%d => %S" state.seq s;
|
||||
state.seq <- state.seq + 1;
|
||||
let n = Unix.send sock s pos len [] in
|
||||
if n != len
|
||||
then error "send %d returned %d" len n;
|
||||
;;
|
||||
|
||||
let updkmap sock resp =
|
||||
let syms = r8 resp 1 in
|
||||
let len = r32 resp 4 in
|
||||
let data =
|
||||
if len > 0
|
||||
then readstr sock (4*len)
|
||||
else ""
|
||||
in
|
||||
let m = len / syms in
|
||||
state.keymap <- Array.make_matrix
|
||||
(state.maxk - state.mink) syms 0xffffff;
|
||||
let rec loop i = if i = m then () else
|
||||
let k = i*4*syms in
|
||||
let rec loop2 k l = if l = syms then () else
|
||||
let v = r32 data k in
|
||||
state.keymap.(i).(l) <- v;
|
||||
loop2 (k+4) (l+1)
|
||||
in
|
||||
loop2 k 0;
|
||||
loop (i+1);
|
||||
in
|
||||
loop 0;
|
||||
;;
|
||||
|
||||
let sendwithrep sock s f =
|
||||
Queue.push f state.fifo;
|
||||
sendstr s sock;
|
||||
;;
|
||||
|
||||
let padcatl ss =
|
||||
let b = Buffer.create 16 in
|
||||
List.iter (Buffer.add_string b) ss;
|
||||
let bl = Buffer.length b in
|
||||
let pl = bl land 3 in
|
||||
if pl != 0
|
||||
then (
|
||||
let pad = "123" in
|
||||
Buffer.add_substring b pad 0 (4 - pl);
|
||||
);
|
||||
Buffer.contents b;
|
||||
;;
|
||||
|
||||
let padcat s1 s2 = padcatl [s1; s2];;
|
||||
|
||||
let internreq name onlyifexists =
|
||||
let s = "\016\000\000\000\000\000\000\000" in
|
||||
let s = padcat s name in
|
||||
w8 s 1 (if onlyifexists then 1 else 0);
|
||||
w16 s 2 (String.length s / 4);
|
||||
w16 s 4 (String.length name);
|
||||
s;
|
||||
;;
|
||||
|
||||
let sendintern sock s onlyifexists f =
|
||||
let s = internreq s onlyifexists in
|
||||
sendwithrep sock s f;
|
||||
;;
|
||||
|
||||
let createwindowreq wid parent x y w h bw mask =
|
||||
let s = "\001\000\009\000wwwwppppxxyywwhhbwccvvvvmmmmeeee" in
|
||||
w32 s 4 wid;
|
||||
w32 s 8 parent;
|
||||
w16 s 12 x;
|
||||
w16 s 14 y;
|
||||
w16 s 16 w;
|
||||
w16 s 18 h;
|
||||
w16 s 20 bw;
|
||||
w16 s 22 1;
|
||||
w32 s 24 0;
|
||||
w32 s 28 0x800; (* eventmask *)
|
||||
w32 s 32 mask;
|
||||
s;
|
||||
;;
|
||||
|
||||
let mapreq wid =
|
||||
let s = "\008u\002\000wwww" in
|
||||
w32 s 4 wid;
|
||||
s;
|
||||
;;
|
||||
|
||||
let getkeymapreq first count =
|
||||
let s = "\101u\002\000fcuu" in
|
||||
w8 s 4 first;
|
||||
w8 s 5 count;
|
||||
s;
|
||||
;;
|
||||
|
||||
let changepropreq wid prop typ format props =
|
||||
let s = "\018\000llwwwwppppttttfuuuLLLL" in
|
||||
let s = padcat s props in
|
||||
w16 s 2 (String.length s / 4);
|
||||
w32 s 4 wid;
|
||||
w32 s 8 prop;
|
||||
w32 s 12 typ;
|
||||
w8 s 16 format;
|
||||
let ful = String.length props / (match format with
|
||||
| 8 -> 1
|
||||
| 16 -> 2
|
||||
| 32 -> 4
|
||||
| n -> error "no idea what %d means" n)
|
||||
in
|
||||
w32 s 20 ful;
|
||||
s;
|
||||
;;
|
||||
|
||||
let openfontreq fid name =
|
||||
let s = "\045ullffffnnuu" in
|
||||
let s = padcat s name in
|
||||
w16 s 2 (String.length s / 4);
|
||||
w32 s 4 fid;
|
||||
w16 s 8 (String.length name);
|
||||
s;
|
||||
;;
|
||||
|
||||
let createglyphcursorreq fid cid cindex =
|
||||
let s = "\094u\008\000ccccffffffffssmmrrggbbRRGGBB" in
|
||||
w32 s 4 cid;
|
||||
w32 s 8 fid;
|
||||
w32 s 12 fid;
|
||||
w16 s 16 cindex;
|
||||
w16 s 18 (cindex+1);
|
||||
w16 s 20 0;
|
||||
w16 s 22 0;
|
||||
w16 s 24 0;
|
||||
w16 s 26 0xffff;
|
||||
w16 s 28 0xffff;
|
||||
w16 s 30 0xffff;
|
||||
s;
|
||||
;;
|
||||
|
||||
let mapwindowreq wid =
|
||||
let s = "\008u\002\000wwww" in
|
||||
w32 s 4 wid;
|
||||
s;
|
||||
;;
|
||||
|
||||
let changewindowattributesreq wid mask attrs =
|
||||
let s = "\002ullwwwwmmmm" in
|
||||
let s = padcat s attrs in
|
||||
w16 s 2 (String.length s / 4);
|
||||
w32 s 4 wid;
|
||||
w32 s 8 mask;
|
||||
s;
|
||||
;;
|
||||
|
||||
let configurewindowreq wid mask values =
|
||||
let s = "\012ullwwwwmmuu" in
|
||||
let s = padcat s values in
|
||||
w16 s 2 (String.length s / 4);
|
||||
w32 s 4 wid;
|
||||
w16 s 8 mask;
|
||||
s;
|
||||
;;
|
||||
|
||||
let s32 n =
|
||||
let s = "1234" in
|
||||
w32 s 0 n;
|
||||
s;
|
||||
;;
|
||||
|
||||
let clientmessage format seq wid typ data =
|
||||
let s = "\033fsswwwwtttt" in
|
||||
let s = padcat s data in
|
||||
w8 s 1 format;
|
||||
w16 s 2 seq;
|
||||
w32 s 4 wid;
|
||||
w32 s 8 typ;
|
||||
s;
|
||||
;;
|
||||
|
||||
let sendeventreq propagate destwid mask data =
|
||||
let s = "\025p\011\000wwwwmmmm" in
|
||||
let s = padcat s data in
|
||||
w8 s 1 propagate;
|
||||
w32 s 4 destwid;
|
||||
w32 s 8 mask;
|
||||
s;
|
||||
;;
|
||||
|
||||
let readresp sock =
|
||||
let resp = readstr sock 32 in
|
||||
match resp.[0] with
|
||||
| '\000' ->
|
||||
let s = resp in
|
||||
let code = r8 s 1
|
||||
and serial = r16 s 2
|
||||
and resid = r32 resp 4
|
||||
and min = r16 s 8
|
||||
and maj = r8 s 10 in
|
||||
error "code=%d serial=%d resid=%#x min=%d maj=%d\n%S"
|
||||
code serial resid min maj resp;
|
||||
|
||||
| '\001' ->
|
||||
let rep = Queue.pop state.fifo in
|
||||
rep resp;
|
||||
|
||||
| '\002' ->
|
||||
if Array.length state.keymap > 0
|
||||
then
|
||||
let code = r8 resp 1 in
|
||||
let mask = r16 resp 28 in
|
||||
let keysym = state.keymap.(code-state.mink).(
|
||||
if mask land 3 != 0 then 1 else 0
|
||||
) in
|
||||
vlog "keysym = %x %c" keysym (Char.unsafe_chr keysym);
|
||||
state.t#key keysym mask;
|
||||
|
||||
| '\003' ->
|
||||
if Array.length state.keymap > 0
|
||||
then
|
||||
let code = r8 resp 1 in
|
||||
let mask = r16 resp 28 in
|
||||
let keysym = state.keymap.(code-state.mink).(
|
||||
if mask land 3 != 0 then 1 else 0
|
||||
) in
|
||||
vlog "release keysym = %x %c mask %#x"
|
||||
keysym (Char.unsafe_chr keysym) mask
|
||||
|
||||
| '\004' ->
|
||||
let n = r8 resp 1
|
||||
and x = r16s resp 24
|
||||
and y = r16s resp 26
|
||||
and m = r16 resp 28 in
|
||||
state.t#mouse n true x y m;
|
||||
vlog "press %d" n
|
||||
|
||||
| '\005' ->
|
||||
let n = r8 resp 1
|
||||
and x = r16s resp 24
|
||||
and y = r16s resp 26
|
||||
and m = r16 resp 28 in
|
||||
state.t#mouse n false x y m;
|
||||
vlog "release %d %d %d" n x y
|
||||
|
||||
| '\006' ->
|
||||
let x = r16s resp 24 in
|
||||
let y = r16s resp 26 in
|
||||
let m = r16 resp 28 in
|
||||
if m = 0
|
||||
then state.t#pmotion x y
|
||||
else state.t#motion x y;
|
||||
vlog "move %dx%d => %d" x y m
|
||||
|
||||
| '\007' -> vlog "enter"
|
||||
| '\008' -> vlog "leave"
|
||||
| '\018' -> vlog "unmap";
|
||||
|
||||
| '\019' ->
|
||||
if state.w > 0 && state.h > 0
|
||||
then state.t#reshape state.w state.h;
|
||||
state.t#display;
|
||||
vlog "map";
|
||||
|
||||
| '\015' ->
|
||||
let vis = r8 resp 8 in
|
||||
if vis = 0 then state.t#display;
|
||||
vlog "visibility %d" vis;
|
||||
|
||||
| '\034' ->
|
||||
state.keymap <- [||];
|
||||
let s = getkeymapreq state.mink (state.maxk-state.mink-1) in
|
||||
sendwithrep sock s (updkmap sock);
|
||||
|
||||
| '\021' ->
|
||||
if state.w > 0 && state.h > 0
|
||||
then state.t#reshape state.w state.h;
|
||||
|
||||
| '\161' ->
|
||||
let atom = r32 resp 8 in
|
||||
if atom = state.protoatom
|
||||
then (
|
||||
let atom = r32 resp 12 in
|
||||
if atom = state.deleatom
|
||||
then raise Quit;
|
||||
);
|
||||
vlog "atom %#x" atom
|
||||
|
||||
| '\022'
|
||||
| '\150' ->
|
||||
let w = r16 resp 20
|
||||
and h = r16 resp 22 in
|
||||
if w != state.w || h != state.h
|
||||
then (
|
||||
state.w <- w;
|
||||
state.h <- h;
|
||||
state.t#reshape w h;
|
||||
);
|
||||
|
||||
| c ->
|
||||
dolog "event %d %S" (Char.code c) resp
|
||||
;;
|
||||
|
||||
let readresp sock =
|
||||
let rec loop () =
|
||||
readresp sock;
|
||||
if hasdata sock then loop ();
|
||||
in
|
||||
loop ();
|
||||
;;
|
||||
|
||||
let hexstr s =
|
||||
let b = Buffer.create 16 in
|
||||
String.iter (fun c ->
|
||||
Buffer.add_string b (Printf.sprintf "%02x" (Char.code c))) s;
|
||||
Buffer.contents b;
|
||||
;;
|
||||
|
||||
let reshape w h =
|
||||
if state.fs
|
||||
then
|
||||
state.fullscreen state.idbase
|
||||
;
|
||||
let s = "wwuuhhuu" in
|
||||
w32 s 0 w;
|
||||
w32 s 4 h;
|
||||
let s = configurewindowreq state.idbase 0x000c s in
|
||||
vlog "reshape %d %s %d" state.seq (hexstr s) (String.length s);
|
||||
sendstr s state.sock;
|
||||
;;
|
||||
|
||||
let setup sock _screennum =
|
||||
let s = readstr sock 2 in
|
||||
let n = String.length s in
|
||||
if n != 2
|
||||
then error "failed to read X connection setup response n=%d" n;
|
||||
match s.[0] with
|
||||
| '\000' ->
|
||||
let reasonlen = r8 s 1 in
|
||||
let s = readstr sock 6 in
|
||||
let maj = r16 s 0
|
||||
and min = r16 s 2
|
||||
and add = r16 s 4 in
|
||||
let len = add*4 in
|
||||
let data = readstr sock len in
|
||||
let reason = String.sub data 0 reasonlen in
|
||||
error "X connection failed maj=%d min=%d reason=%S"
|
||||
maj min reason
|
||||
|
||||
| '\002' -> failwith "X connection setup failed: authentication required";
|
||||
|
||||
| '\001' ->
|
||||
let s = readstr sock 38 in
|
||||
let maj = r16 s 0
|
||||
and min = r16 s 2
|
||||
and add = r16 s 4
|
||||
and idbase = r32 s 10
|
||||
and idmask = r32 s 14
|
||||
and vlen = r16 s 22
|
||||
and screens = r8 s 26
|
||||
and formats = r8 s 27
|
||||
and minkk = r8 s 32
|
||||
and maxkk = r8 s 33 in
|
||||
let data = readstr sock (4*add-32) in
|
||||
let vendor = String.sub data 0 vlen in
|
||||
let pos = ((vlen+3) land lnot 3) + formats*8 in
|
||||
let root = r32 data pos in
|
||||
let w = r16 data (pos+20)
|
||||
and h = r16 data (pos+22) in
|
||||
state.mink <- minkk;
|
||||
state.maxk <- maxkk;
|
||||
state.idbase <- idbase;
|
||||
vlog "vendor = %S, maj=%d min=%d" vendor maj min;
|
||||
vlog "screens = %d formats = %d" screens formats;
|
||||
vlog "minkk = %d maxkk = %d" minkk maxkk;
|
||||
vlog "idbase = %#x idmask = %#x" idbase idmask;
|
||||
vlog "root=%#x %dx%d" root w h;
|
||||
|
||||
let mask = 0
|
||||
+ 0x00000001 (* KeyPress *)
|
||||
(* + 0x00000002 *) (* KeyRelease *)
|
||||
+ 0x00000004 (* ButtonPress *)
|
||||
+ 0x00000008 (* ButtonRelease *)
|
||||
+ 0x00000010 (* EnterWindow *)
|
||||
+ 0x00000020 (* LeaveWindow *)
|
||||
+ 0x00000040 (* PointerMotion *)
|
||||
(* + 0x00000080 *) (* PointerMotionHint *)
|
||||
(* + 0x00000100 *) (* Button1Motion *)
|
||||
(* + 0x00000200 *) (* Button2Motion *)
|
||||
(* + 0x00000400 *) (* Button3Motion *)
|
||||
(* + 0x00000800 *) (* Button4Motion *)
|
||||
(* + 0x00001000 *) (* Button5Motion *)
|
||||
+ 0x00002000 (* ButtonMotion *)
|
||||
(* + 0x00004000 *) (* KeymapState *)
|
||||
(* + 0x00008000 *) (* Exposure *)
|
||||
+ 0x00010000 (* VisibilityChange *)
|
||||
+ 0x00020000 (* StructureNotify *)
|
||||
(* + 0x00040000 *) (* ResizeRedirect *)
|
||||
(* + 0x00080000 *) (* SubstructureNotify *)
|
||||
(* + 0x00100000 *) (* SubstructureRedirect *)
|
||||
(* + 0x00200000 *) (* FocusChange *)
|
||||
(* + 0x00400000 *) (* PropertyChange *)
|
||||
(* + 0x00800000 *) (* ColormapChange *)
|
||||
(* + 0x01000000 *) (* OwnerGrabButton *)
|
||||
in
|
||||
let wid = state.idbase in
|
||||
let s = createwindowreq wid root 0 0 900 900 0 mask in
|
||||
sendstr s sock;
|
||||
|
||||
let s = mapreq wid in
|
||||
sendstr s sock;
|
||||
|
||||
let s = getkeymapreq state.mink (state.maxk-state.mink) in
|
||||
sendwithrep sock s (updkmap sock);
|
||||
|
||||
sendintern sock "WM_PROTOCOLS" false (fun resp ->
|
||||
state.protoatom <- r32 resp 8;
|
||||
sendintern sock "WM_DELETE_WINDOW" false (fun resp ->
|
||||
state.deleatom <- r32 resp 8;
|
||||
let s = s32 state.deleatom in
|
||||
let s = changepropreq wid state.protoatom 4 32 s in
|
||||
sendstr s sock;
|
||||
);
|
||||
);
|
||||
|
||||
sendintern sock "WM_CLASS" false (fun resp ->
|
||||
let atom = r32 resp 8 in
|
||||
let llpp = "llpp\000llpp\000" in
|
||||
let s = changepropreq wid atom 31 8 llpp in
|
||||
sendstr s sock;
|
||||
);
|
||||
|
||||
let s = openfontreq (wid+1) "cursor" in
|
||||
sendstr s sock;
|
||||
|
||||
Array.iteri (fun i glyphindex ->
|
||||
let s = createglyphcursorreq (wid+1) (wid+2+i) glyphindex in
|
||||
sendstr s sock;
|
||||
) [|34;48;50;58;128;152|];
|
||||
|
||||
state.title <- (fun wid s ->
|
||||
let s = changepropreq wid 39 31 8 s in
|
||||
sendstr s sock;
|
||||
);
|
||||
|
||||
sendintern sock "UTF8_STRING" false (fun resp ->
|
||||
let atom = r32 resp 8 in
|
||||
state.title <- (fun wid s ->
|
||||
let s = changepropreq wid 39 atom 8 s in
|
||||
sendstr s sock;
|
||||
);
|
||||
);
|
||||
|
||||
sendintern sock "_NET_WM_STATE" true (fun resp ->
|
||||
let nwmsatom = r32 resp 8 in
|
||||
sendintern sock "_NET_WM_STATE_FULLSCREEN" true (fun resp ->
|
||||
let fsatom = r32 resp 8 in
|
||||
|
||||
state.fullscreen <-
|
||||
(fun wid ->
|
||||
let data = String.make 20 '\000' in
|
||||
state.fs <- not state.fs;
|
||||
w32 data 0 (if state.fs then 1 else 0);
|
||||
w32 data 4 fsatom;
|
||||
|
||||
let cm = clientmessage 32 0 wid nwmsatom data in
|
||||
let s = sendeventreq 0 root 0x180000 cm in
|
||||
sendstr s sock;
|
||||
()
|
||||
);
|
||||
);
|
||||
);
|
||||
glx wid
|
||||
|
||||
| c ->
|
||||
error "unknown conection setup response %d" (Char.code c)
|
||||
;;
|
||||
|
||||
let getauth haddr dnum =
|
||||
let haddr =
|
||||
if haddr = "localhost"
|
||||
then Unix.gethostname ()
|
||||
else haddr
|
||||
in
|
||||
let path = Filename.concat (Sys.getenv "HOME") ".Xauthority" in
|
||||
let ic = open_in_bin path in
|
||||
let input_string ic len =
|
||||
let s = String.create len in
|
||||
really_input ic s 0 len;
|
||||
s;
|
||||
in
|
||||
let r16 s =
|
||||
let rb pos = Char.code (String.get s pos) in
|
||||
(rb 1) lor ((rb 0) lsl 8)
|
||||
in
|
||||
let rec find () =
|
||||
let family = input_string ic 2 in
|
||||
|
||||
let addrlens = input_string ic 2 in
|
||||
let addrlen = r16 addrlens in
|
||||
let addr = input_string ic addrlen in
|
||||
|
||||
let numlens = input_string ic 2 in
|
||||
let numlen = r16 numlens in
|
||||
let num = input_string ic numlen in
|
||||
let num = int_of_string num in
|
||||
|
||||
let namelens = input_string ic 2 in
|
||||
let namelen = r16 namelens in
|
||||
let name = input_string ic namelen in
|
||||
|
||||
let datalens = input_string ic 2 in
|
||||
let datalen = r16 datalens in
|
||||
let data = input_string ic datalen in
|
||||
|
||||
vlog "family %S addr %S(%S) num %d(%d) name %S data %S"
|
||||
family addr haddr num dnum name data;
|
||||
if addr = haddr && num = dnum
|
||||
then name, data
|
||||
else find ()
|
||||
in
|
||||
let name, data =
|
||||
try find () with _ -> "", ""
|
||||
in
|
||||
close_in ic;
|
||||
name, data;
|
||||
;;
|
||||
|
||||
let init t =
|
||||
let d = Sys.getenv "DISPLAY" in
|
||||
let colonpos = String.index d ':' in
|
||||
let host = String.sub d 0 colonpos in
|
||||
let dispnum, screennum =
|
||||
try
|
||||
let dotpos = String.index_from d (colonpos + 1) '.' in
|
||||
let disp = String.sub d (colonpos + 1) (dotpos - colonpos - 1) in
|
||||
let screen = String.sub d (dotpos + 1) (String.length d - dotpos - 1) in
|
||||
int_of_string disp, int_of_string screen
|
||||
with Not_found ->
|
||||
let disp = String.sub d (colonpos + 1) (String.length d - colonpos - 1) in
|
||||
int_of_string disp, 0
|
||||
in
|
||||
let aname, adata = getauth host dispnum in
|
||||
let fd =
|
||||
if String.length host = 0 || host = "unix"
|
||||
then
|
||||
let addr = Unix.ADDR_UNIX ("/tmp/.X11-unix/X" ^ string_of_int dispnum) in
|
||||
let fd = Unix.socket Unix.PF_UNIX Unix.SOCK_STREAM 0 in
|
||||
Unix.connect fd addr;
|
||||
fd
|
||||
else
|
||||
let h = Unix.gethostbyname host in
|
||||
let addr = h.Unix.h_addr_list.(0) in
|
||||
let port = 6000 + dispnum in
|
||||
let fd = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
|
||||
Unix.connect fd (Unix.ADDR_INET (addr, port));
|
||||
fd
|
||||
in
|
||||
cloexec fd;
|
||||
let s = "luMMmmnndduu" in
|
||||
let s = padcat s aname in
|
||||
let s = padcat s adata in
|
||||
w16 s 2 11;
|
||||
w16 s 4 0;
|
||||
w16 s 6 (String.length aname);
|
||||
w16 s 8 (String.length adata);
|
||||
sendstr s fd;
|
||||
state.sock <- fd;
|
||||
setup fd screennum;
|
||||
state.t <- t;
|
||||
fd;
|
||||
;;
|
||||
|
||||
let settitle s =
|
||||
state.title state.idbase s;
|
||||
;;
|
||||
|
||||
let setcursor cursor =
|
||||
let n =
|
||||
match cursor with
|
||||
| CURSOR_INHERIT -> -1
|
||||
| CURSOR_INFO -> 3
|
||||
| CURSOR_CYCLE -> 2
|
||||
| CURSOR_CROSSHAIR -> 0
|
||||
| CURSOR_TEXT -> 5
|
||||
in
|
||||
let s = s32 (if n = -1 then 0 else state.idbase+2+n) in
|
||||
let s = changewindowattributesreq state.idbase (*cursor*)0x4000 s in
|
||||
sendstr s state.sock;
|
||||
;;
|
||||
|
||||
let fullscreen () =
|
||||
state.fullscreen state.idbase;
|
||||
;;
|
||||
|
||||
let withalt mask = mask land 8 != 0;;
|
||||
let withctrl mask = mask land 4 != 0;;
|
||||
let withshift mask = mask land 1 != 0;;
|
||||
30
wsi.mli
Normal file
30
wsi.mli
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
type cursor =
|
||||
| CURSOR_INHERIT
|
||||
| CURSOR_INFO
|
||||
| CURSOR_CYCLE
|
||||
| CURSOR_CROSSHAIR
|
||||
| CURSOR_TEXT
|
||||
;;
|
||||
|
||||
class type t = object
|
||||
method display : unit
|
||||
method reshape : int -> int -> unit
|
||||
method mouse : int -> bool -> int -> int -> int -> unit
|
||||
method motion : int -> int -> unit
|
||||
method pmotion : int -> int -> unit
|
||||
method key : int -> int -> unit
|
||||
end;;
|
||||
|
||||
val setcursor : cursor -> unit;;
|
||||
val settitle : string -> unit;;
|
||||
val swapb : unit -> unit;;
|
||||
val readresp : Unix.file_descr -> unit;;
|
||||
val init : t -> Unix.file_descr;;
|
||||
val fullscreen : unit -> unit;;
|
||||
val reshape : int -> int -> unit;;
|
||||
val withalt : int -> bool;;
|
||||
val withctrl : int -> bool;;
|
||||
val withshift : int -> bool;;
|
||||
val toutf8 : int -> string;;
|
||||
|
||||
exception Quit;;
|
||||
Loading…
Reference in a new issue