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.19 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.30 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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