Commit 11fc1fad authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

parent 3590c756
......@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.4 2004/01/12 20:54:21 herrb Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -207,6 +207,44 @@ copies the matched event into the client-supplied
structure without removing the event from the queue.
.ZN XPeekIfEvent
flushes the output buffer if it blocks waiting for additional events.
.LP
Each of these functions requires you to pass a predicate procedure that
determines if an event matches what you want.
Your predicate procedure must decide if the event is useful
without calling any Xlib functions.
If the predicate directly or indirectly causes the state of the event queue
to change, the result is not defined.
If Xlib has been initialized for threads, the predicate is called with
the display locked and the result of a call by the predicate to any
Xlib function that locks the display is not defined unless the caller
has first called
.ZN XLockDisplay .
.LP
The predicate procedure and its associated arguments are:
.sM
.HP
Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^)
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
.IP \fIevent\fP 1i
Specifies the
.ZN XEvent
structure.
.IP \fIarg\fP 1i
Specifies the argument passed in from the
.ZN XIfEvent ,
.ZN XCheckIfEvent ,
or
.ZN XPeekIfEvent
function.
.LP
.eM
The predicate procedure is called once for each
event in the queue until it finds a match.
After finding a match, the predicate procedure must return
.ZN True .
If it did not find a match, it must return
.ZN False .
.SH "SEE ALSO"
XAnyEvent(3X11),
XNextEvent(3X11),
......
......@@ -32,7 +32,7 @@ THIS SOFTWARE.
frankyling@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 @@ _XimLocalIMFree(
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;
......
......@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
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 @@ THAI_chtype (unsigned char ch)
return tactis_chtype[ch];
}
#ifdef UNUSED
/* returns the display level */
Private int
THAI_chlevel (unsigned char ch)
......@@ -311,7 +311,7 @@ THAI_istone (unsigned char ch)
{
return (tactis_chtype[ch] == TONE);
}
#endif
Private Bool
THAI_iscomposible (
......@@ -353,7 +353,7 @@ THAI_isaccepted (
return iskeyvalid;
}
#if 0
#ifdef UNUSED
Private void
THAI_apply_write_rules(
unsigned char *instr,
......@@ -427,7 +427,7 @@ Output parameters:
}
return position;
}
#endif
Private int
THAI_apply_scm(
......@@ -462,25 +462,21 @@ THAI_apply_scm(
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 @@ Private KeySym HexIMSecondComposeKey(
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 @@ Private Bool ThaiComposeConvert(
(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 @@ IC_RealDeletePreviousChar(Xic ic)
#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 @@ typedef KeySym (*StateProc)(
!IsShift((event)->state)) \
? True : False)
#if 0
/*
* State handler to implement the Thai hex input method.
*/
......@@ -686,7 +681,7 @@ Private StateProc state_handler[] = {
HexIMFirstComposeKey,
HexIMSecondComposeKey
};
#endif
/*
* Table for 'Thai Compose' character input.
......@@ -718,6 +713,7 @@ struct _XKeytrans {
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 @@ ThaiComposeConvert(
return False;
}
#if 0
Private int
XThaiTranslateKey(
register Display *dpy,
......@@ -931,7 +926,6 @@ XThaiTranslateKeySym(
return 1;
}
}
#endif
/*
* given a KeySym, returns the first keycode containing it, if any.
......@@ -954,7 +948,6 @@ FindKeyCode(
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 @@ ComputeMaskFromKeytrans(
}
p->state &= AllMods;
}
#endif
/************************************************************************
*
......@@ -1157,7 +1149,7 @@ void SetLed(
led_control.led = num;
XChangeKeyboardControl (dpy, KBLed | KBLedMode, &led_control);
}
#endif
/*
* Initialize ISC mode from im modifier
......@@ -1252,7 +1244,7 @@ XPointer client_data;
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 @@ XPointer client_data;
{
return False;
}
#if 0
#ifdef UNUSED
if (! XThaiTranslateKey(ev->xkey.display, ev->xkey.keycode, ev->xkey.state,
&modifiers, &symbol, &lsym, &usym))
return False;
......
......@@ -4,7 +4,7 @@ XCOMM This file contains compose table file name.
XCOMM The first word is the compose table file name and
XCOMM the second word is full locale name.
XCOMM
XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
XCOMM $XFree86: xc/nls/compose.dir,v 1.25 2004/02/09 01:35:16 dawes Exp $
XCOMM
iso8859-1/Compose: C
iso8859-1/Compose: af_ZA.ISO8859-1
......@@ -345,6 +345,7 @@ en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
en_US.UTF-8/Compose: uk_UA.UTF-8
en_US.UTF-8/Compose: ur_PK.UTF-8
en_US.UTF-8/Compose: uz_UZ.UTF-8
en_US.UTF-8/Compose: vi_VN.UTF-8
en_US.UTF-8/Compose: wa_BE.UTF-8
en_US.UTF-8/Compose: yi_US.UTF-8
This diff is collapsed.
XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.5 2004-02-18 22:17:02 kaleb Exp $
XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.6 2004-02-23 21:34:50 kaleb Exp $
XCOMM $Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
XCOMM This file contains alias name of locale.
......@@ -6,7 +6,7 @@ XCOMM Each alias name is described within one line.
XCOMM The first word is the alias name (simplified locale name)
XCOMM the second word is full locale name.
XCOMM
XCOMM $XFree86: xc/nls/locale.alias,v 1.64 2003/12/18 04:14:22 dawes Exp $
XCOMM $XFree86: xc/nls/locale.alias,v 1.66 2004/02/09 01:35:17 dawes Exp $
XCOMM
POSIX: C
......@@ -535,6 +535,7 @@ ko: ko_KR.eucKR
ko_KR: ko_KR.eucKR
KO_KR: ko_KR.eucKR
ko_KR.EUC: ko_KR.eucKR
ko_KR.EUC-KR: ko_KR.eucKR
ko_KR.euc: ko_KR.eucKR
ko_KR.euckr: ko_KR.eucKR
ko_KR.utf8: ko_KR.UTF-8
......@@ -797,6 +798,8 @@ ur_PK.cp1256: ur_PK.CP1256
ur_PK.microsoftcp1256: ur_PK.CP1256
ur_PK.microsoft-cp1256: ur_PK.CP1256
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
uz: uz_UZ.UTF-8
uz_UZ: uz_UZ.UTF-8
vi: vi_VN.TCVN
vi_VN: vi_VN.TCVN
Vi_VN: vi_VN.TCVN
......
XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.4 2004-02-18 22:17:02 kaleb Exp $
XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.5 2004-02-23 21:34:50 kaleb Exp $
XCOMM $Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
XCOMM This file contains locale database file names
XCOMM The first word is the locale database file name and
XCOMM the second word is the full locale name.
XCOMM
XCOMM $XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $
XCOMM $XFree86: xc/nls/locale.dir,v 1.45 2004/02/09 01:35:18 dawes Exp $
XCOMM
C/XLC_LOCALE: C
......@@ -378,6 +378,7 @@ en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: uk_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: ur_PK.UTF-8
en_US.UTF-8/XLC_LOCALE: uz_UZ.UTF-8
en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8
en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8
......
......@@ -24,12 +24,16 @@ used in advertising or otherwise to promote the sale, use or other dealings
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)
......
/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.4 2004-02-23 21:34:20 kaleb Exp $ */
/* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
......@@ -56,7 +56,7 @@ other dealings in this Software without prior written authorization
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 @@ _Xsetlocale(
#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
......
......@@ -64,7 +64,7 @@ other dealings in this Software without prior written authorization
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 @@ void
XSetICFocus(ic)
XIC ic;
{
if (ic->core.im)
if (ic && ic->core.im)
(*ic->methods->set_focus) (ic);
}
......
......@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@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 @@ _Xsetlocale(
int category,
_Xconst char *name);
#else
#ifdef __DARWIN__
extern char *
_Xsetlocale(
int category,
_Xconst char *name);
#endif
extern char *_XlcMapOSLocaleName(
char *osname,
char *siname);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment