~ubuntu-branches/ubuntu/lucid/libx11/lucid

« back to all changes in this revision

Viewing changes to src/Xrm.c

Committer: Bazaar Package Importer
Author(s): Timo Aaltonen
Date: 2009-01-17 16:34:54 UTC
mfrom: (1.1.7 upstream)
Revision ID: james.westby@ubuntu.com-20090117163454-gaey3cd32xyavueo

Tags: 2:1.1.99.2-1build1

Fakesync with Debian, all previous Ubuntu changes are included
in the new upstream release.

files added:
src/Xprivate.h

files removed:
debian/patches/020_th_TH_iso8859-11_ct.diff

debian/patches/021_Thai_xim_num_caps.diff

debian/patches/022_Thai_xim_surr_conv.diff

debian/patches/023_missing_keysyms.diff

src/xcb_lock.c

files modified:
AUTHORS

ChangeLog

Makefile.am

Makefile.in

acinclude.m4

configure

configure.ac

debian/changelog

debian/control

debian/patches/002_arm_abi_brain_damage.diff

debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff

debian/patches/007_iso8859-15_Compose_fix.diff

debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff

debian/patches/series

include/Makefile.in

include/X11/XKBlib.h

include/X11/Xcms.h

include/X11/Xlib.h

include/X11/Xlibint.h

include/X11/Xregion.h

include/X11/Xresource.h

include/X11/Xutil.h

man/Makefile.in

man/xkb/Makefile.in

man/xkb/XkbGetIndicatorState.man

modules/Makefile.in

modules/im/Makefile.in

modules/im/ximcp/Makefile.in

modules/im/ximcp/imCallbk.c

modules/im/ximcp/imDefFlt.c

modules/im/ximcp/imDefIc.c

modules/im/ximcp/imDefIm.c

modules/im/ximcp/imDefLkup.c

modules/im/ximcp/imDispch.c

modules/im/ximcp/imEvToWire.c

modules/im/ximcp/imExten.c

modules/im/ximcp/imImSw.c

modules/im/ximcp/imInt.c

modules/im/ximcp/imLcFlt.c

modules/im/ximcp/imLcGIc.c

modules/im/ximcp/imLcIc.c

modules/im/ximcp/imLcIm.c

modules/im/ximcp/imLcLkup.c

modules/im/ximcp/imLcPrs.c

modules/im/ximcp/imLcSIc.c

modules/im/ximcp/imRm.c

modules/im/ximcp/imRmAttr.c

modules/im/ximcp/imThaiFlt.c

modules/im/ximcp/imThaiIc.c

modules/im/ximcp/imThaiIm.c

modules/im/ximcp/imTrX.c

modules/im/ximcp/imTrans.c

modules/im/ximcp/imTransR.c

modules/lc/Makefile.in

modules/lc/Utf8/Makefile.in

modules/lc/def/Makefile.in

modules/lc/gen/Makefile.in

modules/lc/gen/lcGenConv.c

modules/lc/xlocale/Makefile.in

modules/lc/xlocale/lcEuc.c

modules/lc/xlocale/lcJis.c

modules/lc/xlocale/lcSjis.c

modules/om/Makefile.in

modules/om/generic/Makefile.in

modules/om/generic/omGeneric.c

modules/om/generic/omText.c

modules/om/generic/omTextEsc.c

modules/om/generic/omTextPer.c

modules/om/generic/omXChar.c

nls/C/Makefile.in

nls/Makefile.in

nls/am_ET.UTF-8/Compose.pre

nls/am_ET.UTF-8/Makefile.in

nls/armscii-8/Makefile.in

nls/el_GR.UTF-8/Compose.pre

nls/el_GR.UTF-8/Makefile.in

nls/en_US.UTF-8/Compose.pre

nls/en_US.UTF-8/Makefile.in

nls/georgian-academy/Makefile.in

nls/georgian-ps/Makefile.in

nls/ibm-cp1133/Makefile.in

nls/iscii-dev/Makefile.in

nls/isiri-3342/Makefile.in

nls/iso8859-1/Makefile.in

nls/iso8859-10/Makefile.in

nls/iso8859-11/Makefile.in

nls/iso8859-13/Makefile.in

nls/iso8859-14/Makefile.in

