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.165 by root, Sun Jan 8 00:20:12 2006 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 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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
… …
193 pty.put (); 206 pty.put ();
194} 207}
195 208
196rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
197{ 210{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
199 212
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 214
202 emergency_cleanup (); 215 emergency_cleanup ();
203 216
… …
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_1])
493 rs[Rs_perl_ext_1] = "default";
494
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
479 rxvt_perl.init (); 499 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 }
502#endif
483 503
484 create_windows (argc, argv); 504 create_windows (argc, argv);
485 505
486 dDisp; 506 dDisp;
487 507
… …
517 537
518 init_command (cmd_argv); 538 init_command (cmd_argv);
519 539
520 free (cmd_argv); 540 free (cmd_argv);
521 541
542 if (pty.pty >= 0)
522 pty_ev.start (pty.pty, EVENT_READ); 543 pty_ev.start (pty.pty, EVENT_READ);
523 544
524 check_ev.start (); 545 check_ev.start ();
525 546
526 PERL_INVOKE ((this, HOOK_START, DT_END)); 547 HOOK_INVOKE ((this, HOOK_START, DT_END));
527 548
528 return true; 549 return true;
529} 550}
530 551
531static struct sig_handlers 552static struct sig_handlers
… …
908 prop.height += lineSpace; 929 prop.height += lineSpace;
909 fs->set_prop (prop); 930 fs->set_prop (prop);
910 931
911 fwidth = prop.width; 932 fwidth = prop.width;
912 fheight = prop.height; 933 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 934 fbase = prop.ascent;
914 935
915 for (int style = 1; style < 4; style++) 936 for (int style = 1; style < 4; style++)
916 { 937 {
917#if ENABLE_STYLES 938#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 939 const char *res = rs[Rs_font + style];
… …
1009 i = atoi (color); 1030 i = atoi (color);
1010 1031
1011 if (i >= 8 && i <= 15) 1032 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 1033 { /* bright colors */
1013 i -= 8; 1034 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
1017 goto done; 1037 goto done;
1018# endif
1019 } 1038 }
1020 1039
1021 if (i >= 0 && i <= 7) 1040 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 1041 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1207 } 1226 }
1208 1227
1209 if (menubar_visible ()) 1228 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win, 1229 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0, 1230 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1231 width, menuBar_TotalHeight ());
1213 1232
1214 XMoveResizeWindow (disp, vt, 1233 XMoveResizeWindow (disp, vt,
1215 window_vt_x, window_vt_y, 1234 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1235 width, height);
1217 1236
1218 scr_clear (); 1237 scr_clear ();
1219#ifdef XPM_BACKGROUND 1238#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1239 resize_pixmap ();
1221#endif 1240#endif

Diff Legend

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