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

Diff Legend

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