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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.159 by root, Wed Jan 4 04:42:45 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
474 if (OPTION (Opt_scrollBar)) 487 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 489#endif
477 490
478#if ENABLE_PERL 491#if ENABLE_PERL
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493 {
479 rxvt_perl.init (); 494 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
497#endif
483 498
484 create_windows (argc, argv); 499 create_windows (argc, argv);
485 500
486 dDisp; 501 dDisp;
487 502
… …
908 prop.height += lineSpace; 923 prop.height += lineSpace;
909 fs->set_prop (prop); 924 fs->set_prop (prop);
910 925
911 fwidth = prop.width; 926 fwidth = prop.width;
912 fheight = prop.height; 927 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 928 fbase = prop.ascent;
914 929
915 for (int style = 1; style < 4; style++) 930 for (int style = 1; style < 4; style++)
916 { 931 {
917#if ENABLE_STYLES 932#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 933 const char *res = rs[Rs_font + style];
… …
1207 } 1222 }
1208 1223
1209 if (menubar_visible ()) 1224 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0, 1226 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 width, menuBar_TotalHeight ());
1213 1228
1214 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1215 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 width, height);
1217 1232
1218 scr_clear (); 1233 scr_clear ();
1219#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1235 resize_pixmap ();
1221#endif 1236#endif

Diff Legend

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