nls/iso8859-15/Makefile.in

nls/iso8859-2/Makefile.in

nls/iso8859-3/Makefile.in

nls/iso8859-4/Makefile.in

nls/iso8859-5/Makefile.in

nls/iso8859-6/Makefile.in

nls/iso8859-7/Makefile.in

nls/iso8859-8/Makefile.in

nls/iso8859-9/Makefile.in

nls/iso8859-9e/Makefile.in

nls/ja.JIS/Makefile.in

nls/ja.S90/Makefile.in

nls/ja.SJIS/Makefile.in

nls/ja.U90/Makefile.in

nls/ja/Makefile.in

nls/ja_JP.UTF-8/Makefile.in

nls/ko/Makefile.in

nls/ko_KR.UTF-8/Makefile.in

nls/koi8-c/Makefile.in

nls/koi8-r/Makefile.in

nls/koi8-u/Makefile.in

nls/microsoft-cp1251/Makefile.in

nls/microsoft-cp1255/Makefile.in

nls/microsoft-cp1256/Makefile.in

nls/mulelao-1/Makefile.in

nls/nokhchi-1/Makefile.in

nls/pt_BR.UTF-8/Compose.pre

nls/pt_BR.UTF-8/Makefile.in

nls/ru_RU.UTF-8/Makefile.in

nls/tatar-cyr/Makefile.in

nls/th_TH.UTF-8/Makefile.in

nls/th_TH/Makefile.in

nls/tscii-0/Makefile.in

nls/vi_VN.tcvn/Makefile.in

nls/vi_VN.viscii/Makefile.in

nls/zh_CN.UTF-8/Makefile.in

nls/zh_CN.gb18030/Makefile.in

nls/zh_CN.gbk/Makefile.in

nls/zh_CN/Makefile.in

nls/zh_HK.UTF-8/Makefile.in

nls/zh_HK.big5/Makefile.in

nls/zh_HK.big5hkscs/Makefile.in

nls/zh_TW.UTF-8/Makefile.in

nls/zh_TW.big5/Makefile.in

nls/zh_TW/Makefile.in

src/AllPlanes.c

src/ChClMode.c

src/ChKeyCon.c

src/ChProp.c

src/ChkIfEv.c

src/ChkMaskEv.c

src/ChkTypEv.c

src/ChkTypWEv.c

src/ChkWinEv.c

src/ClDisplay.c

src/ClearArea.c

src/ConnDis.c

src/Context.c

src/ConvSel.c

src/CopyArea.c

src/CopyCmap.c

src/CopyGC.c

src/CopyPlane.c

src/CrBFData.c

src/CrCursor.c

src/CrGC.c

src/CrGlCur.c

src/CrPFBData.c

src/CrWindow.c

src/Cursor.c

src/Depths.c

src/DisName.c

src/DrArc.c

src/DrLine.c

src/DrRect.c

src/ErrDes.c

src/ErrHndlr.c

src/EvToWire.c

src/FSWrap.c

src/FetchName.c

src/FillPoly.c

src/FillRct.c

src/FillRcts.c

src/FilterEv.c

src/Font.c

src/FontInfo.c

src/FontNames.c

src/FreeEData.c

src/FreeGC.c

src/FreePix.c

src/Geom.c

src/GetAtomNm.c

src/GetDflt.c

src/GetFProp.c

src/GetGeom.c

src/GetHints.c

src/GetIFocus.c

src/GetImage.c

src/GetKCnt.c

src/GetMoEv.c

src/GetNrmHint.c

src/GetPCnt.c

src/GetPntMap.c

src/GetProp.c

src/GetRGBCMap.c

src/GetSSaver.c

src/GetStCmap.c

src/GetTxtProp.c

src/GetWAttrs.c

src/GetWMCMapW.c

src/GetWMProto.c

src/GrButton.c

src/GrKey.c

src/GrKeybd.c

src/GrPointer.c

src/Host.c

src/Iconify.c

src/IfEvent.c

src/ImText.c

src/ImText16.c

src/ImUtil.c

src/InitExt.c

src/IntAtom.c

src/KeyBind.c

src/KeysymStr.c

src/LiHosts.c

src/LiICmaps.c

src/LoadFont.c

src/LockDis.c

