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.16 by pcg, Thu Dec 18 13:33:02 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

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