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.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"
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
… …
284 delete argv; 313 delete argv;
285 314
286#ifdef KEYSYM_RESOURCE 315#ifdef KEYSYM_RESOURCE
287 delete keyboard; 316 delete keyboard;
288#endif 317#endif
318}
319
320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
289} 327}
290 328
291void 329void
292rxvt_term::destroy () 330rxvt_term::destroy ()
293{ 331{
… …
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 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
446 set_locale (""); 489 set_locale ("");
447 490
448 if (!init_vars ()) 491 if (!init_vars ())
449 return false; 492 return false;
450 493
451 init_secondary (); 494 init_secondary ();
452 495
453 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
454 497
455#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 499 keyboard->register_done ();
457#endif 500#endif
458 501
459#if MENUBAR_MAX 502#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
461#endif 504#endif
462#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 506 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 508#endif
509 }
466 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
467 create_windows (argc, argv); 541 create_windows (argc, argv);
468 542
469 dDisp; 543 dDisp;
470 544
471 init_xlocale (); 545 init_xlocale ();
472 546
473 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
474 548
475#if 0 549#if 0
476 XSynchronize (disp, True); 550 XSynchronize (disp, True);
477#endif 551#endif
478 552
479#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 554 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
482#endif 556#endif
483#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
484 if (menubar_visible ()) 558 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
486#endif 560#endif
487#ifdef TRANSPARENT 561#ifdef TRANSPARENT
488 if (options & Opt_transparent) 562 if (OPTION (Opt_transparent))
489 { 563 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 565 check_our_parents ();
492 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
493 } 567 }
494#endif 568#endif
495 569
496 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
497 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
498 572
499 set_colorfgbg (); 573 set_colorfgbg ();
500 574
501 init_command (cmd_argv); 575 init_command (cmd_argv);
502 576
503 free (cmd_argv); 577 free (cmd_argv);
504 578
579 if (pty.pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
506 581
507 check_ev.start (); 582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
508 586
509 return true; 587 return true;
510} 588}
511 589
512static struct sig_handlers 590static struct sig_handlers
… …
520 598
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 601 if (pid == (*t)->cmd_pid)
524 { 602 {
525 (*t)->destroy (); 603 (*t)->child_exit ();
526 break; 604 break;
527 } 605 }
528 } 606 }
529 607
530 /* 608 /*
… …
573 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
574 652
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
578} 658}
579 659
580/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
618 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
620void 700void
621rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
622{ 702{
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__) 703#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
638 case IGNORE: 713 case IGNORE:
639 /* 714 /*
640 * 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
641 * back to root later, as required 716 * back to root later, as required
642 */ 717 */
718 setegid (getgid ());
643 seteuid (getuid ()); 719 seteuid (getuid ());
644 setegid (getgid ());
645 break; 720 break;
646 case SAVE: 721 case SAVE:
647 euid = geteuid ();
648 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
649 break; 724 break;
650 case RESTORE: 725 case RESTORE:
651 seteuid (euid);
652 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
653 break; 728 break;
654 } 729 }
655# else 730# else
656 switch (action) 731 switch (action)
657 { 732 {
658 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
659 setuid (getuid ()); 735 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
662 case SAVE: 737 case SAVE:
663 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
664 case RESTORE: 739 case RESTORE:
665 break; 740 break;
… …
670 745
671#ifdef UTMP_SUPPORT 746#ifdef UTMP_SUPPORT
672void 747void
673rxvt_term::privileged_utmp (rxvt_privaction action) 748rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 749{
675 if ((options & Opt_utmpInhibit) 750 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 751 || !pty.name || !*pty.name)
677 return; 752 return;
678 753
679 rxvt_privileges (RESTORE); 754 rxvt_privileges (RESTORE);
680 755
… …
718 if (rs[Rs_geometry]) 793 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 794 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 795
721 if (flags & WidthValue) 796 if (flags & WidthValue)
722 { 797 {
723 ncol = clamp (w, 0, MAX_POSITIVE_INT16); 798 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 799 szHint.flags |= USSize;
725 } 800 }
726 801
727 if (flags & HeightValue) 802 if (flags & HeightValue)
728 { 803 {
729 nrow = clamp (h, 0, MAX_POSITIVE_INT16); 804 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 805 szHint.flags |= USSize;
731 } 806 }
732 807
733 if (flags & XValue) 808 if (flags & XValue)
734 { 809 {
… …
772 847
773 if (scrollbar_visible ()) 848 if (scrollbar_visible ())
774 { 849 {
775 sb_w = scrollbar_TotalWidth (); 850 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 851 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 852 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 853 window_vt_x += sb_w;
779 } 854 }
780 855
781 if (menubar_visible ()) 856 if (menubar_visible ())
782 { 857 {
… …
810 { 885 {
811 min_it (height, max_height); 886 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 887 szHint.height = szHint.base_height + height;
813 } 888 }
814 889
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 891 window_sb_x = szHint.width - sb_w;
817 892
818 if (recalc_x) 893 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 895 if (recalc_y)
… …
889 prop.height += lineSpace; 964 prop.height += lineSpace;
890 fs->set_prop (prop); 965 fs->set_prop (prop);
891 966
892 fwidth = prop.width; 967 fwidth = prop.width;
893 fheight = prop.height; 968 fheight = prop.height;
894 fweight = prop.weight; 969 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 970
898 for (int style = 1; style < 4; style++) 971 for (int style = 1; style < 4; style++)
899 { 972 {
900#if ENABLE_STYLES 973#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 974 const char *res = rs[Rs_font + style];
… …
935 return true; 1008 return true;
936} 1009}
937 1010
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1011void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 1012{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 1013 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 1014 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1015 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 1016}
945 1017
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1018void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 1019{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 1020 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 1021 char *s = rxvt_wcstoutf8 (ws);
951 1022
952 XChangeProperty (display->display, parent[0], 1023 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1024 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1065 i = atoi (color);
995 1066
996 if (i >= 8 && i <= 15) 1067 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1068 { /* bright colors */
998 i -= 8; 1069 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
1002 goto done; 1072 goto done;
1003# endif
1004 } 1073 }
1005 1074
1006 if (i >= 0 && i <= 7) 1075 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1076 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1192 } 1261 }
1193 1262
1194 if (menubar_visible ()) 1263 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1264 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1265 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1266 width, menuBar_TotalHeight ());
1198 1267
1199 XMoveResizeWindow (disp, vt, 1268 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1269 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1270 width, height);
1202 1271
1203 scr_clear (); 1272 scr_clear ();
1204#ifdef XPM_BACKGROUND 1273#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1274 resize_pixmap ();
1206#endif 1275#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1455 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1456 unsigned long fg, bg;
1388 const char *p; 1457 const char *p;
1389 char **s; 1458 char **s;
1390 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1460
1461 TEMP_ENV;
1391 1462
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1464 return false;
1394 1465
1395 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