… | |
… | |
89 | rxvt_pop_locale () |
89 | rxvt_pop_locale () |
90 | { |
90 | { |
91 | rxvt_set_locale (savelocale); |
91 | rxvt_set_locale (savelocale); |
92 | } |
92 | } |
93 | |
93 | |
|
|
94 | void |
|
|
95 | rxvt_term::make_current () const |
|
|
96 | { |
|
|
97 | SET_R (this); |
|
|
98 | rxvt_set_locale (locale); |
|
|
99 | set_environ (envv); |
|
|
100 | } |
|
|
101 | |
94 | #if ENABLE_COMBINING |
102 | #if ENABLE_COMBINING |
95 | class rxvt_composite_vec rxvt_composite; |
103 | class rxvt_composite_vec rxvt_composite; |
96 | |
104 | |
97 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
105 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
98 | { |
106 | { |
… | |
… | |
377 | } |
385 | } |
378 | |
386 | |
379 | void |
387 | void |
380 | rxvt_term::destroy_cb (time_watcher &w) |
388 | rxvt_term::destroy_cb (time_watcher &w) |
381 | { |
389 | { |
382 | SET_R (this); |
390 | make_current (); |
383 | |
391 | |
384 | delete this; |
392 | delete this; |
385 | } |
393 | } |
386 | |
394 | |
387 | /*----------------------------------------------------------------------*/ |
395 | /*----------------------------------------------------------------------*/ |
… | |
… | |
478 | /*----------------------------------------------------------------------*/ |
486 | /*----------------------------------------------------------------------*/ |
479 | bool |
487 | bool |
480 | rxvt_term::init (int argc, const char *const *argv) |
488 | rxvt_term::init (int argc, const char *const *argv) |
481 | { |
489 | { |
482 | SET_R (this); |
490 | SET_R (this); |
|
|
491 | set_locale (""); |
483 | set_environ (envv); // few things in X do not call setlocale :( |
492 | set_environ (envv); // few things in X do not call setlocale :( |
484 | |
|
|
485 | set_locale (""); |
|
|
486 | |
493 | |
487 | if (!init_vars ()) |
494 | if (!init_vars ()) |
488 | return false; |
495 | return false; |
489 | |
496 | |
490 | init_secondary (); |
497 | init_secondary (); |
… | |
… | |
1627 | int i; |
1634 | int i; |
1628 | const char *p; |
1635 | const char *p; |
1629 | char **s; |
1636 | char **s; |
1630 | char buf[IMBUFSIZ]; |
1637 | char buf[IMBUFSIZ]; |
1631 | |
1638 | |
1632 | SET_R (this); |
1639 | make_current (); |
1633 | |
1640 | |
1634 | im_destroy (); |
1641 | im_destroy (); |
1635 | |
1642 | |
1636 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1643 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1637 | if (Input_Context) |
1644 | if (Input_Context) |