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

Diff Legend

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