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

Diff Legend

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