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

Diff Legend

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