[Xorg-commit] xc/lib/X11 CrGlCur.c,1.1.4.2,1.1.4.3 ICWrap.c,1.1.4.3,1.1.4.4 SetLocale.c,1.1.4.3,1.1.4.4 XlcPubI.h,1.1.4.4,1.1.4.5 imLcIm.c,1.1.4.3,1.1.4.4 imThaiFlt.c,1.1.4.5,1.1.4.6
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/lib/X11
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/X11
Modified Files:
Tag: XORG-CURRENT
CrGlCur.c ICWrap.c SetLocale.c XlcPubI.h imLcIm.c imThaiFlt.c
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: CrGlCur.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/CrGlCur.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/CrGlCur.c 26 Nov 2003 22:48:35 -0000 1.1.4.2
+++ b/CrGlCur.c 23 Feb 2004 21:34:20 -0000 1.1.4.3
@@ -24,12 +24,16 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.7 2003/04/13 19:22:15 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.8 2004/01/13 19:08:04 dawes Exp $ */
#include "Xlibint.h"
#ifdef USE_DYNAMIC_XCURSOR
+#ifdef __UNIXOS2__
+#define RTLD_LAZY 1
+#define LIBXCURSOR "Xcursor.dll"
+#endif
#include <stdio.h>
#include <string.h>
#if defined(hpux)
Index: ICWrap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ICWrap.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/ICWrap.c 8 Dec 2003 16:42:30 -0000 1.1.4.3
+++ b/ICWrap.c 23 Feb 2004 21:34:20 -0000 1.1.4.4
@@ -64,7 +64,7 @@
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */
+/* $XFree86: xc/lib/X11/ICWrap.c,v 1.11 2004/01/04 18:44:46 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
@@ -346,7 +346,7 @@
XSetICFocus(ic)
XIC ic;
{
- if (ic->core.im)
+ if (ic && ic->core.im)
(*ic->methods->set_focus) (ic);
}
Index: SetLocale.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/SetLocale.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/SetLocale.c 6 Dec 2003 13:24:22 -0000 1.1.4.3
+++ b/SetLocale.c 23 Feb 2004 21:34:20 -0000 1.1.4.4
@@ -56,7 +56,7 @@
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetLocale.c,v 3.20 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetLocale.c,v 3.21 2004/02/11 00:30:44 torrey Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
@@ -118,6 +118,17 @@
#else /* X_LOCALE */
+#ifdef __DARWIN__
+char *
+_Xsetlocale(
+ int category,
+ _Xconst char *name
+)
+{
+ return setlocale(category, name);
+}
+#endif /* __DARWIN__ */
+
/*
* _XlcMapOSLocaleName is an implementation dependent routine that derives
* the LC_CTYPE locale name as used in the sample implementation from that
Index: XlcPubI.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlcPubI.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XlcPubI.h 8 Dec 2003 16:42:30 -0000 1.1.4.4
+++ b/XlcPubI.h 23 Feb 2004 21:34:20 -0000 1.1.4.5
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi at osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.14 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.15 2004/02/11 00:30:44 torrey Exp $ */
#ifndef _XLCPUBLICI_H_
#define _XLCPUBLICI_H_
@@ -234,6 +234,12 @@
int category,
_Xconst char *name);
#else
+#ifdef __DARWIN__
+extern char *
+_Xsetlocale(
+ int category,
+ _Xconst char *name);
+#endif
extern char *_XlcMapOSLocaleName(
char *osname,
char *siname);
Index: imLcIm.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcIm.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/imLcIm.c 8 Dec 2003 16:42:30 -0000 1.1.4.3
+++ b/imLcIm.c 23 Feb 2004 21:34:20 -0000 1.1.4.4
@@ -32,7 +32,7 @@
frankyling at hgrd01.enet.dec.com
******************************************************************/
-/* $XFree86: xc/lib/X11/imLcIm.c,v 1.12 2003/09/06 14:06:32 pascal Exp $ */
+/* $XFree86: xc/lib/X11/imLcIm.c,v 1.13 2004/01/06 13:49:27 pascal Exp $ */
#include <stdio.h>
/*
@@ -91,6 +91,8 @@
Xim im)
{
XimFreeDefaultTree(im->private.local.top);
+ im->private.local.top = NULL;
+
if(im->core.im_resources) {
Xfree(im->core.im_resources);
im->core.im_resources = NULL;
Index: imThaiFlt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imThaiFlt.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/imThaiFlt.c 15 Dec 2003 21:38:47 -0000 1.1.4.5
+++ b/imThaiFlt.c 23 Feb 2004 21:34:20 -0000 1.1.4.6
@@ -45,7 +45,7 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.21 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.23 2003/12/31 01:18:42 tsi Exp $ */
/*
**++
@@ -230,7 +230,7 @@
return tactis_chtype[ch];
}
-
+#ifdef UNUSED
/* returns the display level */
Private int
THAI_chlevel (unsigned char ch)
@@ -311,7 +311,7 @@
{
return (tactis_chtype[ch] == TONE);
}
-
+#endif
Private Bool
THAI_iscomposible (
@@ -353,7 +353,7 @@
return iskeyvalid;
}
-#if 0
+#ifdef UNUSED
Private void
THAI_apply_write_rules(
unsigned char *instr,
@@ -427,7 +427,7 @@
}
return position;
}
-#endif
+
Private int
THAI_apply_scm(
@@ -462,25 +462,21 @@
return 0; /* probably not right but better than returning garbage */
}
+
/* The following functions are copied from XKeyBind.c */
-#if 0
Private void ComputeMaskFromKeytrans();
-#endif
Private int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event);
Private void SetLed(Display *dpy, int num, int state);
-#if 0
Private CARD8 FindKeyCode();
-#endif
+
/* The following functions are specific to this module */
-#if 0
Private int XThaiTranslateKey();
Private int XThaiTranslateKeySym();
-#endif
-#if 0
+
Private KeySym HexIMNormalKey(
XicThaiPart *thai_part,
KeySym symbol,
@@ -493,9 +489,7 @@
XicThaiPart *thai_part,
KeySym symbol
XKeyEvent *event);
-#endif
Private KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2);
-#if 0
Private void InitIscMode(Xic ic);
Private Bool ThaiComposeConvert(
Display *dpy,
@@ -514,11 +508,12 @@
(0<=(wc)&&(wc)<=0x7F) ? \
(wc) : \
((0x0E01<=(wc)&&(wc)<=0x0E5F) ? ((wc)-0x0E00+0xA0) : 0))
+/* "c" is an unsigned char */
#define tis2ucs(c) \
( \
((c)<=0x7F) ? \
(wchar_t)(c) : \
- ((0x0A1<=(c)&&(c)<=0x0FF) ? ((wchar_t)(c)-0xA0+0x0E00) : 0))
+ ((0x0A1<=(c)) ? ((wchar_t)(c)-0xA0+0x0E00) : 0))
/*
* Macros to save and recall last input character in XIC
@@ -645,12 +640,12 @@
#define COMPOSE_LED 2
-#if 0
+#ifdef UNUSED
typedef KeySym (*StateProc)(
XicThaiPart *thai_part,
KeySym symbol,
XKeyEvent *event);
-#endif
+
/*
* macros to classify XKeyEvent state field
@@ -675,7 +670,7 @@
!IsShift((event)->state)) \
? True : False)
-#if 0
+
/*
* State handler to implement the Thai hex input method.
*/
@@ -686,7 +681,7 @@
HexIMFirstComposeKey,
HexIMSecondComposeKey
};
-#endif
+
/*
* Table for 'Thai Compose' character input.
@@ -718,6 +713,7 @@
int mlen; /* length of modifier list */
};
+
/* Convert keysym to 'Thai Compose' keysym */
/* The current implementation use latin-1 keysyms */
Private Bool
@@ -740,7 +736,6 @@
return False;
}
-#if 0
Private int
XThaiTranslateKey(
register Display *dpy,
@@ -931,7 +926,6 @@
return 1;
}
}
-#endif
/*
* given a KeySym, returns the first keycode containing it, if any.
@@ -954,7 +948,6 @@
return 0;
}
-#if 0
/*
* given a list of modifiers, computes the mask necessary for later matching.
* This routine must lookup the key in the Keymap and then search to see
@@ -988,7 +981,6 @@
}
p->state &= AllMods;
}
-#endif
/************************************************************************
*
@@ -1157,7 +1149,7 @@
led_control.led = num;
XChangeKeyboardControl (dpy, KBLed | KBLedMode, &led_control);
}
-
+#endif
/*
* Initialize ISC mode from im modifier
@@ -1252,7 +1244,7 @@
int isc_mode; /* Thai Input Sequence Check mode */
unsigned char previous_char; /* Last inputted Thai char */
unsigned char new_char;
-#if 0
+#ifdef UNUSED
unsigned int modifiers;
KeySym lsym,usym;
int state;
@@ -1298,7 +1290,7 @@
{
return False;
}
-#if 0
+#ifdef UNUSED
if (! XThaiTranslateKey(ev->xkey.display, ev->xkey.keycode, ev->xkey.state,
&modifiers, &symbol, &lsym, &usym))
return False;
More information about the xorg-commit
mailing list