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.22 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.38 by pcg, Wed Mar 3 04:07:52 2004 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
326#endif 327#endif
327#ifdef KEEP_SCROLLCOLOR 328#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 329 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 330 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332
331 }; 333 };
332 334
333const char *const xa_names[NUM_XA] = 335const char *const xa_names[NUM_XA] =
334 { 336 {
335 "TEXT", 337 "TEXT",
… …
371 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 376 want_refresh = 1;
375 cmd_pid = -1; 377 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 380 TermWin.focus = 0;
379 TermWin.ncol = 80; 381 TermWin.ncol = 80;
380 TermWin.nrow = 24; 382 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
397#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
398 ks_bigfont = XK_greater; 400 ks_bigfont = XK_greater;
399 ks_smallfont = XK_less; 401 ks_smallfont = XK_less;
400#endif 402#endif
401 403
402#ifdef GREEK_SUPPORT
403 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
404#endif
405
406 refresh_limit = 1; 404 refresh_limit = 1;
407 refresh_type = SLOW_REFRESH; 405 refresh_type = SLOW_REFRESH;
408 prev_nrow = prev_ncol = 0; 406 prev_nrow = prev_ncol = 0;
409#ifdef MULTICHAR_SET
410# ifdef MULTICHAR_ENCODING
411 encoding_method = MULTICHAR_ENCODING;
412# endif
413 multichar_decode = rxvt_euc2jis;
414#endif
415 407
416 oldcursor.row = oldcursor.col = -1; 408 oldcursor.row = oldcursor.col = -1;
417#ifdef XPM_BACKGROUND 409#ifdef XPM_BACKGROUND
418 /* bgPixmap.w = bgPixmap.h = 0; */ 410 /* bgPixmap.w = bgPixmap.h = 0; */
419 bgPixmap.x = bgPixmap.y = 50; 411 bgPixmap.x = bgPixmap.y = 50;
… …
422 414
423 last_bot = last_state = -1; 415 last_bot = last_state = -1;
424 416
425#ifdef MENUBAR 417#ifdef MENUBAR
426 menu_readonly = 1; 418 menu_readonly = 1;
427# if !(MENUBAR_MAX > 1) 419# if ! (MENUBAR_MAX > 1)
428 CurrentBar = &(BarList); 420 CurrentBar = & (BarList);
429# endif /* (MENUBAR_MAX > 1) */ 421# endif /* (MENUBAR_MAX > 1) */
430#endif 422#endif
431 423
432 return true; 424 return true;
433} 425}
… …
444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 436 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
445 ttygid = gr->gr_gid; 437 ttygid = gr->gr_gid;
446 } 438 }
447 else 439 else
448#endif /* TTY_GID_SUPPORT */ 440#endif /* TTY_GID_SUPPORT */
441
449 { 442 {
450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 443 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
451 ttygid = getgid (); 444 ttygid = getgid ();
452 } 445 }
453 446
… …
473 { 466 {
474#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 467#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
475 if (i == 4 || i == 7) 468 if (i == 4 || i == 7)
476 continue; 469 continue;
477#endif 470#endif
478 close(i); 471 close (i);
479 } 472 }
480#endif 473#endif
481} 474}
482 475
483/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
… …
490 483
491 /* 484 /*
492 * Look for -exec option. Find => split and make cmd_argv[] of command args 485 * Look for -exec option. Find => split and make cmd_argv[] of command args
493 */ 486 */
494 for (r_argc = 0; r_argc < argc; r_argc++) 487 for (r_argc = 0; r_argc < argc; r_argc++)
495 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 488 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
496 break; 489 break;
497 490
498 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 491 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
499 492
500 for (i = 0; i < r_argc; i++) 493 for (i = 0; i < r_argc; i++)
501 r_argv[i] = (const char *)argv[i]; 494 r_argv[i] = (const char *)argv[i];
502 495
503 r_argv[i] = NULL; 496 r_argv[i] = NULL;
504 497
505 if (r_argc == argc) 498 if (r_argc == argc)
506 cmd_argv = NULL; 499 cmd_argv = NULL;
507 else 500 else
508 { 501 {
509 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 502 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
510 503
511 for (i = 0; i < argc - r_argc - 1; i++) 504 for (i = 0; i < argc - r_argc - 1; i++)
512 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 505 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
513 506
514 cmd_argv[i] = NULL; 507 cmd_argv[i] = NULL;
… …
516 509
517 /* clear all resources */ 510 /* clear all resources */
518 for (i = 0; i < NUM_RESOURCES;) 511 for (i = 0; i < NUM_RESOURCES;)
519 rs[i++] = NULL; 512 rs[i++] = NULL;
520 513
521 rs[Rs_name] = rxvt_r_basename(argv[0]); 514 rs[Rs_name] = rxvt_r_basename (argv[0]);
522 515
523 /* 516 /*
524 * Open display, get options/resources and create the window 517 * Open display, get options/resources and create the window
525 */ 518 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 519 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
533 if (rs[Rs_display_name][0] == ':') 526 if (rs[Rs_display_name][0] == ':')
534 { 527 {
535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 528 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
536 STRCPY (val, "unix"); 529 STRCPY (val, "unix");
537 STRCAT (val, rs[Rs_display_name]); 530 STRCAT (val, rs[Rs_display_name]);
538 Xdisplay = XOpenDisplay (val); 531 display = displays.get (val);
539 free (val); 532 free (val);
540 } 533 }
541#endif 534#endif
542 535
543 if (Xdisplay == NULL 536 if (!display
544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 537 && ! (display = displays.get (rs[Rs_display_name])))
545 { 538 {
546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
547 exit (EXIT_FAILURE); 540 exit (EXIT_FAILURE);
548 } 541 }
549 542
550 extract_resources (Xdisplay, rs[Rs_name]); 543 extract_resources (display->display, rs[Rs_name]);
551 544
552 /* 545 /*
553 * set any defaults not already set 546 * set any defaults not already set
554 */ 547 */
555 if (cmd_argv && cmd_argv[0]) 548 if (cmd_argv && cmd_argv[0])
556 { 549 {
557 if (!rs[Rs_title]) 550 if (!rs[Rs_title])
558 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 551 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
559 if (!rs[Rs_iconName]) 552 if (!rs[Rs_iconName])
560 rs[Rs_iconName] = rs[Rs_title]; 553 rs[Rs_iconName] = rs[Rs_title];
561 } 554 }
562 else 555 else
563 { 556 {
… …
565 rs[Rs_title] = rs[Rs_name]; 558 rs[Rs_title] = rs[Rs_name];
566 if (!rs[Rs_iconName]) 559 if (!rs[Rs_iconName])
567 rs[Rs_iconName] = rs[Rs_name]; 560 rs[Rs_iconName] = rs[Rs_name];
568 } 561 }
569 562
570 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 563 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
571 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 564 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
572 565
573#ifndef NO_FRILLS 566#ifndef NO_FRILLS
574 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 567 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
575 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 568 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
576 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 569 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
577 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 570 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
578#endif 571#endif
579 572
580#ifndef NO_LINESPACE 573#ifndef NO_LINESPACE
581 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 574 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
582 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 575 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
583#endif 576#endif
584 577
585#ifdef POINTER_BLANK 578#ifdef POINTER_BLANK
586 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 579 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
587 pointerBlankDelay = i; 580 pointerBlankDelay = i;
588 else 581 else
589 pointerBlankDelay = 2; 582 pointerBlankDelay = 2;
590#endif 583#endif
591 584
… …
602 rs[Rs_cutchars] = CUTCHARS; 595 rs[Rs_cutchars] = CUTCHARS;
603 596
604#ifdef ACS_ASCII 597#ifdef ACS_ASCII
605 if (!rs[Rs_acs_chars]) 598 if (!rs[Rs_acs_chars])
606 rs[Rs_acs_chars] = ACS_CHARS; 599 rs[Rs_acs_chars] = ACS_CHARS;
607 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
608 { 601 {
609 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
610 for (; i < 0x20; ) 603 for (; i < 0x20; )
611 val[i] = ' '; 604 val[i] = ' ';
612 rs[Rs_acs_chars] = val; 605 rs[Rs_acs_chars] = val;
613 } 606 }
614#endif 607#endif
… …
620# else 613# else
621 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 614 key_backspace = "DEC"; /* can toggle between \010 or \177 */
622# endif 615# endif
623 else 616 else
624 { 617 {
625 val = STRDUP(rs[Rs_backspace_key]); 618 val = STRDUP (rs[Rs_backspace_key]);
626 rxvt_Str_trim(val); 619 rxvt_Str_trim (val);
627 rxvt_Str_escaped(val); 620 rxvt_Str_escaped (val);
628 key_backspace = val; 621 key_backspace = val;
629 } 622 }
630#endif 623#endif
631 624
632#ifndef NO_DELETE_KEY 625#ifndef NO_DELETE_KEY
… …
636# else 629# else
637 key_delete = "\033[3~"; 630 key_delete = "\033[3~";
638# endif 631# endif
639 else 632 else
640 { 633 {
641 val = STRDUP(rs[Rs_delete_key]); 634 val = STRDUP (rs[Rs_delete_key]);
642 rxvt_Str_trim(val); 635 rxvt_Str_trim (val);
643 rxvt_Str_escaped(val); 636 rxvt_Str_escaped (val);
644 key_delete = val; 637 key_delete = val;
645 } 638 }
646#endif 639#endif
647 if (rs[Rs_answerbackstring]) 640 if (rs[Rs_answerbackstring])
648 { 641 {
649 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
650 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
651 } 644 }
652 645
653 if (rs[Rs_selectstyle]) 646 if (rs[Rs_selectstyle])
654 { 647 {
655 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
656 selection_style = OLD_WORD_SELECT; 649 selection_style = OLD_WORD_SELECT;
657#ifndef NO_OLD_SELECTION 650#ifndef NO_OLD_SELECTION
658 651
659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
660 selection_style = OLD_SELECT; 653 selection_style = OLD_SELECT;
661#endif 654#endif
655
662 } 656 }
663 657
664#ifdef HAVE_SCROLLBARS 658#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 660 rs[Rs_scrollBar_thickness]);
667#endif 661#endif
668
669 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width;
672 TermWin.fheight = TermWin.fontset->base_font ()->height;
673 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
674 662
675#ifdef XTERM_REVERSE_VIDEO 663#ifdef XTERM_REVERSE_VIDEO
676 /* this is how xterm implements reverseVideo */ 664 /* this is how xterm implements reverseVideo */
677 if (Options & Opt_reverseVideo) 665 if (Options & Opt_reverseVideo)
678 { 666 {
… …
688 rs[Rs_color + i] = def_colorName[i]; 676 rs[Rs_color + i] = def_colorName[i];
689 677
690#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
691 /* this is how we implement reverseVideo */ 679 /* this is how we implement reverseVideo */
692 if (Options & Opt_reverseVideo) 680 if (Options & Opt_reverseVideo)
693 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 681 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
694#endif 682#endif
695 683
696 /* convenient aliases for setting fg/bg to colors */ 684 /* convenient aliases for setting fg/bg to colors */
697 color_aliases (Color_fg); 685 color_aliases (Color_fg);
698 color_aliases (Color_bg); 686 color_aliases (Color_bg);
… …
721 709
722#ifdef DISPLAY_IS_IP 710#ifdef DISPLAY_IS_IP
723 /* Fixup display_name for export over pty to any interested terminal 711 /* Fixup display_name for export over pty to any interested terminal
724 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 712 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
725 * (for the first non-loopback interface) that we get from 713 * (for the first non-loopback interface) that we get from
726 * rxvt_network_display(). This is more "name-resolution-portable", if you 714 * rxvt_network_display (). This is more "name-resolution-portable", if you
727 * will, and probably allows for faster x-client startup if your name 715 * will, and probably allows for faster x-client startup if your name
728 * server is beyond a slow link or overloaded at client startup. Of 716 * server is beyond a slow link or overloaded at client startup. Of
729 * course that only helps the shell's child processes, not us. 717 * course that only helps the shell's child processes, not us.
730 * 718 *
731 * Giving out the display_name also affords a potential security hole 719 * Giving out the display_name also affords a potential security hole
… …
733 val = rxvt_network_display (rs[Rs_display_name]); 721 val = rxvt_network_display (rs[Rs_display_name]);
734 rs[Rs_display_name] = (const char *)val; 722 rs[Rs_display_name] = (const char *)val;
735 723
736 if (val == NULL) 724 if (val == NULL)
737#endif /* DISPLAY_IS_IP */ 725#endif /* DISPLAY_IS_IP */
738 val = XDisplayString(Xdisplay); 726 val = XDisplayString (display->display);
739 727
740 if (rs[Rs_display_name] == NULL) 728 if (rs[Rs_display_name] == NULL)
741 rs[Rs_display_name] = val; /* use broken `:0' value */ 729 rs[Rs_display_name] = val; /* use broken `:0' value */
742 730
743 i = STRLEN (val); 731 i = STRLEN (val);
744 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 732 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
745 733
746 sprintf (env_display, "DISPLAY=%s", val); 734 sprintf (env_display, "DISPLAY=%s", val);
747 735
748 /* avoiding the math library: 736 /* avoiding the math library:
749 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 737 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
750 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 738 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
751 ; 739 ;
752 MAX_IT(i, 1); 740 MAX_IT (i, 1);
753 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 741 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
754 742
755 sprintf (env_windowid, "WINDOWID=%u", 743 sprintf (env_windowid, "WINDOWID=%u",
756 (unsigned int)TermWin.parent[0]); 744 (unsigned int)TermWin.parent[0]);
757 745
758 /* add entries to the environment: 746 /* add entries to the environment:
759 * @ DISPLAY: in case we started with -display 747 * @ DISPLAY: in case we started with -display
760 * @ WINDOWID: X window id number of the window 748 * @ WINDOWID: X window id number of the window
761 * @ COLORTERM: terminal sub-name and also indicates its color 749 * @ COLORTERM: terminal sub-name and also indicates its color
762 * @ TERM: terminal name 750 * @ TERM: terminal name
763 * @ TERMINFO: path to terminfo directory 751 * @ TERMINFO: path to terminfo directory
752 * @ COLORFGBG: fg;bg color codes
764 */ 753 */
765 putenv (env_display); 754 putenv (env_display);
766 putenv (env_windowid); 755 putenv (env_windowid);
756 if (env_colorfgbg)
757 putenv (env_colorfgbg);
767 758
768#ifdef RXVT_TERMINFO 759#ifdef RXVT_TERMINFO
769 putenv ("TERMINFO=" RXVT_TERMINFO); 760 putenv ("TERMINFO=" RXVT_TERMINFO);
770#endif 761#endif
771 762
772 if (Xdepth <= 2) 763 if (display->depth <= 2)
773 putenv ("COLORTERM=" COLORTERMENV "-mono"); 764 putenv ("COLORTERM=" COLORTERMENV "-mono");
774 else 765 else
775 putenv ("COLORTERM=" COLORTERMENVFULL); 766 putenv ("COLORTERM=" COLORTERMENVFULL);
776 767
777 if (rs[Rs_term_name] != NULL) 768 if (rs[Rs_term_name] != NULL)
778 { 769 {
779 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 770 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
780 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 771 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
781 putenv (env_term); 772 putenv (env_term);
782 } 773 }
783 else 774 else
784 putenv ("TERM=" TERMENV); 775 putenv ("TERM=" TERMENV);
… …
799void 790void
800rxvt_term::set_locale (const char *locale) 791rxvt_term::set_locale (const char *locale)
801{ 792{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 793#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 794 free (this->locale);
804 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
796 SET_LOCALE (this->locale);
797 mbstate.reset ();
805#endif 798#endif
806#if HAVE_NL_LANGINFO 799#if HAVE_NL_LANGINFO
807 free (codeset); 800 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 801 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 802 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 803 || !STRCASECMP (codeset, "UTF8");
811#else 804#else
812 enc_utf8 = 1; 805 enc_utf8 = 1;
813#endif 806#endif
814} 807}
815 808
… …
821 rxvt_print_error ("Setting locale failed."); 814 rxvt_print_error ("Setting locale failed.");
822 else 815 else
823 { 816 {
824 Atom wmlocale; 817 Atom wmlocale;
825 818
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 820 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 821 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 822 (unsigned char *)locale, STRLEN (locale));
830 823
831 if (!XSupportsLocale ()) 824 if (!XSupportsLocale ())
832 { 825 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 826 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 827 return;
835 } 828 }
836 829
830 im_ev.start (display);
831
837 /* see if we can connect yet */ 832 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 833 im_cb ();
839
840 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL);
844 } 834 }
845#endif 835#endif
846} 836}
847 837
848/*----------------------------------------------------------------------*/ 838/*----------------------------------------------------------------------*/
849void 839void
850rxvt_term::init_command(const char *const *argv) 840rxvt_term::init_command (const char *const *argv)
851{ 841{
852 /* 842 /*
853 * Initialize the command connection. 843 * Initialize the command connection.
854 * This should be called after the X server connection is established. 844 * This should be called after the X server connection is established.
855 */ 845 */
856 int i; 846 int i;
857 847
858 for (i = 0; i < NUM_XA; i++) 848 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 849 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 850
861 /* Enable delete window protocol */ 851 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 852 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 853 & (xa[XA_WMDELETEWINDOW]), 1);
864 854
865#ifdef USING_W11LIB 855#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 856 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 857 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 858#endif
869 859
870#ifdef META8_OPTION 860#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 861 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 862#endif
873 863
874 get_ourmods (); 864 get_ourmods ();
875 865
876 if (!(Options & Opt_scrollTtyOutput)) 866 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 867 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 868 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 869 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 870 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 871 PrivateModes |= PrivMode_smoothScroll;
882 872
883#ifndef NO_BACKSPACE_KEY 873#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 874 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 875 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 876#endif
887 877
888 /* add value for scrollBar */ 878 /* add value for scrollBar */
889 if (scrollbar_visible ()) 879 if (scrollbar_visible ())
… …
895 { 885 {
896 PrivateModes |= PrivMode_menuBar; 886 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 887 SavedModes |= PrivMode_menuBar;
898 } 888 }
899 889
900#ifdef GREEK_SUPPORT
901 greek_init();
902#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905
906#ifdef CURSOR_BLINK 890#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 891 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 892 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 893#endif
911 894
912 if ((cmd_fd = run_command (argv)) < 0) 895 if ((cmd_fd = run_command (argv)) < 0)
… …
931 914
932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 915 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 916 {
934#ifndef XTERM_REVERSE_VIDEO 917#ifndef XTERM_REVERSE_VIDEO
935 if (i < 2 && (Options & Opt_reverseVideo)) 918 if (i < 2 && (Options & Opt_reverseVideo))
936 {
937 rs[Rs_color + i] = def_colorName[!i]; 919 rs[Rs_color + i] = def_colorName[!i];
938 }
939 else 920 else
940#endif 921#endif
941 rs[Rs_color + i] = def_colorName[i]; 922 rs[Rs_color + i] = def_colorName[i];
942 923
943 if (!rs[Rs_color + i]) 924 if (!rs[Rs_color + i])
… …
945 926
946 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 927 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
947 { 928 {
948 switch (i) 929 switch (i)
949 { 930 {
950 case Color_fg: 931 case Color_fg:
951 case Color_bg: 932 case Color_bg:
952 /* fatal: need bg/fg color */ 933 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 934 rxvt_print_error ("aborting");
954 exit (EXIT_FAILURE); 935 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 936 /* NOTREACHED */
956 break; 937 break;
957#ifndef NO_CURSORCOLOR 938#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 939 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 940 xcol = PixColors[Color_fg];
960 break; 941 break;
961#endif /* ! NO_CURSORCOLOR */ 942#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 943 case Color_pointer:
963 xcol = PixColors[Color_fg]; 944 xcol = PixColors[Color_fg];
964 break; 945 break;
965 default: 946 default:
966 xcol = PixColors[Color_bg]; /* None */ 947 xcol = PixColors[Color_bg]; /* None */
967 break; 948 break;
968 } 949 }
969 } 950 }
970 } 951 }
971 952
972 PixColors[i] = xcol; 953 PixColors[i] = xcol;
… …
999 * xcol[1] == top shadow 980 * xcol[1] == top shadow
1000 * xcol[2] == bot shadow */ 981 * xcol[2] == bot shadow */
1001 982
1002 xcol[1] = PixColors[Color_scroll]; 983 xcol[1] = PixColors[Color_scroll];
1003# ifdef PREFER_24BIT 984# ifdef PREFER_24BIT
1004 xcol[0].set (this, 65535, 65535, 65535); 985 xcol[0].set (display, 65535, 65535, 65535);
1005 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 986 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1006# else 987# else
1007 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); 988 xcol[0].set (display, WhitePixel (display->display, display->screen));
1008# endif 989# endif
1009 990
1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 991 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1011 992
1012 xcol[0].get (this, pr0, pg0, pb0); 993 xcol[0].get (display, pr0, pg0, pb0);
1013 xcol[1].get (this, pr1, pg1, pb1); 994 xcol[1].get (display, pr1, pg1, pb1);
1014 995
1015 /* bottomShadowColor */ 996 /* bottomShadowColor */
1016 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) 997 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1017 xcol[2] = PixColors[Color_Black]; 998 xcol[2] = PixColors[Color_Black];
1018 999
1019 PixColors[Color_bottomShadow] = xcol[2]; 1000 PixColors[Color_bottomShadow] = xcol[2];
1020 1001
1021 /* topShadowColor */ 1002 /* topShadowColor */
1022 if (!xcol[1].set (this, 1003 if (!xcol[1].set (display,
1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1004 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1005 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1006 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1026 xcol[1] = PixColors[Color_White]; 1007 xcol[1] = PixColors[Color_White];
1027 1008
… …
1031} 1012}
1032 1013
1033/*----------------------------------------------------------------------*/ 1014/*----------------------------------------------------------------------*/
1034/* color aliases, fg/bg bright-bold */ 1015/* color aliases, fg/bg bright-bold */
1035void 1016void
1036rxvt_term::color_aliases(int idx) 1017rxvt_term::color_aliases (int idx)
1037{ 1018{
1038 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1019 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1039 { 1020 {
1040 int i = atoi (rs[Rs_color + idx]); 1021 int i = atoi (rs[Rs_color + idx]);
1041 1022
1042 if (i >= 8 && i <= 15) 1023 if (i >= 8 && i <= 15)
1043 { /* bright colors */ 1024 { /* bright colors */
1044 i -= 8; 1025 i -= 8;
1045#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1027 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1047 return; 1028 return;
1048#endif 1029#endif
1030
1049 } 1031 }
1050 1032
1051 if (i >= 0 && i <= 7) /* normal colors */ 1033 if (i >= 0 && i <= 7) /* normal colors */
1052 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1034 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1053 } 1035 }
… …
1072 }; 1054 };
1073 1055
1074 requestedmeta = realmeta = realalt = 0; 1056 requestedmeta = realmeta = realalt = 0;
1075 rsmod = rs[Rs_modifier]; 1057 rsmod = rs[Rs_modifier];
1076 if (rsmod 1058 if (rsmod
1077 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1059 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1078 requestedmeta = rsmod[3] - '0'; 1060 requestedmeta = rsmod[3] - '0';
1079 1061
1080 map = XGetModifierMapping(Xdisplay); 1062 map = XGetModifierMapping (display->display);
1081 kc = map->modifiermap; 1063 kc = map->modifiermap;
1082 for (i = 1; i < 6; i++) 1064 for (i = 1; i < 6; i++)
1083 { 1065 {
1084 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1066 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1085 for (j = map->max_keypermod; j--; k++) 1067 for (j = map->max_keypermod; j--; k++)
1086 { 1068 {
1087 if (kc[k] == 0) 1069 if (kc[k] == 0)
1088 break; 1070 break;
1089 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 1071 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1090 { 1072 {
1091 case XK_Num_Lock: 1073 case XK_Num_Lock:
1092 ModNumLockMask = modmasks[i - 1]; 1074 ModNumLockMask = modmasks[i - 1];
1093 /* FALLTHROUGH */ 1075 /* FALLTHROUGH */
1094 default: 1076 default:
1095 continue; /* for(;;) */ 1077 continue; /* for (;;) */
1096 case XK_Meta_L: 1078 case XK_Meta_L:
1097 case XK_Meta_R: 1079 case XK_Meta_R:
1098 cm = "meta"; 1080 cm = "meta";
1099 realmeta = i; 1081 realmeta = i;
1100 break; 1082 break;
1101 case XK_Alt_L: 1083 case XK_Alt_L:
1102 case XK_Alt_R: 1084 case XK_Alt_R:
1103 cm = "alt"; 1085 cm = "alt";
1104 realalt = i; 1086 realalt = i;
1105 break; 1087 break;
1106 case XK_Super_L: 1088 case XK_Super_L:
1107 case XK_Super_R: 1089 case XK_Super_R:
1108 cm = "super"; 1090 cm = "super";
1109 break; 1091 break;
1110 case XK_Hyper_L: 1092 case XK_Hyper_L:
1111 case XK_Hyper_R: 1093 case XK_Hyper_R:
1112 cm = "hyper"; 1094 cm = "hyper";
1113 break; 1095 break;
1114 } 1096 }
1115 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1097 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1116 requestedmeta = i; 1098 requestedmeta = i;
1117 } 1099 }
1118 } 1100 }
1119 XFreeModifiermap(map); 1101 XFreeModifiermap (map);
1120 i = (requestedmeta ? requestedmeta 1102 i = (requestedmeta ? requestedmeta
1121 : (realmeta ? realmeta 1103 : (realmeta ? realmeta
1122 : (realalt ? realalt : 0))); 1104 : (realalt ? realalt : 0)));
1123 if (i) 1105 if (i)
1124 ModMetaMask = modmasks[i - 1]; 1106 ModMetaMask = modmasks[i - 1];
1125} 1107}
1126 1108
1127/*----------------------------------------------------------------------*/ 1109/*----------------------------------------------------------------------*/
1128/* rxvt_Create_Windows() - Open and map the window */ 1110/* rxvt_Create_Windows () - Open and map the window */
1129void 1111void
1130rxvt_term::create_windows (int argc, const char *const *argv) 1112rxvt_term::create_windows (int argc, const char *const *argv)
1131{ 1113{
1132 XClassHint classHint; 1114 XClassHint classHint;
1133 XWMHints wmHint; 1115 XWMHints wmHint;
1134 XGCValues gcvalue; 1116 XGCValues gcvalue;
1135 long vt_emask; 1117 long vt_emask;
1136 1118
1137 XWindowAttributes gattr; 1119 XWindowAttributes gattr;
1138 1120
1139 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1140 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1141 Xscreen = DefaultScreen (Xdisplay);
1142
1143 if (Options & Opt_transparent) 1121 if (Options & Opt_transparent)
1144 { 1122 {
1145 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1123 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1146 Xdepth = gattr.depth; 1124 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1147 }
1148 else
1149 {
1150 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1151#ifdef PREFER_24BIT
1152 /*
1153 * If depth is not 24, look for a 24bit visual.
1154 */
1155 if (Xdepth != 24)
1156 {
1157 XVisualInfo vinfo;
1158
1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1160 {
1161 Xdepth = 24;
1162 Xvisual = vinfo.visual;
1163 Xcmap = XCreateColormap(Xdisplay,
1164 RootWindow(Xdisplay, Xscreen),
1165 Xvisual, AllocNone);
1166 }
1167 }
1168#endif
1169 } 1125 }
1170 1126
1171 /* grab colors before netscape does */ 1127 /* grab colors before netscape does */
1172 Get_Colours (); 1128 Get_Colours ();
1173 1129
1174 change_font (1, NULL); 1130 if (!change_font (rs[Rs_font]))
1131 {
1132 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1133 destroy ();
1134 return;
1135 }
1136
1175 window_calc (0, 0); 1137 window_calc (0, 0);
1176 old_width = szHint.width; 1138 old_width = szHint.width;
1177 old_height = szHint.height; 1139 old_height = szHint.height;
1178 1140
1179 /* parent window - reverse video so we can see placement errors 1141 /* parent window - reverse video so we can see placement errors
1180 * sub-window placement & size in rxvt_resize_subwindows() 1142 * sub-window placement & size in rxvt_resize_subwindows ()
1181 */ 1143 */
1182 1144
1183#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes; 1146 XSetWindowAttributes attributes;
1185 1147
1186 attributes.background_pixel = PixColors[Color_fg]; 1148 attributes.background_pixel = PixColors[Color_fg];
1187 attributes.border_pixel = PixColors[Color_border]; 1149 attributes.border_pixel = PixColors[Color_border];
1188 attributes.colormap = Xcmap; 1150 attributes.colormap = display->cmap;
1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1151 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1190 szHint.x, szHint.y, 1152 szHint.x, szHint.y,
1191 szHint.width, szHint.height, 1153 szHint.width, szHint.height,
1192 TermWin.ext_bwidth, 1154 TermWin.ext_bwidth,
1193 Xdepth, InputOutput, 1155 display->depth, InputOutput,
1194 Xvisual, 1156 display->visual,
1195 CWBackPixel | CWBorderPixel
1196 | CWColormap, &attributes); 1157 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1197#else 1158#else
1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1159 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1199 szHint.x, szHint.y, 1160 szHint.x, szHint.y,
1200 szHint.width, 1161 szHint.width,
1201 szHint.height, 1162 szHint.height,
1202 TermWin.ext_bwidth, 1163 TermWin.ext_bwidth,
1203 PixColors[Color_border], 1164 PixColors[Color_border],
1204 PixColors[Color_fg]); 1165 PixColors[Color_fg]);
1205#endif 1166#endif
1206 1167
1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1209 1170
1210 classHint.res_name = (char *)rs[Rs_name]; 1171 classHint.res_name = (char *)rs[Rs_name];
1211 classHint.res_class = (char *)APL_CLASS; 1172 classHint.res_class = (char *)RESCLASS;
1212 1173
1213 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1214 wmHint.input = True; 1175 wmHint.input = True;
1215 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1216 : NormalState); 1177 : NormalState);
1217 wmHint.window_group = TermWin.parent[0]; 1178 wmHint.window_group = TermWin.parent[0];
1218 1179
1219 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1180 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1220 (char **)argv, argc, &szHint, &wmHint, &classHint); 1181 (char **)argv, argc, &szHint, &wmHint, &classHint);
1182
1221 XSelectInput(Xdisplay, TermWin.parent[0], 1183 XSelectInput (display->display, TermWin.parent[0],
1222 (KeyPressMask 1184 KeyPressMask
1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1185#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1224 | KeyReleaseMask 1186 | KeyReleaseMask
1225#endif 1187#endif
1226 | FocusChangeMask | VisibilityChangeMask 1188 | FocusChangeMask | VisibilityChangeMask
1227 | StructureNotifyMask)); 1189 | StructureNotifyMask);
1190 termwin_ev.start (display, TermWin.parent[0]);
1228 1191
1229 /* vt cursor: Black-on-White is standard, but this is more popular */ 1192 /* vt cursor: Black-on-White is standard, but this is more popular */
1230 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1193 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1231 1194
1232#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1195#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1233 /* cursor (menuBar/scrollBar): Black-on-White */ 1196 /* cursor (menuBar/scrollBar): Black-on-White */
1234 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1197 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1235#endif 1198#endif
1236 1199
1237#ifdef POINTER_BLANK 1200#ifdef POINTER_BLANK
1238
1239 { 1201 {
1240 XColor blackcolour; 1202 XColor blackcolour;
1241 blackcolour.red = 0; 1203 blackcolour.red = 0;
1242 blackcolour.green = 0; 1204 blackcolour.green = 0;
1243 blackcolour.blue = 0; 1205 blackcolour.blue = 0;
1244 Font f = XLoadFont (Xdisplay, "fixed"); 1206 Font f = XLoadFont (display->display, "fixed");
1245 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1207 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1246 &blackcolour, &blackcolour); 1208 &blackcolour, &blackcolour);
1247 XUnloadFont (Xdisplay, f); 1209 XUnloadFont (display->display, f);
1248 } 1210 }
1249#endif 1211#endif
1250 1212
1251 /* the vt window */ 1213 /* the vt window */
1252 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1214 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1253 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1254 TermWin_TotalWidth(), 1216 TermWin_TotalWidth (),
1255 TermWin_TotalHeight(), 1217 TermWin_TotalHeight (),
1256 0, 1218 0,
1257 PixColors[Color_fg], 1219 PixColors[Color_fg],
1258 PixColors[Color_bg]); 1220 PixColors[Color_bg]);
1221
1259#ifdef DEBUG_X 1222#ifdef DEBUG_X
1260 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1223 XStoreName (display->display, TermWin.vt, "vt window");
1261#endif 1224#endif
1262 1225
1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1226 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1264 | PropertyChangeMask); 1227 | PropertyChangeMask);
1265 1228
… …
1270 vt_emask |= PointerMotionMask; 1233 vt_emask |= PointerMotionMask;
1271 else 1234 else
1272#endif 1235#endif
1273 vt_emask |= (Button1MotionMask | Button3MotionMask); 1236 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274 1237
1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1238 XSelectInput (display->display, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt);
1276 1240
1277#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1241#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1278
1279 if (menuBar_height()) 1242 if (menuBar_height ())
1280 { 1243 {
1281 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1282 window_vt_x, 0, 1245 window_vt_x, 0,
1283 TermWin_TotalWidth(), 1246 TermWin_TotalWidth (),
1284 menuBar_TotalHeight(), 1247 menuBar_TotalHeight (),
1285 0, 1248 0,
1286 PixColors[Color_fg], 1249 PixColors[Color_fg],
1287 PixColors[Color_scroll]); 1250 PixColors[Color_scroll]);
1251
1288#ifdef DEBUG_X 1252#ifdef DEBUG_X
1289
1290 XStoreName(Xdisplay, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1291#endif 1254#endif
1292 1255
1293 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257
1258 XDefineCursor (display->display, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr));
1260
1294 XSelectInput(Xdisplay, menuBar.win, 1261 XSelectInput (display->display, menuBar.win,
1295 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1296 | Button1MotionMask)); 1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win);
1297 } 1265 }
1298#endif 1266#endif
1267
1299#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1300 if (rs[Rs_backgroundPixmap] != NULL 1269 if (rs[Rs_backgroundPixmap] != NULL
1301 && !(Options & Opt_transparent)) 1270 && ! (Options & Opt_transparent))
1302 { 1271 {
1303 const char *p = rs[Rs_backgroundPixmap]; 1272 const char *p = rs[Rs_backgroundPixmap];
1304 1273
1305 if ((p = STRCHR(p, ';')) != NULL) 1274 if ((p = STRCHR (p, ';')) != NULL)
1306 { 1275 {
1307 p++; 1276 p++;
1308 scale_pixmap (p); 1277 scale_pixmap (p);
1309 } 1278 }
1310 set_bgPixmap (rs[Rs_backgroundPixmap]); 1279 set_bgPixmap (rs[Rs_backgroundPixmap]);
… …
1314 1283
1315 /* graphics context for the vt window */ 1284 /* graphics context for the vt window */
1316 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = PixColors[Color_fg];
1317 gcvalue.background = PixColors[Color_bg]; 1286 gcvalue.background = PixColors[Color_bg];
1318 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1319 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1320 GCForeground | GCBackground 1289 GCForeground | GCBackground
1321 | GCGraphicsExposures, &gcvalue); 1290 | GCGraphicsExposures, &gcvalue);
1291
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1322 1293
1323#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1324
1325 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = PixColors[Color_topShadow];
1326 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1327 GCForeground, &gcvalue);
1328 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = PixColors[Color_bottomShadow];
1329 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1330 GCForeground, &gcvalue);
1331 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1299 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1332 : Color_scroll)]; 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1333 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1334 GCForeground, &gcvalue);
1335#endif 1301#endif
1336} 1302}
1337 1303
1338/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1339/* 1305/*
… …
1345rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1346{ 1312{
1347 int cfd, er; 1313 int cfd, er;
1348 1314
1349 /* get master (pty) */ 1315 /* get master (pty) */
1350 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1316 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1351 { 1317 {
1352 rxvt_print_error("can't open pseudo-tty"); 1318 rxvt_print_error ("can't open pseudo-tty");
1353 return -1; 1319 return -1;
1354 } 1320 }
1355
1356#ifdef FD_SETSIZE
1357 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1358 {
1359 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1360 rxvt_clean_exit();
1361 exit(EXIT_FAILURE);
1362 }
1363#endif
1364 1321
1365 fcntl (cfd, F_SETFL, O_NONBLOCK); 1322 fcntl (cfd, F_SETFL, O_NONBLOCK);
1366 1323
1367 /* get slave (tty) */ 1324 /* get slave (tty) */
1368 if (tty_fd < 0) 1325 if (tty_fd < 0)
… …
1371 privileged_ttydev (SAVE); 1328 privileged_ttydev (SAVE);
1372#endif 1329#endif
1373 1330
1374 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1331 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1375 { 1332 {
1376 close(cfd); 1333 close (cfd);
1377 rxvt_print_error("can't open slave tty %s", ttydev); 1334 rxvt_print_error ("can't open slave tty %s", ttydev);
1378 return -1; 1335 return -1;
1379 } 1336 }
1380 } 1337 }
1381#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1339 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1340 er = key_backspace[0];
1384 else if (STRCMP(key_backspace, "DEC") == 0) 1341 else if (STRCMP (key_backspace, "DEC") == 0)
1385 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1386 else 1343 else
1387#endif 1344#endif
1388 1345
1389 er = -1; 1346 er = -1;
1390 1347
1391 rxvt_get_ttymode (&(tio), er); 1348 rxvt_get_ttymode (& (tio), er);
1392 1349
1393#ifndef __QNX__ 1350#ifndef __QNX__
1394 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1395 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1396 { 1353 {
1397 case -1: 1354 case -1:
1398 rxvt_print_error("can't fork"); 1355 rxvt_print_error ("can't fork");
1399 return -1; 1356 return -1;
1400 case 0: 1357 case 0:
1401 close (cfd); /* only keep tty_fd and STDERR open */ 1358 close (cfd); /* only keep tty_fd and STDERR open */
1402 close (Xfd); 1359
1360 init_env ();
1361
1403 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1362 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1404 rxvt_print_error ("could not obtain control of tty"); 1363 rxvt_print_error ("could not obtain control of tty");
1405 else 1364 else
1365 {
1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1367 dup2 (tty_fd, STDIN_FILENO);
1368 dup2 (tty_fd, STDOUT_FILENO);
1369 dup2 (tty_fd, STDERR_FILENO);
1370
1371 if (tty_fd > 2)
1372 close (tty_fd);
1373
1374 run_child (argv);
1375 }
1376 exit (EXIT_FAILURE);
1377 /* NOTREACHED */
1378 default:
1406 { 1379 {
1407 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1381 int fdstdin;
1382
1383 fdstdin = dup (STDIN_FILENO);
1408 dup2 (tty_fd, STDIN_FILENO); 1384 dup2 (tty_fd, STDIN_FILENO);
1385#endif
1386
1387#ifdef UTMP_SUPPORT
1388 privileged_utmp (SAVE);
1389#endif
1390
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392
1409 dup2 (tty_fd, STDOUT_FILENO); 1393 dup2 (fdstdin, STDIN_FILENO);
1410 dup2 (tty_fd, STDERR_FILENO);
1411
1412 if (tty_fd > 2)
1413 close (tty_fd); 1394 close (fdstdin);
1395#endif
1414 1396
1415 run_child (argv);
1416 } 1397 }
1417 exit (EXIT_FAILURE);
1418 /* NOTREACHED */
1419 default:
1420 {
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422 int fdstdin;
1423
1424 fdstdin = dup (STDIN_FILENO);
1425 dup2 (tty_fd, STDIN_FILENO);
1426#endif
1427
1428#ifdef UTMP_SUPPORT
1429 privileged_utmp (SAVE);
1430#endif
1431
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433
1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin);
1436#endif
1437
1438 }
1439 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1398 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1440 break; 1399 break;
1441 } 1400 }
1442#else /* __QNX__ uses qnxspawn() */ 1401#else /* __QNX__ uses qnxspawn () */
1443 fchmod (tty_fd, 0622); 1402 fchmod (tty_fd, 0622);
1444 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1403 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1445 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1404 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1446 1405
1447 if (run_child (argv) == -1) 1406 if (run_child (argv) == -1)
… …
1461int 1420int
1462rxvt_term::run_child (const char *const *argv) 1421rxvt_term::run_child (const char *const *argv)
1463{ 1422{
1464 char *login; 1423 char *login;
1465 1424
1466 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1425 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1467 1426
1468 if (Options & Opt_console) 1427 if (Options & Opt_console)
1469 { /* be virtual console, fail silently */ 1428 { /* be virtual console, fail silently */
1470#ifdef TIOCCONS 1429#ifdef TIOCCONS
1471 unsigned int on = 1; 1430 unsigned int on = 1;
… …
1479 { 1438 {
1480 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1439 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1481 close (fd); 1440 close (fd);
1482 } 1441 }
1483#endif /* SRIOCSREDIR */ 1442#endif /* SRIOCSREDIR */
1443
1484 } 1444 }
1485 1445
1486 /* reset signals and spin off the command interpreter */ 1446 /* reset signals and spin off the command interpreter */
1487 signal (SIGINT, SIG_DFL); 1447 signal (SIGINT, SIG_DFL);
1488 signal (SIGQUIT, SIG_DFL); 1448 signal (SIGQUIT, SIG_DFL);
… …
1516 { 1476 {
1517# ifdef DEBUG_CMD 1477# ifdef DEBUG_CMD
1518 int i; 1478 int i;
1519 1479
1520 for (i = 0; argv[i]; i++) 1480 for (i = 0; argv[i]; i++)
1521 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1481 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1522# endif 1482# endif
1523 1483
1524 execvp(argv[0], (char *const *)argv); 1484 execvp (argv[0], (char *const *)argv);
1525 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1526 } 1486 }
1527 else 1487 else
1528 { 1488 {
1529 const char *argv0, *shell; 1489 const char *argv0, *shell;
1530 1490
1531 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1491 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1532 shell = "/bin/sh"; 1492 shell = "/bin/sh";
1533 1493
1534 argv0 = (const char *)rxvt_r_basename(shell); 1494 argv0 = (const char *)rxvt_r_basename (shell);
1535 if (Options & Opt_loginShell) 1495 if (Options & Opt_loginShell)
1536 { 1496 {
1537 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1497 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1538 1498
1539 login[0] = '-'; 1499 login[0] = '-';
1540 STRCPY(&login[1], argv0); 1500 STRCPY (&login[1], argv0);
1541 argv0 = login; 1501 argv0 = login;
1542 } 1502 }
1543 execlp(shell, argv0, NULL); 1503 execlp (shell, argv0, NULL);
1544 /* no error message: STDERR is closed! */ 1504 /* no error message: STDERR is closed! */
1545 } 1505 }
1546 1506
1547#else /* __QNX__ uses qnxspawn() */ 1507#else /* __QNX__ uses qnxspawn () */
1548 1508
1549 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1509 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1550 char *command = NULL, fullcommand[_MAX_PATH]; 1510 char *command = NULL, fullcommand[_MAX_PATH];
1551 char **arg_v, *arg_a[2] = { NULL, NULL }; 1511 char **arg_v, *arg_a[2] = { NULL, NULL };
1552 1512
1553 if (argv != NULL) 1513 if (argv != NULL)
1554 { 1514 {
1555 if (access(argv[0], X_OK) == -1) 1515 if (access (argv[0], X_OK) == -1)
1556 { 1516 {
1557 if (STRCHR(argv[0], '/') == NULL) 1517 if (STRCHR (argv[0], '/') == NULL)
1558 { 1518 {
1559 searchenv(argv[0], "PATH", fullcommand); 1519 searchenv (argv[0], "PATH", fullcommand);
1560 if (fullcommand[0] != '\0') 1520 if (fullcommand[0] != '\0')
1561 command = fullcommand; 1521 command = fullcommand;
1562 } 1522 }
1563 if (access(command, X_OK) == -1) 1523 if (access (command, X_OK) == -1)
1564 return -1; 1524 return -1;
1565 } 1525 }
1566 else 1526 else
1567 command = argv[0]; 1527 command = argv[0];
1568 arg_v = argv; 1528 arg_v = argv;
1569 } 1529 }
1570 else 1530 else
1571 { 1531 {
1572 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1532 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1573 command = "/bin/sh"; 1533 command = "/bin/sh";
1574 1534
1575 arg_a[0] = my_basename(command); 1535 arg_a[0] = my_basename (command);
1576 if (Options & Opt_loginShell) 1536 if (Options & Opt_loginShell)
1577 { 1537 {
1578 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1538 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1579 1539
1580 login[0] = '-'; 1540 login[0] = '-';
1581 STRCPY(&login[1], arg_a[0]); 1541 STRCPY (&login[1], arg_a[0]);
1582 arg_a[0] = login; 1542 arg_a[0] = login;
1583 } 1543 }
1584 arg_v = arg_a; 1544 arg_v = arg_a;
1585 } 1545 }
1586 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1546 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1587 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1547 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1588 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1548 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1589 command, arg_v, environ, iov_a, 0); 1549 command, arg_v, environ, iov_a, 0);
1590 if (login) 1550 if (login)
1591 free(login); 1551 free (login);
1592 1552
1593 close(tty_fd); 1553 close (tty_fd);
1594 return cmd_fd; 1554 return cmd_fd;
1595 1555
1596#endif 1556#endif
1597 return -1; 1557 return -1;
1598} 1558}
1599 1559
1600/* ------------------------------------------------------------------------- * 1560/* ------------------------------------------------------------------------- *
1601 * GET TTY CURRENT STATE * 1561 * GET TTY CURRENT STATE *
1602 * ------------------------------------------------------------------------- */ 1562 * ------------------------------------------------------------------------- */
1603/* rxvt_get_ttymode() */ 1563/* rxvt_get_ttymode () */
1604/* EXTPROTO */ 1564/* EXTPROTO */
1605void 1565void
1606rxvt_get_ttymode(ttymode_t *tio, int erase) 1566rxvt_get_ttymode (ttymode_t *tio, int erase)
1607{ 1567{
1608#ifdef HAVE_TERMIOS_H 1568#ifdef HAVE_TERMIOS_H
1609 /* 1569 /*
1610 * standard System V termios interface 1570 * standard System V termios interface
1611 */ 1571 */
1612 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1572 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1613 { 1573 {
1614 /* return error - use system defaults */ 1574 /* return error - use system defaults */
1615 tio->c_cc[VINTR] = CINTR; 1575 tio->c_cc[VINTR] = CINTR;
1616 tio->c_cc[VQUIT] = CQUIT; 1576 tio->c_cc[VQUIT] = CQUIT;
1617 tio->c_cc[VERASE] = CERASE; 1577 tio->c_cc[VERASE] = CERASE;
… …
1691 /* 1651 /*
1692 * sgtty interface 1652 * sgtty interface
1693 */ 1653 */
1694 1654
1695 /* get parameters -- gtty */ 1655 /* get parameters -- gtty */
1696 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1656 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1697 { 1657 {
1698 tio->sg.sg_erase = CERASE; /* ^H */ 1658 tio->sg.sg_erase = CERASE; /* ^H */
1699 tio->sg.sg_kill = CKILL; /* ^U */ 1659 tio->sg.sg_kill = CKILL; /* ^U */
1700 } 1660 }
1701 if (erase != -1) 1661 if (erase != -1)
1702 tio->sg.sg_erase = (char)erase; 1662 tio->sg.sg_erase = (char)erase;
1703 1663
1704 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1664 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1705 1665
1706 /* get special characters */ 1666 /* get special characters */
1707 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1708 { 1668 {
1709 tio->tc.t_intrc = CINTR; /* ^C */ 1669 tio->tc.t_intrc = CINTR; /* ^C */
1710 tio->tc.t_quitc = CQUIT; /* ^\ */ 1670 tio->tc.t_quitc = CQUIT; /* ^\ */
1711 tio->tc.t_startc = CSTART; /* ^Q */ 1671 tio->tc.t_startc = CSTART; /* ^Q */
1712 tio->tc.t_stopc = CSTOP; /* ^S */ 1672 tio->tc.t_stopc = CSTOP; /* ^S */
1713 tio->tc.t_eofc = CEOF; /* ^D */ 1673 tio->tc.t_eofc = CEOF; /* ^D */
1714 tio->tc.t_brkc = -1; 1674 tio->tc.t_brkc = -1;
1715 } 1675 }
1716 /* get local special chars */ 1676 /* get local special chars */
1717 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1677 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1718 { 1678 {
1719 tio->lc.t_suspc = CSUSP; /* ^Z */ 1679 tio->lc.t_suspc = CSUSP; /* ^Z */
1720 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1680 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1721 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1681 tio->lc.t_rprntc = CRPRNT; /* ^R */
1722 tio->lc.t_flushc = CFLUSH; /* ^O */ 1682 tio->lc.t_flushc = CFLUSH; /* ^O */
1723 tio->lc.t_werasc = CWERASE; /* ^W */ 1683 tio->lc.t_werasc = CWERASE; /* ^W */
1724 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1684 tio->lc.t_lnextc = CLNEXT; /* ^V */
1725 } 1685 }
1726 /* get line discipline */ 1686 /* get line discipline */
1727 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1687 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1728# ifdef NTTYDISC 1688# ifdef NTTYDISC
1729 1689
1730 tio->line = NTTYDISC; 1690 tio->line = NTTYDISC;
1731# endif /* NTTYDISC */ 1691# endif /* NTTYDISC */
1732 1692
… …
1737 * Debugging 1697 * Debugging
1738 */ 1698 */
1739#ifdef DEBUG_TTYMODE 1699#ifdef DEBUG_TTYMODE
1740#ifdef HAVE_TERMIOS_H 1700#ifdef HAVE_TERMIOS_H
1741 /* c_iflag bits */ 1701 /* c_iflag bits */
1742 fprintf(stderr, "Input flags\n"); 1702 fprintf (stderr, "Input flags\n");
1743 1703
1744 /* cpp token stringize doesn't work on all machines <sigh> */ 1704 /* cpp token stringize doesn't work on all machines <sigh> */
1745# define FOO(flag,name) \ 1705# define FOO(flag,name) \
1746 if ((tio->c_iflag) & flag) \ 1706 if ((tio->c_iflag) & flag) \
1747 fprintf (stderr, "%s ", name) 1707 fprintf (stderr, "%s ", name)
1748 1708
1749 /* c_iflag bits */ 1709 /* c_iflag bits */
1750 FOO(IGNBRK, "IGNBRK"); 1710 FOO (IGNBRK, "IGNBRK");
1751 FOO(BRKINT, "BRKINT"); 1711 FOO (BRKINT, "BRKINT");
1752 FOO(IGNPAR, "IGNPAR"); 1712 FOO (IGNPAR, "IGNPAR");
1753 FOO(PARMRK, "PARMRK"); 1713 FOO (PARMRK, "PARMRK");
1754 FOO(INPCK, "INPCK"); 1714 FOO (INPCK, "INPCK");
1755 FOO(ISTRIP, "ISTRIP"); 1715 FOO (ISTRIP, "ISTRIP");
1756 FOO(INLCR, "INLCR"); 1716 FOO (INLCR, "INLCR");
1757 FOO(IGNCR, "IGNCR"); 1717 FOO (IGNCR, "IGNCR");
1758 FOO(ICRNL, "ICRNL"); 1718 FOO (ICRNL, "ICRNL");
1759 FOO(IXON, "IXON"); 1719 FOO (IXON, "IXON");
1760 FOO(IXOFF, "IXOFF"); 1720 FOO (IXOFF, "IXOFF");
1761# ifdef IUCLC 1721# ifdef IUCLC
1762 1722
1763 FOO(IUCLC, "IUCLC"); 1723 FOO (IUCLC, "IUCLC");
1764# endif 1724# endif
1765# ifdef IXANY 1725# ifdef IXANY
1766 1726
1767 FOO(IXANY, "IXANY"); 1727 FOO (IXANY, "IXANY");
1768# endif 1728# endif
1769# ifdef IMAXBEL 1729# ifdef IMAXBEL
1770 1730
1771 FOO(IMAXBEL, "IMAXBEL"); 1731 FOO (IMAXBEL, "IMAXBEL");
1772# endif 1732# endif
1773 1733
1774 fprintf(stderr, "\n"); 1734 fprintf (stderr, "\n");
1775 1735
1776# undef FOO 1736# undef FOO
1777# define FOO(entry, name) \ 1737# define FOO(entry, name) \
1778 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1738 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1779 1739
1780 FOO(VINTR, "VINTR"); 1740 FOO (VINTR, "VINTR");
1781 FOO(VQUIT, "VQUIT"); 1741 FOO (VQUIT, "VQUIT");
1782 FOO(VERASE, "VERASE"); 1742 FOO (VERASE, "VERASE");
1783 FOO(VKILL, "VKILL"); 1743 FOO (VKILL, "VKILL");
1784 FOO(VEOF, "VEOF"); 1744 FOO (VEOF, "VEOF");
1785 FOO(VEOL, "VEOL"); 1745 FOO (VEOL, "VEOL");
1786# ifdef VEOL2 1746# ifdef VEOL2
1787 1747
1788 FOO(VEOL2, "VEOL2"); 1748 FOO (VEOL2, "VEOL2");
1789# endif 1749# endif
1790# ifdef VSWTC 1750# ifdef VSWTC
1791 1751
1792 FOO(VSWTC, "VSWTC"); 1752 FOO (VSWTC, "VSWTC");
1793# endif 1753# endif
1794# ifdef VSWTCH 1754# ifdef VSWTCH
1795 1755
1796 FOO(VSWTCH, "VSWTCH"); 1756 FOO (VSWTCH, "VSWTCH");
1797# endif 1757# endif
1798 1758
1799 FOO(VSTART, "VSTART"); 1759 FOO (VSTART, "VSTART");
1800 FOO(VSTOP, "VSTOP"); 1760 FOO (VSTOP, "VSTOP");
1801 FOO(VSUSP, "VSUSP"); 1761 FOO (VSUSP, "VSUSP");
1802# ifdef VDSUSP 1762# ifdef VDSUSP
1803 1763
1804 FOO(VDSUSP, "VDSUSP"); 1764 FOO (VDSUSP, "VDSUSP");
1805# endif 1765# endif
1806# ifdef VREPRINT 1766# ifdef VREPRINT
1807 1767
1808 FOO(VREPRINT, "VREPRINT"); 1768 FOO (VREPRINT, "VREPRINT");
1809# endif 1769# endif
1810# ifdef VDISCRD 1770# ifdef VDISCRD
1811 1771
1812 FOO(VDISCRD, "VDISCRD"); 1772 FOO (VDISCRD, "VDISCRD");
1813# endif 1773# endif
1814# ifdef VWERSE 1774# ifdef VWERSE
1815 1775
1816 FOO(VWERSE, "VWERSE"); 1776 FOO (VWERSE, "VWERSE");
1817# endif 1777# endif
1818# ifdef VLNEXT 1778# ifdef VLNEXT
1819 1779
1820 FOO(VLNEXT, "VLNEXT"); 1780 FOO (VLNEXT, "VLNEXT");
1821# endif 1781# endif
1822 1782
1823 fprintf(stderr, "\n"); 1783 fprintf (stderr, "\n");
1824# undef FOO 1784# undef FOO
1825# endif /* HAVE_TERMIOS_H */ 1785# endif /* HAVE_TERMIOS_H */
1826#endif /* DEBUG_TTYMODE */ 1786#endif /* DEBUG_TTYMODE */
1827} 1787}
1828 1788

Diff Legend

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