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.25 by pcg, Wed Feb 11 08:13:44 2004 UTC vs.
Revision 1.28 by pcg, Sat Feb 21 20:33:40 2004 UTC

… …
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)
… …
541 free (val); 541 free (val);
542 } 542 }
543#endif 543#endif
544 544
545 if (!display 545 if (!display
546 && !(display = displays.get (rs[Rs_display_name]))) 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
… …
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(display->display); 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
… …
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 rxvt_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")
… …
827 Atom wmlocale; 832 Atom wmlocale;
828 833
829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
830 XChangeProperty (display->display, 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;
… …
845#endif 850#endif
846} 851}
847 852
848/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
849void 854void
850rxvt_term::init_command(const char *const *argv) 855rxvt_term::init_command (const char *const *argv)
851{ 856{
852 /* 857 /*
853 * Initialize the command connection. 858 * Initialize the command connection.
854 * This should be called after the X server connection is established. 859 * This should be called after the X server connection is established.
855 */ 860 */
856 int i; 861 int i;
857 862
858 for (i = 0; i < NUM_XA; i++) 863 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(display->display, xa_names[i], False); 864 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 865
861 /* Enable delete window protocol */ 866 /* Enable delete window protocol */
862 XSetWMProtocols (display->display, TermWin.parent[0], 867 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 868 & (xa[XA_WMDELETEWINDOW]), 1);
864 869
865#ifdef USING_W11LIB 870#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 871 /* enable W11 callbacks */
867 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 872 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 873#endif
… …
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 876 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 877#endif
873 878
874 get_ourmods (); 879 get_ourmods ();
875 880
876 if (!(Options & Opt_scrollTtyOutput)) 881 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 882 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 883 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 884 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 885 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 886 PrivateModes |= PrivMode_smoothScroll;
882 887
883#ifndef NO_BACKSPACE_KEY 888#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 889 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 890 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 891#endif
887 892
888 /* add value for scrollBar */ 893 /* add value for scrollBar */
889 if (scrollbar_visible ()) 894 if (scrollbar_visible ())
… …
896 PrivateModes |= PrivMode_menuBar; 901 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 902 SavedModes |= PrivMode_menuBar;
898 } 903 }
899 904
900#ifdef GREEK_SUPPORT 905#ifdef GREEK_SUPPORT
901 greek_init(); 906 greek_init ();
902#endif 907#endif
903 908
904#ifdef CURSOR_BLINK 909#ifdef CURSOR_BLINK
905 if (Options & Opt_cursorBlink) 910 if (Options & Opt_cursorBlink)
906 (void)gettimeofday (&lastcursorchange, NULL); 911 (void)gettimeofday (&lastcursorchange, NULL);
… …
995 * xcol[2] == bot shadow */ 1000 * xcol[2] == bot shadow */
996 1001
997 xcol[1] = PixColors[Color_scroll]; 1002 xcol[1] = PixColors[Color_scroll];
998# ifdef PREFER_24BIT 1003# ifdef PREFER_24BIT
999 xcol[0].set (display, 65535, 65535, 65535); 1004 xcol[0].set (display, 65535, 65535, 65535);
1000 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1005 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1001# else 1006# else
1002 xcol[0].set (display, WhitePixel (display->display, display->screen)); 1007 xcol[0].set (display, WhitePixel (display->display, display->screen));
1003# endif 1008# endif
1004 1009
1005 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
… …
1026} 1031}
1027 1032
1028/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1029/* color aliases, fg/bg bright-bold */ 1034/* color aliases, fg/bg bright-bold */
1030void 1035void
1031rxvt_term::color_aliases(int idx) 1036rxvt_term::color_aliases (int idx)
1032{ 1037{
1033 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1038 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1034 { 1039 {
1035 int i = atoi (rs[Rs_color + idx]); 1040 int i = atoi (rs[Rs_color + idx]);
1036 1041
1037 if (i >= 8 && i <= 15) 1042 if (i >= 8 && i <= 15)
1038 { /* bright colors */ 1043 { /* bright colors */
… …
1068 }; 1073 };
1069 1074
1070 requestedmeta = realmeta = realalt = 0; 1075 requestedmeta = realmeta = realalt = 0;
1071 rsmod = rs[Rs_modifier]; 1076 rsmod = rs[Rs_modifier];
1072 if (rsmod 1077 if (rsmod
1073 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1078 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1074 requestedmeta = rsmod[3] - '0'; 1079 requestedmeta = rsmod[3] - '0';
1075 1080
1076 map = XGetModifierMapping(display->display); 1081 map = XGetModifierMapping (display->display);
1077 kc = map->modifiermap; 1082 kc = map->modifiermap;
1078 for (i = 1; i < 6; i++) 1083 for (i = 1; i < 6; i++)
1079 { 1084 {
1080 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1085 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1081 for (j = map->max_keypermod; j--; k++) 1086 for (j = map->max_keypermod; j--; k++)
1082 { 1087 {
1083 if (kc[k] == 0) 1088 if (kc[k] == 0)
1084 break; 1089 break;
1085 switch (XKeycodeToKeysym(display->display, kc[k], 0)) 1090 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1086 { 1091 {
1087 case XK_Num_Lock: 1092 case XK_Num_Lock:
1088 ModNumLockMask = modmasks[i - 1]; 1093 ModNumLockMask = modmasks[i - 1];
1089 /* FALLTHROUGH */ 1094 /* FALLTHROUGH */
1090 default: 1095 default:
1091 continue; /* for(;;) */ 1096 continue; /* for (;;) */
1092 case XK_Meta_L: 1097 case XK_Meta_L:
1093 case XK_Meta_R: 1098 case XK_Meta_R:
1094 cm = "meta"; 1099 cm = "meta";
1095 realmeta = i; 1100 realmeta = i;
1096 break; 1101 break;
… …
1106 case XK_Hyper_L: 1111 case XK_Hyper_L:
1107 case XK_Hyper_R: 1112 case XK_Hyper_R:
1108 cm = "hyper"; 1113 cm = "hyper";
1109 break; 1114 break;
1110 } 1115 }
1111 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1116 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1112 requestedmeta = i; 1117 requestedmeta = i;
1113 } 1118 }
1114 } 1119 }
1115 XFreeModifiermap(map); 1120 XFreeModifiermap (map);
1116 i = (requestedmeta ? requestedmeta 1121 i = (requestedmeta ? requestedmeta
1117 : (realmeta ? realmeta 1122 : (realmeta ? realmeta
1118 : (realalt ? realalt : 0))); 1123 : (realalt ? realalt : 0)));
1119 if (i) 1124 if (i)
1120 ModMetaMask = modmasks[i - 1]; 1125 ModMetaMask = modmasks[i - 1];
1121} 1126}
1122 1127
1123/*----------------------------------------------------------------------*/ 1128/*----------------------------------------------------------------------*/
1124/* rxvt_Create_Windows() - Open and map the window */ 1129/* rxvt_Create_Windows () - Open and map the window */
1125void 1130void
1126rxvt_term::create_windows (int argc, const char *const *argv) 1131rxvt_term::create_windows (int argc, const char *const *argv)
1127{ 1132{
1128 XClassHint classHint; 1133 XClassHint classHint;
1129 XWMHints wmHint; 1134 XWMHints wmHint;
… …
1132 1137
1133 XWindowAttributes gattr; 1138 XWindowAttributes gattr;
1134 1139
1135 if (Options & Opt_transparent) 1140 if (Options & Opt_transparent)
1136 { 1141 {
1137 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); 1142 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1138 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1143 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1139 } 1144 }
1140 1145
1141 /* grab colors before netscape does */ 1146 /* grab colors before netscape does */
1142 Get_Colours (); 1147 Get_Colours ();
… …
1145 window_calc (0, 0); 1150 window_calc (0, 0);
1146 old_width = szHint.width; 1151 old_width = szHint.width;
1147 old_height = szHint.height; 1152 old_height = szHint.height;
1148 1153
1149 /* parent window - reverse video so we can see placement errors 1154 /* parent window - reverse video so we can see placement errors
1150 * sub-window placement & size in rxvt_resize_subwindows() 1155 * sub-window placement & size in rxvt_resize_subwindows ()
1151 */ 1156 */
1152 1157
1153#ifdef PREFER_24BIT 1158#ifdef PREFER_24BIT
1154 XSetWindowAttributes attributes; 1159 XSetWindowAttributes attributes;
1155 1160
… …
1183 wmHint.input = True; 1188 wmHint.input = True;
1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1185 : NormalState); 1190 : NormalState);
1186 wmHint.window_group = TermWin.parent[0]; 1191 wmHint.window_group = TermWin.parent[0];
1187 1192
1188 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, 1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1189 (char **)argv, argc, &szHint, &wmHint, &classHint); 1194 (char **)argv, argc, &szHint, &wmHint, &classHint);
1190 1195
1191 XSelectInput(display->display, TermWin.parent[0], 1196 XSelectInput (display->display, TermWin.parent[0],
1192 KeyPressMask 1197 KeyPressMask
1193#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1194 | KeyReleaseMask 1199 | KeyReleaseMask
1195#endif 1200#endif
1196 | FocusChangeMask | VisibilityChangeMask 1201 | FocusChangeMask | VisibilityChangeMask
1197 | StructureNotifyMask); 1202 | StructureNotifyMask);
1198 termwin_ev.start (display, TermWin.parent[0]); 1203 termwin_ev.start (display, TermWin.parent[0]);
1199 1204
1200 /* 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 */
1201 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1202 1207
1203#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1204 /* cursor (menuBar/scrollBar): Black-on-White */ 1209 /* cursor (menuBar/scrollBar): Black-on-White */
1205 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); 1210 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1206#endif 1211#endif
1207 1212
1208#ifdef POINTER_BLANK 1213#ifdef POINTER_BLANK
1209 { 1214 {
1210 XColor blackcolour; 1215 XColor blackcolour;
… …
1217 XUnloadFont (display->display, f); 1222 XUnloadFont (display->display, f);
1218 } 1223 }
1219#endif 1224#endif
1220 1225
1221 /* the vt window */ 1226 /* the vt window */
1222 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1223 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1224 TermWin_TotalWidth(), 1229 TermWin_TotalWidth (),
1225 TermWin_TotalHeight(), 1230 TermWin_TotalHeight (),
1226 0, 1231 0,
1227 PixColors[Color_fg], 1232 PixColors[Color_fg],
1228 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1229 1234
1230#ifdef DEBUG_X 1235#ifdef DEBUG_X
1231 XStoreName(display->display, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1232#endif 1237#endif
1233 1238
1234 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1239 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1235 | PropertyChangeMask); 1240 | PropertyChangeMask);
1236 1241
… …
1241 vt_emask |= PointerMotionMask; 1246 vt_emask |= PointerMotionMask;
1242 else 1247 else
1243#endif 1248#endif
1244 vt_emask |= (Button1MotionMask | Button3MotionMask); 1249 vt_emask |= (Button1MotionMask | Button3MotionMask);
1245 1250
1246 XSelectInput(display->display, TermWin.vt, vt_emask); 1251 XSelectInput (display->display, TermWin.vt, vt_emask);
1247 vt_ev.start (display, TermWin.vt); 1252 vt_ev.start (display, TermWin.vt);
1248 1253
1249#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1254#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1250 if (menuBar_height()) 1255 if (menuBar_height ())
1251 { 1256 {
1252 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], 1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, 0, 1258 window_vt_x, 0,
1254 TermWin_TotalWidth(), 1259 TermWin_TotalWidth (),
1255 menuBar_TotalHeight(), 1260 menuBar_TotalHeight (),
1256 0, 1261 0,
1257 PixColors[Color_fg], 1262 PixColors[Color_fg],
1258 PixColors[Color_scroll]); 1263 PixColors[Color_scroll]);
1259#ifdef DEBUG_X 1264#ifdef DEBUG_X
1260 XStoreName(display->display, menuBar.win, "menubar"); 1265 XStoreName (display->display, menuBar.win, "menubar");
1261#endif 1266#endif
1262 1267
1263 XDefineCursor(display->display, menuBar.win, pointer_leftptr); 1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1264 1269
1265 XSelectInput(display->display, menuBar.win, 1270 XSelectInput (display->display, menuBar.win,
1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1267 | Button1MotionMask)); 1272 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win); 1273 menubar_ev.start (display, menuBar.win);
1269 } 1274 }
1270#endif 1275#endif
1271 1276
1272#ifdef XPM_BACKGROUND 1277#ifdef XPM_BACKGROUND
1273 if (rs[Rs_backgroundPixmap] != NULL 1278 if (rs[Rs_backgroundPixmap] != NULL
1274 && !(Options & Opt_transparent)) 1279 && ! (Options & Opt_transparent))
1275 { 1280 {
1276 const char *p = rs[Rs_backgroundPixmap]; 1281 const char *p = rs[Rs_backgroundPixmap];
1277 1282
1278 if ((p = STRCHR(p, ';')) != NULL) 1283 if ((p = STRCHR (p, ';')) != NULL)
1279 { 1284 {
1280 p++; 1285 p++;
1281 scale_pixmap (p); 1286 scale_pixmap (p);
1282 } 1287 }
1283 set_bgPixmap (rs[Rs_backgroundPixmap]); 1288 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1287 1292
1288 /* graphics context for the vt window */ 1293 /* graphics context for the vt window */
1289 gcvalue.foreground = PixColors[Color_fg]; 1294 gcvalue.foreground = PixColors[Color_fg];
1290 gcvalue.background = PixColors[Color_bg]; 1295 gcvalue.background = PixColors[Color_bg];
1291 gcvalue.graphics_exposures = 1; 1296 gcvalue.graphics_exposures = 1;
1292 TermWin.gc = XCreateGC(display->display, TermWin.vt, 1297 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1293 GCForeground | GCBackground 1298 GCForeground | GCBackground
1294 | GCGraphicsExposures, &gcvalue); 1299 | GCGraphicsExposures, &gcvalue);
1295 1300
1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1297 gcvalue.foreground = PixColors[Color_topShadow]; 1302 gcvalue.foreground = PixColors[Color_topShadow];
1298 topShadowGC = XCreateGC(display->display, TermWin.vt, 1303 topShadowGC = XCreateGC (display->display, TermWin.vt,
1299 GCForeground, &gcvalue); 1304 GCForeground, &gcvalue);
1300 gcvalue.foreground = PixColors[Color_bottomShadow]; 1305 gcvalue.foreground = PixColors[Color_bottomShadow];
1301 botShadowGC = XCreateGC(display->display, TermWin.vt, 1306 botShadowGC = XCreateGC (display->display, TermWin.vt,
1302 GCForeground, &gcvalue); 1307 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1304 : Color_scroll)]; 1309 : Color_scroll)];
1305 scrollbarGC = XCreateGC(display->display, TermWin.vt, 1310 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1306 GCForeground, &gcvalue); 1311 GCForeground, &gcvalue);
1307#endif 1312#endif
1308} 1313}
1309 1314
1310/*----------------------------------------------------------------------*/ 1315/*----------------------------------------------------------------------*/
… …
1317rxvt_term::run_command (const char *const *argv) 1322rxvt_term::run_command (const char *const *argv)
1318{ 1323{
1319 int cfd, er; 1324 int cfd, er;
1320 1325
1321 /* get master (pty) */ 1326 /* get master (pty) */
1322 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1323 { 1328 {
1324 rxvt_print_error("can't open pseudo-tty"); 1329 rxvt_print_error ("can't open pseudo-tty");
1325 return -1; 1330 return -1;
1326 } 1331 }
1327 1332
1328 fcntl (cfd, F_SETFL, O_NONBLOCK); 1333 fcntl (cfd, F_SETFL, O_NONBLOCK);
1329 1334
… …
1334 privileged_ttydev (SAVE); 1339 privileged_ttydev (SAVE);
1335#endif 1340#endif
1336 1341
1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1338 { 1343 {
1339 close(cfd); 1344 close (cfd);
1340 rxvt_print_error("can't open slave tty %s", ttydev); 1345 rxvt_print_error ("can't open slave tty %s", ttydev);
1341 return -1; 1346 return -1;
1342 } 1347 }
1343 } 1348 }
1344#ifndef NO_BACKSPACE_KEY 1349#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1350 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1351 er = key_backspace[0];
1347 else if (STRCMP(key_backspace, "DEC") == 0) 1352 else if (STRCMP (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */ 1353 er = '\177'; /* the initial state anyway */
1349 else 1354 else
1350#endif 1355#endif
1351 1356
1352 er = -1; 1357 er = -1;
1353 1358
1354 rxvt_get_ttymode (&(tio), er); 1359 rxvt_get_ttymode (& (tio), er);
1355 1360
1356#ifndef __QNX__ 1361#ifndef __QNX__
1357 /* spin off the command interpreter */ 1362 /* spin off the command interpreter */
1358 switch (cmd_pid = fork ()) 1363 switch (cmd_pid = fork ())
1359 { 1364 {
1360 case -1: 1365 case -1:
1361 rxvt_print_error("can't fork"); 1366 rxvt_print_error ("can't fork");
1362 return -1; 1367 return -1;
1363 case 0: 1368 case 0:
1364 close (cfd); /* only keep tty_fd and STDERR open */ 1369 close (cfd); /* only keep tty_fd and STDERR open */
1370
1371 init_env ();
1365 1372
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1373 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1374 rxvt_print_error ("could not obtain control of tty");
1368 else 1375 else
1369 { 1376 {
… …
1400 1407
1401 } 1408 }
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1410 break;
1404 } 1411 }
1405#else /* __QNX__ uses qnxspawn() */ 1412#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1413 fchmod (tty_fd, 0622);
1407 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1414 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1408 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1415 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1409 1416
1410 if (run_child (argv) == -1) 1417 if (run_child (argv) == -1)
… …
1424int 1431int
1425rxvt_term::run_child (const char *const *argv) 1432rxvt_term::run_child (const char *const *argv)
1426{ 1433{
1427 char *login; 1434 char *login;
1428 1435
1429 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1436 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1430 1437
1431 if (Options & Opt_console) 1438 if (Options & Opt_console)
1432 { /* be virtual console, fail silently */ 1439 { /* be virtual console, fail silently */
1433#ifdef TIOCCONS 1440#ifdef TIOCCONS
1434 unsigned int on = 1; 1441 unsigned int on = 1;
… …
1480 { 1487 {
1481# ifdef DEBUG_CMD 1488# ifdef DEBUG_CMD
1482 int i; 1489 int i;
1483 1490
1484 for (i = 0; argv[i]; i++) 1491 for (i = 0; argv[i]; i++)
1485 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1492 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1486# endif 1493# endif
1487 1494
1488 execvp(argv[0], (char *const *)argv); 1495 execvp (argv[0], (char *const *)argv);
1489 /* no error message: STDERR is closed! */ 1496 /* no error message: STDERR is closed! */
1490 } 1497 }
1491 else 1498 else
1492 { 1499 {
1493 const char *argv0, *shell; 1500 const char *argv0, *shell;
1494 1501
1495 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1502 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1496 shell = "/bin/sh"; 1503 shell = "/bin/sh";
1497 1504
1498 argv0 = (const char *)rxvt_r_basename(shell); 1505 argv0 = (const char *)rxvt_r_basename (shell);
1499 if (Options & Opt_loginShell) 1506 if (Options & Opt_loginShell)
1500 { 1507 {
1501 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1508 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1502 1509
1503 login[0] = '-'; 1510 login[0] = '-';
1504 STRCPY(&login[1], argv0); 1511 STRCPY (&login[1], argv0);
1505 argv0 = login; 1512 argv0 = login;
1506 } 1513 }
1507 execlp(shell, argv0, NULL); 1514 execlp (shell, argv0, NULL);
1508 /* no error message: STDERR is closed! */ 1515 /* no error message: STDERR is closed! */
1509 } 1516 }
1510 1517
1511#else /* __QNX__ uses qnxspawn() */ 1518#else /* __QNX__ uses qnxspawn () */
1512 1519
1513 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 };
1514 char *command = NULL, fullcommand[_MAX_PATH]; 1521 char *command = NULL, fullcommand[_MAX_PATH];
1515 char **arg_v, *arg_a[2] = { NULL, NULL }; 1522 char **arg_v, *arg_a[2] = { NULL, NULL };
1516 1523
1517 if (argv != NULL) 1524 if (argv != NULL)
1518 { 1525 {
1519 if (access(argv[0], X_OK) == -1) 1526 if (access (argv[0], X_OK) == -1)
1520 { 1527 {
1521 if (STRCHR(argv[0], '/') == NULL) 1528 if (STRCHR (argv[0], '/') == NULL)
1522 { 1529 {
1523 searchenv(argv[0], "PATH", fullcommand); 1530 searchenv (argv[0], "PATH", fullcommand);
1524 if (fullcommand[0] != '\0') 1531 if (fullcommand[0] != '\0')
1525 command = fullcommand; 1532 command = fullcommand;
1526 } 1533 }
1527 if (access(command, X_OK) == -1) 1534 if (access (command, X_OK) == -1)
1528 return -1; 1535 return -1;
1529 } 1536 }
1530 else 1537 else
1531 command = argv[0]; 1538 command = argv[0];
1532 arg_v = argv; 1539 arg_v = argv;
1533 } 1540 }
1534 else 1541 else
1535 { 1542 {
1536 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1543 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1537 command = "/bin/sh"; 1544 command = "/bin/sh";
1538 1545
1539 arg_a[0] = my_basename(command); 1546 arg_a[0] = my_basename (command);
1540 if (Options & Opt_loginShell) 1547 if (Options & Opt_loginShell)
1541 { 1548 {
1542 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1549 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1543 1550
1544 login[0] = '-'; 1551 login[0] = '-';
1545 STRCPY(&login[1], arg_a[0]); 1552 STRCPY (&login[1], arg_a[0]);
1546 arg_a[0] = login; 1553 arg_a[0] = login;
1547 } 1554 }
1548 arg_v = arg_a; 1555 arg_v = arg_a;
1549 } 1556 }
1550 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1557 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1551 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1558 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1552 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1559 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1553 command, arg_v, environ, iov_a, 0); 1560 command, arg_v, environ, iov_a, 0);
1554 if (login) 1561 if (login)
1555 free(login); 1562 free (login);
1556 1563
1557 close(tty_fd); 1564 close (tty_fd);
1558 return cmd_fd; 1565 return cmd_fd;
1559 1566
1560#endif 1567#endif
1561 return -1; 1568 return -1;
1562} 1569}
1563 1570
1564/* ------------------------------------------------------------------------- * 1571/* ------------------------------------------------------------------------- *
1565 * GET TTY CURRENT STATE * 1572 * GET TTY CURRENT STATE *
1566 * ------------------------------------------------------------------------- */ 1573 * ------------------------------------------------------------------------- */
1567/* rxvt_get_ttymode() */ 1574/* rxvt_get_ttymode () */
1568/* EXTPROTO */ 1575/* EXTPROTO */
1569void 1576void
1570rxvt_get_ttymode(ttymode_t *tio, int erase) 1577rxvt_get_ttymode (ttymode_t *tio, int erase)
1571{ 1578{
1572#ifdef HAVE_TERMIOS_H 1579#ifdef HAVE_TERMIOS_H
1573 /* 1580 /*
1574 * standard System V termios interface 1581 * standard System V termios interface
1575 */ 1582 */
1576 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1583 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1577 { 1584 {
1578 /* return error - use system defaults */ 1585 /* return error - use system defaults */
1579 tio->c_cc[VINTR] = CINTR; 1586 tio->c_cc[VINTR] = CINTR;
1580 tio->c_cc[VQUIT] = CQUIT; 1587 tio->c_cc[VQUIT] = CQUIT;
1581 tio->c_cc[VERASE] = CERASE; 1588 tio->c_cc[VERASE] = CERASE;
… …
1655 /* 1662 /*
1656 * sgtty interface 1663 * sgtty interface
1657 */ 1664 */
1658 1665
1659 /* get parameters -- gtty */ 1666 /* get parameters -- gtty */
1660 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1661 { 1668 {
1662 tio->sg.sg_erase = CERASE; /* ^H */ 1669 tio->sg.sg_erase = CERASE; /* ^H */
1663 tio->sg.sg_kill = CKILL; /* ^U */ 1670 tio->sg.sg_kill = CKILL; /* ^U */
1664 } 1671 }
1665 if (erase != -1) 1672 if (erase != -1)
1666 tio->sg.sg_erase = (char)erase; 1673 tio->sg.sg_erase = (char)erase;
1667 1674
1668 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1675 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1669 1676
1670 /* get special characters */ 1677 /* get special characters */
1671 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1678 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1672 { 1679 {
1673 tio->tc.t_intrc = CINTR; /* ^C */ 1680 tio->tc.t_intrc = CINTR; /* ^C */
1674 tio->tc.t_quitc = CQUIT; /* ^\ */ 1681 tio->tc.t_quitc = CQUIT; /* ^\ */
1675 tio->tc.t_startc = CSTART; /* ^Q */ 1682 tio->tc.t_startc = CSTART; /* ^Q */
1676 tio->tc.t_stopc = CSTOP; /* ^S */ 1683 tio->tc.t_stopc = CSTOP; /* ^S */
1677 tio->tc.t_eofc = CEOF; /* ^D */ 1684 tio->tc.t_eofc = CEOF; /* ^D */
1678 tio->tc.t_brkc = -1; 1685 tio->tc.t_brkc = -1;
1679 } 1686 }
1680 /* get local special chars */ 1687 /* get local special chars */
1681 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1688 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1682 { 1689 {
1683 tio->lc.t_suspc = CSUSP; /* ^Z */ 1690 tio->lc.t_suspc = CSUSP; /* ^Z */
1684 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1691 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1685 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1692 tio->lc.t_rprntc = CRPRNT; /* ^R */
1686 tio->lc.t_flushc = CFLUSH; /* ^O */ 1693 tio->lc.t_flushc = CFLUSH; /* ^O */
1687 tio->lc.t_werasc = CWERASE; /* ^W */ 1694 tio->lc.t_werasc = CWERASE; /* ^W */
1688 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1695 tio->lc.t_lnextc = CLNEXT; /* ^V */
1689 } 1696 }
1690 /* get line discipline */ 1697 /* get line discipline */
1691 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1698 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1692# ifdef NTTYDISC 1699# ifdef NTTYDISC
1693 1700
1694 tio->line = NTTYDISC; 1701 tio->line = NTTYDISC;
1695# endif /* NTTYDISC */ 1702# endif /* NTTYDISC */
1696 1703
… …
1701 * Debugging 1708 * Debugging
1702 */ 1709 */
1703#ifdef DEBUG_TTYMODE 1710#ifdef DEBUG_TTYMODE
1704#ifdef HAVE_TERMIOS_H 1711#ifdef HAVE_TERMIOS_H
1705 /* c_iflag bits */ 1712 /* c_iflag bits */
1706 fprintf(stderr, "Input flags\n"); 1713 fprintf (stderr, "Input flags\n");
1707 1714
1708 /* cpp token stringize doesn't work on all machines <sigh> */ 1715 /* cpp token stringize doesn't work on all machines <sigh> */
1709# define FOO(flag,name) \ 1716# define FOO(flag,name) \
1710 if ((tio->c_iflag) & flag) \ 1717 if ((tio->c_iflag) & flag) \
1711 fprintf (stderr, "%s ", name) 1718 fprintf (stderr, "%s ", name)
1712 1719
1713 /* c_iflag bits */ 1720 /* c_iflag bits */
1714 FOO(IGNBRK, "IGNBRK"); 1721 FOO (IGNBRK, "IGNBRK");
1715 FOO(BRKINT, "BRKINT"); 1722 FOO (BRKINT, "BRKINT");
1716 FOO(IGNPAR, "IGNPAR"); 1723 FOO (IGNPAR, "IGNPAR");
1717 FOO(PARMRK, "PARMRK"); 1724 FOO (PARMRK, "PARMRK");
1718 FOO(INPCK, "INPCK"); 1725 FOO (INPCK, "INPCK");
1719 FOO(ISTRIP, "ISTRIP"); 1726 FOO (ISTRIP, "ISTRIP");
1720 FOO(INLCR, "INLCR"); 1727 FOO (INLCR, "INLCR");
1721 FOO(IGNCR, "IGNCR"); 1728 FOO (IGNCR, "IGNCR");
1722 FOO(ICRNL, "ICRNL"); 1729 FOO (ICRNL, "ICRNL");
1723 FOO(IXON, "IXON"); 1730 FOO (IXON, "IXON");
1724 FOO(IXOFF, "IXOFF"); 1731 FOO (IXOFF, "IXOFF");
1725# ifdef IUCLC 1732# ifdef IUCLC
1726 1733
1727 FOO(IUCLC, "IUCLC"); 1734 FOO (IUCLC, "IUCLC");
1728# endif 1735# endif
1729# ifdef IXANY 1736# ifdef IXANY
1730 1737
1731 FOO(IXANY, "IXANY"); 1738 FOO (IXANY, "IXANY");
1732# endif 1739# endif
1733# ifdef IMAXBEL 1740# ifdef IMAXBEL
1734 1741
1735 FOO(IMAXBEL, "IMAXBEL"); 1742 FOO (IMAXBEL, "IMAXBEL");
1736# endif 1743# endif
1737 1744
1738 fprintf(stderr, "\n"); 1745 fprintf (stderr, "\n");
1739 1746
1740# undef FOO 1747# undef FOO
1741# define FOO(entry, name) \ 1748# define FOO(entry, name) \
1742 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1749 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1743 1750
1744 FOO(VINTR, "VINTR"); 1751 FOO (VINTR, "VINTR");
1745 FOO(VQUIT, "VQUIT"); 1752 FOO (VQUIT, "VQUIT");
1746 FOO(VERASE, "VERASE"); 1753 FOO (VERASE, "VERASE");
1747 FOO(VKILL, "VKILL"); 1754 FOO (VKILL, "VKILL");
1748 FOO(VEOF, "VEOF"); 1755 FOO (VEOF, "VEOF");
1749 FOO(VEOL, "VEOL"); 1756 FOO (VEOL, "VEOL");
1750# ifdef VEOL2 1757# ifdef VEOL2
1751 1758
1752 FOO(VEOL2, "VEOL2"); 1759 FOO (VEOL2, "VEOL2");
1753# endif 1760# endif
1754# ifdef VSWTC 1761# ifdef VSWTC
1755 1762
1756 FOO(VSWTC, "VSWTC"); 1763 FOO (VSWTC, "VSWTC");
1757# endif 1764# endif
1758# ifdef VSWTCH 1765# ifdef VSWTCH
1759 1766
1760 FOO(VSWTCH, "VSWTCH"); 1767 FOO (VSWTCH, "VSWTCH");
1761# endif 1768# endif
1762 1769
1763 FOO(VSTART, "VSTART"); 1770 FOO (VSTART, "VSTART");
1764 FOO(VSTOP, "VSTOP"); 1771 FOO (VSTOP, "VSTOP");
1765 FOO(VSUSP, "VSUSP"); 1772 FOO (VSUSP, "VSUSP");
1766# ifdef VDSUSP 1773# ifdef VDSUSP
1767 1774
1768 FOO(VDSUSP, "VDSUSP"); 1775 FOO (VDSUSP, "VDSUSP");
1769# endif 1776# endif
1770# ifdef VREPRINT 1777# ifdef VREPRINT
1771 1778
1772 FOO(VREPRINT, "VREPRINT"); 1779 FOO (VREPRINT, "VREPRINT");
1773# endif 1780# endif
1774# ifdef VDISCRD 1781# ifdef VDISCRD
1775 1782
1776 FOO(VDISCRD, "VDISCRD"); 1783 FOO (VDISCRD, "VDISCRD");
1777# endif 1784# endif
1778# ifdef VWERSE 1785# ifdef VWERSE
1779 1786
1780 FOO(VWERSE, "VWERSE"); 1787 FOO (VWERSE, "VWERSE");
1781# endif 1788# endif
1782# ifdef VLNEXT 1789# ifdef VLNEXT
1783 1790
1784 FOO(VLNEXT, "VLNEXT"); 1791 FOO (VLNEXT, "VLNEXT");
1785# endif 1792# endif
1786 1793
1787 fprintf(stderr, "\n"); 1794 fprintf (stderr, "\n");
1788# undef FOO 1795# undef FOO
1789# endif /* HAVE_TERMIOS_H */ 1796# endif /* HAVE_TERMIOS_H */
1790#endif /* DEBUG_TTYMODE */ 1797#endif /* DEBUG_TTYMODE */
1791} 1798}
1792 1799

Diff Legend

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