src/Macros.c

src/Makefile.am

src/Makefile.in

src/MaskEvent.c

src/ModMap.c

src/MoveWin.c

src/NextEvent.c

src/OMWrap.c

src/OpenDis.c

src/ParseCmd.c

src/ParseGeom.c

src/PeekEvent.c

src/PolyReg.c

src/PolyTxt.c

src/PolyTxt16.c

src/PropAlloc.c

src/PutBEvent.c

src/PutImage.c

src/QuBest.c

src/QuCurShp.c

src/QuExt.c

src/QuKeybd.c

src/QuPntr.c

src/QuStipShp.c

src/QuTileShp.c

src/QuTree.c

src/Quarks.c

src/RdBitF.c

src/RecolorC.c

src/ReconfWin.c

src/Region.c

src/RegstFlt.c

src/RepWindow.c

src/RestackWs.c

src/RotProp.c

src/SetCRects.c

src/SetClOrig.c

src/SetDashes.c

src/SetHints.c

src/SetIFocus.c

src/SetLocale.c

src/SetNrmHint.c

src/SetPMask.c

src/SetPntMap.c

src/SetRGBCMap.c

src/SetSSaver.c

src/SetStCmap.c

src/SetTxtProp.c

src/SetWMCMapW.c

src/SetWMProto.c

src/StBytes.c

src/StColors.c

src/StName.c

src/StrToText.c

src/Text.c

src/Text16.c

src/TextExt.c

src/TextExt16.c

src/TextToStr.c

src/TrCoords.c

src/UIThrStubs.c

src/UnldFont.c

src/VisUtil.c

src/WMGeom.c

src/WMProps.c

src/WarpPtr.c

src/WinEvent.c

src/Window.c

src/Withdraw.c

src/WrBitF.c

src/XKeysymDB

src/Xatomtype.h

src/XlibAsync.c

src/XlibInt.c

src/XomGeneric.h

src/Xrm.c

src/XrmI.h

src/Xxcbint.h

src/config.h.in

src/globals.c

src/imConv.c

src/locking.c

src/locking.h

src/os2Stubs.c

src/poly.h

src/udcInf.c

src/util/Makefile.am

src/util/Makefile.in

src/util/makekeys.c

src/x11_trans.c

src/xcb_disp.c

src/xcb_io.c

src/xcms/AddDIC.c

src/xcms/AddSF.c

src/xcms/CCC.c

src/xcms/CvColW.c

src/xcms/CvCols.c

src/xcms/HVC.c

src/xcms/HVCGcC.c

src/xcms/HVCGcV.c

src/xcms/HVCGcVC.c

src/xcms/HVCMnV.c

src/xcms/HVCMxC.c

src/xcms/HVCMxV.c

src/xcms/HVCMxVC.c

src/xcms/HVCMxVs.c

src/xcms/HVCWpAj.c

src/xcms/IdOfPr.c

src/xcms/LRGB.c

src/xcms/Lab.c

src/xcms/LabGcC.c

src/xcms/LabGcL.c

src/xcms/LabGcLC.c

src/xcms/LabMnL.c

src/xcms/LabMxC.c

src/xcms/LabMxL.c

src/xcms/LabMxLC.c

src/xcms/LabWpAj.c

src/xcms/Luv.c

src/xcms/LuvGcC.c

src/xcms/LuvGcL.c

src/xcms/LuvGcLC.c

src/xcms/LuvMnL.c

src/xcms/LuvMxC.c

src/xcms/LuvMxL.c

src/xcms/LuvMxLC.c

src/xcms/LuvWpAj.c

src/xcms/Makefile.in

src/xcms/OfCCC.c

src/xcms/PrOfId.c

src/xcms/QBlack.c

src/xcms/QBlue.c

src/xcms/QGreen.c

src/xcms/QRed.c

src/xcms/QWhite.c

src/xcms/QuCol.c

src/xcms/QuCols.c

src/xcms/SetCCC.c

src/xcms/SetGetCols.c

src/xcms/StCol.c

src/xcms/StCols.c

src/xcms/UNDEFINED.c

src/xcms/XRGB.c

src/xcms/XYZ.c

src/xcms/Xcmsint.h

src/xcms/cmsAllCol.c

src/xcms/cmsAllNCol.c

