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

Diff Legend

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