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

« back to all changes in this revision

Viewing changes to debian/patches/022_Thai_xim_surr_conv.diff

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

debian/patches/022_Thai_xim_surr_conv.diff

Index: libx11-1.1.4/modules/im/ximcp/imThaiFlt.c

===================================================================

--- libx11-1.1.4.orig/modules/im/ximcp/imThaiFlt.c 2008-07-17 21:15:44.000000000 +0700

+++ libx11-1.1.4/modules/im/ximcp/imThaiFlt.c 2008-07-17 21:39:48.000000000 +0700

@@ -560,13 +560,37 @@

{

c = 0;

} else {

+ Xim im;

+ XlcConv conv;

+ int from_left;

+ int to_left;

+ char *from_buf;

+ char *to_buf;

+ im = (Xim) XIMOfIC((XIC)ic);

if (screc.text->encoding_is_wchar) {

- c = ucs2tis(screc.text->string.wcs[0]);

- XFree(screc.text->string.wcs);

+ conv = _XlcOpenConverter(im->core.lcd, XlcNWideChar,

+ im->core.lcd, XlcNCharSet);

+ from_buf = (char *) screc.text->string.wcs;

+ from_left = screc.text->length * sizeof(wchar_t);

} else {

- c = screc.text->string.mbs[0];

- XFree(screc.text->string.mbs);

+ conv = _XlcOpenConverter(im->core.lcd, XlcNMultiByte,

+ im->core.lcd, XlcNCharSet);

+ from_buf = screc.text->string.mbs;

+ from_left = screc.text->length;

+ }

+ to_buf = (char *)&c;

+ to_left = 1;

+ _XlcResetConverter(conv);

+ if (_XlcConvert(conv, (XPointer *)&from_buf, &from_left,

+ (XPointer *)&to_buf, &to_left, NULL, 0) < 0)

+ {

+ c = (unsigned char) b->mb[b->tree[(ic)->private.local.context].mb];

}

+ _XlcCloseConverter(conv);

+ XFree(screc.text->string.mbs);

}

XFree(screc.text);

return c;

Older »