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.21 by pcg, Sat Jan 31 02:14:58 2004 UTC vs.
Revision 1.29 by pcg, Sat Feb 21 21:43:37 2004 UTC

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

Diff Legend

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