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.36 by pcg, Sat Feb 21 20:33:40 2004 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
265 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS 267#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */ 268 Gr_reset (); /* reset graphics */
268#endif 269#endif
269 270
270#if 1 271#if 0
271 XSynchronize (display->display, True); 272 XSynchronize (display->display, True);
272#endif 273#endif
273 274
274#ifdef HAVE_SCROLLBARS 275#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar) 276 if (Options & Opt_scrollBar)
1314 if (Input_Context) 1315 if (Input_Context)
1315 return; 1316 return;
1316 1317
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1318#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1319 if (rs[Rs_imLocale])
1319 rxvt_set_locale (rs[Rs_imLocale]); 1320 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1321#endif
1321 1322
1322 p = rs[Rs_inputMethod]; 1323 p = rs[Rs_inputMethod];
1323 if (p && *p) 1324 if (p && *p)
1324 { 1325 {
1355 goto done; 1356 goto done;
1356 1357
1357done: 1358done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1359#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1360 if (rs[Rs_imLocale])
1360 rxvt_set_locale (locale); 1361 SET_LOCALE (locale);
1361#endif 1362#endif
1362} 1363}
1363 1364
1364void 1365void
1365rxvt_term::IMSetStatusPosition () 1366rxvt_term::IMSetStatusPosition ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines