ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.367 by root, Wed Jan 18 11:47:51 2012 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 2012 UTC

… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
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 <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
350 348
351 delete this; 349 delete this;
352} 350}
353 351
354void 352void
355rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356{ 354{
357 if (!opt) 355 if (!opt)
358 return; 356 return;
359 357
360 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
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
1573done: ; 1569done: ;
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
1580void 1574void
1581rxvt_term::im_set_position () 1575rxvt_term::im_set_position ()
1582{ 1576{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines