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.17 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.27 by pcg, Fri Feb 13 13:28:17 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.17 2004/01/19 17:26:43 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 "COMPOUND_TEXT", 337 "COMPOUND_TEXT",
338 "UTF8_STRING",
337 "MULTIPLE", 339 "MULTIPLE",
338 "TARGETS", 340 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 341 "TIMESTAMP",
341 "VT_SELECTION", 342 "VT_SELECTION",
342 "INCR", 343 "INCR",
343 "WM_DELETE_WINDOW", 344 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 345#ifdef TRANSPARENT
… …
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)
527 rs[Rs_display_name] = ":0"; 529 rs[Rs_display_name] = ":0";
528 530
529 rxvt_get_options (this, r_argc, r_argv); 531 get_options (r_argc, r_argv);
530 free (r_argv); 532 free (r_argv);
531 533
532#ifdef LOCAL_X_IS_UNIX 534#ifdef LOCAL_X_IS_UNIX
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 rxvt_extract_resources (this, 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 rxvt_setup_scrollbar (this, 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);
… …
799void 805void
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 = strdup (setlocale (LC_CTYPE, "")); 810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
805#endif 811#endif
806#if HAVE_NL_LANGINFO 812#if HAVE_NL_LANGINFO
807 free (codeset); 813 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 814 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 815 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 816 || !STRCASECMP (codeset, "UTF8");
811#else 817#else
812 enc_utf8 = 1; 818 enc_utf8 = 1;
813#endif 819#endif
814} 820}
815 821
… …
821 rxvt_print_error ("Setting locale failed."); 827 rxvt_print_error ("Setting locale failed.");
822 else 828 else
823 { 829 {
824 Atom wmlocale; 830 Atom wmlocale;
825 831
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 832 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 833 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 834 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 835 (unsigned char *)locale, STRLEN (locale));
830 836
831 if (!XSupportsLocale ()) 837 if (!XSupportsLocale ())
832 { 838 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 839 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 840 return;
835 } 841 }
836 842
843 im_ev.start (display);
844
837 /* see if we can connect yet */ 845 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 846 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 } 847 }
845#endif 848#endif
846} 849}
847 850
848/*----------------------------------------------------------------------*/ 851/*----------------------------------------------------------------------*/
849void 852void
850rxvt_term::init_command(const char *const *argv) 853rxvt_term::init_command (const char *const *argv)
851{ 854{
852 /* 855 /*
853 * Initialize the command connection. 856 * Initialize the command connection.
854 * This should be called after the X server connection is established. 857 * This should be called after the X server connection is established.
855 */ 858 */
856 int i; 859 int i;
857 860
858 for (i = 0; i < NUM_XA; i++) 861 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 862 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 863
861 /* Enable delete window protocol */ 864 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 865 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 866 & (xa[XA_WMDELETEWINDOW]), 1);
864 867
865#ifdef USING_W11LIB 868#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 869 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 871#endif
869 872
870#ifdef META8_OPTION 873#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 875#endif
873 876
874 rxvt_get_ourmods (this); 877 get_ourmods ();
875 878
876 if (!(Options & Opt_scrollTtyOutput)) 879 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 880 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 881 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 882 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 883 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 884 PrivateModes |= PrivMode_smoothScroll;
882 885
883#ifndef NO_BACKSPACE_KEY 886#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 887 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 888 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 889#endif
887 890
888 /* add value for scrollBar */ 891 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 892 if (scrollbar_visible ())
890 { 893 {
891 PrivateModes |= PrivMode_scrollBar; 894 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 895 SavedModes |= PrivMode_scrollBar;
893 } 896 }
894 if (menubar_visible (this)) 897 if (menubar_visible ())
895 { 898 {
896 PrivateModes |= PrivMode_menuBar; 899 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 900 SavedModes |= PrivMode_menuBar;
898 } 901 }
899 902
900#ifdef GREEK_SUPPORT 903#ifdef GREEK_SUPPORT
901 greek_init(); 904 greek_init ();
902#endif 905#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905 906
906#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 910#endif
911 911
912 if ((cmd_fd = run_command (argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
… …
915 exit (EXIT_FAILURE); 915 exit (EXIT_FAILURE);
916 } 916 }
917} 917}
918 918
919/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 920void
922rxvt_Get_Colours (pR) 921rxvt_term::Get_Colours ()
923{ 922{
924 int i; 923 int i;
925 924
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 926 {
928 rxvt_color xcol; 927 rxvt_color xcol;
929 928
930 if (!R->rs[Rs_color + i]) 929 if (!rs[Rs_color + i])
931 continue; 930 continue;
932 931
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 933 {
935#ifndef XTERM_REVERSE_VIDEO 934#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 936 rs[Rs_color + i] = def_colorName[!i];
939 }
940 else 937 else
941#endif 938#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 939 rs[Rs_color + i] = def_colorName[i];
943 940
944 if (!R->rs[Rs_color + i]) 941 if (!rs[Rs_color + i])
945 continue; 942 continue;
946 943
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 944 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 945 {
949 switch (i) 946 switch (i)
950 { 947 {
951 case Color_fg: 948 case Color_fg:
952 case Color_bg: 949 case Color_bg:
953 /* fatal: need bg/fg color */ 950 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 951 rxvt_print_error ("aborting");
955 exit (EXIT_FAILURE); 952 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 953 /* NOTREACHED */
957 break; 954 break;
958#ifndef NO_CURSORCOLOR 955#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 956 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 957 xcol = PixColors[Color_fg];
961 break; 958 break;
962#endif /* ! NO_CURSORCOLOR */ 959#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 960 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 961 xcol = PixColors[Color_fg];
965 break; 962 break;
966 default: 963 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 964 xcol = PixColors[Color_bg]; /* None */
968 break; 965 break;
969 } 966 }
970 } 967 }
971 } 968 }
972 969
973 R->PixColors[i] = xcol; 970 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 971 SET_PIXCOLOR (i);
975 } 972 }
976 973
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 974 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 975 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 976 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 977 PixColors[Color_border] = PixColors[Color_fg];
981 978
982 /* 979 /*
983 * get scrollBar/menuBar shadow colors 980 * get scrollBar/menuBar shadow colors
984 * 981 *
985 * The calculations of topShadow/bottomShadow values are adapted 982 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 984 */
988#ifdef KEEP_SCROLLCOLOR 985#ifdef KEEP_SCROLLCOLOR
989 986
990 if (XDEPTH <= 2) 987 if (XDEPTH <= 2)
991 { /* Monochrome */ 988 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 989 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 990 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 991 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 992 }
996 else 993 else
997 { 994 {
998 rxvt_color xcol[3]; 995 rxvt_color xcol[3];
999 /* xcol[0] == white 996 /* xcol[0] == white
1000 * xcol[1] == top shadow 997 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 998 * xcol[2] == bot shadow */
1002 999
1003 xcol[1] = R->PixColors[Color_scroll]; 1000 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1001# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 1002 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1003 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1007# else 1004# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif 1006# endif
1010 1007
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 1009
1013 xcol[0].get (R, pr0, pg0, pb0); 1010 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 1011 xcol[1].get (display, pr1, pg1, pb1);
1015 1012
1016 /* bottomShadowColor */ 1013 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 1015 xcol[2] = PixColors[Color_Black];
1019 1016
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1017 PixColors[Color_bottomShadow] = xcol[2];
1021 1018
1022 /* topShadowColor */ 1019 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 1020 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1023 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 1024 xcol[1] = PixColors[Color_White];
1028 1025
1029 R->PixColors[Color_topShadow] = xcol[1]; 1026 PixColors[Color_topShadow] = xcol[1];
1030 } 1027 }
1031#endif /* KEEP_SCROLLCOLOR */ 1028#endif /* KEEP_SCROLLCOLOR */
1032} 1029}
1033 1030
1034/*----------------------------------------------------------------------*/ 1031/*----------------------------------------------------------------------*/
1035/* color aliases, fg/bg bright-bold */ 1032/* color aliases, fg/bg bright-bold */
1036void 1033void
1037rxvt_term::color_aliases(int idx) 1034rxvt_term::color_aliases (int idx)
1038{ 1035{
1039 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1036 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1040 { 1037 {
1041 int i = atoi (rs[Rs_color + idx]); 1038 int i = atoi (rs[Rs_color + idx]);
1042 1039
1043 if (i >= 8 && i <= 15) 1040 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1041 { /* bright colors */
1045 i -= 8; 1042 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1043#ifndef NO_BRIGHTCOLOR
1047 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1048 return; 1045 return;
1049#endif 1046#endif
1047
1050 } 1048 }
1051 1049
1052 if (i >= 0 && i <= 7) /* normal colors */ 1050 if (i >= 0 && i <= 7) /* normal colors */
1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1054 } 1052 }
… …
1057/*----------------------------------------------------------------------*/ 1055/*----------------------------------------------------------------------*/
1058/* 1056/*
1059 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1057 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1060 * Use resource ``modifier'' to override the Meta modifier 1058 * Use resource ``modifier'' to override the Meta modifier
1061 */ 1059 */
1062/* INTPROTO */
1063void 1060void
1064rxvt_get_ourmods(pR) 1061rxvt_term::get_ourmods ()
1065{ 1062{
1066 int i, j, k; 1063 int i, j, k;
1067 int requestedmeta, realmeta, realalt; 1064 int requestedmeta, realmeta, realalt;
1068 const char *cm, *rsmod; 1065 const char *cm, *rsmod;
1069 XModifierKeymap *map; 1066 XModifierKeymap *map;
… …
1072 { 1069 {
1073 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1070 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1074 }; 1071 };
1075 1072
1076 requestedmeta = realmeta = realalt = 0; 1073 requestedmeta = realmeta = realalt = 0;
1077 rsmod = R->rs[Rs_modifier]; 1074 rsmod = rs[Rs_modifier];
1078 if (rsmod 1075 if (rsmod
1079 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1076 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1080 requestedmeta = rsmod[3] - '0'; 1077 requestedmeta = rsmod[3] - '0';
1081 1078
1082 map = XGetModifierMapping(R->Xdisplay); 1079 map = XGetModifierMapping (display->display);
1083 kc = map->modifiermap; 1080 kc = map->modifiermap;
1084 for (i = 1; i < 6; i++) 1081 for (i = 1; i < 6; i++)
1085 { 1082 {
1086 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1087 for (j = map->max_keypermod; j--; k++) 1084 for (j = map->max_keypermod; j--; k++)
1088 { 1085 {
1089 if (kc[k] == 0) 1086 if (kc[k] == 0)
1090 break; 1087 break;
1091 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1088 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1092 { 1089 {
1093 case XK_Num_Lock: 1090 case XK_Num_Lock:
1094 R->ModNumLockMask = modmasks[i - 1]; 1091 ModNumLockMask = modmasks[i - 1];
1095 /* FALLTHROUGH */ 1092 /* FALLTHROUGH */
1096 default: 1093 default:
1097 continue; /* for(;;) */ 1094 continue; /* for (;;) */
1098 case XK_Meta_L: 1095 case XK_Meta_L:
1099 case XK_Meta_R: 1096 case XK_Meta_R:
1100 cm = "meta"; 1097 cm = "meta";
1101 realmeta = i; 1098 realmeta = i;
1102 break; 1099 break;
1103 case XK_Alt_L: 1100 case XK_Alt_L:
1104 case XK_Alt_R: 1101 case XK_Alt_R:
1105 cm = "alt"; 1102 cm = "alt";
1106 realalt = i; 1103 realalt = i;
1107 break; 1104 break;
1108 case XK_Super_L: 1105 case XK_Super_L:
1109 case XK_Super_R: 1106 case XK_Super_R:
1110 cm = "super"; 1107 cm = "super";
1111 break; 1108 break;
1112 case XK_Hyper_L: 1109 case XK_Hyper_L:
1113 case XK_Hyper_R: 1110 case XK_Hyper_R:
1114 cm = "hyper"; 1111 cm = "hyper";
1115 break; 1112 break;
1116 } 1113 }
1117 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1114 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1118 requestedmeta = i; 1115 requestedmeta = i;
1119 } 1116 }
1120 } 1117 }
1121 XFreeModifiermap(map); 1118 XFreeModifiermap (map);
1122 i = (requestedmeta ? requestedmeta 1119 i = (requestedmeta ? requestedmeta
1123 : (realmeta ? realmeta 1120 : (realmeta ? realmeta
1124 : (realalt ? realalt : 0))); 1121 : (realalt ? realalt : 0)));
1125 if (i) 1122 if (i)
1126 R->ModMetaMask = modmasks[i - 1]; 1123 ModMetaMask = modmasks[i - 1];
1127} 1124}
1128 1125
1129/*----------------------------------------------------------------------*/ 1126/*----------------------------------------------------------------------*/
1130/* rxvt_Create_Windows() - Open and map the window */ 1127/* rxvt_Create_Windows () - Open and map the window */
1131void 1128void
1132rxvt_term::create_windows (int argc, const char *const *argv) 1129rxvt_term::create_windows (int argc, const char *const *argv)
1133{ 1130{
1134 XClassHint classHint; 1131 XClassHint classHint;
1135 XWMHints wmHint; 1132 XWMHints wmHint;
1136 XGCValues gcvalue; 1133 XGCValues gcvalue;
1137 long vt_emask; 1134 long vt_emask;
1138 1135
1139 XSetWindowAttributes attributes;
1140 XWindowAttributes gattr; 1136 XWindowAttributes gattr;
1141 1137
1142 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1143 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1144 Xscreen = DefaultScreen (Xdisplay);
1145
1146 if (Options & Opt_transparent) 1138 if (Options & Opt_transparent)
1147 { 1139 {
1148 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1140 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1149 Xdepth = gattr.depth; 1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1150 }
1151 else
1152 {
1153 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1154#ifdef PREFER_24BIT
1155 /*
1156 * If depth is not 24, look for a 24bit visual.
1157 */
1158 if (Xdepth != 24)
1159 {
1160 XVisualInfo vinfo;
1161
1162 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1163 {
1164 Xdepth = 24;
1165 Xvisual = vinfo.visual;
1166 Xcmap = XCreateColormap(Xdisplay,
1167 RootWindow(Xdisplay, Xscreen),
1168 Xvisual, AllocNone);
1169 }
1170 }
1171#endif
1172 } 1142 }
1173 1143
1174 /* grab colors before netscape does */ 1144 /* grab colors before netscape does */
1175 rxvt_Get_Colours (this); 1145 Get_Colours ();
1176 1146
1177 rxvt_change_font (this, 1, NULL); 1147 change_font (1, NULL);
1178 window_calc (0, 0); 1148 window_calc (0, 0);
1179 old_width = szHint.width; 1149 old_width = szHint.width;
1180 old_height = szHint.height; 1150 old_height = szHint.height;
1181 1151
1182 /* parent window - reverse video so we can see placement errors 1152 /* parent window - reverse video so we can see placement errors
1183 * sub-window placement & size in rxvt_resize_subwindows() 1153 * sub-window placement & size in rxvt_resize_subwindows ()
1184 */ 1154 */
1185 1155
1186#ifdef PREFER_24BIT 1156#ifdef PREFER_24BIT
1157 XSetWindowAttributes attributes;
1158
1187 attributes.background_pixel = PixColors[Color_fg]; 1159 attributes.background_pixel = PixColors[Color_fg];
1188 attributes.border_pixel = PixColors[Color_border]; 1160 attributes.border_pixel = PixColors[Color_border];
1189 attributes.colormap = XCMAP; 1161 attributes.colormap = display->cmap;
1190 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1191 szHint.x, szHint.y, 1163 szHint.x, szHint.y,
1192 szHint.width, szHint.height, 1164 szHint.width, szHint.height,
1193 TermWin.ext_bwidth, 1165 TermWin.ext_bwidth,
1194 XDEPTH, InputOutput, 1166 display->depth, InputOutput,
1195 XVISUAL, 1167 display->visual,
1196 CWBackPixel | CWBorderPixel
1197 | CWColormap, &attributes); 1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1198#else 1169#else
1199 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1200 szHint.x, szHint.y, 1171 szHint.x, szHint.y,
1201 szHint.width, 1172 szHint.width,
1202 szHint.height, 1173 szHint.height,
1203 TermWin.ext_bwidth, 1174 TermWin.ext_bwidth,
1204 PixColors[Color_border], 1175 PixColors[Color_border],
1205 PixColors[Color_fg]); 1176 PixColors[Color_fg]);
1206#endif 1177#endif
1207 1178
1208 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1209 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1210 1181
1211 classHint.res_name = (char *)rs[Rs_name]; 1182 classHint.res_name = (char *)rs[Rs_name];
1212 classHint.res_class = (char *)APL_CLASS; 1183 classHint.res_class = (char *)APL_CLASS;
1213 1184
1214 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1215 wmHint.input = True; 1186 wmHint.input = True;
1216 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1217 : NormalState); 1188 : NormalState);
1218 wmHint.window_group = TermWin.parent[0]; 1189 wmHint.window_group = TermWin.parent[0];
1219 1190
1220 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1191 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1221 (char **)argv, argc, &szHint, &wmHint, &classHint); 1192 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193
1222 XSelectInput(Xdisplay, TermWin.parent[0], 1194 XSelectInput (display->display, TermWin.parent[0],
1223 (KeyPressMask 1195 KeyPressMask
1224#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1225 | KeyReleaseMask 1197 | KeyReleaseMask
1226#endif 1198#endif
1227 | FocusChangeMask | VisibilityChangeMask 1199 | FocusChangeMask | VisibilityChangeMask
1228 | StructureNotifyMask)); 1200 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]);
1229 1202
1230 /* vt cursor: Black-on-White is standard, but this is more popular */ 1203 /* vt cursor: Black-on-White is standard, but this is more popular */
1231 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1204 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1232 1205
1233#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1234 /* cursor (menuBar/scrollBar): Black-on-White */ 1207 /* cursor (menuBar/scrollBar): Black-on-White */
1235 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1208 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1236#endif 1209#endif
1237 1210
1238#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1239
1240 { 1212 {
1241 XColor blackcolour; 1213 XColor blackcolour;
1242 blackcolour.red = 0; 1214 blackcolour.red = 0;
1243 blackcolour.green = 0; 1215 blackcolour.green = 0;
1244 blackcolour.blue = 0; 1216 blackcolour.blue = 0;
1245 Font f = XLoadFont (Xdisplay, "fixed"); 1217 Font f = XLoadFont (display->display, "fixed");
1246 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1218 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1247 &blackcolour, &blackcolour); 1219 &blackcolour, &blackcolour);
1248 XUnloadFont (Xdisplay, f); 1220 XUnloadFont (display->display, f);
1249 } 1221 }
1250#endif 1222#endif
1251 1223
1252 /* the vt window */ 1224 /* the vt window */
1253 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1225 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1254 window_vt_x, window_vt_y, 1226 window_vt_x, window_vt_y,
1255 TermWin_TotalWidth(), 1227 TermWin_TotalWidth (),
1256 TermWin_TotalHeight(), 1228 TermWin_TotalHeight (),
1257 0, 1229 0,
1258 PixColors[Color_fg], 1230 PixColors[Color_fg],
1259 PixColors[Color_bg]); 1231 PixColors[Color_bg]);
1232
1260#ifdef DEBUG_X 1233#ifdef DEBUG_X
1261 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1234 XStoreName (display->display, TermWin.vt, "vt window");
1262#endif 1235#endif
1263 1236
1264 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | PropertyChangeMask); 1238 | PropertyChangeMask);
1266 1239
… …
1271 vt_emask |= PointerMotionMask; 1244 vt_emask |= PointerMotionMask;
1272 else 1245 else
1273#endif 1246#endif
1274 vt_emask |= (Button1MotionMask | Button3MotionMask); 1247 vt_emask |= (Button1MotionMask | Button3MotionMask);
1275 1248
1276 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1249 XSelectInput (display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt);
1277 1251
1278#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1252#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1279
1280 if (menuBar_height()) 1253 if (menuBar_height ())
1281 { 1254 {
1282 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1255 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1283 window_vt_x, 0, 1256 window_vt_x, 0,
1284 TermWin_TotalWidth(), 1257 TermWin_TotalWidth (),
1285 menuBar_TotalHeight(), 1258 menuBar_TotalHeight (),
1286 0, 1259 0,
1287 PixColors[Color_fg], 1260 PixColors[Color_fg],
1288 PixColors[Color_scroll]); 1261 PixColors[Color_scroll]);
1289#ifdef DEBUG_X 1262#ifdef DEBUG_X
1290
1291 XStoreName(Xdisplay, menuBar.win, "menubar"); 1263 XStoreName (display->display, menuBar.win, "menubar");
1292#endif 1264#endif
1293 1265
1294 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1266 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1267
1295 XSelectInput(Xdisplay, menuBar.win, 1268 XSelectInput (display->display, menuBar.win,
1296 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1297 | Button1MotionMask)); 1270 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win);
1298 } 1272 }
1299#endif 1273#endif
1274
1300#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1301 if (rs[Rs_backgroundPixmap] != NULL 1276 if (rs[Rs_backgroundPixmap] != NULL
1302 && !(Options & Opt_transparent)) 1277 && ! (Options & Opt_transparent))
1303 { 1278 {
1304 const char *p = rs[Rs_backgroundPixmap]; 1279 const char *p = rs[Rs_backgroundPixmap];
1305 1280
1306 if ((p = STRCHR(p, ';')) != NULL) 1281 if ((p = STRCHR (p, ';')) != NULL)
1307 { 1282 {
1308 p++; 1283 p++;
1309 rxvt_scale_pixmap (this, p); 1284 scale_pixmap (p);
1310 } 1285 }
1311 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1286 set_bgPixmap (rs[Rs_backgroundPixmap]);
1312 rxvt_scr_touch (this, True); 1287 scr_touch (True);
1313 } 1288 }
1314#endif 1289#endif
1315 1290
1316 /* graphics context for the vt window */ 1291 /* graphics context for the vt window */
1317 gcvalue.foreground = PixColors[Color_fg]; 1292 gcvalue.foreground = PixColors[Color_fg];
1318 gcvalue.background = PixColors[Color_bg]; 1293 gcvalue.background = PixColors[Color_bg];
1319 gcvalue.graphics_exposures = 1; 1294 gcvalue.graphics_exposures = 1;
1320 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1295 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1321 GCForeground | GCBackground 1296 GCForeground | GCBackground
1322 | GCGraphicsExposures, &gcvalue); 1297 | GCGraphicsExposures, &gcvalue);
1323 1298
1324#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1325
1326 gcvalue.foreground = PixColors[Color_topShadow]; 1300 gcvalue.foreground = PixColors[Color_topShadow];
1327 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1301 topShadowGC = XCreateGC (display->display, TermWin.vt,
1328 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1329 gcvalue.foreground = PixColors[Color_bottomShadow]; 1303 gcvalue.foreground = PixColors[Color_bottomShadow];
1330 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1304 botShadowGC = XCreateGC (display->display, TermWin.vt,
1331 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1332 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1306 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1333 : Color_scroll)]; 1307 : Color_scroll)];
1334 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1308 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1335 GCForeground, &gcvalue); 1309 GCForeground, &gcvalue);
1336#endif 1310#endif
1337} 1311}
1338 1312
1339/*----------------------------------------------------------------------*/ 1313/*----------------------------------------------------------------------*/
1340/* 1314/*
… …
1346rxvt_term::run_command (const char *const *argv) 1320rxvt_term::run_command (const char *const *argv)
1347{ 1321{
1348 int cfd, er; 1322 int cfd, er;
1349 1323
1350 /* get master (pty) */ 1324 /* get master (pty) */
1351 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1325 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1352 { 1326 {
1353 rxvt_print_error("can't open pseudo-tty"); 1327 rxvt_print_error ("can't open pseudo-tty");
1354 return -1; 1328 return -1;
1355 } 1329 }
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 1330
1366 fcntl (cfd, F_SETFL, O_NONBLOCK); 1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1367 1332
1368 /* get slave (tty) */ 1333 /* get slave (tty) */
1369 if (tty_fd < 0) 1334 if (tty_fd < 0)
1370 { 1335 {
1371#ifndef NO_SETOWNER_TTYDEV 1336#ifndef NO_SETOWNER_TTYDEV
1372 rxvt_privileged_ttydev (aR_ SAVE); 1337 privileged_ttydev (SAVE);
1373#endif 1338#endif
1374 1339
1375 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1376 { 1341 {
1377 close(cfd); 1342 close (cfd);
1378 rxvt_print_error("can't open slave tty %s", ttydev); 1343 rxvt_print_error ("can't open slave tty %s", ttydev);
1379 return -1; 1344 return -1;
1380 } 1345 }
1381 } 1346 }
1382#ifndef NO_BACKSPACE_KEY 1347#ifndef NO_BACKSPACE_KEY
1383 if (key_backspace[0] && !key_backspace[1]) 1348 if (key_backspace[0] && !key_backspace[1])
1384 er = key_backspace[0]; 1349 er = key_backspace[0];
1385 else if (STRCMP(key_backspace, "DEC") == 0) 1350 else if (STRCMP (key_backspace, "DEC") == 0)
1386 er = '\177'; /* the initial state anyway */ 1351 er = '\177'; /* the initial state anyway */
1387 else 1352 else
1388#endif 1353#endif
1389 1354
1390 er = -1; 1355 er = -1;
1391 1356
1392 rxvt_get_ttymode (&(tio), er); 1357 rxvt_get_ttymode (& (tio), er);
1393 1358
1394#ifndef __QNX__ 1359#ifndef __QNX__
1395 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1396 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1397 { 1362 {
1398 case -1: 1363 case -1:
1399 rxvt_print_error("can't fork"); 1364 rxvt_print_error ("can't fork");
1400 return -1; 1365 return -1;
1401 case 0: 1366 case 0:
1402 close (cfd); /* only keep tty_fd and STDERR open */ 1367 close (cfd); /* only keep tty_fd and STDERR open */
1403 close (Xfd); 1368
1369 init_env ();
1370
1404 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1371 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1405 rxvt_print_error ("could not obtain control of tty"); 1372 rxvt_print_error ("could not obtain control of tty");
1406 else 1373 else
1374 {
1375 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1376 dup2 (tty_fd, STDIN_FILENO);
1377 dup2 (tty_fd, STDOUT_FILENO);
1378 dup2 (tty_fd, STDERR_FILENO);
1379
1380 if (tty_fd > 2)
1381 close (tty_fd);
1382
1383 run_child (argv);
1384 }
1385 exit (EXIT_FAILURE);
1386 /* NOTREACHED */
1387 default:
1407 { 1388 {
1408 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1389#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1390 int fdstdin;
1391
1392 fdstdin = dup (STDIN_FILENO);
1409 dup2 (tty_fd, STDIN_FILENO); 1393 dup2 (tty_fd, STDIN_FILENO);
1394#endif
1395
1396#ifdef UTMP_SUPPORT
1397 privileged_utmp (SAVE);
1398#endif
1399
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401
1410 dup2 (tty_fd, STDOUT_FILENO); 1402 dup2 (fdstdin, STDIN_FILENO);
1411 dup2 (tty_fd, STDERR_FILENO);
1412
1413 if (tty_fd > 2)
1414 close (tty_fd); 1403 close (fdstdin);
1404#endif
1415 1405
1416 run_child (argv);
1417 } 1406 }
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 rxvt_privileged_utmp (this, 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 */ 1407 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1441 break; 1408 break;
1442 } 1409 }
1443#else /* __QNX__ uses qnxspawn() */ 1410#else /* __QNX__ uses qnxspawn () */
1444 fchmod (tty_fd, 0622); 1411 fchmod (tty_fd, 0622);
1445 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1412 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1446 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1413 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1447 1414
1448 if (run_child (argv) == -1) 1415 if (run_child (argv) == -1)
… …
1462int 1429int
1463rxvt_term::run_child (const char *const *argv) 1430rxvt_term::run_child (const char *const *argv)
1464{ 1431{
1465 char *login; 1432 char *login;
1466 1433
1467 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1434 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1468 1435
1469 if (Options & Opt_console) 1436 if (Options & Opt_console)
1470 { /* be virtual console, fail silently */ 1437 { /* be virtual console, fail silently */
1471#ifdef TIOCCONS 1438#ifdef TIOCCONS
1472 unsigned int on = 1; 1439 unsigned int on = 1;
… …
1480 { 1447 {
1481 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1448 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1482 close (fd); 1449 close (fd);
1483 } 1450 }
1484#endif /* SRIOCSREDIR */ 1451#endif /* SRIOCSREDIR */
1452
1485 } 1453 }
1486 1454
1487 /* reset signals and spin off the command interpreter */ 1455 /* reset signals and spin off the command interpreter */
1488 signal (SIGINT, SIG_DFL); 1456 signal (SIGINT, SIG_DFL);
1489 signal (SIGQUIT, SIG_DFL); 1457 signal (SIGQUIT, SIG_DFL);
… …
1517 { 1485 {
1518# ifdef DEBUG_CMD 1486# ifdef DEBUG_CMD
1519 int i; 1487 int i;
1520 1488
1521 for (i = 0; argv[i]; i++) 1489 for (i = 0; argv[i]; i++)
1522 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1490 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1523# endif 1491# endif
1524 1492
1525 execvp(argv[0], (char *const *)argv); 1493 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */ 1494 /* no error message: STDERR is closed! */
1527 } 1495 }
1528 else 1496 else
1529 { 1497 {
1530 const char *argv0, *shell; 1498 const char *argv0, *shell;
1531 1499
1532 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1500 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh"; 1501 shell = "/bin/sh";
1534 1502
1535 argv0 = (const char *)rxvt_r_basename(shell); 1503 argv0 = (const char *)rxvt_r_basename (shell);
1536 if (Options & Opt_loginShell) 1504 if (Options & Opt_loginShell)
1537 { 1505 {
1538 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1506 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1539 1507
1540 login[0] = '-'; 1508 login[0] = '-';
1541 STRCPY(&login[1], argv0); 1509 STRCPY (&login[1], argv0);
1542 argv0 = login; 1510 argv0 = login;
1543 } 1511 }
1544 execlp(shell, argv0, NULL); 1512 execlp (shell, argv0, NULL);
1545 /* no error message: STDERR is closed! */ 1513 /* no error message: STDERR is closed! */
1546 } 1514 }
1547 1515
1548#else /* __QNX__ uses qnxspawn() */ 1516#else /* __QNX__ uses qnxspawn () */
1549 1517
1550 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1518 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1551 char *command = NULL, fullcommand[_MAX_PATH]; 1519 char *command = NULL, fullcommand[_MAX_PATH];
1552 char **arg_v, *arg_a[2] = { NULL, NULL }; 1520 char **arg_v, *arg_a[2] = { NULL, NULL };
1553 1521
1554 if (argv != NULL) 1522 if (argv != NULL)
1555 { 1523 {
1556 if (access(argv[0], X_OK) == -1) 1524 if (access (argv[0], X_OK) == -1)
1557 { 1525 {
1558 if (STRCHR(argv[0], '/') == NULL) 1526 if (STRCHR (argv[0], '/') == NULL)
1559 { 1527 {
1560 searchenv(argv[0], "PATH", fullcommand); 1528 searchenv (argv[0], "PATH", fullcommand);
1561 if (fullcommand[0] != '\0') 1529 if (fullcommand[0] != '\0')
1562 command = fullcommand; 1530 command = fullcommand;
1563 } 1531 }
1564 if (access(command, X_OK) == -1) 1532 if (access (command, X_OK) == -1)
1565 return -1; 1533 return -1;
1566 } 1534 }
1567 else 1535 else
1568 command = argv[0]; 1536 command = argv[0];
1569 arg_v = argv; 1537 arg_v = argv;
1570 } 1538 }
1571 else 1539 else
1572 { 1540 {
1573 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1541 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1574 command = "/bin/sh"; 1542 command = "/bin/sh";
1575 1543
1576 arg_a[0] = my_basename(command); 1544 arg_a[0] = my_basename (command);
1577 if (Options & Opt_loginShell) 1545 if (Options & Opt_loginShell)
1578 { 1546 {
1579 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1547 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1580 1548
1581 login[0] = '-'; 1549 login[0] = '-';
1582 STRCPY(&login[1], arg_a[0]); 1550 STRCPY (&login[1], arg_a[0]);
1583 arg_a[0] = login; 1551 arg_a[0] = login;
1584 } 1552 }
1585 arg_v = arg_a; 1553 arg_v = arg_a;
1586 } 1554 }
1587 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1555 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1588 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1556 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1589 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1557 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1590 command, arg_v, environ, iov_a, 0); 1558 command, arg_v, environ, iov_a, 0);
1591 if (login) 1559 if (login)
1592 free(login); 1560 free (login);
1593 1561
1594 close(tty_fd); 1562 close (tty_fd);
1595 return cmd_fd; 1563 return cmd_fd;
1596 1564
1597#endif 1565#endif
1598 return -1; 1566 return -1;
1599} 1567}
1600 1568
1601/* ------------------------------------------------------------------------- * 1569/* ------------------------------------------------------------------------- *
1602 * GET TTY CURRENT STATE * 1570 * GET TTY CURRENT STATE *
1603 * ------------------------------------------------------------------------- */ 1571 * ------------------------------------------------------------------------- */
1604/* rxvt_get_ttymode() */ 1572/* rxvt_get_ttymode () */
1605/* INTPROTO */ 1573/* EXTPROTO */
1606void 1574void
1607rxvt_get_ttymode(ttymode_t *tio, int erase) 1575rxvt_get_ttymode (ttymode_t *tio, int erase)
1608{ 1576{
1609#ifdef HAVE_TERMIOS_H 1577#ifdef HAVE_TERMIOS_H
1610 /* 1578 /*
1611 * standard System V termios interface 1579 * standard System V termios interface
1612 */ 1580 */
1613 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1581 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1614 { 1582 {
1615 /* return error - use system defaults */ 1583 /* return error - use system defaults */
1616 tio->c_cc[VINTR] = CINTR; 1584 tio->c_cc[VINTR] = CINTR;
1617 tio->c_cc[VQUIT] = CQUIT; 1585 tio->c_cc[VQUIT] = CQUIT;
1618 tio->c_cc[VERASE] = CERASE; 1586 tio->c_cc[VERASE] = CERASE;
… …
1692 /* 1660 /*
1693 * sgtty interface 1661 * sgtty interface
1694 */ 1662 */
1695 1663
1696 /* get parameters -- gtty */ 1664 /* get parameters -- gtty */
1697 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1665 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1698 { 1666 {
1699 tio->sg.sg_erase = CERASE; /* ^H */ 1667 tio->sg.sg_erase = CERASE; /* ^H */
1700 tio->sg.sg_kill = CKILL; /* ^U */ 1668 tio->sg.sg_kill = CKILL; /* ^U */
1701 } 1669 }
1702 if (erase != -1) 1670 if (erase != -1)
1703 tio->sg.sg_erase = (char)erase; 1671 tio->sg.sg_erase = (char)erase;
1704 1672
1705 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1673 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1706 1674
1707 /* get special characters */ 1675 /* get special characters */
1708 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1676 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1709 { 1677 {
1710 tio->tc.t_intrc = CINTR; /* ^C */ 1678 tio->tc.t_intrc = CINTR; /* ^C */
1711 tio->tc.t_quitc = CQUIT; /* ^\ */ 1679 tio->tc.t_quitc = CQUIT; /* ^\ */
1712 tio->tc.t_startc = CSTART; /* ^Q */ 1680 tio->tc.t_startc = CSTART; /* ^Q */
1713 tio->tc.t_stopc = CSTOP; /* ^S */ 1681 tio->tc.t_stopc = CSTOP; /* ^S */
1714 tio->tc.t_eofc = CEOF; /* ^D */ 1682 tio->tc.t_eofc = CEOF; /* ^D */
1715 tio->tc.t_brkc = -1; 1683 tio->tc.t_brkc = -1;
1716 } 1684 }
1717 /* get local special chars */ 1685 /* get local special chars */
1718 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1686 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1719 { 1687 {
1720 tio->lc.t_suspc = CSUSP; /* ^Z */ 1688 tio->lc.t_suspc = CSUSP; /* ^Z */
1721 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1689 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1722 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1690 tio->lc.t_rprntc = CRPRNT; /* ^R */
1723 tio->lc.t_flushc = CFLUSH; /* ^O */ 1691 tio->lc.t_flushc = CFLUSH; /* ^O */
1724 tio->lc.t_werasc = CWERASE; /* ^W */ 1692 tio->lc.t_werasc = CWERASE; /* ^W */
1725 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1693 tio->lc.t_lnextc = CLNEXT; /* ^V */
1726 } 1694 }
1727 /* get line discipline */ 1695 /* get line discipline */
1728 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1696 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1729# ifdef NTTYDISC 1697# ifdef NTTYDISC
1730 1698
1731 tio->line = NTTYDISC; 1699 tio->line = NTTYDISC;
1732# endif /* NTTYDISC */ 1700# endif /* NTTYDISC */
1733 1701
… …
1738 * Debugging 1706 * Debugging
1739 */ 1707 */
1740#ifdef DEBUG_TTYMODE 1708#ifdef DEBUG_TTYMODE
1741#ifdef HAVE_TERMIOS_H 1709#ifdef HAVE_TERMIOS_H
1742 /* c_iflag bits */ 1710 /* c_iflag bits */
1743 fprintf(stderr, "Input flags\n"); 1711 fprintf (stderr, "Input flags\n");
1744 1712
1745 /* cpp token stringize doesn't work on all machines <sigh> */ 1713 /* cpp token stringize doesn't work on all machines <sigh> */
1746# define FOO(flag,name) \ 1714# define FOO(flag,name) \
1747 if ((tio->c_iflag) & flag) \ 1715 if ((tio->c_iflag) & flag) \
1748 fprintf (stderr, "%s ", name) 1716 fprintf (stderr, "%s ", name)
1749 1717
1750 /* c_iflag bits */ 1718 /* c_iflag bits */
1751 FOO(IGNBRK, "IGNBRK"); 1719 FOO (IGNBRK, "IGNBRK");
1752 FOO(BRKINT, "BRKINT"); 1720 FOO (BRKINT, "BRKINT");
1753 FOO(IGNPAR, "IGNPAR"); 1721 FOO (IGNPAR, "IGNPAR");
1754 FOO(PARMRK, "PARMRK"); 1722 FOO (PARMRK, "PARMRK");
1755 FOO(INPCK, "INPCK"); 1723 FOO (INPCK, "INPCK");
1756 FOO(ISTRIP, "ISTRIP"); 1724 FOO (ISTRIP, "ISTRIP");
1757 FOO(INLCR, "INLCR"); 1725 FOO (INLCR, "INLCR");
1758 FOO(IGNCR, "IGNCR"); 1726 FOO (IGNCR, "IGNCR");
1759 FOO(ICRNL, "ICRNL"); 1727 FOO (ICRNL, "ICRNL");
1760 FOO(IXON, "IXON"); 1728 FOO (IXON, "IXON");
1761 FOO(IXOFF, "IXOFF"); 1729 FOO (IXOFF, "IXOFF");
1762# ifdef IUCLC 1730# ifdef IUCLC
1763 1731
1764 FOO(IUCLC, "IUCLC"); 1732 FOO (IUCLC, "IUCLC");
1765# endif 1733# endif
1766# ifdef IXANY 1734# ifdef IXANY
1767 1735
1768 FOO(IXANY, "IXANY"); 1736 FOO (IXANY, "IXANY");
1769# endif 1737# endif
1770# ifdef IMAXBEL 1738# ifdef IMAXBEL
1771 1739
1772 FOO(IMAXBEL, "IMAXBEL"); 1740 FOO (IMAXBEL, "IMAXBEL");
1773# endif 1741# endif
1774 1742
1775 fprintf(stderr, "\n"); 1743 fprintf (stderr, "\n");
1776 1744
1777# undef FOO 1745# undef FOO
1778# define FOO(entry, name) \ 1746# define FOO(entry, name) \
1779 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1747 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1780 1748
1781 FOO(VINTR, "VINTR"); 1749 FOO (VINTR, "VINTR");
1782 FOO(VQUIT, "VQUIT"); 1750 FOO (VQUIT, "VQUIT");
1783 FOO(VERASE, "VERASE"); 1751 FOO (VERASE, "VERASE");
1784 FOO(VKILL, "VKILL"); 1752 FOO (VKILL, "VKILL");
1785 FOO(VEOF, "VEOF"); 1753 FOO (VEOF, "VEOF");
1786 FOO(VEOL, "VEOL"); 1754 FOO (VEOL, "VEOL");
1787# ifdef VEOL2 1755# ifdef VEOL2
1788 1756
1789 FOO(VEOL2, "VEOL2"); 1757 FOO (VEOL2, "VEOL2");
1790# endif 1758# endif
1791# ifdef VSWTC 1759# ifdef VSWTC
1792 1760
1793 FOO(VSWTC, "VSWTC"); 1761 FOO (VSWTC, "VSWTC");
1794# endif 1762# endif
1795# ifdef VSWTCH 1763# ifdef VSWTCH
1796 1764
1797 FOO(VSWTCH, "VSWTCH"); 1765 FOO (VSWTCH, "VSWTCH");
1798# endif 1766# endif
1799 1767
1800 FOO(VSTART, "VSTART"); 1768 FOO (VSTART, "VSTART");
1801 FOO(VSTOP, "VSTOP"); 1769 FOO (VSTOP, "VSTOP");
1802 FOO(VSUSP, "VSUSP"); 1770 FOO (VSUSP, "VSUSP");
1803# ifdef VDSUSP 1771# ifdef VDSUSP
1804 1772
1805 FOO(VDSUSP, "VDSUSP"); 1773 FOO (VDSUSP, "VDSUSP");
1806# endif 1774# endif
1807# ifdef VREPRINT 1775# ifdef VREPRINT
1808 1776
1809 FOO(VREPRINT, "VREPRINT"); 1777 FOO (VREPRINT, "VREPRINT");
1810# endif 1778# endif
1811# ifdef VDISCRD 1779# ifdef VDISCRD
1812 1780
1813 FOO(VDISCRD, "VDISCRD"); 1781 FOO (VDISCRD, "VDISCRD");
1814# endif 1782# endif
1815# ifdef VWERSE 1783# ifdef VWERSE
1816 1784
1817 FOO(VWERSE, "VWERSE"); 1785 FOO (VWERSE, "VWERSE");
1818# endif 1786# endif
1819# ifdef VLNEXT 1787# ifdef VLNEXT
1820 1788
1821 FOO(VLNEXT, "VLNEXT"); 1789 FOO (VLNEXT, "VLNEXT");
1822# endif 1790# endif
1823 1791
1824 fprintf(stderr, "\n"); 1792 fprintf (stderr, "\n");
1825# undef FOO 1793# undef FOO
1826# endif /* HAVE_TERMIOS_H */ 1794# endif /* HAVE_TERMIOS_H */
1827#endif /* DEBUG_TTYMODE */ 1795#endif /* DEBUG_TTYMODE */
1828} 1796}
1829 1797

Diff Legend

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