src/xcms/cmsCmap.c

src/xcms/cmsColNm.c

src/xcms/cmsGlobls.c

src/xcms/cmsInt.c

src/xcms/cmsLkCol.c

src/xcms/cmsMath.c

src/xcms/cmsProp.c

src/xcms/cmsTrig.c

src/xcms/uvY.c

src/xcms/xyY.c

src/xkb/Makefile.in

src/xkb/XKB.c

src/xkb/XKBAlloc.c

src/xkb/XKBBell.c

src/xkb/XKBBind.c

src/xkb/XKBCompat.c

src/xkb/XKBCtrls.c

src/xkb/XKBCvt.c

src/xkb/XKBExtDev.c

src/xkb/XKBGAlloc.c

src/xkb/XKBGeom.c

src/xkb/XKBGetByName.c

src/xkb/XKBGetMap.c

src/xkb/XKBList.c

src/xkb/XKBMAlloc.c

src/xkb/XKBMisc.c

src/xkb/XKBNames.c

src/xkb/XKBRdBuf.c

src/xkb/XKBSetGeom.c

src/xkb/XKBSetMap.c

src/xkb/XKBUse.c

src/xkb/XKBleds.c

src/xkb/XKBlibint.h

src/xlibi18n/ICWrap.c

src/xlibi18n/IMWrap.c

src/xlibi18n/Makefile.in

src/xlibi18n/XDefaultIMIF.c

src/xlibi18n/XDefaultOMIF.c

src/xlibi18n/Xaixlcint.h

src/xlibi18n/XimImSw.h

src/xlibi18n/XimProto.h

src/xlibi18n/XimThai.h

src/xlibi18n/XimTrX.h

src/xlibi18n/XimTrans.h

src/xlibi18n/Ximint.h

src/xlibi18n/XimintL.h

src/xlibi18n/XimintP.h

src/xlibi18n/XlcDL.c

src/xlibi18n/XlcGeneric.h

src/xlibi18n/XlcPubI.h

src/xlibi18n/Xlcint.h

src/xlibi18n/imKStoUCS.c

src/xlibi18n/lcCT.c

src/xlibi18n/lcCharSet.c

src/xlibi18n/lcConv.c

src/xlibi18n/lcDB.c

src/xlibi18n/lcFile.c

src/xlibi18n/lcGeneric.c

src/xlibi18n/lcInit.c

src/xlibi18n/lcPrTxt.c

src/xlibi18n/lcPubWrap.c

src/xlibi18n/lcPublic.c

src/xlibi18n/lcStd.c

src/xlibi18n/lcTxtPr.c

src/xlibi18n/lcUtil.c

src/xlibi18n/lcWrap.c

src/xlibi18n/mbWrap.c

src/xlibi18n/utf8Wrap.c

src/xlibi18n/wcWrap.c

Show diffs side-by-side

added added

removed removed

src/Xrm.c

Permission to use, copy, modify, and distribute this software and its

documentation for any purpose and without fee is hereby granted,

Permission to use, copy, modify, and distribute this software and its

documentation for any purpose and without fee is hereby granted,

provided that the above copyright notice appear in all copies and that

both that copyright notice and this permission notice appear in

supporting documentation, and that the name Digital not be

used in advertising or publicity pertaining to distribution of the

software without specific, written prior permission.

DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

1071

1072

1073

1074

* This function is highly optimized to inline as much as possible.

1075

* Be very careful with modifications, or simplifications, as they

1074

* This function is highly optimized to inline as much as possible.

1075

* Be very careful with modifications, or simplifications, as they

1076

* may adversely affect the performance.

1077

1078

* Chris Peterson, MIT X Consortium 5/17/90.

1079

1080

1081

1082

* Xlib spec says max 100 quarks in a lookup, will stop and return if

1083

* return if any single production's lhs has more than 100 components.

1084

1085

#define QLIST_SIZE 100

1086

1087

1088

* This should be big enough to handle things like the XKeysymDB or biggish

1089

* ~/.Xdefaults or app-defaults files. Anything bigger will be allocated on

1090

* the heap.

1125

if (!db)

1126

return;

1127

1128

1129

* if strlen (str) < DEF_BUFF_SIZE allocate buffers on the stack for

