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

Diff Legend

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