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.27 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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