libx11: Changes to 'upstream-unstable'
configure.ac | 10 +-
cpprules.in | 1
include/X11/Xlibint.h | 2
man/XCreateColormap.man | 2
man/XCreateFontCursor.man | 2
man/XReadBitmapFile.man | 2
modules/lc/def/lcDefConv.c | 2
modules/lc/gen/lcGenConv.c | 2
modules/lc/xlocale/lcJis.c | 2
nls/Makefile.am | 2
nls/compose.dir.pre | 11 ++
nls/el_GR.UTF-8/Compose.pre | 8 -
nls/en_US.UTF-8/Compose.pre | 12 +-
nls/fi_FI.UTF-8/Compose.pre | 8 -
nls/fi_FI.UTF-8/Makefile.am | 2
nls/iso8859-1/Compose.pre | 16 +--
nls/iso8859-15/Compose.pre | 8 -
nls/iso8859-9/Compose.pre | 8 -
nls/iso8859-9e/Compose.pre | 8 -
nls/locale.alias.pre | 97 ++++++++++++----------
nls/locale.dir.pre | 12 ++
nls/pt_BR.UTF-8/Compose.pre | 8 -
nls/ru_RU.UTF-8/Compose.pre | 1
nls/ru_RU.UTF-8/Makefile.am | 3
nls/ru_RU.UTF-8/XI18N_OBJS | 7 +
nls/ru_RU.UTF-8/XLC_LOCALE.pre | 169 +++++++++++++++++++++++++++++++++++++++
src/CrGlCur.c | 4
src/ErrDes.c | 2
src/ImUtil.c | 2
src/OpenDis.c | 4
src/ParseGeom.c | 18 ----
src/Region.c | 146 ---------------------------------
src/XErrorDB | 58 +++++++++++++
src/XlibInt.c | 12 --
src/Xrm.c | 6 -
src/locking.c | 107 ++++++++----------------
src/util/makekeys.c | 16 ++-
src/xcb_io.c | 4
src/xkb/XKBBind.c | 2
src/xlibi18n/lcUniConv/ksc5601.h | 12 +-
x11.pc.in | 2
41 files changed, 439 insertions(+), 361 deletions(-)
New commits:
commit eac57c77afdf44f50692225b8b0345a7c927bc84
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Apr 7 15:38:45 2009 -0700
Version bump: 1.2.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index e0f1aa7..b4593f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
- 1.2,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
commit bfbec08baec33c5024510b0bcbbee6e4a8473e79
Author: Yaakov Selkowitz (Cygwin Ports maintainer) <yselkowitz@users.sourceforge.net>
Date: Tue Apr 7 13:46:57 2009 -0700
Bug 20773: Xcursor dynamic loading on Cygwin
X.Org Bug #20773 <http://bugs.freedesktop.org/show_bug.cgi?id=20773>
Patch #24096 <http://bugs.freedesktop.org/attachment.cgi?id=24096>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/CrGlCur.c b/src/CrGlCur.c
index d698d96..8125593 100644
--- a/src/CrGlCur.c
+++ b/src/CrGlCur.c
@@ -46,6 +46,10 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Cr.h"
+#ifdef __CYGWIN__
+#define LIBXCURSOR "cygXcursor-1.dll"
+#endif
+
#if defined(hpux)
typedef shl_dt XModuleType;
#else
commit c8c41614911be4fa222fa22478677d263b41c751
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 6 16:52:46 2009 -0700
Fix a several sparse warnings: Using plain integer as NULL pointer
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/ImUtil.c b/src/ImUtil.c
index e79ec15..3576856 100644
--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -374,7 +374,7 @@ XImage *XCreateImage (
if (image_bytes_per_line == 0) {
image->bytes_per_line = min_bytes_per_line;
} else if (image_bytes_per_line < min_bytes_per_line) {
- return 0;
+ return NULL;
} else {
image->bytes_per_line = image_bytes_per_line;
}
diff --git a/src/OpenDis.c b/src/OpenDis.c
index 2d61be1..29ac65c 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -167,8 +167,8 @@ XOpenDisplay (
#if USE_XCB
if(!_XConnectXCB(dpy, display, &fullname, &iscreen)) {
dpy->display_name = fullname;
- OutOfMemory(dpy, 0);
- return 0;
+ OutOfMemory(dpy, NULL);
+ return NULL;
}
#else /* !USE_XCB */
if ((dpy->trans_conn = _X11TransConnectDisplay (
diff --git a/src/XlibInt.c b/src/XlibInt.c
index 0a0c537..ad91400 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -3282,7 +3282,7 @@ Screen *_XScreenOfWindow(Display *dpy, Window w)
if (XGetGeometry (dpy, w, &root, &x, &y, &width, &height,
&bw, &depth) == False) {
- return None;
+ return NULL;
}
for (i = 0; i < ScreenCount (dpy); i++) { /* find root from list */
if (root == RootWindow (dpy, i)) {
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index a349deb..556917b 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -632,7 +632,7 @@ XkbTranslateKeySym( register Display * dpy,
}
if (change) {
if (n==1)
- *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,0);
+ *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,NULL);
else *sym_rtrn= NoSymbol;
}
}
commit b336c3d0cc2aefc8926500cff5f76b5a3e803886
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 6 16:32:05 2009 -0700
Further ansify prototypes & reduce #ifdefs in locking.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/locking.c b/src/locking.c
index c421e0c..8c85bad 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -52,6 +52,17 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h> /* for warn/debug stuff */
#endif
+/* Additional arguments for source code location lock call was made from */
+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
+# define XTHREADS_FILE_LINE_ARGS \
+ , \
+ char* file, /* source file, from macro */ \
+ int line
+#else
+# define XTHREADS_FILE_LINE_ARGS /* None */
+#endif
+
+
#define NUM_FREE_CVLS 4
/* in lcWrap.c */
@@ -60,14 +71,14 @@ extern LockInfoPtr _Xi18n_lock;
#ifdef WIN32
static DWORD _X_TlsIndex = (DWORD)-1;
-void _Xthread_init()
+void _Xthread_init(void)
{
if (_X_TlsIndex == (DWORD)-1)
_X_TlsIndex = TlsAlloc();
}
struct _xthread_waiter *
-_Xthread_waiter()
+_Xthread_waiter(void)
{
struct _xthread_waiter *me;
@@ -89,28 +100,18 @@ static xthread_t _Xthread_self(void)
static LockInfoRec global_lock;
static LockInfoRec i18n_lock;
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XLockMutex(lip,file,line)
- LockInfoPtr lip;
- char* file;
- int line;
-#else
static void _XLockMutex(
- LockInfoPtr lip)
-#endif
+ LockInfoPtr lip
+ XTHREADS_FILE_LINE_ARGS
+ )
{
xmutex_lock(lip->lock);
}
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XUnlockMutex(
- LockInfoPtr lip,
- char* file,
- int line)
-#else
static void _XUnlockMutex(
- LockInfoPtr lip)
-#endif
+ LockInfoPtr lip
+ XTHREADS_FILE_LINE_ARGS
+ )
{
xmutex_unlock(lip->lock);
}
@@ -202,15 +203,10 @@ static void _XLockDisplayWarn(
}
#endif /* XTHREADS_WARN */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XUnlockDisplay(dpy,file,line)
- Display *dpy;
- char *file;
- int line;
-#else
static void _XUnlockDisplay(
- Display *dpy)
-#endif
+ Display *dpy
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
xthread_t self = xthread_self();
@@ -330,17 +326,11 @@ static void _XPopReader(
}
}
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionWait(cv, mutex,file,line)
- xcondition_t cv;
- xmutex_t mutex;
- char *file;
- int line;
-#else
static void _XConditionWait(
xcondition_t cv,
- xmutex_t mutex)
-#endif
+ xmutex_t mutex
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
xthread_t self = xthread_self();
@@ -381,15 +371,10 @@ static void _XConditionWait(
#endif /* XTHREADS_WARN */
}
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionSignal(cv,file,line)
- xcondition_t cv;
- char *file;
- int line;
-#else
static void _XConditionSignal(
- xcondition_t cv)
-#endif
+ xcondition_t cv
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
#ifdef XTHREADS_DEBUG
@@ -400,15 +385,10 @@ static void _XConditionSignal(
}
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XConditionBroadcast(cv,file,line)
- xcondition_t cv;
- char *file;
- int line;
-#else
static void _XConditionBroadcast(
- xcondition_t cv)
-#endif
+ xcondition_t cv
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
#ifdef XTHREADS_DEBUG
@@ -469,15 +449,10 @@ static void _XDisplayLockWait(
}
}
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XLockDisplay(dpy, file, line)
- Display *dpy;
- char *file; /* source file, from macro */
- int line;
-#else
static void _XLockDisplay(
- Display *dpy)
-#endif
+ Display *dpy
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
_XLockDisplayWarn(dpy, file, line);
@@ -492,17 +467,11 @@ static void _XLockDisplay(
* _XReply is allowed to exit from select/poll and clean up even if a
* user-level lock is in force, so it uses this instead of _XFancyLockDisplay.
*/
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-static void _XInternalLockDisplay(dpy, wskip, file, line)
- Display *dpy;
- Bool wskip;
- char *file; /* source file, from macro */
- int line;
-#else
static void _XInternalLockDisplay(
Display *dpy,
- Bool wskip)
-#endif
+ Bool wskip
+ XTHREADS_FILE_LINE_ARGS
+ )
{
#ifdef XTHREADS_WARN
_XLockDisplayWarn(dpy, file, line);
@@ -646,7 +615,7 @@ Status XInitThreads(void)
}
#else /* XTHREADS */
-Status XInitThreads()
+Status XInitThreads(void)
{
return 0;
}
commit 892b401d5acc055803a20e349ede0d64490f2230
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 6 10:50:09 2009 -0700
Change masculine to ordmasculine in Compose file comments
Matches the ordfeminine name used for the matching character,
and the ordmasculine name used in many font descriptions of the glyph.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index 8d29684..d96b00d 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -127,10 +127,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "ª" ordfeminine
<Multi_key> <A> <underscore> : "ª" ordfeminine
<Multi_key> <underscore> <A> : "ª" ordfeminine
-<Multi_key> <o> <underscore> : "º" masculine
-<Multi_key> <underscore> <o> : "º" masculine
-<Multi_key> <O> <underscore> : "º" masculine
-<Multi_key> <underscore> <O> : "º" masculine
+<Multi_key> <o> <underscore> : "º" ordmasculine
+<Multi_key> <underscore> <o> : "º" ordmasculine
+<Multi_key> <O> <underscore> : "º" ordmasculine
+<Multi_key> <underscore> <O> : "º" ordmasculine
<Multi_key> <less> <less> : "«" guillemotleft
<Multi_key> <greater> <greater> : "»" guillemotright
<Multi_key> <0> <asciicircum> : "°" degree
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 7c46ddb..04eccf4 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -483,10 +483,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS
diff --git a/nls/fi_FI.UTF-8/Compose.pre b/nls/fi_FI.UTF-8/Compose.pre
index 9185896..5c5ba0b 100644
--- a/nls/fi_FI.UTF-8/Compose.pre
+++ b/nls/fi_FI.UTF-8/Compose.pre
@@ -479,10 +479,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS
diff --git a/nls/iso8859-1/Compose.pre b/nls/iso8859-1/Compose.pre
index cbdf9cc..3b25956 100644
--- a/nls/iso8859-1/Compose.pre
+++ b/nls/iso8859-1/Compose.pre
@@ -104,10 +104,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
-<Multi_key> <o> <underscore> : "\272" masculine
-<Multi_key> <underscore> <o> : "\272" masculine
-<Multi_key> <O> <underscore> : "\272" masculine
-<Multi_key> <underscore> <O> : "\272" masculine
+<Multi_key> <o> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <o> : "\272" ordmasculine
+<Multi_key> <O> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree
@@ -570,10 +570,10 @@ Ctrl<T> <a> <underscore> : "\252" ordfeminine
Ctrl<T> <underscore> <a> : "\252" ordfeminine
Ctrl<T> <A> <underscore> : "\252" ordfeminine
Ctrl<T> <underscore> <A> : "\252" ordfeminine
-Ctrl<T> <o> <underscore> : "\272" masculine
-Ctrl<T> <underscore> <o> : "\272" masculine
-Ctrl<T> <O> <underscore> : "\272" masculine
-Ctrl<T> <underscore> <O> : "\272" masculine
+Ctrl<T> <o> <underscore> : "\272" ordmasculine
+Ctrl<T> <underscore> <o> : "\272" ordmasculine
+Ctrl<T> <O> <underscore> : "\272" ordmasculine
+Ctrl<T> <underscore> <O> : "\272" ordmasculine
Ctrl<T> <less> <less> : "\253" guillemotleft
Ctrl<T> <greater> <greater> : "\273" guillemotright
Ctrl<T> <0> <asciicircum> : "\260" degree
diff --git a/nls/iso8859-15/Compose.pre b/nls/iso8859-15/Compose.pre
index 9f80d88..9aaeab8 100644
--- a/nls/iso8859-15/Compose.pre
+++ b/nls/iso8859-15/Compose.pre
@@ -100,10 +100,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
-<Multi_key> <o> <underscore> : "\272" masculine
-<Multi_key> <underscore> <o> : "\272" masculine
-<Multi_key> <O> <underscore> : "\272" masculine
-<Multi_key> <underscore> <O> : "\272" masculine
+<Multi_key> <o> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <o> : "\272" ordmasculine
+<Multi_key> <O> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree
diff --git a/nls/iso8859-9/Compose.pre b/nls/iso8859-9/Compose.pre
index f5d67d0..76cc967 100644
--- a/nls/iso8859-9/Compose.pre
+++ b/nls/iso8859-9/Compose.pre
@@ -98,10 +98,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
-<Multi_key> <o> <underscore> : "\272" masculine
-<Multi_key> <underscore> <o> : "\272" masculine
-<Multi_key> <O> <underscore> : "\272" masculine
-<Multi_key> <underscore> <O> : "\272" masculine
+<Multi_key> <o> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <o> : "\272" ordmasculine
+<Multi_key> <O> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree
diff --git a/nls/iso8859-9e/Compose.pre b/nls/iso8859-9e/Compose.pre
index 2bbb2bd..523583a 100644
--- a/nls/iso8859-9e/Compose.pre
+++ b/nls/iso8859-9e/Compose.pre
@@ -97,10 +97,10 @@ XCOMM Special Character
<Multi_key> <underscore> <a> : "\252" ordfeminine
<Multi_key> <A> <underscore> : "\252" ordfeminine
<Multi_key> <underscore> <A> : "\252" ordfeminine
-<Multi_key> <o> <underscore> : "\272" masculine
-<Multi_key> <underscore> <o> : "\272" masculine
-<Multi_key> <O> <underscore> : "\272" masculine
-<Multi_key> <underscore> <O> : "\272" masculine
+<Multi_key> <o> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <o> : "\272" ordmasculine
+<Multi_key> <O> <underscore> : "\272" ordmasculine
+<Multi_key> <underscore> <O> : "\272" ordmasculine
<Multi_key> <less> <less> : "\253" guillemotleft
<Multi_key> <greater> <greater> : "\273" guillemotright
<Multi_key> <0> <asciicircum> : "\260" degree
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index 7961893..7003644 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -447,10 +447,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS
commit e3198b55dc16ec57346cc28aa8d34165ce8cde96
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 13 13:52:33 2009 +0100
Add a ru_RU.UTF-8 locale
Based on patch by Eugene Konev <ejka@imfi.kspu.ru> for X.Org 6.9.0.
Debian bug#330144 <http://bugs.debian.org/330144>
X.Org bug#15887 <http://bugs.freedesktop.org/show_bug.cgi?id=15887>
diff --git a/configure.ac b/configure.ac
index afcf02a..e0f1aa7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,7 @@ AC_OUTPUT([Makefile
nls/mulelao-1/Makefile
nls/nokhchi-1/Makefile
nls/pt_BR.UTF-8/Makefile
+ nls/ru_RU.UTF-8/Makefile
nls/tatar-cyr/Makefile
nls/th_TH/Makefile
nls/th_TH.UTF-8/Makefile
diff --git a/cpprules.in b/cpprules.in
index 12964fa..52e34a0 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -22,6 +22,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
+ -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
-e '/\@\@$$/s/\@\@$$/\\/'
.pre:
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 62ca44d..d6ec4e1 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -54,6 +54,7 @@ SUBDIRS= \
mulelao-1 \
nokhchi-1 \
pt_BR.UTF-8 \
+ ru_RU.UTF-8 \
tatar-cyr \
th_TH \
th_TH.UTF-8 \
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 3e2c8ef..4465568 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -394,7 +394,7 @@ en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
-en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
+ru_RU.UTF-8/XLC_LOCALE: ru_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
diff --git a/nls/ru_RU.UTF-8/Compose.pre b/nls/ru_RU.UTF-8/Compose.pre
new file mode 100644
index 0000000..6c2c411
--- /dev/null
+++ b/nls/ru_RU.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/nls/ru_RU.UTF-8/Makefile.am b/nls/ru_RU.UTF-8/Makefile.am
new file mode 100644
index 0000000..f138e53
--- /dev/null
+++ b/nls/ru_RU.UTF-8/Makefile.am
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+
+include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ru_RU.UTF-8/XI18N_OBJS b/nls/ru_RU.UTF-8/XI18N_OBJS
new file mode 100644
index 0000000..842fc27
--- /dev/null
+++ b/nls/ru_RU.UTF-8/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
+# XI18N objects table for ru_RU.UTF-8 locale
+#
+XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
diff --git a/nls/ru_RU.UTF-8/XLC_LOCALE.pre b/nls/ru_RU.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 0000000..d2f397e
--- /dev/null
+++ b/nls/ru_RU.UTF-8/XLC_LOCALE.pre
@@ -0,0 +1,169 @@
+XCOMM
+XCOMM XLocale Database Sample for ru_RU.UTF-8
+XCOMM Derived from en_US.UTF-8
+XCOMM
+
+XCOMM
+XCOMM XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+
+on_demand_loading True
+
+object_name generic
+
+XCOMM fs0 class (7 bit ASCII)
+fs0 {
+ charset {
+ name ISO8859-1:GL
+ }
+ font {
+ primary ISO8859-1:GL
+ vertical_rotate all
+ }
+}
+XCOMM fs1 class (ISO8859 families)
+fs1 {
+ charset {
+ name ISO8859-1:GR
+ }
+ font {
+ primary ISO8859-1:GR
+ }
+}
+XCOMM fs2 class (KOI8-R)
+fs2 {
+ charset {
+ name KOI8-R:GR
+ }
+ font {
+ primary KOI8-R:GR
+ }
+}
+XCOMM fs3 class (MICROSOFT-CP1251)
+fs3 {
+ charset {
+ name MICROSOFT-CP1251:GR
+ }
+ font {
+ primary MICROSOFT-CP1251:GR
+ }
+}
+XCOMM fs4 class (ISO8859-5)
+fs4 {
+ charset {
+ name ISO8859-5:GR
+ }
+ font {
+ primary ISO8859-5:GR
+ }
+}
+XCOMM fs5 class (Kanji)
+fs5 {
+ charset {
+ name JISX0208.1983-0:GL
+ }
+ font {
+ primary JISX0208.1983-0:GL
+ }
+}
+XCOMM fs6 class (Korean Character)
+fs6 {
+ charset {
+ name KSC5601.1987-0:GL
+ }
+ font {
+ primary KSC5601.1987-0:GL
+ }
+}
+XCOMM fs7 class (Chinese Han Character)
+fs7 {
+ charset {
+ name GB2312.1980-0:GL
+ }
+ font {
+ primary GB2312.1980-0:GL
+ }
+}
+XCOMM fs8 class (Half Kana)
+fs8 {
+ charset {
+ name JISX0201.1976-0:GR
+ }
+ font {
+ primary JISX0201.1976-0:GR
+ vertical_rotate all
+ }
+}
+XCOMM ISO10646 should come last so the fonts above will actually be used
+XCOMM fs9 class
+fs9 {
+ charset {
+ name ISO10646-1
+ }
+ font {
+ primary ISO10646-1
+ }
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name UTF-8
+mb_cur_max 6
+state_depend_encoding False
+
+XCOMM cs0 class
+cs0 {
+ side GL:Default
+ length 1
+ ct_encoding ISO8859-1:GL
+}
+
+XCOMM cs1 class
+cs1 {
+ side GR:Default
+ length 1
+ ct_encoding ISO8859-1:GR
+}
+
+XCOMM cs2 class
+cs2 {
+ side GR
+ length 2
+ ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
+
+}
+
+XCOMM cs3 class
+cs3 {
+ side GL
+ length 2
+ ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR
+
+}
+
+XCOMM cs4 class
+cs4 {
+ side GR
+ length 2
+ ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
+XCOMM cs5 class
+cs5 {
+ side GR
+ length 1
+ ct_encoding JISX0201.1976-0:GR
+}
+
+XCOMM cs6 class
+cs6 {
+ side none
+ ct_encoding ISO10646-1
+}
+
+END XLC_XLOCALE
commit d239de9452691d6f875e6e5ace3d499ec3bf14d9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Mar 25 17:59:09 2009 -0700
Delete some unused "#ifdef notdef" static functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/ParseGeom.c b/src/ParseGeom.c
index 0fe9d08..ba6e45e 100644
--- a/src/ParseGeom.c
+++ b/src/ParseGeom.c
@@ -35,24 +35,6 @@ from The Open Group.
#include "Xlibint.h"
#include "Xutil.h"
-#ifdef notdef
-/*
- *Returns pointer to first char ins search which is also in what, else NULL.
- */
-static char *strscan (search, what)
-char *search, *what;
-{
- int i, len = strlen (what);
- char c;
-
- while ((c = *(search++)) != NULL)
- for (i = 0; i < len; i++)
- if (c == what [i])
- return (--search);
- return (NULL);
-}
-#endif
-
/*
* XParseGeometry parses strings of the form
* "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
diff --git a/src/Region.c b/src/Region.c
index d5200da..7d7e596 100644
--- a/src/Region.c
+++ b/src/Region.c
@@ -397,23 +397,6 @@ XShrinkRegion(
return 0;
}
-#ifdef notdef
-/***********************************************************
- * Bop down the array of rects until we have passed
- * scanline y. numRects is the size of the array.
- ***********************************************************/
-
-static BOX
-*IndexRects(
- register BOX *rects,
- register int numRects,
- register int y)
-{
- while ((numRects--) && (rects->y2 <= y))
- rects++;
- return(rects);
-}
-#endif
/*======================================================================
* Region Intersection
@@ -555,135 +538,6 @@ miRegionCopy(
}
}
-#ifdef notdef
-
-/*
- * combinRegs(newReg, reg1, reg2)
- * if one region is above or below the other.
-*/
-
-static void
-combineRegs(
- register Region newReg,
- Region reg1,
- Region reg2)
-{
- register Region tempReg;
- register BOX *rects;
- register BOX *rects1;
- register BOX *rects2;
- register int total;
-
- rects1 = reg1->rects;
- rects2 = reg2->rects;
-
- total = reg1->numRects + reg2->numRects;
- if (! (tempReg = XCreateRegion()))
- return;
- tempReg->size = total;
- /* region 1 is below region 2 */
- if (reg1->extents.y1 > reg2->extents.y1)
- {
- miRegionCopy(tempReg, reg2);
- rects = &tempReg->rects[tempReg->numRects];
- total -= tempReg->numRects;
- while (total--)
- *rects++ = *rects1++;
- }
- else
- {
- miRegionCopy(tempReg, reg1);
- rects = &tempReg->rects[tempReg->numRects];
- total -= tempReg->numRects;
- while (total--)
- *rects++ = *rects2++;
- }
- tempReg->extents = reg1->extents;
- tempReg->numRects = reg1->numRects + reg2->numRects;
- EXTENTS(®2->extents, tempReg);
- miRegionCopy(newReg, tempReg);
- Xfree((char *)tempReg);
-}
-
-/*
- * QuickCheck checks to see if it does not have to go through all the
- * the ugly code for the region call. It returns 1 if it did all
- * the work for Union, otherwise 0 - still work to be done.
-*/
-
-static int
-QuickCheck(Region newReg, Region reg1, Region reg2)
-{
-
- /* if unioning with itself or no rects to union with */
- if ( (reg1 == reg2) || (!(reg1->numRects)) )
- {
- miRegionCopy(newReg, reg2);
- return TRUE;
- }
-
- /* if nothing to union */
- if (!(reg2->numRects))
- {
- miRegionCopy(newReg, reg1);
- return TRUE;
- }
-
- /* could put an extent check to see if add above or below */
-
- if ((reg1->extents.y1 >= reg2->extents.y2) ||
- (reg2->extents.y1 >= reg1->extents.y2) )
- {
- combineRegs(newReg, reg1, reg2);
- return TRUE;
- }
- return FALSE;
-}
-
-/* TopRects(rects, reg1, reg2)
- * N.B. We now assume that reg1 and reg2 intersect. Therefore we are
- * NOT checking in the two while loops for stepping off the end of the
- * region.
- */
-
-static int
-TopRects(
- register Region newReg,
- register BOX *rects,
- register Region reg1,
- register Region reg2,
- BOX *FirstRect)
-{
- register BOX *tempRects;
-
- /* need to add some rects from region 1 */
- if (reg1->extents.y1 < reg2->extents.y1)
- {
- tempRects = reg1->rects;
- while(tempRects->y1 < reg2->extents.y1)
- {
- MEMCHECK(newReg, rects, FirstRect);
- ADDRECTNOX(newReg,rects, tempRects->x1, tempRects->y1,
- tempRects->x2, MIN(tempRects->y2, reg2->extents.y1));
- tempRects++;
- }
- }
- /* need to add some rects from region 2 */
- if (reg2->extents.y1 < reg1->extents.y1)
- {
- tempRects = reg2->rects;
- while (tempRects->y1 < reg1->extents.y1)
- {
- MEMCHECK(newReg, rects, FirstRect);
- ADDRECTNOX(newReg, rects, tempRects->x1,tempRects->y1,
Reply to: