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.13 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.14 by pcg, Thu Dec 18 05:45:11 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.13 2003/12/18 02:07:12 pcg Exp $ 4 * $Id: init.C,v 1.14 2003/12/18 05:45:11 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * 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> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
350#endif 350#endif
351 "CLIPBOARD" 351 "CLIPBOARD"
352 }; 352 };
353 353
354bool 354bool
355rxvt_term::init_vars() 355rxvt_term::init_vars ()
356{ 356{
357 PixColors = new rxvt_color [TOTAL_COLORS]; 357 PixColors = new rxvt_color [TOTAL_COLORS];
358 if (PixColors == NULL) 358 if (PixColors == NULL)
359 return false; 359 return false;
360 360
… …
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 381 TermWin.int_bwidth = INTERNALBORDERWIDTH;
382 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 382 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
383 TermWin.lineSpace = LINESPACE; 383 TermWin.lineSpace = LINESPACE;
384 TermWin.saveLines = SAVELINES; 384 TermWin.saveLines = SAVELINES;
385 numPixColors = TOTAL_COLORS; 385 numPixColors = TOTAL_COLORS;
386
386#ifndef NO_NEW_SELECTION 387#ifndef NO_NEW_SELECTION
387
388 selection_style = NEW_SELECT; 388 selection_style = NEW_SELECT;
389#else 389#else
390
391 selection_style = OLD_SELECT; 390 selection_style = OLD_SELECT;
392#endif 391#endif
392
393#ifndef NO_BRIGHTCOLOR 393#ifndef NO_BRIGHTCOLOR
394
395 colorfgbg = DEFAULT_RSTYLE; 394 colorfgbg = DEFAULT_RSTYLE;
396#endif 395#endif
396
397#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 397#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
398
399 ks_bigfont = XK_greater; 398 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less; 399 ks_smallfont = XK_less;
401#endif 400#endif
401
402#ifdef GREEK_SUPPORT 402#ifdef GREEK_SUPPORT
403
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH; 403 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 404#endif
406 405
407 refresh_limit = 1; 406 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 407 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 408 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET 409#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING 410# ifdef MULTICHAR_ENCODING
412
413 encoding_method = MULTICHAR_ENCODING; 411 encoding_method = MULTICHAR_ENCODING;
414# endif 412# endif
415
416 multichar_decode = rxvt_euc2jis; 413 multichar_decode = rxvt_euc2jis;
417#endif 414#endif
418 415
419 oldcursor.row = oldcursor.col = -1; 416 oldcursor.row = oldcursor.col = -1;
420#ifdef XPM_BACKGROUND 417#ifdef XPM_BACKGROUND
… …
422 bgPixmap.x = bgPixmap.y = 50; 419 bgPixmap.x = bgPixmap.y = 50;
423 bgPixmap.pixmap = None; 420 bgPixmap.pixmap = None;
424#endif 421#endif
425 422
426 last_bot = last_state = -1; 423 last_bot = last_state = -1;
424
427#ifdef MENUBAR 425#ifdef MENUBAR
428
429 menu_readonly = 1; 426 menu_readonly = 1;
430# if !(MENUBAR_MAX > 1) 427# if !(MENUBAR_MAX > 1)
431
432 CurrentBar = &(BarList); 428 CurrentBar = &(BarList);
433# endif /* (MENUBAR_MAX > 1) */ 429# endif /* (MENUBAR_MAX > 1) */
434#endif 430#endif
435 431
436 return true; 432 return true;
437} 433}
438 434
439/* EXTPROTO */
440void 435void
441rxvt_init_secondary (pR) 436rxvt_term::init_secondary ()
442{ 437{
443 int i; 438 int i;
444#ifdef TTY_GID_SUPPORT 439#ifdef TTY_GID_SUPPORT
445 struct group *gr = getgrnam ("tty"); 440 struct group *gr = getgrnam ("tty");
446 441
447 if (gr) 442 if (gr)
448 { /* change group ownership of tty to "tty" */ 443 { /* change group ownership of tty to "tty" */
449 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
450 R->ttygid = gr->gr_gid; 445 ttygid = gr->gr_gid;
451 } 446 }
452 else 447 else
453#endif /* TTY_GID_SUPPORT */ 448#endif /* TTY_GID_SUPPORT */
454 { 449 {
455 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
456 R->ttygid = getgid (); 451 ttygid = getgid ();
457 } 452 }
458
459#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
460 R->locale = strdup (setlocale (LC_CTYPE, ""));
461#endif
462 453
463 /* 454 /*
464 * Close all unused file descriptors 455 * Close all unused file descriptors
465 * We don't want them, we don't need them. 456 * We don't want them, we don't need them.
466 */ 457 */
… …
474 dup2 (i, STDIN_FILENO); 465 dup2 (i, STDIN_FILENO);
475 close (i); 466 close (i);
476 } 467 }
477 468
478 dup2 (STDERR_FILENO, STDOUT_FILENO); 469 dup2 (STDERR_FILENO, STDOUT_FILENO);
470
479#if 0 // schmorp sayz closing filies is murder 471#if 0 // schmorp sayz closing filies is murder
480
481 for (i = STDERR_FILENO + 1; i < R->num_fds; i++) 472 for (i = STDERR_FILENO + 1; i < num_fds; i++)
482 { 473 {
483#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 474#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
484 if (i == 4 || i == 7) 475 if (i == 4 || i == 7)
485 continue; 476 continue;
486#endif 477#endif
487
488 close(i); 478 close(i);
489 } 479 }
490#endif 480#endif
491} 481}
492 482
493/*----------------------------------------------------------------------*/ 483/*----------------------------------------------------------------------*/
494/* EXTPROTO */
495const char ** 484const char **
496rxvt_init_resources (pR_ int argc, const char *const *argv) 485rxvt_term::init_resources (int argc, const char *const *argv)
497{ 486{
498 int i, r_argc; 487 int i, r_argc;
499 char *val; 488 char *val;
500 const char **cmd_argv, **r_argv; 489 const char **cmd_argv, **r_argv;
501 const char **rs;
502 490
503 /* 491 /*
504 * Look for -exec option. Find => split and make cmd_argv[] of command args 492 * Look for -exec option. Find => split and make cmd_argv[] of command args
505 */ 493 */
506 for (r_argc = 0; r_argc < argc; r_argc++) 494 for (r_argc = 0; r_argc < argc; r_argc++)
507 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 495 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec"))
508 break; 496 break;
497
509 r_argv = (const char **)rxvt_malloc(sizeof(char *) * (r_argc + 1)); 498 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1));
510 499
511 for (i = 0; i < r_argc; i++) 500 for (i = 0; i < r_argc; i++)
512 r_argv[i] = (const char *)argv[i]; 501 r_argv[i] = (const char *)argv[i];
502
513 r_argv[i] = NULL; 503 r_argv[i] = NULL;
504
514 if (r_argc == argc) 505 if (r_argc == argc)
515 cmd_argv = NULL; 506 cmd_argv = NULL;
516 else 507 else
517 { 508 {
518 cmd_argv = (const char **)rxvt_malloc(sizeof(char *) * (argc - r_argc)); 509 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc));
519 510
520 for (i = 0; i < argc - r_argc - 1; i++) 511 for (i = 0; i < argc - r_argc - 1; i++)
521 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 512 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
513
522 cmd_argv[i] = NULL; 514 cmd_argv[i] = NULL;
523 } 515 }
524 516
525 /* clear all resources */ 517 /* clear all resources */
526 rs = R->rs;
527 for (i = 0; i < NUM_RESOURCES;) 518 for (i = 0; i < NUM_RESOURCES;)
528 rs[i++] = NULL; 519 rs[i++] = NULL;
529 520
530 rs[Rs_name] = rxvt_r_basename(argv[0]); 521 rs[Rs_name] = rxvt_r_basename(argv[0]);
522
531 /* 523 /*
532 * Open display, get options/resources and create the window 524 * Open display, get options/resources and create the window
533 */ 525 */
534 if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) 526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
535 rs[Rs_display_name] = ":0"; 527 rs[Rs_display_name] = ":0";
536 528
537 rxvt_get_options(aR_ r_argc, r_argv); 529 rxvt_get_options (this, r_argc, r_argv);
538 free(r_argv); 530 free (r_argv);
539 531
540#ifdef LOCAL_X_IS_UNIX 532#ifdef LOCAL_X_IS_UNIX
541
542 if (rs[Rs_display_name][0] == ':') 533 if (rs[Rs_display_name][0] == ':')
543 { 534 {
544 val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name])); 535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
545 STRCPY(val, "unix"); 536 STRCPY (val, "unix");
546 STRCAT(val, rs[Rs_display_name]); 537 STRCAT (val, rs[Rs_display_name]);
547 R->Xdisplay = XOpenDisplay(val); 538 Xdisplay = XOpenDisplay (val);
548 free(val); 539 free (val);
549 } 540 }
550#endif 541#endif
551 542
552 if (R->Xdisplay == NULL 543 if (Xdisplay == NULL
553 && (R->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) 544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL)
554 { 545 {
555 rxvt_print_error("can't open display %s", rs[Rs_display_name]); 546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
556 exit(EXIT_FAILURE); 547 exit (EXIT_FAILURE);
557 } 548 }
558 549
559 rxvt_extract_resources(aR_ R->Xdisplay, rs[Rs_name]); 550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]);
560 551
561 /* 552 /*
562 * set any defaults not already set 553 * set any defaults not already set
563 */ 554 */
564 if (cmd_argv && cmd_argv[0]) 555 if (cmd_argv && cmd_argv[0])
… …
573 if (!rs[Rs_title]) 564 if (!rs[Rs_title])
574 rs[Rs_title] = rs[Rs_name]; 565 rs[Rs_title] = rs[Rs_name];
575 if (!rs[Rs_iconName]) 566 if (!rs[Rs_iconName])
576 rs[Rs_iconName] = rs[Rs_name]; 567 rs[Rs_iconName] = rs[Rs_name];
577 } 568 }
569
578 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 570 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0)
579 R->TermWin.saveLines = BOUND_POSITIVE_INT16(i); 571 TermWin.saveLines = BOUND_POSITIVE_INT16(i);
572
580#ifndef NO_FRILLS 573#ifndef NO_FRILLS
581
582 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 574 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0)
583 R->TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 575 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */
584 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 576 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0)
585 R->TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 577 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */
586#endif 578#endif
579
587#ifndef NO_LINESPACE 580#ifndef NO_LINESPACE
588
589 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 581 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0)
590 R->TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 582 TermWin.lineSpace = min(i, 100); /* arbitrary limit */
591#endif 583#endif
592 584
593#ifdef POINTER_BLANK 585#ifdef POINTER_BLANK
594
595 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 586 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0)
596 R->pointerBlankDelay = i; 587 pointerBlankDelay = i;
597 else 588 else
598 R->pointerBlankDelay = 2; 589 pointerBlankDelay = 2;
599#endif 590#endif
600 591
601 /* no point having a scrollbar without having any scrollback! */ 592 /* no point having a scrollbar without having any scrollback! */
602 if (!R->TermWin.saveLines) 593 if (!TermWin.saveLines)
603 R->Options &= ~Opt_scrollBar; 594 Options &= ~Opt_scrollBar;
604 595
605#ifdef PRINTPIPE 596#ifdef PRINTPIPE
606
607 if (!rs[Rs_print_pipe]) 597 if (!rs[Rs_print_pipe])
608 rs[Rs_print_pipe] = PRINTPIPE; 598 rs[Rs_print_pipe] = PRINTPIPE;
609#endif 599#endif
610 600
611 if (!rs[Rs_cutchars]) 601 if (!rs[Rs_cutchars])
612 rs[Rs_cutchars] = CUTCHARS; 602 rs[Rs_cutchars] = CUTCHARS;
603
613#ifdef ACS_ASCII 604#ifdef ACS_ASCII
614
615 if (!rs[Rs_acs_chars]) 605 if (!rs[Rs_acs_chars])
616 rs[Rs_acs_chars] = ACS_CHARS; 606 rs[Rs_acs_chars] = ACS_CHARS;
617 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 607 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
618 { 608 {
619 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 609 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
620 for (; i < 0x20; ) 610 for (; i < 0x20; )
621 val[i] = ' '; 611 val[i] = ' ';
622 rs[Rs_acs_chars] = val; 612 rs[Rs_acs_chars] = val;
623 } 613 }
624#endif 614#endif
615
625#ifndef NO_BACKSPACE_KEY 616#ifndef NO_BACKSPACE_KEY
626 if (!rs[Rs_backspace_key]) 617 if (!rs[Rs_backspace_key])
627# ifdef DEFAULT_BACKSPACE 618# ifdef DEFAULT_BACKSPACE
628
629 R->key_backspace = DEFAULT_BACKSPACE; 619 key_backspace = DEFAULT_BACKSPACE;
630# else 620# else
631
632 R->key_backspace = "DEC"; /* can toggle between \010 or \177 */ 621 key_backspace = "DEC"; /* can toggle between \010 or \177 */
633# endif 622# endif
634
635 else 623 else
636 { 624 {
637 val = STRDUP(rs[Rs_backspace_key]); 625 val = STRDUP(rs[Rs_backspace_key]);
638 rxvt_Str_trim(val); 626 rxvt_Str_trim(val);
639 rxvt_Str_escaped(val); 627 rxvt_Str_escaped(val);
640 R->key_backspace = val; 628 key_backspace = val;
641 } 629 }
642#endif 630#endif
631
643#ifndef NO_DELETE_KEY 632#ifndef NO_DELETE_KEY
644 if (!rs[Rs_delete_key]) 633 if (!rs[Rs_delete_key])
645# ifdef DEFAULT_DELETE 634# ifdef DEFAULT_DELETE
646
647 R->key_delete = DEFAULT_DELETE; 635 key_delete = DEFAULT_DELETE;
648# else 636# else
649
650 R->key_delete = "\033[3~"; 637 key_delete = "\033[3~";
651# endif 638# endif
652
653 else 639 else
654 { 640 {
655 val = STRDUP(rs[Rs_delete_key]); 641 val = STRDUP(rs[Rs_delete_key]);
656 rxvt_Str_trim(val); 642 rxvt_Str_trim(val);
657 rxvt_Str_escaped(val); 643 rxvt_Str_escaped(val);
658 R->key_delete = val; 644 key_delete = val;
659 } 645 }
660#endif 646#endif
661 if (rs[Rs_answerbackstring]) 647 if (rs[Rs_answerbackstring])
662 { 648 {
663 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 649 rxvt_Str_trim((char *)rs[Rs_answerbackstring]);
… …
665 } 651 }
666 652
667 if (rs[Rs_selectstyle]) 653 if (rs[Rs_selectstyle])
668 { 654 {
669 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 655 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
670 R->selection_style = OLD_WORD_SELECT; 656 selection_style = OLD_WORD_SELECT;
671#ifndef NO_OLD_SELECTION 657#ifndef NO_OLD_SELECTION
672 658
673 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
674 R->selection_style = OLD_SELECT; 660 selection_style = OLD_SELECT;
675#endif 661#endif
676
677 } 662 }
678 663
679#ifdef HAVE_SCROLLBARS 664#ifdef HAVE_SCROLLBARS
680 rxvt_setup_scrollbar(aR_ rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
681 rs[Rs_scrollBar_thickness]); 666 rs[Rs_scrollBar_thickness]);
682#endif 667#endif
683 668
684 R->TermWin.fontset = new rxvt_fontset (aR); 669 TermWin.fontset = new rxvt_fontset (this);
685 R->TermWin.fontset->populate (rs[Rs_font]); 670 TermWin.fontset->populate (rs[Rs_font]);
686 R->TermWin.fwidth = R->TermWin.fontset->base_font ()->width; 671 TermWin.fwidth = TermWin.fontset->base_font ()->width;
687 R->TermWin.fheight = R->TermWin.fontset->base_font ()->height; 672 TermWin.fheight = TermWin.fontset->base_font ()->height;
688 R->TermWin.fbase = R->TermWin.fontset->base_font ()->ascent; 673 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
689 674
690#ifdef XTERM_REVERSE_VIDEO 675#ifdef XTERM_REVERSE_VIDEO
691 /* this is how xterm implements reverseVideo */ 676 /* this is how xterm implements reverseVideo */
692 if (R->Options & Opt_reverseVideo) 677 if (Options & Opt_reverseVideo)
693 { 678 {
694 if (!rs[Rs_color + Color_fg]) 679 if (!rs[Rs_color + Color_fg])
695 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 680 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
696 if (!rs[Rs_color + Color_bg]) 681 if (!rs[Rs_color + Color_bg])
697 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 682 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
702 if (!rs[Rs_color + i]) 687 if (!rs[Rs_color + i])
703 rs[Rs_color + i] = def_colorName[i]; 688 rs[Rs_color + i] = def_colorName[i];
704 689
705#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
706 /* this is how we implement reverseVideo */ 691 /* this is how we implement reverseVideo */
707 if (R->Options & Opt_reverseVideo) 692 if (Options & Opt_reverseVideo)
708 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 693 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
709#endif 694#endif
710 695
711 /* convenient aliases for setting fg/bg to colors */ 696 /* convenient aliases for setting fg/bg to colors */
712 rxvt_color_aliases(aR_ Color_fg); 697 color_aliases (Color_fg);
713 rxvt_color_aliases(aR_ Color_bg); 698 color_aliases (Color_bg);
714#ifndef NO_CURSORCOLOR 699#ifndef NO_CURSORCOLOR
715
716 rxvt_color_aliases(aR_ Color_cursor); 700 color_aliases (Color_cursor);
717 rxvt_color_aliases(aR_ Color_cursor2); 701 color_aliases (Color_cursor2);
718#endif /* NO_CURSORCOLOR */ 702#endif /* NO_CURSORCOLOR */
719
720 rxvt_color_aliases(aR_ Color_pointer); 703 color_aliases (Color_pointer);
721 rxvt_color_aliases(aR_ Color_border); 704 color_aliases (Color_border);
722#ifndef NO_BOLD_UNDERLINE_REVERSE 705#ifndef NO_BOLD_UNDERLINE_REVERSE
723
724 rxvt_color_aliases(aR_ Color_BD); 706 color_aliases (Color_BD);
725 rxvt_color_aliases(aR_ Color_UL); 707 color_aliases (Color_UL);
726 rxvt_color_aliases(aR_ Color_RV); 708 color_aliases (Color_RV);
727#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 709#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
728 710
729 return cmd_argv; 711 return cmd_argv;
730} 712}
731 713
732/*----------------------------------------------------------------------*/ 714/*----------------------------------------------------------------------*/
733/* EXTPROTO */
734void 715void
735rxvt_init_env(pR) 716rxvt_term::init_env ()
736{ 717{
737 int i; 718 int i;
738 unsigned int u; 719 unsigned int u;
739 char *val; 720 char *val;
740 721
741#ifdef DISPLAY_IS_IP 722#ifdef DISPLAY_IS_IP
742 /* Fixup display_name for export over pty to any interested terminal 723 /* Fixup display_name for export over pty to any interested terminal
743 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 724 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
744 * (for the first non-loopback interface) that we get from 725 * (for the first non-loopback interface) that we get from
… …
747 * server is beyond a slow link or overloaded at client startup. Of 728 * server is beyond a slow link or overloaded at client startup. Of
748 * course that only helps the shell's child processes, not us. 729 * course that only helps the shell's child processes, not us.
749 * 730 *
750 * Giving out the display_name also affords a potential security hole 731 * Giving out the display_name also affords a potential security hole
751 */ 732 */
752 val = rxvt_network_display(R->rs[Rs_display_name]); 733 val = rxvt_network_display (rs[Rs_display_name]);
753 R->rs[Rs_display_name] = (const char *)val; 734 rs[Rs_display_name] = (const char *)val;
735
754 if (val == NULL) 736 if (val == NULL)
755#endif /* DISPLAY_IS_IP */ 737#endif /* DISPLAY_IS_IP */
756
757 val = XDisplayString(R->Xdisplay); 738 val = XDisplayString(Xdisplay);
739
758 if (R->rs[Rs_display_name] == NULL) 740 if (rs[Rs_display_name] == NULL)
759 R->rs[Rs_display_name] = val; /* use broken `:0' value */ 741 rs[Rs_display_name] = val; /* use broken `:0' value */
760 742
761 i = STRLEN(val); 743 i = STRLEN (val);
762 R->env_display = (char *)rxvt_malloc((i + 9) * sizeof(char)); 744 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char));
763 745
764 sprintf(R->env_display, "DISPLAY=%s", val); 746 sprintf (env_display, "DISPLAY=%s", val);
765 747
766 /* avoiding the math library: 748 /* avoiding the math library:
767 * i = (int)(ceil(log10((unsigned int)R->TermWin.parent[0]))) */ 749 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */
768 for (i = 0, u = (unsigned int)R->TermWin.parent[0]; u; u /= 10, i++) 750 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
769 ; 751 ;
770 MAX_IT(i, 1); 752 MAX_IT(i, 1);
771 R->env_windowid = (char *)rxvt_malloc((i + 10) * sizeof(char)); 753 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char));
772 754
773 sprintf(R->env_windowid, "WINDOWID=%u", 755 sprintf (env_windowid, "WINDOWID=%u",
774 (unsigned int)R->TermWin.parent[0]); 756 (unsigned int)TermWin.parent[0]);
775 757
776 /* add entries to the environment: 758 /* add entries to the environment:
777 * @ DISPLAY: in case we started with -display 759 * @ DISPLAY: in case we started with -display
778 * @ WINDOWID: X window id number of the window 760 * @ WINDOWID: X window id number of the window
779 * @ COLORTERM: terminal sub-name and also indicates its color 761 * @ COLORTERM: terminal sub-name and also indicates its color
780 * @ TERM: terminal name 762 * @ TERM: terminal name
781 * @ TERMINFO: path to terminfo directory 763 * @ TERMINFO: path to terminfo directory
782 */ 764 */
783 putenv(R->env_display); 765 putenv (env_display);
784 putenv(R->env_windowid); 766 putenv (env_windowid);
767
785#ifdef RXVT_TERMINFO 768#ifdef RXVT_TERMINFO
786
787 putenv("TERMINFO=" RXVT_TERMINFO); 769 putenv ("TERMINFO=" RXVT_TERMINFO);
788#endif 770#endif
789 771
790 if (XDEPTH <= 2) 772 if (Xdepth <= 2)
791 putenv("COLORTERM=" COLORTERMENV "-mono"); 773 putenv ("COLORTERM=" COLORTERMENV "-mono");
792 else 774 else
793 putenv("COLORTERM=" COLORTERMENVFULL); 775 putenv ("COLORTERM=" COLORTERMENVFULL);
776
794 if (R->rs[Rs_term_name] != NULL) 777 if (rs[Rs_term_name] != NULL)
795 { 778 {
796 R->env_term = (char *)rxvt_malloc((STRLEN(R->rs[Rs_term_name]) + 6) * sizeof(char)); 779 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char));
797 sprintf(R->env_term, "TERM=%s", R->rs[Rs_term_name]); 780 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
798 putenv(R->env_term); 781 putenv (env_term);
799 } 782 }
800 else 783 else
801 putenv("TERM=" TERMENV); 784 putenv ("TERM=" TERMENV);
802 785
803#ifdef HAVE_UNSETENV 786#ifdef HAVE_UNSETENV
804 /* avoid passing old settings and confusing term size */ 787 /* avoid passing old settings and confusing term size */
805 unsetenv("LINES"); 788 unsetenv ("LINES");
806 unsetenv("COLUMNS"); 789 unsetenv ("COLUMNS");
807 unsetenv("TERMCAP"); /* terminfo should be okay */ 790 unsetenv ("TERMCAP"); /* terminfo should be okay */
808#endif /* HAVE_UNSETENV */ 791#endif /* HAVE_UNSETENV */
809} 792}
810 793
811/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
812/* 795/*
813 * This is more or less stolen straight from XFree86 xterm. 796 * This is more or less stolen straight from XFree86 xterm.
814 * This should support all European type languages. 797 * This should support all European type languages.
815 */ 798 */
816/* EXTPROTO */
817void 799void
818rxvt_init_xlocale(pR) 800rxvt_term::init_xlocale ()
819{ 801{
820#ifdef USE_XIM 802#ifdef USE_XIM
821 if (R->locale == NULL) 803 if (!locale)
822 rxvt_print_error("Setting locale failed."); 804 rxvt_print_error ("Setting locale failed.");
823 else 805 else
824 { 806 {
825 Atom wmlocale; 807 Atom wmlocale;
826 808
827 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 809 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False);
828 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 810 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 811 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)R->locale, STRLEN(R->locale)); 812 (unsigned char *)locale, STRLEN(locale));
831 813
832 if (XSupportsLocale() != True) 814 if (!XSupportsLocale ())
833 { 815 {
834 rxvt_print_error("The locale is not supported by Xlib"); 816 rxvt_print_error ("The locale is not supported by Xlib");
835 return; 817 return;
836 } 818 }
837 819
838 rxvt_setTermFontSet(aR_ 0); 820 rxvt_setTermFontSet (this, 0);
839 821
840 /* see if we can connect yet */ 822 /* see if we can connect yet */
841 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 823 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL);
842 824
843 /* To avoid Segmentation Fault in C locale: Solaris only? */ 825 /* To avoid Segmentation Fault in C locale: Solaris only? */
844 if (STRCMP(R->locale, "C")) 826 if (STRCMP (locale, "C"))
845 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 827 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
846 rxvt_IMInstantiateCallback, NULL); 828 rxvt_IMInstantiateCallback, NULL);
847 } 829 }
848#endif 830#endif
849} 831}
850 832
851/*----------------------------------------------------------------------*/ 833/*----------------------------------------------------------------------*/
852/* EXTPROTO */
853void 834void
854rxvt_init_command(pR_ const char *const *argv) 835rxvt_term::init_command(const char *const *argv)
855{ 836{
856 /* 837 /*
857 * Initialize the command connection. 838 * Initialize the command connection.
858 * This should be called after the X server connection is established. 839 * This should be called after the X server connection is established.
859 */ 840 */
860 int i; 841 int i;
861 842
862 for (i = 0; i < NUM_XA; i++) 843 for (i = 0; i < NUM_XA; i++)
863 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 844 xa[i] = XInternAtom(Xdisplay, xa_names[i], False);
864 845
865 /* Enable delete window protocol */ 846 /* Enable delete window protocol */
866 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 847 XSetWMProtocols (Xdisplay, TermWin.parent[0],
867 &(R->xa[XA_WMDELETEWINDOW]), 1); 848 &(xa[XA_WMDELETEWINDOW]), 1);
868 849
869#ifdef USING_W11LIB 850#ifdef USING_W11LIB
870 /* enable W11 callbacks */ 851 /* enable W11 callbacks */
871 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 852 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event);
872#endif 853#endif
873 854
874#ifdef META8_OPTION 855#ifdef META8_OPTION
875
876 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 856 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
877#endif 857#endif
878 858
879 rxvt_get_ourmods(aR); 859 rxvt_get_ourmods (this);
880 860
881 if (!(R->Options & Opt_scrollTtyOutput)) 861 if (!(Options & Opt_scrollTtyOutput))
882 R->PrivateModes |= PrivMode_TtyOutputInh; 862 PrivateModes |= PrivMode_TtyOutputInh;
883 if (R->Options & Opt_scrollTtyKeypress) 863 if (Options & Opt_scrollTtyKeypress)
884 R->PrivateModes |= PrivMode_Keypress; 864 PrivateModes |= PrivMode_Keypress;
885 if (!(R->Options & Opt_jumpScroll)) 865 if (!(Options & Opt_jumpScroll))
886 R->PrivateModes |= PrivMode_smoothScroll; 866 PrivateModes |= PrivMode_smoothScroll;
867
887#ifndef NO_BACKSPACE_KEY 868#ifndef NO_BACKSPACE_KEY
888
889 if (STRCMP(R->key_backspace, "DEC") == 0) 869 if (STRCMP(key_backspace, "DEC") == 0)
890 R->PrivateModes |= PrivMode_HaveBackSpace; 870 PrivateModes |= PrivMode_HaveBackSpace;
891#endif 871#endif
872
892 /* add value for scrollBar */ 873 /* add value for scrollBar */
893 if (scrollbar_visible(R)) 874 if (scrollbar_visible (this))
894 { 875 {
895 R->PrivateModes |= PrivMode_scrollBar; 876 PrivateModes |= PrivMode_scrollBar;
896 R->SavedModes |= PrivMode_scrollBar; 877 SavedModes |= PrivMode_scrollBar;
897 } 878 }
898 if (menubar_visible(R)) 879 if (menubar_visible (this))
899 { 880 {
900 R->PrivateModes |= PrivMode_menuBar; 881 PrivateModes |= PrivMode_menuBar;
901 R->SavedModes |= PrivMode_menuBar; 882 SavedModes |= PrivMode_menuBar;
902 } 883 }
884
903#ifdef GREEK_SUPPORT 885#ifdef GREEK_SUPPORT
904 greek_init(); 886 greek_init();
905#endif 887#endif
906 888
907 R->Xfd = XConnectionNumber (R->Xdisplay); 889 Xfd = XConnectionNumber (Xdisplay);
908 890
909#ifdef CURSOR_BLINK 891#ifdef CURSOR_BLINK
910 892
911 if (R->Options & Opt_cursorBlink) 893 if (Options & Opt_cursorBlink)
912 (void)gettimeofday(&R->lastcursorchange, NULL); 894 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 895#endif
914 896
915 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 897 if ((cmd_fd = run_command (argv)) < 0)
916 { 898 {
917 rxvt_print_error ("aborting"); 899 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE); 900 exit (EXIT_FAILURE);
919 } 901 }
920} 902}
921 903
922/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
923/* INTPROTO */ 905/* INTPROTO */
924void 906void
925rxvt_Get_Colours(pR) 907rxvt_Get_Colours (pR)
926{ 908{
927 int i; 909 int i;
928 910
929 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 911 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
930 { 912 {
931 rxvt_color xcol; 913 rxvt_color xcol;
932 914
933 if (!R->rs[Rs_color + i]) 915 if (!R->rs[Rs_color + i])
934 continue; 916 continue;
935 917
936 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 918 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
… …
940 { 922 {
941 R->rs[Rs_color + i] = def_colorName[!i]; 923 R->rs[Rs_color + i] = def_colorName[!i];
942 } 924 }
943 else 925 else
944#endif 926#endif
945
946 R->rs[Rs_color + i] = def_colorName[i]; 927 R->rs[Rs_color + i] = def_colorName[i];
928
947 if (!R->rs[Rs_color + i]) 929 if (!R->rs[Rs_color + i])
948 continue; 930 continue;
931
949 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 932 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
950 { 933 {
951 switch (i) 934 switch (i)
952 { 935 {
953 case Color_fg: 936 case Color_fg:
954 case Color_bg: 937 case Color_bg:
955 /* fatal: need bg/fg color */ 938 /* fatal: need bg/fg color */
956 rxvt_print_error("aborting"); 939 rxvt_print_error ("aborting");
957 exit(EXIT_FAILURE); 940 exit (EXIT_FAILURE);
958 /* NOTREACHED */ 941 /* NOTREACHED */
959 break; 942 break;
960#ifndef NO_CURSORCOLOR 943#ifndef NO_CURSORCOLOR
961
962 case Color_cursor2: 944 case Color_cursor2:
963 xcol = R->PixColors[Color_fg]; 945 xcol = R->PixColors[Color_fg];
964 break; 946 break;
965#endif /* ! NO_CURSORCOLOR */ 947#endif /* ! NO_CURSORCOLOR */
966
967 case Color_pointer: 948 case Color_pointer:
968 xcol = R->PixColors[Color_fg]; 949 xcol = R->PixColors[Color_fg];
969 break; 950 break;
970 default: 951 default:
971 xcol = R->PixColors[Color_bg]; /* None */ 952 xcol = R->PixColors[Color_bg]; /* None */
972 break; 953 break;
973 } 954 }
974 } 955 }
975 } 956 }
957
976 R->PixColors[i] = xcol; 958 R->PixColors[i] = xcol;
977 SET_PIXCOLOR(R, i); 959 SET_PIXCOLOR (R, i);
978 } 960 }
979 961
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 962 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer])
981 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 963 R->PixColors[Color_pointer] = R->PixColors[Color_fg];
982 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 964 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border])
… …
1034#endif /* KEEP_SCROLLCOLOR */ 1016#endif /* KEEP_SCROLLCOLOR */
1035} 1017}
1036 1018
1037/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
1038/* color aliases, fg/bg bright-bold */ 1020/* color aliases, fg/bg bright-bold */
1039/* INTPROTO */
1040void 1021void
1041rxvt_color_aliases(pR_ int idx) 1022rxvt_term::color_aliases(int idx)
1042{ 1023{
1043 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 1024 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx])))
1044 { 1025 {
1045 int i = atoi(R->rs[Rs_color + idx]); 1026 int i = atoi (rs[Rs_color + idx]);
1046 1027
1047 if (i >= 8 && i <= 15) 1028 if (i >= 8 && i <= 15)
1048 { /* bright colors */ 1029 { /* bright colors */
1049 i -= 8; 1030 i -= 8;
1050#ifndef NO_BRIGHTCOLOR 1031#ifndef NO_BRIGHTCOLOR
1051 1032
1052 R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; 1033 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1053 return; 1034 return;
1054#endif 1035#endif
1055 1036
1056 } 1037 }
1057 if (i >= 0 && i <= 7) /* normal colors */ 1038 if (i >= 0 && i <= 7) /* normal colors */
1058 R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; 1039 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1059 } 1040 }
1060} 1041}
1061 1042
1062/*----------------------------------------------------------------------*/ 1043/*----------------------------------------------------------------------*/
1063/* 1044/*
… …
1350/* 1331/*
1351 * Run the command in a subprocess and return a file descriptor for the 1332 * Run the command in a subprocess and return a file descriptor for the
1352 * master end of the pseudo-teletype pair with the command talking to 1333 * master end of the pseudo-teletype pair with the command talking to
1353 * the slave. 1334 * the slave.
1354 */ 1335 */
1355/* INTPROTO */
1356int 1336int
1357rxvt_run_command(pR_ const char *const *argv) 1337rxvt_term::run_command (const char *const *argv)
1358{ 1338{
1359 int cfd, er; 1339 int cfd, er;
1360 1340
1361 /* get master (pty) */ 1341 /* get master (pty) */
1362 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1342 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0)
1363 { 1343 {
1364 rxvt_print_error("can't open pseudo-tty"); 1344 rxvt_print_error("can't open pseudo-tty");
1365 return -1; 1345 return -1;
1366 } 1346 }
1367 1347
1368#ifdef FD_SETSIZE 1348#ifdef FD_SETSIZE
1369 if (R->Xfd > FD_SETSIZE || cfd > FD_SETSIZE) 1349 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1370 { 1350 {
1371 rxvt_print_error("fd too high: %d max", FD_SETSIZE); 1351 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1372 rxvt_clean_exit(); 1352 rxvt_clean_exit();
1373 exit(EXIT_FAILURE); 1353 exit(EXIT_FAILURE);
1374 } 1354 }
1375#endif 1355#endif
1376 1356
1377 fcntl (cfd, F_SETFL, O_NONBLOCK); 1357 fcntl (cfd, F_SETFL, O_NONBLOCK);
1378 1358
1379 /* get slave (tty) */ 1359 /* get slave (tty) */
1380 if (R->tty_fd < 0) 1360 if (tty_fd < 0)
1381 { 1361 {
1382#ifndef NO_SETOWNER_TTYDEV 1362#ifndef NO_SETOWNER_TTYDEV
1383 rxvt_privileged_ttydev (aR_ SAVE); 1363 rxvt_privileged_ttydev (aR_ SAVE);
1384#endif 1364#endif
1385 1365
1386 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1366 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1387 { 1367 {
1388 close(cfd); 1368 close(cfd);
1389 rxvt_print_error("can't open slave tty %s", R->ttydev); 1369 rxvt_print_error("can't open slave tty %s", ttydev);
1390 return -1; 1370 return -1;
1391 } 1371 }
1392 } 1372 }
1393#ifndef NO_BACKSPACE_KEY 1373#ifndef NO_BACKSPACE_KEY
1394 if (R->key_backspace[0] && !R->key_backspace[1]) 1374 if (key_backspace[0] && !key_backspace[1])
1395 er = R->key_backspace[0]; 1375 er = key_backspace[0];
1396 else if (STRCMP(R->key_backspace, "DEC") == 0) 1376 else if (STRCMP(key_backspace, "DEC") == 0)
1397 er = '\177'; /* the initial state anyway */ 1377 er = '\177'; /* the initial state anyway */
1398 else 1378 else
1399#endif 1379#endif
1400 1380
1401 er = -1; 1381 er = -1;
1402 1382
1403 rxvt_get_ttymode (&(R->tio), er); 1383 rxvt_get_ttymode (&(tio), er);
1404 1384
1405#ifndef __QNX__ 1385#ifndef __QNX__
1406 /* spin off the command interpreter */ 1386 /* spin off the command interpreter */
1407 switch (R->cmd_pid = fork ()) 1387 switch (cmd_pid = fork ())
1408 { 1388 {
1409 case -1: 1389 case -1:
1410 rxvt_print_error("can't fork"); 1390 rxvt_print_error("can't fork");
1411 return -1; 1391 return -1;
1412 case 0: 1392 case 0:
1413 close (cfd); /* only keep R->tty_fd and STDERR open */ 1393 close (cfd); /* only keep tty_fd and STDERR open */
1414 close (R->Xfd); 1394 close (Xfd);
1415 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1395 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1416 rxvt_print_error ("could not obtain control of tty"); 1396 rxvt_print_error ("could not obtain control of tty");
1417 else 1397 else
1418 { 1398 {
1419 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1399 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1420 dup2 (R->tty_fd, STDIN_FILENO); 1400 dup2 (tty_fd, STDIN_FILENO);
1421 dup2 (R->tty_fd, STDOUT_FILENO); 1401 dup2 (tty_fd, STDOUT_FILENO);
1422 dup2 (R->tty_fd, STDERR_FILENO); 1402 dup2 (tty_fd, STDERR_FILENO);
1423 1403
1424 if (R->tty_fd > 2) 1404 if (tty_fd > 2)
1425 close (R->tty_fd); 1405 close (tty_fd);
1426 1406
1427 rxvt_run_child (aR_ argv); 1407 run_child (argv);
1428 } 1408 }
1429 exit (EXIT_FAILURE); 1409 exit (EXIT_FAILURE);
1430 /* NOTREACHED */ 1410 /* NOTREACHED */
1431 default: 1411 default:
1432 { 1412 {
1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1413#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1434 int fdstdin; 1414 int fdstdin;
1435 1415
1436 fdstdin = dup (STDIN_FILENO); 1416 fdstdin = dup (STDIN_FILENO);
1437 dup2 (R->tty_fd, STDIN_FILENO); 1417 dup2 (tty_fd, STDIN_FILENO);
1438#endif 1418#endif
1439 1419
1440 rxvt_privileged_utmp (aR_ SAVE); 1420 rxvt_privileged_utmp (this, SAVE);
1441#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1442 1422
1443 dup2 (fdstdin, STDIN_FILENO); 1423 dup2 (fdstdin, STDIN_FILENO);
1444 close (fdstdin); 1424 close (fdstdin);
1445#endif 1425#endif
1446 1426
1447 } 1427 }
1448 close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ 1428 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */
1449 break; 1429 break;
1450 } 1430 }
1451#else /* __QNX__ uses qnxspawn() */ 1431#else /* __QNX__ uses qnxspawn() */
1452 fchmod (R->tty_fd, 0622); 1432 fchmod (tty_fd, 0622);
1453 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1433 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1454 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1434 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1455 1435
1456 if (rxvt_run_child (aR_ argv) == -1) 1436 if (run_child (argv) == -1)
1457 exit (EXIT_FAILURE); 1437 exit (EXIT_FAILURE);
1458#endif 1438#endif
1459 1439
1460 return cfd; 1440 return cfd;
1461} 1441}
… …
1465 * ------------------------------------------------------------------------- */ 1445 * ------------------------------------------------------------------------- */
1466/* 1446/*
1467 * The only open file descriptor is the slave tty - so no error messages. 1447 * The only open file descriptor is the slave tty - so no error messages.
1468 * returns are fatal 1448 * returns are fatal
1469 */ 1449 */
1470/* INTPROTO */
1471int 1450int
1472rxvt_run_child(pR_ const char *const *argv) 1451rxvt_term::run_child (const char *const *argv)
1473{ 1452{
1474 char *login; 1453 char *login;
1475 1454
1476 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1455 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */
1477 1456
1478 if (R->Options & Opt_console) 1457 if (Options & Opt_console)
1479 { /* be virtual console, fail silently */ 1458 { /* be virtual console, fail silently */
1480#ifdef TIOCCONS 1459#ifdef TIOCCONS
1481 unsigned int on = 1; 1460 unsigned int on = 1;
1482 1461
1483 ioctl (STDIN_FILENO, TIOCCONS, &on); 1462 ioctl (STDIN_FILENO, TIOCCONS, &on);
1484#elif defined (SRIOCSREDIR) 1463#elif defined (SRIOCSREDIR)
1485
1486 int fd; 1464 int fd;
1487 1465
1488 fd = open (CONSOLE, O_WRONLY, 0); 1466 fd = open (CONSOLE, O_WRONLY, 0);
1489 if (fd >= 0) 1467 if (fd >= 0)
1490 { 1468 {
1491 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1469 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1492 close (fd); 1470 close (fd);
1493 } 1471 }
1494#endif /* SRIOCSREDIR */ 1472#endif /* SRIOCSREDIR */
1495
1496 } 1473 }
1497 1474
1498 /* reset signals and spin off the command interpreter */ 1475 /* reset signals and spin off the command interpreter */
1499 signal (SIGINT, SIG_DFL); 1476 signal (SIGINT, SIG_DFL);
1500 signal (SIGQUIT, SIG_DFL); 1477 signal (SIGQUIT, SIG_DFL);
… …
1502 /* 1479 /*
1503 * mimick login's behavior by disabling the job control signals 1480 * mimick login's behavior by disabling the job control signals
1504 * a shell that wants them can turn them back on 1481 * a shell that wants them can turn them back on
1505 */ 1482 */
1506#ifdef SIGTSTP 1483#ifdef SIGTSTP
1507
1508 signal (SIGTSTP, SIG_IGN); 1484 signal (SIGTSTP, SIG_IGN);
1509 signal (SIGTTIN, SIG_IGN); 1485 signal (SIGTTIN, SIG_IGN);
1510 signal (SIGTTOU, SIG_IGN); 1486 signal (SIGTTOU, SIG_IGN);
1511#endif /* SIGTSTP */ 1487#endif /* SIGTSTP */
1512 1488
1513 /* set window size */ 1489 /* set window size */
1514 struct winsize ws; 1490 struct winsize ws;
1515 1491
1516 ws.ws_col = R->TermWin.ncol; 1492 ws.ws_col = TermWin.ncol;
1517 ws.ws_row = R->TermWin.nrow; 1493 ws.ws_row = TermWin.nrow;
1518 ws.ws_xpixel = ws.ws_ypixel = 0; 1494 ws.ws_xpixel = ws.ws_ypixel = 0;
1519 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1495 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1520 1496
1521 // unblock signals (signals are blocked by iom.C 1497 // unblock signals (signals are blocked by iom.C
1522 sigset_t ss; 1498 sigset_t ss;
… …
1543 1519
1544 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1520 if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
1545 shell = "/bin/sh"; 1521 shell = "/bin/sh";
1546 1522
1547 argv0 = (const char *)rxvt_r_basename(shell); 1523 argv0 = (const char *)rxvt_r_basename(shell);
1548 if (R->Options & Opt_loginShell) 1524 if (Options & Opt_loginShell)
1549 { 1525 {
1550 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1526 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char));
1551 1527
1552 login[0] = '-'; 1528 login[0] = '-';
1553 STRCPY(&login[1], argv0); 1529 STRCPY(&login[1], argv0);
1554 argv0 = login; 1530 argv0 = login;
1555 } 1531 }
1556 execlp(shell, argv0, NULL); 1532 execlp(shell, argv0, NULL);
1557 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1558 } 1534 }
1535
1559#else /* __QNX__ uses qnxspawn() */ 1536#else /* __QNX__ uses qnxspawn() */
1560 { 1537
1561 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1538 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1562 char *command = NULL, fullcommand[_MAX_PATH]; 1539 char *command = NULL, fullcommand[_MAX_PATH];
1563 char **arg_v, *arg_a[2] = { NULL, NULL }; 1540 char **arg_v, *arg_a[2] = { NULL, NULL };
1564 1541
1565 if (argv != NULL) 1542 if (argv != NULL)
1566 { 1543 {
1567 if (access(argv[0], X_OK) == -1) 1544 if (access(argv[0], X_OK) == -1)
1568 { 1545 {
1569 if (STRCHR(argv[0], '/') == NULL) 1546 if (STRCHR(argv[0], '/') == NULL)
1570 { 1547 {
1571 searchenv(argv[0], "PATH", fullcommand); 1548 searchenv(argv[0], "PATH", fullcommand);
1572 if (fullcommand[0] != '\0') 1549 if (fullcommand[0] != '\0')
1573 command = fullcommand; 1550 command = fullcommand;
1574 } 1551 }
1575 if (access(command, X_OK) == -1) 1552 if (access(command, X_OK) == -1)
1576 return -1; 1553 return -1;
1577 } 1554 }
1578 else 1555 else
1579 command = argv[0]; 1556 command = argv[0];
1580 arg_v = argv; 1557 arg_v = argv;
1581 } 1558 }
1582 else 1559 else
1583 { 1560 {
1584 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1561 if ((command = getenv("SHELL")) == NULL || *command == '\0')
1585 command = "/bin/sh"; 1562 command = "/bin/sh";
1586 1563
1587 arg_a[0] = my_basename(command); 1564 arg_a[0] = my_basename(command);
1588 if (R->Options & Opt_loginShell) 1565 if (Options & Opt_loginShell)
1589 { 1566 {
1590 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1567 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char));
1591 1568
1592 login[0] = '-'; 1569 login[0] = '-';
1593 STRCPY(&login[1], arg_a[0]); 1570 STRCPY(&login[1], arg_a[0]);
1594 arg_a[0] = login; 1571 arg_a[0] = login;
1595 } 1572 }
1596 arg_v = arg_a; 1573 arg_v = arg_a;
1597 } 1574 }
1598 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1575 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1599 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1576 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1600 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1577 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1601 command, arg_v, environ, iov_a, 0); 1578 command, arg_v, environ, iov_a, 0);
1602 if (login) 1579 if (login)
1603 free(login); 1580 free(login);
1581
1604 close(R->tty_fd); 1582 close(tty_fd);
1605 return R->cmd_fd; 1583 return cmd_fd;
1606 } 1584
1607#endif 1585#endif
1608 return -1; 1586 return -1;
1609} 1587}
1610 1588
1611/* ------------------------------------------------------------------------- * 1589/* ------------------------------------------------------------------------- *

Diff Legend

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