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

Diff Legend

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