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

Diff Legend

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