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.30 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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