fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-09 06:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into xge

Browse source
This commit is contained in:
Peter Hutterer 2008-05-12 17:58:37 +09:30
commit c9b2ff1e6a
30 changed files with 247 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
acinclude.m4
View file

@ -1,4 +1,6 @@
##### http://autoconf-archive.cryp.to/ac_define_dir.html
# ===========================================================================
# http://autoconf-archive.cryp.to/ac_define_dir.html
# ===========================================================================
#
# SYNOPSIS
#
@ -6,11 +8,11 @@
#
# DESCRIPTION
#
# This macro sets VARNAME to the expansion of the DIR variable,
# taking care of fixing up ${prefix} and such.
# This macro sets VARNAME to the expansion of the DIR variable, taking
# care of fixing up ${prefix} and such.
#
# VARNAME is then offered as both an output variable and a C
# preprocessor symbol.
# VARNAME is then offered as both an output variable and a C preprocessor
# symbol.
#
# Example:
#
@ -18,18 +20,18 @@
#
# LAST MODIFICATION
#
# 2006-10-13
# 2008-04-12
#
# COPYLEFT
#
# Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz>
# Copyright (c) 2006 Andreas Schwab <schwab@suse.de>
# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2006 Alexandre Oliva
# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
# Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2008 Alexandre Oliva
#
# Copying and distribution of this file, with or without
# modification, are permitted in any medium without royalty provided
# the copyright notice and this notice are preserved.
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved.
AC_DEFUN([AC_DEFINE_DIR], [
prefix_NONE=

47
configure.ac
View file

@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
1.1.3,
1.1.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@ -14,6 +14,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_HEADER([include/X11/XlibConf.h])
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.1)
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
@ -144,6 +148,17 @@ AC_SUBST(WCHAR32)
AM_CONDITIONAL(OS2, test x$os2 = xtrue)
AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
if test "x$LAUNCHD" = xauto; then
unset LAUNCHD
AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
fi
if test "x$LAUNCHD" = xyes ; then
AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])
fi
AC_ARG_ENABLE(xthreads,
AC_HELP_STRING([--disable-xthreads],
[Disable Xlib support for Multithreading]),
@ -205,31 +220,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
#
# Find keysymdef.h
#
KEYSYMDEF=""
AC_MSG_CHECKING([keysymdef.h])
for flag in $XPROTO_CFLAGS -I/usr/include; do
case "$KEYSYMDEF" in
"")
case "$flag" in
*-I*)
dir=`echo "$flag" | sed 's/ *-I//'`
file="$dir/X11/keysymdef.h"
if test -f "$file"; then
KEYSYMDEF="$file"
fi
;;
esac
;;
esac
done
case "$KEYSYMDEF" in
"")
dir=`pkg-config --variable=includedir xproto`
KEYSYMDEF="$dir/X11/keysymdef.h"
if test -f "$KEYSYMDEF"; then
AC_MSG_RESULT([$KEYSYMDEF])
else
AC_MSG_ERROR([Cannot find keysymdef.h])
;;
*)
AC_MSG_RESULT([$KEYSYMDEF])
;;
esac
fi
AC_SUBST(KEYSYMDEF)
AM_CONDITIONAL(UDC, test xfalse = xtrue)
@ -320,6 +318,7 @@ fi
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([X11])
LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}"
if test "x$GCC" = "xyes"; then

2
include/X11/XlibConf.h.in
View file

@ -1,6 +1,4 @@
/*
* $Id: $
*
* Copyright © 2005 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

2
man/XOpenIM.man
View file

@ -142,7 +142,7 @@
.ny0
.TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and otain input method information
XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information
.SH SYNTAX
.HP
XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char

2
man/XcmsCIELabQueryMaxC.man
View file

@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)

2
man/XcmsCIELuvQueryMaxC.man
View file

@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)

2
man/XcmsColor.man
View file

@ -152,7 +152,7 @@
..
.TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color struture
XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure
.SH STRUCTURES
The structure for
.ZN XcmsColor

2
man/xkb/XkbGetKeyVirtualModMap.man
View file

@ -57,7 +57,7 @@ connection to server
keycode of first key to fetch
.TP
.I \- num
# keys for which virtual mod maps are desired
number of keys for which virtual mod maps are desired
.TP
.I \- xkb
Xkb description where results will be placed

4
modules/im/ximcp/imDefIc.c
View file

@ -949,6 +949,8 @@ _XimProtoSetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
MARK_FOCUSED(ic);
_XimRegisterFilter(ic);
return;
}
@ -994,6 +996,8 @@ _XimProtoUnsetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
UNMARK_FOCUSED(ic);
_XimUnregisterFilter(ic);
return;
}

9
modules/im/ximcp/imDefLkup.c
View file

@ -216,8 +216,13 @@ _XimRespSyncReply(
Xic ic,
BITMASK16 mode)
{
if (mode & XimSYNCHRONUS) /* SYNC Request */
MARK_NEED_SYNC_REPLY(ic);
if (mode & XimSYNCHRONUS) /* SYNC Request */ {
if (IS_FOCUSED(ic))
MARK_NEED_SYNC_REPLY(ic);
else
_XimProcSyncReply(ic->core.im, ic);
}
return True;
}

