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.22 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.29 by pcg, Sat Feb 21 21:43:37 2004 UTC

… …
326#endif 326#endif
327#ifdef KEEP_SCROLLCOLOR 327#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 328 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 329 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 330#endif /* KEEP_SCROLLCOLOR */
331
331 }; 332 };
332 333
333const char *const xa_names[NUM_XA] = 334const char *const xa_names[NUM_XA] =
334 { 335 {
335 "TEXT", 336 "TEXT",
… …
371 MEvent.time = CurrentTime; 372 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 373 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 374 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 375 want_refresh = 1;
375 cmd_pid = -1; 376 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 377 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 378 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 379 TermWin.focus = 0;
379 TermWin.ncol = 80; 380 TermWin.ncol = 80;
380 TermWin.nrow = 24; 381 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 382 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
422 423
423 last_bot = last_state = -1; 424 last_bot = last_state = -1;
424 425
425#ifdef MENUBAR 426#ifdef MENUBAR
426 menu_readonly = 1; 427 menu_readonly = 1;
427# if !(MENUBAR_MAX > 1) 428# if ! (MENUBAR_MAX > 1)
428 CurrentBar = &(BarList); 429 CurrentBar = & (BarList);
429# endif /* (MENUBAR_MAX > 1) */ 430# endif /* (MENUBAR_MAX > 1) */
430#endif 431#endif
431 432
432 return true; 433 return true;
433} 434}
… …
444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
445 ttygid = gr->gr_gid; 446 ttygid = gr->gr_gid;
446 } 447 }
447 else 448 else
448#endif /* TTY_GID_SUPPORT */ 449#endif /* TTY_GID_SUPPORT */
450
449 { 451 {
450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
451 ttygid = getgid (); 453 ttygid = getgid ();
452 } 454 }
453 455
… …
473 { 475 {
474#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
475 if (i == 4 || i == 7) 477 if (i == 4 || i == 7)
476 continue; 478 continue;
477#endif 479#endif
478 close(i); 480 close (i);
479 } 481 }
480#endif 482#endif
481} 483}
482 484
483/*----------------------------------------------------------------------*/ 485/*----------------------------------------------------------------------*/
… …
490 492
491 /* 493 /*
492 * 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
493 */ 495 */
494 for (r_argc = 0; r_argc < argc; r_argc++) 496 for (r_argc = 0; r_argc < argc; r_argc++)
495 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
496 break; 498 break;
497 499
498 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 500 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
499 501
500 for (i = 0; i < r_argc; i++) 502 for (i = 0; i < r_argc; i++)
501 r_argv[i] = (const char *)argv[i]; 503 r_argv[i] = (const char *)argv[i];
502 504
503 r_argv[i] = NULL; 505 r_argv[i] = NULL;
504 506
505 if (r_argc == argc) 507 if (r_argc == argc)
506 cmd_argv = NULL; 508 cmd_argv = NULL;
507 else 509 else
508 { 510 {
509 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 511 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
510 512
511 for (i = 0; i < argc - r_argc - 1; i++) 513 for (i = 0; i < argc - r_argc - 1; i++)
512 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 514 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
513 515
514 cmd_argv[i] = NULL; 516 cmd_argv[i] = NULL;
… …
516 518
517 /* clear all resources */ 519 /* clear all resources */
518 for (i = 0; i < NUM_RESOURCES;) 520 for (i = 0; i < NUM_RESOURCES;)
519 rs[i++] = NULL; 521 rs[i++] = NULL;
520 522
521 rs[Rs_name] = rxvt_r_basename(argv[0]); 523 rs[Rs_name] = rxvt_r_basename (argv[0]);
522 524
523 /* 525 /*
524 * Open display, get options/resources and create the window 526 * Open display, get options/resources and create the window
525 */ 527 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
533 if (rs[Rs_display_name][0] == ':') 535 if (rs[Rs_display_name][0] == ':')
534 { 536 {
535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
536 STRCPY (val, "unix"); 538 STRCPY (val, "unix");
537 STRCAT (val, rs[Rs_display_name]); 539 STRCAT (val, rs[Rs_display_name]);
538 Xdisplay = XOpenDisplay (val); 540 display = displays.get (val);
539 free (val); 541 free (val);
540 } 542 }
541#endif 543#endif
542 544
543 if (Xdisplay == NULL 545 if (!display
544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 546 && ! (display = displays.get (rs[Rs_display_name])))
545 { 547 {
546 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]);
547 exit (EXIT_FAILURE); 549 exit (EXIT_FAILURE);
548 } 550 }
549 551
550 extract_resources (Xdisplay, rs[Rs_name]); 552 extract_resources (display->display, rs[Rs_name]);
551 553
552 /* 554 /*
553 * set any defaults not already set 555 * set any defaults not already set
554 */ 556 */
555 if (cmd_argv && cmd_argv[0]) 557 if (cmd_argv && cmd_argv[0])
556 { 558 {
557 if (!rs[Rs_title]) 559 if (!rs[Rs_title])
558 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 560 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
559 if (!rs[Rs_iconName]) 561 if (!rs[Rs_iconName])
560 rs[Rs_iconName] = rs[Rs_title]; 562 rs[Rs_iconName] = rs[Rs_title];
561 } 563 }
562 else 564 else
563 { 565 {
… …
565 rs[Rs_title] = rs[Rs_name]; 567 rs[Rs_title] = rs[Rs_name];
566 if (!rs[Rs_iconName]) 568 if (!rs[Rs_iconName])
567 rs[Rs_iconName] = rs[Rs_name]; 569 rs[Rs_iconName] = rs[Rs_name];
568 } 570 }
569 571
570 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 572 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
571 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 573 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
572 574
573#ifndef NO_FRILLS 575#ifndef NO_FRILLS
574 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)
575 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 577 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
576 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)
577 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 579 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
578#endif 580#endif
579 581
580#ifndef NO_LINESPACE 582#ifndef NO_LINESPACE
581 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 583 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
582 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 584 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
583#endif 585#endif
584 586
585#ifdef POINTER_BLANK 587#ifdef POINTER_BLANK
586 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 588 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
587 pointerBlankDelay = i; 589 pointerBlankDelay = i;
588 else 590 else
589 pointerBlankDelay = 2; 591 pointerBlankDelay = 2;
590#endif 592#endif
591 593
… …
602 rs[Rs_cutchars] = CUTCHARS; 604 rs[Rs_cutchars] = CUTCHARS;
603 605
604#ifdef ACS_ASCII 606#ifdef ACS_ASCII
605 if (!rs[Rs_acs_chars]) 607 if (!rs[Rs_acs_chars])
606 rs[Rs_acs_chars] = ACS_CHARS; 608 rs[Rs_acs_chars] = ACS_CHARS;
607 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
608 { 610 {
609 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
610 for (; i < 0x20; ) 612 for (; i < 0x20; )
611 val[i] = ' '; 613 val[i] = ' ';
612 rs[Rs_acs_chars] = val; 614 rs[Rs_acs_chars] = val;
613 } 615 }
614#endif 616#endif
… …
620# else 622# else
621 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 623 key_backspace = "DEC"; /* can toggle between \010 or \177 */
622# endif 624# endif
623 else 625 else
624 { 626 {
625 val = STRDUP(rs[Rs_backspace_key]); 627 val = STRDUP (rs[Rs_backspace_key]);
626 rxvt_Str_trim(val); 628 rxvt_Str_trim (val);
627 rxvt_Str_escaped(val); 629 rxvt_Str_escaped (val);
628 key_backspace = val; 630 key_backspace = val;
629 } 631 }
630#endif 632#endif
631 633
632#ifndef NO_DELETE_KEY 634#ifndef NO_DELETE_KEY
… …
636# else 638# else
637 key_delete = "\033[3~"; 639 key_delete = "\033[3~";
638# endif 640# endif
639 else 641 else
640 { 642 {
641 val = STRDUP(rs[Rs_delete_key]); 643 val = STRDUP (rs[Rs_delete_key]);
642 rxvt_Str_trim(val); 644 rxvt_Str_trim (val);
643 rxvt_Str_escaped(val); 645 rxvt_Str_escaped (val);
644 key_delete = val; 646 key_delete = val;
645 } 647 }
646#endif 648#endif
647 if (rs[Rs_answerbackstring]) 649 if (rs[Rs_answerbackstring])
648 { 650 {
649 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
650 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
651 } 653 }
652 654
653 if (rs[Rs_selectstyle]) 655 if (rs[Rs_selectstyle])
654 { 656 {
655 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
656 selection_style = OLD_WORD_SELECT; 658 selection_style = OLD_WORD_SELECT;
657#ifndef NO_OLD_SELECTION 659#ifndef NO_OLD_SELECTION
658 660
659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
660 selection_style = OLD_SELECT; 662 selection_style = OLD_SELECT;
661#endif 663#endif
664
662 } 665 }
663 666
664#ifdef HAVE_SCROLLBARS 667#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 669 rs[Rs_scrollBar_thickness]);
667#endif 670#endif
668 671
669 TermWin.fontset = new rxvt_fontset (this); 672 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]); 673 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width; 674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
… …
688 rs[Rs_color + i] = def_colorName[i]; 691 rs[Rs_color + i] = def_colorName[i];
689 692
690#ifndef XTERM_REVERSE_VIDEO 693#ifndef XTERM_REVERSE_VIDEO
691 /* this is how we implement reverseVideo */ 694 /* this is how we implement reverseVideo */
692 if (Options & Opt_reverseVideo) 695 if (Options & Opt_reverseVideo)
693 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 *);
694#endif 697#endif
695 698
696 /* convenient aliases for setting fg/bg to colors */ 699 /* convenient aliases for setting fg/bg to colors */
697 color_aliases (Color_fg); 700 color_aliases (Color_fg);
698 color_aliases (Color_bg); 701 color_aliases (Color_bg);
… …
721 724
722#ifdef DISPLAY_IS_IP 725#ifdef DISPLAY_IS_IP
723 /* Fixup display_name for export over pty to any interested terminal 726 /* Fixup display_name for export over pty to any interested terminal
724 * 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
725 * (for the first non-loopback interface) that we get from 728 * (for the first non-loopback interface) that we get from
726 * rxvt_network_display(). This is more "name-resolution-portable", if you 729 * rxvt_network_display (). This is more "name-resolution-portable", if you
727 * 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
728 * 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
729 * course that only helps the shell's child processes, not us. 732 * course that only helps the shell's child processes, not us.
730 * 733 *
731 * Giving out the display_name also affords a potential security hole 734 * Giving out the display_name also affords a potential security hole
… …
733 val = rxvt_network_display (rs[Rs_display_name]); 736 val = rxvt_network_display (rs[Rs_display_name]);
734 rs[Rs_display_name] = (const char *)val; 737 rs[Rs_display_name] = (const char *)val;
735 738
736 if (val == NULL) 739 if (val == NULL)
737#endif /* DISPLAY_IS_IP */ 740#endif /* DISPLAY_IS_IP */
738 val = XDisplayString(Xdisplay); 741 val = XDisplayString (display->display);
739 742
740 if (rs[Rs_display_name] == NULL) 743 if (rs[Rs_display_name] == NULL)
741 rs[Rs_display_name] = val; /* use broken `:0' value */ 744 rs[Rs_display_name] = val; /* use broken `:0' value */
742 745
743 i = STRLEN (val); 746 i = STRLEN (val);
744 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
745 748
746 sprintf (env_display, "DISPLAY=%s", val); 749 sprintf (env_display, "DISPLAY=%s", val);
747 750
748 /* avoiding the math library: 751 /* avoiding the math library:
749 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 752 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
750 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++)
751 ; 754 ;
752 MAX_IT(i, 1); 755 MAX_IT (i, 1);
753 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
754 757
755 sprintf (env_windowid, "WINDOWID=%u", 758 sprintf (env_windowid, "WINDOWID=%u",
756 (unsigned int)TermWin.parent[0]); 759 (unsigned int)TermWin.parent[0]);
757 760
758 /* add entries to the environment: 761 /* add entries to the environment:
759 * @ DISPLAY: in case we started with -display 762 * @ DISPLAY: in case we started with -display
760 * @ WINDOWID: X window id number of the window 763 * @ WINDOWID: X window id number of the window
761 * @ COLORTERM: terminal sub-name and also indicates its color 764 * @ COLORTERM: terminal sub-name and also indicates its color
762 * @ TERM: terminal name 765 * @ TERM: terminal name
763 * @ TERMINFO: path to terminfo directory 766 * @ TERMINFO: path to terminfo directory
767 * @ COLORFGBG: fg;bg color codes
764 */ 768 */
765 putenv (env_display); 769 putenv (env_display);
766 putenv (env_windowid); 770 putenv (env_windowid);
771 if (env_colorfgbg)
772 putenv (env_colorfgbg);
767 773
768#ifdef RXVT_TERMINFO 774#ifdef RXVT_TERMINFO
769 putenv ("TERMINFO=" RXVT_TERMINFO); 775 putenv ("TERMINFO=" RXVT_TERMINFO);
770#endif 776#endif
771 777
772 if (Xdepth <= 2) 778 if (display->depth <= 2)
773 putenv ("COLORTERM=" COLORTERMENV "-mono"); 779 putenv ("COLORTERM=" COLORTERMENV "-mono");
774 else 780 else
775 putenv ("COLORTERM=" COLORTERMENVFULL); 781 putenv ("COLORTERM=" COLORTERMENVFULL);
776 782
777 if (rs[Rs_term_name] != NULL) 783 if (rs[Rs_term_name] != NULL)
778 { 784 {
779 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));
780 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 786 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
781 putenv (env_term); 787 putenv (env_term);
782 } 788 }
783 else 789 else
784 putenv ("TERM=" TERMENV); 790 putenv ("TERM=" TERMENV);
… …
800rxvt_term::set_locale (const char *locale) 806rxvt_term::set_locale (const char *locale)
801{ 807{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 808#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 809 free (this->locale);
804 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
811 SET_LOCALE (this->locale);
812 mbstate.reset ();
805#endif 813#endif
806#if HAVE_NL_LANGINFO 814#if HAVE_NL_LANGINFO
807 free (codeset); 815 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 816 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 817 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 818 || !STRCASECMP (codeset, "UTF8");
811#else 819#else
812 enc_utf8 = 1; 820 enc_utf8 = 1;
813#endif 821#endif
814} 822}
815 823
… …
821 rxvt_print_error ("Setting locale failed."); 829 rxvt_print_error ("Setting locale failed.");
822 else 830 else
823 { 831 {
824 Atom wmlocale; 832 Atom wmlocale;
825 833
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 835 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 836 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 837 (unsigned char *)locale, STRLEN (locale));
830 838
831 if (!XSupportsLocale ()) 839 if (!XSupportsLocale ())
832 { 840 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 841 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 842 return;
835 } 843 }
836 844
845 im_ev.start (display);
846
837 /* see if we can connect yet */ 847 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 848 im_cb ();
839
840 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL);
844 } 849 }
845#endif 850#endif
846} 851}
847 852
848/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
849void 854void
850rxvt_term::init_command(const char *const *argv) 855rxvt_term::init_command (const char *const *argv)
851{ 856{
852 /* 857 /*
853 * Initialize the command connection. 858 * Initialize the command connection.
854 * This should be called after the X server connection is established. 859 * This should be called after the X server connection is established.
855 */ 860 */
856 int i; 861 int i;
857 862
858 for (i = 0; i < NUM_XA; i++) 863 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 864 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 865
861 /* Enable delete window protocol */ 866 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 867 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 868 & (xa[XA_WMDELETEWINDOW]), 1);
864 869
865#ifdef USING_W11LIB 870#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 871 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 872 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 873#endif
869 874
870#ifdef META8_OPTION 875#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 876 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 877#endif
873 878
874 get_ourmods (); 879 get_ourmods ();
875 880
876 if (!(Options & Opt_scrollTtyOutput)) 881 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 882 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 883 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 884 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 885 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 886 PrivateModes |= PrivMode_smoothScroll;
882 887
883#ifndef NO_BACKSPACE_KEY 888#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 889 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 890 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 891#endif
887 892
888 /* add value for scrollBar */ 893 /* add value for scrollBar */
889 if (scrollbar_visible ()) 894 if (scrollbar_visible ())
… …
896 PrivateModes |= PrivMode_menuBar; 901 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 902 SavedModes |= PrivMode_menuBar;
898 } 903 }
899 904
900#ifdef GREEK_SUPPORT 905#ifdef GREEK_SUPPORT
901 greek_init(); 906 greek_init ();
902#endif 907#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905 908
906#ifdef CURSOR_BLINK 909#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 910 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 911 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 912#endif
911 913
912 if ((cmd_fd = run_command (argv)) < 0) 914 if ((cmd_fd = run_command (argv)) < 0)
… …
931 933
932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 934 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 935 {
934#ifndef XTERM_REVERSE_VIDEO 936#ifndef XTERM_REVERSE_VIDEO
935 if (i < 2 && (Options & Opt_reverseVideo)) 937 if (i < 2 && (Options & Opt_reverseVideo))
936 {
937 rs[Rs_color + i] = def_colorName[!i]; 938 rs[Rs_color + i] = def_colorName[!i];
938 }
939 else 939 else
940#endif 940#endif
941 rs[Rs_color + i] = def_colorName[i]; 941 rs[Rs_color + i] = def_colorName[i];
942 942
943 if (!rs[Rs_color + i]) 943 if (!rs[Rs_color + i])
… …
945 945
946 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 946 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
947 { 947 {
948 switch (i) 948 switch (i)
949 { 949 {
950 case Color_fg: 950 case Color_fg:
951 case Color_bg: 951 case Color_bg:
952 /* fatal: need bg/fg color */ 952 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 953 rxvt_print_error ("aborting");
954 exit (EXIT_FAILURE); 954 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 955 /* NOTREACHED */
956 break; 956 break;
957#ifndef NO_CURSORCOLOR 957#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 958 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 959 xcol = PixColors[Color_fg];
960 break; 960 break;
961#endif /* ! NO_CURSORCOLOR */ 961#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 962 case Color_pointer:
963 xcol = PixColors[Color_fg]; 963 xcol = PixColors[Color_fg];
964 break; 964 break;
965 default: 965 default:
966 xcol = PixColors[Color_bg]; /* None */ 966 xcol = PixColors[Color_bg]; /* None */
967 break; 967 break;
968 } 968 }
969 } 969 }
970 } 970 }
971 971
972 PixColors[i] = xcol; 972 PixColors[i] = xcol;
… …
999 * xcol[1] == top shadow 999 * xcol[1] == top shadow
1000 * xcol[2] == bot shadow */ 1000 * xcol[2] == bot shadow */
1001 1001
1002 xcol[1] = PixColors[Color_scroll]; 1002 xcol[1] = PixColors[Color_scroll];
1003# ifdef PREFER_24BIT 1003# ifdef PREFER_24BIT
1004 xcol[0].set (this, 65535, 65535, 65535); 1004 xcol[0].set (display, 65535, 65535, 65535);
1005 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1005 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1006# else 1006# else
1007 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); 1007 xcol[0].set (display, WhitePixel (display->display, display->screen));
1008# endif 1008# endif
1009 1009
1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1011 1011
1012 xcol[0].get (this, pr0, pg0, pb0); 1012 xcol[0].get (display, pr0, pg0, pb0);
1013 xcol[1].get (this, pr1, pg1, pb1); 1013 xcol[1].get (display, pr1, pg1, pb1);
1014 1014
1015 /* bottomShadowColor */ 1015 /* bottomShadowColor */
1016 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) 1016 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1017 xcol[2] = PixColors[Color_Black]; 1017 xcol[2] = PixColors[Color_Black];
1018 1018
1019 PixColors[Color_bottomShadow] = xcol[2]; 1019 PixColors[Color_bottomShadow] = xcol[2];
1020 1020
1021 /* topShadowColor */ 1021 /* topShadowColor */
1022 if (!xcol[1].set (this, 1022 if (!xcol[1].set (display,
1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1026 xcol[1] = PixColors[Color_White]; 1026 xcol[1] = PixColors[Color_White];
1027 1027
… …
1031} 1031}
1032 1032
1033/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1034/* color aliases, fg/bg bright-bold */ 1034/* color aliases, fg/bg bright-bold */
1035void 1035void
1036rxvt_term::color_aliases(int idx) 1036rxvt_term::color_aliases (int idx)
1037{ 1037{
1038 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1038 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1039 { 1039 {
1040 int i = atoi (rs[Rs_color + idx]); 1040 int i = atoi (rs[Rs_color + idx]);
1041 1041
1042 if (i >= 8 && i <= 15) 1042 if (i >= 8 && i <= 15)
1043 { /* bright colors */ 1043 { /* bright colors */
1044 i -= 8; 1044 i -= 8;
1045#ifndef NO_BRIGHTCOLOR 1045#ifndef NO_BRIGHTCOLOR
1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1047 return; 1047 return;
1048#endif 1048#endif
1049
1049 } 1050 }
1050 1051
1051 if (i >= 0 && i <= 7) /* normal colors */ 1052 if (i >= 0 && i <= 7) /* normal colors */
1052 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1053 } 1054 }
… …
1072 }; 1073 };
1073 1074
1074 requestedmeta = realmeta = realalt = 0; 1075 requestedmeta = realmeta = realalt = 0;
1075 rsmod = rs[Rs_modifier]; 1076 rsmod = rs[Rs_modifier];
1076 if (rsmod 1077 if (rsmod
1077 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1078 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1078 requestedmeta = rsmod[3] - '0'; 1079 requestedmeta = rsmod[3] - '0';
1079 1080
1080 map = XGetModifierMapping(Xdisplay); 1081 map = XGetModifierMapping (display->display);
1081 kc = map->modifiermap; 1082 kc = map->modifiermap;
1082 for (i = 1; i < 6; i++) 1083 for (i = 1; i < 6; i++)
1083 { 1084 {
1084 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1085 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1085 for (j = map->max_keypermod; j--; k++) 1086 for (j = map->max_keypermod; j--; k++)
1086 { 1087 {
1087 if (kc[k] == 0) 1088 if (kc[k] == 0)
1088 break; 1089 break;
1089 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 1090 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1090 { 1091 {
1091 case XK_Num_Lock: 1092 case XK_Num_Lock:
1092 ModNumLockMask = modmasks[i - 1]; 1093 ModNumLockMask = modmasks[i - 1];
1093 /* FALLTHROUGH */ 1094 /* FALLTHROUGH */
1094 default: 1095 default:
1095 continue; /* for(;;) */ 1096 continue; /* for (;;) */
1096 case XK_Meta_L: 1097 case XK_Meta_L:
1097 case XK_Meta_R: 1098 case XK_Meta_R:
1098 cm = "meta"; 1099 cm = "meta";
1099 realmeta = i; 1100 realmeta = i;
1100 break; 1101 break;
1101 case XK_Alt_L: 1102 case XK_Alt_L:
1102 case XK_Alt_R: 1103 case XK_Alt_R:
1103 cm = "alt"; 1104 cm = "alt";
1104 realalt = i; 1105 realalt = i;
1105 break; 1106 break;
1106 case XK_Super_L: 1107 case XK_Super_L:
1107 case XK_Super_R: 1108 case XK_Super_R:
1108 cm = "super"; 1109 cm = "super";
1109 break; 1110 break;
1110 case XK_Hyper_L: 1111 case XK_Hyper_L:
1111 case XK_Hyper_R: 1112 case XK_Hyper_R:
1112 cm = "hyper"; 1113 cm = "hyper";
1113 break; 1114 break;
1114 } 1115 }
1115 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1116 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1116 requestedmeta = i; 1117 requestedmeta = i;
1117 } 1118 }
1118 } 1119 }
1119 XFreeModifiermap(map); 1120 XFreeModifiermap (map);
1120 i = (requestedmeta ? requestedmeta 1121 i = (requestedmeta ? requestedmeta
1121 : (realmeta ? realmeta 1122 : (realmeta ? realmeta
1122 : (realalt ? realalt : 0))); 1123 : (realalt ? realalt : 0)));
1123 if (i) 1124 if (i)
1124 ModMetaMask = modmasks[i - 1]; 1125 ModMetaMask = modmasks[i - 1];
1125} 1126}
1126 1127
1127/*----------------------------------------------------------------------*/ 1128/*----------------------------------------------------------------------*/
1128/* rxvt_Create_Windows() - Open and map the window */ 1129/* rxvt_Create_Windows () - Open and map the window */
1129void 1130void
1130rxvt_term::create_windows (int argc, const char *const *argv) 1131rxvt_term::create_windows (int argc, const char *const *argv)
1131{ 1132{
1132 XClassHint classHint; 1133 XClassHint classHint;
1133 XWMHints wmHint; 1134 XWMHints wmHint;
1134 XGCValues gcvalue; 1135 XGCValues gcvalue;
1135 long vt_emask; 1136 long vt_emask;
1136 1137
1137 XWindowAttributes gattr; 1138 XWindowAttributes gattr;
1138 1139
1139 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1140 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1141 Xscreen = DefaultScreen (Xdisplay);
1142
1143 if (Options & Opt_transparent) 1140 if (Options & Opt_transparent)
1144 { 1141 {
1145 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1142 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1146 Xdepth = gattr.depth; 1143 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1147 }
1148 else
1149 {
1150 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1151#ifdef PREFER_24BIT
1152 /*
1153 * If depth is not 24, look for a 24bit visual.
1154 */
1155 if (Xdepth != 24)
1156 {
1157 XVisualInfo vinfo;
1158
1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1160 {
1161 Xdepth = 24;
1162 Xvisual = vinfo.visual;
1163 Xcmap = XCreateColormap(Xdisplay,
1164 RootWindow(Xdisplay, Xscreen),
1165 Xvisual, AllocNone);
1166 }
1167 }
1168#endif
1169 } 1144 }
1170 1145
1171 /* grab colors before netscape does */ 1146 /* grab colors before netscape does */
1172 Get_Colours (); 1147 Get_Colours ();
1173 1148
… …
1175 window_calc (0, 0); 1150 window_calc (0, 0);
1176 old_width = szHint.width; 1151 old_width = szHint.width;
1177 old_height = szHint.height; 1152 old_height = szHint.height;
1178 1153
1179 /* parent window - reverse video so we can see placement errors 1154 /* parent window - reverse video so we can see placement errors
1180 * sub-window placement & size in rxvt_resize_subwindows() 1155 * sub-window placement & size in rxvt_resize_subwindows ()
1181 */ 1156 */
1182 1157
1183#ifdef PREFER_24BIT 1158#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes; 1159 XSetWindowAttributes attributes;
1185 1160
1186 attributes.background_pixel = PixColors[Color_fg]; 1161 attributes.background_pixel = PixColors[Color_fg];
1187 attributes.border_pixel = PixColors[Color_border]; 1162 attributes.border_pixel = PixColors[Color_border];
1188 attributes.colormap = Xcmap; 1163 attributes.colormap = display->cmap;
1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1164 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1190 szHint.x, szHint.y, 1165 szHint.x, szHint.y,
1191 szHint.width, szHint.height, 1166 szHint.width, szHint.height,
1192 TermWin.ext_bwidth, 1167 TermWin.ext_bwidth,
1193 Xdepth, InputOutput, 1168 display->depth, InputOutput,
1194 Xvisual, 1169 display->visual,
1195 CWBackPixel | CWBorderPixel
1196 | CWColormap, &attributes); 1170 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1197#else 1171#else
1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1172 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1199 szHint.x, szHint.y, 1173 szHint.x, szHint.y,
1200 szHint.width, 1174 szHint.width,
1201 szHint.height, 1175 szHint.height,
1202 TermWin.ext_bwidth, 1176 TermWin.ext_bwidth,
1203 PixColors[Color_border], 1177 PixColors[Color_border],
1204 PixColors[Color_fg]); 1178 PixColors[Color_fg]);
1205#endif 1179#endif
1206 1180
1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1181 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1182 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1209 1183
… …
1214 wmHint.input = True; 1188 wmHint.input = True;
1215 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1216 : NormalState); 1190 : NormalState);
1217 wmHint.window_group = TermWin.parent[0]; 1191 wmHint.window_group = TermWin.parent[0];
1218 1192
1219 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1220 (char **)argv, argc, &szHint, &wmHint, &classHint); 1194 (char **)argv, argc, &szHint, &wmHint, &classHint);
1195
1221 XSelectInput(Xdisplay, TermWin.parent[0], 1196 XSelectInput (display->display, TermWin.parent[0],
1222 (KeyPressMask 1197 KeyPressMask
1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1224 | KeyReleaseMask 1199 | KeyReleaseMask
1225#endif 1200#endif
1226 | FocusChangeMask | VisibilityChangeMask 1201 | FocusChangeMask | VisibilityChangeMask
1227 | StructureNotifyMask)); 1202 | StructureNotifyMask);
1203 termwin_ev.start (display, TermWin.parent[0]);
1228 1204
1229 /* vt cursor: Black-on-White is standard, but this is more popular */ 1205 /* vt cursor: Black-on-White is standard, but this is more popular */
1230 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1231 1207
1232#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1233 /* cursor (menuBar/scrollBar): Black-on-White */ 1209 /* cursor (menuBar/scrollBar): Black-on-White */
1234 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1210 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1235#endif 1211#endif
1236 1212
1237#ifdef POINTER_BLANK 1213#ifdef POINTER_BLANK
1238
1239 { 1214 {
1240 XColor blackcolour; 1215 XColor blackcolour;
1241 blackcolour.red = 0; 1216 blackcolour.red = 0;
1242 blackcolour.green = 0; 1217 blackcolour.green = 0;
1243 blackcolour.blue = 0; 1218 blackcolour.blue = 0;
1244 Font f = XLoadFont (Xdisplay, "fixed"); 1219 Font f = XLoadFont (display->display, "fixed");
1245 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1220 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1246 &blackcolour, &blackcolour); 1221 &blackcolour, &blackcolour);
1247 XUnloadFont (Xdisplay, f); 1222 XUnloadFont (display->display, f);
1248 } 1223 }
1249#endif 1224#endif
1250 1225
1251 /* the vt window */ 1226 /* the vt window */
1252 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1254 TermWin_TotalWidth(), 1229 TermWin_TotalWidth (),
1255 TermWin_TotalHeight(), 1230 TermWin_TotalHeight (),
1256 0, 1231 0,
1257 PixColors[Color_fg], 1232 PixColors[Color_fg],
1258 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1234
1259#ifdef DEBUG_X 1235#ifdef DEBUG_X
1260 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1261#endif 1237#endif
1262 1238
1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1239 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1264 | PropertyChangeMask); 1240 | PropertyChangeMask);
1265 1241
… …
1270 vt_emask |= PointerMotionMask; 1246 vt_emask |= PointerMotionMask;
1271 else 1247 else
1272#endif 1248#endif
1273 vt_emask |= (Button1MotionMask | Button3MotionMask); 1249 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274 1250
1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1251 XSelectInput (display->display, TermWin.vt, vt_emask);
1252 vt_ev.start (display, TermWin.vt);
1276 1253
1277#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1254#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1278
1279 if (menuBar_height()) 1255 if (menuBar_height ())
1280 { 1256 {
1281 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1282 window_vt_x, 0, 1258 window_vt_x, 0,
1283 TermWin_TotalWidth(), 1259 TermWin_TotalWidth (),
1284 menuBar_TotalHeight(), 1260 menuBar_TotalHeight (),
1285 0, 1261 0,
1286 PixColors[Color_fg], 1262 PixColors[Color_fg],
1287 PixColors[Color_scroll]); 1263 PixColors[Color_scroll]);
1288#ifdef DEBUG_X 1264#ifdef DEBUG_X
1289
1290 XStoreName(Xdisplay, menuBar.win, "menubar"); 1265 XStoreName (display->display, menuBar.win, "menubar");
1291#endif 1266#endif
1292 1267
1293 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1269
1294 XSelectInput(Xdisplay, menuBar.win, 1270 XSelectInput (display->display, menuBar.win,
1295 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1296 | Button1MotionMask)); 1272 | Button1MotionMask));
1273 menubar_ev.start (display, menuBar.win);
1297 } 1274 }
1298#endif 1275#endif
1276
1299#ifdef XPM_BACKGROUND 1277#ifdef XPM_BACKGROUND
1300 if (rs[Rs_backgroundPixmap] != NULL 1278 if (rs[Rs_backgroundPixmap] != NULL
1301 && !(Options & Opt_transparent)) 1279 && ! (Options & Opt_transparent))
1302 { 1280 {
1303 const char *p = rs[Rs_backgroundPixmap]; 1281 const char *p = rs[Rs_backgroundPixmap];
1304 1282
1305 if ((p = STRCHR(p, ';')) != NULL) 1283 if ((p = STRCHR (p, ';')) != NULL)
1306 { 1284 {
1307 p++; 1285 p++;
1308 scale_pixmap (p); 1286 scale_pixmap (p);
1309 } 1287 }
1310 set_bgPixmap (rs[Rs_backgroundPixmap]); 1288 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1314 1292
1315 /* graphics context for the vt window */ 1293 /* graphics context for the vt window */
1316 gcvalue.foreground = PixColors[Color_fg]; 1294 gcvalue.foreground = PixColors[Color_fg];
1317 gcvalue.background = PixColors[Color_bg]; 1295 gcvalue.background = PixColors[Color_bg];
1318 gcvalue.graphics_exposures = 1; 1296 gcvalue.graphics_exposures = 1;
1319 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1297 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1320 GCForeground | GCBackground 1298 GCForeground | GCBackground
1321 | GCGraphicsExposures, &gcvalue); 1299 | GCGraphicsExposures, &gcvalue);
1322 1300
1323#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1324
1325 gcvalue.foreground = PixColors[Color_topShadow]; 1302 gcvalue.foreground = PixColors[Color_topShadow];
1326 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1303 topShadowGC = XCreateGC (display->display, TermWin.vt,
1327 GCForeground, &gcvalue); 1304 GCForeground, &gcvalue);
1328 gcvalue.foreground = PixColors[Color_bottomShadow]; 1305 gcvalue.foreground = PixColors[Color_bottomShadow];
1329 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1306 botShadowGC = XCreateGC (display->display, TermWin.vt,
1330 GCForeground, &gcvalue); 1307 GCForeground, &gcvalue);
1331 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1332 : Color_scroll)]; 1309 : Color_scroll)];
1333 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1310 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1334 GCForeground, &gcvalue); 1311 GCForeground, &gcvalue);
1335#endif 1312#endif
1336} 1313}
1337 1314
1338/*----------------------------------------------------------------------*/ 1315/*----------------------------------------------------------------------*/
1339/* 1316/*
… …
1345rxvt_term::run_command (const char *const *argv) 1322rxvt_term::run_command (const char *const *argv)
1346{ 1323{
1347 int cfd, er; 1324 int cfd, er;
1348 1325
1349 /* get master (pty) */ 1326 /* get master (pty) */
1350 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1351 { 1328 {
1352 rxvt_print_error("can't open pseudo-tty"); 1329 rxvt_print_error ("can't open pseudo-tty");
1353 return -1; 1330 return -1;
1354 } 1331 }
1355
1356#ifdef FD_SETSIZE
1357 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1358 {
1359 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1360 rxvt_clean_exit();
1361 exit(EXIT_FAILURE);
1362 }
1363#endif
1364 1332
1365 fcntl (cfd, F_SETFL, O_NONBLOCK); 1333 fcntl (cfd, F_SETFL, O_NONBLOCK);
1366 1334
1367 /* get slave (tty) */ 1335 /* get slave (tty) */
1368 if (tty_fd < 0) 1336 if (tty_fd < 0)
… …
1371 privileged_ttydev (SAVE); 1339 privileged_ttydev (SAVE);
1372#endif 1340#endif
1373 1341
1374 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1375 { 1343 {
1376 close(cfd); 1344 close (cfd);
1377 rxvt_print_error("can't open slave tty %s", ttydev); 1345 rxvt_print_error ("can't open slave tty %s", ttydev);
1378 return -1; 1346 return -1;
1379 } 1347 }
1380 } 1348 }
1381#ifndef NO_BACKSPACE_KEY 1349#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1350 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1351 er = key_backspace[0];
1384 else if (STRCMP(key_backspace, "DEC") == 0) 1352 else if (STRCMP (key_backspace, "DEC") == 0)
1385 er = '\177'; /* the initial state anyway */ 1353 er = '\177'; /* the initial state anyway */
1386 else 1354 else
1387#endif 1355#endif
1388 1356
1389 er = -1; 1357 er = -1;
1390 1358
1391 rxvt_get_ttymode (&(tio), er); 1359 rxvt_get_ttymode (& (tio), er);
1392 1360
1393#ifndef __QNX__ 1361#ifndef __QNX__
1394 /* spin off the command interpreter */ 1362 /* spin off the command interpreter */
1395 switch (cmd_pid = fork ()) 1363 switch (cmd_pid = fork ())
1396 { 1364 {
1397 case -1: 1365 case -1:
1398 rxvt_print_error("can't fork"); 1366 rxvt_print_error ("can't fork");
1399 return -1; 1367 return -1;
1400 case 0: 1368 case 0:
1401 close (cfd); /* only keep tty_fd and STDERR open */ 1369 close (cfd); /* only keep tty_fd and STDERR open */
1402 close (Xfd); 1370
1371 init_env ();
1372
1403 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1373 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1404 rxvt_print_error ("could not obtain control of tty"); 1374 rxvt_print_error ("could not obtain control of tty");
1405 else 1375 else
1376 {
1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1378 dup2 (tty_fd, STDIN_FILENO);
1379 dup2 (tty_fd, STDOUT_FILENO);
1380 dup2 (tty_fd, STDERR_FILENO);
1381
1382 if (tty_fd > 2)
1383 close (tty_fd);
1384
1385 run_child (argv);
1386 }
1387 exit (EXIT_FAILURE);
1388 /* NOTREACHED */
1389 default:
1406 { 1390 {
1407 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 int fdstdin;
1393
1394 fdstdin = dup (STDIN_FILENO);
1408 dup2 (tty_fd, STDIN_FILENO); 1395 dup2 (tty_fd, STDIN_FILENO);
1396#endif
1397
1398#ifdef UTMP_SUPPORT
1399 privileged_utmp (SAVE);
1400#endif
1401
1402#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1403
1409 dup2 (tty_fd, STDOUT_FILENO); 1404 dup2 (fdstdin, STDIN_FILENO);
1410 dup2 (tty_fd, STDERR_FILENO);
1411
1412 if (tty_fd > 2)
1413 close (tty_fd); 1405 close (fdstdin);
1406#endif
1414 1407
1415 run_child (argv);
1416 } 1408 }
1417 exit (EXIT_FAILURE);
1418 /* NOTREACHED */
1419 default:
1420 {
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422 int fdstdin;
1423
1424 fdstdin = dup (STDIN_FILENO);
1425 dup2 (tty_fd, STDIN_FILENO);
1426#endif
1427
1428#ifdef UTMP_SUPPORT
1429 privileged_utmp (SAVE);
1430#endif
1431
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433
1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin);
1436#endif
1437
1438 }
1439 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1440 break; 1410 break;
1441 } 1411 }
1442#else /* __QNX__ uses qnxspawn() */ 1412#else /* __QNX__ uses qnxspawn () */
1443 fchmod (tty_fd, 0622); 1413 fchmod (tty_fd, 0622);
1444 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1414 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1445 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1415 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1446 1416
1447 if (run_child (argv) == -1) 1417 if (run_child (argv) == -1)
… …
1461int 1431int
1462rxvt_term::run_child (const char *const *argv) 1432rxvt_term::run_child (const char *const *argv)
1463{ 1433{
1464 char *login; 1434 char *login;
1465 1435
1466 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1436 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1467 1437
1468 if (Options & Opt_console) 1438 if (Options & Opt_console)
1469 { /* be virtual console, fail silently */ 1439 { /* be virtual console, fail silently */
1470#ifdef TIOCCONS 1440#ifdef TIOCCONS
1471 unsigned int on = 1; 1441 unsigned int on = 1;
… …
1479 { 1449 {
1480 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1450 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1481 close (fd); 1451 close (fd);
1482 } 1452 }
1483#endif /* SRIOCSREDIR */ 1453#endif /* SRIOCSREDIR */
1454
1484 } 1455 }
1485 1456
1486 /* reset signals and spin off the command interpreter */ 1457 /* reset signals and spin off the command interpreter */
1487 signal (SIGINT, SIG_DFL); 1458 signal (SIGINT, SIG_DFL);
1488 signal (SIGQUIT, SIG_DFL); 1459 signal (SIGQUIT, SIG_DFL);
… …
1516 { 1487 {
1517# ifdef DEBUG_CMD 1488# ifdef DEBUG_CMD
1518 int i; 1489 int i;
1519 1490
1520 for (i = 0; argv[i]; i++) 1491 for (i = 0; argv[i]; i++)
1521 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1492 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1522# endif 1493# endif
1523 1494
1524 execvp(argv[0], (char *const *)argv); 1495 execvp (argv[0], (char *const *)argv);
1525 /* no error message: STDERR is closed! */ 1496 /* no error message: STDERR is closed! */
1526 } 1497 }
1527 else 1498 else
1528 { 1499 {
1529 const char *argv0, *shell; 1500 const char *argv0, *shell;
1530 1501
1531 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1502 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1532 shell = "/bin/sh"; 1503 shell = "/bin/sh";
1533 1504
1534 argv0 = (const char *)rxvt_r_basename(shell); 1505 argv0 = (const char *)rxvt_r_basename (shell);
1535 if (Options & Opt_loginShell) 1506 if (Options & Opt_loginShell)
1536 { 1507 {
1537 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1508 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1538 1509
1539 login[0] = '-'; 1510 login[0] = '-';
1540 STRCPY(&login[1], argv0); 1511 STRCPY (&login[1], argv0);
1541 argv0 = login; 1512 argv0 = login;
1542 } 1513 }
1543 execlp(shell, argv0, NULL); 1514 execlp (shell, argv0, NULL);
1544 /* no error message: STDERR is closed! */ 1515 /* no error message: STDERR is closed! */
1545 } 1516 }
1546 1517
1547#else /* __QNX__ uses qnxspawn() */ 1518#else /* __QNX__ uses qnxspawn () */
1548 1519
1549 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1520 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1550 char *command = NULL, fullcommand[_MAX_PATH]; 1521 char *command = NULL, fullcommand[_MAX_PATH];
1551 char **arg_v, *arg_a[2] = { NULL, NULL }; 1522 char **arg_v, *arg_a[2] = { NULL, NULL };
1552 1523
1553 if (argv != NULL) 1524 if (argv != NULL)
1554 { 1525 {
1555 if (access(argv[0], X_OK) == -1) 1526 if (access (argv[0], X_OK) == -1)
1556 { 1527 {
1557 if (STRCHR(argv[0], '/') == NULL) 1528 if (STRCHR (argv[0], '/') == NULL)
1558 { 1529 {
1559 searchenv(argv[0], "PATH", fullcommand); 1530 searchenv (argv[0], "PATH", fullcommand);
1560 if (fullcommand[0] != '\0') 1531 if (fullcommand[0] != '\0')
1561 command = fullcommand; 1532 command = fullcommand;
1562 } 1533 }
1563 if (access(command, X_OK) == -1) 1534 if (access (command, X_OK) == -1)
1564 return -1; 1535 return -1;
1565 } 1536 }
1566 else 1537 else
1567 command = argv[0]; 1538 command = argv[0];
1568 arg_v = argv; 1539 arg_v = argv;
1569 } 1540 }
1570 else 1541 else
1571 { 1542 {
1572 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1543 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1573 command = "/bin/sh"; 1544 command = "/bin/sh";
1574 1545
1575 arg_a[0] = my_basename(command); 1546 arg_a[0] = my_basename (command);
1576 if (Options & Opt_loginShell) 1547 if (Options & Opt_loginShell)
1577 { 1548 {
1578 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1549 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1579 1550
1580 login[0] = '-'; 1551 login[0] = '-';
1581 STRCPY(&login[1], arg_a[0]); 1552 STRCPY (&login[1], arg_a[0]);
1582 arg_a[0] = login; 1553 arg_a[0] = login;
1583 } 1554 }
1584 arg_v = arg_a; 1555 arg_v = arg_a;
1585 } 1556 }
1586 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1557 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1587 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1558 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1588 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1559 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1589 command, arg_v, environ, iov_a, 0); 1560 command, arg_v, environ, iov_a, 0);
1590 if (login) 1561 if (login)
1591 free(login); 1562 free (login);
1592 1563
1593 close(tty_fd); 1564 close (tty_fd);
1594 return cmd_fd; 1565 return cmd_fd;
1595 1566
1596#endif 1567#endif
1597 return -1; 1568 return -1;
1598} 1569}
1599 1570
1600/* ------------------------------------------------------------------------- * 1571/* ------------------------------------------------------------------------- *
1601 * GET TTY CURRENT STATE * 1572 * GET TTY CURRENT STATE *
1602 * ------------------------------------------------------------------------- */ 1573 * ------------------------------------------------------------------------- */
1603/* rxvt_get_ttymode() */ 1574/* rxvt_get_ttymode () */
1604/* EXTPROTO */ 1575/* EXTPROTO */
1605void 1576void
1606rxvt_get_ttymode(ttymode_t *tio, int erase) 1577rxvt_get_ttymode (ttymode_t *tio, int erase)
1607{ 1578{
1608#ifdef HAVE_TERMIOS_H 1579#ifdef HAVE_TERMIOS_H
1609 /* 1580 /*
1610 * standard System V termios interface 1581 * standard System V termios interface
1611 */ 1582 */
1612 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1583 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1613 { 1584 {
1614 /* return error - use system defaults */ 1585 /* return error - use system defaults */
1615 tio->c_cc[VINTR] = CINTR; 1586 tio->c_cc[VINTR] = CINTR;
1616 tio->c_cc[VQUIT] = CQUIT; 1587 tio->c_cc[VQUIT] = CQUIT;
1617 tio->c_cc[VERASE] = CERASE; 1588 tio->c_cc[VERASE] = CERASE;
… …
1691 /* 1662 /*
1692 * sgtty interface 1663 * sgtty interface
1693 */ 1664 */
1694 1665
1695 /* get parameters -- gtty */ 1666 /* get parameters -- gtty */
1696 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1697 { 1668 {
1698 tio->sg.sg_erase = CERASE; /* ^H */ 1669 tio->sg.sg_erase = CERASE; /* ^H */
1699 tio->sg.sg_kill = CKILL; /* ^U */ 1670 tio->sg.sg_kill = CKILL; /* ^U */
1700 } 1671 }
1701 if (erase != -1) 1672 if (erase != -1)
1702 tio->sg.sg_erase = (char)erase; 1673 tio->sg.sg_erase = (char)erase;
1703 1674
1704 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1675 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1705 1676
1706 /* get special characters */ 1677 /* get special characters */
1707 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1678 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1708 { 1679 {
1709 tio->tc.t_intrc = CINTR; /* ^C */ 1680 tio->tc.t_intrc = CINTR; /* ^C */
1710 tio->tc.t_quitc = CQUIT; /* ^\ */ 1681 tio->tc.t_quitc = CQUIT; /* ^\ */
1711 tio->tc.t_startc = CSTART; /* ^Q */ 1682 tio->tc.t_startc = CSTART; /* ^Q */
1712 tio->tc.t_stopc = CSTOP; /* ^S */ 1683 tio->tc.t_stopc = CSTOP; /* ^S */
1713 tio->tc.t_eofc = CEOF; /* ^D */ 1684 tio->tc.t_eofc = CEOF; /* ^D */
1714 tio->tc.t_brkc = -1; 1685 tio->tc.t_brkc = -1;
1715 } 1686 }
1716 /* get local special chars */ 1687 /* get local special chars */
1717 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1688 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1718 { 1689 {
1719 tio->lc.t_suspc = CSUSP; /* ^Z */ 1690 tio->lc.t_suspc = CSUSP; /* ^Z */
1720 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1691 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1721 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1692 tio->lc.t_rprntc = CRPRNT; /* ^R */
1722 tio->lc.t_flushc = CFLUSH; /* ^O */ 1693 tio->lc.t_flushc = CFLUSH; /* ^O */
1723 tio->lc.t_werasc = CWERASE; /* ^W */ 1694 tio->lc.t_werasc = CWERASE; /* ^W */
1724 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1695 tio->lc.t_lnextc = CLNEXT; /* ^V */
1725 } 1696 }
1726 /* get line discipline */ 1697 /* get line discipline */
1727 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1698 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1728# ifdef NTTYDISC 1699# ifdef NTTYDISC
1729 1700
1730 tio->line = NTTYDISC; 1701 tio->line = NTTYDISC;
1731# endif /* NTTYDISC */ 1702# endif /* NTTYDISC */
1732 1703
… …
1737 * Debugging 1708 * Debugging
1738 */ 1709 */
1739#ifdef DEBUG_TTYMODE 1710#ifdef DEBUG_TTYMODE
1740#ifdef HAVE_TERMIOS_H 1711#ifdef HAVE_TERMIOS_H
1741 /* c_iflag bits */ 1712 /* c_iflag bits */
1742 fprintf(stderr, "Input flags\n"); 1713 fprintf (stderr, "Input flags\n");
1743 1714
1744 /* cpp token stringize doesn't work on all machines <sigh> */ 1715 /* cpp token stringize doesn't work on all machines <sigh> */
1745# define FOO(flag,name) \ 1716# define FOO(flag,name) \
1746 if ((tio->c_iflag) & flag) \ 1717 if ((tio->c_iflag) & flag) \
1747 fprintf (stderr, "%s ", name) 1718 fprintf (stderr, "%s ", name)
1748 1719
1749 /* c_iflag bits */ 1720 /* c_iflag bits */
1750 FOO(IGNBRK, "IGNBRK"); 1721 FOO (IGNBRK, "IGNBRK");
1751 FOO(BRKINT, "BRKINT"); 1722 FOO (BRKINT, "BRKINT");
1752 FOO(IGNPAR, "IGNPAR"); 1723 FOO (IGNPAR, "IGNPAR");
1753 FOO(PARMRK, "PARMRK"); 1724 FOO (PARMRK, "PARMRK");
1754 FOO(INPCK, "INPCK"); 1725 FOO (INPCK, "INPCK");
1755 FOO(ISTRIP, "ISTRIP"); 1726 FOO (ISTRIP, "ISTRIP");
1756 FOO(INLCR, "INLCR"); 1727 FOO (INLCR, "INLCR");
1757 FOO(IGNCR, "IGNCR"); 1728 FOO (IGNCR, "IGNCR");
1758 FOO(ICRNL, "ICRNL"); 1729 FOO (ICRNL, "ICRNL");
1759 FOO(IXON, "IXON"); 1730 FOO (IXON, "IXON");
1760 FOO(IXOFF, "IXOFF"); 1731 FOO (IXOFF, "IXOFF");
1761# ifdef IUCLC 1732# ifdef IUCLC
1762 1733
1763 FOO(IUCLC, "IUCLC"); 1734 FOO (IUCLC, "IUCLC");
1764# endif 1735# endif
1765# ifdef IXANY 1736# ifdef IXANY
1766 1737
1767 FOO(IXANY, "IXANY"); 1738 FOO (IXANY, "IXANY");
1768# endif 1739# endif
1769# ifdef IMAXBEL 1740# ifdef IMAXBEL
1770 1741
1771 FOO(IMAXBEL, "IMAXBEL"); 1742 FOO (IMAXBEL, "IMAXBEL");
1772# endif 1743# endif
1773 1744
1774 fprintf(stderr, "\n"); 1745 fprintf (stderr, "\n");
1775 1746
1776# undef FOO 1747# undef FOO
1777# define FOO(entry, name) \ 1748# define FOO(entry, name) \
1778 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1749 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1779 1750
1780 FOO(VINTR, "VINTR"); 1751 FOO (VINTR, "VINTR");
1781 FOO(VQUIT, "VQUIT"); 1752 FOO (VQUIT, "VQUIT");
1782 FOO(VERASE, "VERASE"); 1753 FOO (VERASE, "VERASE");
1783 FOO(VKILL, "VKILL"); 1754 FOO (VKILL, "VKILL");
1784 FOO(VEOF, "VEOF"); 1755 FOO (VEOF, "VEOF");
1785 FOO(VEOL, "VEOL"); 1756 FOO (VEOL, "VEOL");
1786# ifdef VEOL2 1757# ifdef VEOL2
1787 1758
1788 FOO(VEOL2, "VEOL2"); 1759 FOO (VEOL2, "VEOL2");
1789# endif 1760# endif
1790# ifdef VSWTC 1761# ifdef VSWTC
1791 1762
1792 FOO(VSWTC, "VSWTC"); 1763 FOO (VSWTC, "VSWTC");
1793# endif 1764# endif
1794# ifdef VSWTCH 1765# ifdef VSWTCH
1795 1766
1796 FOO(VSWTCH, "VSWTCH"); 1767 FOO (VSWTCH, "VSWTCH");
1797# endif 1768# endif
1798 1769
1799 FOO(VSTART, "VSTART"); 1770 FOO (VSTART, "VSTART");
1800 FOO(VSTOP, "VSTOP"); 1771 FOO (VSTOP, "VSTOP");
1801 FOO(VSUSP, "VSUSP"); 1772 FOO (VSUSP, "VSUSP");
1802# ifdef VDSUSP 1773# ifdef VDSUSP
1803 1774
1804 FOO(VDSUSP, "VDSUSP"); 1775 FOO (VDSUSP, "VDSUSP");
1805# endif 1776# endif
1806# ifdef VREPRINT 1777# ifdef VREPRINT
1807 1778
1808 FOO(VREPRINT, "VREPRINT"); 1779 FOO (VREPRINT, "VREPRINT");
1809# endif 1780# endif
1810# ifdef VDISCRD 1781# ifdef VDISCRD
1811 1782
1812 FOO(VDISCRD, "VDISCRD"); 1783 FOO (VDISCRD, "VDISCRD");
1813# endif 1784# endif
1814# ifdef VWERSE 1785# ifdef VWERSE
1815 1786
1816 FOO(VWERSE, "VWERSE"); 1787 FOO (VWERSE, "VWERSE");
1817# endif 1788# endif
1818# ifdef VLNEXT 1789# ifdef VLNEXT
1819 1790
1820 FOO(VLNEXT, "VLNEXT"); 1791 FOO (VLNEXT, "VLNEXT");
1821# endif 1792# endif
1822 1793
1823 fprintf(stderr, "\n"); 1794 fprintf (stderr, "\n");
1824# undef FOO 1795# undef FOO
1825# endif /* HAVE_TERMIOS_H */ 1796# endif /* HAVE_TERMIOS_H */
1826#endif /* DEBUG_TTYMODE */ 1797#endif /* DEBUG_TTYMODE */
1827} 1798}
1828 1799

Diff Legend

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