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.25 by pcg, Wed Feb 11 08:13:44 2004 UTC vs.
Revision 1.45 by pcg, Mon Mar 22 17:18:25 2004 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 385 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 386 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 387 numPixColors = TOTAL_COLORS;
387 388
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 389#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 390 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 391#endif
406 392
407 refresh_limit = 1; 393 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 394 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 395 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 396
417 oldcursor.row = oldcursor.col = -1; 397 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 398#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 399 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 400 bgPixmap.x = bgPixmap.y = 50;
… …
423 403
424 last_bot = last_state = -1; 404 last_bot = last_state = -1;
425 405
426#ifdef MENUBAR 406#ifdef MENUBAR
427 menu_readonly = 1; 407 menu_readonly = 1;
428# if !(MENUBAR_MAX > 1) 408# if ! (MENUBAR_MAX > 1)
429 CurrentBar = &(BarList); 409 CurrentBar = & (BarList);
430# endif /* (MENUBAR_MAX > 1) */ 410# endif /* (MENUBAR_MAX > 1) */
431#endif 411#endif
432 412
433 return true; 413 return true;
434} 414}
… …
475 { 455 {
476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 456#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
477 if (i == 4 || i == 7) 457 if (i == 4 || i == 7)
478 continue; 458 continue;
479#endif 459#endif
480 close(i); 460 close (i);
481 } 461 }
482#endif 462#endif
483} 463}
484 464
485/*----------------------------------------------------------------------*/ 465/*----------------------------------------------------------------------*/
… …
492 472
493 /* 473 /*
494 * Look for -exec option. Find => split and make cmd_argv[] of command args 474 * Look for -exec option. Find => split and make cmd_argv[] of command args
495 */ 475 */
496 for (r_argc = 0; r_argc < argc; r_argc++) 476 for (r_argc = 0; r_argc < argc; r_argc++)
497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 477 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
498 break; 478 break;
499 479
500 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 480 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
501 481
502 for (i = 0; i < r_argc; i++) 482 for (i = 0; i < r_argc; i++)
503 r_argv[i] = (const char *)argv[i]; 483 r_argv[i] = (const char *)argv[i];
504 484
505 r_argv[i] = NULL; 485 r_argv[i] = NULL;
506 486
507 if (r_argc == argc) 487 if (r_argc == argc)
508 cmd_argv = NULL; 488 cmd_argv = NULL;
509 else 489 else
510 { 490 {
511 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 491 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
512 492
513 for (i = 0; i < argc - r_argc - 1; i++) 493 for (i = 0; i < argc - r_argc - 1; i++)
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 494 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 495
516 cmd_argv[i] = NULL; 496 cmd_argv[i] = NULL;
517 } 497 }
518 498
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename(argv[0]); 499 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 500
525 /* 501 /*
526 * Open display, get options/resources and create the window 502 * Open display, get options/resources and create the window
527 */ 503 */
528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 504 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
541 free (val); 517 free (val);
542 } 518 }
543#endif 519#endif
544 520
545 if (!display 521 if (!display
546 && !(display = displays.get (rs[Rs_display_name]))) 522 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 523 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 524
552 extract_resources (display->display, rs[Rs_name]); 525 extract_resources (display->display, rs[Rs_name]);
553 526
554 /* 527 /*
555 * set any defaults not already set 528 * set any defaults not already set
556 */ 529 */
557 if (cmd_argv && cmd_argv[0]) 530 if (cmd_argv && cmd_argv[0])
558 { 531 {
559 if (!rs[Rs_title]) 532 if (!rs[Rs_title])
560 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 533 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
561 if (!rs[Rs_iconName]) 534 if (!rs[Rs_iconName])
562 rs[Rs_iconName] = rs[Rs_title]; 535 rs[Rs_iconName] = rs[Rs_title];
563 } 536 }
564 else 537 else
565 { 538 {
… …
567 rs[Rs_title] = rs[Rs_name]; 540 rs[Rs_title] = rs[Rs_name];
568 if (!rs[Rs_iconName]) 541 if (!rs[Rs_iconName])
569 rs[Rs_iconName] = rs[Rs_name]; 542 rs[Rs_iconName] = rs[Rs_name];
570 } 543 }
571 544
572 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 545 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
573 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 546 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
574 547
575#ifndef NO_FRILLS 548#ifndef NO_FRILLS
576 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 549 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
577 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 550 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
578 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 551 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
579 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 552 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
580#endif 553#endif
581 554
582#ifndef NO_LINESPACE 555#ifndef NO_LINESPACE
583 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 556 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
584 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 557 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
585#endif 558#endif
586 559
587#ifdef POINTER_BLANK 560#ifdef POINTER_BLANK
588 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 561 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
589 pointerBlankDelay = i; 562 pointerBlankDelay = i;
590 else 563 else
591 pointerBlankDelay = 2; 564 pointerBlankDelay = 2;
592#endif 565#endif
593 566
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 573 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 574#endif
602 575
603 if (!rs[Rs_cutchars]) 576 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 577 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 578
618#ifndef NO_BACKSPACE_KEY 579#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 580 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 581# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 582 key_backspace = DEFAULT_BACKSPACE;
622# else 583# else
623 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 584 key_backspace = "DEC"; /* can toggle between \010 or \177 */
624# endif 585# endif
625 else 586 else
626 { 587 {
627 val = STRDUP(rs[Rs_backspace_key]); 588 val = STRDUP (rs[Rs_backspace_key]);
628 rxvt_Str_trim(val); 589 rxvt_Str_trim (val);
629 rxvt_Str_escaped(val); 590 rxvt_Str_escaped (val);
630 key_backspace = val; 591 key_backspace = val;
631 } 592 }
632#endif 593#endif
633 594
634#ifndef NO_DELETE_KEY 595#ifndef NO_DELETE_KEY
… …
638# else 599# else
639 key_delete = "\033[3~"; 600 key_delete = "\033[3~";
640# endif 601# endif
641 else 602 else
642 { 603 {
643 val = STRDUP(rs[Rs_delete_key]); 604 val = STRDUP (rs[Rs_delete_key]);
644 rxvt_Str_trim(val); 605 rxvt_Str_trim (val);
645 rxvt_Str_escaped(val); 606 rxvt_Str_escaped (val);
646 key_delete = val; 607 key_delete = val;
647 } 608 }
648#endif 609#endif
649 if (rs[Rs_answerbackstring]) 610 if (rs[Rs_answerbackstring])
650 { 611 {
651 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 612 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 613 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 }
654
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 } 614 }
666 615
667#ifdef HAVE_SCROLLBARS 616#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 617 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 618 rs[Rs_scrollBar_thickness]);
670#endif 619#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 620
678#ifdef XTERM_REVERSE_VIDEO 621#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 622 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 623 if (Options & Opt_reverseVideo)
681 { 624 {
… …
691 rs[Rs_color + i] = def_colorName[i]; 634 rs[Rs_color + i] = def_colorName[i];
692 635
693#ifndef XTERM_REVERSE_VIDEO 636#ifndef XTERM_REVERSE_VIDEO
694 /* this is how we implement reverseVideo */ 637 /* this is how we implement reverseVideo */
695 if (Options & Opt_reverseVideo) 638 if (Options & Opt_reverseVideo)
696 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 639 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
697#endif 640#endif
698 641
699 /* convenient aliases for setting fg/bg to colors */ 642 /* convenient aliases for setting fg/bg to colors */
700 color_aliases (Color_fg); 643 color_aliases (Color_fg);
701 color_aliases (Color_bg); 644 color_aliases (Color_bg);
… …
724 667
725#ifdef DISPLAY_IS_IP 668#ifdef DISPLAY_IS_IP
726 /* Fixup display_name for export over pty to any interested terminal 669 /* Fixup display_name for export over pty to any interested terminal
727 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 670 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
728 * (for the first non-loopback interface) that we get from 671 * (for the first non-loopback interface) that we get from
729 * rxvt_network_display(). This is more "name-resolution-portable", if you 672 * rxvt_network_display (). This is more "name-resolution-portable", if you
730 * will, and probably allows for faster x-client startup if your name 673 * will, and probably allows for faster x-client startup if your name
731 * server is beyond a slow link or overloaded at client startup. Of 674 * server is beyond a slow link or overloaded at client startup. Of
732 * course that only helps the shell's child processes, not us. 675 * course that only helps the shell's child processes, not us.
733 * 676 *
734 * Giving out the display_name also affords a potential security hole 677 * Giving out the display_name also affords a potential security hole
… …
736 val = rxvt_network_display (rs[Rs_display_name]); 679 val = rxvt_network_display (rs[Rs_display_name]);
737 rs[Rs_display_name] = (const char *)val; 680 rs[Rs_display_name] = (const char *)val;
738 681
739 if (val == NULL) 682 if (val == NULL)
740#endif /* DISPLAY_IS_IP */ 683#endif /* DISPLAY_IS_IP */
741 val = XDisplayString(display->display); 684 val = XDisplayString (display->display);
742 685
743 if (rs[Rs_display_name] == NULL) 686 if (rs[Rs_display_name] == NULL)
744 rs[Rs_display_name] = val; /* use broken `:0' value */ 687 rs[Rs_display_name] = val; /* use broken `:0' value */
745 688
746 i = STRLEN (val); 689 i = STRLEN (val);
747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 690 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
748 691
749 sprintf (env_display, "DISPLAY=%s", val); 692 sprintf (env_display, "DISPLAY=%s", val);
750 693
751 /* avoiding the math library: 694 /* avoiding the math library:
752 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 695 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
753 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 696 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
754 ; 697 ;
755 MAX_IT(i, 1); 698 MAX_IT (i, 1);
756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 699 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
757 700
758 sprintf (env_windowid, "WINDOWID=%u", 701 sprintf (env_windowid, "WINDOWID=%u",
759 (unsigned int)TermWin.parent[0]); 702 (unsigned int)TermWin.parent[0]);
760 703
761 /* add entries to the environment: 704 /* add entries to the environment:
762 * @ DISPLAY: in case we started with -display 705 * @ DISPLAY: in case we started with -display
763 * @ WINDOWID: X window id number of the window 706 * @ WINDOWID: X window id number of the window
764 * @ COLORTERM: terminal sub-name and also indicates its color 707 * @ COLORTERM: terminal sub-name and also indicates its color
765 * @ TERM: terminal name 708 * @ TERM: terminal name
766 * @ TERMINFO: path to terminfo directory 709 * @ TERMINFO: path to terminfo directory
710 * @ COLORFGBG: fg;bg color codes
767 */ 711 */
768 putenv (env_display); 712 putenv (env_display);
769 putenv (env_windowid); 713 putenv (env_windowid);
714 if (env_colorfgbg)
715 putenv (env_colorfgbg);
770 716
771#ifdef RXVT_TERMINFO 717#ifdef RXVT_TERMINFO
772 putenv ("TERMINFO=" RXVT_TERMINFO); 718 putenv ("TERMINFO=" RXVT_TERMINFO);
773#endif 719#endif
774 720
… …
777 else 723 else
778 putenv ("COLORTERM=" COLORTERMENVFULL); 724 putenv ("COLORTERM=" COLORTERMENVFULL);
779 725
780 if (rs[Rs_term_name] != NULL) 726 if (rs[Rs_term_name] != NULL)
781 { 727 {
782 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 728 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
783 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 729 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
784 putenv (env_term); 730 putenv (env_term);
785 } 731 }
786 else 732 else
787 putenv ("TERM=" TERMENV); 733 putenv ("TERM=" TERMENV);
… …
802void 748void
803rxvt_term::set_locale (const char *locale) 749rxvt_term::set_locale (const char *locale)
804{ 750{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 751#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 752 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 753 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
754 SET_LOCALE (this->locale);
755 mbstate.reset ();
808#endif 756#endif
757#if 0
809#if HAVE_NL_LANGINFO 758#if HAVE_NL_LANGINFO
810 free (codeset); 759 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET)); 760 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 761 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8"); 762 || !STRCASECMP (codeset, "UTF8");
814#else 763#else
815 enc_utf8 = 1; 764 enc_utf8 = 1;
816#endif 765#endif
766#endif
817} 767}
818 768
819void 769void
820rxvt_term::init_xlocale () 770rxvt_term::init_xlocale ()
821{ 771{
822#ifdef USE_XIM 772#ifdef USE_XIM
823 if (!locale) 773 if (!locale)
824 rxvt_print_error ("Setting locale failed."); 774 rxvt_warn ("setting locale failed, working without locale support.\n");
825 else 775 else
826 { 776 {
827 Atom wmlocale; 777 Atom wmlocale;
828 778
829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 779 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
830 XChangeProperty (display->display, TermWin.parent[0], wmlocale, 780 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
831 XA_STRING, 8, PropModeReplace, 781 XA_STRING, 8, PropModeReplace,
832 (unsigned char *)locale, STRLEN(locale)); 782 (unsigned char *)locale, STRLEN (locale));
833 783
834 if (!XSupportsLocale ()) 784 if (!XSupportsLocale ())
835 { 785 {
836 rxvt_print_error ("The locale is not supported by Xlib"); 786 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
837 return; 787 return;
838 } 788 }
839 789
840 im_ev.start (display); 790 im_ev.start (display);
841 791
… …
845#endif 795#endif
846} 796}
847 797
848/*----------------------------------------------------------------------*/ 798/*----------------------------------------------------------------------*/
849void 799void
850rxvt_term::init_command(const char *const *argv) 800rxvt_term::init_command (const char *const *argv)
851{ 801{
852 /* 802 /*
853 * Initialize the command connection. 803 * Initialize the command connection.
854 * This should be called after the X server connection is established. 804 * This should be called after the X server connection is established.
855 */ 805 */
856 int i; 806 int i;
857 807
858 for (i = 0; i < NUM_XA; i++) 808 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(display->display, xa_names[i], False); 809 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 810
861 /* Enable delete window protocol */ 811 /* Enable delete window protocol */
862 XSetWMProtocols (display->display, TermWin.parent[0], 812 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 813 & (xa[XA_WMDELETEWINDOW]), 1);
864 814
865#ifdef USING_W11LIB 815#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 816 /* enable W11 callbacks */
867 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 817 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 818#endif
… …
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 821 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 822#endif
873 823
874 get_ourmods (); 824 get_ourmods ();
875 825
876 if (!(Options & Opt_scrollTtyOutput)) 826 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 827 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 828 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 829 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 830 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 831 PrivateModes |= PrivMode_smoothScroll;
882 832
883#ifndef NO_BACKSPACE_KEY 833#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 834 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 835 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 836#endif
887 837
888 /* add value for scrollBar */ 838 /* add value for scrollBar */
889 if (scrollbar_visible ()) 839 if (scrollbar_visible ())
… …
894 if (menubar_visible ()) 844 if (menubar_visible ())
895 { 845 {
896 PrivateModes |= PrivMode_menuBar; 846 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 847 SavedModes |= PrivMode_menuBar;
898 } 848 }
899
900#ifdef GREEK_SUPPORT
901 greek_init();
902#endif
903 849
904#ifdef CURSOR_BLINK 850#ifdef CURSOR_BLINK
905 if (Options & Opt_cursorBlink) 851 if (Options & Opt_cursorBlink)
906 (void)gettimeofday (&lastcursorchange, NULL); 852 (void)gettimeofday (&lastcursorchange, NULL);
907#endif 853#endif
908 854
909 if ((cmd_fd = run_command (argv)) < 0) 855 if ((cmd_fd = run_command (argv)) < 0)
910 { 856 rxvt_fatal ("failure while running command, aborting");
911 rxvt_print_error ("aborting");
912 exit (EXIT_FAILURE);
913 }
914} 857}
915 858
916/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
917void 860void
918rxvt_term::Get_Colours () 861rxvt_term::Get_Colours ()
… …
943 switch (i) 886 switch (i)
944 { 887 {
945 case Color_fg: 888 case Color_fg:
946 case Color_bg: 889 case Color_bg:
947 /* fatal: need bg/fg color */ 890 /* fatal: need bg/fg color */
948 rxvt_print_error ("aborting"); 891 rxvt_fatal ("unable to get foreground/background colour, aborting");
949 exit (EXIT_FAILURE);
950 /* NOTREACHED */ 892 /* NOTREACHED */
951 break; 893 break;
952#ifndef NO_CURSORCOLOR 894#ifndef NO_CURSORCOLOR
953 case Color_cursor2: 895 case Color_cursor2:
954 xcol = PixColors[Color_fg]; 896 xcol = PixColors[Color_fg];
… …
995 * xcol[2] == bot shadow */ 937 * xcol[2] == bot shadow */
996 938
997 xcol[1] = PixColors[Color_scroll]; 939 xcol[1] = PixColors[Color_scroll];
998# ifdef PREFER_24BIT 940# ifdef PREFER_24BIT
999 xcol[0].set (display, 65535, 65535, 65535); 941 xcol[0].set (display, 65535, 65535, 65535);
1000 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ 942 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1001# else 943# else
1002 xcol[0].set (display, WhitePixel (display->display, display->screen)); 944 xcol[0].set (display, WhitePixel (display->display, display->screen));
1003# endif 945# endif
1004 946
1005 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 947 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
… …
1026} 968}
1027 969
1028/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
1029/* color aliases, fg/bg bright-bold */ 971/* color aliases, fg/bg bright-bold */
1030void 972void
1031rxvt_term::color_aliases(int idx) 973rxvt_term::color_aliases (int idx)
1032{ 974{
1033 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 975 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1034 { 976 {
1035 int i = atoi (rs[Rs_color + idx]); 977 int i = atoi (rs[Rs_color + idx]);
1036 978
1037 if (i >= 8 && i <= 15) 979 if (i >= 8 && i <= 15)
1038 { /* bright colors */ 980 { /* bright colors */
… …
1068 }; 1010 };
1069 1011
1070 requestedmeta = realmeta = realalt = 0; 1012 requestedmeta = realmeta = realalt = 0;
1071 rsmod = rs[Rs_modifier]; 1013 rsmod = rs[Rs_modifier];
1072 if (rsmod 1014 if (rsmod
1073 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1015 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1074 requestedmeta = rsmod[3] - '0'; 1016 requestedmeta = rsmod[3] - '0';
1075 1017
1076 map = XGetModifierMapping(display->display); 1018 map = XGetModifierMapping (display->display);
1077 kc = map->modifiermap; 1019 kc = map->modifiermap;
1078 for (i = 1; i < 6; i++) 1020 for (i = 1; i < 6; i++)
1079 { 1021 {
1080 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1022 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1081 for (j = map->max_keypermod; j--; k++) 1023 for (j = map->max_keypermod; j--; k++)
1082 { 1024 {
1083 if (kc[k] == 0) 1025 if (kc[k] == 0)
1084 break; 1026 break;
1085 switch (XKeycodeToKeysym(display->display, kc[k], 0)) 1027 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1086 { 1028 {
1087 case XK_Num_Lock: 1029 case XK_Num_Lock:
1088 ModNumLockMask = modmasks[i - 1]; 1030 ModNumLockMask = modmasks[i - 1];
1089 /* FALLTHROUGH */ 1031 /* FALLTHROUGH */
1090 default: 1032 default:
1091 continue; /* for(;;) */ 1033 continue; /* for (;;) */
1092 case XK_Meta_L: 1034 case XK_Meta_L:
1093 case XK_Meta_R: 1035 case XK_Meta_R:
1094 cm = "meta"; 1036 cm = "meta";
1095 realmeta = i; 1037 realmeta = i;
1096 break; 1038 break;
… …
1106 case XK_Hyper_L: 1048 case XK_Hyper_L:
1107 case XK_Hyper_R: 1049 case XK_Hyper_R:
1108 cm = "hyper"; 1050 cm = "hyper";
1109 break; 1051 break;
1110 } 1052 }
1111 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1053 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1112 requestedmeta = i; 1054 requestedmeta = i;
1113 } 1055 }
1114 } 1056 }
1115 XFreeModifiermap(map); 1057 XFreeModifiermap (map);
1116 i = (requestedmeta ? requestedmeta 1058 i = (requestedmeta ? requestedmeta
1117 : (realmeta ? realmeta 1059 : (realmeta ? realmeta
1118 : (realalt ? realalt : 0))); 1060 : (realalt ? realalt : 0)));
1119 if (i) 1061 if (i)
1120 ModMetaMask = modmasks[i - 1]; 1062 ModMetaMask = modmasks[i - 1];
1121} 1063}
1122 1064
1123/*----------------------------------------------------------------------*/ 1065/*----------------------------------------------------------------------*/
1124/* rxvt_Create_Windows() - Open and map the window */ 1066/* rxvt_Create_Windows () - Open and map the window */
1125void 1067void
1126rxvt_term::create_windows (int argc, const char *const *argv) 1068rxvt_term::create_windows (int argc, const char *const *argv)
1127{ 1069{
1128 XClassHint classHint; 1070 XClassHint classHint;
1129 XWMHints wmHint; 1071 XWMHints wmHint;
… …
1132 1074
1133 XWindowAttributes gattr; 1075 XWindowAttributes gattr;
1134 1076
1135 if (Options & Opt_transparent) 1077 if (Options & Opt_transparent)
1136 { 1078 {
1137 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); 1079 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1138 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1080 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1139 } 1081 }
1140 1082
1141 /* grab colors before netscape does */ 1083 /* grab colors before netscape does */
1142 Get_Colours (); 1084 Get_Colours ();
1143 1085
1144 change_font (1, NULL); 1086 if (!change_font (rs[Rs_font]))
1087 {
1088 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1089 destroy ();
1090 return;
1091 }
1092
1145 window_calc (0, 0); 1093 window_calc (0, 0);
1146 old_width = szHint.width; 1094 old_width = szHint.width;
1147 old_height = szHint.height; 1095 old_height = szHint.height;
1148 1096
1149 /* parent window - reverse video so we can see placement errors 1097 /* parent window - reverse video so we can see placement errors
1150 * sub-window placement & size in rxvt_resize_subwindows() 1098 * sub-window placement & size in rxvt_resize_subwindows ()
1151 */ 1099 */
1152 1100
1153#ifdef PREFER_24BIT 1101#ifdef PREFER_24BIT
1154 XSetWindowAttributes attributes; 1102 XSetWindowAttributes attributes;
1155 1103
… …
1175 1123
1176 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1177 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1178 1126
1179 classHint.res_name = (char *)rs[Rs_name]; 1127 classHint.res_name = (char *)rs[Rs_name];
1180 classHint.res_class = (char *)APL_CLASS; 1128 classHint.res_class = (char *)RESCLASS;
1181 1129
1182 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1183 wmHint.input = True; 1131 wmHint.input = True;
1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1185 : NormalState); 1133 : NormalState);
1186 wmHint.window_group = TermWin.parent[0]; 1134 wmHint.window_group = TermWin.parent[0];
1187 1135
1188 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, 1136 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1189 (char **)argv, argc, &szHint, &wmHint, &classHint); 1137 (char **)argv, argc, &szHint, &wmHint, &classHint);
1190 1138
1191 XSelectInput(display->display, TermWin.parent[0], 1139 XSelectInput (display->display, TermWin.parent[0],
1192 KeyPressMask 1140 KeyPressMask
1193#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1141#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1194 | KeyReleaseMask 1142 | KeyReleaseMask
1195#endif 1143#endif
1196 | FocusChangeMask | VisibilityChangeMask 1144 | FocusChangeMask | VisibilityChangeMask
1197 | StructureNotifyMask); 1145 | StructureNotifyMask);
1198 termwin_ev.start (display, TermWin.parent[0]); 1146 termwin_ev.start (display, TermWin.parent[0]);
1199 1147
1200 /* vt cursor: Black-on-White is standard, but this is more popular */ 1148 /* vt cursor: Black-on-White is standard, but this is more popular */
1201 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); 1149 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1202 1150
1203#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1151#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1204 /* cursor (menuBar/scrollBar): Black-on-White */ 1152 /* cursor (menuBar/scrollBar): Black-on-White */
1205 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); 1153 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1206#endif 1154#endif
1207 1155
1208#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1209 { 1157 {
1210 XColor blackcolour; 1158 XColor blackcolour;
… …
1217 XUnloadFont (display->display, f); 1165 XUnloadFont (display->display, f);
1218 } 1166 }
1219#endif 1167#endif
1220 1168
1221 /* the vt window */ 1169 /* the vt window */
1222 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], 1170 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1223 window_vt_x, window_vt_y, 1171 window_vt_x, window_vt_y,
1224 TermWin_TotalWidth(), 1172 TermWin_TotalWidth (),
1225 TermWin_TotalHeight(), 1173 TermWin_TotalHeight (),
1226 0, 1174 0,
1227 PixColors[Color_fg], 1175 PixColors[Color_fg],
1228 PixColors[Color_bg]); 1176 PixColors[Color_bg]);
1229 1177
1230#ifdef DEBUG_X 1178#ifdef DEBUG_X
1231 XStoreName(display->display, TermWin.vt, "vt window"); 1179 XStoreName (display->display, TermWin.vt, "vt window");
1232#endif 1180#endif
1233 1181
1234 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1182 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1235 | PropertyChangeMask); 1183 | PropertyChangeMask);
1236 1184
… …
1241 vt_emask |= PointerMotionMask; 1189 vt_emask |= PointerMotionMask;
1242 else 1190 else
1243#endif 1191#endif
1244 vt_emask |= (Button1MotionMask | Button3MotionMask); 1192 vt_emask |= (Button1MotionMask | Button3MotionMask);
1245 1193
1246 XSelectInput(display->display, TermWin.vt, vt_emask); 1194 XSelectInput (display->display, TermWin.vt, vt_emask);
1247 vt_ev.start (display, TermWin.vt); 1195 vt_ev.start (display, TermWin.vt);
1248 1196
1249#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1197#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1250 if (menuBar_height()) 1198 if (menuBar_height ())
1251 { 1199 {
1252 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], 1200 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, 0, 1201 window_vt_x, 0,
1254 TermWin_TotalWidth(), 1202 TermWin_TotalWidth (),
1255 menuBar_TotalHeight(), 1203 menuBar_TotalHeight (),
1256 0, 1204 0,
1257 PixColors[Color_fg], 1205 PixColors[Color_fg],
1258 PixColors[Color_scroll]); 1206 PixColors[Color_scroll]);
1207
1259#ifdef DEBUG_X 1208#ifdef DEBUG_X
1260 XStoreName(display->display, menuBar.win, "menubar"); 1209 XStoreName (display->display, menuBar.win, "menubar");
1261#endif 1210#endif
1262 1211
1212 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1213
1263 XDefineCursor(display->display, menuBar.win, pointer_leftptr); 1214 XDefineCursor (display->display, menuBar.win,
1215 XCreateFontCursor (display->display, XC_left_ptr));
1264 1216
1265 XSelectInput(display->display, menuBar.win, 1217 XSelectInput (display->display, menuBar.win,
1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1218 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1267 | Button1MotionMask)); 1219 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win); 1220 menubar_ev.start (display, menuBar.win);
1269 } 1221 }
1270#endif 1222#endif
1271 1223
1272#ifdef XPM_BACKGROUND 1224#ifdef XPM_BACKGROUND
1273 if (rs[Rs_backgroundPixmap] != NULL 1225 if (rs[Rs_backgroundPixmap] != NULL
1274 && !(Options & Opt_transparent)) 1226 && ! (Options & Opt_transparent))
1275 { 1227 {
1276 const char *p = rs[Rs_backgroundPixmap]; 1228 const char *p = rs[Rs_backgroundPixmap];
1277 1229
1278 if ((p = STRCHR(p, ';')) != NULL) 1230 if ((p = STRCHR (p, ';')) != NULL)
1279 { 1231 {
1280 p++; 1232 p++;
1281 scale_pixmap (p); 1233 scale_pixmap (p);
1282 } 1234 }
1283 set_bgPixmap (rs[Rs_backgroundPixmap]); 1235 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1287 1239
1288 /* graphics context for the vt window */ 1240 /* graphics context for the vt window */
1289 gcvalue.foreground = PixColors[Color_fg]; 1241 gcvalue.foreground = PixColors[Color_fg];
1290 gcvalue.background = PixColors[Color_bg]; 1242 gcvalue.background = PixColors[Color_bg];
1291 gcvalue.graphics_exposures = 1; 1243 gcvalue.graphics_exposures = 1;
1292 TermWin.gc = XCreateGC(display->display, TermWin.vt, 1244 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1293 GCForeground | GCBackground 1245 GCForeground | GCBackground | GCGraphicsExposures,
1294 | GCGraphicsExposures, &gcvalue); 1246 &gcvalue);
1247
1248 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1295 1249
1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1250#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1297 gcvalue.foreground = PixColors[Color_topShadow]; 1251 gcvalue.foreground = PixColors[Color_topShadow];
1298 topShadowGC = XCreateGC(display->display, TermWin.vt, 1252 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 GCForeground, &gcvalue);
1300 gcvalue.foreground = PixColors[Color_bottomShadow]; 1253 gcvalue.foreground = PixColors[Color_bottomShadow];
1301 botShadowGC = XCreateGC(display->display, TermWin.vt, 1254 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1255 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1304 : Color_scroll)];
1305 scrollbarGC = XCreateGC(display->display, TermWin.vt, 1256 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1306 GCForeground, &gcvalue);
1307#endif 1257#endif
1308} 1258}
1309 1259
1310/*----------------------------------------------------------------------*/ 1260/*----------------------------------------------------------------------*/
1311/* 1261/*
… …
1317rxvt_term::run_command (const char *const *argv) 1267rxvt_term::run_command (const char *const *argv)
1318{ 1268{
1319 int cfd, er; 1269 int cfd, er;
1320 1270
1321 /* get master (pty) */ 1271 /* get master (pty) */
1322 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1272 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1323 {
1324 rxvt_print_error("can't open pseudo-tty"); 1273 rxvt_fatal ("can't open pseudo-tty");
1325 return -1;
1326 }
1327 1274
1328 fcntl (cfd, F_SETFL, O_NONBLOCK); 1275 fcntl (cfd, F_SETFL, O_NONBLOCK);
1329 1276
1330 /* get slave (tty) */ 1277 /* get slave (tty) */
1331 if (tty_fd < 0) 1278 if (tty_fd < 0)
… …
1334 privileged_ttydev (SAVE); 1281 privileged_ttydev (SAVE);
1335#endif 1282#endif
1336 1283
1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1284 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1338 { 1285 {
1339 close(cfd); 1286 close (cfd);
1340 rxvt_print_error("can't open slave tty %s", ttydev); 1287 rxvt_fatal ("can't open slave tty %s", ttydev);
1341 return -1;
1342 } 1288 }
1343 } 1289 }
1344#ifndef NO_BACKSPACE_KEY 1290#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1291 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1292 er = key_backspace[0];
1347 else if (STRCMP(key_backspace, "DEC") == 0) 1293 else if (STRCMP (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */ 1294 er = '\177'; /* the initial state anyway */
1349 else 1295 else
1350#endif 1296#endif
1351 1297
1352 er = -1; 1298 er = -1;
1353 1299
1354 rxvt_get_ttymode (&(tio), er); 1300 rxvt_get_ttymode (& (tio), er);
1355 1301
1356#ifndef __QNX__ 1302#ifndef __QNX__
1357 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1358 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1359 { 1305 {
1360 case -1: 1306 case -1:
1361 rxvt_print_error("can't fork"); 1307 rxvt_fatal ("can't fork");
1362 return -1;
1363 case 0: 1308 case 0:
1364 close (cfd); /* only keep tty_fd and STDERR open */ 1309 close (cfd); /* only keep tty_fd and STDERR open */
1365 1310
1311 init_env ();
1312
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1313 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1314 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1315 else
1369 { 1316 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1317 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1318 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1319 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1321
1375 if (tty_fd > 2) 1322 if (tty_fd > 2)
1376 close (tty_fd); 1323 close (tty_fd);
1377 1324
1378 run_child (argv); 1325 run_child (argv);
1326 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1327 }
1328
1380 exit (EXIT_FAILURE); 1329 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1330
1382 default: 1331 default:
1383 { 1332 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1333#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1334 int fdstdin;
1386 1335
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1345
1397 dup2 (fdstdin, STDIN_FILENO); 1346 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1347 close (fdstdin);
1399#endif 1348#endif
1400
1401 } 1349 }
1350
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1351 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1352 break;
1404 } 1353 }
1405#else /* __QNX__ uses qnxspawn() */ 1354#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1355 fchmod (tty_fd, 0622);
1407 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1356 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1408 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1357 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1409 1358
1410 if (run_child (argv) == -1) 1359 if (run_child (argv) == -1)
… …
1424int 1373int
1425rxvt_term::run_child (const char *const *argv) 1374rxvt_term::run_child (const char *const *argv)
1426{ 1375{
1427 char *login; 1376 char *login;
1428 1377
1429 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1378 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1430 1379
1431 if (Options & Opt_console) 1380 if (Options & Opt_console)
1432 { /* be virtual console, fail silently */ 1381 { /* be virtual console, fail silently */
1433#ifdef TIOCCONS 1382#ifdef TIOCCONS
1434 unsigned int on = 1; 1383 unsigned int on = 1;
… …
1480 { 1429 {
1481# ifdef DEBUG_CMD 1430# ifdef DEBUG_CMD
1482 int i; 1431 int i;
1483 1432
1484 for (i = 0; argv[i]; i++) 1433 for (i = 0; argv[i]; i++)
1485 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1434 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1486# endif 1435# endif
1487 1436
1488 execvp(argv[0], (char *const *)argv); 1437 execvp (argv[0], (char *const *)argv);
1489 /* no error message: STDERR is closed! */ 1438 /* no error message: STDERR is closed! */
1490 } 1439 }
1491 else 1440 else
1492 { 1441 {
1493 const char *argv0, *shell; 1442 const char *argv0, *shell;
1494 1443
1495 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1444 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1496 shell = "/bin/sh"; 1445 shell = "/bin/sh";
1497 1446
1498 argv0 = (const char *)rxvt_r_basename(shell); 1447 argv0 = (const char *)rxvt_r_basename (shell);
1499 if (Options & Opt_loginShell) 1448 if (Options & Opt_loginShell)
1500 { 1449 {
1501 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1450 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1502 1451
1503 login[0] = '-'; 1452 login[0] = '-';
1504 STRCPY(&login[1], argv0); 1453 STRCPY (&login[1], argv0);
1505 argv0 = login; 1454 argv0 = login;
1506 } 1455 }
1507 execlp(shell, argv0, NULL); 1456 execlp (shell, argv0, NULL);
1508 /* no error message: STDERR is closed! */ 1457 /* no error message: STDERR is closed! */
1509 } 1458 }
1510 1459
1511#else /* __QNX__ uses qnxspawn() */ 1460#else /* __QNX__ uses qnxspawn () */
1512 1461
1513 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1462 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1514 char *command = NULL, fullcommand[_MAX_PATH]; 1463 char *command = NULL, fullcommand[_MAX_PATH];
1515 char **arg_v, *arg_a[2] = { NULL, NULL }; 1464 char **arg_v, *arg_a[2] = { NULL, NULL };
1516 1465
1517 if (argv != NULL) 1466 if (argv != NULL)
1518 { 1467 {
1519 if (access(argv[0], X_OK) == -1) 1468 if (access (argv[0], X_OK) == -1)
1520 { 1469 {
1521 if (STRCHR(argv[0], '/') == NULL) 1470 if (STRCHR (argv[0], '/') == NULL)
1522 { 1471 {
1523 searchenv(argv[0], "PATH", fullcommand); 1472 searchenv (argv[0], "PATH", fullcommand);
1524 if (fullcommand[0] != '\0') 1473 if (fullcommand[0] != '\0')
1525 command = fullcommand; 1474 command = fullcommand;
1526 } 1475 }
1527 if (access(command, X_OK) == -1) 1476 if (access (command, X_OK) == -1)
1528 return -1; 1477 return -1;
1529 } 1478 }
1530 else 1479 else
1531 command = argv[0]; 1480 command = argv[0];
1532 arg_v = argv; 1481 arg_v = argv;
1533 } 1482 }
1534 else 1483 else
1535 { 1484 {
1536 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1485 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1537 command = "/bin/sh"; 1486 command = "/bin/sh";
1538 1487
1539 arg_a[0] = my_basename(command); 1488 arg_a[0] = my_basename (command);
1540 if (Options & Opt_loginShell) 1489 if (Options & Opt_loginShell)
1541 { 1490 {
1542 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1491 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1543 1492
1544 login[0] = '-'; 1493 login[0] = '-';
1545 STRCPY(&login[1], arg_a[0]); 1494 STRCPY (&login[1], arg_a[0]);
1546 arg_a[0] = login; 1495 arg_a[0] = login;
1547 } 1496 }
1548 arg_v = arg_a; 1497 arg_v = arg_a;
1549 } 1498 }
1550 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1499 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1551 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1500 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1552 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1501 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1553 command, arg_v, environ, iov_a, 0); 1502 command, arg_v, environ, iov_a, 0);
1554 if (login) 1503 if (login)
1555 free(login); 1504 free (login);
1556 1505
1557 close(tty_fd); 1506 close (tty_fd);
1558 return cmd_fd; 1507 return cmd_fd;
1559 1508
1560#endif 1509#endif
1561 return -1; 1510 return -1;
1562} 1511}
1563 1512
1564/* ------------------------------------------------------------------------- * 1513/* ------------------------------------------------------------------------- *
1565 * GET TTY CURRENT STATE * 1514 * GET TTY CURRENT STATE *
1566 * ------------------------------------------------------------------------- */ 1515 * ------------------------------------------------------------------------- */
1567/* rxvt_get_ttymode() */ 1516/* rxvt_get_ttymode () */
1568/* EXTPROTO */ 1517/* EXTPROTO */
1569void 1518void
1570rxvt_get_ttymode(ttymode_t *tio, int erase) 1519rxvt_get_ttymode (ttymode_t *tio, int erase)
1571{ 1520{
1572#ifdef HAVE_TERMIOS_H 1521#ifdef HAVE_TERMIOS_H
1573 /* 1522 /*
1574 * standard System V termios interface 1523 * standard System V termios interface
1575 */ 1524 */
1576 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1525 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1577 { 1526 {
1578 /* return error - use system defaults */ 1527 /* return error - use system defaults */
1579 tio->c_cc[VINTR] = CINTR; 1528 tio->c_cc[VINTR] = CINTR;
1580 tio->c_cc[VQUIT] = CQUIT; 1529 tio->c_cc[VQUIT] = CQUIT;
1581 tio->c_cc[VERASE] = CERASE; 1530 tio->c_cc[VERASE] = CERASE;
… …
1655 /* 1604 /*
1656 * sgtty interface 1605 * sgtty interface
1657 */ 1606 */
1658 1607
1659 /* get parameters -- gtty */ 1608 /* get parameters -- gtty */
1660 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1609 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1661 { 1610 {
1662 tio->sg.sg_erase = CERASE; /* ^H */ 1611 tio->sg.sg_erase = CERASE; /* ^H */
1663 tio->sg.sg_kill = CKILL; /* ^U */ 1612 tio->sg.sg_kill = CKILL; /* ^U */
1664 } 1613 }
1665 if (erase != -1) 1614 if (erase != -1)
1666 tio->sg.sg_erase = (char)erase; 1615 tio->sg.sg_erase = (char)erase;
1667 1616
1668 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1617 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1669 1618
1670 /* get special characters */ 1619 /* get special characters */
1671 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1620 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1672 { 1621 {
1673 tio->tc.t_intrc = CINTR; /* ^C */ 1622 tio->tc.t_intrc = CINTR; /* ^C */
1674 tio->tc.t_quitc = CQUIT; /* ^\ */ 1623 tio->tc.t_quitc = CQUIT; /* ^\ */
1675 tio->tc.t_startc = CSTART; /* ^Q */ 1624 tio->tc.t_startc = CSTART; /* ^Q */
1676 tio->tc.t_stopc = CSTOP; /* ^S */ 1625 tio->tc.t_stopc = CSTOP; /* ^S */
1677 tio->tc.t_eofc = CEOF; /* ^D */ 1626 tio->tc.t_eofc = CEOF; /* ^D */
1678 tio->tc.t_brkc = -1; 1627 tio->tc.t_brkc = -1;
1679 } 1628 }
1680 /* get local special chars */ 1629 /* get local special chars */
1681 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1630 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1682 { 1631 {
1683 tio->lc.t_suspc = CSUSP; /* ^Z */ 1632 tio->lc.t_suspc = CSUSP; /* ^Z */
1684 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1633 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1685 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1634 tio->lc.t_rprntc = CRPRNT; /* ^R */
1686 tio->lc.t_flushc = CFLUSH; /* ^O */ 1635 tio->lc.t_flushc = CFLUSH; /* ^O */
1687 tio->lc.t_werasc = CWERASE; /* ^W */ 1636 tio->lc.t_werasc = CWERASE; /* ^W */
1688 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1637 tio->lc.t_lnextc = CLNEXT; /* ^V */
1689 } 1638 }
1690 /* get line discipline */ 1639 /* get line discipline */
1691 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1640 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1692# ifdef NTTYDISC 1641# ifdef NTTYDISC
1693 1642
1694 tio->line = NTTYDISC; 1643 tio->line = NTTYDISC;
1695# endif /* NTTYDISC */ 1644# endif /* NTTYDISC */
1696 1645
… …
1701 * Debugging 1650 * Debugging
1702 */ 1651 */
1703#ifdef DEBUG_TTYMODE 1652#ifdef DEBUG_TTYMODE
1704#ifdef HAVE_TERMIOS_H 1653#ifdef HAVE_TERMIOS_H
1705 /* c_iflag bits */ 1654 /* c_iflag bits */
1706 fprintf(stderr, "Input flags\n"); 1655 fprintf (stderr, "Input flags\n");
1707 1656
1708 /* cpp token stringize doesn't work on all machines <sigh> */ 1657 /* cpp token stringize doesn't work on all machines <sigh> */
1709# define FOO(flag,name) \ 1658# define FOO(flag,name) \
1710 if ((tio->c_iflag) & flag) \ 1659 if ((tio->c_iflag) & flag) \
1711 fprintf (stderr, "%s ", name) 1660 fprintf (stderr, "%s ", name)
1712 1661
1713 /* c_iflag bits */ 1662 /* c_iflag bits */
1714 FOO(IGNBRK, "IGNBRK"); 1663 FOO (IGNBRK, "IGNBRK");
1715 FOO(BRKINT, "BRKINT"); 1664 FOO (BRKINT, "BRKINT");
1716 FOO(IGNPAR, "IGNPAR"); 1665 FOO (IGNPAR, "IGNPAR");
1717 FOO(PARMRK, "PARMRK"); 1666 FOO (PARMRK, "PARMRK");
1718 FOO(INPCK, "INPCK"); 1667 FOO (INPCK, "INPCK");
1719 FOO(ISTRIP, "ISTRIP"); 1668 FOO (ISTRIP, "ISTRIP");
1720 FOO(INLCR, "INLCR"); 1669 FOO (INLCR, "INLCR");
1721 FOO(IGNCR, "IGNCR"); 1670 FOO (IGNCR, "IGNCR");
1722 FOO(ICRNL, "ICRNL"); 1671 FOO (ICRNL, "ICRNL");
1723 FOO(IXON, "IXON"); 1672 FOO (IXON, "IXON");
1724 FOO(IXOFF, "IXOFF"); 1673 FOO (IXOFF, "IXOFF");
1725# ifdef IUCLC 1674# ifdef IUCLC
1726 1675
1727 FOO(IUCLC, "IUCLC"); 1676 FOO (IUCLC, "IUCLC");
1728# endif 1677# endif
1729# ifdef IXANY 1678# ifdef IXANY
1730 1679
1731 FOO(IXANY, "IXANY"); 1680 FOO (IXANY, "IXANY");
1732# endif 1681# endif
1733# ifdef IMAXBEL 1682# ifdef IMAXBEL
1734 1683
1735 FOO(IMAXBEL, "IMAXBEL"); 1684 FOO (IMAXBEL, "IMAXBEL");
1736# endif 1685# endif
1737 1686
1738 fprintf(stderr, "\n"); 1687 fprintf (stderr, "\n");
1739 1688
1740# undef FOO 1689# undef FOO
1741# define FOO(entry, name) \ 1690# define FOO(entry, name) \
1742 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1691 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1743 1692
1744 FOO(VINTR, "VINTR"); 1693 FOO (VINTR, "VINTR");
1745 FOO(VQUIT, "VQUIT"); 1694 FOO (VQUIT, "VQUIT");
1746 FOO(VERASE, "VERASE"); 1695 FOO (VERASE, "VERASE");
1747 FOO(VKILL, "VKILL"); 1696 FOO (VKILL, "VKILL");
1748 FOO(VEOF, "VEOF"); 1697 FOO (VEOF, "VEOF");
1749 FOO(VEOL, "VEOL"); 1698 FOO (VEOL, "VEOL");
1750# ifdef VEOL2 1699# ifdef VEOL2
1751 1700
1752 FOO(VEOL2, "VEOL2"); 1701 FOO (VEOL2, "VEOL2");
1753# endif 1702# endif
1754# ifdef VSWTC 1703# ifdef VSWTC
1755 1704
1756 FOO(VSWTC, "VSWTC"); 1705 FOO (VSWTC, "VSWTC");
1757# endif 1706# endif
1758# ifdef VSWTCH 1707# ifdef VSWTCH
1759 1708
1760 FOO(VSWTCH, "VSWTCH"); 1709 FOO (VSWTCH, "VSWTCH");
1761# endif 1710# endif
1762 1711
1763 FOO(VSTART, "VSTART"); 1712 FOO (VSTART, "VSTART");
1764 FOO(VSTOP, "VSTOP"); 1713 FOO (VSTOP, "VSTOP");
1765 FOO(VSUSP, "VSUSP"); 1714 FOO (VSUSP, "VSUSP");
1766# ifdef VDSUSP 1715# ifdef VDSUSP
1767 1716
1768 FOO(VDSUSP, "VDSUSP"); 1717 FOO (VDSUSP, "VDSUSP");
1769# endif 1718# endif
1770# ifdef VREPRINT 1719# ifdef VREPRINT
1771 1720
1772 FOO(VREPRINT, "VREPRINT"); 1721 FOO (VREPRINT, "VREPRINT");
1773# endif 1722# endif
1774# ifdef VDISCRD 1723# ifdef VDISCRD
1775 1724
1776 FOO(VDISCRD, "VDISCRD"); 1725 FOO (VDISCRD, "VDISCRD");
1777# endif 1726# endif
1778# ifdef VWERSE 1727# ifdef VWERSE
1779 1728
1780 FOO(VWERSE, "VWERSE"); 1729 FOO (VWERSE, "VWERSE");
1781# endif 1730# endif
1782# ifdef VLNEXT 1731# ifdef VLNEXT
1783 1732
1784 FOO(VLNEXT, "VLNEXT"); 1733 FOO (VLNEXT, "VLNEXT");
1785# endif 1734# endif
1786 1735
1787 fprintf(stderr, "\n"); 1736 fprintf (stderr, "\n");
1788# undef FOO 1737# undef FOO
1789# endif /* HAVE_TERMIOS_H */ 1738# endif /* HAVE_TERMIOS_H */
1790#endif /* DEBUG_TTYMODE */ 1739#endif /* DEBUG_TTYMODE */
1791} 1740}
1792 1741

Diff Legend

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