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.16 by pcg, Thu Dec 18 13:33:02 2003 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.16 2003/12/18 13:33:02 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 {
337 "TEXT",
336 "COMPOUND_TEXT", 338 "COMPOUND_TEXT",
339 "UTF8_STRING",
337 "MULTIPLE", 340 "MULTIPLE",
338 "TARGETS", 341 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 342 "TIMESTAMP",
341 "VT_SELECTION", 343 "VT_SELECTION",
342 "INCR", 344 "INCR",
343 "WM_DELETE_WINDOW", 345 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 346#ifdef TRANSPARENT
… …
371 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 376 want_refresh = 1;
375 cmd_pid = -1; 377 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 380 TermWin.focus = 0;
379 TermWin.ncol = 80; 381 TermWin.ncol = 80;
380 TermWin.nrow = 24; 382 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
422 424
423 last_bot = last_state = -1; 425 last_bot = last_state = -1;
424 426
425#ifdef MENUBAR 427#ifdef MENUBAR
426 menu_readonly = 1; 428 menu_readonly = 1;
427# if !(MENUBAR_MAX > 1) 429# if ! (MENUBAR_MAX > 1)
428 CurrentBar = &(BarList); 430 CurrentBar = & (BarList);
429# endif /* (MENUBAR_MAX > 1) */ 431# endif /* (MENUBAR_MAX > 1) */
430#endif 432#endif
431 433
432 return true; 434 return true;
433} 435}
… …
444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 446 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
445 ttygid = gr->gr_gid; 447 ttygid = gr->gr_gid;
446 } 448 }
447 else 449 else
448#endif /* TTY_GID_SUPPORT */ 450#endif /* TTY_GID_SUPPORT */
451
449 { 452 {
450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 453 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
451 ttygid = getgid (); 454 ttygid = getgid ();
452 } 455 }
453 456
… …
473 { 476 {
474#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 477#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
475 if (i == 4 || i == 7) 478 if (i == 4 || i == 7)
476 continue; 479 continue;
477#endif 480#endif
478 close(i); 481 close (i);
479 } 482 }
480#endif 483#endif
481} 484}
482 485
483/*----------------------------------------------------------------------*/ 486/*----------------------------------------------------------------------*/
… …
490 493
491 /* 494 /*
492 * 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
493 */ 496 */
494 for (r_argc = 0; r_argc < argc; r_argc++) 497 for (r_argc = 0; r_argc < argc; r_argc++)
495 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 498 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
496 break; 499 break;
497 500
498 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 501 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
499 502
500 for (i = 0; i < r_argc; i++) 503 for (i = 0; i < r_argc; i++)
501 r_argv[i] = (const char *)argv[i]; 504 r_argv[i] = (const char *)argv[i];
502 505
503 r_argv[i] = NULL; 506 r_argv[i] = NULL;
504 507
505 if (r_argc == argc) 508 if (r_argc == argc)
506 cmd_argv = NULL; 509 cmd_argv = NULL;
507 else 510 else
508 { 511 {
509 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 512 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
510 513
511 for (i = 0; i < argc - r_argc - 1; i++) 514 for (i = 0; i < argc - r_argc - 1; i++)
512 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 515 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
513 516
514 cmd_argv[i] = NULL; 517 cmd_argv[i] = NULL;
… …
516 519
517 /* clear all resources */ 520 /* clear all resources */
518 for (i = 0; i < NUM_RESOURCES;) 521 for (i = 0; i < NUM_RESOURCES;)
519 rs[i++] = NULL; 522 rs[i++] = NULL;
520 523
521 rs[Rs_name] = rxvt_r_basename(argv[0]); 524 rs[Rs_name] = rxvt_r_basename (argv[0]);
522 525
523 /* 526 /*
524 * Open display, get options/resources and create the window 527 * Open display, get options/resources and create the window
525 */ 528 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 529 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
527 rs[Rs_display_name] = ":0"; 530 rs[Rs_display_name] = ":0";
528 531
529 rxvt_get_options (this, r_argc, r_argv); 532 get_options (r_argc, r_argv);
530 free (r_argv); 533 free (r_argv);
531 534
532#ifdef LOCAL_X_IS_UNIX 535#ifdef LOCAL_X_IS_UNIX
533 if (rs[Rs_display_name][0] == ':') 536 if (rs[Rs_display_name][0] == ':')
534 { 537 {
535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 538 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
536 STRCPY (val, "unix"); 539 STRCPY (val, "unix");
537 STRCAT (val, rs[Rs_display_name]); 540 STRCAT (val, rs[Rs_display_name]);
538 Xdisplay = XOpenDisplay (val); 541 display = displays.get (val);
539 free (val); 542 free (val);
540 } 543 }
541#endif 544#endif
542 545
543 if (Xdisplay == NULL 546 if (!display
544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 547 && ! (display = displays.get (rs[Rs_display_name])))
545 { 548 {
546 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]);
547 exit (EXIT_FAILURE); 550 exit (EXIT_FAILURE);
548 } 551 }
549 552
550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 553 extract_resources (display->display, rs[Rs_name]);
551 554
552 /* 555 /*
553 * set any defaults not already set 556 * set any defaults not already set
554 */ 557 */
555 if (cmd_argv && cmd_argv[0]) 558 if (cmd_argv && cmd_argv[0])
556 { 559 {
557 if (!rs[Rs_title]) 560 if (!rs[Rs_title])
558 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 561 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
559 if (!rs[Rs_iconName]) 562 if (!rs[Rs_iconName])
560 rs[Rs_iconName] = rs[Rs_title]; 563 rs[Rs_iconName] = rs[Rs_title];
561 } 564 }
562 else 565 else
563 { 566 {
… …
565 rs[Rs_title] = rs[Rs_name]; 568 rs[Rs_title] = rs[Rs_name];
566 if (!rs[Rs_iconName]) 569 if (!rs[Rs_iconName])
567 rs[Rs_iconName] = rs[Rs_name]; 570 rs[Rs_iconName] = rs[Rs_name];
568 } 571 }
569 572
570 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 573 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
571 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 574 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
572 575
573#ifndef NO_FRILLS 576#ifndef NO_FRILLS
574 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)
575 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 578 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
576 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)
577 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 580 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
578#endif 581#endif
579 582
580#ifndef NO_LINESPACE 583#ifndef NO_LINESPACE
581 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 584 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
582 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 585 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
583#endif 586#endif
584 587
585#ifdef POINTER_BLANK 588#ifdef POINTER_BLANK
586 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 589 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
587 pointerBlankDelay = i; 590 pointerBlankDelay = i;
588 else 591 else
589 pointerBlankDelay = 2; 592 pointerBlankDelay = 2;
590#endif 593#endif
591 594
… …
602 rs[Rs_cutchars] = CUTCHARS; 605 rs[Rs_cutchars] = CUTCHARS;
603 606
604#ifdef ACS_ASCII 607#ifdef ACS_ASCII
605 if (!rs[Rs_acs_chars]) 608 if (!rs[Rs_acs_chars])
606 rs[Rs_acs_chars] = ACS_CHARS; 609 rs[Rs_acs_chars] = ACS_CHARS;
607 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 610 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
608 { 611 {
609 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 612 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
610 for (; i < 0x20; ) 613 for (; i < 0x20; )
611 val[i] = ' '; 614 val[i] = ' ';
612 rs[Rs_acs_chars] = val; 615 rs[Rs_acs_chars] = val;
613 } 616 }
614#endif 617#endif
… …
620# else 623# else
621 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 624 key_backspace = "DEC"; /* can toggle between \010 or \177 */
622# endif 625# endif
623 else 626 else
624 { 627 {
625 val = STRDUP(rs[Rs_backspace_key]); 628 val = STRDUP (rs[Rs_backspace_key]);
626 rxvt_Str_trim(val); 629 rxvt_Str_trim (val);
627 rxvt_Str_escaped(val); 630 rxvt_Str_escaped (val);
628 key_backspace = val; 631 key_backspace = val;
629 } 632 }
630#endif 633#endif
631 634
632#ifndef NO_DELETE_KEY 635#ifndef NO_DELETE_KEY
… …
636# else 639# else
637 key_delete = "\033[3~"; 640 key_delete = "\033[3~";
638# endif 641# endif
639 else 642 else
640 { 643 {
641 val = STRDUP(rs[Rs_delete_key]); 644 val = STRDUP (rs[Rs_delete_key]);
642 rxvt_Str_trim(val); 645 rxvt_Str_trim (val);
643 rxvt_Str_escaped(val); 646 rxvt_Str_escaped (val);
644 key_delete = val; 647 key_delete = val;
645 } 648 }
646#endif 649#endif
647 if (rs[Rs_answerbackstring]) 650 if (rs[Rs_answerbackstring])
648 { 651 {
649 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 652 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
650 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 653 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
651 } 654 }
652 655
653 if (rs[Rs_selectstyle]) 656 if (rs[Rs_selectstyle])
654 { 657 {
655 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 658 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
656 selection_style = OLD_WORD_SELECT; 659 selection_style = OLD_WORD_SELECT;
657#ifndef NO_OLD_SELECTION 660#ifndef NO_OLD_SELECTION
658 661
659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 662 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
660 selection_style = OLD_SELECT; 663 selection_style = OLD_SELECT;
661#endif 664#endif
665
662 } 666 }
663 667
664#ifdef HAVE_SCROLLBARS 668#ifdef HAVE_SCROLLBARS
665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 669 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 670 rs[Rs_scrollBar_thickness]);
667#endif 671#endif
668 672
669 TermWin.fontset = new rxvt_fontset (this); 673 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]); 674 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width; 675 TermWin.fwidth = TermWin.fontset->base_font ()->width;
… …
688 rs[Rs_color + i] = def_colorName[i]; 692 rs[Rs_color + i] = def_colorName[i];
689 693
690#ifndef XTERM_REVERSE_VIDEO 694#ifndef XTERM_REVERSE_VIDEO
691 /* this is how we implement reverseVideo */ 695 /* this is how we implement reverseVideo */
692 if (Options & Opt_reverseVideo) 696 if (Options & Opt_reverseVideo)
693 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 *);
694#endif 698#endif
695 699
696 /* convenient aliases for setting fg/bg to colors */ 700 /* convenient aliases for setting fg/bg to colors */
697 color_aliases (Color_fg); 701 color_aliases (Color_fg);
698 color_aliases (Color_bg); 702 color_aliases (Color_bg);
… …
721 725
722#ifdef DISPLAY_IS_IP 726#ifdef DISPLAY_IS_IP
723 /* Fixup display_name for export over pty to any interested terminal 727 /* Fixup display_name for export over pty to any interested terminal
724 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 728 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
725 * (for the first non-loopback interface) that we get from 729 * (for the first non-loopback interface) that we get from
726 * rxvt_network_display(). This is more "name-resolution-portable", if you 730 * rxvt_network_display (). This is more "name-resolution-portable", if you
727 * 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
728 * 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
729 * course that only helps the shell's child processes, not us. 733 * course that only helps the shell's child processes, not us.
730 * 734 *
731 * Giving out the display_name also affords a potential security hole 735 * Giving out the display_name also affords a potential security hole
… …
733 val = rxvt_network_display (rs[Rs_display_name]); 737 val = rxvt_network_display (rs[Rs_display_name]);
734 rs[Rs_display_name] = (const char *)val; 738 rs[Rs_display_name] = (const char *)val;
735 739
736 if (val == NULL) 740 if (val == NULL)
737#endif /* DISPLAY_IS_IP */ 741#endif /* DISPLAY_IS_IP */
738 val = XDisplayString(Xdisplay); 742 val = XDisplayString (display->display);
739 743
740 if (rs[Rs_display_name] == NULL) 744 if (rs[Rs_display_name] == NULL)
741 rs[Rs_display_name] = val; /* use broken `:0' value */ 745 rs[Rs_display_name] = val; /* use broken `:0' value */
742 746
743 i = STRLEN (val); 747 i = STRLEN (val);
744 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 748 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
745 749
746 sprintf (env_display, "DISPLAY=%s", val); 750 sprintf (env_display, "DISPLAY=%s", val);
747 751
748 /* avoiding the math library: 752 /* avoiding the math library:
749 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 753 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
750 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++)
751 ; 755 ;
752 MAX_IT(i, 1); 756 MAX_IT (i, 1);
753 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 757 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
754 758
755 sprintf (env_windowid, "WINDOWID=%u", 759 sprintf (env_windowid, "WINDOWID=%u",
756 (unsigned int)TermWin.parent[0]); 760 (unsigned int)TermWin.parent[0]);
757 761
758 /* add entries to the environment: 762 /* add entries to the environment:
759 * @ DISPLAY: in case we started with -display 763 * @ DISPLAY: in case we started with -display
760 * @ WINDOWID: X window id number of the window 764 * @ WINDOWID: X window id number of the window
761 * @ COLORTERM: terminal sub-name and also indicates its color 765 * @ COLORTERM: terminal sub-name and also indicates its color
762 * @ TERM: terminal name 766 * @ TERM: terminal name
763 * @ TERMINFO: path to terminfo directory 767 * @ TERMINFO: path to terminfo directory
768 * @ COLORFGBG: fg;bg color codes
764 */ 769 */
765 putenv (env_display); 770 putenv (env_display);
766 putenv (env_windowid); 771 putenv (env_windowid);
772 if (env_colorfgbg)
773 putenv (env_colorfgbg);
767 774
768#ifdef RXVT_TERMINFO 775#ifdef RXVT_TERMINFO
769 putenv ("TERMINFO=" RXVT_TERMINFO); 776 putenv ("TERMINFO=" RXVT_TERMINFO);
770#endif 777#endif
771 778
772 if (Xdepth <= 2) 779 if (display->depth <= 2)
773 putenv ("COLORTERM=" COLORTERMENV "-mono"); 780 putenv ("COLORTERM=" COLORTERMENV "-mono");
774 else 781 else
775 putenv ("COLORTERM=" COLORTERMENVFULL); 782 putenv ("COLORTERM=" COLORTERMENVFULL);
776 783
777 if (rs[Rs_term_name] != NULL) 784 if (rs[Rs_term_name] != NULL)
778 { 785 {
779 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));
780 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 787 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
781 putenv (env_term); 788 putenv (env_term);
782 } 789 }
783 else 790 else
784 putenv ("TERM=" TERMENV); 791 putenv ("TERM=" TERMENV);
… …
799void 806void
800rxvt_term::set_locale (const char *locale) 807rxvt_term::set_locale (const char *locale)
801{ 808{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 809#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 810 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 811 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
812 SET_LOCALE (this->locale);
813 mbstate.reset ();
805#endif 814#endif
806#if HAVE_NL_LANGINFO 815#if HAVE_NL_LANGINFO
807 free (codeset); 816 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 817 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 818 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 819 || !STRCASECMP (codeset, "UTF8");
811#else 820#else
812 enc_utf8 = 1; 821 enc_utf8 = 1;
813#endif 822#endif
814} 823}
815 824
… …
821 rxvt_print_error ("Setting locale failed."); 830 rxvt_print_error ("Setting locale failed.");
822 else 831 else
823 { 832 {
824 Atom wmlocale; 833 Atom wmlocale;
825 834
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 835 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 836 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 837 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 838 (unsigned char *)locale, STRLEN (locale));
830 839
831 if (!XSupportsLocale ()) 840 if (!XSupportsLocale ())
832 { 841 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 842 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 843 return;
835 } 844 }
836 845
846 im_ev.start (display);
847
837 /* see if we can connect yet */ 848 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 849 im_cb ();
839
840 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL);
844 } 850 }
845#endif 851#endif
846} 852}
847 853
848/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
849void 855void
850rxvt_term::init_command(const char *const *argv) 856rxvt_term::init_command (const char *const *argv)
851{ 857{
852 /* 858 /*
853 * Initialize the command connection. 859 * Initialize the command connection.
854 * This should be called after the X server connection is established. 860 * This should be called after the X server connection is established.
855 */ 861 */
856 int i; 862 int i;
857 863
858 for (i = 0; i < NUM_XA; i++) 864 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 865 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 866
861 /* Enable delete window protocol */ 867 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 868 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 869 & (xa[XA_WMDELETEWINDOW]), 1);
864 870
865#ifdef USING_W11LIB 871#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 872 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 873 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 874#endif
869 875
870#ifdef META8_OPTION 876#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 877 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 878#endif
873 879
874 rxvt_get_ourmods (this); 880 get_ourmods ();
875 881
876 if (!(Options & Opt_scrollTtyOutput)) 882 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 883 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 884 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 885 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 886 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 887 PrivateModes |= PrivMode_smoothScroll;
882 888
883#ifndef NO_BACKSPACE_KEY 889#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 890 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 891 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 892#endif
887 893
888 /* add value for scrollBar */ 894 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 895 if (scrollbar_visible ())
890 { 896 {
891 PrivateModes |= PrivMode_scrollBar; 897 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 898 SavedModes |= PrivMode_scrollBar;
893 } 899 }
894 if (menubar_visible (this)) 900 if (menubar_visible ())
895 { 901 {
896 PrivateModes |= PrivMode_menuBar; 902 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 903 SavedModes |= PrivMode_menuBar;
898 } 904 }
899 905
900#ifdef GREEK_SUPPORT 906#ifdef GREEK_SUPPORT
901 greek_init(); 907 greek_init ();
902#endif 908#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905 909
906#ifdef CURSOR_BLINK 910#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 911 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 912 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 913#endif
911 914
912 if ((cmd_fd = run_command (argv)) < 0) 915 if ((cmd_fd = run_command (argv)) < 0)
… …
915 exit (EXIT_FAILURE); 918 exit (EXIT_FAILURE);
916 } 919 }
917} 920}
918 921
919/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 923void
922rxvt_Get_Colours (pR) 924rxvt_term::Get_Colours ()
923{ 925{
924 int i; 926 int i;
925 927
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 928 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 929 {
928 rxvt_color xcol; 930 rxvt_color xcol;
929 931
930 if (!R->rs[Rs_color + i]) 932 if (!rs[Rs_color + i])
931 continue; 933 continue;
932 934
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 935 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 936 {
935#ifndef XTERM_REVERSE_VIDEO 937#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 938 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 939 rs[Rs_color + i] = def_colorName[!i];
939 }
940 else 940 else
941#endif 941#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 942 rs[Rs_color + i] = def_colorName[i];
943 943
944 if (!R->rs[Rs_color + i]) 944 if (!rs[Rs_color + i])
945 continue; 945 continue;
946 946
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 947 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 948 {
949 switch (i) 949 switch (i)
950 { 950 {
951 case Color_fg: 951 case Color_fg:
952 case Color_bg: 952 case Color_bg:
953 /* fatal: need bg/fg color */ 953 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 954 rxvt_print_error ("aborting");
955 exit (EXIT_FAILURE); 955 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 956 /* NOTREACHED */
957 break; 957 break;
958#ifndef NO_CURSORCOLOR 958#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 959 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 960 xcol = PixColors[Color_fg];
961 break; 961 break;
962#endif /* ! NO_CURSORCOLOR */ 962#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 963 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 964 xcol = PixColors[Color_fg];
965 break; 965 break;
966 default: 966 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 967 xcol = PixColors[Color_bg]; /* None */
968 break; 968 break;
969 } 969 }
970 } 970 }
971 } 971 }
972 972
973 R->PixColors[i] = xcol; 973 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 974 SET_PIXCOLOR (i);
975 } 975 }
976 976
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 977 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 978 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 979 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 980 PixColors[Color_border] = PixColors[Color_fg];
981 981
982 /* 982 /*
983 * get scrollBar/menuBar shadow colors 983 * get scrollBar/menuBar shadow colors
984 * 984 *
985 * The calculations of topShadow/bottomShadow values are adapted 985 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 987 */
988#ifdef KEEP_SCROLLCOLOR 988#ifdef KEEP_SCROLLCOLOR
989 989
990 if (XDEPTH <= 2) 990 if (XDEPTH <= 2)
991 { /* Monochrome */ 991 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 992 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 993 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 994 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 995 }
996 else 996 else
997 { 997 {
998 rxvt_color xcol[3]; 998 rxvt_color xcol[3];
999 /* xcol[0] == white 999 /* xcol[0] == white
1000 * xcol[1] == top shadow 1000 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 1001 * xcol[2] == bot shadow */
1002 1002
1003 xcol[1] = R->PixColors[Color_scroll]; 1003 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1004# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 1005 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1006 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1007# else 1007# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1008 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif 1009# endif
1010 1010
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 1012
1013 xcol[0].get (R, pr0, pg0, pb0); 1013 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 1014 xcol[1].get (display, pr1, pg1, pb1);
1015 1015
1016 /* bottomShadowColor */ 1016 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1017 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 1018 xcol[2] = PixColors[Color_Black];
1019 1019
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1020 PixColors[Color_bottomShadow] = xcol[2];
1021 1021
1022 /* topShadowColor */ 1022 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 1023 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 1027 xcol[1] = PixColors[Color_White];
1028 1028
1029 R->PixColors[Color_topShadow] = xcol[1]; 1029 PixColors[Color_topShadow] = xcol[1];
1030 } 1030 }
1031#endif /* KEEP_SCROLLCOLOR */ 1031#endif /* KEEP_SCROLLCOLOR */
1032} 1032}
1033 1033
1034/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
1035/* color aliases, fg/bg bright-bold */ 1035/* color aliases, fg/bg bright-bold */
1036void 1036void
1037rxvt_term::color_aliases(int idx) 1037rxvt_term::color_aliases (int idx)
1038{ 1038{
1039 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1039 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1040 { 1040 {
1041 int i = atoi (rs[Rs_color + idx]); 1041 int i = atoi (rs[Rs_color + idx]);
1042 1042
1043 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1044 { /* bright colors */
1045 i -= 8; 1045 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1046#ifndef NO_BRIGHTCOLOR
1047
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
1051 1050
1052 } 1051 }
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 }
1056} 1056}
1057 1057
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#ifdef PREFER_24BIT
1141 XSetWindowAttributes attributes;
1142 XWindowAttributes gattr; 1139 XWindowAttributes gattr;
1143 1140
1144 XCMAP = DefaultColormap(Xdisplay, Xscreen);
1145 XVISUAL = DefaultVisual(Xdisplay, Xscreen);
1146
1147 if (Options & Opt_transparent) 1141 if (Options & Opt_transparent)
1148 { 1142 {
1149 XGetWindowAttributes(Xdisplay, RootWindow(Xdisplay, Xscreen), 1143 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1150 &gattr); 1144 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1151 XDEPTH = gattr.depth;
1152 }
1153 else
1154 { 1145 }
1155 XDEPTH = DefaultDepth(Xdisplay, Xscreen);
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 }
1173#endif
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
1263 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1237 XStoreName (display->display, TermWin.vt, "vt window");
1264#endif 1238#endif
1265
1266 pointer_unblank ();
1267 1239
1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1240 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1269 | PropertyChangeMask); 1241 | PropertyChangeMask);
1242
1270#ifdef POINTER_BLANK 1243#ifdef POINTER_BLANK
1244 pointer_unblank ();
1271 1245
1272 if ((Options & Opt_pointerBlank)) 1246 if ((Options & Opt_pointerBlank))
1273 vt_emask |= PointerMotionMask; 1247 vt_emask |= PointerMotionMask;
1274 else 1248 else
1275#endif 1249#endif
1276
1277 vt_emask |= (Button1MotionMask | Button3MotionMask); 1250 vt_emask |= (Button1MotionMask | Button3MotionMask);
1251
1278 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1252 XSelectInput (display->display, TermWin.vt, vt_emask);
1253 vt_ev.start (display, TermWin.vt);
1279 1254
1280#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1255#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1281
1282 if (menuBar_height()) 1256 if (menuBar_height ())
1283 { 1257 {
1284 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1285 window_vt_x, 0, 1259 window_vt_x, 0,
1286 TermWin_TotalWidth(), 1260 TermWin_TotalWidth (),
1287 menuBar_TotalHeight(), 1261 menuBar_TotalHeight (),
1288 0, 1262 0,
1289 PixColors[Color_fg], 1263 PixColors[Color_fg],
1290 PixColors[Color_scroll]); 1264 PixColors[Color_scroll]);
1291#ifdef DEBUG_X 1265#ifdef DEBUG_X
1292
1293 XStoreName(Xdisplay, menuBar.win, "menubar"); 1266 XStoreName (display->display, menuBar.win, "menubar");
1294#endif 1267#endif
1295 1268
1296 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1269 XDefineCursor (display->display, menuBar.win, pointer_leftptr);
1270
1297 XSelectInput(Xdisplay, menuBar.win, 1271 XSelectInput (display->display, menuBar.win,
1298 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1272 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1299 | Button1MotionMask)); 1273 | Button1MotionMask));
1274 menubar_ev.start (display, menuBar.win);
1300 } 1275 }
1301#endif 1276#endif
1277
1302#ifdef XPM_BACKGROUND 1278#ifdef XPM_BACKGROUND
1303 if (rs[Rs_backgroundPixmap] != NULL 1279 if (rs[Rs_backgroundPixmap] != NULL
1304 && !(Options & Opt_transparent)) 1280 && ! (Options & Opt_transparent))
1305 { 1281 {
1306 const char *p = rs[Rs_backgroundPixmap]; 1282 const char *p = rs[Rs_backgroundPixmap];
1307 1283
1308 if ((p = STRCHR(p, ';')) != NULL) 1284 if ((p = STRCHR (p, ';')) != NULL)
1309 { 1285 {
1310 p++; 1286 p++;
1311 rxvt_scale_pixmap (this, p); 1287 scale_pixmap (p);
1312 } 1288 }
1313 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1289 set_bgPixmap (rs[Rs_backgroundPixmap]);
1314 rxvt_scr_touch (this, True); 1290 scr_touch (True);
1315 } 1291 }
1316#endif 1292#endif
1317 1293
1318 /* graphics context for the vt window */ 1294 /* graphics context for the vt window */
1319 gcvalue.foreground = PixColors[Color_fg]; 1295 gcvalue.foreground = PixColors[Color_fg];
1320 gcvalue.background = PixColors[Color_bg]; 1296 gcvalue.background = PixColors[Color_bg];
1321 gcvalue.graphics_exposures = 1; 1297 gcvalue.graphics_exposures = 1;
1322 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1298 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1323 GCForeground | GCBackground 1299 GCForeground | GCBackground
1324 | GCGraphicsExposures, &gcvalue); 1300 | GCGraphicsExposures, &gcvalue);
1325 1301
1326#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1302#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1327
1328 gcvalue.foreground = PixColors[Color_topShadow]; 1303 gcvalue.foreground = PixColors[Color_topShadow];
1329 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1304 topShadowGC = XCreateGC (display->display, TermWin.vt,
1330 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1331 gcvalue.foreground = PixColors[Color_bottomShadow]; 1306 gcvalue.foreground = PixColors[Color_bottomShadow];
1332 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1307 botShadowGC = XCreateGC (display->display, TermWin.vt,
1333 GCForeground, &gcvalue); 1308 GCForeground, &gcvalue);
1334 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1309 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1335 : Color_scroll)]; 1310 : Color_scroll)];
1336 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1311 scrollbarGC = XCreateGC (display->display, TermWin.vt,
1337 GCForeground, &gcvalue); 1312 GCForeground, &gcvalue);
1338#endif 1313#endif
1339} 1314}
1340 1315
1341/*----------------------------------------------------------------------*/ 1316/*----------------------------------------------------------------------*/
1342/* 1317/*
… …
1348rxvt_term::run_command (const char *const *argv) 1323rxvt_term::run_command (const char *const *argv)
1349{ 1324{
1350 int cfd, er; 1325 int cfd, er;
1351 1326
1352 /* get master (pty) */ 1327 /* get master (pty) */
1353 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1328 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1354 { 1329 {
1355 rxvt_print_error("can't open pseudo-tty"); 1330 rxvt_print_error ("can't open pseudo-tty");
1356 return -1; 1331 return -1;
1357 } 1332 }
1358
1359#ifdef FD_SETSIZE
1360 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1361 {
1362 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1363 rxvt_clean_exit();
1364 exit(EXIT_FAILURE);
1365 }
1366#endif
1367 1333
1368 fcntl (cfd, F_SETFL, O_NONBLOCK); 1334 fcntl (cfd, F_SETFL, O_NONBLOCK);
1369 1335
1370 /* get slave (tty) */ 1336 /* get slave (tty) */
1371 if (tty_fd < 0) 1337 if (tty_fd < 0)
1372 { 1338 {
1373#ifndef NO_SETOWNER_TTYDEV 1339#ifndef NO_SETOWNER_TTYDEV
1374 rxvt_privileged_ttydev (aR_ SAVE); 1340 privileged_ttydev (SAVE);
1375#endif 1341#endif
1376 1342
1377 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1343 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1378 { 1344 {
1379 close(cfd); 1345 close (cfd);
1380 rxvt_print_error("can't open slave tty %s", ttydev); 1346 rxvt_print_error ("can't open slave tty %s", ttydev);
1381 return -1; 1347 return -1;
1382 } 1348 }
1383 } 1349 }
1384#ifndef NO_BACKSPACE_KEY 1350#ifndef NO_BACKSPACE_KEY
1385 if (key_backspace[0] && !key_backspace[1]) 1351 if (key_backspace[0] && !key_backspace[1])
1386 er = key_backspace[0]; 1352 er = key_backspace[0];
1387 else if (STRCMP(key_backspace, "DEC") == 0) 1353 else if (STRCMP (key_backspace, "DEC") == 0)
1388 er = '\177'; /* the initial state anyway */ 1354 er = '\177'; /* the initial state anyway */
1389 else 1355 else
1390#endif 1356#endif
1391 1357
1392 er = -1; 1358 er = -1;
1393 1359
1394 rxvt_get_ttymode (&(tio), er); 1360 rxvt_get_ttymode (& (tio), er);
1395 1361
1396#ifndef __QNX__ 1362#ifndef __QNX__
1397 /* spin off the command interpreter */ 1363 /* spin off the command interpreter */
1398 switch (cmd_pid = fork ()) 1364 switch (cmd_pid = fork ())
1399 { 1365 {
1400 case -1: 1366 case -1:
1401 rxvt_print_error("can't fork"); 1367 rxvt_print_error ("can't fork");
1402 return -1; 1368 return -1;
1403 case 0: 1369 case 0:
1404 close (cfd); /* only keep tty_fd and STDERR open */ 1370 close (cfd); /* only keep tty_fd and STDERR open */
1405 close (Xfd); 1371
1372 init_env ();
1373
1406 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1374 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1407 rxvt_print_error ("could not obtain control of tty"); 1375 rxvt_print_error ("could not obtain control of tty");
1408 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:
1409 { 1391 {
1410 /* 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);
1411 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
1412 dup2 (tty_fd, STDOUT_FILENO); 1405 dup2 (fdstdin, STDIN_FILENO);
1413 dup2 (tty_fd, STDERR_FILENO);
1414
1415 if (tty_fd > 2)
1416 close (tty_fd); 1406 close (fdstdin);
1407#endif
1417 1408
1418 run_child (argv);
1419 } 1409 }
1420 exit (EXIT_FAILURE);
1421 /* NOTREACHED */
1422 default:
1423 {
1424#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1425 int fdstdin;
1426
1427 fdstdin = dup (STDIN_FILENO);
1428 dup2 (tty_fd, STDIN_FILENO);
1429#endif
1430
1431 rxvt_privileged_utmp (this, SAVE);
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433
1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin);
1436#endif
1437
1438 }
1439 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1410 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1440 break; 1411 break;
1441 } 1412 }
1442#else /* __QNX__ uses qnxspawn() */ 1413#else /* __QNX__ uses qnxspawn () */
1443 fchmod (tty_fd, 0622); 1414 fchmod (tty_fd, 0622);
1444 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1415 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1445 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1416 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1446 1417
1447 if (run_child (argv) == -1) 1418 if (run_child (argv) == -1)
… …
1461int 1432int
1462rxvt_term::run_child (const char *const *argv) 1433rxvt_term::run_child (const char *const *argv)
1463{ 1434{
1464 char *login; 1435 char *login;
1465 1436
1466 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1437 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1467 1438
1468 if (Options & Opt_console) 1439 if (Options & Opt_console)
1469 { /* be virtual console, fail silently */ 1440 { /* be virtual console, fail silently */
1470#ifdef TIOCCONS 1441#ifdef TIOCCONS
1471 unsigned int on = 1; 1442 unsigned int on = 1;
… …
1479 { 1450 {
1480 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1451 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1481 close (fd); 1452 close (fd);
1482 } 1453 }
1483#endif /* SRIOCSREDIR */ 1454#endif /* SRIOCSREDIR */
1455
1484 } 1456 }
1485 1457
1486 /* reset signals and spin off the command interpreter */ 1458 /* reset signals and spin off the command interpreter */
1487 signal (SIGINT, SIG_DFL); 1459 signal (SIGINT, SIG_DFL);
1488 signal (SIGQUIT, SIG_DFL); 1460 signal (SIGQUIT, SIG_DFL);
… …
1516 { 1488 {
1517# ifdef DEBUG_CMD 1489# ifdef DEBUG_CMD
1518 int i; 1490 int i;
1519 1491
1520 for (i = 0; argv[i]; i++) 1492 for (i = 0; argv[i]; i++)
1521 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1493 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1522# endif 1494# endif
1523 1495
1524 execvp(argv[0], (char *const *)argv); 1496 execvp (argv[0], (char *const *)argv);
1525 /* no error message: STDERR is closed! */ 1497 /* no error message: STDERR is closed! */
1526 } 1498 }
1527 else 1499 else
1528 { 1500 {
1529 const char *argv0, *shell; 1501 const char *argv0, *shell;
1530 1502
1531 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1503 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1532 shell = "/bin/sh"; 1504 shell = "/bin/sh";
1533 1505
1534 argv0 = (const char *)rxvt_r_basename(shell); 1506 argv0 = (const char *)rxvt_r_basename (shell);
1535 if (Options & Opt_loginShell) 1507 if (Options & Opt_loginShell)
1536 { 1508 {
1537 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1509 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1538 1510
1539 login[0] = '-'; 1511 login[0] = '-';
1540 STRCPY(&login[1], argv0); 1512 STRCPY (&login[1], argv0);
1541 argv0 = login; 1513 argv0 = login;
1542 } 1514 }
1543 execlp(shell, argv0, NULL); 1515 execlp (shell, argv0, NULL);
1544 /* no error message: STDERR is closed! */ 1516 /* no error message: STDERR is closed! */
1545 } 1517 }
1546 1518
1547#else /* __QNX__ uses qnxspawn() */ 1519#else /* __QNX__ uses qnxspawn () */
1548 1520
1549 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 };
1550 char *command = NULL, fullcommand[_MAX_PATH]; 1522 char *command = NULL, fullcommand[_MAX_PATH];
1551 char **arg_v, *arg_a[2] = { NULL, NULL }; 1523 char **arg_v, *arg_a[2] = { NULL, NULL };
1552 1524
1553 if (argv != NULL) 1525 if (argv != NULL)
1554 { 1526 {
1555 if (access(argv[0], X_OK) == -1) 1527 if (access (argv[0], X_OK) == -1)
1556 { 1528 {
1557 if (STRCHR(argv[0], '/') == NULL) 1529 if (STRCHR (argv[0], '/') == NULL)
1558 { 1530 {
1559 searchenv(argv[0], "PATH", fullcommand); 1531 searchenv (argv[0], "PATH", fullcommand);
1560 if (fullcommand[0] != '\0') 1532 if (fullcommand[0] != '\0')
1561 command = fullcommand; 1533 command = fullcommand;
1562 } 1534 }
1563 if (access(command, X_OK) == -1) 1535 if (access (command, X_OK) == -1)
1564 return -1; 1536 return -1;
1565 } 1537 }
1566 else 1538 else
1567 command = argv[0]; 1539 command = argv[0];
1568 arg_v = argv; 1540 arg_v = argv;
1569 } 1541 }
1570 else 1542 else
1571 { 1543 {
1572 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1544 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1573 command = "/bin/sh"; 1545 command = "/bin/sh";
1574 1546
1575 arg_a[0] = my_basename(command); 1547 arg_a[0] = my_basename (command);
1576 if (Options & Opt_loginShell) 1548 if (Options & Opt_loginShell)
1577 { 1549 {
1578 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1550 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1579 1551
1580 login[0] = '-'; 1552 login[0] = '-';
1581 STRCPY(&login[1], arg_a[0]); 1553 STRCPY (&login[1], arg_a[0]);
1582 arg_a[0] = login; 1554 arg_a[0] = login;
1583 } 1555 }
1584 arg_v = arg_a; 1556 arg_v = arg_a;
1585 } 1557 }
1586 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1558 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1587 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1559 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1588 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1560 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1589 command, arg_v, environ, iov_a, 0); 1561 command, arg_v, environ, iov_a, 0);
1590 if (login) 1562 if (login)
1591 free(login); 1563 free (login);
1592 1564
1593 close(tty_fd); 1565 close (tty_fd);
1594 return cmd_fd; 1566 return cmd_fd;
1595 1567
1596#endif 1568#endif
1597 return -1; 1569 return -1;
1598} 1570}
1599 1571
1600/* ------------------------------------------------------------------------- * 1572/* ------------------------------------------------------------------------- *
1601 * GET TTY CURRENT STATE * 1573 * GET TTY CURRENT STATE *
1602 * ------------------------------------------------------------------------- */ 1574 * ------------------------------------------------------------------------- */
1603/* rxvt_get_ttymode() */ 1575/* rxvt_get_ttymode () */
1604/* INTPROTO */ 1576/* EXTPROTO */
1605void 1577void
1606rxvt_get_ttymode(ttymode_t *tio, int erase) 1578rxvt_get_ttymode (ttymode_t *tio, int erase)
1607{ 1579{
1608#ifdef HAVE_TERMIOS_H 1580#ifdef HAVE_TERMIOS_H
1609 /* 1581 /*
1610 * standard System V termios interface 1582 * standard System V termios interface
1611 */ 1583 */
1612 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1584 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1613 { 1585 {
1614 /* return error - use system defaults */ 1586 /* return error - use system defaults */
1615 tio->c_cc[VINTR] = CINTR; 1587 tio->c_cc[VINTR] = CINTR;
1616 tio->c_cc[VQUIT] = CQUIT; 1588 tio->c_cc[VQUIT] = CQUIT;
1617 tio->c_cc[VERASE] = CERASE; 1589 tio->c_cc[VERASE] = CERASE;
… …
1691 /* 1663 /*
1692 * sgtty interface 1664 * sgtty interface
1693 */ 1665 */
1694 1666
1695 /* get parameters -- gtty */ 1667 /* get parameters -- gtty */
1696 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1668 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1697 { 1669 {
1698 tio->sg.sg_erase = CERASE; /* ^H */ 1670 tio->sg.sg_erase = CERASE; /* ^H */
1699 tio->sg.sg_kill = CKILL; /* ^U */ 1671 tio->sg.sg_kill = CKILL; /* ^U */
1700 } 1672 }
1701 if (erase != -1) 1673 if (erase != -1)
1702 tio->sg.sg_erase = (char)erase; 1674 tio->sg.sg_erase = (char)erase;
1703 1675
1704 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1676 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1705 1677
1706 /* get special characters */ 1678 /* get special characters */
1707 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1679 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1708 { 1680 {
1709 tio->tc.t_intrc = CINTR; /* ^C */ 1681 tio->tc.t_intrc = CINTR; /* ^C */
1710 tio->tc.t_quitc = CQUIT; /* ^\ */ 1682 tio->tc.t_quitc = CQUIT; /* ^\ */
1711 tio->tc.t_startc = CSTART; /* ^Q */ 1683 tio->tc.t_startc = CSTART; /* ^Q */
1712 tio->tc.t_stopc = CSTOP; /* ^S */ 1684 tio->tc.t_stopc = CSTOP; /* ^S */
1713 tio->tc.t_eofc = CEOF; /* ^D */ 1685 tio->tc.t_eofc = CEOF; /* ^D */
1714 tio->tc.t_brkc = -1; 1686 tio->tc.t_brkc = -1;
1715 } 1687 }
1716 /* get local special chars */ 1688 /* get local special chars */
1717 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1689 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1718 { 1690 {
1719 tio->lc.t_suspc = CSUSP; /* ^Z */ 1691 tio->lc.t_suspc = CSUSP; /* ^Z */
1720 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1692 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1721 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1693 tio->lc.t_rprntc = CRPRNT; /* ^R */
1722 tio->lc.t_flushc = CFLUSH; /* ^O */ 1694 tio->lc.t_flushc = CFLUSH; /* ^O */
1723 tio->lc.t_werasc = CWERASE; /* ^W */ 1695 tio->lc.t_werasc = CWERASE; /* ^W */
1724 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1696 tio->lc.t_lnextc = CLNEXT; /* ^V */
1725 } 1697 }
1726 /* get line discipline */ 1698 /* get line discipline */
1727 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1699 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1728# ifdef NTTYDISC 1700# ifdef NTTYDISC
1729 1701
1730 tio->line = NTTYDISC; 1702 tio->line = NTTYDISC;
1731# endif /* NTTYDISC */ 1703# endif /* NTTYDISC */
1732 1704
… …
1737 * Debugging 1709 * Debugging
1738 */ 1710 */
1739#ifdef DEBUG_TTYMODE 1711#ifdef DEBUG_TTYMODE
1740#ifdef HAVE_TERMIOS_H 1712#ifdef HAVE_TERMIOS_H
1741 /* c_iflag bits */ 1713 /* c_iflag bits */
1742 fprintf(stderr, "Input flags\n"); 1714 fprintf (stderr, "Input flags\n");
1743 1715
1744 /* cpp token stringize doesn't work on all machines <sigh> */ 1716 /* cpp token stringize doesn't work on all machines <sigh> */
1745# define FOO(flag,name) \ 1717# define FOO(flag,name) \
1746 if ((tio->c_iflag) & flag) \ 1718 if ((tio->c_iflag) & flag) \
1747 fprintf (stderr, "%s ", name) 1719 fprintf (stderr, "%s ", name)
1748 1720
1749 /* c_iflag bits */ 1721 /* c_iflag bits */
1750 FOO(IGNBRK, "IGNBRK"); 1722 FOO (IGNBRK, "IGNBRK");
1751 FOO(BRKINT, "BRKINT"); 1723 FOO (BRKINT, "BRKINT");
1752 FOO(IGNPAR, "IGNPAR"); 1724 FOO (IGNPAR, "IGNPAR");
1753 FOO(PARMRK, "PARMRK"); 1725 FOO (PARMRK, "PARMRK");
1754 FOO(INPCK, "INPCK"); 1726 FOO (INPCK, "INPCK");
1755 FOO(ISTRIP, "ISTRIP"); 1727 FOO (ISTRIP, "ISTRIP");
1756 FOO(INLCR, "INLCR"); 1728 FOO (INLCR, "INLCR");
1757 FOO(IGNCR, "IGNCR"); 1729 FOO (IGNCR, "IGNCR");
1758 FOO(ICRNL, "ICRNL"); 1730 FOO (ICRNL, "ICRNL");
1759 FOO(IXON, "IXON"); 1731 FOO (IXON, "IXON");
1760 FOO(IXOFF, "IXOFF"); 1732 FOO (IXOFF, "IXOFF");
1761# ifdef IUCLC 1733# ifdef IUCLC
1762 1734
1763 FOO(IUCLC, "IUCLC"); 1735 FOO (IUCLC, "IUCLC");
1764# endif 1736# endif
1765# ifdef IXANY 1737# ifdef IXANY
1766 1738
1767 FOO(IXANY, "IXANY"); 1739 FOO (IXANY, "IXANY");
1768# endif 1740# endif
1769# ifdef IMAXBEL 1741# ifdef IMAXBEL
1770 1742
1771 FOO(IMAXBEL, "IMAXBEL"); 1743 FOO (IMAXBEL, "IMAXBEL");
1772# endif 1744# endif
1773 1745
1774 fprintf(stderr, "\n"); 1746 fprintf (stderr, "\n");
1775 1747
1776# undef FOO 1748# undef FOO
1777# define FOO(entry, name) \ 1749# define FOO(entry, name) \
1778 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1750 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1779 1751
1780 FOO(VINTR, "VINTR"); 1752 FOO (VINTR, "VINTR");
1781 FOO(VQUIT, "VQUIT"); 1753 FOO (VQUIT, "VQUIT");
1782 FOO(VERASE, "VERASE"); 1754 FOO (VERASE, "VERASE");
1783 FOO(VKILL, "VKILL"); 1755 FOO (VKILL, "VKILL");
1784 FOO(VEOF, "VEOF"); 1756 FOO (VEOF, "VEOF");
1785 FOO(VEOL, "VEOL"); 1757 FOO (VEOL, "VEOL");
1786# ifdef VEOL2 1758# ifdef VEOL2
1787 1759
1788 FOO(VEOL2, "VEOL2"); 1760 FOO (VEOL2, "VEOL2");
1789# endif 1761# endif
1790# ifdef VSWTC 1762# ifdef VSWTC
1791 1763
1792 FOO(VSWTC, "VSWTC"); 1764 FOO (VSWTC, "VSWTC");
1793# endif 1765# endif
1794# ifdef VSWTCH 1766# ifdef VSWTCH
1795 1767
1796 FOO(VSWTCH, "VSWTCH"); 1768 FOO (VSWTCH, "VSWTCH");
1797# endif 1769# endif
1798 1770
1799 FOO(VSTART, "VSTART"); 1771 FOO (VSTART, "VSTART");
1800 FOO(VSTOP, "VSTOP"); 1772 FOO (VSTOP, "VSTOP");
1801 FOO(VSUSP, "VSUSP"); 1773 FOO (VSUSP, "VSUSP");
1802# ifdef VDSUSP 1774# ifdef VDSUSP
1803 1775
1804 FOO(VDSUSP, "VDSUSP"); 1776 FOO (VDSUSP, "VDSUSP");
1805# endif 1777# endif
1806# ifdef VREPRINT 1778# ifdef VREPRINT
1807 1779
1808 FOO(VREPRINT, "VREPRINT"); 1780 FOO (VREPRINT, "VREPRINT");
1809# endif 1781# endif
1810# ifdef VDISCRD 1782# ifdef VDISCRD
1811 1783
1812 FOO(VDISCRD, "VDISCRD"); 1784 FOO (VDISCRD, "VDISCRD");
1813# endif 1785# endif
1814# ifdef VWERSE 1786# ifdef VWERSE
1815 1787
1816 FOO(VWERSE, "VWERSE"); 1788 FOO (VWERSE, "VWERSE");
1817# endif 1789# endif
1818# ifdef VLNEXT 1790# ifdef VLNEXT
1819 1791
1820 FOO(VLNEXT, "VLNEXT"); 1792 FOO (VLNEXT, "VLNEXT");
1821# endif 1793# endif
1822 1794
1823 fprintf(stderr, "\n"); 1795 fprintf (stderr, "\n");
1824# undef FOO 1796# undef FOO
1825# endif /* HAVE_TERMIOS_H */ 1797# endif /* HAVE_TERMIOS_H */
1826#endif /* DEBUG_TTYMODE */ 1798#endif /* DEBUG_TTYMODE */
1827} 1799}
1828 1800

Diff Legend

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