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.10 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.15 by pcg, Thu Dec 18 07:31:19 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.10 2003/12/08 23:14:40 pcg Exp $ 4 * $Id: init.C,v 1.15 2003/12/18 07:31:19 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
800rxvt_term::set_locale (const char *locale)
801{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, ""));
805#endif
806#if HAVE_NL_LANGINFO
807 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8");
811#else
812 enc_utf8 = 1;
813#endif
814}
815
816void
821rxvt_init_xlocale(pR) 817rxvt_term::init_xlocale ()
822{ 818{
823#ifdef USE_XIM 819#ifdef USE_XIM
824 if (R->locale == NULL) 820 if (!locale)
825 rxvt_print_error("Setting locale failed."); 821 rxvt_print_error ("Setting locale failed.");
826 else 822 else
827 { 823 {
828 Atom wmlocale; 824 Atom wmlocale;
829 825
830 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False);
831 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale,
832 XA_STRING, 8, PropModeReplace, 828 XA_STRING, 8, PropModeReplace,
833 (unsigned char *)R->locale, STRLEN(R->locale)); 829 (unsigned char *)locale, STRLEN(locale));
834 830
835 if (XSupportsLocale() != True) 831 if (!XSupportsLocale ())
836 { 832 {
837 rxvt_print_error("The locale is not supported by Xlib"); 833 rxvt_print_error ("The locale is not supported by Xlib");
838 return; 834 return;
839 } 835 }
840 836
841 rxvt_setTermFontSet(aR_ 0);
842
843 /* see if we can connect yet */ 837 /* see if we can connect yet */
844 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL);
845 839
846 /* To avoid Segmentation Fault in C locale: Solaris only? */ 840 /* To avoid Segmentation Fault in C locale: Solaris only? */
847 if (STRCMP(R->locale, "C")) 841 if (STRCMP (locale, "C"))
848 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
849 rxvt_IMInstantiateCallback, NULL); 843 rxvt_IMInstantiateCallback, NULL);
850 } 844 }
851#endif 845#endif
852} 846}
853 847
854/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
855/* EXTPROTO */
856void 849void
857rxvt_init_command(pR_ const char *const *argv) 850rxvt_term::init_command(const char *const *argv)
858{ 851{
859 /* 852 /*
860 * Initialize the command connection. 853 * Initialize the command connection.
861 * This should be called after the X server connection is established. 854 * This should be called after the X server connection is established.
862 */ 855 */
863 int i; 856 int i;
864 857
865 for (i = 0; i < NUM_XA; i++) 858 for (i = 0; i < NUM_XA; i++)
866 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False);
867 860
868 /* Enable delete window protocol */ 861 /* Enable delete window protocol */
869 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 862 XSetWMProtocols (Xdisplay, TermWin.parent[0],
870 &(R->xa[XA_WMDELETEWINDOW]), 1); 863 &(xa[XA_WMDELETEWINDOW]), 1);
871 864
872#ifdef USING_W11LIB 865#ifdef USING_W11LIB
873 /* enable W11 callbacks */ 866 /* enable W11 callbacks */
874 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event);
875#endif 868#endif
876 869
877#ifdef META8_OPTION 870#ifdef META8_OPTION
878
879 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
880#endif 872#endif
881 873
882 rxvt_get_ourmods(aR); 874 rxvt_get_ourmods (this);
883 875
884 if (!(R->Options & Opt_scrollTtyOutput)) 876 if (!(Options & Opt_scrollTtyOutput))
885 R->PrivateModes |= PrivMode_TtyOutputInh; 877 PrivateModes |= PrivMode_TtyOutputInh;
886 if (R->Options & Opt_scrollTtyKeypress) 878 if (Options & Opt_scrollTtyKeypress)
887 R->PrivateModes |= PrivMode_Keypress; 879 PrivateModes |= PrivMode_Keypress;
888 if (!(R->Options & Opt_jumpScroll)) 880 if (!(Options & Opt_jumpScroll))
889 R->PrivateModes |= PrivMode_smoothScroll; 881 PrivateModes |= PrivMode_smoothScroll;
882
890#ifndef NO_BACKSPACE_KEY 883#ifndef NO_BACKSPACE_KEY
891
892 if (STRCMP(R->key_backspace, "DEC") == 0) 884 if (STRCMP(key_backspace, "DEC") == 0)
893 R->PrivateModes |= PrivMode_HaveBackSpace; 885 PrivateModes |= PrivMode_HaveBackSpace;
894#endif 886#endif
887
895 /* add value for scrollBar */ 888 /* add value for scrollBar */
896 if (scrollbar_visible(R)) 889 if (scrollbar_visible (this))
897 { 890 {
898 R->PrivateModes |= PrivMode_scrollBar; 891 PrivateModes |= PrivMode_scrollBar;
899 R->SavedModes |= PrivMode_scrollBar; 892 SavedModes |= PrivMode_scrollBar;
900 } 893 }
901 if (menubar_visible(R)) 894 if (menubar_visible (this))
902 { 895 {
903 R->PrivateModes |= PrivMode_menuBar; 896 PrivateModes |= PrivMode_menuBar;
904 R->SavedModes |= PrivMode_menuBar; 897 SavedModes |= PrivMode_menuBar;
905 } 898 }
899
906#ifdef GREEK_SUPPORT 900#ifdef GREEK_SUPPORT
907 greek_init(); 901 greek_init();
908#endif 902#endif
909 903
910 R->Xfd = XConnectionNumber (R->Xdisplay); 904 Xfd = XConnectionNumber (Xdisplay);
911 905
912#ifdef CURSOR_BLINK 906#ifdef CURSOR_BLINK
913 907
914 if (R->Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
915 (void)gettimeofday(&R->lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
916#endif 910#endif
917 911
918 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
919 { 913 {
920 rxvt_print_error ("aborting"); 914 rxvt_print_error ("aborting");
921 exit (EXIT_FAILURE); 915 exit (EXIT_FAILURE);
922 } 916 }
923} 917}
924 918
925/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
926/* INTPROTO */ 920/* INTPROTO */
927void 921void
928rxvt_Get_Colours(pR) 922rxvt_Get_Colours (pR)
929{ 923{
930 int i; 924 int i;
931 925
932 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
933 { 927 {
934 rxvt_color xcol; 928 rxvt_color xcol;
935 929
936 if (!R->rs[Rs_color + i]) 930 if (!R->rs[Rs_color + i])
937 continue; 931 continue;
938 932
939 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
… …
943 { 937 {
944 R->rs[Rs_color + i] = def_colorName[!i]; 938 R->rs[Rs_color + i] = def_colorName[!i];
945 } 939 }
946 else 940 else
947#endif 941#endif
948
949 R->rs[Rs_color + i] = def_colorName[i]; 942 R->rs[Rs_color + i] = def_colorName[i];
943
950 if (!R->rs[Rs_color + i]) 944 if (!R->rs[Rs_color + i])
951 continue; 945 continue;
946
952 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
953 { 948 {
954 switch (i) 949 switch (i)
955 { 950 {
956 case Color_fg: 951 case Color_fg:
957 case Color_bg: 952 case Color_bg:
958 /* fatal: need bg/fg color */ 953 /* fatal: need bg/fg color */
959 rxvt_print_error("aborting"); 954 rxvt_print_error ("aborting");
960 exit(EXIT_FAILURE); 955 exit (EXIT_FAILURE);
961 /* NOTREACHED */ 956 /* NOTREACHED */
962 break; 957 break;
963#ifndef NO_CURSORCOLOR 958#ifndef NO_CURSORCOLOR
964
965 case Color_cursor2: 959 case Color_cursor2:
966 xcol = R->PixColors[Color_fg]; 960 xcol = R->PixColors[Color_fg];
967 break; 961 break;
968#endif /* ! NO_CURSORCOLOR */ 962#endif /* ! NO_CURSORCOLOR */
969
970 case Color_pointer: 963 case Color_pointer:
971 xcol = R->PixColors[Color_fg]; 964 xcol = R->PixColors[Color_fg];
972 break; 965 break;
973 default: 966 default:
974 xcol = R->PixColors[Color_bg]; /* None */ 967 xcol = R->PixColors[Color_bg]; /* None */
975 break; 968 break;
976 } 969 }
977 } 970 }
978 } 971 }
972
979 R->PixColors[i] = xcol; 973 R->PixColors[i] = xcol;
980 SET_PIXCOLOR(R, i); 974 SET_PIXCOLOR (R, i);
981 } 975 }
982 976
983 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer])
984 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 978 R->PixColors[Color_pointer] = R->PixColors[Color_fg];
985 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border])
… …
1006 * xcol[1] == top shadow 1000 * xcol[1] == top shadow
1007 * xcol[2] == bot shadow */ 1001 * xcol[2] == bot shadow */
1008 1002
1009 xcol[1] = R->PixColors[Color_scroll]; 1003 xcol[1] = R->PixColors[Color_scroll];
1010# ifdef PREFER_24BIT 1004# ifdef PREFER_24BIT
1011 1005 xcol[0].set (R, 65535, 65535, 65535);
1012 xcol[0].set (r, -1, -1, -1);
1013 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1014# else 1007# else
1015
1016 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen));
1017# endif 1009# endif
1018 1010
1019 unsigned short R1, G1, B1, R0, G0, B0; 1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1020 1012
1021 xcol[0].get (r, R0, G0, B0); 1013 xcol[0].get (R, pr0, pg0, pb0);
1022 xcol[1].get (r, R1, G1, B1); 1014 xcol[1].get (R, pr1, pg1, pb1);
1023 1015
1024 /* bottomShadowColor */ 1016 /* bottomShadowColor */
1025 if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) 1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2))
1026 xcol[2] = R->PixColors[Color_Black]; 1018 xcol[2] = R->PixColors[Color_Black];
1027 1019
1028 R->PixColors[Color_bottomShadow] = xcol[2]; 1020 R->PixColors[Color_bottomShadow] = xcol[2];
1029 1021
1030 /* topShadowColor */ 1022 /* topShadowColor */
1031 if (!xcol[1].set (aR_ 1023 if (!xcol[1].set (aR_
1032 min (R0, max (R0 / 5, R1) * 7 / 5), 1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1033 min (G0, max (G0 / 5, G1) * 7 / 5), 1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1034 min (B0, max (B0 / 5, B1) * 7 / 5))) 1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1035 xcol[1] = R->PixColors[Color_White]; 1027 xcol[1] = R->PixColors[Color_White];
1036 1028
1037 R->PixColors[Color_topShadow] = xcol[1]; 1029 R->PixColors[Color_topShadow] = xcol[1];
1038 } 1030 }
1039#endif /* KEEP_SCROLLCOLOR */ 1031#endif /* KEEP_SCROLLCOLOR */
1040} 1032}
1041 1033
1042/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
1043/* color aliases, fg/bg bright-bold */ 1035/* color aliases, fg/bg bright-bold */
1044/* INTPROTO */
1045void 1036void
1046rxvt_color_aliases(pR_ int idx) 1037rxvt_term::color_aliases(int idx)
1047{ 1038{
1048 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 1039 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx])))
1049 { 1040 {
1050 int i = atoi(R->rs[Rs_color + idx]); 1041 int i = atoi (rs[Rs_color + idx]);
1051 1042
1052 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
1053 { /* bright colors */ 1044 { /* bright colors */
1054 i -= 8; 1045 i -= 8;
1055#ifndef NO_BRIGHTCOLOR 1046#ifndef NO_BRIGHTCOLOR
1056 1047
1057 R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; 1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1058 return; 1049 return;
1059#endif 1050#endif
1060 1051
1061 } 1052 }
1062 if (i >= 0 && i <= 7) /* normal colors */ 1053 if (i >= 0 && i <= 7) /* normal colors */
1063 R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; 1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1064 } 1055 }
1065} 1056}
1066 1057
1067/*----------------------------------------------------------------------*/ 1058/*----------------------------------------------------------------------*/
1068/* 1059/*
… …
1146 XWMHints wmHint; 1137 XWMHints wmHint;
1147 XGCValues gcvalue; 1138 XGCValues gcvalue;
1148 long vt_emask; 1139 long vt_emask;
1149 1140
1150#ifdef PREFER_24BIT 1141#ifdef PREFER_24BIT
1151
1152 XSetWindowAttributes attributes; 1142 XSetWindowAttributes attributes;
1153 XWindowAttributes gattr; 1143 XWindowAttributes gattr;
1154 1144
1155 XCMAP = DefaultColormap(R->Xdisplay, Xscreen); 1145 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1156 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen); 1146 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
… …
1355/* 1345/*
1356 * Run the command in a subprocess and return a file descriptor for the 1346 * Run the command in a subprocess and return a file descriptor for the
1357 * master end of the pseudo-teletype pair with the command talking to 1347 * master end of the pseudo-teletype pair with the command talking to
1358 * the slave. 1348 * the slave.
1359 */ 1349 */
1360/* INTPROTO */
1361int 1350int
1362rxvt_run_command(pR_ const char *const *argv) 1351rxvt_term::run_command (const char *const *argv)
1363{ 1352{
1364 int cfd, er; 1353 int cfd, er;
1365 1354
1366 /* get master (pty) */ 1355 /* get master (pty) */
1367 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1356 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0)
1368 { 1357 {
1369 rxvt_print_error("can't open pseudo-tty"); 1358 rxvt_print_error("can't open pseudo-tty");
1370 return -1; 1359 return -1;
1371 } 1360 }
1372 1361
1373#ifdef FD_SETSIZE 1362#ifdef FD_SETSIZE
1374 if (R->Xfd > FD_SETSIZE || cfd > FD_SETSIZE) 1363 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1375 { 1364 {
1376 rxvt_print_error("fd too high: %d max", FD_SETSIZE); 1365 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1377 rxvt_clean_exit(); 1366 rxvt_clean_exit();
1378 exit(EXIT_FAILURE); 1367 exit(EXIT_FAILURE);
1379 } 1368 }
1380#endif 1369#endif
1381 1370
1382 fcntl (cfd, F_SETFL, O_NONBLOCK); 1371 fcntl (cfd, F_SETFL, O_NONBLOCK);
1383 1372
1384 /* get slave (tty) */ 1373 /* get slave (tty) */
1385 if (R->tty_fd < 0) 1374 if (tty_fd < 0)
1386 { 1375 {
1387#ifndef NO_SETOWNER_TTYDEV 1376#ifndef NO_SETOWNER_TTYDEV
1388 rxvt_privileged_ttydev (aR_ SAVE); 1377 rxvt_privileged_ttydev (aR_ SAVE);
1389#endif 1378#endif
1390 1379
1391 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1380 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1392 { 1381 {
1393 close(cfd); 1382 close(cfd);
1394 rxvt_print_error("can't open slave tty %s", R->ttydev); 1383 rxvt_print_error("can't open slave tty %s", ttydev);
1395 return -1; 1384 return -1;
1396 } 1385 }
1397 } 1386 }
1398#ifndef NO_BACKSPACE_KEY 1387#ifndef NO_BACKSPACE_KEY
1399 if (R->key_backspace[0] && !R->key_backspace[1]) 1388 if (key_backspace[0] && !key_backspace[1])
1400 er = R->key_backspace[0]; 1389 er = key_backspace[0];
1401 else if (STRCMP(R->key_backspace, "DEC") == 0) 1390 else if (STRCMP(key_backspace, "DEC") == 0)
1402 er = '\177'; /* the initial state anyway */ 1391 er = '\177'; /* the initial state anyway */
1403 else 1392 else
1404#endif 1393#endif
1405 1394
1406 er = -1; 1395 er = -1;
1407 1396
1408 rxvt_get_ttymode (&(R->tio), er); 1397 rxvt_get_ttymode (&(tio), er);
1409 1398
1410#ifndef __QNX__ 1399#ifndef __QNX__
1411 /* spin off the command interpreter */ 1400 /* spin off the command interpreter */
1412 switch (R->cmd_pid = fork ()) 1401 switch (cmd_pid = fork ())
1413 { 1402 {
1414 case -1: 1403 case -1:
1415 rxvt_print_error("can't fork"); 1404 rxvt_print_error("can't fork");
1416 return -1; 1405 return -1;
1417 case 0: 1406 case 0:
1418 close (cfd); /* only keep R->tty_fd and STDERR open */ 1407 close (cfd); /* only keep tty_fd and STDERR open */
1419 close (R->Xfd); 1408 close (Xfd);
1420 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1409 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1421 rxvt_print_error ("could not obtain control of tty"); 1410 rxvt_print_error ("could not obtain control of tty");
1422 else 1411 else
1423 { 1412 {
1424 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1413 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1425 dup2 (R->tty_fd, STDIN_FILENO); 1414 dup2 (tty_fd, STDIN_FILENO);
1426 dup2 (R->tty_fd, STDOUT_FILENO); 1415 dup2 (tty_fd, STDOUT_FILENO);
1427 dup2 (R->tty_fd, STDERR_FILENO); 1416 dup2 (tty_fd, STDERR_FILENO);
1428 1417
1429 if (R->tty_fd > 2) 1418 if (tty_fd > 2)
1430 close (R->tty_fd); 1419 close (tty_fd);
1431 1420
1432 rxvt_run_child (aR_ argv); 1421 run_child (argv);
1433 } 1422 }
1434 exit (EXIT_FAILURE); 1423 exit (EXIT_FAILURE);
1435 /* NOTREACHED */ 1424 /* NOTREACHED */
1436 default: 1425 default:
1437 { 1426 {
1438#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1427#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1439 int fdstdin; 1428 int fdstdin;
1440 1429
1441 fdstdin = dup (STDIN_FILENO); 1430 fdstdin = dup (STDIN_FILENO);
1442 dup2 (R->tty_fd, STDIN_FILENO); 1431 dup2 (tty_fd, STDIN_FILENO);
1443#endif 1432#endif
1444 1433
1445 rxvt_privileged_utmp (aR_ SAVE); 1434 rxvt_privileged_utmp (this, SAVE);
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1435#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1447 1436
1448 dup2 (fdstdin, STDIN_FILENO); 1437 dup2 (fdstdin, STDIN_FILENO);
1449 close (fdstdin); 1438 close (fdstdin);
1450#endif 1439#endif
1451 1440
1452 } 1441 }
1453 close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ 1442 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */
1454 break; 1443 break;
1455 } 1444 }
1456#else /* __QNX__ uses qnxspawn() */ 1445#else /* __QNX__ uses qnxspawn() */
1457 fchmod (R->tty_fd, 0622); 1446 fchmod (tty_fd, 0622);
1458 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1447 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1459 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1448 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1460 1449
1461 if (rxvt_run_child (aR_ argv) == -1) 1450 if (run_child (argv) == -1)
1462 exit (EXIT_FAILURE); 1451 exit (EXIT_FAILURE);
1463#endif 1452#endif
1464 1453
1465 return cfd; 1454 return cfd;
1466} 1455}
… …
1470 * ------------------------------------------------------------------------- */ 1459 * ------------------------------------------------------------------------- */
1471/* 1460/*
1472 * The only open file descriptor is the slave tty - so no error messages. 1461 * The only open file descriptor is the slave tty - so no error messages.
1473 * returns are fatal 1462 * returns are fatal
1474 */ 1463 */
1475/* INTPROTO */
1476int 1464int
1477rxvt_run_child(pR_ const char *const *argv) 1465rxvt_term::run_child (const char *const *argv)
1478{ 1466{
1479 char *login; 1467 char *login;
1480 1468
1481 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1469 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */
1482 1470
1483 if (R->Options & Opt_console) 1471 if (Options & Opt_console)
1484 { /* be virtual console, fail silently */ 1472 { /* be virtual console, fail silently */
1485#ifdef TIOCCONS 1473#ifdef TIOCCONS
1486 unsigned int on = 1; 1474 unsigned int on = 1;
1487 1475
1488 ioctl (STDIN_FILENO, TIOCCONS, &on); 1476 ioctl (STDIN_FILENO, TIOCCONS, &on);
1489#elif defined (SRIOCSREDIR) 1477#elif defined (SRIOCSREDIR)
1490
1491 int fd; 1478 int fd;
1492 1479
1493 fd = open (CONSOLE, O_WRONLY, 0); 1480 fd = open (CONSOLE, O_WRONLY, 0);
1494 if (fd >= 0) 1481 if (fd >= 0)
1495 { 1482 {
1496 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1483 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1497 close (fd); 1484 close (fd);
1498 } 1485 }
1499#endif /* SRIOCSREDIR */ 1486#endif /* SRIOCSREDIR */
1500
1501 } 1487 }
1502 1488
1503 /* reset signals and spin off the command interpreter */ 1489 /* reset signals and spin off the command interpreter */
1504 signal (SIGINT, SIG_DFL); 1490 signal (SIGINT, SIG_DFL);
1505 signal (SIGQUIT, SIG_DFL); 1491 signal (SIGQUIT, SIG_DFL);
… …
1507 /* 1493 /*
1508 * mimick login's behavior by disabling the job control signals 1494 * mimick login's behavior by disabling the job control signals
1509 * a shell that wants them can turn them back on 1495 * a shell that wants them can turn them back on
1510 */ 1496 */
1511#ifdef SIGTSTP 1497#ifdef SIGTSTP
1512
1513 signal (SIGTSTP, SIG_IGN); 1498 signal (SIGTSTP, SIG_IGN);
1514 signal (SIGTTIN, SIG_IGN); 1499 signal (SIGTTIN, SIG_IGN);
1515 signal (SIGTTOU, SIG_IGN); 1500 signal (SIGTTOU, SIG_IGN);
1516#endif /* SIGTSTP */ 1501#endif /* SIGTSTP */
1517 1502
1518 /* set window size */ 1503 /* set window size */
1519 struct winsize ws; 1504 struct winsize ws;
1520 1505
1521 ws.ws_col = R->TermWin.ncol; 1506 ws.ws_col = TermWin.ncol;
1522 ws.ws_row = R->TermWin.nrow; 1507 ws.ws_row = TermWin.nrow;
1523 ws.ws_xpixel = ws.ws_ypixel = 0; 1508 ws.ws_xpixel = ws.ws_ypixel = 0;
1524 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1509 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1525 1510
1526 // unblock signals (signals are blocked by iom.C 1511 // unblock signals (signals are blocked by iom.C
1527 sigset_t ss; 1512 sigset_t ss;
… …
1548 1533
1549 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1534 if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
1550 shell = "/bin/sh"; 1535 shell = "/bin/sh";
1551 1536
1552 argv0 = (const char *)rxvt_r_basename(shell); 1537 argv0 = (const char *)rxvt_r_basename(shell);
1553 if (R->Options & Opt_loginShell) 1538 if (Options & Opt_loginShell)
1554 { 1539 {
1555 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1540 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char));
1556 1541
1557 login[0] = '-'; 1542 login[0] = '-';
1558 STRCPY(&login[1], argv0); 1543 STRCPY(&login[1], argv0);
1559 argv0 = login; 1544 argv0 = login;
1560 } 1545 }
1561 execlp(shell, argv0, NULL); 1546 execlp(shell, argv0, NULL);
1562 /* no error message: STDERR is closed! */ 1547 /* no error message: STDERR is closed! */
1563 } 1548 }
1549
1564#else /* __QNX__ uses qnxspawn() */ 1550#else /* __QNX__ uses qnxspawn() */
1565 { 1551
1566 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1552 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1567 char *command = NULL, fullcommand[_MAX_PATH]; 1553 char *command = NULL, fullcommand[_MAX_PATH];
1568 char **arg_v, *arg_a[2] = { NULL, NULL }; 1554 char **arg_v, *arg_a[2] = { NULL, NULL };
1569 1555
1570 if (argv != NULL) 1556 if (argv != NULL)
1571 { 1557 {
1572 if (access(argv[0], X_OK) == -1) 1558 if (access(argv[0], X_OK) == -1)
1573 { 1559 {
1574 if (STRCHR(argv[0], '/') == NULL) 1560 if (STRCHR(argv[0], '/') == NULL)
1575 { 1561 {
1576 searchenv(argv[0], "PATH", fullcommand); 1562 searchenv(argv[0], "PATH", fullcommand);
1577 if (fullcommand[0] != '\0') 1563 if (fullcommand[0] != '\0')
1578 command = fullcommand; 1564 command = fullcommand;
1579 } 1565 }
1580 if (access(command, X_OK) == -1) 1566 if (access(command, X_OK) == -1)
1581 return -1; 1567 return -1;
1582 } 1568 }
1583 else 1569 else
1584 command = argv[0]; 1570 command = argv[0];
1585 arg_v = argv; 1571 arg_v = argv;
1586 } 1572 }
1587 else 1573 else
1588 { 1574 {
1589 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1575 if ((command = getenv("SHELL")) == NULL || *command == '\0')
1590 command = "/bin/sh"; 1576 command = "/bin/sh";
1591 1577
1592 arg_a[0] = my_basename(command); 1578 arg_a[0] = my_basename(command);
1593 if (R->Options & Opt_loginShell) 1579 if (Options & Opt_loginShell)
1594 { 1580 {
1595 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1581 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char));
1596 1582
1597 login[0] = '-'; 1583 login[0] = '-';
1598 STRCPY(&login[1], arg_a[0]); 1584 STRCPY(&login[1], arg_a[0]);
1599 arg_a[0] = login; 1585 arg_a[0] = login;
1600 } 1586 }
1601 arg_v = arg_a; 1587 arg_v = arg_a;
1602 } 1588 }
1603 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1589 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1604 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1590 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1605 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1591 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1606 command, arg_v, environ, iov_a, 0); 1592 command, arg_v, environ, iov_a, 0);
1607 if (login) 1593 if (login)
1608 free(login); 1594 free(login);
1595
1609 close(R->tty_fd); 1596 close(tty_fd);
1610 return R->cmd_fd; 1597 return cmd_fd;
1611 } 1598
1612#endif 1599#endif
1613 return -1; 1600 return -1;
1614} 1601}
1615 1602
1616/* ------------------------------------------------------------------------- * 1603/* ------------------------------------------------------------------------- *

Diff Legend

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