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.174 by root, Thu Jan 12 00:11:13 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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
50# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
51#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
52 65
53vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
54 67
55static char curlocale[128]; 68static char curlocale[128], savelocale[128];
56 69
57bool 70bool
58rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
59{ 72{
60 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 74 return false;
62 75
63 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
65 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
66} 92}
67 93
68#if ENABLE_COMBINING 94#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
70 96
… …
195 pty.put (); 221 pty.put ();
196} 222}
197 223
198rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
199{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 229
202 emergency_cleanup (); 230 emergency_cleanup ();
203 231
204#if ENABLE_STYLES 232#if ENABLE_STYLES
… …
256 if (parent[0]) 284 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
258 } 286 }
259 287
260 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 289 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
265#endif 292#endif
266 293
… …
293void 320void
294rxvt_term::child_exit () 321rxvt_term::child_exit ()
295{ 322{
296 cmd_pid = 0; 323 cmd_pid = 0;
297 324
298 if (!(options & Opt_hold)) 325 if (!OPTION (Opt_hold))
299 destroy (); 326 destroy ();
300} 327}
301 328
302void 329void
303rxvt_term::destroy () 330rxvt_term::destroy ()
… …
452bool 479bool
453rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
454{ 481{
455 SET_R (this); 482 SET_R (this);
456 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
457 set_locale (""); 489 set_locale ("");
458 490
459 if (!init_vars ()) 491 if (!init_vars ())
460 return false; 492 return false;
461 493
462 init_secondary (); 494 init_secondary ();
463 495
464 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
465 497
466#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 499 keyboard->register_done ();
468#endif 500#endif
469 501
470#if MENUBAR_MAX 502#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
472#endif 504#endif
473#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 506 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 508#endif
509 }
477 510
511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 }
536#endif
537
538 {
539 TEMP_ENV;
540
478 create_windows (argc, argv); 541 create_windows (argc, argv);
479 542
480 dDisp; 543 dDisp;
481 544
482 init_xlocale (); 545 init_xlocale ();
483 546
484 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
485 548
486#if 0 549#if 0
487 XSynchronize (disp, True); 550 XSynchronize (disp, True);
488#endif 551#endif
489 552
490#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 554 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
493#endif 556#endif
494#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
495 if (menubar_visible ()) 558 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
497#endif 560#endif
498#ifdef TRANSPARENT 561#ifdef TRANSPARENT
499 if (options & Opt_transparent) 562 if (OPTION (Opt_transparent))
500 { 563 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 565 check_our_parents ();
503 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
504 } 567 }
505#endif 568#endif
506 569
507 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
509 572
510 set_colorfgbg (); 573 set_colorfgbg ();
511 574
512 init_command (cmd_argv); 575 init_command (cmd_argv);
513 576
514 free (cmd_argv); 577 free (cmd_argv);
515 578
579 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
517 581
518 check_ev.start (); 582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
519 586
520 return true; 587 return true;
521} 588}
522 589
523static struct sig_handlers 590static struct sig_handlers
… …
584 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
585 652
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
589} 658}
590 659
591/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
629 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
631void 700void
632rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
633{ 702{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__) 703#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
649 case IGNORE: 713 case IGNORE:
650 /* 714 /*
651 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required 716 * back to root later, as required
653 */ 717 */
718 setegid (getgid ());
654 seteuid (getuid ()); 719 seteuid (getuid ());
655 setegid (getgid ());
656 break; 720 break;
657 case SAVE: 721 case SAVE:
658 euid = geteuid ();
659 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
660 break; 724 break;
661 case RESTORE: 725 case RESTORE:
662 seteuid (euid);
663 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
664 break; 728 break;
665 } 729 }
666# else 730# else
667 switch (action) 731 switch (action)
668 { 732 {
669 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
670 setuid (getuid ()); 735 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
673 case SAVE: 737 case SAVE:
674 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
675 case RESTORE: 739 case RESTORE:
676 break; 740 break;
… …
681 745
682#ifdef UTMP_SUPPORT 746#ifdef UTMP_SUPPORT
683void 747void
684rxvt_term::privileged_utmp (rxvt_privaction action) 748rxvt_term::privileged_utmp (rxvt_privaction action)
685{ 749{
686 if ((options & Opt_utmpInhibit) 750 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name) 751 || !pty.name || !*pty.name)
688 return; 752 return;
689 753
690 rxvt_privileges (RESTORE); 754 rxvt_privileges (RESTORE);
691 755
… …
783 847
784 if (scrollbar_visible ()) 848 if (scrollbar_visible ())
785 { 849 {
786 sb_w = scrollbar_TotalWidth (); 850 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 851 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 852 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 853 window_vt_x += sb_w;
790 } 854 }
791 855
792 if (menubar_visible ()) 856 if (menubar_visible ())
793 { 857 {
… …
821 { 885 {
822 min_it (height, max_height); 886 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 887 szHint.height = szHint.base_height + height;
824 } 888 }
825 889
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 891 window_sb_x = szHint.width - sb_w;
828 892
829 if (recalc_x) 893 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 895 if (recalc_y)
… …
900 prop.height += lineSpace; 964 prop.height += lineSpace;
901 fs->set_prop (prop); 965 fs->set_prop (prop);
902 966
903 fwidth = prop.width; 967 fwidth = prop.width;
904 fheight = prop.height; 968 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 969 fbase = prop.ascent;
906 970
907 for (int style = 1; style < 4; style++) 971 for (int style = 1; style < 4; style++)
908 { 972 {
909#if ENABLE_STYLES 973#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 974 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 1065 i = atoi (color);
1002 1066
1003 if (i >= 8 && i <= 15) 1067 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 1068 { /* bright colors */
1005 i -= 8; 1069 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
1009 goto done; 1072 goto done;
1010# endif
1011 } 1073 }
1012 1074
1013 if (i >= 0 && i <= 7) 1075 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 1076 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1199 } 1261 }
1200 1262
1201 if (menubar_visible ()) 1263 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win, 1264 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0, 1265 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1266 width, menuBar_TotalHeight ());
1205 1267
1206 XMoveResizeWindow (disp, vt, 1268 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1269 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1270 width, height);
1209 1271
1210 scr_clear (); 1272 scr_clear ();
1211#ifdef XPM_BACKGROUND 1273#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1274 resize_pixmap ();
1213#endif 1275#endif
… …
1393 XRectangle rect, status_rect, needed_rect; 1455 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1456 unsigned long fg, bg;
1395 const char *p; 1457 const char *p;
1396 char **s; 1458 char **s;
1397 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1460
1461 TEMP_ENV;
1398 1462
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1464 return false;
1401 1465
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));

Diff Legend

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