8
modules/im/ximcp/imThaiIm.c
View file

@ -67,7 +67,13 @@ _XimCheckIfThaiProcessing(im)
char *language;
_XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL);
if(strcmp(language, THAI_LANGUAGE_NAME) == 0) {
if(strcmp(language, THAI_LANGUAGE_NAME) == 0 &&
(strcmp(im->core.im_name, "") == 0 ||
strcmp(im->core.im_name, "BasicCheck") == 0 ||
strcmp(im->core.im_name, "Strict") == 0 ||
strcmp(im->core.im_name, "Thaicat") == 0 ||
strcmp(im->core.im_name, "Passthrough") == 0))
{
return(True);
}
return(False);

3
nls/el_GR.UTF-8/Compose.pre
View file

@ -2382,4 +2382,7 @@ XCOMM Miscellaneous extensions.
<Multi_key> <Greek_delta> <Greek_RHO> : "₯" U20af
<Multi_key> <Greek_delta> <Greek_rho> : "₯" U20af
<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
XCOMM End

74
nls/en_US.UTF-8/Compose.pre
View file

@ -35,6 +35,7 @@ XCOMM Spacing versions of dead accents
<dead_iota> <space> : "ͺ" U37a # GREEK YPOGEGRAMMENI
<dead_iota> <dead_iota> : "ͺ" U37a # GREEK YPOGEGRAMMENI
XCOMM ASCII characters that may be difficult to access
XCOMM on some keyboards.
<Multi_key> <plus> <plus> : "#" numbersign # NUMBER SIGN
@ -211,6 +212,9 @@ XCOMM Other symbols
<Multi_key> <Cyrillic_EN> <Cyrillic_o> : "№" numerosign # NUMERO SIGN
<Multi_key> <Cyrillic_EN> <Cyrillic_O> : "№" numerosign # NUMERO SIGN
<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
XCOMM Part 2
XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
@ -453,6 +457,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U11B7> <U11BB> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
<Multi_key> <U11BC> <U11A9> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
XCOMM Part 3
<Multi_key> <comma> <minus> : "¬" notsign # NOT SIGN
<Multi_key> <minus> <comma> : "¬" notsign # NOT SIGN
<dead_circumflex> <Multi_key> <underscore> <a> : "ª" ordfeminine # FEMININE ORDINAL INDICATOR
@ -540,6 +545,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_diaeresis> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <quotedbl> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <x> <x> : "×" multiply # MULTIPLICATION SIGN
<dead_stroke> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<Multi_key> <slash> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<Multi_key> <KP_Divide> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<dead_grave> <U> : "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
@ -618,6 +624,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <quotedbl> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
<Multi_key> <colon> <minus> : "÷" division # DIVISION SIGN
<Multi_key> <minus> <colon> : "÷" division # DIVISION SIGN
<dead_stroke> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<Multi_key> <slash> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<Multi_key> <KP_Divide> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<dead_grave> <u> : "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
@ -678,8 +685,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <D> : "Ď" U010E # LATIN CAPITAL LETTER D WITH CARON
<dead_caron> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <c> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<dead_stroke> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <slash> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<dead_stroke> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <slash> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<dead_macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
@ -728,8 +737,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<dead_circumflex> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
<Multi_key> <asciicircum> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
<dead_stroke> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <slash> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <KP_Divide> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<dead_stroke> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <slash> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <KP_Divide> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<dead_tilde> <I> : "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
@ -783,8 +794,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<dead_caron> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
<Multi_key> <c> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
<dead_stroke> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<Multi_key> <slash> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<Multi_key> <KP_Divide> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<dead_stroke> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<Multi_key> <slash> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<Multi_key> <KP_Divide> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<dead_acute> <N> : "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
@ -865,8 +878,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<dead_caron> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
<Multi_key> <c> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
<dead_stroke> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
<Multi_key> <slash> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
<Multi_key> <KP_Divide> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
<dead_stroke> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<Multi_key> <slash> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<Multi_key> <KP_Divide> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<dead_tilde> <U> : "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
@ -926,8 +941,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <Z> : "Ž" U017D # LATIN CAPITAL LETTER Z WITH CARON
<dead_caron> <z> : "ž" U017E # LATIN SMALL LETTER Z WITH CARON
<Multi_key> <c> <z> : "ž" U017E # LATIN SMALL LETTER Z WITH CARON
<dead_stroke> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
<Multi_key> <slash> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
<Multi_key> <KP_Divide> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
<dead_stroke> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<Multi_key> <slash> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<Multi_key> <KP_Divide> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<dead_horn> <O> : "Ơ" U01A0 # LATIN CAPITAL LETTER O WITH HORN
@ -938,8 +955,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <plus> <U> : "Ư" U01AF # LATIN CAPITAL LETTER U WITH HORN
<dead_horn> <u> : "ư" U01B0 # LATIN SMALL LETTER U WITH HORN
<Multi_key> <plus> <u> : "ư" U01B0 # LATIN SMALL LETTER U WITH HORN
<dead_stroke> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
<Multi_key> <slash> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
<Multi_key> <KP_Divide> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
<dead_stroke> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<Multi_key> <slash> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<Multi_key> <KP_Divide> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<dead_caron> <A> : "Ǎ" U01CD # LATIN CAPITAL LETTER A WITH CARON
@ -1072,8 +1091,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
<Multi_key> <macron> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
<Multi_key> <underscore> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
<dead_stroke> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
<Multi_key> <slash> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
<Multi_key> <KP_Divide> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
<dead_stroke> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<Multi_key> <slash> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<Multi_key> <KP_Divide> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<dead_caron> <G> : "Ǧ" U01E6 # LATIN CAPITAL LETTER G WITH CARON
@ -1159,6 +1180,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <dead_stroke> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <Multi_key> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
@ -1168,9 +1190,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_stroke> <dead_acute> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<dead_acute> <dead_stroke> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<dead_acute> <Multi_key> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
@ -1180,6 +1204,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<dead_stroke> <dead_acute> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<U030F> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
<U030F> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
<U0311> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
@ -1291,6 +1316,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <macron> <y> : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON
<Multi_key> <underscore> <y> : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON
<Multi_key> <e> <e> : "ə" U0259 # LATIN SMALL LETTER SCHWA
<dead_stroke> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <slash> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <KP_Divide> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <slash> <U0294> : "ʡ" U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE
@ -1663,7 +1689,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U0F90> <U0FB5> : "ྐྵ" U0FB9 # TIBETAN SUBJOINED LETTER KSSA
<Multi_key> <U102E> <U1025> : "ဦ" U1026 # MYANMAR LETTER UU
<U0325> <A> : "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
<dead_belowring> <A> : "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
<U0325> <a> : "ḁ" U1E01 # LATIN SMALL LETTER A WITH RING BELOW
<dead_belowring> <a> : "ḁ" U1E01 # LATIN SMALL LETTER A WITH RING BELOW
<dead_abovedot> <B> : "Ḃ" U1E02 # LATIN CAPITAL LETTER B WITH DOT ABOVE
<Multi_key> <period> <B> : "Ḃ" U1E02 # LATIN CAPITAL LETTER B WITH DOT ABOVE
<dead_abovedot> <b> : "ḃ" U1E03 # LATIN SMALL LETTER B WITH DOT ABOVE
@ -1675,7 +1703,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <b> : "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
<combining_belowdot> <b> : "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
<U0331> <B> : "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
<dead_belowmacron> <B> : "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
<U0331> <b> : "ḇ" U1E07 # LATIN SMALL LETTER B WITH LINE BELOW
<dead_belowmacron> <b> : "ḇ" U1E07 # LATIN SMALL LETTER B WITH LINE BELOW
<dead_acute> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@ -1709,13 +1739,17 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <d> : "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
<combining_belowdot> <d> : "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
<U0331> <D> : "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
<dead_belowmacron> <D> : "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
<U0331> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
<dead_belowmacron> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
<dead_cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<Multi_key> <comma> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<dead_cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<Multi_key> <comma> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<U032D> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
<U032D> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
<dead_grave> <Emacron> : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
<Multi_key> <grave> <Emacron> : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
<dead_grave> <dead_macron> <E> : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
@ -1773,9 +1807,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <Multi_key> <macron> <e> : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
<combining_acute> <Multi_key> <underscore> <e> : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
<U032D> <E> : "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <E> : "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
<U032D> <e> : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <e> : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
<U0330> <E> : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
<dead_belowtilde> <E> : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
<U0330> <e> : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
<dead_belowtilde> <e> : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
<dead_breve> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
@ -1823,9 +1861,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<Multi_key> <comma> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<U032E> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
<dead_belowbreve> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
<U032E> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
<dead_belowbreve> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
<U0330> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
<dead_belowtilde> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
<U0330> <i> : "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
<dead_belowtilde> <i> : "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
<dead_acute> <Idiaeresis> : "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
<Multi_key> <acute> <Idiaeresis> : "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
<Multi_key> <apostrophe> <Idiaeresis> : "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
@ -1865,7 +1907,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <k> : "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
<combining_belowdot> <k> : "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
<U0331> <K> : "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
<dead_belowmacron> <K> : "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
<U0331> <k> : "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
<dead_belowmacron> <k> : "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
<dead_belowdot> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
<Multi_key> <exclam> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
<combining_belowdot> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
@ -1897,9 +1941,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <macron> <combining_belowdot> <l> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <l> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
<U0331> <L> : "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
<dead_belowmacron> <L> : "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
<U0331> <l> : "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
<dead_belowmacron> <l> : "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
<U032D> <L> : "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <L> : "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
<U032D> <l> : "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <l> : "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
<dead_acute> <M> : "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
<Multi_key> <acute> <M> : "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
<Multi_key> <apostrophe> <M> : "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
@ -1929,9 +1977,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <n> : "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
<combining_belowdot> <n> : "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
<U0331> <N> : "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
<dead_belowmacron> <N> : "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
<U0331> <n> : "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
<dead_belowmacron> <n> : "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
<U032D> <N> : "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <N> : "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
<U032D> <n> : "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <n> : "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
<dead_acute> <Otilde> : "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
<Multi_key> <acute> <Otilde> : "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
<Multi_key> <apostrophe> <Otilde> : "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
@ -2083,7 +2135,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <macron> <combining_belowdot> <r> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <r> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
<U0331> <R> : "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
<dead_belowmacron> <R> : "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
<U0331> <r> : "ṟ" U1E5F # LATIN SMALL LETTER R WITH LINE BELOW
<dead_belowmacron> <r> : "ṟ" U1E5F # LATIN SMALL LETTER R WITH LINE BELOW
<dead_abovedot> <S> : "Ṡ" U1E60 # LATIN CAPITAL LETTER S WITH DOT ABOVE
<Multi_key> <period> <S> : "Ṡ" U1E60 # LATIN CAPITAL LETTER S WITH DOT ABOVE
<dead_abovedot> <s> : "ṡ" U1E61 # LATIN SMALL LETTER S WITH DOT ABOVE
@ -2151,15 +2205,25 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <t> : "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
<combining_belowdot> <t> : "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
<U0331> <T> : "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
<dead_belowmacron> <T> : "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
<U0331> <t> : "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
<dead_belowmacron> <t> : "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
<U032D> <T> : "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <T> : "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
<U032D> <t> : "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <t> : "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
<U0324> <U> : "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
<dead_belowdiaeresis> <U> : "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
<U0324> <u> : "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
<dead_belowdiaeresis> <u> : "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
<U0330> <U> : "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
<dead_belowtilde> <U> : "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
<U0330> <u> : "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
<dead_belowtilde> <u> : "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
<U032D> <U> : "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <U> : "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
<U032D> <u> : "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <u> : "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
<dead_acute> <Utilde> : "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
<Multi_key> <acute> <Utilde> : "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
<Multi_key> <apostrophe> <Utilde> : "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
@ -2271,8 +2335,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <exclam> <z> : "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
<combining_belowdot> <z> : "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
<U0331> <Z> : "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
<dead_belowmacron> <Z> : "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
<U0331> <z> : "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
<dead_belowmacron> <z> : "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
<U0331> <h> : "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
<dead_belowmacron> <h> : "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
<dead_diaeresis> <t> : "ẗ" U1E97 # LATIN SMALL LETTER T WITH DIAERESIS
<Multi_key> <quotedbl> <t> : "ẗ" U1E97 # LATIN SMALL LETTER T WITH DIAERESIS
<dead_abovering> <w> : "ẘ" U1E98 # LATIN SMALL LETTER W WITH RING ABOVE
@ -5730,7 +5797,14 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <parenleft> <z> <parenright> : "ⓩ" U24E9 # CIRCLED LATIN SMALL LETTER Z
<Multi_key> <parenleft> <0> <parenright> : "⓪" U24EA # CIRCLED DIGIT ZERO
<Multi_key> <parenleft> <KP_0> <parenright> : "⓪" U24EA # CIRCLED DIGIT ZERO
<dead_belowdot> <plus> : "⨥" U2A25 # PLUS SIGN WITH DOT BELOW
<dead_belowtilde> <plus> : "⨦" U2A26 # PLUS SIGN WITH TILDE BELOW
<dead_belowdot> <minus> : "⨪" U2A2A # MINUS SIGN WITH DOT BELOW
<dead_belowdot> <equal> : "⩦" U2A66 # EQUALS SIGN WITH DOT BELOW
<dead_diaeresis> <dead_belowdiaeresis> <equal> : "⩷" U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
<dead_belowdiaeresis> <dead_diaeresis> <equal> : "⩷" U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
<Multi_key> <U2ADD> <U0338> : "⫝̸" U2ADC # FORKING
<dead_belowring> <bar> : "⫰" U2AF0 # VERTICAL LINE WITH CIRCLE BELOW
<dead_voiced_sound> <U304B> : "が" U304C # HIRAGANA LETTER GA
<dead_voiced_sound> <U304D> : "ぎ" U304E # HIRAGANA LETTER GI
<dead_voiced_sound> <U304F> : "ぐ" U3050 # HIRAGANA LETTER GU

5
nls/locale.alias.pre
View file

@ -916,8 +916,9 @@ ro_RO: ro_RO.ISO8859-2
ro_RO.iso88592: ro_RO.ISO8859-2
ro_RO.ISO-8859-2: ro_RO.ISO8859-2
ro_RO.utf8: ro_RO.UTF-8
ru: ru_RU.ISO8859-5
ru_RU: ru_RU.ISO8859-5
ru: ru_RU.UTF-8
ru_RU: ru_RU.UTF-8
ru_RU.utf8: ru_RU.UTF-8
ru_RU.iso88595: ru_RU.ISO8859-5
ru_RU.ISO-8859-5: ru_RU.ISO8859-5
ru_RU.koi8r: ru_RU.KOI8-R

4
nls/locale.dir.pre
View file

@ -34,7 +34,7 @@ microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
microsoft-cp1251/XLC_LOCALE: bg_BG.CP1251
koi8-r/XLC_LOCALE: bg_BG.KOI8-R
iso8859-2/XLC_LOCALE bs_BA.ISO8859-2
iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
@ -269,7 +269,7 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8
en_US.UTF-8/XLC_LOCALE bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8

3
nls/pt_BR.UTF-8/Compose.pre
View file

@ -185,6 +185,9 @@ XCOMM Other symbols
<Multi_key> <P> <P> : "¶" paragraph # PILCROW SIGN (PARAGRAPH SIGN)
<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
XCOMM Part 2
XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically

42
src/ConnDis.c
View file

@ -303,7 +303,11 @@ _X11TransConnectDisplay (
#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN)
if (!pprotocol) {
#ifdef HAVE_LAUNCHD
if (!phostname || phostname[0]=='/') {
#else
if (!phostname) {
#endif
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
pprotocol = copystring ("local", 5);
#if defined(TCPCONN)
@ -374,13 +378,13 @@ _X11TransConnectDisplay (
* too many times).
*/
for(retry=X_CONNECTION_RETRIES; retry>=0; retry-- )
{
{
if ( (trans_conn = _X11TransOpenCOTSClient(address)) == NULL )
{
{
break;
}
}
if ((connect_stat = _X11TransConnect(trans_conn,address)) < 0 )
{
{
_X11TransClose(trans_conn);
trans_conn = NULL;
@ -391,7 +395,7 @@ _X11TransConnectDisplay (
}
else
break;
}
}
_X11TransGetPeerAddr(trans_conn, &family, &saddrlen, &saddr);
@ -402,7 +406,7 @@ _X11TransConnectDisplay (
*/
if( _X11TransConvertAddress(&family, &saddrlen, &saddr) < 0 )
{
{
_X11TransClose(trans_conn);
trans_conn = NULL;
sleep(1);
@ -412,10 +416,10 @@ _X11TransConnectDisplay (
saddr = NULL;
}
continue;
}
}
break;
}
}
if (address != addrbuf) Xfree (address);
address = addrbuf;
@ -449,6 +453,14 @@ _X11TransConnectDisplay (
*fullnamep = (char *) Xmalloc (len);
if (!*fullnamep) goto bad;
#ifdef HAVE_LAUNCHD
if (phostname && strlen(phostname) > 11 && !strncmp(phostname, "/tmp/launch", 11))
sprintf (*fullnamep, "%s%s%d",
(phostname ? phostname : ""),
(dnet ? "::" : ":"),
idisplay);
else
#endif
sprintf (*fullnamep, "%s%s%d.%d",
(phostname ? phostname : ""),
(dnet ? "::" : ":"),
@ -1109,7 +1121,7 @@ GetAuthorization(
{
#ifdef AF_INET
case AF_INET:
{
{
/*
* addr will contain a sockaddr_in with all
* of the members already in network byte order.
@ -1120,18 +1132,18 @@ GetAuthorization(
for(i=2; i<4; i++) /* do sin_port */
xdmcp_data[j++] = ((char *)addr)[i];
break;
}
}
#endif /* AF_INET */
#if defined(IPv6) && defined(AF_INET6)
case AF_INET6:
/* XXX This should probably never happen */
{
{
unsigned char ipv4mappedprefix[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
/* In the case of v4 mapped addresses send the v4
part of the address - addr is already in network byte order */
if (memcmp(addr+8, ipv4mappedprefix, 12) == 0) {
if (memcmp((char*)addr+8, ipv4mappedprefix, 12) == 0) {
for (i = 20 ; i < 24; i++)
xdmcp_data[j++] = ((char *)addr)[i];
@ -1146,11 +1158,11 @@ GetAuthorization(
}
}
break;
}
}
#endif /* AF_INET6 */
#ifdef AF_UNIX
case AF_UNIX:
{
{
/*
* We don't use the sockaddr_un for this encoding.
* Instead, we create a sockaddr_in filled with
@ -1179,7 +1191,7 @@ GetAuthorization(
xdmcp_data[j++] = (the_port >> 8) & 0xFF;
xdmcp_data[j++] = (the_port >> 0) & 0xFF;
break;
}
}
#endif /* AF_UNIX */
#ifdef AF_DECnet
case AF_DECnet:

8
src/GetDflt.c
View file

@ -98,16 +98,16 @@ GetHomeDir(
int len)
{
#ifdef WIN32
register char *ptr1;
register char *ptr2;
register char *ptr1 = NULL;
register char *ptr2 = NULL;
int len1 = 0, len2 = 0;
if (ptr1 = getenv("HOME")) { /* old, deprecated */
if ((ptr1 = getenv("HOME"))) { /* old, deprecated */
len1 = strlen (ptr1);
} else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
len1 = strlen (ptr1);
len2 = strlen (ptr2);
} else if (ptr2 = getenv("USERNAME")) {
} else if ((ptr2 = getenv("USERNAME"))) {
len1 = strlen (ptr1 = "/users/");
len2 = strlen (ptr2);
}

13
src/Makefile.am
View file

@ -402,6 +402,19 @@ lint: $(BUILT_SOURCES)
done
endif LINT
if MAKE_LINT_LIB
lintlibdir = $(libdir)
lintlib_DATA = $(LINTLIB)
lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
CLEANFILES += $(lintlib_DATA)
$(LINTLIB): $(libX11_la_SOURCES)
$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
endif MAKE_LINT_LIB
#
# Building ks_tables.h requires the makekeys utility
#

1
src/WMProps.c
View file

@ -71,6 +71,7 @@ SOFTWARE.
* WM_CLIENT_MACHINE type: TEXT format: varies?
* WM_NORMAL_HINTS type: WM_SIZE_HINTS format: 32
* WM_CLASS type: STRING/STRING format: 8
* WM_LOCALE_NAME type: STRING format: 8
*/
void XSetWMProperties (

10
src/XErrorDB
View file

@ -634,7 +634,7 @@ XProtoError.XFree86-Misc.5: XF86MiscModInDevDisabled
XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
XProtoError.XFree86-Misc.7: XF86MiscNoModule
! XFree86-DGA -- not an X Consortium standard
XRequest.XFree86-DGA.0: XDGAQueryVersion
XRequest.XFree86-DGA.0: XF86DGAQueryVersion
XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
XRequest.XFree86-DGA.2: XF86DGADirectVideo
XRequest.XFree86-DGA.3: XF86DGAGetViewPortSize
@ -891,6 +891,12 @@ XRequest.RENDER.27: RenderCreateCursor
XRequest.RENDER.28: RenderSetPictureTransform
XRequest.RENDER.29: RenderQueryFilters
XRequest.RENDER.30: RenderSetPictureFilter
XRequest.RENDER.31: RenderCreateAnimCursor
XRequest.RENDER.32: RenderAddTraps
XRequest.RENDER.33: RenderCreateSolidFill
XRequest.RENDER.34: RenderCreateLinearGradient
XRequest.RENDER.35: RenderCreateRadialGradient
XRequest.RENDER.36: RenderCreateConicalGradient
XProtoError.RENDER.0: RenderBadFormat (invalid PictFormat parameter)
XlibMessage.RENDER.0: PictFormat id in failed request: 0x%lx
XProtoError.RENDER.1: RenderBadPicture (invalid Picture parameter)
@ -931,6 +937,8 @@ XRequest.XFIXES.25: XFixesGetCursorImageAndName
XRequest.XFIXES.26: XFixesChangeCursor
XRequest.XFIXES.27: XFixesChangeCursorByName
XRequest.XFIXES.28: XFixesExpandRegion
XRequest.XFIXES.29: XFixesHideCursor
XRequest.XFIXES.30: XFixesShowCursor
XProtoError.XFIXES.0: BadRegion (invalid Region parameter)
XlibMessage.XFIXES.0: Region id in failed request: 0x%lx
! DAMAGE extension

21
src/XlibInt.c
View file

@ -201,8 +201,6 @@ static char *_XAsyncReply(
Bool discard);
#endif /* !USE_XCB */
#define SEQLIMIT (65535 - (BUFSIZE / SIZEOF(xReq)) - 10)
/*
* The following routines are internal routines used by Xlib for protocol
* packet transmission and reception.
@ -565,33 +563,42 @@ _XWaitForReadable(
}
#endif /* !USE_XCB */
static int sync_hazard(Display *dpy)
{
unsigned long span = dpy->request - dpy->last_request_read;
unsigned long hazard = min((dpy->bufmax - dpy->buffer) / SIZEOF(xReq), 65535 - 10);
return span >= 65535 - hazard - 10;
}
static
int _XSeqSyncFunction(
register Display *dpy)
{
xGetInputFocusReply rep;
register xReq *req;
int sent_sync = 0;
LockDisplay(dpy);
if ((dpy->request - dpy->last_request_read) >= (BUFSIZE / SIZEOF(xReq))) {
if ((dpy->request - dpy->last_request_read) >= (65535 - BUFSIZE/SIZEOF(xReq))) {
GetEmptyReq(GetInputFocus, req);
(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
sent_sync = 1;
}
/* could get XID handler while waiting for reply in MT env */
if (dpy->synchandler == _XSeqSyncFunction) {
if (dpy->synchandler == _XSeqSyncFunction && !sync_hazard(dpy)) {
dpy->synchandler = dpy->savedsynchandler;
dpy->flags &= ~XlibDisplayPrivSync;
}
UnlockDisplay(dpy);
SyncHandle();
if (sent_sync)
SyncHandle();
return 0;
}
void _XSetSeqSyncFunction(
register Display *dpy)
{
if ((dpy->request - dpy->last_request_read) >= SEQLIMIT &&
!(dpy->flags & XlibDisplayPrivSync)) {
if (!(dpy->flags & XlibDisplayPrivSync) && sync_hazard(dpy)) {
dpy->savedsynchandler = dpy->synchandler;
dpy->synchandler = _XSeqSyncFunction;
dpy->flags |= XlibDisplayPrivSync;

2
src/locking.c
View file

@ -60,7 +60,7 @@ extern LockInfoPtr _Xi18n_lock;
#ifdef WIN32
static DWORD _X_TlsIndex = (DWORD)-1;
_Xthread_init()
void _Xthread_init()
{
if (_X_TlsIndex == (DWORD)-1)
_X_TlsIndex = TlsAlloc();

2
src/x11_trans.c
View file

@ -1,6 +1,4 @@
/*
* $Id: x11_trans.c,v 1.2 2005/05/16 22:35:28 sandmann Exp $
*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its

21
src/xcb_disp.c
View file

@ -63,13 +63,22 @@ int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *scr
if(!dpy->xcb)
return 0;
if(!xcb_parse_display(display, &host, &n, screenp))
return 0;
#ifdef HAVE_LAUNCHD
if(!display || !*display) display = getenv("DISPLAY");
if(display && strlen(display)>11 && !strncmp(display, "/tmp/launch", 11)) {
/* do nothing -- the magic happens inside of xcb_connect */
} else
#endif
{
if(!xcb_parse_display(display, &host, &n, screenp))
return 0;
len = strlen(host) + (1 + 20 + 1 + 20 + 1);
*fullnamep = Xmalloc(len);
snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
free(host);
len = strlen(host) + (1 + 20 + 1 + 20 + 1);
*fullnamep = Xmalloc(len);
snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
free(host);
}
_XLockMutex(_Xglobal_lock);
if(xauth.name && xauth.data)

9
src/xcms/cmsColNm.c
View file

@ -735,10 +735,17 @@ LoadColornameDB(void)
}
if ((stream = _XFopenFile (pathname, "r")) == NULL) {
/* can't open file */
XcmsColorDbState = XcmsDbInitFailure;
return(XcmsFailure);
}
stringSectionSize(stream, &nEntries, &size);
if (stringSectionSize(stream, &nEntries, &size) != XcmsSuccess ||
nEntries == 0) {
(void) fclose(stream);
XcmsColorDbState = XcmsDbInitFailure;
return(XcmsFailure);
}
rewind(stream);
strings = (char *) Xmalloc(size);

2
src/xkb/XKBBind.c
View file

@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
changes= xkbi->changes;
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
#ifdef DEBUG
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
xkbi->flags&= ~XkbMapPending;
bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
}
UnlockDisplay(dpy);
return rtrn;
}
return BadMatch;

8
src/xlibi18n/XimintP.h
View file

@ -244,6 +244,7 @@ typedef struct _XicProtoPrivateRec {
#define IC_CONNECTED (1L)
#define FABLICATED (1L << 1)
#define NEED_SYNC_REPLY (1L << 2)
#define FOCUSED (1L << 3)
/*
* macro for the flag of XICPrivateRec
@ -269,6 +270,13 @@ typedef struct _XicProtoPrivateRec {
#define UNMARK_NEED_SYNC_REPLY(ic) \
(((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY)
#define IS_FOCUSED(ic) \
(((Xic)ic)->private.proto.flag & FOCUSED)
#define MARK_FOCUSED(ic) \
(((Xic)ic)->private.proto.flag |= FOCUSED)
#define UNMARK_FOCUSED(ic) \
(((Xic)ic)->private.proto.flag &= ~FOCUSED)
/*
* macro for the filter_event_mask of XICPrivateRec
*/

2
src/xlibi18n/lcWrap.c
View file

@ -154,7 +154,7 @@ _XlcDefaultMapModifiers(
#ifdef WIN32
{
char *s;
for (s = mods; s = strchr(s, '@'); s++) {
for (s = mods; (s = strchr(s, '@')); s++) {
for (s++; *s && *s != '='; s++) {
if (*s == '#') {
*s = '=';

2
src/xlibi18n/xim_trans.c
View file

@ -1,6 +1,4 @@
/*
* $Id: xim_trans.c,v 1.1 2005/07/11 08:29:25 keithp Exp $
*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its