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.150 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 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"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
48# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
49#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}
50 65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
57{ 72{
58 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 74 return false;
60 75
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 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);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
193 pty.put (); 221 pty.put ();
194} 222}
195 223
196rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
197{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 229
200 emergency_cleanup (); 230 emergency_cleanup ();
201 231
202#if ENABLE_STYLES 232#if ENABLE_STYLES
… …
254 if (parent[0]) 284 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
256 } 286 }
257 287
258 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 289 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
263#endif 292#endif
264 293
… …
287 delete keyboard; 316 delete keyboard;
288#endif 317#endif
289} 318}
290 319
291void 320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
327}
328
329void
292rxvt_term::destroy () 330rxvt_term::destroy ()
293{ 331{
294 if (destroy_ev.active) 332 if (destroy_ev.active)
295 return; 333 return;
296 334
… …
339} 377}
340 378
341void 379void
342rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
343{ 381{
344 SET_R (this); 382 make_current ();
345 383
346 delete this; 384 delete this;
347} 385}
348 386
349/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
440/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
441bool 479bool
442rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
443{ 481{
444 SET_R (this); 482 SET_R (this);
445
446 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
447 485
448 if (!init_vars ()) 486 if (!init_vars ())
449 return false; 487 return false;
450 488
451 init_secondary (); 489 init_secondary ();
… …
458 496
459#if MENUBAR_MAX 497#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 498 menubar_read (rs[Rs_menu]);
461#endif 499#endif
462#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 503#endif
466 504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531
467 create_windows (argc, argv); 532 create_windows (argc, argv);
468 533
469 dDisp; 534 dDisp;
470 535
471 init_xlocale (); 536 init_xlocale ();
472 537
473 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
474 539
475#if 0 540#if 0
476 XSynchronize (disp, True); 541 XSynchronize (disp, True);
477#endif 542#endif
478 543
479#ifdef HAVE_SCROLLBARS 544#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 545 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 546 resize_scrollbar (); /* create and map scrollbar */
482#endif 547#endif
483#if (MENUBAR_MAX) 548#if (MENUBAR_MAX)
484 if (menubar_visible ()) 549 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 550 XMapWindow (disp, menuBar.win);
486#endif 551#endif
487#ifdef TRANSPARENT 552#ifdef TRANSPARENT
488 if (options & Opt_transparent) 553 if (OPTION (Opt_transparent))
489 { 554 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 555 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 556 check_our_parents ();
492 rootwin_ev.start (display, display->root); 557 rootwin_ev.start (display, display->root);
493 } 558 }
… …
500 565
501 init_command (cmd_argv); 566 init_command (cmd_argv);
502 567
503 free (cmd_argv); 568 free (cmd_argv);
504 569
570 if (pty.pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
506 572
507 check_ev.start (); 573 check_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
508 576
509 return true; 577 return true;
510} 578}
511 579
512static struct sig_handlers 580static struct sig_handlers
… …
520 588
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 591 if (pid == (*t)->cmd_pid)
524 { 592 {
525 (*t)->destroy (); 593 (*t)->child_exit ();
526 break; 594 break;
527 } 595 }
528 } 596 }
529 597
530 /* 598 /*
… …
547 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
548 { 616 {
549 } 617 }
550} sig_handlers; 618} sig_handlers;
551 619
620char **rxvt_environ; // startup environment
621
552void 622void
553rxvt_init () 623rxvt_init ()
554{ 624{
625 rxvt_environ = environ;
626
555 /* 627 /*
556 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
557 * If we need privileges in any area then we must specifically request it. 629 * If we need privileges in any area then we must specifically request it.
558 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
559 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
… …
573 /* signal (SIGURG, SIG_DFL); */ 645 /* signal (SIGURG, SIG_DFL); */
574 646
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 647 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 648 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 649 XSetIOErrorHandler (rxvt_xioerror_handler);
650
651 XrmInitialize ();
578} 652}
579 653
580/* ------------------------------------------------------------------------- * 654/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 655 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 656 * ------------------------------------------------------------------------- */
… …
618 * ------------------------------------------------------------------------- */ 692 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 693/* take care of suid/sgid super-user (root) privileges */
620void 694void
621rxvt_privileges (rxvt_privaction action) 695rxvt_privileges (rxvt_privaction action)
622{ 696{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__) 697#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 699 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 700# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 701# define setegid(a) setregid(-1, (a))
… …
638 case IGNORE: 707 case IGNORE:
639 /* 708 /*
640 * change effective uid/gid - not real uid/gid - so we can switch 709 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required 710 * back to root later, as required
642 */ 711 */
712 setegid (getgid ());
643 seteuid (getuid ()); 713 seteuid (getuid ());
644 setegid (getgid ());
645 break; 714 break;
646 case SAVE: 715 case SAVE:
647 euid = geteuid ();
648 egid = getegid (); 716 saved_egid = getegid ();
717 saved_euid = geteuid ();
649 break; 718 break;
650 case RESTORE: 719 case RESTORE:
651 seteuid (euid);
652 setegid (egid); 720 setegid (saved_egid);
721 seteuid (saved_euid);
653 break; 722 break;
654 } 723 }
655# else 724# else
656 switch (action) 725 switch (action)
657 { 726 {
658 case IGNORE: 727 case IGNORE:
728 setgid (getgid ());
659 setuid (getuid ()); 729 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
662 case SAVE: 731 case SAVE:
663 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
664 case RESTORE: 733 case RESTORE:
665 break; 734 break;
… …
670 739
671#ifdef UTMP_SUPPORT 740#ifdef UTMP_SUPPORT
672void 741void
673rxvt_term::privileged_utmp (rxvt_privaction action) 742rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 743{
675 if ((options & Opt_utmpInhibit) 744 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 745 || !pty.name || !*pty.name)
677 return; 746 return;
678 747
679 rxvt_privileges (RESTORE); 748 rxvt_privileges (RESTORE);
680 749
… …
718 if (rs[Rs_geometry]) 787 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 788 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 789
721 if (flags & WidthValue) 790 if (flags & WidthValue)
722 { 791 {
723 ncol = clamp (w, 0, MAX_POSITIVE_INT16); 792 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 793 szHint.flags |= USSize;
725 } 794 }
726 795
727 if (flags & HeightValue) 796 if (flags & HeightValue)
728 { 797 {
729 nrow = clamp (h, 0, MAX_POSITIVE_INT16); 798 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 799 szHint.flags |= USSize;
731 } 800 }
732 801
733 if (flags & XValue) 802 if (flags & XValue)
734 { 803 {
… …
772 841
773 if (scrollbar_visible ()) 842 if (scrollbar_visible ())
774 { 843 {
775 sb_w = scrollbar_TotalWidth (); 844 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 845 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 846 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 847 window_vt_x += sb_w;
779 } 848 }
780 849
781 if (menubar_visible ()) 850 if (menubar_visible ())
782 { 851 {
… …
810 { 879 {
811 min_it (height, max_height); 880 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 881 szHint.height = szHint.base_height + height;
813 } 882 }
814 883
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 885 window_sb_x = szHint.width - sb_w;
817 886
818 if (recalc_x) 887 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 889 if (recalc_y)
… …
889 prop.height += lineSpace; 958 prop.height += lineSpace;
890 fs->set_prop (prop); 959 fs->set_prop (prop);
891 960
892 fwidth = prop.width; 961 fwidth = prop.width;
893 fheight = prop.height; 962 fheight = prop.height;
894 fweight = prop.weight; 963 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 964
898 for (int style = 1; style < 4; style++) 965 for (int style = 1; style < 4; style++)
899 { 966 {
900#if ENABLE_STYLES 967#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 968 const char *res = rs[Rs_font + style];
… …
935 return true; 1002 return true;
936} 1003}
937 1004
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1005void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 1006{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 1007 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 1008 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1009 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 1010}
945 1011
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 1013{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 1014 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 1015 char *s = rxvt_wcstoutf8 (ws);
951 1016
952 XChangeProperty (display->display, parent[0], 1017 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1059 i = atoi (color);
995 1060
996 if (i >= 8 && i <= 15) 1061 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1062 { /* bright colors */
998 i -= 8; 1063 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1065 SET_PIXCOLOR (idx);
1002 goto done; 1066 goto done;
1003# endif
1004 } 1067 }
1005 1068
1006 if (i >= 0 && i <= 7) 1069 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1070 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1192 } 1255 }
1193 1256
1194 if (menubar_visible ()) 1257 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1258 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1259 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1260 width, menuBar_TotalHeight ());
1198 1261
1199 XMoveResizeWindow (disp, vt, 1262 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1263 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1264 width, height);
1202 1265
1203 scr_clear (); 1266 scr_clear ();
1204#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1268 resize_pixmap ();
1206#endif 1269#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1449 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1450 unsigned long fg, bg;
1388 const char *p; 1451 const char *p;
1389 char **s; 1452 char **s;
1390 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1454
1455 set_environ (envv);
1391 1456
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1458 return false;
1394 1459
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1561 int i; 1626 int i;
1562 const char *p; 1627 const char *p;
1563 char **s; 1628 char **s;
1564 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1565 1630
1566 SET_R (this); 1631 make_current ();
1567 1632
1568 im_destroy (); 1633 im_destroy ();
1569 1634
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1636 if (Input_Context)

Diff Legend

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