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.19 by pcg, Wed Jan 28 23:40:50 2004 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.19 2004/01/28 23:40:50 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>
… …
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332 }; 332 };
333 333
334const char *const xa_names[NUM_XA] = 334const char *const xa_names[NUM_XA] =
335 { 335 {
336 "TEXT",
336 "COMPOUND_TEXT", 337 "COMPOUND_TEXT",
338 "UTF8_STRING",
337 "MULTIPLE", 339 "MULTIPLE",
338 "TARGETS", 340 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 341 "TIMESTAMP",
341 "VT_SELECTION", 342 "VT_SELECTION",
342 "INCR", 343 "INCR",
343 "WM_DELETE_WINDOW", 344 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 345#ifdef TRANSPARENT
… …
350#endif 351#endif
351 "CLIPBOARD" 352 "CLIPBOARD"
352 }; 353 };
353 354
354bool 355bool
355rxvt_term::init_vars() 356rxvt_term::init_vars ()
356{ 357{
357 PixColors = new rxvt_color [TOTAL_COLORS]; 358 PixColors = new rxvt_color [TOTAL_COLORS];
358 if (PixColors == NULL) 359 if (PixColors == NULL)
359 return false; 360 return false;
360 361
361#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 362#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
362
363 TermWin.pixmap = None; 363 TermWin.pixmap = None;
364#endif 364#endif
365#ifdef UTMP_SUPPORT 365#ifdef UTMP_SUPPORT
366
367 next_utmp_action = SAVE; 366 next_utmp_action = SAVE;
368#endif 367#endif
369#ifndef NO_SETOWNER_TTYDEV 368#ifndef NO_SETOWNER_TTYDEV
370
371 next_tty_action = SAVE; 369 next_tty_action = SAVE;
372#endif 370#endif
373 371
374 MEvent.time = CurrentTime; 372 MEvent.time = CurrentTime;
375 MEvent.button = AnyButton; 373 MEvent.button = AnyButton;
… …
384 TermWin.int_bwidth = INTERNALBORDERWIDTH; 382 TermWin.int_bwidth = INTERNALBORDERWIDTH;
385 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
386 TermWin.lineSpace = LINESPACE; 384 TermWin.lineSpace = LINESPACE;
387 TermWin.saveLines = SAVELINES; 385 TermWin.saveLines = SAVELINES;
388 numPixColors = TOTAL_COLORS; 386 numPixColors = TOTAL_COLORS;
387
389#ifndef NO_NEW_SELECTION 388#ifndef NO_NEW_SELECTION
390
391 selection_style = NEW_SELECT; 389 selection_style = NEW_SELECT;
392#else 390#else
393
394 selection_style = OLD_SELECT; 391 selection_style = OLD_SELECT;
395#endif 392#endif
393
396#ifndef NO_BRIGHTCOLOR 394#ifndef NO_BRIGHTCOLOR
397
398 colorfgbg = DEFAULT_RSTYLE; 395 colorfgbg = DEFAULT_RSTYLE;
399#endif 396#endif
397
400#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
401
402 ks_bigfont = XK_greater; 399 ks_bigfont = XK_greater;
403 ks_smallfont = XK_less; 400 ks_smallfont = XK_less;
404#endif 401#endif
402
405#ifdef GREEK_SUPPORT 403#ifdef GREEK_SUPPORT
406
407 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH; 404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
408#endif 405#endif
409 406
410 refresh_limit = 1; 407 refresh_limit = 1;
411 refresh_type = SLOW_REFRESH; 408 refresh_type = SLOW_REFRESH;
412 prev_nrow = prev_ncol = 0; 409 prev_nrow = prev_ncol = 0;
413#ifdef MULTICHAR_SET 410#ifdef MULTICHAR_SET
414# ifdef MULTICHAR_ENCODING 411# ifdef MULTICHAR_ENCODING
415
416 encoding_method = MULTICHAR_ENCODING; 412 encoding_method = MULTICHAR_ENCODING;
417# endif 413# endif
418
419 multichar_decode = rxvt_euc2jis; 414 multichar_decode = rxvt_euc2jis;
420#endif 415#endif
421 416
422 oldcursor.row = oldcursor.col = -1; 417 oldcursor.row = oldcursor.col = -1;
423#ifdef XPM_BACKGROUND 418#ifdef XPM_BACKGROUND
… …
425 bgPixmap.x = bgPixmap.y = 50; 420 bgPixmap.x = bgPixmap.y = 50;
426 bgPixmap.pixmap = None; 421 bgPixmap.pixmap = None;
427#endif 422#endif
428 423
429 last_bot = last_state = -1; 424 last_bot = last_state = -1;
425
430#ifdef MENUBAR 426#ifdef MENUBAR
431
432 menu_readonly = 1; 427 menu_readonly = 1;
433# if !(MENUBAR_MAX > 1) 428# if !(MENUBAR_MAX > 1)
434
435 CurrentBar = &(BarList); 429 CurrentBar = &(BarList);
436# endif /* (MENUBAR_MAX > 1) */ 430# endif /* (MENUBAR_MAX > 1) */
437#endif 431#endif
438 432
439 return true; 433 return true;
440} 434}
441 435
442/* EXTPROTO */
443void 436void
444rxvt_init_secondary (pR) 437rxvt_term::init_secondary ()
445{ 438{
446 int i; 439 int i;
447#ifdef TTY_GID_SUPPORT 440#ifdef TTY_GID_SUPPORT
448 struct group *gr = getgrnam ("tty"); 441 struct group *gr = getgrnam ("tty");
449 442
450 if (gr) 443 if (gr)
451 { /* change group ownership of tty to "tty" */ 444 { /* change group ownership of tty to "tty" */
452 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
453 R->ttygid = gr->gr_gid; 446 ttygid = gr->gr_gid;
454 } 447 }
455 else 448 else
456#endif /* TTY_GID_SUPPORT */ 449#endif /* TTY_GID_SUPPORT */
457 { 450 {
458 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 451 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
459 R->ttygid = getgid (); 452 ttygid = getgid ();
460 } 453 }
461
462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
463 R->locale = setlocale (LC_CTYPE, "");
464#endif
465 454
466 /* 455 /*
467 * Close all unused file descriptors 456 * Close all unused file descriptors
468 * We don't want them, we don't need them. 457 * We don't want them, we don't need them.
469 */ 458 */
… …
477 dup2 (i, STDIN_FILENO); 466 dup2 (i, STDIN_FILENO);
478 close (i); 467 close (i);
479 } 468 }
480 469
481 dup2 (STDERR_FILENO, STDOUT_FILENO); 470 dup2 (STDERR_FILENO, STDOUT_FILENO);
471
482#if 0 // schmorp sayz closing filies is murder 472#if 0 // schmorp sayz closing filies is murder
483
484 for (i = STDERR_FILENO + 1; i < R->num_fds; i++) 473 for (i = STDERR_FILENO + 1; i < num_fds; i++)
485 { 474 {
486#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 475#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
487 if (i == 4 || i == 7) 476 if (i == 4 || i == 7)
488 continue; 477 continue;
489#endif 478#endif
490
491 close(i); 479 close(i);
492 } 480 }
493#endif 481#endif
494} 482}
495 483
496/*----------------------------------------------------------------------*/ 484/*----------------------------------------------------------------------*/
497/* EXTPROTO */
498const char ** 485const char **
499rxvt_init_resources (pR_ int argc, const char *const *argv) 486rxvt_term::init_resources (int argc, const char *const *argv)
500{ 487{
501 int i, r_argc; 488 int i, r_argc;
502 char *val; 489 char *val;
503 const char **cmd_argv, **r_argv; 490 const char **cmd_argv, **r_argv;
504 const char **rs;
505 491
506 /* 492 /*
507 * Look for -exec option. Find => split and make cmd_argv[] of command args 493 * Look for -exec option. Find => split and make cmd_argv[] of command args
508 */ 494 */
509 for (r_argc = 0; r_argc < argc; r_argc++) 495 for (r_argc = 0; r_argc < argc; r_argc++)
510 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 496 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec"))
511 break; 497 break;
498
512 r_argv = (const char **)rxvt_malloc(sizeof(char *) * (r_argc + 1)); 499 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1));
513 500
514 for (i = 0; i < r_argc; i++) 501 for (i = 0; i < r_argc; i++)
515 r_argv[i] = (const char *)argv[i]; 502 r_argv[i] = (const char *)argv[i];
503
516 r_argv[i] = NULL; 504 r_argv[i] = NULL;
505
517 if (r_argc == argc) 506 if (r_argc == argc)
518 cmd_argv = NULL; 507 cmd_argv = NULL;
519 else 508 else
520 { 509 {
521 cmd_argv = (const char **)rxvt_malloc(sizeof(char *) * (argc - r_argc)); 510 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc));
522 511
523 for (i = 0; i < argc - r_argc - 1; i++) 512 for (i = 0; i < argc - r_argc - 1; i++)
524 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 513 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
514
525 cmd_argv[i] = NULL; 515 cmd_argv[i] = NULL;
526 } 516 }
527 517
528 /* clear all resources */ 518 /* clear all resources */
529 rs = R->rs;
530 for (i = 0; i < NUM_RESOURCES;) 519 for (i = 0; i < NUM_RESOURCES;)
531 rs[i++] = NULL; 520 rs[i++] = NULL;
532 521
533 rs[Rs_name] = rxvt_r_basename(argv[0]); 522 rs[Rs_name] = rxvt_r_basename(argv[0]);
523
534 /* 524 /*
535 * Open display, get options/resources and create the window 525 * Open display, get options/resources and create the window
536 */ 526 */
537 if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) 527 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
538 rs[Rs_display_name] = ":0"; 528 rs[Rs_display_name] = ":0";
539 529
540 rxvt_get_options(aR_ r_argc, r_argv); 530 rxvt_get_options (this, r_argc, r_argv);
541 free(r_argv); 531 free (r_argv);
542 532
543#ifdef LOCAL_X_IS_UNIX 533#ifdef LOCAL_X_IS_UNIX
544
545 if (rs[Rs_display_name][0] == ':') 534 if (rs[Rs_display_name][0] == ':')
546 { 535 {
547 val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name])); 536 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
548 STRCPY(val, "unix"); 537 STRCPY (val, "unix");
549 STRCAT(val, rs[Rs_display_name]); 538 STRCAT (val, rs[Rs_display_name]);
550 R->Xdisplay = XOpenDisplay(val); 539 Xdisplay = XOpenDisplay (val);
551 free(val); 540 free (val);
552 } 541 }
553#endif 542#endif
554 543
555 if (R->Xdisplay == NULL 544 if (Xdisplay == NULL
556 && (R->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) 545 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL)
557 { 546 {
558 rxvt_print_error("can't open display %s", rs[Rs_display_name]); 547 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
559 exit(EXIT_FAILURE); 548 exit (EXIT_FAILURE);
560 } 549 }
561 550
562 rxvt_extract_resources(aR_ R->Xdisplay, rs[Rs_name]); 551 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]);
563 552
564 /* 553 /*
565 * set any defaults not already set 554 * set any defaults not already set
566 */ 555 */
567 if (cmd_argv && cmd_argv[0]) 556 if (cmd_argv && cmd_argv[0])
… …
576 if (!rs[Rs_title]) 565 if (!rs[Rs_title])
577 rs[Rs_title] = rs[Rs_name]; 566 rs[Rs_title] = rs[Rs_name];
578 if (!rs[Rs_iconName]) 567 if (!rs[Rs_iconName])
579 rs[Rs_iconName] = rs[Rs_name]; 568 rs[Rs_iconName] = rs[Rs_name];
580 } 569 }
570
581 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 571 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0)
582 R->TermWin.saveLines = BOUND_POSITIVE_INT16(i); 572 TermWin.saveLines = BOUND_POSITIVE_INT16(i);
573
583#ifndef NO_FRILLS 574#ifndef NO_FRILLS
584
585 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 575 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0)
586 R->TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 576 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */
587 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 577 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0)
588 R->TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 578 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */
589#endif 579#endif
580
590#ifndef NO_LINESPACE 581#ifndef NO_LINESPACE
591
592 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 582 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0)
593 R->TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 583 TermWin.lineSpace = min(i, 100); /* arbitrary limit */
594#endif 584#endif
595 585
596#ifdef POINTER_BLANK 586#ifdef POINTER_BLANK
597
598 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 587 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0)
599 R->pointerBlankDelay = i; 588 pointerBlankDelay = i;
600 else 589 else
601 R->pointerBlankDelay = 2; 590 pointerBlankDelay = 2;
602#endif 591#endif
603 592
604 /* no point having a scrollbar without having any scrollback! */ 593 /* no point having a scrollbar without having any scrollback! */
605 if (!R->TermWin.saveLines) 594 if (!TermWin.saveLines)
606 R->Options &= ~Opt_scrollBar; 595 Options &= ~Opt_scrollBar;
607 596
608#ifdef PRINTPIPE 597#ifdef PRINTPIPE
609
610 if (!rs[Rs_print_pipe]) 598 if (!rs[Rs_print_pipe])
611 rs[Rs_print_pipe] = PRINTPIPE; 599 rs[Rs_print_pipe] = PRINTPIPE;
612#endif 600#endif
613 601
614 if (!rs[Rs_cutchars]) 602 if (!rs[Rs_cutchars])
615 rs[Rs_cutchars] = CUTCHARS; 603 rs[Rs_cutchars] = CUTCHARS;
604
616#ifdef ACS_ASCII 605#ifdef ACS_ASCII
617
618 if (!rs[Rs_acs_chars]) 606 if (!rs[Rs_acs_chars])
619 rs[Rs_acs_chars] = ACS_CHARS; 607 rs[Rs_acs_chars] = ACS_CHARS;
620 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 608 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
621 { 609 {
622 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 610 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
623 for (; i < 0x20; ) 611 for (; i < 0x20; )
624 val[i] = ' '; 612 val[i] = ' ';
625 rs[Rs_acs_chars] = val; 613 rs[Rs_acs_chars] = val;
626 } 614 }
627#endif 615#endif
616
628#ifndef NO_BACKSPACE_KEY 617#ifndef NO_BACKSPACE_KEY
629 if (!rs[Rs_backspace_key]) 618 if (!rs[Rs_backspace_key])
630# ifdef DEFAULT_BACKSPACE 619# ifdef DEFAULT_BACKSPACE
631
632 R->key_backspace = DEFAULT_BACKSPACE; 620 key_backspace = DEFAULT_BACKSPACE;
633# else 621# else
634
635 R->key_backspace = "DEC"; /* can toggle between \010 or \177 */ 622 key_backspace = "DEC"; /* can toggle between \010 or \177 */
636# endif 623# endif
637
638 else 624 else
639 { 625 {
640 val = STRDUP(rs[Rs_backspace_key]); 626 val = STRDUP(rs[Rs_backspace_key]);
641 rxvt_Str_trim(val); 627 rxvt_Str_trim(val);
642 rxvt_Str_escaped(val); 628 rxvt_Str_escaped(val);
643 R->key_backspace = val; 629 key_backspace = val;
644 } 630 }
645#endif 631#endif
632
646#ifndef NO_DELETE_KEY 633#ifndef NO_DELETE_KEY
647 if (!rs[Rs_delete_key]) 634 if (!rs[Rs_delete_key])
648# ifdef DEFAULT_DELETE 635# ifdef DEFAULT_DELETE
649
650 R->key_delete = DEFAULT_DELETE; 636 key_delete = DEFAULT_DELETE;
651# else 637# else
652
653 R->key_delete = "\033[3~"; 638 key_delete = "\033[3~";
654# endif 639# endif
655
656 else 640 else
657 { 641 {
658 val = STRDUP(rs[Rs_delete_key]); 642 val = STRDUP(rs[Rs_delete_key]);
659 rxvt_Str_trim(val); 643 rxvt_Str_trim(val);
660 rxvt_Str_escaped(val); 644 rxvt_Str_escaped(val);
661 R->key_delete = val; 645 key_delete = val;
662 } 646 }
663#endif 647#endif
664 if (rs[Rs_answerbackstring]) 648 if (rs[Rs_answerbackstring])
665 { 649 {
666 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 650 rxvt_Str_trim((char *)rs[Rs_answerbackstring]);
… …
668 } 652 }
669 653
670 if (rs[Rs_selectstyle]) 654 if (rs[Rs_selectstyle])
671 { 655 {
672 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 656 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
673 R->selection_style = OLD_WORD_SELECT; 657 selection_style = OLD_WORD_SELECT;
674#ifndef NO_OLD_SELECTION 658#ifndef NO_OLD_SELECTION
675 659
676 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 660 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
677 R->selection_style = OLD_SELECT; 661 selection_style = OLD_SELECT;
678#endif 662#endif
679
680 } 663 }
681 664
682#ifdef HAVE_SCROLLBARS 665#ifdef HAVE_SCROLLBARS
683 rxvt_setup_scrollbar(aR_ rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 666 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
684 rs[Rs_scrollBar_thickness]); 667 rs[Rs_scrollBar_thickness]);
685#endif 668#endif
686 669
687 R->TermWin.fontset = new rxvt_fontset (aR); 670 TermWin.fontset = new rxvt_fontset (this);
688 R->TermWin.fontset->populate (rs[Rs_font]); 671 TermWin.fontset->populate (rs[Rs_font]);
689 R->TermWin.fwidth = R->TermWin.fontset->base_font ()->width; 672 TermWin.fwidth = TermWin.fontset->base_font ()->width;
690 R->TermWin.fheight = R->TermWin.fontset->base_font ()->height; 673 TermWin.fheight = TermWin.fontset->base_font ()->height;
691 R->TermWin.fbase = R->TermWin.fontset->base_font ()->ascent; 674 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
692 675
693#ifdef XTERM_REVERSE_VIDEO 676#ifdef XTERM_REVERSE_VIDEO
694 /* this is how xterm implements reverseVideo */ 677 /* this is how xterm implements reverseVideo */
695 if (R->Options & Opt_reverseVideo) 678 if (Options & Opt_reverseVideo)
696 { 679 {
697 if (!rs[Rs_color + Color_fg]) 680 if (!rs[Rs_color + Color_fg])
698 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 681 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
699 if (!rs[Rs_color + Color_bg]) 682 if (!rs[Rs_color + Color_bg])
700 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 683 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
705 if (!rs[Rs_color + i]) 688 if (!rs[Rs_color + i])
706 rs[Rs_color + i] = def_colorName[i]; 689 rs[Rs_color + i] = def_colorName[i];
707 690
708#ifndef XTERM_REVERSE_VIDEO 691#ifndef XTERM_REVERSE_VIDEO
709 /* this is how we implement reverseVideo */ 692 /* this is how we implement reverseVideo */
710 if (R->Options & Opt_reverseVideo) 693 if (Options & Opt_reverseVideo)
711 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 694 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
712#endif 695#endif
713 696
714 /* convenient aliases for setting fg/bg to colors */ 697 /* convenient aliases for setting fg/bg to colors */
715 rxvt_color_aliases(aR_ Color_fg); 698 color_aliases (Color_fg);
716 rxvt_color_aliases(aR_ Color_bg); 699 color_aliases (Color_bg);
717#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
718
719 rxvt_color_aliases(aR_ Color_cursor); 701 color_aliases (Color_cursor);
720 rxvt_color_aliases(aR_ Color_cursor2); 702 color_aliases (Color_cursor2);
721#endif /* NO_CURSORCOLOR */ 703#endif /* NO_CURSORCOLOR */
722
723 rxvt_color_aliases(aR_ Color_pointer); 704 color_aliases (Color_pointer);
724 rxvt_color_aliases(aR_ Color_border); 705 color_aliases (Color_border);
725#ifndef NO_BOLD_UNDERLINE_REVERSE 706#ifndef NO_BOLD_UNDERLINE_REVERSE
726
727 rxvt_color_aliases(aR_ Color_BD); 707 color_aliases (Color_BD);
728 rxvt_color_aliases(aR_ Color_UL); 708 color_aliases (Color_UL);
729 rxvt_color_aliases(aR_ Color_RV); 709 color_aliases (Color_RV);
730#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 710#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
731 711
732 return cmd_argv; 712 return cmd_argv;
733} 713}
734 714
735/*----------------------------------------------------------------------*/ 715/*----------------------------------------------------------------------*/
736/* EXTPROTO */
737void 716void
738rxvt_init_env(pR) 717rxvt_term::init_env ()
739{ 718{
740 int i; 719 int i;
741 unsigned int u; 720 unsigned int u;
742 char *val; 721 char *val;
743 722
744#ifdef DISPLAY_IS_IP 723#ifdef DISPLAY_IS_IP
745 /* Fixup display_name for export over pty to any interested terminal 724 /* 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 725 * 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 726 * (for the first non-loopback interface) that we get from
… …
750 * server is beyond a slow link or overloaded at client startup. Of 729 * server is beyond a slow link or overloaded at client startup. Of
751 * course that only helps the shell's child processes, not us. 730 * course that only helps the shell's child processes, not us.
752 * 731 *
753 * Giving out the display_name also affords a potential security hole 732 * Giving out the display_name also affords a potential security hole
754 */ 733 */
755 val = rxvt_network_display(R->rs[Rs_display_name]); 734 val = rxvt_network_display (rs[Rs_display_name]);
756 R->rs[Rs_display_name] = (const char *)val; 735 rs[Rs_display_name] = (const char *)val;
736
757 if (val == NULL) 737 if (val == NULL)
758#endif /* DISPLAY_IS_IP */ 738#endif /* DISPLAY_IS_IP */
759
760 val = XDisplayString(R->Xdisplay); 739 val = XDisplayString(Xdisplay);
740
761 if (R->rs[Rs_display_name] == NULL) 741 if (rs[Rs_display_name] == NULL)
762 R->rs[Rs_display_name] = val; /* use broken `:0' value */ 742 rs[Rs_display_name] = val; /* use broken `:0' value */
763 743
764 i = STRLEN(val); 744 i = STRLEN (val);
765 R->env_display = (char *)rxvt_malloc((i + 9) * sizeof(char)); 745 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char));
766 746
767 sprintf(R->env_display, "DISPLAY=%s", val); 747 sprintf (env_display, "DISPLAY=%s", val);
768 748
769 /* avoiding the math library: 749 /* avoiding the math library:
770 * i = (int)(ceil(log10((unsigned int)R->TermWin.parent[0]))) */ 750 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */
771 for (i = 0, u = (unsigned int)R->TermWin.parent[0]; u; u /= 10, i++) 751 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
772 ; 752 ;
773 MAX_IT(i, 1); 753 MAX_IT(i, 1);
774 R->env_windowid = (char *)rxvt_malloc((i + 10) * sizeof(char)); 754 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char));
775 755
776 sprintf(R->env_windowid, "WINDOWID=%u", 756 sprintf (env_windowid, "WINDOWID=%u",
777 (unsigned int)R->TermWin.parent[0]); 757 (unsigned int)TermWin.parent[0]);
778 758
779 /* add entries to the environment: 759 /* add entries to the environment:
780 * @ DISPLAY: in case we started with -display 760 * @ DISPLAY: in case we started with -display
781 * @ WINDOWID: X window id number of the window 761 * @ WINDOWID: X window id number of the window
782 * @ COLORTERM: terminal sub-name and also indicates its color 762 * @ COLORTERM: terminal sub-name and also indicates its color
783 * @ TERM: terminal name 763 * @ TERM: terminal name
784 * @ TERMINFO: path to terminfo directory 764 * @ TERMINFO: path to terminfo directory
785 */ 765 */
786 putenv(R->env_display); 766 putenv (env_display);
787 putenv(R->env_windowid); 767 putenv (env_windowid);
768
788#ifdef RXVT_TERMINFO 769#ifdef RXVT_TERMINFO
789
790 putenv("TERMINFO=" RXVT_TERMINFO); 770 putenv ("TERMINFO=" RXVT_TERMINFO);
791#endif 771#endif
792 772
793 if (XDEPTH <= 2) 773 if (Xdepth <= 2)
794 putenv("COLORTERM=" COLORTERMENV "-mono"); 774 putenv ("COLORTERM=" COLORTERMENV "-mono");
795 else 775 else
796 putenv("COLORTERM=" COLORTERMENVFULL); 776 putenv ("COLORTERM=" COLORTERMENVFULL);
777
797 if (R->rs[Rs_term_name] != NULL) 778 if (rs[Rs_term_name] != NULL)
798 { 779 {
799 R->env_term = (char *)rxvt_malloc((STRLEN(R->rs[Rs_term_name]) + 6) * sizeof(char)); 780 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]); 781 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
801 putenv(R->env_term); 782 putenv (env_term);
802 } 783 }
803 else 784 else
804 putenv("TERM=" TERMENV); 785 putenv ("TERM=" TERMENV);
805 786
806#ifdef HAVE_UNSETENV 787#ifdef HAVE_UNSETENV
807 /* avoid passing old settings and confusing term size */ 788 /* avoid passing old settings and confusing term size */
808 unsetenv("LINES"); 789 unsetenv ("LINES");
809 unsetenv("COLUMNS"); 790 unsetenv ("COLUMNS");
810 unsetenv("TERMCAP"); /* terminfo should be okay */ 791 unsetenv ("TERMCAP"); /* terminfo should be okay */
811#endif /* HAVE_UNSETENV */ 792#endif /* HAVE_UNSETENV */
812} 793}
813 794
814/*----------------------------------------------------------------------*/ 795/*----------------------------------------------------------------------*/
815/* 796/*
816 * This is more or less stolen straight from XFree86 xterm. 797 * This is more or less stolen straight from XFree86 xterm.
817 * This should support all European type languages. 798 * This should support all European type languages.
818 */ 799 */
819/* EXTPROTO */
820void 800void
801rxvt_term::set_locale (const char *locale)
802{
803#if HAVE_XSETLOCALE || HAVE_SETLOCALE
804 free (this->locale);
805 this->locale = strdup (setlocale (LC_CTYPE, ""));
806#endif
807#if HAVE_NL_LANGINFO
808 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8");
812#else
813 enc_utf8 = 1;
814#endif
815}
816
817void
821rxvt_init_xlocale(pR) 818rxvt_term::init_xlocale ()
822{ 819{
823#ifdef USE_XIM 820#ifdef USE_XIM
824 if (R->locale == NULL) 821 if (!locale)
825 rxvt_print_error("Setting locale failed."); 822 rxvt_print_error ("Setting locale failed.");
826 else 823 else
827 { 824 {
828 Atom wmlocale; 825 Atom wmlocale;
829 826
830 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 827 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False);
831 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 828 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale,
832 XA_STRING, 8, PropModeReplace, 829 XA_STRING, 8, PropModeReplace,
833 (unsigned char *)R->locale, STRLEN(R->locale)); 830 (unsigned char *)locale, STRLEN(locale));
834 831
835 if (XSupportsLocale() != True) 832 if (!XSupportsLocale ())
836 { 833 {
837 rxvt_print_error("The locale is not supported by Xlib"); 834 rxvt_print_error ("The locale is not supported by Xlib");
838 return; 835 return;
839 } 836 }
840 837
841 rxvt_setTermFontSet(aR_ 0);
842
843 /* see if we can connect yet */ 838 /* see if we can connect yet */
844 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 839 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL);
845 840
846 /* To avoid Segmentation Fault in C locale: Solaris only? */ 841 /* To avoid Segmentation Fault in C locale: Solaris only? */
847 if (STRCMP(R->locale, "C")) 842 if (STRCMP (locale, "C"))
848 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 843 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
849 rxvt_IMInstantiateCallback, NULL); 844 rxvt_IMInstantiateCallback, NULL);
850 } 845 }
851#endif 846#endif
852} 847}
853 848
854/*----------------------------------------------------------------------*/ 849/*----------------------------------------------------------------------*/
855/* EXTPROTO */
856void 850void
857rxvt_init_command(pR_ const char *const *argv) 851rxvt_term::init_command(const char *const *argv)
858{ 852{
859 /* 853 /*
860 * Initialize the command connection. 854 * Initialize the command connection.
861 * This should be called after the X server connection is established. 855 * This should be called after the X server connection is established.
862 */ 856 */
863 int i; 857 int i;
864 858
865 for (i = 0; i < NUM_XA; i++) 859 for (i = 0; i < NUM_XA; i++)
866 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 860 xa[i] = XInternAtom(Xdisplay, xa_names[i], False);
867 861
868 /* Enable delete window protocol */ 862 /* Enable delete window protocol */
869 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 863 XSetWMProtocols (Xdisplay, TermWin.parent[0],
870 &(R->xa[XA_WMDELETEWINDOW]), 1); 864 &(xa[XA_WMDELETEWINDOW]), 1);
871 865
872#ifdef USING_W11LIB 866#ifdef USING_W11LIB
873 /* enable W11 callbacks */ 867 /* enable W11 callbacks */
874 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 868 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event);
875#endif 869#endif
876 870
877#ifdef META8_OPTION 871#ifdef META8_OPTION
878
879 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
880#endif 873#endif
881 874
882 rxvt_get_ourmods(aR); 875 rxvt_get_ourmods (this);
883 876
884 if (!(R->Options & Opt_scrollTtyOutput)) 877 if (!(Options & Opt_scrollTtyOutput))
885 R->PrivateModes |= PrivMode_TtyOutputInh; 878 PrivateModes |= PrivMode_TtyOutputInh;
886 if (R->Options & Opt_scrollTtyKeypress) 879 if (Options & Opt_scrollTtyKeypress)
887 R->PrivateModes |= PrivMode_Keypress; 880 PrivateModes |= PrivMode_Keypress;
888 if (!(R->Options & Opt_jumpScroll)) 881 if (!(Options & Opt_jumpScroll))
889 R->PrivateModes |= PrivMode_smoothScroll; 882 PrivateModes |= PrivMode_smoothScroll;
883
890#ifndef NO_BACKSPACE_KEY 884#ifndef NO_BACKSPACE_KEY
891
892 if (STRCMP(R->key_backspace, "DEC") == 0) 885 if (STRCMP(key_backspace, "DEC") == 0)
893 R->PrivateModes |= PrivMode_HaveBackSpace; 886 PrivateModes |= PrivMode_HaveBackSpace;
894#endif 887#endif
888
895 /* add value for scrollBar */ 889 /* add value for scrollBar */
896 if (scrollbar_visible(R)) 890 if (scrollbar_visible (this))
897 { 891 {
898 R->PrivateModes |= PrivMode_scrollBar; 892 PrivateModes |= PrivMode_scrollBar;
899 R->SavedModes |= PrivMode_scrollBar; 893 SavedModes |= PrivMode_scrollBar;
900 } 894 }
901 if (menubar_visible(R)) 895 if (menubar_visible (this))
902 { 896 {
903 R->PrivateModes |= PrivMode_menuBar; 897 PrivateModes |= PrivMode_menuBar;
904 R->SavedModes |= PrivMode_menuBar; 898 SavedModes |= PrivMode_menuBar;
905 } 899 }
900
906#ifdef GREEK_SUPPORT 901#ifdef GREEK_SUPPORT
907 greek_init(); 902 greek_init();
908#endif 903#endif
909 904
910 R->Xfd = XConnectionNumber (R->Xdisplay); 905 Xfd = XConnectionNumber (Xdisplay);
911 906
912#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
913 908
914 if (R->Options & Opt_cursorBlink) 909 if (Options & Opt_cursorBlink)
915 (void)gettimeofday(&R->lastcursorchange, NULL); 910 (void)gettimeofday (&lastcursorchange, NULL);
916#endif 911#endif
917 912
918 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 913 if ((cmd_fd = run_command (argv)) < 0)
919 { 914 {
920 rxvt_print_error ("aborting"); 915 rxvt_print_error ("aborting");
921 exit (EXIT_FAILURE); 916 exit (EXIT_FAILURE);
922 } 917 }
923} 918}
924 919
925/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
926/* INTPROTO */ 921/* INTPROTO */
927void 922void
928rxvt_Get_Colours(pR) 923rxvt_Get_Colours (pR)
929{ 924{
930 int i; 925 int i;
931 926
932 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 927 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
933 { 928 {
934 rxvt_color xcol; 929 rxvt_color xcol;
935 930
936 if (!R->rs[Rs_color + i]) 931 if (!R->rs[Rs_color + i])
937 continue; 932 continue;
938 933
939 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 934 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
… …
943 { 938 {
944 R->rs[Rs_color + i] = def_colorName[!i]; 939 R->rs[Rs_color + i] = def_colorName[!i];
945 } 940 }
946 else 941 else
947#endif 942#endif
948
949 R->rs[Rs_color + i] = def_colorName[i]; 943 R->rs[Rs_color + i] = def_colorName[i];
944
950 if (!R->rs[Rs_color + i]) 945 if (!R->rs[Rs_color + i])
951 continue; 946 continue;
947
952 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 948 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i]))
953 { 949 {
954 switch (i) 950 switch (i)
955 { 951 {
956 case Color_fg: 952 case Color_fg:
957 case Color_bg: 953 case Color_bg:
958 /* fatal: need bg/fg color */ 954 /* fatal: need bg/fg color */
959 rxvt_print_error("aborting"); 955 rxvt_print_error ("aborting");
960 exit(EXIT_FAILURE); 956 exit (EXIT_FAILURE);
961 /* NOTREACHED */ 957 /* NOTREACHED */
962 break; 958 break;
963#ifndef NO_CURSORCOLOR 959#ifndef NO_CURSORCOLOR
964
965 case Color_cursor2: 960 case Color_cursor2:
966 xcol = R->PixColors[Color_fg]; 961 xcol = R->PixColors[Color_fg];
967 break; 962 break;
968#endif /* ! NO_CURSORCOLOR */ 963#endif /* ! NO_CURSORCOLOR */
969
970 case Color_pointer: 964 case Color_pointer:
971 xcol = R->PixColors[Color_fg]; 965 xcol = R->PixColors[Color_fg];
972 break; 966 break;
973 default: 967 default:
974 xcol = R->PixColors[Color_bg]; /* None */ 968 xcol = R->PixColors[Color_bg]; /* None */
975 break; 969 break;
976 } 970 }
977 } 971 }
978 } 972 }
973
979 R->PixColors[i] = xcol; 974 R->PixColors[i] = xcol;
980 SET_PIXCOLOR(R, i); 975 SET_PIXCOLOR (R, i);
981 } 976 }
982 977
983 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 978 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer])
984 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 979 R->PixColors[Color_pointer] = R->PixColors[Color_fg];
985 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border])
… …
1006 * xcol[1] == top shadow 1001 * xcol[1] == top shadow
1007 * xcol[2] == bot shadow */ 1002 * xcol[2] == bot shadow */
1008 1003
1009 xcol[1] = R->PixColors[Color_scroll]; 1004 xcol[1] = R->PixColors[Color_scroll];
1010# ifdef PREFER_24BIT 1005# ifdef PREFER_24BIT
1011 1006 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); */ 1007 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1014# else 1008# else
1015
1016 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1009 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen));
1017# endif 1010# endif
1018 1011
1019 unsigned short R1, G1, B1, R0, G0, B0; 1012 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1020 1013
1021 xcol[0].get (r, R0, G0, B0); 1014 xcol[0].get (R, pr0, pg0, pb0);
1022 xcol[1].get (r, R1, G1, B1); 1015 xcol[1].get (R, pr1, pg1, pb1);
1023 1016
1024 /* bottomShadowColor */ 1017 /* bottomShadowColor */
1025 if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) 1018 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2))
1026 xcol[2] = R->PixColors[Color_Black]; 1019 xcol[2] = R->PixColors[Color_Black];
1027 1020
1028 R->PixColors[Color_bottomShadow] = xcol[2]; 1021 R->PixColors[Color_bottomShadow] = xcol[2];
1029 1022
1030 /* topShadowColor */ 1023 /* topShadowColor */
1031 if (!xcol[1].set (aR_ 1024 if (!xcol[1].set (aR_
1032 min (R0, max (R0 / 5, R1) * 7 / 5), 1025 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1033 min (G0, max (G0 / 5, G1) * 7 / 5), 1026 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1034 min (B0, max (B0 / 5, B1) * 7 / 5))) 1027 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1035 xcol[1] = R->PixColors[Color_White]; 1028 xcol[1] = R->PixColors[Color_White];
1036 1029
1037 R->PixColors[Color_topShadow] = xcol[1]; 1030 R->PixColors[Color_topShadow] = xcol[1];
1038 } 1031 }
1039#endif /* KEEP_SCROLLCOLOR */ 1032#endif /* KEEP_SCROLLCOLOR */
1040} 1033}
1041 1034
1042/*----------------------------------------------------------------------*/ 1035/*----------------------------------------------------------------------*/
1043/* color aliases, fg/bg bright-bold */ 1036/* color aliases, fg/bg bright-bold */
1044/* INTPROTO */
1045void 1037void
1046rxvt_color_aliases(pR_ int idx) 1038rxvt_term::color_aliases(int idx)
1047{ 1039{
1048 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 1040 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx])))
1049 { 1041 {
1050 int i = atoi(R->rs[Rs_color + idx]); 1042 int i = atoi (rs[Rs_color + idx]);
1051 1043
1052 if (i >= 8 && i <= 15) 1044 if (i >= 8 && i <= 15)
1053 { /* bright colors */ 1045 { /* bright colors */
1054 i -= 8; 1046 i -= 8;
1055#ifndef NO_BRIGHTCOLOR 1047#ifndef NO_BRIGHTCOLOR
1056
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
1061 } 1051 }
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/*
… …
1136 R->ModMetaMask = modmasks[i - 1]; 1127 R->ModMetaMask = modmasks[i - 1];
1137} 1128}
1138 1129
1139/*----------------------------------------------------------------------*/ 1130/*----------------------------------------------------------------------*/
1140/* rxvt_Create_Windows() - Open and map the window */ 1131/* rxvt_Create_Windows() - Open and map the window */
1141/* EXTPROTO */
1142void 1132void
1143rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1133rxvt_term::create_windows (int argc, const char *const *argv)
1144{ 1134{
1145 XClassHint classHint; 1135 XClassHint classHint;
1146 XWMHints wmHint; 1136 XWMHints wmHint;
1147 XGCValues gcvalue; 1137 XGCValues gcvalue;
1148 long vt_emask; 1138 long vt_emask;
1149 1139
1150#ifdef PREFER_24BIT
1151
1152 XSetWindowAttributes attributes; 1140 XSetWindowAttributes attributes;
1153 XWindowAttributes gattr; 1141 XWindowAttributes gattr;
1154 1142
1155 XCMAP = DefaultColormap(R->Xdisplay, Xscreen); 1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1156 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen); 1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay);
1157 1146
1158 if (R->Options & Opt_transparent) 1147 if (Options & Opt_transparent)
1159 { 1148 {
1160 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen), 1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr);
1161 &gattr);
1162 XDEPTH = gattr.depth; 1150 Xdepth = gattr.depth;
1163 } 1151 }
1164 else 1152 else
1165 { 1153 {
1166 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen); 1154 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1155#ifdef PREFER_24BIT
1167 /* 1156 /*
1168 * If depth is not 24, look for a 24bit visual. 1157 * If depth is not 24, look for a 24bit visual.
1169 */ 1158 */
1170 if (XDEPTH != 24) 1159 if (Xdepth != 24)
1171 { 1160 {
1172 XVisualInfo vinfo; 1161 XVisualInfo vinfo;
1173 1162
1174 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1175 { 1164 {
1176 XDEPTH = 24; 1165 Xdepth = 24;
1177 XVISUAL = vinfo.visual; 1166 Xvisual = vinfo.visual;
1178 XCMAP = XCreateColormap(R->Xdisplay, 1167 Xcmap = XCreateColormap(Xdisplay,
1179 RootWindow(R->Xdisplay, Xscreen), 1168 RootWindow(Xdisplay, Xscreen),
1180 XVISUAL, AllocNone); 1169 Xvisual, AllocNone);
1181 } 1170 }
1182 } 1171 }
1183 }
1184#endif 1172#endif
1173 }
1185 1174
1186 /* grab colors before netscape does */ 1175 /* grab colors before netscape does */
1187 rxvt_Get_Colours(aR); 1176 rxvt_Get_Colours (this);
1188 1177
1189 rxvt_change_font(aR_ 1, NULL); 1178 rxvt_change_font (this, 1, NULL);
1190 rxvt_window_calc(aR_ 0, 0); 1179 window_calc (0, 0);
1191 R->old_width = R->szHint.width; 1180 old_width = szHint.width;
1192 R->old_height = R->szHint.height; 1181 old_height = szHint.height;
1193 1182
1194 /* parent window - reverse video so we can see placement errors 1183 /* parent window - reverse video so we can see placement errors
1195 * sub-window placement & size in rxvt_resize_subwindows() 1184 * sub-window placement & size in rxvt_resize_subwindows()
1196 */ 1185 */
1197 1186
1198#ifdef PREFER_24BIT 1187#ifdef PREFER_24BIT
1199
1200 attributes.background_pixel = R->PixColors[Color_fg]; 1188 attributes.background_pixel = PixColors[Color_fg];
1201 attributes.border_pixel = R->PixColors[Color_border]; 1189 attributes.border_pixel = PixColors[Color_border];
1202 attributes.colormap = XCMAP; 1190 attributes.colormap = Xcmap;
1203 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1204 R->szHint.x, R->szHint.y, 1192 szHint.x, szHint.y,
1205 R->szHint.width, R->szHint.height, 1193 szHint.width, szHint.height,
1206 R->TermWin.ext_bwidth, 1194 TermWin.ext_bwidth,
1207 XDEPTH, InputOutput, 1195 Xdepth, InputOutput,
1208 XVISUAL, 1196 Xvisual,
1209 CWBackPixel | CWBorderPixel 1197 CWBackPixel | CWBorderPixel
1210 | CWColormap, &attributes); 1198 | CWColormap, &attributes);
1211#else 1199#else
1212
1213 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, 1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1214 R->szHint.x, R->szHint.y, 1201 szHint.x, szHint.y,
1215 R->szHint.width, 1202 szHint.width,
1216 R->szHint.height, 1203 szHint.height,
1217 R->TermWin.ext_bwidth, 1204 TermWin.ext_bwidth,
1218 R->PixColors[Color_border], 1205 PixColors[Color_border],
1219 R->PixColors[Color_fg]); 1206 PixColors[Color_fg]);
1220#endif 1207#endif
1221 1208
1222 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST);
1223 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1224 1211
1225 classHint.res_name = (char *)R->rs[Rs_name]; 1212 classHint.res_name = (char *)rs[Rs_name];
1226 classHint.res_class = (char *)APL_CLASS; 1213 classHint.res_class = (char *)APL_CLASS;
1227 1214
1228 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1229 wmHint.input = True; 1216 wmHint.input = True;
1230 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1217 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1231 : NormalState); 1218 : NormalState);
1232 wmHint.window_group = R->TermWin.parent[0]; 1219 wmHint.window_group = TermWin.parent[0];
1233 1220
1234 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1221 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL,
1235 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1222 (char **)argv, argc, &szHint, &wmHint, &classHint);
1236 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1223 XSelectInput(Xdisplay, TermWin.parent[0],
1237 (KeyPressMask 1224 (KeyPressMask
1238#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1225#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1239 | KeyReleaseMask 1226 | KeyReleaseMask
1240#endif 1227#endif
1241 | FocusChangeMask | VisibilityChangeMask 1228 | FocusChangeMask | VisibilityChangeMask
1242 | StructureNotifyMask)); 1229 | StructureNotifyMask));
1243 1230
1244 /* vt cursor: Black-on-White is standard, but this is more popular */ 1231 /* vt cursor: Black-on-White is standard, but this is more popular */
1245 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1232 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
1246 1233
1247#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1234#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1248 /* cursor (menuBar/scrollBar): Black-on-White */ 1235 /* cursor (menuBar/scrollBar): Black-on-White */
1249 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1236 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
1250#endif 1237#endif
1251 1238
1252#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1253 1240
1254 { 1241 {
1255 XColor blackcolour; 1242 XColor blackcolour;
1256 blackcolour.red = 0; 1243 blackcolour.red = 0;
1257 blackcolour.green = 0; 1244 blackcolour.green = 0;
1258 blackcolour.blue = 0; 1245 blackcolour.blue = 0;
1259 Font f = XLoadFont (R->Xdisplay, "fixed"); 1246 Font f = XLoadFont (Xdisplay, "fixed");
1260 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1247 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1261 &blackcolour, &blackcolour); 1248 &blackcolour, &blackcolour);
1262 XUnloadFont (R->Xdisplay, f); 1249 XUnloadFont (Xdisplay, f);
1263 } 1250 }
1264#endif 1251#endif
1265 1252
1266 /* the vt window */ 1253 /* the vt window */
1267 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1254 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1268 R->window_vt_x, R->window_vt_y, 1255 window_vt_x, window_vt_y,
1269 TermWin_TotalWidth(), 1256 TermWin_TotalWidth(),
1270 TermWin_TotalHeight(), 1257 TermWin_TotalHeight(),
1271 0, 1258 0,
1272 R->PixColors[Color_fg], 1259 PixColors[Color_fg],
1273 R->PixColors[Color_bg]); 1260 PixColors[Color_bg]);
1274#ifdef DEBUG_X 1261#ifdef DEBUG_X
1275
1276 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1262 XStoreName(Xdisplay, TermWin.vt, "vt window");
1277#endif 1263#endif
1278
1279 R->pointer_unblank ();
1280 1264
1281 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1265 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1282 | PropertyChangeMask); 1266 | PropertyChangeMask);
1267
1283#ifdef POINTER_BLANK 1268#ifdef POINTER_BLANK
1269 pointer_unblank ();
1284 1270
1285 if ((R->Options & Opt_pointerBlank)) 1271 if ((Options & Opt_pointerBlank))
1286 vt_emask |= PointerMotionMask; 1272 vt_emask |= PointerMotionMask;
1287 else 1273 else
1288#endif 1274#endif
1289
1290 vt_emask |= (Button1MotionMask | Button3MotionMask); 1275 vt_emask |= (Button1MotionMask | Button3MotionMask);
1276
1291 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1277 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1292 1278
1293#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1279#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1294 1280
1295 if (menuBar_height()) 1281 if (menuBar_height())
1296 { 1282 {
1297 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1283 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1298 R->window_vt_x, 0, 1284 window_vt_x, 0,
1299 TermWin_TotalWidth(), 1285 TermWin_TotalWidth(),
1300 menuBar_TotalHeight(), 1286 menuBar_TotalHeight(),
1301 0, 1287 0,
1302 R->PixColors[Color_fg], 1288 PixColors[Color_fg],
1303 R->PixColors[Color_scroll]); 1289 PixColors[Color_scroll]);
1304#ifdef DEBUG_X 1290#ifdef DEBUG_X
1305 1291
1306 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1292 XStoreName(Xdisplay, menuBar.win, "menubar");
1307#endif 1293#endif
1308 1294
1309 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1295 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr);
1310 XSelectInput(R->Xdisplay, R->menuBar.win, 1296 XSelectInput(Xdisplay, menuBar.win,
1311 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1297 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1312 | Button1MotionMask)); 1298 | Button1MotionMask));
1313 } 1299 }
1314#endif 1300#endif
1315#ifdef XPM_BACKGROUND 1301#ifdef XPM_BACKGROUND
1316 if (R->rs[Rs_backgroundPixmap] != NULL 1302 if (rs[Rs_backgroundPixmap] != NULL
1317 && !(R->Options & Opt_transparent)) 1303 && !(Options & Opt_transparent))
1318 { 1304 {
1319 const char *p = R->rs[Rs_backgroundPixmap]; 1305 const char *p = rs[Rs_backgroundPixmap];
1320 1306
1321 if ((p = STRCHR(p, ';')) != NULL) 1307 if ((p = STRCHR(p, ';')) != NULL)
1322 { 1308 {
1323 p++; 1309 p++;
1324 rxvt_scale_pixmap(aR_ p); 1310 rxvt_scale_pixmap (this, p);
1325 } 1311 }
1326 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1312 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]);
1327 rxvt_scr_touch(aR_ True); 1313 rxvt_scr_touch (this, True);
1328 } 1314 }
1329#endif 1315#endif
1330 1316
1331 /* graphics context for the vt window */ 1317 /* graphics context for the vt window */
1332 gcvalue.foreground = R->PixColors[Color_fg]; 1318 gcvalue.foreground = PixColors[Color_fg];
1333 gcvalue.background = R->PixColors[Color_bg]; 1319 gcvalue.background = PixColors[Color_bg];
1334 gcvalue.graphics_exposures = 1; 1320 gcvalue.graphics_exposures = 1;
1335 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1321 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1336 GCForeground | GCBackground 1322 GCForeground | GCBackground
1337 | GCGraphicsExposures, &gcvalue); 1323 | GCGraphicsExposures, &gcvalue);
1338 1324
1339#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1325#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1340 1326
1341 gcvalue.foreground = R->PixColors[Color_topShadow]; 1327 gcvalue.foreground = PixColors[Color_topShadow];
1342 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1328 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1343 GCForeground, &gcvalue); 1329 GCForeground, &gcvalue);
1344 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1330 gcvalue.foreground = PixColors[Color_bottomShadow];
1345 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1331 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1346 GCForeground, &gcvalue); 1332 GCForeground, &gcvalue);
1347 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1333 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1348 : Color_scroll)]; 1334 : Color_scroll)];
1349 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1335 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1350 GCForeground, &gcvalue); 1336 GCForeground, &gcvalue);
1351#endif 1337#endif
1352} 1338}
1353 1339
1354/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
1355/* 1341/*
1356 * Run the command in a subprocess and return a file descriptor for the 1342 * 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 1343 * master end of the pseudo-teletype pair with the command talking to
1358 * the slave. 1344 * the slave.
1359 */ 1345 */
1360/* INTPROTO */
1361int 1346int
1362rxvt_run_command(pR_ const char *const *argv) 1347rxvt_term::run_command (const char *const *argv)
1363{ 1348{
1364 int cfd, er; 1349 int cfd, er;
1365 1350
1366 /* get master (pty) */ 1351 /* get master (pty) */
1367 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1352 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0)
1368 { 1353 {
1369 rxvt_print_error("can't open pseudo-tty"); 1354 rxvt_print_error("can't open pseudo-tty");
1370 return -1; 1355 return -1;
1371 } 1356 }
1372 1357
1373#ifdef FD_SETSIZE 1358#ifdef FD_SETSIZE
1374 if (R->Xfd > FD_SETSIZE || cfd > FD_SETSIZE) 1359 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1375 { 1360 {
1376 rxvt_print_error("fd too high: %d max", FD_SETSIZE); 1361 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1377 rxvt_clean_exit(); 1362 rxvt_clean_exit();
1378 exit(EXIT_FAILURE); 1363 exit(EXIT_FAILURE);
1379 } 1364 }
1380#endif 1365#endif
1381 1366
1382 fcntl (cfd, F_SETFL, O_NONBLOCK); 1367 fcntl (cfd, F_SETFL, O_NONBLOCK);
1383 1368
1384 /* get slave (tty) */ 1369 /* get slave (tty) */
1385 if (R->tty_fd < 0) 1370 if (tty_fd < 0)
1386 { 1371 {
1387#ifndef NO_SETOWNER_TTYDEV 1372#ifndef NO_SETOWNER_TTYDEV
1388 rxvt_privileged_ttydev (aR_ SAVE); 1373 rxvt_privileged_ttydev (aR_ SAVE);
1389#endif 1374#endif
1390 1375
1391 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1376 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1392 { 1377 {
1393 close(cfd); 1378 close(cfd);
1394 rxvt_print_error("can't open slave tty %s", R->ttydev); 1379 rxvt_print_error("can't open slave tty %s", ttydev);
1395 return -1; 1380 return -1;
1396 } 1381 }
1397 } 1382 }
1398#ifndef NO_BACKSPACE_KEY 1383#ifndef NO_BACKSPACE_KEY
1399 if (R->key_backspace[0] && !R->key_backspace[1]) 1384 if (key_backspace[0] && !key_backspace[1])
1400 er = R->key_backspace[0]; 1385 er = key_backspace[0];
1401 else if (STRCMP(R->key_backspace, "DEC") == 0) 1386 else if (STRCMP(key_backspace, "DEC") == 0)
1402 er = '\177'; /* the initial state anyway */ 1387 er = '\177'; /* the initial state anyway */
1403 else 1388 else
1404#endif 1389#endif
1405 1390
1406 er = -1; 1391 er = -1;
1407 1392
1408 rxvt_get_ttymode (&(R->tio), er); 1393 rxvt_get_ttymode (&(tio), er);
1409 1394
1410#ifndef __QNX__ 1395#ifndef __QNX__
1411 /* spin off the command interpreter */ 1396 /* spin off the command interpreter */
1412 switch (R->cmd_pid = fork ()) 1397 switch (cmd_pid = fork ())
1413 { 1398 {
1414 case -1: 1399 case -1:
1415 rxvt_print_error("can't fork"); 1400 rxvt_print_error("can't fork");
1416 return -1; 1401 return -1;
1417 case 0: 1402 case 0:
1418 close (cfd); /* only keep R->tty_fd and STDERR open */ 1403 close (cfd); /* only keep tty_fd and STDERR open */
1419 close (R->Xfd); 1404 close (Xfd);
1420 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1405 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1421 rxvt_print_error ("could not obtain control of tty"); 1406 rxvt_print_error ("could not obtain control of tty");
1422 else 1407 else
1423 { 1408 {
1424 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1409 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1425 dup2 (R->tty_fd, STDIN_FILENO); 1410 dup2 (tty_fd, STDIN_FILENO);
1426 dup2 (R->tty_fd, STDOUT_FILENO); 1411 dup2 (tty_fd, STDOUT_FILENO);
1427 dup2 (R->tty_fd, STDERR_FILENO); 1412 dup2 (tty_fd, STDERR_FILENO);
1428 1413
1429 if (R->tty_fd > 2) 1414 if (tty_fd > 2)
1430 close (R->tty_fd); 1415 close (tty_fd);
1431 1416
1432 rxvt_run_child (aR_ argv); 1417 run_child (argv);
1433 } 1418 }
1434 exit (EXIT_FAILURE); 1419 exit (EXIT_FAILURE);
1435 /* NOTREACHED */ 1420 /* NOTREACHED */
1436 default: 1421 default:
1437 { 1422 {
1438#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1423#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1439 int fdstdin; 1424 int fdstdin;
1440 1425
1441 fdstdin = dup (STDIN_FILENO); 1426 fdstdin = dup (STDIN_FILENO);
1442 dup2 (R->tty_fd, STDIN_FILENO); 1427 dup2 (tty_fd, STDIN_FILENO);
1443#endif 1428#endif
1444 1429
1430#ifdef UTMP_SUPPORT
1445 rxvt_privileged_utmp (aR_ SAVE); 1431 rxvt_privileged_utmp (this, SAVE);
1432#endif
1433
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1434#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1447 1435
1448 dup2 (fdstdin, STDIN_FILENO); 1436 dup2 (fdstdin, STDIN_FILENO);
1449 close (fdstdin); 1437 close (fdstdin);
1450#endif 1438#endif
1451 1439
1452 } 1440 }
1453 close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ 1441 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */
1454 break; 1442 break;
1455 } 1443 }
1456#else /* __QNX__ uses qnxspawn() */ 1444#else /* __QNX__ uses qnxspawn() */
1457 fchmod (R->tty_fd, 0622); 1445 fchmod (tty_fd, 0622);
1458 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1446 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1459 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1447 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1460 1448
1461 if (rxvt_run_child (aR_ argv) == -1) 1449 if (run_child (argv) == -1)
1462 exit (EXIT_FAILURE); 1450 exit (EXIT_FAILURE);
1463#endif 1451#endif
1464 1452
1465 return cfd; 1453 return cfd;
1466} 1454}
… …
1470 * ------------------------------------------------------------------------- */ 1458 * ------------------------------------------------------------------------- */
1471/* 1459/*
1472 * The only open file descriptor is the slave tty - so no error messages. 1460 * The only open file descriptor is the slave tty - so no error messages.
1473 * returns are fatal 1461 * returns are fatal
1474 */ 1462 */
1475/* INTPROTO */
1476int 1463int
1477rxvt_run_child(pR_ const char *const *argv) 1464rxvt_term::run_child (const char *const *argv)
1478{ 1465{
1479 char *login; 1466 char *login;
1480 1467
1481 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1468 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */
1482 1469
1483 if (R->Options & Opt_console) 1470 if (Options & Opt_console)
1484 { /* be virtual console, fail silently */ 1471 { /* be virtual console, fail silently */
1485#ifdef TIOCCONS 1472#ifdef TIOCCONS
1486 unsigned int on = 1; 1473 unsigned int on = 1;
1487 1474
1488 ioctl (STDIN_FILENO, TIOCCONS, &on); 1475 ioctl (STDIN_FILENO, TIOCCONS, &on);
1489#elif defined (SRIOCSREDIR) 1476#elif defined (SRIOCSREDIR)
1490
1491 int fd; 1477 int fd;
1492 1478
1493 fd = open (CONSOLE, O_WRONLY, 0); 1479 fd = open (CONSOLE, O_WRONLY, 0);
1494 if (fd >= 0) 1480 if (fd >= 0)
1495 { 1481 {
1496 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1482 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1497 close (fd); 1483 close (fd);
1498 } 1484 }
1499#endif /* SRIOCSREDIR */ 1485#endif /* SRIOCSREDIR */
1500
1501 } 1486 }
1502 1487
1503 /* reset signals and spin off the command interpreter */ 1488 /* reset signals and spin off the command interpreter */
1504 signal (SIGINT, SIG_DFL); 1489 signal (SIGINT, SIG_DFL);
1505 signal (SIGQUIT, SIG_DFL); 1490 signal (SIGQUIT, SIG_DFL);
… …
1507 /* 1492 /*
1508 * mimick login's behavior by disabling the job control signals 1493 * mimick login's behavior by disabling the job control signals
1509 * a shell that wants them can turn them back on 1494 * a shell that wants them can turn them back on
1510 */ 1495 */
1511#ifdef SIGTSTP 1496#ifdef SIGTSTP
1512
1513 signal (SIGTSTP, SIG_IGN); 1497 signal (SIGTSTP, SIG_IGN);
1514 signal (SIGTTIN, SIG_IGN); 1498 signal (SIGTTIN, SIG_IGN);
1515 signal (SIGTTOU, SIG_IGN); 1499 signal (SIGTTOU, SIG_IGN);
1516#endif /* SIGTSTP */ 1500#endif /* SIGTSTP */
1517 1501
1518 /* set window size */ 1502 /* set window size */
1519 struct winsize ws; 1503 struct winsize ws;
1520 1504
1521 ws.ws_col = R->TermWin.ncol; 1505 ws.ws_col = TermWin.ncol;
1522 ws.ws_row = R->TermWin.nrow; 1506 ws.ws_row = TermWin.nrow;
1523 ws.ws_xpixel = ws.ws_ypixel = 0; 1507 ws.ws_xpixel = ws.ws_ypixel = 0;
1524 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1508 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1525 1509
1526 // unblock signals (signals are blocked by iom.C 1510 // unblock signals (signals are blocked by iom.C
1527 sigset_t ss; 1511 sigset_t ss;
… …
1548 1532
1549 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1533 if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
1550 shell = "/bin/sh"; 1534 shell = "/bin/sh";
1551 1535
1552 argv0 = (const char *)rxvt_r_basename(shell); 1536 argv0 = (const char *)rxvt_r_basename(shell);
1553 if (R->Options & Opt_loginShell) 1537 if (Options & Opt_loginShell)
1554 { 1538 {
1555 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1539 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char));
1556 1540
1557 login[0] = '-'; 1541 login[0] = '-';
1558 STRCPY(&login[1], argv0); 1542 STRCPY(&login[1], argv0);
1559 argv0 = login; 1543 argv0 = login;
1560 } 1544 }
1561 execlp(shell, argv0, NULL); 1545 execlp(shell, argv0, NULL);
1562 /* no error message: STDERR is closed! */ 1546 /* no error message: STDERR is closed! */
1563 } 1547 }
1548
1564#else /* __QNX__ uses qnxspawn() */ 1549#else /* __QNX__ uses qnxspawn() */
1565 { 1550
1566 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1551 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1567 char *command = NULL, fullcommand[_MAX_PATH]; 1552 char *command = NULL, fullcommand[_MAX_PATH];
1568 char **arg_v, *arg_a[2] = { NULL, NULL }; 1553 char **arg_v, *arg_a[2] = { NULL, NULL };
1569 1554
1570 if (argv != NULL) 1555 if (argv != NULL)
1571 { 1556 {
1572 if (access(argv[0], X_OK) == -1) 1557 if (access(argv[0], X_OK) == -1)
1573 { 1558 {
1574 if (STRCHR(argv[0], '/') == NULL) 1559 if (STRCHR(argv[0], '/') == NULL)
1575 { 1560 {
1576 searchenv(argv[0], "PATH", fullcommand); 1561 searchenv(argv[0], "PATH", fullcommand);
1577 if (fullcommand[0] != '\0') 1562 if (fullcommand[0] != '\0')
1578 command = fullcommand; 1563 command = fullcommand;
1579 } 1564 }
1580 if (access(command, X_OK) == -1) 1565 if (access(command, X_OK) == -1)
1581 return -1; 1566 return -1;
1582 } 1567 }
1583 else 1568 else
1584 command = argv[0]; 1569 command = argv[0];
1585 arg_v = argv; 1570 arg_v = argv;
1586 } 1571 }
1587 else 1572 else
1588 { 1573 {
1589 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1574 if ((command = getenv("SHELL")) == NULL || *command == '\0')
1590 command = "/bin/sh"; 1575 command = "/bin/sh";
1591 1576
1592 arg_a[0] = my_basename(command); 1577 arg_a[0] = my_basename(command);
1593 if (R->Options & Opt_loginShell) 1578 if (Options & Opt_loginShell)
1594 { 1579 {
1595 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1580 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char));
1596 1581
1597 login[0] = '-'; 1582 login[0] = '-';
1598 STRCPY(&login[1], arg_a[0]); 1583 STRCPY(&login[1], arg_a[0]);
1599 arg_a[0] = login; 1584 arg_a[0] = login;
1600 } 1585 }
1601 arg_v = arg_a; 1586 arg_v = arg_a;
1602 } 1587 }
1603 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1588 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1604 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1589 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1605 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1590 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1606 command, arg_v, environ, iov_a, 0); 1591 command, arg_v, environ, iov_a, 0);
1607 if (login) 1592 if (login)
1608 free(login); 1593 free(login);
1594
1609 close(R->tty_fd); 1595 close(tty_fd);
1610 return R->cmd_fd; 1596 return cmd_fd;
1611 } 1597
1612#endif 1598#endif
1613 return -1; 1599 return -1;
1614} 1600}
1615 1601
1616/* ------------------------------------------------------------------------- * 1602/* ------------------------------------------------------------------------- *

Diff Legend

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