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.21 by pcg, Sat Jan 31 02:14:58 2004 UTC vs.
Revision 1.31 by pcg, Sun Feb 22 08:09:38 2004 UTC

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

Diff Legend

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