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.51 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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
840 im_ev.start (display); 795 im_ev.start (display);
841 796
… …
845#endif 800#endif
846} 801}
847 802
848/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
849void 804void
850rxvt_term::init_command(const char *const *argv) 805rxvt_term::init_command (const char *const *argv)
851{ 806{
852 /* 807 /*
853 * Initialize the command connection. 808 * Initialize the command connection.
854 * This should be called after the X server connection is established. 809 * This should be called after the X server connection is established.
855 */ 810 */
856 int i; 811 int i;
857 812
858 for (i = 0; i < NUM_XA; i++) 813 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(display->display, xa_names[i], False); 814 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 815
861 /* Enable delete window protocol */ 816 /* Enable delete window protocol */
862 XSetWMProtocols (display->display, TermWin.parent[0], 817 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 818 & (xa[XA_WMDELETEWINDOW]), 1);
864 819
865#ifdef USING_W11LIB 820#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 821 /* enable W11 callbacks */
867 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 822 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 823#endif
… …
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 827#endif
873 828
874 get_ourmods (); 829 get_ourmods ();
875 830
876 if (!(Options & Opt_scrollTtyOutput)) 831 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 832 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 833 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 834 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 835 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 836 PrivateModes |= PrivMode_smoothScroll;
882 837
883#ifndef NO_BACKSPACE_KEY 838#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 839 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 840 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 841#endif
887 842
888 /* add value for scrollBar */ 843 /* add value for scrollBar */
889 if (scrollbar_visible ()) 844 if (scrollbar_visible ())
… …
894 if (menubar_visible ()) 849 if (menubar_visible ())
895 { 850 {
896 PrivateModes |= PrivMode_menuBar; 851 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 852 SavedModes |= PrivMode_menuBar;
898 } 853 }
899
900#ifdef GREEK_SUPPORT
901 greek_init();
902#endif
903 854
904#ifdef CURSOR_BLINK 855#ifdef CURSOR_BLINK
905 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
906 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
907#endif 858#endif
908 859
909 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
910 { 861 rxvt_fatal ("failure while running command, aborting");
911 rxvt_print_error ("aborting");
912 exit (EXIT_FAILURE);
913 }
914} 862}
915 863
916/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
917void 865void
918rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
943 switch (i) 891 switch (i)
944 { 892 {
945 case Color_fg: 893 case Color_fg:
946 case Color_bg: 894 case Color_bg:
947 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
948 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
949 exit (EXIT_FAILURE);
950 /* NOTREACHED */ 897 /* NOTREACHED */
951 break; 898 break;
952#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
953 case Color_cursor2: 900 case Color_cursor2:
954 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
955 break; 902 break;
956#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
957 case Color_pointer: 904 case Color_pointer_fg:
958 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
959 break; 906 break;
960 default: 907 default:
961 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
962 break; 909 break;
… …
966 913
967 PixColors[i] = xcol; 914 PixColors[i] = xcol;
968 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
969 } 916 }
970 917
971 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
972 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
973 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
974 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 }
975 924
976 /* 925 /*
977 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
978 * 927 *
979 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
995 * xcol[2] == bot shadow */ 944 * xcol[2] == bot shadow */
996 945
997 xcol[1] = PixColors[Color_scroll]; 946 xcol[1] = PixColors[Color_scroll];
998# ifdef PREFER_24BIT 947# ifdef PREFER_24BIT
999 xcol[0].set (display, 65535, 65535, 65535); 948 xcol[0].set (display, 65535, 65535, 65535);
1000 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ 949 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1001# else 950# else
1002 xcol[0].set (display, WhitePixel (display->display, display->screen)); 951 xcol[0].set (display, WhitePixel (display->display, display->screen));
1003# endif 952# endif
1004 953
1005 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 954 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
… …
1026} 975}
1027 976
1028/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1029/* color aliases, fg/bg bright-bold */ 978/* color aliases, fg/bg bright-bold */
1030void 979void
1031rxvt_term::color_aliases(int idx) 980rxvt_term::color_aliases (int idx)
1032{ 981{
1033 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 982 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1034 { 983 {
1035 int i = atoi (rs[Rs_color + idx]); 984 int i = atoi (rs[Rs_color + idx]);
1036 985
1037 if (i >= 8 && i <= 15) 986 if (i >= 8 && i <= 15)
1038 { /* bright colors */ 987 { /* bright colors */
… …
1068 }; 1017 };
1069 1018
1070 requestedmeta = realmeta = realalt = 0; 1019 requestedmeta = realmeta = realalt = 0;
1071 rsmod = rs[Rs_modifier]; 1020 rsmod = rs[Rs_modifier];
1072 if (rsmod 1021 if (rsmod
1073 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1022 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1074 requestedmeta = rsmod[3] - '0'; 1023 requestedmeta = rsmod[3] - '0';
1075 1024
1076 map = XGetModifierMapping(display->display); 1025 map = XGetModifierMapping (display->display);
1077 kc = map->modifiermap; 1026 kc = map->modifiermap;
1078 for (i = 1; i < 6; i++) 1027 for (i = 1; i < 6; i++)
1079 { 1028 {
1080 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1029 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1081 for (j = map->max_keypermod; j--; k++) 1030 for (j = map->max_keypermod; j--; k++)
1082 { 1031 {
1083 if (kc[k] == 0) 1032 if (kc[k] == 0)
1084 break; 1033 break;
1085 switch (XKeycodeToKeysym(display->display, kc[k], 0)) 1034 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1086 { 1035 {
1087 case XK_Num_Lock: 1036 case XK_Num_Lock:
1088 ModNumLockMask = modmasks[i - 1]; 1037 ModNumLockMask = modmasks[i - 1];
1089 /* FALLTHROUGH */ 1038 /* FALLTHROUGH */
1090 default: 1039 default:
1091 continue; /* for(;;) */ 1040 continue; /* for (;;) */
1092 case XK_Meta_L: 1041 case XK_Meta_L:
1093 case XK_Meta_R: 1042 case XK_Meta_R:
1094 cm = "meta"; 1043 cm = "meta";
1095 realmeta = i; 1044 realmeta = i;
1096 break; 1045 break;
… …
1106 case XK_Hyper_L: 1055 case XK_Hyper_L:
1107 case XK_Hyper_R: 1056 case XK_Hyper_R:
1108 cm = "hyper"; 1057 cm = "hyper";
1109 break; 1058 break;
1110 } 1059 }
1111 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1060 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1112 requestedmeta = i; 1061 requestedmeta = i;
1113 } 1062 }
1114 } 1063 }
1115 XFreeModifiermap(map); 1064 XFreeModifiermap (map);
1116 i = (requestedmeta ? requestedmeta 1065 i = (requestedmeta ? requestedmeta
1117 : (realmeta ? realmeta 1066 : (realmeta ? realmeta
1118 : (realalt ? realalt : 0))); 1067 : (realalt ? realalt : 0)));
1119 if (i) 1068 if (i)
1120 ModMetaMask = modmasks[i - 1]; 1069 ModMetaMask = modmasks[i - 1];
1121} 1070}
1122 1071
1123/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
1124/* rxvt_Create_Windows() - Open and map the window */ 1073/* rxvt_Create_Windows () - Open and map the window */
1125void 1074void
1126rxvt_term::create_windows (int argc, const char *const *argv) 1075rxvt_term::create_windows (int argc, const char *const *argv)
1127{ 1076{
1128 XClassHint classHint; 1077 XClassHint classHint;
1129 XWMHints wmHint; 1078 XWMHints wmHint;
1130 XGCValues gcvalue; 1079 XGCValues gcvalue;
1131 long vt_emask; 1080 long vt_emask;
1132 1081 XSetWindowAttributes attributes;
1133 XWindowAttributes gattr; 1082 XWindowAttributes gattr;
1134 1083
1135 if (Options & Opt_transparent) 1084 if (Options & Opt_transparent)
1136 { 1085 {
1137 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); 1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1138 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1087 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1139 } 1088 }
1140 1089
1141 /* grab colors before netscape does */ 1090 /* grab colors before netscape does */
1142 Get_Colours (); 1091 Get_Colours ();
1143 1092
1144 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
1145 window_calc (0, 0); 1100 window_calc (0, 0);
1146 old_width = szHint.width; 1101 old_width = szHint.width;
1147 old_height = szHint.height; 1102 old_height = szHint.height;
1148 1103
1149 /* parent window - reverse video so we can see placement errors
1150 * sub-window placement & size in rxvt_resize_subwindows() 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1151 */
1152 1105
1153#ifdef PREFER_24BIT 1106#ifdef PREFER_24BIT
1154 XSetWindowAttributes attributes;
1155
1156 attributes.background_pixel = PixColors[Color_fg]; 1107 attributes.background_pixel = PixColors[Color_bg];
1157 attributes.border_pixel = PixColors[Color_border]; 1108 attributes.border_pixel = PixColors[Color_border];
1158 attributes.colormap = display->cmap; 1109 attributes.colormap = display->cmap;
1159 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1160 szHint.x, szHint.y, 1111 szHint.x, szHint.y,
1161 szHint.width, szHint.height, 1112 szHint.width, szHint.height,
1162 TermWin.ext_bwidth, 1113 TermWin.ext_bwidth,
1163 display->depth, InputOutput, 1114 display->depth, InputOutput,
1164 display->visual, 1115 display->visual,
1165 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1116 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1166#else 1117#else
1167 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1168 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1169 szHint.width, 1120 szHint.width, szHint.height,
1170 szHint.height,
1171 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1172 PixColors[Color_border], 1122 PixColors[Color_border],
1173 PixColors[Color_fg]); 1123 PixColors[Color_bg]);
1174#endif 1124#endif
1175 1125
1176 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1177 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1178 1128
1179 classHint.res_name = (char *)rs[Rs_name]; 1129 classHint.res_name = (char *)rs[Rs_name];
1180 classHint.res_class = (char *)APL_CLASS; 1130 classHint.res_class = (char *)RESCLASS;
1181 1131
1182 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1132 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1183 wmHint.input = True; 1133 wmHint.input = True;
1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1185 : NormalState);
1186 wmHint.window_group = TermWin.parent[0]; 1135 wmHint.window_group = TermWin.parent[0];
1187 1136
1188 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, 1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1189 (char **)argv, argc, &szHint, &wmHint, &classHint); 1138 (char **)argv, argc, &szHint, &wmHint, &classHint);
1190 1139
1140#ifndef NO_FRILLS
1141 long pid = getpid ();
1142 XChangeProperty (display->display, TermWin.parent[0],
1143 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1144 PropModeReplace, (unsigned char *)&pid, 1);
1145#endif
1146
1191 XSelectInput(display->display, TermWin.parent[0], 1147 XSelectInput (display->display, TermWin.parent[0],
1192 KeyPressMask 1148 KeyPressMask
1193#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1194 | KeyReleaseMask 1150 | KeyReleaseMask
1195#endif 1151#endif
1196 | FocusChangeMask | VisibilityChangeMask 1152 | FocusChangeMask | VisibilityChangeMask
1197 | StructureNotifyMask); 1153 | StructureNotifyMask);
1198 termwin_ev.start (display, TermWin.parent[0]); 1154 termwin_ev.start (display, TermWin.parent[0]);
1199 1155
1200 /* vt cursor: Black-on-White is standard, but this is more popular */ 1156 /* vt cursor: Black-on-White is standard, but this is more popular */
1201 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); 1157 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1202 1158
1203#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1159#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1204 /* cursor (menuBar/scrollBar): Black-on-White */ 1160 /* cursor (menuBar/scrollBar): Black-on-White */
1205 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); 1161 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1206#endif 1162#endif
1207 1163
1208#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1209 { 1165 {
1210 XColor blackcolour; 1166 XColor blackcolour;
… …
1217 XUnloadFont (display->display, f); 1173 XUnloadFont (display->display, f);
1218 } 1174 }
1219#endif 1175#endif
1220 1176
1221 /* the vt window */ 1177 /* the vt window */
1222 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], 1178 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1223 window_vt_x, window_vt_y, 1179 window_vt_x, window_vt_y,
1224 TermWin_TotalWidth(), 1180 TermWin_TotalWidth (),
1225 TermWin_TotalHeight(), 1181 TermWin_TotalHeight (),
1226 0, 1182 0,
1227 PixColors[Color_fg], 1183 PixColors[Color_fg],
1228 PixColors[Color_bg]); 1184 PixColors[Color_bg]);
1229 1185
1230#ifdef DEBUG_X 1186#ifdef DEBUG_X
1231 XStoreName(display->display, TermWin.vt, "vt window"); 1187 XStoreName (display->display, TermWin.vt, "vt window");
1232#endif 1188#endif
1233 1189
1190 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192
1234 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1235 | PropertyChangeMask);
1236 1194
1237#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1238 pointer_unblank (); 1196 pointer_unblank ();
1239 1197
1240 if ((Options & Opt_pointerBlank)) 1198 if (Options & Opt_pointerBlank)
1241 vt_emask |= PointerMotionMask; 1199 vt_emask |= PointerMotionMask;
1242 else 1200 else
1243#endif 1201#endif
1244 vt_emask |= (Button1MotionMask | Button3MotionMask); 1202 vt_emask |= Button1MotionMask | Button3MotionMask;
1245 1203
1246 XSelectInput(display->display, TermWin.vt, vt_emask); 1204 XSelectInput (display->display, TermWin.vt, vt_emask);
1247 vt_ev.start (display, TermWin.vt); 1205 vt_ev.start (display, TermWin.vt);
1248 1206
1249#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1207#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1250 if (menuBar_height()) 1208 if (menuBar_height ())
1251 { 1209 {
1252 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], 1210 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, 0, 1211 window_vt_x, 0,
1254 TermWin_TotalWidth(), 1212 TermWin_TotalWidth (),
1255 menuBar_TotalHeight(), 1213 menuBar_TotalHeight (),
1256 0, 1214 0,
1257 PixColors[Color_fg], 1215 PixColors[Color_fg],
1258 PixColors[Color_scroll]); 1216 PixColors[Color_scroll]);
1217
1259#ifdef DEBUG_X 1218#ifdef DEBUG_X
1260 XStoreName(display->display, menuBar.win, "menubar"); 1219 XStoreName (display->display, menuBar.win, "menubar");
1261#endif 1220#endif
1262 1221
1222 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1223
1263 XDefineCursor(display->display, menuBar.win, pointer_leftptr); 1224 XDefineCursor (display->display, menuBar.win,
1225 XCreateFontCursor (display->display, XC_left_ptr));
1264 1226
1265 XSelectInput(display->display, menuBar.win, 1227 XSelectInput (display->display, menuBar.win,
1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1228 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1267 | Button1MotionMask)); 1229 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win); 1230 menubar_ev.start (display, menuBar.win);
1269 } 1231 }
1270#endif 1232#endif
1271 1233
1272#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1273 if (rs[Rs_backgroundPixmap] != NULL 1235 if (rs[Rs_backgroundPixmap] != NULL
1274 && !(Options & Opt_transparent)) 1236 && ! (Options & Opt_transparent))
1275 { 1237 {
1276 const char *p = rs[Rs_backgroundPixmap]; 1238 const char *p = rs[Rs_backgroundPixmap];
1277 1239
1278 if ((p = STRCHR(p, ';')) != NULL) 1240 if ((p = STRCHR (p, ';')) != NULL)
1279 { 1241 {
1280 p++; 1242 p++;
1281 scale_pixmap (p); 1243 scale_pixmap (p);
1282 } 1244 }
1283 set_bgPixmap (rs[Rs_backgroundPixmap]); 1245 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1287 1249
1288 /* graphics context for the vt window */ 1250 /* graphics context for the vt window */
1289 gcvalue.foreground = PixColors[Color_fg]; 1251 gcvalue.foreground = PixColors[Color_fg];
1290 gcvalue.background = PixColors[Color_bg]; 1252 gcvalue.background = PixColors[Color_bg];
1291 gcvalue.graphics_exposures = 1; 1253 gcvalue.graphics_exposures = 1;
1292 TermWin.gc = XCreateGC(display->display, TermWin.vt, 1254 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1293 GCForeground | GCBackground 1255 GCForeground | GCBackground | GCGraphicsExposures,
1294 | GCGraphicsExposures, &gcvalue); 1256 &gcvalue);
1257
1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1295 1259
1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1297 gcvalue.foreground = PixColors[Color_topShadow]; 1261 gcvalue.foreground = PixColors[Color_topShadow];
1298 topShadowGC = XCreateGC(display->display, TermWin.vt, 1262 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1299 GCForeground, &gcvalue);
1300 gcvalue.foreground = PixColors[Color_bottomShadow]; 1263 gcvalue.foreground = PixColors[Color_bottomShadow];
1301 botShadowGC = XCreateGC(display->display, TermWin.vt, 1264 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1265 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1304 : Color_scroll)];
1305 scrollbarGC = XCreateGC(display->display, TermWin.vt, 1266 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1306 GCForeground, &gcvalue);
1307#endif 1267#endif
1308} 1268}
1309 1269
1310/*----------------------------------------------------------------------*/ 1270/*----------------------------------------------------------------------*/
1311/* 1271/*
… …
1317rxvt_term::run_command (const char *const *argv) 1277rxvt_term::run_command (const char *const *argv)
1318{ 1278{
1319 int cfd, er; 1279 int cfd, er;
1320 1280
1321 /* get master (pty) */ 1281 /* get master (pty) */
1322 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1323 {
1324 rxvt_print_error("can't open pseudo-tty"); 1283 rxvt_fatal ("can't open pseudo-tty");
1325 return -1;
1326 }
1327 1284
1328 fcntl (cfd, F_SETFL, O_NONBLOCK); 1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1329 1286
1330 /* get slave (tty) */ 1287 /* get slave (tty) */
1331 if (tty_fd < 0) 1288 if (tty_fd < 0)
… …
1334 privileged_ttydev (SAVE); 1291 privileged_ttydev (SAVE);
1335#endif 1292#endif
1336 1293
1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1338 { 1295 {
1339 close(cfd); 1296 close (cfd);
1340 rxvt_print_error("can't open slave tty %s", ttydev); 1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1341 return -1;
1342 } 1298 }
1343 } 1299 }
1344#ifndef NO_BACKSPACE_KEY 1300#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1301 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1302 er = key_backspace[0];
1347 else if (STRCMP(key_backspace, "DEC") == 0) 1303 else if (STRCMP (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */ 1304 er = '\177'; /* the initial state anyway */
1349 else 1305 else
1350#endif 1306#endif
1351 1307
1352 er = -1; 1308 er = -1;
1353 1309
1354 rxvt_get_ttymode (&(tio), er); 1310 rxvt_get_ttymode (& (tio), er);
1355 1311
1356#ifndef __QNX__ 1312#ifndef __QNX__
1357 /* spin off the command interpreter */ 1313 /* spin off the command interpreter */
1358 switch (cmd_pid = fork ()) 1314 switch (cmd_pid = fork ())
1359 { 1315 {
1360 case -1: 1316 case -1:
1361 rxvt_print_error("can't fork"); 1317 rxvt_fatal ("can't fork");
1362 return -1;
1363 case 0: 1318 case 0:
1364 close (cfd); /* only keep tty_fd and STDERR open */ 1319 close (cfd); /* only keep tty_fd and STDERR open */
1365 1320
1321 init_env ();
1322
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1325 else
1369 { 1326 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1328 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1329 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1331
1375 if (tty_fd > 2) 1332 if (tty_fd > 2)
1376 close (tty_fd); 1333 close (tty_fd);
1377 1334
1378 run_child (argv); 1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1337 }
1338
1380 exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1340
1382 default: 1341 default:
1383 { 1342 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1344 int fdstdin;
1386 1345
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1355
1397 dup2 (fdstdin, STDIN_FILENO); 1356 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1357 close (fdstdin);
1399#endif 1358#endif
1400
1401 } 1359 }
1360
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1362 break;
1404 } 1363 }
1405#else /* __QNX__ uses qnxspawn() */ 1364#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1365 fchmod (tty_fd, 0622);
1407 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1366 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1408 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1367 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1409 1368
1410 if (run_child (argv) == -1) 1369 if (run_child (argv) == -1)
… …
1424int 1383int
1425rxvt_term::run_child (const char *const *argv) 1384rxvt_term::run_child (const char *const *argv)
1426{ 1385{
1427 char *login; 1386 char *login;
1428 1387
1429 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1388 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1430 1389
1431 if (Options & Opt_console) 1390 if (Options & Opt_console)
1432 { /* be virtual console, fail silently */ 1391 { /* be virtual console, fail silently */
1433#ifdef TIOCCONS 1392#ifdef TIOCCONS
1434 unsigned int on = 1; 1393 unsigned int on = 1;
… …
1480 { 1439 {
1481# ifdef DEBUG_CMD 1440# ifdef DEBUG_CMD
1482 int i; 1441 int i;
1483 1442
1484 for (i = 0; argv[i]; i++) 1443 for (i = 0; argv[i]; i++)
1485 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1444 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1486# endif 1445# endif
1487 1446
1488 execvp(argv[0], (char *const *)argv); 1447 execvp (argv[0], (char *const *)argv);
1489 /* no error message: STDERR is closed! */ 1448 /* no error message: STDERR is closed! */
1490 } 1449 }
1491 else 1450 else
1492 { 1451 {
1493 const char *argv0, *shell; 1452 const char *argv0, *shell;
1494 1453
1495 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1454 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1496 shell = "/bin/sh"; 1455 shell = "/bin/sh";
1497 1456
1498 argv0 = (const char *)rxvt_r_basename(shell); 1457 argv0 = (const char *)rxvt_r_basename (shell);
1499 if (Options & Opt_loginShell) 1458 if (Options & Opt_loginShell)
1500 { 1459 {
1501 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1460 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1502 1461
1503 login[0] = '-'; 1462 login[0] = '-';
1504 STRCPY(&login[1], argv0); 1463 STRCPY (&login[1], argv0);
1505 argv0 = login; 1464 argv0 = login;
1506 } 1465 }
1507 execlp(shell, argv0, NULL); 1466 execlp (shell, argv0, NULL);
1508 /* no error message: STDERR is closed! */ 1467 /* no error message: STDERR is closed! */
1509 } 1468 }
1510 1469
1511#else /* __QNX__ uses qnxspawn() */ 1470#else /* __QNX__ uses qnxspawn () */
1512 1471
1513 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1472 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1514 char *command = NULL, fullcommand[_MAX_PATH]; 1473 char *command = NULL, fullcommand[_MAX_PATH];
1515 char **arg_v, *arg_a[2] = { NULL, NULL }; 1474 char **arg_v, *arg_a[2] = { NULL, NULL };
1516 1475
1517 if (argv != NULL) 1476 if (argv != NULL)
1518 { 1477 {
1519 if (access(argv[0], X_OK) == -1) 1478 if (access (argv[0], X_OK) == -1)
1520 { 1479 {
1521 if (STRCHR(argv[0], '/') == NULL) 1480 if (STRCHR (argv[0], '/') == NULL)
1522 { 1481 {
1523 searchenv(argv[0], "PATH", fullcommand); 1482 searchenv (argv[0], "PATH", fullcommand);
1524 if (fullcommand[0] != '\0') 1483 if (fullcommand[0] != '\0')
1525 command = fullcommand; 1484 command = fullcommand;
1526 } 1485 }
1527 if (access(command, X_OK) == -1) 1486 if (access (command, X_OK) == -1)
1528 return -1; 1487 return -1;
1529 } 1488 }
1530 else 1489 else
1531 command = argv[0]; 1490 command = argv[0];
1532 arg_v = argv; 1491 arg_v = argv;
1533 } 1492 }
1534 else 1493 else
1535 { 1494 {
1536 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1495 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1537 command = "/bin/sh"; 1496 command = "/bin/sh";
1538 1497
1539 arg_a[0] = my_basename(command); 1498 arg_a[0] = my_basename (command);
1540 if (Options & Opt_loginShell) 1499 if (Options & Opt_loginShell)
1541 { 1500 {
1542 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1501 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1543 1502
1544 login[0] = '-'; 1503 login[0] = '-';
1545 STRCPY(&login[1], arg_a[0]); 1504 STRCPY (&login[1], arg_a[0]);
1546 arg_a[0] = login; 1505 arg_a[0] = login;
1547 } 1506 }
1548 arg_v = arg_a; 1507 arg_v = arg_a;
1549 } 1508 }
1550 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1509 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1551 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1510 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1552 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1511 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1553 command, arg_v, environ, iov_a, 0); 1512 command, arg_v, environ, iov_a, 0);
1554 if (login) 1513 if (login)
1555 free(login); 1514 free (login);
1556 1515
1557 close(tty_fd); 1516 close (tty_fd);
1558 return cmd_fd; 1517 return cmd_fd;
1559 1518
1560#endif 1519#endif
1561 return -1; 1520 return -1;
1562} 1521}
1563 1522
1564/* ------------------------------------------------------------------------- * 1523/* ------------------------------------------------------------------------- *
1565 * GET TTY CURRENT STATE * 1524 * GET TTY CURRENT STATE *
1566 * ------------------------------------------------------------------------- */ 1525 * ------------------------------------------------------------------------- */
1567/* rxvt_get_ttymode() */ 1526/* rxvt_get_ttymode () */
1568/* EXTPROTO */ 1527/* EXTPROTO */
1569void 1528void
1570rxvt_get_ttymode(ttymode_t *tio, int erase) 1529rxvt_get_ttymode (ttymode_t *tio, int erase)
1571{ 1530{
1572#ifdef HAVE_TERMIOS_H 1531#ifdef HAVE_TERMIOS_H
1573 /* 1532 /*
1574 * standard System V termios interface 1533 * standard System V termios interface
1575 */ 1534 */
1576 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1535 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1577 { 1536 {
1578 /* return error - use system defaults */ 1537 /* return error - use system defaults */
1579 tio->c_cc[VINTR] = CINTR; 1538 tio->c_cc[VINTR] = CINTR;
1580 tio->c_cc[VQUIT] = CQUIT; 1539 tio->c_cc[VQUIT] = CQUIT;
1581 tio->c_cc[VERASE] = CERASE; 1540 tio->c_cc[VERASE] = CERASE;
… …
1655 /* 1614 /*
1656 * sgtty interface 1615 * sgtty interface
1657 */ 1616 */
1658 1617
1659 /* get parameters -- gtty */ 1618 /* get parameters -- gtty */
1660 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1619 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1661 { 1620 {
1662 tio->sg.sg_erase = CERASE; /* ^H */ 1621 tio->sg.sg_erase = CERASE; /* ^H */
1663 tio->sg.sg_kill = CKILL; /* ^U */ 1622 tio->sg.sg_kill = CKILL; /* ^U */
1664 } 1623 }
1665 if (erase != -1) 1624 if (erase != -1)
1666 tio->sg.sg_erase = (char)erase; 1625 tio->sg.sg_erase = (char)erase;
1667 1626
1668 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1627 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1669 1628
1670 /* get special characters */ 1629 /* get special characters */
1671 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1630 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1672 { 1631 {
1673 tio->tc.t_intrc = CINTR; /* ^C */ 1632 tio->tc.t_intrc = CINTR; /* ^C */
1674 tio->tc.t_quitc = CQUIT; /* ^\ */ 1633 tio->tc.t_quitc = CQUIT; /* ^\ */
1675 tio->tc.t_startc = CSTART; /* ^Q */ 1634 tio->tc.t_startc = CSTART; /* ^Q */
1676 tio->tc.t_stopc = CSTOP; /* ^S */ 1635 tio->tc.t_stopc = CSTOP; /* ^S */
1677 tio->tc.t_eofc = CEOF; /* ^D */ 1636 tio->tc.t_eofc = CEOF; /* ^D */
1678 tio->tc.t_brkc = -1; 1637 tio->tc.t_brkc = -1;
1679 } 1638 }
1680 /* get local special chars */ 1639 /* get local special chars */
1681 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1640 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1682 { 1641 {
1683 tio->lc.t_suspc = CSUSP; /* ^Z */ 1642 tio->lc.t_suspc = CSUSP; /* ^Z */
1684 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1643 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1685 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1644 tio->lc.t_rprntc = CRPRNT; /* ^R */
1686 tio->lc.t_flushc = CFLUSH; /* ^O */ 1645 tio->lc.t_flushc = CFLUSH; /* ^O */
1687 tio->lc.t_werasc = CWERASE; /* ^W */ 1646 tio->lc.t_werasc = CWERASE; /* ^W */
1688 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1647 tio->lc.t_lnextc = CLNEXT; /* ^V */
1689 } 1648 }
1690 /* get line discipline */ 1649 /* get line discipline */
1691 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1650 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1692# ifdef NTTYDISC 1651# ifdef NTTYDISC
1693 1652
1694 tio->line = NTTYDISC; 1653 tio->line = NTTYDISC;
1695# endif /* NTTYDISC */ 1654# endif /* NTTYDISC */
1696 1655
… …
1701 * Debugging 1660 * Debugging
1702 */ 1661 */
1703#ifdef DEBUG_TTYMODE 1662#ifdef DEBUG_TTYMODE
1704#ifdef HAVE_TERMIOS_H 1663#ifdef HAVE_TERMIOS_H
1705 /* c_iflag bits */ 1664 /* c_iflag bits */
1706 fprintf(stderr, "Input flags\n"); 1665 fprintf (stderr, "Input flags\n");
1707 1666
1708 /* cpp token stringize doesn't work on all machines <sigh> */ 1667 /* cpp token stringize doesn't work on all machines <sigh> */
1709# define FOO(flag,name) \ 1668# define FOO(flag,name) \
1710 if ((tio->c_iflag) & flag) \ 1669 if ((tio->c_iflag) & flag) \
1711 fprintf (stderr, "%s ", name) 1670 fprintf (stderr, "%s ", name)
1712 1671
1713 /* c_iflag bits */ 1672 /* c_iflag bits */
1714 FOO(IGNBRK, "IGNBRK"); 1673 FOO (IGNBRK, "IGNBRK");
1715 FOO(BRKINT, "BRKINT"); 1674 FOO (BRKINT, "BRKINT");
1716 FOO(IGNPAR, "IGNPAR"); 1675 FOO (IGNPAR, "IGNPAR");
1717 FOO(PARMRK, "PARMRK"); 1676 FOO (PARMRK, "PARMRK");
1718 FOO(INPCK, "INPCK"); 1677 FOO (INPCK, "INPCK");
1719 FOO(ISTRIP, "ISTRIP"); 1678 FOO (ISTRIP, "ISTRIP");
1720 FOO(INLCR, "INLCR"); 1679 FOO (INLCR, "INLCR");
1721 FOO(IGNCR, "IGNCR"); 1680 FOO (IGNCR, "IGNCR");
1722 FOO(ICRNL, "ICRNL"); 1681 FOO (ICRNL, "ICRNL");
1723 FOO(IXON, "IXON"); 1682 FOO (IXON, "IXON");
1724 FOO(IXOFF, "IXOFF"); 1683 FOO (IXOFF, "IXOFF");
1725# ifdef IUCLC 1684# ifdef IUCLC
1726 1685
1727 FOO(IUCLC, "IUCLC"); 1686 FOO (IUCLC, "IUCLC");
1728# endif 1687# endif
1729# ifdef IXANY 1688# ifdef IXANY
1730 1689
1731 FOO(IXANY, "IXANY"); 1690 FOO (IXANY, "IXANY");
1732# endif 1691# endif
1733# ifdef IMAXBEL 1692# ifdef IMAXBEL
1734 1693
1735 FOO(IMAXBEL, "IMAXBEL"); 1694 FOO (IMAXBEL, "IMAXBEL");
1736# endif 1695# endif
1737 1696
1738 fprintf(stderr, "\n"); 1697 fprintf (stderr, "\n");
1739 1698
1740# undef FOO 1699# undef FOO
1741# define FOO(entry, name) \ 1700# define FOO(entry, name) \
1742 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1701 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1743 1702
1744 FOO(VINTR, "VINTR"); 1703 FOO (VINTR, "VINTR");
1745 FOO(VQUIT, "VQUIT"); 1704 FOO (VQUIT, "VQUIT");
1746 FOO(VERASE, "VERASE"); 1705 FOO (VERASE, "VERASE");
1747 FOO(VKILL, "VKILL"); 1706 FOO (VKILL, "VKILL");
1748 FOO(VEOF, "VEOF"); 1707 FOO (VEOF, "VEOF");
1749 FOO(VEOL, "VEOL"); 1708 FOO (VEOL, "VEOL");
1750# ifdef VEOL2 1709# ifdef VEOL2
1751 1710
1752 FOO(VEOL2, "VEOL2"); 1711 FOO (VEOL2, "VEOL2");
1753# endif 1712# endif
1754# ifdef VSWTC 1713# ifdef VSWTC
1755 1714
1756 FOO(VSWTC, "VSWTC"); 1715 FOO (VSWTC, "VSWTC");
1757# endif 1716# endif
1758# ifdef VSWTCH 1717# ifdef VSWTCH
1759 1718
1760 FOO(VSWTCH, "VSWTCH"); 1719 FOO (VSWTCH, "VSWTCH");
1761# endif 1720# endif
1762 1721
1763 FOO(VSTART, "VSTART"); 1722 FOO (VSTART, "VSTART");
1764 FOO(VSTOP, "VSTOP"); 1723 FOO (VSTOP, "VSTOP");
1765 FOO(VSUSP, "VSUSP"); 1724 FOO (VSUSP, "VSUSP");
1766# ifdef VDSUSP 1725# ifdef VDSUSP
1767 1726
1768 FOO(VDSUSP, "VDSUSP"); 1727 FOO (VDSUSP, "VDSUSP");
1769# endif 1728# endif
1770# ifdef VREPRINT 1729# ifdef VREPRINT
1771 1730
1772 FOO(VREPRINT, "VREPRINT"); 1731 FOO (VREPRINT, "VREPRINT");
1773# endif 1732# endif
1774# ifdef VDISCRD 1733# ifdef VDISCRD
1775 1734
1776 FOO(VDISCRD, "VDISCRD"); 1735 FOO (VDISCRD, "VDISCRD");
1777# endif 1736# endif
1778# ifdef VWERSE 1737# ifdef VWERSE
1779 1738
1780 FOO(VWERSE, "VWERSE"); 1739 FOO (VWERSE, "VWERSE");
1781# endif 1740# endif
1782# ifdef VLNEXT 1741# ifdef VLNEXT
1783 1742
1784 FOO(VLNEXT, "VLNEXT"); 1743 FOO (VLNEXT, "VLNEXT");
1785# endif 1744# endif
1786 1745
1787 fprintf(stderr, "\n"); 1746 fprintf (stderr, "\n");
1788# undef FOO 1747# undef FOO
1789# endif /* HAVE_TERMIOS_H */ 1748# endif /* HAVE_TERMIOS_H */
1790#endif /* DEBUG_TTYMODE */ 1749#endif /* DEBUG_TTYMODE */
1791} 1750}
1792 1751

Diff Legend

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