ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.23 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.29 by pcg, Sat Feb 21 21:43:37 2004 UTC

… …
372 MEvent.time = CurrentTime; 372 MEvent.time = CurrentTime;
373 MEvent.button = AnyButton; 373 MEvent.button = AnyButton;
374 Options = DEFAULT_OPTIONS; 374 Options = DEFAULT_OPTIONS;
375 want_refresh = 1; 375 want_refresh = 1;
376 cmd_pid = -1; 376 cmd_pid = -1;
377 cmd_fd = tty_fd = Xfd = -1; 377 cmd_fd = tty_fd = -1;
378 PrivateModes = SavedModes = PrivMode_Default; 378 PrivateModes = SavedModes = PrivMode_Default;
379 TermWin.focus = 0; 379 TermWin.focus = 0;
380 TermWin.ncol = 80; 380 TermWin.ncol = 80;
381 TermWin.nrow = 24; 381 TermWin.nrow = 24;
382 TermWin.int_bwidth = INTERNALBORDERWIDTH; 382 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
423 423
424 last_bot = last_state = -1; 424 last_bot = last_state = -1;
425 425
426#ifdef MENUBAR 426#ifdef MENUBAR
427 menu_readonly = 1; 427 menu_readonly = 1;
428# if !(MENUBAR_MAX > 1) 428# if ! (MENUBAR_MAX > 1)
429 CurrentBar = &(BarList); 429 CurrentBar = & (BarList);
430# endif /* (MENUBAR_MAX > 1) */ 430# endif /* (MENUBAR_MAX > 1) */
431#endif 431#endif
432 432
433 return true; 433 return true;
434} 434}
… …
475 { 475 {
476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
477 if (i == 4 || i == 7) 477 if (i == 4 || i == 7)
478 continue; 478 continue;
479#endif 479#endif
480 close(i); 480 close (i);
481 } 481 }
482#endif 482#endif
483} 483}
484 484
485/*----------------------------------------------------------------------*/ 485/*----------------------------------------------------------------------*/
… …
492 492
493 /* 493 /*
494 * Look for -exec option. Find => split and make cmd_argv[] of command args 494 * Look for -exec option. Find => split and make cmd_argv[] of command args
495 */ 495 */
496 for (r_argc = 0; r_argc < argc; r_argc++) 496 for (r_argc = 0; r_argc < argc; r_argc++)
497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
498 break; 498 break;
499 499
500 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 500 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
501 501
502 for (i = 0; i < r_argc; i++) 502 for (i = 0; i < r_argc; i++)
503 r_argv[i] = (const char *)argv[i]; 503 r_argv[i] = (const char *)argv[i];
504 504
505 r_argv[i] = NULL; 505 r_argv[i] = NULL;
506 506
507 if (r_argc == argc) 507 if (r_argc == argc)
508 cmd_argv = NULL; 508 cmd_argv = NULL;
509 else 509 else
510 { 510 {
511 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 511 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
512 512
513 for (i = 0; i < argc - r_argc - 1; i++) 513 for (i = 0; i < argc - r_argc - 1; i++)
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 514 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 515
516 cmd_argv[i] = NULL; 516 cmd_argv[i] = NULL;
… …
518 518
519 /* clear all resources */ 519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;) 520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL; 521 rs[i++] = NULL;
522 522
523 rs[Rs_name] = rxvt_r_basename(argv[0]); 523 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 524
525 /* 525 /*
526 * Open display, get options/resources and create the window 526 * Open display, get options/resources and create the window
527 */ 527 */
528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
535 if (rs[Rs_display_name][0] == ':') 535 if (rs[Rs_display_name][0] == ':')
536 { 536 {
537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
538 STRCPY (val, "unix"); 538 STRCPY (val, "unix");
539 STRCAT (val, rs[Rs_display_name]); 539 STRCAT (val, rs[Rs_display_name]);
540 Xdisplay = XOpenDisplay (val); 540 display = displays.get (val);
541 free (val); 541 free (val);
542 } 542 }
543#endif 543#endif
544 544
545 if (Xdisplay == NULL 545 if (!display
546 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 546 && ! (display = displays.get (rs[Rs_display_name])))
547 { 547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE); 549 exit (EXIT_FAILURE);
550 } 550 }
551 551
552 extract_resources (Xdisplay, rs[Rs_name]); 552 extract_resources (display->display, rs[Rs_name]);
553 553
554 /* 554 /*
555 * set any defaults not already set 555 * set any defaults not already set
556 */ 556 */
557 if (cmd_argv && cmd_argv[0]) 557 if (cmd_argv && cmd_argv[0])
558 { 558 {
559 if (!rs[Rs_title]) 559 if (!rs[Rs_title])
560 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 560 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
561 if (!rs[Rs_iconName]) 561 if (!rs[Rs_iconName])
562 rs[Rs_iconName] = rs[Rs_title]; 562 rs[Rs_iconName] = rs[Rs_title];
563 } 563 }
564 else 564 else
565 { 565 {
… …
567 rs[Rs_title] = rs[Rs_name]; 567 rs[Rs_title] = rs[Rs_name];
568 if (!rs[Rs_iconName]) 568 if (!rs[Rs_iconName])
569 rs[Rs_iconName] = rs[Rs_name]; 569 rs[Rs_iconName] = rs[Rs_name];
570 } 570 }
571 571
572 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 572 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
573 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 573 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
574 574
575#ifndef NO_FRILLS 575#ifndef NO_FRILLS
576 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 576 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
577 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 577 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
578 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 578 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
579 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 579 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
580#endif 580#endif
581 581
582#ifndef NO_LINESPACE 582#ifndef NO_LINESPACE
583 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 583 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
584 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 584 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
585#endif 585#endif
586 586
587#ifdef POINTER_BLANK 587#ifdef POINTER_BLANK
588 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 588 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
589 pointerBlankDelay = i; 589 pointerBlankDelay = i;
590 else 590 else
591 pointerBlankDelay = 2; 591 pointerBlankDelay = 2;
592#endif 592#endif
593 593
… …
604 rs[Rs_cutchars] = CUTCHARS; 604 rs[Rs_cutchars] = CUTCHARS;
605 605
606#ifdef ACS_ASCII 606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars]) 607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS; 608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 { 610 {
611 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; ) 612 for (; i < 0x20; )
613 val[i] = ' '; 613 val[i] = ' ';
614 rs[Rs_acs_chars] = val; 614 rs[Rs_acs_chars] = val;
615 } 615 }
616#endif 616#endif
… …
622# else 622# else
623 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 623 key_backspace = "DEC"; /* can toggle between \010 or \177 */
624# endif 624# endif
625 else 625 else
626 { 626 {
627 val = STRDUP(rs[Rs_backspace_key]); 627 val = STRDUP (rs[Rs_backspace_key]);
628 rxvt_Str_trim(val); 628 rxvt_Str_trim (val);
629 rxvt_Str_escaped(val); 629 rxvt_Str_escaped (val);
630 key_backspace = val; 630 key_backspace = val;
631 } 631 }
632#endif 632#endif
633 633
634#ifndef NO_DELETE_KEY 634#ifndef NO_DELETE_KEY
… …
638# else 638# else
639 key_delete = "\033[3~"; 639 key_delete = "\033[3~";
640# endif 640# endif
641 else 641 else
642 { 642 {
643 val = STRDUP(rs[Rs_delete_key]); 643 val = STRDUP (rs[Rs_delete_key]);
644 rxvt_Str_trim(val); 644 rxvt_Str_trim (val);
645 rxvt_Str_escaped(val); 645 rxvt_Str_escaped (val);
646 key_delete = val; 646 key_delete = val;
647 } 647 }
648#endif 648#endif
649 if (rs[Rs_answerbackstring]) 649 if (rs[Rs_answerbackstring])
650 { 650 {
651 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 653 }
654 654
655 if (rs[Rs_selectstyle]) 655 if (rs[Rs_selectstyle])
656 { 656 {
657 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT; 658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION 659#ifndef NO_OLD_SELECTION
660 660
661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT; 662 selection_style = OLD_SELECT;
663#endif 663#endif
664 664
665 } 665 }
666 666
… …
691 rs[Rs_color + i] = def_colorName[i]; 691 rs[Rs_color + i] = def_colorName[i];
692 692
693#ifndef XTERM_REVERSE_VIDEO 693#ifndef XTERM_REVERSE_VIDEO
694 /* this is how we implement reverseVideo */ 694 /* this is how we implement reverseVideo */
695 if (Options & Opt_reverseVideo) 695 if (Options & Opt_reverseVideo)
696 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 696 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
697#endif 697#endif
698 698
699 /* convenient aliases for setting fg/bg to colors */ 699 /* convenient aliases for setting fg/bg to colors */
700 color_aliases (Color_fg); 700 color_aliases (Color_fg);
701 color_aliases (Color_bg); 701 color_aliases (Color_bg);
… …
724 724
725#ifdef DISPLAY_IS_IP 725#ifdef DISPLAY_IS_IP
726 /* Fixup display_name for export over pty to any interested terminal 726 /* Fixup display_name for export over pty to any interested terminal
727 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 727 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
728 * (for the first non-loopback interface) that we get from 728 * (for the first non-loopback interface) that we get from
729 * rxvt_network_display(). This is more "name-resolution-portable", if you 729 * rxvt_network_display (). This is more "name-resolution-portable", if you
730 * will, and probably allows for faster x-client startup if your name 730 * will, and probably allows for faster x-client startup if your name
731 * server is beyond a slow link or overloaded at client startup. Of 731 * server is beyond a slow link or overloaded at client startup. Of
732 * course that only helps the shell's child processes, not us. 732 * course that only helps the shell's child processes, not us.
733 * 733 *
734 * Giving out the display_name also affords a potential security hole 734 * Giving out the display_name also affords a potential security hole
… …
736 val = rxvt_network_display (rs[Rs_display_name]); 736 val = rxvt_network_display (rs[Rs_display_name]);
737 rs[Rs_display_name] = (const char *)val; 737 rs[Rs_display_name] = (const char *)val;
738 738
739 if (val == NULL) 739 if (val == NULL)
740#endif /* DISPLAY_IS_IP */ 740#endif /* DISPLAY_IS_IP */
741 val = XDisplayString(Xdisplay); 741 val = XDisplayString (display->display);
742 742
743 if (rs[Rs_display_name] == NULL) 743 if (rs[Rs_display_name] == NULL)
744 rs[Rs_display_name] = val; /* use broken `:0' value */ 744 rs[Rs_display_name] = val; /* use broken `:0' value */
745 745
746 i = STRLEN (val); 746 i = STRLEN (val);
747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
748 748
749 sprintf (env_display, "DISPLAY=%s", val); 749 sprintf (env_display, "DISPLAY=%s", val);
750 750
751 /* avoiding the math library: 751 /* avoiding the math library:
752 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 752 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
753 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 753 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
754 ; 754 ;
755 MAX_IT(i, 1); 755 MAX_IT (i, 1);
756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
757 757
758 sprintf (env_windowid, "WINDOWID=%u", 758 sprintf (env_windowid, "WINDOWID=%u",
759 (unsigned int)TermWin.parent[0]); 759 (unsigned int)TermWin.parent[0]);
760 760
761 /* add entries to the environment: 761 /* add entries to the environment:
762 * @ DISPLAY: in case we started with -display 762 * @ DISPLAY: in case we started with -display
763 * @ WINDOWID: X window id number of the window 763 * @ WINDOWID: X window id number of the window
764 * @ COLORTERM: terminal sub-name and also indicates its color 764 * @ COLORTERM: terminal sub-name and also indicates its color
765 * @ TERM: terminal name 765 * @ TERM: terminal name
766 * @ TERMINFO: path to terminfo directory 766 * @ TERMINFO: path to terminfo directory
767 * @ COLORFGBG: fg;bg color codes
767 */ 768 */
768 putenv (env_display); 769 putenv (env_display);
769 putenv (env_windowid); 770 putenv (env_windowid);
771 if (env_colorfgbg)
772 putenv (env_colorfgbg);
770 773
771#ifdef RXVT_TERMINFO 774#ifdef RXVT_TERMINFO
772 putenv ("TERMINFO=" RXVT_TERMINFO); 775 putenv ("TERMINFO=" RXVT_TERMINFO);
773#endif 776#endif
774 777
775 if (Xdepth <= 2) 778 if (display->depth <= 2)
776 putenv ("COLORTERM=" COLORTERMENV "-mono"); 779 putenv ("COLORTERM=" COLORTERMENV "-mono");
777 else 780 else
778 putenv ("COLORTERM=" COLORTERMENVFULL); 781 putenv ("COLORTERM=" COLORTERMENVFULL);
779 782
780 if (rs[Rs_term_name] != NULL) 783 if (rs[Rs_term_name] != NULL)
781 { 784 {
782 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 785 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
783 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 786 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
784 putenv (env_term); 787 putenv (env_term);
785 } 788 }
786 else 789 else
787 putenv ("TERM=" TERMENV); 790 putenv ("TERM=" TERMENV);
… …
803rxvt_term::set_locale (const char *locale) 806rxvt_term::set_locale (const char *locale)
804{ 807{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 808#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 809 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
811 SET_LOCALE (this->locale);
812 mbstate.reset ();
808#endif 813#endif
809#if HAVE_NL_LANGINFO 814#if HAVE_NL_LANGINFO
810 free (codeset); 815 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET)); 816 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 817 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
… …
824 rxvt_print_error ("Setting locale failed."); 829 rxvt_print_error ("Setting locale failed.");
825 else 830 else
826 { 831 {
827 Atom wmlocale; 832 Atom wmlocale;
828 833
829 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
830 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 835 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
831 XA_STRING, 8, PropModeReplace, 836 XA_STRING, 8, PropModeReplace,
832 (unsigned char *)locale, STRLEN(locale)); 837 (unsigned char *)locale, STRLEN (locale));
833 838
834 if (!XSupportsLocale ()) 839 if (!XSupportsLocale ())
835 { 840 {
836 rxvt_print_error ("The locale is not supported by Xlib"); 841 rxvt_print_error ("The locale is not supported by Xlib");
837 return; 842 return;
838 } 843 }
839 844
845 im_ev.start (display);
846
840 /* see if we can connect yet */ 847 /* see if we can connect already */
841 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 848 im_cb ();
842
843 /* To avoid Segmentation Fault in C locale: Solaris only? */
844 if (STRCMP (locale, "C"))
845 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
846 rxvt_IMInstantiateCallback, NULL);
847 } 849 }
848#endif 850#endif
849} 851}
850 852
851/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
852void 854void
853rxvt_term::init_command(const char *const *argv) 855rxvt_term::init_command (const char *const *argv)
854{ 856{
855 /* 857 /*
856 * Initialize the command connection. 858 * Initialize the command connection.
857 * This should be called after the X server connection is established. 859 * This should be called after the X server connection is established.
858 */ 860 */
859 int i; 861 int i;
860 862
861 for (i = 0; i < NUM_XA; i++) 863 for (i = 0; i < NUM_XA; i++)
862 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 864 xa[i] = XInternAtom (display->display, xa_names[i], False);
863 865
864 /* Enable delete window protocol */ 866 /* Enable delete window protocol */
865 XSetWMProtocols (Xdisplay, TermWin.parent[0], 867 XSetWMProtocols (display->display, TermWin.parent[0],
866 &(xa[XA_WMDELETEWINDOW]), 1); 868 & (xa[XA_WMDELETEWINDOW]), 1);
867 869
868#ifdef USING_W11LIB 870#ifdef USING_W11LIB
869 /* enable W11 callbacks */ 871 /* enable W11 callbacks */
870 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 872 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
871#endif 873#endif
872 874
873#ifdef META8_OPTION 875#ifdef META8_OPTION
874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 876 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
875#endif 877#endif
876 878
877 get_ourmods (); 879 get_ourmods ();
878 880
879 if (!(Options & Opt_scrollTtyOutput)) 881 if (! (Options & Opt_scrollTtyOutput))
880 PrivateModes |= PrivMode_TtyOutputInh; 882 PrivateModes |= PrivMode_TtyOutputInh;
881 if (Options & Opt_scrollTtyKeypress) 883 if (Options & Opt_scrollTtyKeypress)
882 PrivateModes |= PrivMode_Keypress; 884 PrivateModes |= PrivMode_Keypress;
883 if (!(Options & Opt_jumpScroll)) 885 if (! (Options & Opt_jumpScroll))
884 PrivateModes |= PrivMode_smoothScroll; 886 PrivateModes |= PrivMode_smoothScroll;
885 887
886#ifndef NO_BACKSPACE_KEY 888#ifndef NO_BACKSPACE_KEY
887 if (STRCMP(key_backspace, "DEC") == 0) 889 if (STRCMP (key_backspace, "DEC") == 0)
888 PrivateModes |= PrivMode_HaveBackSpace; 890 PrivateModes |= PrivMode_HaveBackSpace;
889#endif 891#endif
890 892
891 /* add value for scrollBar */ 893 /* add value for scrollBar */
892 if (scrollbar_visible ()) 894 if (scrollbar_visible ())
… …
899 PrivateModes |= PrivMode_menuBar; 901 PrivateModes |= PrivMode_menuBar;
900 SavedModes |= PrivMode_menuBar; 902 SavedModes |= PrivMode_menuBar;
901 } 903 }
902 904
903#ifdef GREEK_SUPPORT 905#ifdef GREEK_SUPPORT
904 greek_init(); 906 greek_init ();
905#endif 907#endif
906
907 Xfd = XConnectionNumber (Xdisplay);
908 908
909#ifdef CURSOR_BLINK 909#ifdef CURSOR_BLINK
910
911 if (Options & Opt_cursorBlink) 910 if (Options & Opt_cursorBlink)
912 (void)gettimeofday (&lastcursorchange, NULL); 911 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 912#endif
914 913
915 if ((cmd_fd = run_command (argv)) < 0) 914 if ((cmd_fd = run_command (argv)) < 0)
… …
934 933
935 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 934 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
936 { 935 {
937#ifndef XTERM_REVERSE_VIDEO 936#ifndef XTERM_REVERSE_VIDEO
938 if (i < 2 && (Options & Opt_reverseVideo)) 937 if (i < 2 && (Options & Opt_reverseVideo))
939 {
940 rs[Rs_color + i] = def_colorName[!i]; 938 rs[Rs_color + i] = def_colorName[!i];
941 }
942 else 939 else
943#endif 940#endif
944 rs[Rs_color + i] = def_colorName[i]; 941 rs[Rs_color + i] = def_colorName[i];
945 942
946 if (!rs[Rs_color + i]) 943 if (!rs[Rs_color + i])
… …
1002 * xcol[1] == top shadow 999 * xcol[1] == top shadow
1003 * xcol[2] == bot shadow */ 1000 * xcol[2] == bot shadow */
1004 1001
1005 xcol[1] = PixColors[Color_scroll]; 1002 xcol[1] = PixColors[Color_scroll];
1006# ifdef PREFER_24BIT 1003# ifdef PREFER_24BIT
1007 xcol[0].set (this, 65535, 65535, 65535); 1004 xcol[0].set (display, 65535, 65535, 65535);
1008 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1005 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1009# else 1006# else
1010 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); 1007 xcol[0].set (display, WhitePixel (display->display, display->screen));
1011# endif 1008# endif
1012 1009
1013 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1014 1011
1015 xcol[0].get (this, pr0, pg0, pb0); 1012 xcol[0].get (display, pr0, pg0, pb0);
1016 xcol[1].get (this, pr1, pg1, pb1); 1013 xcol[1].get (display, pr1, pg1, pb1);
1017 1014
1018 /* bottomShadowColor */ 1015 /* bottomShadowColor */
1019 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) 1016 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1020 xcol[2] = PixColors[Color_Black]; 1017 xcol[2] = PixColors[Color_Black];
1021 1018
1022 PixColors[Color_bottomShadow] = xcol[2]; 1019 PixColors[Color_bottomShadow] = xcol[2];
1023 1020
1024 /* topShadowColor */ 1021 /* topShadowColor */
1025 if (!xcol[1].set (this, 1022 if (!xcol[1].set (display,
1026 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1027 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1028 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1029 xcol[1] = PixColors[Color_White]; 1026 xcol[1] = PixColors[Color_White];
1030 1027
… …
1034} 1031}
1035 1032
1036/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1037/* color aliases, fg/bg bright-bold */ 1034/* color aliases, fg/bg bright-bold */
1038void 1035void
1039rxvt_term::color_aliases(int idx) 1036rxvt_term::color_aliases (int idx)
1040{ 1037{
1041 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1038 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1042 { 1039 {
1043 int i = atoi (rs[Rs_color + idx]); 1040 int i = atoi (rs[Rs_color + idx]);
1044 1041
1045 if (i >= 8 && i <= 15) 1042 if (i >= 8 && i <= 15)
1046 { /* bright colors */ 1043 { /* bright colors */
… …
1076 }; 1073 };
1077 1074
1078 requestedmeta = realmeta = realalt = 0; 1075 requestedmeta = realmeta = realalt = 0;
1079 rsmod = rs[Rs_modifier]; 1076 rsmod = rs[Rs_modifier];
1080 if (rsmod 1077 if (rsmod
1081 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1078 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1082 requestedmeta = rsmod[3] - '0'; 1079 requestedmeta = rsmod[3] - '0';
1083 1080
1084 map = XGetModifierMapping(Xdisplay); 1081 map = XGetModifierMapping (display->display);
1085 kc = map->modifiermap; 1082 kc = map->modifiermap;
1086 for (i = 1; i < 6; i++) 1083 for (i = 1; i < 6; i++)
1087 { 1084 {
1088 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1085 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1089 for (j = map->max_keypermod; j--; k++) 1086 for (j = map->max_keypermod; j--; k++)
1090 { 1087 {
1091 if (kc[k] == 0) 1088 if (kc[k] == 0)
1092 break; 1089 break;
1093 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 1090 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1094 { 1091 {
1095 case XK_Num_Lock: 1092 case XK_Num_Lock:
1096 ModNumLockMask = modmasks[i - 1]; 1093 ModNumLockMask = modmasks[i - 1];
1097 /* FALLTHROUGH */ 1094 /* FALLTHROUGH */
1098 default: 1095 default:
1099 continue; /* for(;;) */ 1096 continue; /* for (;;) */
1100 case XK_Meta_L: 1097 case XK_Meta_L:
1101 case XK_Meta_R: 1098 case XK_Meta_R:
1102 cm = "meta"; 1099 cm = "meta";
1103 realmeta = i; 1100 realmeta = i;
1104 break; 1101 break;
… …
1114 case XK_Hyper_L: 1111 case XK_Hyper_L:
1115 case XK_Hyper_R: 1112 case XK_Hyper_R:
1116 cm = "hyper"; 1113 cm = "hyper";
1117 break; 1114 break;
1118 } 1115 }
1119 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1116 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1120 requestedmeta = i; 1117 requestedmeta = i;
1121 } 1118 }
1122 } 1119 }
1123 XFreeModifiermap(map); 1120 XFreeModifiermap (map);
1124 i = (requestedmeta ? requestedmeta 1121 i = (requestedmeta ? requestedmeta
1125 : (realmeta ? realmeta 1122 : (realmeta ? realmeta
1126 : (realalt ? realalt : 0))); 1123 : (realalt ? realalt : 0)));
1127 if (i) 1124 if (i)
1128 ModMetaMask = modmasks[i - 1]; 1125 ModMetaMask = modmasks[i - 1];
1129} 1126}
1130 1127
1131/*----------------------------------------------------------------------*/ 1128/*----------------------------------------------------------------------*/
1132/* rxvt_Create_Windows() - Open and map the window */ 1129/* rxvt_Create_Windows () - Open and map the window */
1133void 1130void
1134rxvt_term::create_windows (int argc, const char *const *argv) 1131rxvt_term::create_windows (int argc, const char *const *argv)
1135{ 1132{
1136 XClassHint classHint; 1133 XClassHint classHint;
1137 XWMHints wmHint; 1134 XWMHints wmHint;
1138 XGCValues gcvalue; 1135 XGCValues gcvalue;
1139 long vt_emask; 1136 long vt_emask;
1140 1137
1141 XWindowAttributes gattr; 1138 XWindowAttributes gattr;
1142 1139
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay);
1146
1147 if (Options & Opt_transparent) 1140 if (Options & Opt_transparent)
1148 { 1141 {
1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1142 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1150 Xdepth = gattr.depth; 1143 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1151 }
1152 else
1153 {
1154 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1155#ifdef PREFER_24BIT
1156 /*
1157 * If depth is not 24, look for a 24bit visual.
1158 */
1159 if (Xdepth != 24)
1160 {
1161 XVisualInfo vinfo;
1162
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 {
1165 Xdepth = 24;
1166 Xvisual = vinfo.visual;
1167 Xcmap = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen),
1169 Xvisual, AllocNone);
1170 }
1171 }
1172#endif
1173
1174 } 1144 }
1175 1145
1176 /* grab colors before netscape does */ 1146 /* grab colors before netscape does */
1177 Get_Colours (); 1147 Get_Colours ();
1178 1148
… …
1180 window_calc (0, 0); 1150 window_calc (0, 0);
1181 old_width = szHint.width; 1151 old_width = szHint.width;
1182 old_height = szHint.height; 1152 old_height = szHint.height;
1183 1153
1184 /* parent window - reverse video so we can see placement errors 1154 /* parent window - reverse video so we can see placement errors
1185 * sub-window placement & size in rxvt_resize_subwindows() 1155 * sub-window placement & size in rxvt_resize_subwindows ()
1186 */ 1156 */
1187 1157
1188#ifdef PREFER_24BIT 1158#ifdef PREFER_24BIT
1189 XSetWindowAttributes attributes; 1159 XSetWindowAttributes attributes;
1190 1160
1191 attributes.background_pixel = PixColors[Color_fg]; 1161 attributes.background_pixel = PixColors[Color_fg];
1192 attributes.border_pixel = PixColors[Color_border]; 1162 attributes.border_pixel = PixColors[Color_border];
1193 attributes.colormap = Xcmap; 1163 attributes.colormap = display->cmap;
1194 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1164 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1195 szHint.x, szHint.y, 1165 szHint.x, szHint.y,
1196 szHint.width, szHint.height, 1166 szHint.width, szHint.height,
1197 TermWin.ext_bwidth, 1167 TermWin.ext_bwidth,
1198 Xdepth, InputOutput, 1168 display->depth, InputOutput,
1199 Xvisual, 1169 display->visual,
1200 CWBackPixel | CWBorderPixel 1170 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1201 | CWColormap, &attributes);
1202#else 1171#else
1203 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1172 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1204 szHint.x, szHint.y, 1173 szHint.x, szHint.y,
1205 szHint.width, 1174 szHint.width,
1206 szHint.height, 1175 szHint.height,
1207 TermWin.ext_bwidth, 1176 TermWin.ext_bwidth,
1208 PixColors[Color_border], 1177 PixColors[Color_border],
… …
1219 wmHint.input = True; 1188 wmHint.input = True;
1220 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1221 : NormalState); 1190 : NormalState);
1222 wmHint.window_group = TermWin.parent[0]; 1191 wmHint.window_group = TermWin.parent[0];
1223 1192
1224 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1225 (char **)argv, argc, &szHint, &wmHint, &classHint); 1194 (char **)argv, argc, &szHint, &wmHint, &classHint);
1195
1226 XSelectInput(Xdisplay, TermWin.parent[0], 1196 XSelectInput (display->display, TermWin.parent[0],
1227 (KeyPressMask 1197 KeyPressMask
1228#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1229 | KeyReleaseMask 1199 | KeyReleaseMask
1230#endif 1200#endif
1231 | FocusChangeMask | VisibilityChangeMask 1201 | FocusChangeMask | VisibilityChangeMask
1232 | StructureNotifyMask)); 1202 | StructureNotifyMask);
1203 termwin_ev.start (display, TermWin.parent[0]);
1233 1204
1234 /* vt cursor: Black-on-White is standard, but this is more popular */ 1205 /* vt cursor: Black-on-White is standard, but this is more popular */
1235 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1236 1207
1237#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1238 /* cursor (menuBar/scrollBar): Black-on-White */ 1209 /* cursor (menuBar/scrollBar): Black-on-White */
1239 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1210 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1240#endif 1211#endif
1241 1212
1242#ifdef POINTER_BLANK 1213#ifdef POINTER_BLANK
1243
1244 { 1214 {
1245 XColor blackcolour; 1215 XColor blackcolour;
1246 blackcolour.red = 0; 1216 blackcolour.red = 0;
1247 blackcolour.green = 0; 1217 blackcolour.green = 0;
1248 blackcolour.blue = 0; 1218 blackcolour.blue = 0;
1249 Font f = XLoadFont (Xdisplay, "fixed"); 1219 Font f = XLoadFont (display->display, "fixed");
1250 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1220 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1251 &blackcolour, &blackcolour); 1221 &blackcolour, &blackcolour);
1252 XUnloadFont (Xdisplay, f); 1222 XUnloadFont (display->display, f);
1253 } 1223 }
1254#endif 1224#endif
1255 1225
1256 /* the vt window */ 1226 /* the vt window */
1257 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1258 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1259 TermWin_TotalWidth(), 1229 TermWin_TotalWidth (),
1260 TermWin_TotalHeight(), 1230 TermWin_TotalHeight (),
1261 0, 1231 0,
1262 PixColors[Color_fg], 1232 PixColors[Color_fg],
1263 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1234
1264#ifdef DEBUG_X 1235#ifdef DEBUG_X
1265 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1266#endif 1237#endif
1267 1238
1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1239 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1269 | PropertyChangeMask); 1240 | PropertyChangeMask);
1270 1241
… …
1275 vt_emask |= PointerMotionMask; 1246 vt_emask |= PointerMotionMask;
1276 else 1247 else
1277#endif 1248#endif
1278 vt_emask |= (Button1MotionMask | Button3MotionMask); 1249 vt_emask |= (Button1MotionMask | Button3MotionMask);
1279 1250
1280 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1251 XSelectInput (display->display, TermWin.vt, vt_emask);
1252 vt_ev.start (display, TermWin.vt);
1281 1253
1282#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1254#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1283
1284 if (menuBar_height()) 1255 if (menuBar_height ())
1285 { 1256 {
1286 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1287 window_vt_x, 0, 1258 window_vt_x, 0,
1288 TermWin_TotalWidth(), 1259 TermWin_TotalWidth (),
1289 menuBar_TotalHeight(), 1260 menuBar_TotalHeight (),
1290 0, 1261 0,
1291 PixColors[Color_fg], 1262 PixColors[Color_fg],
1292 PixColors[Color_scroll]); 1263 PixColors[Color_scroll]);
1293#ifdef DEBUG_X 1264#ifdef DEBUG_X
1294
1295 XStoreName(Xdisplay, menuBar.win, "menubar"); 1265 XStoreName (display->display, menuBar.win, "menubar");
1296#endif 1266#endif
1297 1267
1298 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1269
1299 XSelectInput(Xdisplay, menuBar.win, 1270 XSelectInput (display->display, menuBar.win,
1300 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1301 | Button1MotionMask)); 1272 | Button1MotionMask));
1273 menubar_ev.start (display, menuBar.win);
1302 } 1274 }
1303#endif 1275#endif
1276
1304#ifdef XPM_BACKGROUND 1277#ifdef XPM_BACKGROUND
1305 if (rs[Rs_backgroundPixmap] != NULL 1278 if (rs[Rs_backgroundPixmap] != NULL
1306 && !(Options & Opt_transparent)) 1279 && ! (Options & Opt_transparent))
1307 { 1280 {
1308 const char *p = rs[Rs_backgroundPixmap]; 1281 const char *p = rs[Rs_backgroundPixmap];
1309 1282
1310 if ((p = STRCHR(p, ';')) != NULL) 1283 if ((p = STRCHR (p, ';')) != NULL)
1311 { 1284 {
1312 p++; 1285 p++;
1313 scale_pixmap (p); 1286 scale_pixmap (p);
1314 } 1287 }
1315 set_bgPixmap (rs[Rs_backgroundPixmap]); 1288 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1319 1292
1320 /* graphics context for the vt window */ 1293 /* graphics context for the vt window */
1321 gcvalue.foreground = PixColors[Color_fg]; 1294 gcvalue.foreground = PixColors[Color_fg];
1322 gcvalue.background = PixColors[Color_bg]; 1295 gcvalue.background = PixColors[Color_bg];
1323 gcvalue.graphics_exposures = 1; 1296 gcvalue.graphics_exposures = 1;
1324 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1297 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1325 GCForeground | GCBackground 1298 GCForeground | GCBackground
1326 | GCGraphicsExposures, &gcvalue); 1299 | GCGraphicsExposures, &gcvalue);
1327 1300
1328#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1329
1330 gcvalue.foreground = PixColors[Color_topShadow]; 1302 gcvalue.foreground = PixColors[Color_topShadow];
1331 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1303 topShadowGC = XCreateGC (display->display, TermWin.vt,
1332 GCForeground, &gcvalue); 1304 GCForeground, &gcvalue);
1333 gcvalue.foreground = PixColors[Color_bottomShadow]; 1305 gcvalue.foreground = PixColors[Color_bottomShadow];
1334 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1306 botShadowGC = XCreateGC (display->display, TermWin.vt,
1335 GCForeground, &gcvalue); 1307 GCForeground, &gcvalue);
1336 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1337 : Color_scroll)]; 1309 : Color_scroll)];
1338 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1310 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1339 GCForeground, &gcvalue); 1311 GCForeground, &gcvalue);
1340#endif 1312#endif
1341} 1313}
1342 1314
1343/*----------------------------------------------------------------------*/ 1315/*----------------------------------------------------------------------*/
… …
1350rxvt_term::run_command (const char *const *argv) 1322rxvt_term::run_command (const char *const *argv)
1351{ 1323{
1352 int cfd, er; 1324 int cfd, er;
1353 1325
1354 /* get master (pty) */ 1326 /* get master (pty) */
1355 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1356 { 1328 {
1357 rxvt_print_error("can't open pseudo-tty"); 1329 rxvt_print_error ("can't open pseudo-tty");
1358 return -1; 1330 return -1;
1359 } 1331 }
1360
1361#ifdef FD_SETSIZE
1362 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1363 {
1364 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1365 rxvt_clean_exit();
1366 exit(EXIT_FAILURE);
1367 }
1368#endif
1369 1332
1370 fcntl (cfd, F_SETFL, O_NONBLOCK); 1333 fcntl (cfd, F_SETFL, O_NONBLOCK);
1371 1334
1372 /* get slave (tty) */ 1335 /* get slave (tty) */
1373 if (tty_fd < 0) 1336 if (tty_fd < 0)
… …
1376 privileged_ttydev (SAVE); 1339 privileged_ttydev (SAVE);
1377#endif 1340#endif
1378 1341
1379 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1380 { 1343 {
1381 close(cfd); 1344 close (cfd);
1382 rxvt_print_error("can't open slave tty %s", ttydev); 1345 rxvt_print_error ("can't open slave tty %s", ttydev);
1383 return -1; 1346 return -1;
1384 } 1347 }
1385 } 1348 }
1386#ifndef NO_BACKSPACE_KEY 1349#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1350 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1351 er = key_backspace[0];
1389 else if (STRCMP(key_backspace, "DEC") == 0) 1352 else if (STRCMP (key_backspace, "DEC") == 0)
1390 er = '\177'; /* the initial state anyway */ 1353 er = '\177'; /* the initial state anyway */
1391 else 1354 else
1392#endif 1355#endif
1393 1356
1394 er = -1; 1357 er = -1;
1395 1358
1396 rxvt_get_ttymode (&(tio), er); 1359 rxvt_get_ttymode (& (tio), er);
1397 1360
1398#ifndef __QNX__ 1361#ifndef __QNX__
1399 /* spin off the command interpreter */ 1362 /* spin off the command interpreter */
1400 switch (cmd_pid = fork ()) 1363 switch (cmd_pid = fork ())
1401 { 1364 {
1402 case -1: 1365 case -1:
1403 rxvt_print_error("can't fork"); 1366 rxvt_print_error ("can't fork");
1404 return -1; 1367 return -1;
1405 case 0: 1368 case 0:
1406 close (cfd); /* only keep tty_fd and STDERR open */ 1369 close (cfd); /* only keep tty_fd and STDERR open */
1407 close (Xfd); 1370
1371 init_env ();
1372
1408 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1373 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1409 rxvt_print_error ("could not obtain control of tty"); 1374 rxvt_print_error ("could not obtain control of tty");
1410 else 1375 else
1411 { 1376 {
1412 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */
… …
1439 dup2 (fdstdin, STDIN_FILENO); 1404 dup2 (fdstdin, STDIN_FILENO);
1440 close (fdstdin); 1405 close (fdstdin);
1441#endif 1406#endif
1442 1407
1443 } 1408 }
1444 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1445 break; 1410 break;
1446 } 1411 }
1447#else /* __QNX__ uses qnxspawn() */ 1412#else /* __QNX__ uses qnxspawn () */
1448 fchmod (tty_fd, 0622); 1413 fchmod (tty_fd, 0622);
1449 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1414 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1450 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1415 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1451 1416
1452 if (run_child (argv) == -1) 1417 if (run_child (argv) == -1)
… …
1466int 1431int
1467rxvt_term::run_child (const char *const *argv) 1432rxvt_term::run_child (const char *const *argv)
1468{ 1433{
1469 char *login; 1434 char *login;
1470 1435
1471 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1436 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1472 1437
1473 if (Options & Opt_console) 1438 if (Options & Opt_console)
1474 { /* be virtual console, fail silently */ 1439 { /* be virtual console, fail silently */
1475#ifdef TIOCCONS 1440#ifdef TIOCCONS
1476 unsigned int on = 1; 1441 unsigned int on = 1;
… …
1522 { 1487 {
1523# ifdef DEBUG_CMD 1488# ifdef DEBUG_CMD
1524 int i; 1489 int i;
1525 1490
1526 for (i = 0; argv[i]; i++) 1491 for (i = 0; argv[i]; i++)
1527 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1492 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1528# endif 1493# endif
1529 1494
1530 execvp(argv[0], (char *const *)argv); 1495 execvp (argv[0], (char *const *)argv);
1531 /* no error message: STDERR is closed! */ 1496 /* no error message: STDERR is closed! */
1532 } 1497 }
1533 else 1498 else
1534 { 1499 {
1535 const char *argv0, *shell; 1500 const char *argv0, *shell;
1536 1501
1537 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1502 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1538 shell = "/bin/sh"; 1503 shell = "/bin/sh";
1539 1504
1540 argv0 = (const char *)rxvt_r_basename(shell); 1505 argv0 = (const char *)rxvt_r_basename (shell);
1541 if (Options & Opt_loginShell) 1506 if (Options & Opt_loginShell)
1542 { 1507 {
1543 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1508 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1544 1509
1545 login[0] = '-'; 1510 login[0] = '-';
1546 STRCPY(&login[1], argv0); 1511 STRCPY (&login[1], argv0);
1547 argv0 = login; 1512 argv0 = login;
1548 } 1513 }
1549 execlp(shell, argv0, NULL); 1514 execlp (shell, argv0, NULL);
1550 /* no error message: STDERR is closed! */ 1515 /* no error message: STDERR is closed! */
1551 } 1516 }
1552 1517
1553#else /* __QNX__ uses qnxspawn() */ 1518#else /* __QNX__ uses qnxspawn () */
1554 1519
1555 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1520 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1556 char *command = NULL, fullcommand[_MAX_PATH]; 1521 char *command = NULL, fullcommand[_MAX_PATH];
1557 char **arg_v, *arg_a[2] = { NULL, NULL }; 1522 char **arg_v, *arg_a[2] = { NULL, NULL };
1558 1523
1559 if (argv != NULL) 1524 if (argv != NULL)
1560 { 1525 {
1561 if (access(argv[0], X_OK) == -1) 1526 if (access (argv[0], X_OK) == -1)
1562 { 1527 {
1563 if (STRCHR(argv[0], '/') == NULL) 1528 if (STRCHR (argv[0], '/') == NULL)
1564 { 1529 {
1565 searchenv(argv[0], "PATH", fullcommand); 1530 searchenv (argv[0], "PATH", fullcommand);
1566 if (fullcommand[0] != '\0') 1531 if (fullcommand[0] != '\0')
1567 command = fullcommand; 1532 command = fullcommand;
1568 } 1533 }
1569 if (access(command, X_OK) == -1) 1534 if (access (command, X_OK) == -1)
1570 return -1; 1535 return -1;
1571 } 1536 }
1572 else 1537 else
1573 command = argv[0]; 1538 command = argv[0];
1574 arg_v = argv; 1539 arg_v = argv;
1575 } 1540 }
1576 else 1541 else
1577 { 1542 {
1578 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1543 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1579 command = "/bin/sh"; 1544 command = "/bin/sh";
1580 1545
1581 arg_a[0] = my_basename(command); 1546 arg_a[0] = my_basename (command);
1582 if (Options & Opt_loginShell) 1547 if (Options & Opt_loginShell)
1583 { 1548 {
1584 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1549 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1585 1550
1586 login[0] = '-'; 1551 login[0] = '-';
1587 STRCPY(&login[1], arg_a[0]); 1552 STRCPY (&login[1], arg_a[0]);
1588 arg_a[0] = login; 1553 arg_a[0] = login;
1589 } 1554 }
1590 arg_v = arg_a; 1555 arg_v = arg_a;
1591 } 1556 }
1592 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1557 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1593 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1558 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1594 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1559 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1595 command, arg_v, environ, iov_a, 0); 1560 command, arg_v, environ, iov_a, 0);
1596 if (login) 1561 if (login)
1597 free(login); 1562 free (login);
1598 1563
1599 close(tty_fd); 1564 close (tty_fd);
1600 return cmd_fd; 1565 return cmd_fd;
1601 1566
1602#endif 1567#endif
1603 return -1; 1568 return -1;
1604} 1569}
1605 1570
1606/* ------------------------------------------------------------------------- * 1571/* ------------------------------------------------------------------------- *
1607 * GET TTY CURRENT STATE * 1572 * GET TTY CURRENT STATE *
1608 * ------------------------------------------------------------------------- */ 1573 * ------------------------------------------------------------------------- */
1609/* rxvt_get_ttymode() */ 1574/* rxvt_get_ttymode () */
1610/* EXTPROTO */ 1575/* EXTPROTO */
1611void 1576void
1612rxvt_get_ttymode(ttymode_t *tio, int erase) 1577rxvt_get_ttymode (ttymode_t *tio, int erase)
1613{ 1578{
1614#ifdef HAVE_TERMIOS_H 1579#ifdef HAVE_TERMIOS_H
1615 /* 1580 /*
1616 * standard System V termios interface 1581 * standard System V termios interface
1617 */ 1582 */
1618 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1583 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1619 { 1584 {
1620 /* return error - use system defaults */ 1585 /* return error - use system defaults */
1621 tio->c_cc[VINTR] = CINTR; 1586 tio->c_cc[VINTR] = CINTR;
1622 tio->c_cc[VQUIT] = CQUIT; 1587 tio->c_cc[VQUIT] = CQUIT;
1623 tio->c_cc[VERASE] = CERASE; 1588 tio->c_cc[VERASE] = CERASE;
… …
1697 /* 1662 /*
1698 * sgtty interface 1663 * sgtty interface
1699 */ 1664 */
1700 1665
1701 /* get parameters -- gtty */ 1666 /* get parameters -- gtty */
1702 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1703 { 1668 {
1704 tio->sg.sg_erase = CERASE; /* ^H */ 1669 tio->sg.sg_erase = CERASE; /* ^H */
1705 tio->sg.sg_kill = CKILL; /* ^U */ 1670 tio->sg.sg_kill = CKILL; /* ^U */
1706 } 1671 }
1707 if (erase != -1) 1672 if (erase != -1)
1708 tio->sg.sg_erase = (char)erase; 1673 tio->sg.sg_erase = (char)erase;
1709 1674
1710 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1675 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1711 1676
1712 /* get special characters */ 1677 /* get special characters */
1713 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1678 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1714 { 1679 {
1715 tio->tc.t_intrc = CINTR; /* ^C */ 1680 tio->tc.t_intrc = CINTR; /* ^C */
1716 tio->tc.t_quitc = CQUIT; /* ^\ */ 1681 tio->tc.t_quitc = CQUIT; /* ^\ */
1717 tio->tc.t_startc = CSTART; /* ^Q */ 1682 tio->tc.t_startc = CSTART; /* ^Q */
1718 tio->tc.t_stopc = CSTOP; /* ^S */ 1683 tio->tc.t_stopc = CSTOP; /* ^S */
1719 tio->tc.t_eofc = CEOF; /* ^D */ 1684 tio->tc.t_eofc = CEOF; /* ^D */
1720 tio->tc.t_brkc = -1; 1685 tio->tc.t_brkc = -1;
1721 } 1686 }
1722 /* get local special chars */ 1687 /* get local special chars */
1723 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1688 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1724 { 1689 {
1725 tio->lc.t_suspc = CSUSP; /* ^Z */ 1690 tio->lc.t_suspc = CSUSP; /* ^Z */
1726 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1691 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1727 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1692 tio->lc.t_rprntc = CRPRNT; /* ^R */
1728 tio->lc.t_flushc = CFLUSH; /* ^O */ 1693 tio->lc.t_flushc = CFLUSH; /* ^O */
1729 tio->lc.t_werasc = CWERASE; /* ^W */ 1694 tio->lc.t_werasc = CWERASE; /* ^W */
1730 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1695 tio->lc.t_lnextc = CLNEXT; /* ^V */
1731 } 1696 }
1732 /* get line discipline */ 1697 /* get line discipline */
1733 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1698 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1734# ifdef NTTYDISC 1699# ifdef NTTYDISC
1735 1700
1736 tio->line = NTTYDISC; 1701 tio->line = NTTYDISC;
1737# endif /* NTTYDISC */ 1702# endif /* NTTYDISC */
1738 1703
… …
1743 * Debugging 1708 * Debugging
1744 */ 1709 */
1745#ifdef DEBUG_TTYMODE 1710#ifdef DEBUG_TTYMODE
1746#ifdef HAVE_TERMIOS_H 1711#ifdef HAVE_TERMIOS_H
1747 /* c_iflag bits */ 1712 /* c_iflag bits */
1748 fprintf(stderr, "Input flags\n"); 1713 fprintf (stderr, "Input flags\n");
1749 1714
1750 /* cpp token stringize doesn't work on all machines <sigh> */ 1715 /* cpp token stringize doesn't work on all machines <sigh> */
1751# define FOO(flag,name) \ 1716# define FOO(flag,name) \
1752 if ((tio->c_iflag) & flag) \ 1717 if ((tio->c_iflag) & flag) \
1753 fprintf (stderr, "%s ", name) 1718 fprintf (stderr, "%s ", name)
1754 1719
1755 /* c_iflag bits */ 1720 /* c_iflag bits */
1756 FOO(IGNBRK, "IGNBRK"); 1721 FOO (IGNBRK, "IGNBRK");
1757 FOO(BRKINT, "BRKINT"); 1722 FOO (BRKINT, "BRKINT");
1758 FOO(IGNPAR, "IGNPAR"); 1723 FOO (IGNPAR, "IGNPAR");
1759 FOO(PARMRK, "PARMRK"); 1724 FOO (PARMRK, "PARMRK");
1760 FOO(INPCK, "INPCK"); 1725 FOO (INPCK, "INPCK");
1761 FOO(ISTRIP, "ISTRIP"); 1726 FOO (ISTRIP, "ISTRIP");
1762 FOO(INLCR, "INLCR"); 1727 FOO (INLCR, "INLCR");
1763 FOO(IGNCR, "IGNCR"); 1728 FOO (IGNCR, "IGNCR");
1764 FOO(ICRNL, "ICRNL"); 1729 FOO (ICRNL, "ICRNL");
1765 FOO(IXON, "IXON"); 1730 FOO (IXON, "IXON");
1766 FOO(IXOFF, "IXOFF"); 1731 FOO (IXOFF, "IXOFF");
1767# ifdef IUCLC 1732# ifdef IUCLC
1768 1733
1769 FOO(IUCLC, "IUCLC"); 1734 FOO (IUCLC, "IUCLC");
1770# endif 1735# endif
1771# ifdef IXANY 1736# ifdef IXANY
1772 1737
1773 FOO(IXANY, "IXANY"); 1738 FOO (IXANY, "IXANY");
1774# endif 1739# endif
1775# ifdef IMAXBEL 1740# ifdef IMAXBEL
1776 1741
1777 FOO(IMAXBEL, "IMAXBEL"); 1742 FOO (IMAXBEL, "IMAXBEL");
1778# endif 1743# endif
1779 1744
1780 fprintf(stderr, "\n"); 1745 fprintf (stderr, "\n");
1781 1746
1782# undef FOO 1747# undef FOO
1783# define FOO(entry, name) \ 1748# define FOO(entry, name) \
1784 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1749 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1785 1750
1786 FOO(VINTR, "VINTR"); 1751 FOO (VINTR, "VINTR");
1787 FOO(VQUIT, "VQUIT"); 1752 FOO (VQUIT, "VQUIT");
1788 FOO(VERASE, "VERASE"); 1753 FOO (VERASE, "VERASE");
1789 FOO(VKILL, "VKILL"); 1754 FOO (VKILL, "VKILL");
1790 FOO(VEOF, "VEOF"); 1755 FOO (VEOF, "VEOF");
1791 FOO(VEOL, "VEOL"); 1756 FOO (VEOL, "VEOL");
1792# ifdef VEOL2 1757# ifdef VEOL2
1793 1758
1794 FOO(VEOL2, "VEOL2"); 1759 FOO (VEOL2, "VEOL2");
1795# endif 1760# endif
1796# ifdef VSWTC 1761# ifdef VSWTC
1797 1762
1798 FOO(VSWTC, "VSWTC"); 1763 FOO (VSWTC, "VSWTC");
1799# endif 1764# endif
1800# ifdef VSWTCH 1765# ifdef VSWTCH
1801 1766
1802 FOO(VSWTCH, "VSWTCH"); 1767 FOO (VSWTCH, "VSWTCH");
1803# endif 1768# endif
1804 1769
1805 FOO(VSTART, "VSTART"); 1770 FOO (VSTART, "VSTART");
1806 FOO(VSTOP, "VSTOP"); 1771 FOO (VSTOP, "VSTOP");
1807 FOO(VSUSP, "VSUSP"); 1772 FOO (VSUSP, "VSUSP");
1808# ifdef VDSUSP 1773# ifdef VDSUSP
1809 1774
1810 FOO(VDSUSP, "VDSUSP"); 1775 FOO (VDSUSP, "VDSUSP");
1811# endif 1776# endif
1812# ifdef VREPRINT 1777# ifdef VREPRINT
1813 1778
1814 FOO(VREPRINT, "VREPRINT"); 1779 FOO (VREPRINT, "VREPRINT");
1815# endif 1780# endif
1816# ifdef VDISCRD 1781# ifdef VDISCRD
1817 1782
1818 FOO(VDISCRD, "VDISCRD"); 1783 FOO (VDISCRD, "VDISCRD");
1819# endif 1784# endif
1820# ifdef VWERSE 1785# ifdef VWERSE
1821 1786
1822 FOO(VWERSE, "VWERSE"); 1787 FOO (VWERSE, "VWERSE");
1823# endif 1788# endif
1824# ifdef VLNEXT 1789# ifdef VLNEXT
1825 1790
1826 FOO(VLNEXT, "VLNEXT"); 1791 FOO (VLNEXT, "VLNEXT");
1827# endif 1792# endif
1828 1793
1829 fprintf(stderr, "\n"); 1794 fprintf (stderr, "\n");
1830# undef FOO 1795# undef FOO
1831# endif /* HAVE_TERMIOS_H */ 1796# endif /* HAVE_TERMIOS_H */
1832#endif /* DEBUG_TTYMODE */ 1797#endif /* DEBUG_TTYMODE */
1833} 1798}
1834 1799

Diff Legend

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