1128

1129

* if strlen (str) < DEF_BUFF_SIZE allocate buffers on the stack for

1130

* speed otherwise malloc the buffer. From a buffer overflow standpoint

1131

* we can be sure that neither: a) a component on the lhs, or b) a

1132

* value on the rhs, will be longer than the overall length of str,

1133

* i.e. strlen(str).

1134

1135

* This should give good performance when parsing "*foo: bar" type

1135

* This should give good performance when parsing "*foo: bar" type

1136

* databases as might be passed with -xrm command line options; but

1137

* with larger databases, e.g. .Xdefaults, app-defaults, or KeysymDB

1138

* files, the size of the buffers will be overly large. One way

1143

1144

str_len = strlen (str);

1145

if (DEF_BUFF_SIZE > str_len) lhs = lhs_s;

1146

else if ((lhs = (char*) Xmalloc (str_len)) == NULL)

1146

else if ((lhs = (char*) Xmalloc (str_len)) == NULL)

1147

return;

1148

1149

alloc_chars = DEF_BUFF_SIZE < str_len ? str_len : DEF_BUFF_SIZE;

1159

dolines = doall;

1160

1161

1162

* First: Remove extra whitespace.

1162

* First: Remove extra whitespace.

1163

1164

1165

do {

1231

* Third: loop through the LHS of the resource specification

1232

* storing characters and converting this to a Quark.

1233

1234

1235

num_quarks = 0;

1236

t_bindings = bindings;

1237

1238

sig = 0;

1239

ptr = lhs;

1240

*t_bindings = XrmBindTightly;

1240

*t_bindings = XrmBindTightly;

1241

for(;;) {

1242

if (!is_binding(bits)) {

1243

while (!is_EOQ(bits)) {

1246

bits = next_char(c, str);

1247

}

1248

1249

quarks[num_quarks++] =

1249

quarks[num_quarks++] =

1250

_XrmInternalStringToQuark(lhs, ptr - lhs, sig, False);

1251

1252

if (num_quarks > QLIST_SIZE) {

1266

sig = (sig << 1) + c; /* Compute the signature. */

1267

} while (is_space(bits = next_char(c, str)));

1268

1269

1270

* The spec doesn't permit it, but support spaces

1271

* internal to resource name/class

1271

* internal to resource name/class

1272

1273

1274

if (is_separator(bits))

1292

* If two separators appear with no Text between them then

1293

* ignore them.

1294

1295

* If anyone of those separators is a '*' then the binding

1295

* If anyone of those separators is a '*' then the binding

1296

* will be loose, otherwise it will be tight.

1297

1298

1337

* the right hand side.

1338

1339

1340

1341

* Fourth: Remove more whitespace

1342

1343

1355

break;

1356

}

1357

1358

1359

* Fifth: Process the right hand side.

1360

1361

1456

else {

1457

int tcount;

1458

1459

1460

* Otherwise just insert those characters into the

1459

1460

* Otherwise just insert those characters into the

1461

* string, since no special processing is needed on

1462

* numerics we can skip the special processing.

1463

1480

}

1481

}

1482

1483

1484

* It is important to make sure that there is room for at least

1485

* four more characters in the buffer, since I can add that

1486

* many characters into the buffer after a backslash has occured.

1489

if (ptr + len > ptr_max) {

1490

char * temp_str;

1491

1492

alloc_chars += BUFSIZ/10;

1492

alloc_chars += BUFSIZ/10;

1493

temp_str = Xrealloc(rhs, sizeof(char) * alloc_chars);

1494

1495

if (!temp_str) {

1506

}

1507

1508

1509

* Lastly: Terminate the value string, and store this entry

1509

* Lastly: Terminate the value string, and store this entry

1510

* into the database.

1511

1512

1515

/* Store it in database */

1516

value.size = ptr - rhs;

1517

value.addr = (XPointer) rhs;

1518

1519

PutEntry(db, bindings, quarks, XrmQString, &value);

1520

}

1521

2280

} else {

2281

if (table && !table->leaf)

2282

table = table->next;

2283

if (table &&

2283

if (table &&

2284

AppendLEntry((LTable)table, names, classes, &closure)) {

2285

_XUnlockMutex(&db->linfo);

2286

return False;

Older »