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.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.164 by root, Fri Jan 6 05:37:59 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
55static char curlocale[128]; 53static char curlocale[128], savelocale[128];
56 54
57bool 55bool
58rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
59{ 57{
60 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 59 return false;
62 60
63 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
65 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);
66} 77}
67 78
68#if ENABLE_COMBINING 79#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
70 81
… …
195 pty.put (); 206 pty.put ();
196} 207}
197 208
198rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
199{ 210{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
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
204#if ENABLE_STYLES 217#if ENABLE_STYLES
… …
293void 306void
294rxvt_term::child_exit () 307rxvt_term::child_exit ()
295{ 308{
296 cmd_pid = 0; 309 cmd_pid = 0;
297 310
298 if (!(options & Opt_hold)) 311 if (!OPTION (Opt_hold))
299 destroy (); 312 destroy ();
300} 313}
301 314
302void 315void
303rxvt_term::destroy () 316rxvt_term::destroy ()
… …
469 482
470#if MENUBAR_MAX 483#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
472#endif 485#endif
473#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
476#endif 499#endif
477 500
478 create_windows (argc, argv); 501 create_windows (argc, argv);
479 502
480 dDisp; 503 dDisp;
… …
486#if 0 509#if 0
487 XSynchronize (disp, True); 510 XSynchronize (disp, True);
488#endif 511#endif
489 512
490#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 514 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 515 resize_scrollbar (); /* create and map scrollbar */
493#endif 516#endif
494#if (MENUBAR_MAX) 517#if (MENUBAR_MAX)
495 if (menubar_visible ()) 518 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win); 519 XMapWindow (disp, menuBar.win);
497#endif 520#endif
498#ifdef TRANSPARENT 521#ifdef TRANSPARENT
499 if (options & Opt_transparent) 522 if (OPTION (Opt_transparent))
500 { 523 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 524 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 525 check_our_parents ();
503 rootwin_ev.start (display, display->root); 526 rootwin_ev.start (display, display->root);
504 } 527 }
… …
511 534
512 init_command (cmd_argv); 535 init_command (cmd_argv);
513 536
514 free (cmd_argv); 537 free (cmd_argv);
515 538
539 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 540 pty_ev.start (pty.pty, EVENT_READ);
517 541
518 check_ev.start (); 542 check_ev.start ();
543
544 HOOK_INVOKE ((this, HOOK_START, DT_END));
519 545
520 return true; 546 return true;
521} 547}
522 548
523static struct sig_handlers 549static struct sig_handlers
… …
681 707
682#ifdef UTMP_SUPPORT 708#ifdef UTMP_SUPPORT
683void 709void
684rxvt_term::privileged_utmp (rxvt_privaction action) 710rxvt_term::privileged_utmp (rxvt_privaction action)
685{ 711{
686 if ((options & Opt_utmpInhibit) 712 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name) 713 || !pty.name || !*pty.name)
688 return; 714 return;
689 715
690 rxvt_privileges (RESTORE); 716 rxvt_privileges (RESTORE);
691 717
… …
783 809
784 if (scrollbar_visible ()) 810 if (scrollbar_visible ())
785 { 811 {
786 sb_w = scrollbar_TotalWidth (); 812 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 813 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 814 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 815 window_vt_x += sb_w;
790 } 816 }
791 817
792 if (menubar_visible ()) 818 if (menubar_visible ())
793 { 819 {
… …
821 { 847 {
822 min_it (height, max_height); 848 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 849 szHint.height = szHint.base_height + height;
824 } 850 }
825 851
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 852 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 853 window_sb_x = szHint.width - sb_w;
828 854
829 if (recalc_x) 855 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 856 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 857 if (recalc_y)
… …
900 prop.height += lineSpace; 926 prop.height += lineSpace;
901 fs->set_prop (prop); 927 fs->set_prop (prop);
902 928
903 fwidth = prop.width; 929 fwidth = prop.width;
904 fheight = prop.height; 930 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 931 fbase = prop.ascent;
906 932
907 for (int style = 1; style < 4; style++) 933 for (int style = 1; style < 4; style++)
908 { 934 {
909#if ENABLE_STYLES 935#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 936 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 1027 i = atoi (color);
1002 1028
1003 if (i >= 8 && i <= 15) 1029 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 1030 { /* bright colors */
1005 i -= 8; 1031 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 1033 SET_PIXCOLOR (idx);
1009 goto done; 1034 goto done;
1010# endif
1011 } 1035 }
1012 1036
1013 if (i >= 0 && i <= 7) 1037 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 1038 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1039 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1199 } 1223 }
1200 1224
1201 if (menubar_visible ()) 1225 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win, 1226 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0, 1227 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1228 width, menuBar_TotalHeight ());
1205 1229
1206 XMoveResizeWindow (disp, vt, 1230 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1231 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1232 width, height);
1209 1233
1210 scr_clear (); 1234 scr_clear ();
1211#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1236 resize_pixmap ();
1213#endif 1237#endif

Diff Legend

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