… | |
… | |
46 | |
46 | |
47 | #ifdef HAVE_XSETLOCALE |
47 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
48 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
49 | # include <X11/Xlocale.h> |
50 | #else |
50 | #else |
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <locale.h> |
51 | # include <locale.h> |
53 | # endif |
|
|
54 | #endif |
52 | #endif |
55 | |
53 | |
56 | struct termios rxvt_term::def_tio; |
54 | struct termios rxvt_term::def_tio; |
57 | vector<rxvt_term *> rxvt_term::termlist; |
55 | vector<rxvt_term *> rxvt_term::termlist; |
58 | |
56 | |
… | |
… | |
1528 | im_destroy (); |
1526 | im_destroy (); |
1529 | |
1527 | |
1530 | if (Input_Context) |
1528 | if (Input_Context) |
1531 | return; |
1529 | return; |
1532 | |
1530 | |
1533 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1534 | if (rs[Rs_imLocale]) |
1531 | if (rs[Rs_imLocale]) |
1535 | SET_LOCALE (rs[Rs_imLocale]); |
1532 | SET_LOCALE (rs[Rs_imLocale]); |
1536 | #endif |
|
|
1537 | |
1533 | |
1538 | p = rs[Rs_inputMethod]; |
1534 | p = rs[Rs_inputMethod]; |
1539 | if (p && *p) |
1535 | if (p && *p) |
1540 | { |
1536 | { |
1541 | bool found = false; |
1537 | bool found = false; |
… | |
… | |
1569 | /* try with no modifiers base IF the user didn't specify an IM */ |
1565 | /* try with no modifiers base IF the user didn't specify an IM */ |
1570 | if (im_get_ic ("@im=none")) |
1566 | if (im_get_ic ("@im=none")) |
1571 | goto done; |
1567 | goto done; |
1572 | |
1568 | |
1573 | done: ; |
1569 | done: ; |
1574 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1575 | if (rs[Rs_imLocale]) |
1570 | if (rs[Rs_imLocale]) |
1576 | SET_LOCALE (locale); |
1571 | SET_LOCALE (locale); |
1577 | #endif |
|
|
1578 | } |
1572 | } |
1579 | |
1573 | |
1580 | void |
1574 | void |
1581 | rxvt_term::im_set_position () |
1575 | rxvt_term::im_set_position () |
1582 | { |
1576 | { |