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.15 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.29 by pcg, Sat Feb 21 21:43:37 2004 UTC

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

Diff Legend

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