19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 # DEALINGS IN THE SOFTWARE. |
21 # DEALINGS IN THE SOFTWARE. |
22 # |
22 # |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' modules/im/ximcp/imImSw.c modules/im/ximcp/imImSw.c |
24 diff -Nurp -x '*~' -x '*.orig' modules/im/ximcp/imImSw.c modules/im/ximcp/imImSw.c |
25 --- modules/im/ximcp/imImSw.c 2010-09-03 22:52:38.000000000 -0700 |
25 --- modules/im/ximcp/imImSw.c 2010-09-03 22:52:38.000000000 -0700 |
26 +++ modules/im/ximcp/imImSw.c 2010-11-21 18:47:59.406356831 -0800 |
26 +++ modules/im/ximcp/imImSw.c 2011-04-06 13:52:23.090417547 -0700 |
27 @@ -48,7 +48,9 @@ _XimCheckIfDefault( |
27 @@ -48,7 +48,9 @@ _XimCheckIfDefault( |
28 } |
28 } |
29 |
29 |
30 XimImsportSW _XimImSportRec[] = { |
30 XimImsportSW _XimImSportRec[] = { |
31 +#ifdef USE_R6_LOCALIM |
31 +#ifdef USE_R6_LOCALIM |
32 { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree }, |
32 { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree }, |
33 +#endif |
33 +#endif |
34 { _XimCheckIfThaiProcessing, _XimThaiOpenIM, _XimThaiIMFree }, |
34 { _XimCheckIfThaiProcessing, _XimThaiOpenIM, _XimThaiIMFree }, |
35 { _XimCheckIfDefault, _XimProtoOpenIM, _XimProtoIMFree }, |
35 { _XimCheckIfDefault, _XimProtoOpenIM, _XimProtoIMFree }, |
36 { NULL, NULL, NULL }, |
36 { NULL, NULL, NULL }, |
37 diff -urp -x '*~' -x '*.orig' modules/im/ximcp/imThaiFlt.c modules/im/ximcp/imThaiFlt.c |
37 diff -Nurp -x '*~' -x '*.orig' modules/im/ximcp/imThaiFlt.c modules/im/ximcp/imThaiFlt.c |
38 --- modules/im/ximcp/imThaiFlt.c 2010-09-03 22:52:38.000000000 -0700 |
38 --- modules/im/ximcp/imThaiFlt.c 2011-03-24 22:34:22.000000000 -0700 |
39 +++ modules/im/ximcp/imThaiFlt.c 2010-11-21 18:47:59.407125117 -0800 |
39 +++ modules/im/ximcp/imThaiFlt.c 2011-04-06 13:52:23.091092465 -0700 |
40 @@ -76,6 +76,12 @@ SOFTWARE. |
40 @@ -76,6 +76,12 @@ SOFTWARE. |
41 #include "XimThai.h" |
41 #include "XimThai.h" |
42 #include "XlcPubI.h" |
42 #include "XlcPubI.h" |
43 |
43 |
44 +#ifdef sun |
44 +#ifdef sun |
204 - |
204 - |
205 +#endif |
205 +#endif |
206 if ((new_char <= 0x1f) || (new_char == 0x7f)) |
206 if ((new_char <= 0x1f) || (new_char == 0x7f)) |
207 b->tree[ic->private.local.composed].keysym = symbol; |
207 b->tree[ic->private.local.composed].keysym = symbol; |
208 else |
208 else |
209 @@ -1367,7 +1483,15 @@ _XimThaiFilter(Display *d, Window w, XEv |
209 @@ -1374,7 +1490,15 @@ _XimThaiFilter(Display *d, Window w, XEv |
210 */ |
210 */ |
211 isc_mode = IC_IscMode(ic); |
211 isc_mode = IC_IscMode(ic); |
212 if (!(previous_char = IC_GetPreviousChar(ic))) previous_char = ' '; |
212 if (!(previous_char = IC_GetPreviousChar(ic))) previous_char = ' '; |
213 +#ifdef sun |
213 +#ifdef sun |
214 + if (is_utf8_locale()) { |
214 + if (is_utf8_locale()) { |