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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.169 by root, Tue Jan 10 18:09:22 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
… …
261 289
262 delete pix_colors_focused; 290 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 291#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 292 delete pix_colors_unfocused;
265#endif 293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
296#endif
266 297
267 displays.put (display); 298 displays.put (display);
268 299
269 scr_release (); 300 scr_release ();
270 301
… …
286 delete argv; 317 delete argv;
287 318
288#ifdef KEYSYM_RESOURCE 319#ifdef KEYSYM_RESOURCE
289 delete keyboard; 320 delete keyboard;
290#endif 321#endif
322}
323
324void
325rxvt_term::child_exit ()
326{
327 cmd_pid = 0;
328
329 if (!OPTION (Opt_hold))
330 destroy ();
291} 331}
292 332
293void 333void
294rxvt_term::destroy () 334rxvt_term::destroy ()
295{ 335{
… …
460 500
461#if MENUBAR_MAX 501#if MENUBAR_MAX
462 menubar_read (rs[Rs_menu]); 502 menubar_read (rs[Rs_menu]);
463#endif 503#endif
464#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
465 if (options & Opt_scrollBar) 505 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 506 scrollBar.setIdle (); /* set existence for size calculations */
507#endif
508
509#if ENABLE_PERL
510 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default";
512
513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
530 rxvt_perl.init ();
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 }
467#endif 533#endif
468 534
469 create_windows (argc, argv); 535 create_windows (argc, argv);
470 536
471 dDisp; 537 dDisp;
… …
477#if 0 543#if 0
478 XSynchronize (disp, True); 544 XSynchronize (disp, True);
479#endif 545#endif
480 546
481#ifdef HAVE_SCROLLBARS 547#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 548 if (OPTION (Opt_scrollBar))
483 resize_scrollbar (); /* create and map scrollbar */ 549 resize_scrollbar (); /* create and map scrollbar */
484#endif 550#endif
485#if (MENUBAR_MAX) 551#if (MENUBAR_MAX)
486 if (menubar_visible ()) 552 if (menubar_visible ())
487 XMapWindow (disp, menuBar.win); 553 XMapWindow (disp, menuBar.win);
488#endif 554#endif
489#ifdef TRANSPARENT 555#ifdef TRANSPARENT
490 if (options & Opt_transparent) 556 if (OPTION (Opt_transparent))
491 { 557 {
492 XSelectInput (disp, display->root, PropertyChangeMask); 558 XSelectInput (disp, display->root, PropertyChangeMask);
493 check_our_parents (); 559 check_our_parents ();
494 rootwin_ev.start (display, display->root); 560 rootwin_ev.start (display, display->root);
495 } 561 }
… …
502 568
503 init_command (cmd_argv); 569 init_command (cmd_argv);
504 570
505 free (cmd_argv); 571 free (cmd_argv);
506 572
573 if (pty.pty >= 0)
507 pty_ev.start (pty.pty, EVENT_READ); 574 pty_ev.start (pty.pty, EVENT_READ);
508 575
509 check_ev.start (); 576 check_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
510 579
511 return true; 580 return true;
512} 581}
513 582
514static struct sig_handlers 583static struct sig_handlers
… …
522 591
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 592 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 593 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid) 594 if (pid == (*t)->cmd_pid)
526 { 595 {
527 (*t)->destroy (); 596 (*t)->child_exit ();
528 break; 597 break;
529 } 598 }
530 } 599 }
531 600
532 /* 601 /*
… …
575 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
576 645
577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578 // TODO: handle this with exceptions and tolerate the memory loss 647 // TODO: handle this with exceptions and tolerate the memory loss
579 XSetIOErrorHandler (rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
649
650#ifdef USE_XGETDEFAULT
651 XrmInitialize ();
652#endif
580} 653}
581 654
582/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
583 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
584 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
620 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
622void 695void
623rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
624{ 697{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__) 698#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
644 */ 712 */
645 seteuid (getuid ()); 713 seteuid (getuid ());
646 setegid (getgid ()); 714 setegid (getgid ());
647 break; 715 break;
648 case SAVE: 716 case SAVE:
649 euid = geteuid (); 717 saved_euid = geteuid ();
650 egid = getegid (); 718 saved_egid = getegid ();
651 break; 719 break;
652 case RESTORE: 720 case RESTORE:
653 seteuid (euid); 721 seteuid (saved_euid);
654 setegid (egid); 722 setegid (saved_egid);
655 break; 723 break;
656 } 724 }
657# else 725# else
658 switch (action) 726 switch (action)
659 { 727 {
… …
672 740
673#ifdef UTMP_SUPPORT 741#ifdef UTMP_SUPPORT
674void 742void
675rxvt_term::privileged_utmp (rxvt_privaction action) 743rxvt_term::privileged_utmp (rxvt_privaction action)
676{ 744{
677 if ((options & Opt_utmpInhibit) 745 if (OPTION (Opt_utmpInhibit)
678 || !pty.name || !*pty.name) 746 || !pty.name || !*pty.name)
679 return; 747 return;
680 748
681 rxvt_privileges (RESTORE); 749 rxvt_privileges (RESTORE);
682 750
… …
774 842
775 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
776 { 844 {
777 sb_w = scrollbar_TotalWidth (); 845 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 846 szHint.base_width += sb_w;
779 if (!(options & Opt_scrollBar_right)) 847 if (!OPTION (Opt_scrollBar_right))
780 window_vt_x += sb_w; 848 window_vt_x += sb_w;
781 } 849 }
782 850
783 if (menubar_visible ()) 851 if (menubar_visible ())
784 { 852 {
… …
812 { 880 {
813 min_it (height, max_height); 881 min_it (height, max_height);
814 szHint.height = szHint.base_height + height; 882 szHint.height = szHint.base_height + height;
815 } 883 }
816 884
817 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 886 window_sb_x = szHint.width - sb_w;
819 887
820 if (recalc_x) 888 if (recalc_x)
821 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822 if (recalc_y) 890 if (recalc_y)
… …
891 prop.height += lineSpace; 959 prop.height += lineSpace;
892 fs->set_prop (prop); 960 fs->set_prop (prop);
893 961
894 fwidth = prop.width; 962 fwidth = prop.width;
895 fheight = prop.height; 963 fheight = prop.height;
896 fbase = (*fs)[1]->ascent; 964 fbase = prop.ascent;
897 965
898 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
899 { 967 {
900#if ENABLE_STYLES 968#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
… …
935 return true; 1003 return true;
936} 1004}
937 1005
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1006void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 1007{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 1008 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 1009 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1010 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 1011}
945 1012
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1013void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 1014{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 1015 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 1016 char *s = rxvt_wcstoutf8 (ws);
951 1017
952 XChangeProperty (display->display, parent[0], 1018 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1019 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1060 i = atoi (color);
995 1061
996 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1063 { /* bright colors */
998 i -= 8; 1064 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1002 goto done; 1067 goto done;
1003# endif
1004 } 1068 }
1005 1069
1006 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1071 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1192 } 1256 }
1193 1257
1194 if (menubar_visible ()) 1258 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1260 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1198 1262
1199 XMoveResizeWindow (disp, vt, 1263 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1202 1266
1203 scr_clear (); 1267 scr_clear ();
1204#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1269 resize_pixmap ();
1206#endif 1270#endif

Diff Legend

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