ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.25 by pcg, Wed Feb 11 08:13:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.9 2003/12/02 21:49:46 pcg Exp $
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;
376 Options = DEFAULT_OPTIONS; 374 Options = DEFAULT_OPTIONS;
377 want_refresh = 1; 375 want_refresh = 1;
378 cmd_pid = -1; 376 cmd_pid = -1;
379 cmd_fd = tty_fd = Xfd = -1; 377 cmd_fd = tty_fd = -1;
380 PrivateModes = SavedModes = PrivMode_Default; 378 PrivateModes = SavedModes = PrivMode_Default;
381 TermWin.focus = 0; 379 TermWin.focus = 0;
382 TermWin.ncol = 80; 380 TermWin.ncol = 80;
383 TermWin.nrow = 24; 381 TermWin.nrow = 24;
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 display = displays.get (val);
551 free(val); 541 free (val);
552 }
553#endif
554
555 if (R->Xdisplay == NULL
556 && (R->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL)
557 { 542 }
543#endif
544
545 if (!display
546 && !(display = displays.get (rs[Rs_display_name])))
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 (display->display, 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(display->display);
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 (display->depth <= 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 (display->display, "WM_LOCALE_NAME", False);
831 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, 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 rxvt_setTermFontSet(aR_ 0);
841 839
840 im_ev.start (display);
841
842 /* see if we can connect yet */ 842 /* see if we can connect already */
843 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 843 im_cb ();
844
845 /* To avoid Segmentation Fault in C locale: Solaris only? */
846 if (STRCMP(R->locale, "C"))
847 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
848 rxvt_IMInstantiateCallback, NULL);
849 } 844 }
850#endif 845#endif
851} 846}
852 847
853/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
854/* EXTPROTO */
855void 849void
856rxvt_init_command(pR_ const char *const *argv) 850rxvt_term::init_command(const char *const *argv)
857{ 851{
858 /* 852 /*
859 * Initialize the command connection. 853 * Initialize the command connection.
860 * This should be called after the X server connection is established. 854 * This should be called after the X server connection is established.
861 */ 855 */
862 int i; 856 int i;
863 857
864 for (i = 0; i < NUM_XA; i++) 858 for (i = 0; i < NUM_XA; i++)
865 R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); 859 xa[i] = XInternAtom(display->display, xa_names[i], False);
866 860
867 /* Enable delete window protocol */ 861 /* Enable delete window protocol */
868 XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], 862 XSetWMProtocols (display->display, TermWin.parent[0],
869 &(R->xa[XA_WMDELETEWINDOW]), 1); 863 &(xa[XA_WMDELETEWINDOW]), 1);
870 864
871#ifdef USING_W11LIB 865#ifdef USING_W11LIB
872 /* enable W11 callbacks */ 866 /* enable W11 callbacks */
873 W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); 867 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
874#endif 868#endif
875 869
876#ifdef META8_OPTION 870#ifdef META8_OPTION
877
878 R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); 871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
879#endif 872#endif
880 873
881 rxvt_get_ourmods(aR); 874 get_ourmods ();
882 875
883 if (!(R->Options & Opt_scrollTtyOutput)) 876 if (!(Options & Opt_scrollTtyOutput))
884 R->PrivateModes |= PrivMode_TtyOutputInh; 877 PrivateModes |= PrivMode_TtyOutputInh;
885 if (R->Options & Opt_scrollTtyKeypress) 878 if (Options & Opt_scrollTtyKeypress)
886 R->PrivateModes |= PrivMode_Keypress; 879 PrivateModes |= PrivMode_Keypress;
887 if (!(R->Options & Opt_jumpScroll)) 880 if (!(Options & Opt_jumpScroll))
888 R->PrivateModes |= PrivMode_smoothScroll; 881 PrivateModes |= PrivMode_smoothScroll;
882
889#ifndef NO_BACKSPACE_KEY 883#ifndef NO_BACKSPACE_KEY
890
891 if (STRCMP(R->key_backspace, "DEC") == 0) 884 if (STRCMP(key_backspace, "DEC") == 0)
892 R->PrivateModes |= PrivMode_HaveBackSpace; 885 PrivateModes |= PrivMode_HaveBackSpace;
893#endif 886#endif
887
894 /* add value for scrollBar */ 888 /* add value for scrollBar */
895 if (scrollbar_visible(R)) 889 if (scrollbar_visible ())
896 { 890 {
897 R->PrivateModes |= PrivMode_scrollBar; 891 PrivateModes |= PrivMode_scrollBar;
898 R->SavedModes |= PrivMode_scrollBar; 892 SavedModes |= PrivMode_scrollBar;
899 } 893 }
900 if (menubar_visible(R)) 894 if (menubar_visible ())
901 { 895 {
902 R->PrivateModes |= PrivMode_menuBar; 896 PrivateModes |= PrivMode_menuBar;
903 R->SavedModes |= PrivMode_menuBar; 897 SavedModes |= PrivMode_menuBar;
904 } 898 }
899
905#ifdef GREEK_SUPPORT 900#ifdef GREEK_SUPPORT
906 greek_init(); 901 greek_init();
907#endif 902#endif
908 903
909 R->Xfd = XConnectionNumber (R->Xdisplay);
910
911#ifdef CURSOR_BLINK 904#ifdef CURSOR_BLINK
912
913 if (R->Options & Opt_cursorBlink) 905 if (Options & Opt_cursorBlink)
914 (void)gettimeofday(&R->lastcursorchange, NULL); 906 (void)gettimeofday (&lastcursorchange, NULL);
915#endif 907#endif
916 908
917 if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) 909 if ((cmd_fd = run_command (argv)) < 0)
918 { 910 {
919 rxvt_print_error ("aborting"); 911 rxvt_print_error ("aborting");
920 exit (EXIT_FAILURE); 912 exit (EXIT_FAILURE);
921 } 913 }
922} 914}
923 915
924/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
925/* INTPROTO */
926void 917void
927rxvt_Get_Colours(pR) 918rxvt_term::Get_Colours ()
928{ 919{
929 int i; 920 int i;
930 921
931 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 922 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
932 { 923 {
933 rxvt_color xcol; 924 rxvt_color xcol;
934 925
935 if (!R->rs[Rs_color + i]) 926 if (!rs[Rs_color + i])
936 continue; 927 continue;
937 928
938 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 929 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
939 { 930 {
940#ifndef XTERM_REVERSE_VIDEO 931#ifndef XTERM_REVERSE_VIDEO
941 if (i < 2 && (R->Options & Opt_reverseVideo)) 932 if (i < 2 && (Options & Opt_reverseVideo))
942 {
943 R->rs[Rs_color + i] = def_colorName[!i]; 933 rs[Rs_color + i] = def_colorName[!i];
944 }
945 else 934 else
946#endif 935#endif
947
948 R->rs[Rs_color + i] = def_colorName[i]; 936 rs[Rs_color + i] = def_colorName[i];
937
949 if (!R->rs[Rs_color + i]) 938 if (!rs[Rs_color + i])
950 continue; 939 continue;
940
951 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 941 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
952 { 942 {
953 switch (i) 943 switch (i)
954 { 944 {
955 case Color_fg: 945 case Color_fg:
956 case Color_bg: 946 case Color_bg:
957 /* fatal: need bg/fg color */ 947 /* fatal: need bg/fg color */
958 rxvt_print_error("aborting"); 948 rxvt_print_error ("aborting");
959 exit(EXIT_FAILURE); 949 exit (EXIT_FAILURE);
960 /* NOTREACHED */ 950 /* NOTREACHED */
961 break; 951 break;
962#ifndef NO_CURSORCOLOR 952#ifndef NO_CURSORCOLOR
963
964 case Color_cursor2: 953 case Color_cursor2:
965 xcol = R->PixColors[Color_fg]; 954 xcol = PixColors[Color_fg];
966 break; 955 break;
967#endif /* ! NO_CURSORCOLOR */ 956#endif /* ! NO_CURSORCOLOR */
968
969 case Color_pointer: 957 case Color_pointer:
970 xcol = R->PixColors[Color_fg]; 958 xcol = PixColors[Color_fg];
971 break; 959 break;
972 default: 960 default:
973 xcol = R->PixColors[Color_bg]; /* None */ 961 xcol = PixColors[Color_bg]; /* None */
974 break; 962 break;
975 } 963 }
976 } 964 }
977 } 965 }
966
978 R->PixColors[i] = xcol; 967 PixColors[i] = xcol;
979 SET_PIXCOLOR(R, i); 968 SET_PIXCOLOR (i);
980 } 969 }
981 970
982 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 971 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
983 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 972 PixColors[Color_pointer] = PixColors[Color_fg];
984 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 973 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
985 R->PixColors[Color_border] = R->PixColors[Color_fg]; 974 PixColors[Color_border] = PixColors[Color_fg];
986 975
987 /* 976 /*
988 * get scrollBar/menuBar shadow colors 977 * get scrollBar/menuBar shadow colors
989 * 978 *
990 * The calculations of topShadow/bottomShadow values are adapted 979 * The calculations of topShadow/bottomShadow values are adapted
… …
992 */ 981 */
993#ifdef KEEP_SCROLLCOLOR 982#ifdef KEEP_SCROLLCOLOR
994 983
995 if (XDEPTH <= 2) 984 if (XDEPTH <= 2)
996 { /* Monochrome */ 985 { /* Monochrome */
997 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 986 PixColors[Color_scroll] = PixColors[Color_fg];
998 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 987 PixColors[Color_topShadow] = PixColors[Color_bg];
999 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 988 PixColors[Color_bottomShadow] = PixColors[Color_bg];
1000 } 989 }
1001 else 990 else
1002 { 991 {
1003 rxvt_color xcol[3]; 992 rxvt_color xcol[3];
1004 /* xcol[0] == white 993 /* xcol[0] == white
1005 * xcol[1] == top shadow 994 * xcol[1] == top shadow
1006 * xcol[2] == bot shadow */ 995 * xcol[2] == bot shadow */
1007 996
1008 xcol[1] = R->PixColors[Color_scroll]; 997 xcol[1] = PixColors[Color_scroll];
1009# ifdef PREFER_24BIT 998# ifdef PREFER_24BIT
1010 999 xcol[0].set (display, 65535, 65535, 65535);
1011 xcol[0].set (r, -1, -1, -1);
1012 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1000 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */
1013# else 1001# else
1014
1015 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1002 xcol[0].set (display, WhitePixel (display->display, display->screen));
1016# endif 1003# endif
1017 1004
1018 unsigned short R1, G1, B1, R0, G0, B0; 1005 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1019 1006
1020 xcol[0].get (r, R0, G0, B0); 1007 xcol[0].get (display, pr0, pg0, pb0);
1021 xcol[1].get (r, R1, G1, B1); 1008 xcol[1].get (display, pr1, pg1, pb1);
1022 1009
1023 /* bottomShadowColor */ 1010 /* bottomShadowColor */
1024 if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) 1011 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1025 xcol[2] = R->PixColors[Color_Black]; 1012 xcol[2] = PixColors[Color_Black];
1026 1013
1027 R->PixColors[Color_bottomShadow] = xcol[2]; 1014 PixColors[Color_bottomShadow] = xcol[2];
1028 1015
1029 /* topShadowColor */ 1016 /* topShadowColor */
1030 if (!xcol[1].set (aR_ 1017 if (!xcol[1].set (display,
1031 min (R0, max (R0 / 5, R1) * 7 / 5), 1018 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1032 min (G0, max (G0 / 5, G1) * 7 / 5), 1019 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1033 min (B0, max (B0 / 5, B1) * 7 / 5))) 1020 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1034 xcol[1] = R->PixColors[Color_White]; 1021 xcol[1] = PixColors[Color_White];
1035 1022
1036 R->PixColors[Color_topShadow] = xcol[1]; 1023 PixColors[Color_topShadow] = xcol[1];
1037 } 1024 }
1038#endif /* KEEP_SCROLLCOLOR */ 1025#endif /* KEEP_SCROLLCOLOR */
1039} 1026}
1040 1027
1041/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
1042/* color aliases, fg/bg bright-bold */ 1029/* color aliases, fg/bg bright-bold */
1043/* INTPROTO */
1044void 1030void
1045rxvt_color_aliases(pR_ int idx) 1031rxvt_term::color_aliases(int idx)
1046{ 1032{
1047 if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) 1033 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx])))
1048 { 1034 {
1049 int i = atoi(R->rs[Rs_color + idx]); 1035 int i = atoi (rs[Rs_color + idx]);
1050 1036
1051 if (i >= 8 && i <= 15) 1037 if (i >= 8 && i <= 15)
1052 { /* bright colors */ 1038 { /* bright colors */
1053 i -= 8; 1039 i -= 8;
1054#ifndef NO_BRIGHTCOLOR 1040#ifndef NO_BRIGHTCOLOR
1055
1056 R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; 1041 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1057 return; 1042 return;
1058#endif 1043#endif
1059 1044
1060 } 1045 }
1046
1061 if (i >= 0 && i <= 7) /* normal colors */ 1047 if (i >= 0 && i <= 7) /* normal colors */
1062 R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; 1048 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1063 } 1049 }
1064} 1050}
1065 1051
1066/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1067/* 1053/*
1068 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1054 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1069 * Use resource ``modifier'' to override the Meta modifier 1055 * Use resource ``modifier'' to override the Meta modifier
1070 */ 1056 */
1071/* INTPROTO */
1072void 1057void
1073rxvt_get_ourmods(pR) 1058rxvt_term::get_ourmods ()
1074{ 1059{
1075 int i, j, k; 1060 int i, j, k;
1076 int requestedmeta, realmeta, realalt; 1061 int requestedmeta, realmeta, realalt;
1077 const char *cm, *rsmod; 1062 const char *cm, *rsmod;
1078 XModifierKeymap *map; 1063 XModifierKeymap *map;
… …
1081 { 1066 {
1082 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1067 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1083 }; 1068 };
1084 1069
1085 requestedmeta = realmeta = realalt = 0; 1070 requestedmeta = realmeta = realalt = 0;
1086 rsmod = R->rs[Rs_modifier]; 1071 rsmod = rs[Rs_modifier];
1087 if (rsmod 1072 if (rsmod
1088 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1073 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1089 requestedmeta = rsmod[3] - '0'; 1074 requestedmeta = rsmod[3] - '0';
1090 1075
1091 map = XGetModifierMapping(R->Xdisplay); 1076 map = XGetModifierMapping(display->display);
1092 kc = map->modifiermap; 1077 kc = map->modifiermap;
1093 for (i = 1; i < 6; i++) 1078 for (i = 1; i < 6; i++)
1094 { 1079 {
1095 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1080 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1096 for (j = map->max_keypermod; j--; k++) 1081 for (j = map->max_keypermod; j--; k++)
1097 { 1082 {
1098 if (kc[k] == 0) 1083 if (kc[k] == 0)
1099 break; 1084 break;
1100 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1085 switch (XKeycodeToKeysym(display->display, kc[k], 0))
1101 { 1086 {
1102 case XK_Num_Lock: 1087 case XK_Num_Lock:
1103 R->ModNumLockMask = modmasks[i - 1]; 1088 ModNumLockMask = modmasks[i - 1];
1104 /* FALLTHROUGH */ 1089 /* FALLTHROUGH */
1105 default: 1090 default:
1106 continue; /* for(;;) */ 1091 continue; /* for(;;) */
1107 case XK_Meta_L: 1092 case XK_Meta_L:
1108 case XK_Meta_R: 1093 case XK_Meta_R:
1109 cm = "meta"; 1094 cm = "meta";
1110 realmeta = i; 1095 realmeta = i;
1111 break; 1096 break;
1112 case XK_Alt_L: 1097 case XK_Alt_L:
1113 case XK_Alt_R: 1098 case XK_Alt_R:
1114 cm = "alt"; 1099 cm = "alt";
1115 realalt = i; 1100 realalt = i;
1116 break; 1101 break;
1117 case XK_Super_L: 1102 case XK_Super_L:
1118 case XK_Super_R: 1103 case XK_Super_R:
1119 cm = "super"; 1104 cm = "super";
1120 break; 1105 break;
1121 case XK_Hyper_L: 1106 case XK_Hyper_L:
1122 case XK_Hyper_R: 1107 case XK_Hyper_R:
1123 cm = "hyper"; 1108 cm = "hyper";
1124 break; 1109 break;
1125 } 1110 }
1126 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1111 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1127 requestedmeta = i; 1112 requestedmeta = i;
1128 } 1113 }
1129 } 1114 }
1130 XFreeModifiermap(map); 1115 XFreeModifiermap(map);
1131 i = (requestedmeta ? requestedmeta 1116 i = (requestedmeta ? requestedmeta
1132 : (realmeta ? realmeta 1117 : (realmeta ? realmeta
1133 : (realalt ? realalt : 0))); 1118 : (realalt ? realalt : 0)));
1134 if (i) 1119 if (i)
1135 R->ModMetaMask = modmasks[i - 1]; 1120 ModMetaMask = modmasks[i - 1];
1136} 1121}
1137 1122
1138/*----------------------------------------------------------------------*/ 1123/*----------------------------------------------------------------------*/
1139/* rxvt_Create_Windows() - Open and map the window */ 1124/* rxvt_Create_Windows() - Open and map the window */
1140/* EXTPROTO */
1141void 1125void
1142rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1126rxvt_term::create_windows (int argc, const char *const *argv)
1143{ 1127{
1144 XClassHint classHint; 1128 XClassHint classHint;
1145 XWMHints wmHint; 1129 XWMHints wmHint;
1146 XGCValues gcvalue; 1130 XGCValues gcvalue;
1147 long vt_emask; 1131 long vt_emask;
1148 1132
1149#ifdef PREFER_24BIT
1150
1151 XSetWindowAttributes attributes;
1152 XWindowAttributes gattr; 1133 XWindowAttributes gattr;
1153 1134
1154 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1155 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
1156
1157 if (R->Options & Opt_transparent) 1135 if (Options & Opt_transparent)
1158 {
1159 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen),
1160 &gattr);
1161 XDEPTH = gattr.depth;
1162 } 1136 {
1163 else 1137 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr);
1138 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1164 { 1139 }
1165 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen);
1166 /*
1167 * If depth is not 24, look for a 24bit visual.
1168 */
1169 if (XDEPTH != 24)
1170 {
1171 XVisualInfo vinfo;
1172
1173 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1174 {
1175 XDEPTH = 24;
1176 XVISUAL = vinfo.visual;
1177 XCMAP = XCreateColormap(R->Xdisplay,
1178 RootWindow(R->Xdisplay, Xscreen),
1179 XVISUAL, AllocNone);
1180 }
1181 }
1182 }
1183#endif
1184 1140
1185 /* grab colors before netscape does */ 1141 /* grab colors before netscape does */
1186 rxvt_Get_Colours(aR); 1142 Get_Colours ();
1187 1143
1188 rxvt_change_font(aR_ 1, NULL); 1144 change_font (1, NULL);
1189 rxvt_window_calc(aR_ 0, 0); 1145 window_calc (0, 0);
1190 R->old_width = R->szHint.width; 1146 old_width = szHint.width;
1191 R->old_height = R->szHint.height; 1147 old_height = szHint.height;
1192 1148
1193 /* parent window - reverse video so we can see placement errors 1149 /* parent window - reverse video so we can see placement errors
1194 * sub-window placement & size in rxvt_resize_subwindows() 1150 * sub-window placement & size in rxvt_resize_subwindows()
1195 */ 1151 */
1196 1152
1197#ifdef PREFER_24BIT 1153#ifdef PREFER_24BIT
1154 XSetWindowAttributes attributes;
1198 1155
1199 attributes.background_pixel = R->PixColors[Color_fg]; 1156 attributes.background_pixel = PixColors[Color_fg];
1200 attributes.border_pixel = R->PixColors[Color_border]; 1157 attributes.border_pixel = PixColors[Color_border];
1201 attributes.colormap = XCMAP; 1158 attributes.colormap = display->cmap;
1202 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1159 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1203 R->szHint.x, R->szHint.y, 1160 szHint.x, szHint.y,
1204 R->szHint.width, R->szHint.height, 1161 szHint.width, szHint.height,
1205 R->TermWin.ext_bwidth, 1162 TermWin.ext_bwidth,
1206 XDEPTH, InputOutput, 1163 display->depth, InputOutput,
1207 XVISUAL, 1164 display->visual,
1208 CWBackPixel | CWBorderPixel
1209 | CWColormap, &attributes); 1165 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1210#else 1166#else
1211 1167 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1212 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot,
1213 R->szHint.x, R->szHint.y, 1168 szHint.x, szHint.y,
1214 R->szHint.width, 1169 szHint.width,
1215 R->szHint.height, 1170 szHint.height,
1216 R->TermWin.ext_bwidth, 1171 TermWin.ext_bwidth,
1217 R->PixColors[Color_border], 1172 PixColors[Color_border],
1218 R->PixColors[Color_fg]); 1173 PixColors[Color_fg]);
1219#endif 1174#endif
1220 1175
1221 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1176 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1222 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1177 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1223 1178
1224 classHint.res_name = (char *)R->rs[Rs_name]; 1179 classHint.res_name = (char *)rs[Rs_name];
1225 classHint.res_class = (char *)APL_CLASS; 1180 classHint.res_class = (char *)APL_CLASS;
1226 1181
1227 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1182 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1228 wmHint.input = True; 1183 wmHint.input = True;
1229 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1184 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1230 : NormalState); 1185 : NormalState);
1231 wmHint.window_group = R->TermWin.parent[0]; 1186 wmHint.window_group = TermWin.parent[0];
1232 1187
1233 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1188 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL,
1234 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1189 (char **)argv, argc, &szHint, &wmHint, &classHint);
1190
1235 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1191 XSelectInput(display->display, TermWin.parent[0],
1236 (KeyPressMask 1192 KeyPressMask
1237#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1193#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1238 | KeyReleaseMask 1194 | KeyReleaseMask
1239#endif 1195#endif
1240 | FocusChangeMask | VisibilityChangeMask 1196 | FocusChangeMask | VisibilityChangeMask
1241 | StructureNotifyMask)); 1197 | StructureNotifyMask);
1198 termwin_ev.start (display, TermWin.parent[0]);
1242 1199
1243 /* vt cursor: Black-on-White is standard, but this is more popular */ 1200 /* vt cursor: Black-on-White is standard, but this is more popular */
1244 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1201 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm);
1245 1202
1246#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1203#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1247 /* cursor (menuBar/scrollBar): Black-on-White */ 1204 /* cursor (menuBar/scrollBar): Black-on-White */
1248 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1205 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr);
1249#endif 1206#endif
1250 1207
1251#ifdef POINTER_BLANK 1208#ifdef POINTER_BLANK
1252
1253 { 1209 {
1254 XColor blackcolour; 1210 XColor blackcolour;
1255 blackcolour.red = 0; 1211 blackcolour.red = 0;
1256 blackcolour.green = 0; 1212 blackcolour.green = 0;
1257 blackcolour.blue = 0; 1213 blackcolour.blue = 0;
1258 Font f = XLoadFont (R->Xdisplay, "fixed"); 1214 Font f = XLoadFont (display->display, "fixed");
1259 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1215 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1260 &blackcolour, &blackcolour); 1216 &blackcolour, &blackcolour);
1261 XUnloadFont (R->Xdisplay, f); 1217 XUnloadFont (display->display, f);
1262 } 1218 }
1263#endif 1219#endif
1264 1220
1265 /* the vt window */ 1221 /* the vt window */
1266 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1222 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0],
1267 R->window_vt_x, R->window_vt_y, 1223 window_vt_x, window_vt_y,
1268 TermWin_TotalWidth(), 1224 TermWin_TotalWidth(),
1269 TermWin_TotalHeight(), 1225 TermWin_TotalHeight(),
1270 0, 1226 0,
1271 R->PixColors[Color_fg], 1227 PixColors[Color_fg],
1272 R->PixColors[Color_bg]); 1228 PixColors[Color_bg]);
1229
1273#ifdef DEBUG_X 1230#ifdef DEBUG_X
1274
1275 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1231 XStoreName(display->display, TermWin.vt, "vt window");
1276#endif 1232#endif
1277
1278 R->pointer_unblank ();
1279 1233
1280 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1234 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1281 | PropertyChangeMask); 1235 | PropertyChangeMask);
1236
1282#ifdef POINTER_BLANK 1237#ifdef POINTER_BLANK
1238 pointer_unblank ();
1283 1239
1284 if ((R->Options & Opt_pointerBlank)) 1240 if ((Options & Opt_pointerBlank))
1285 vt_emask |= PointerMotionMask; 1241 vt_emask |= PointerMotionMask;
1286 else 1242 else
1287#endif 1243#endif
1288
1289 vt_emask |= (Button1MotionMask | Button3MotionMask); 1244 vt_emask |= (Button1MotionMask | Button3MotionMask);
1245
1290 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1246 XSelectInput(display->display, TermWin.vt, vt_emask);
1247 vt_ev.start (display, TermWin.vt);
1291 1248
1292#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1293
1294 if (menuBar_height()) 1250 if (menuBar_height())
1295 { 1251 {
1296 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1252 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0],
1297 R->window_vt_x, 0, 1253 window_vt_x, 0,
1298 TermWin_TotalWidth(), 1254 TermWin_TotalWidth(),
1299 menuBar_TotalHeight(), 1255 menuBar_TotalHeight(),
1300 0, 1256 0,
1301 R->PixColors[Color_fg], 1257 PixColors[Color_fg],
1302 R->PixColors[Color_scroll]); 1258 PixColors[Color_scroll]);
1303#ifdef DEBUG_X 1259#ifdef DEBUG_X
1304
1305 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1260 XStoreName(display->display, menuBar.win, "menubar");
1306#endif 1261#endif
1307 1262
1308 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1263 XDefineCursor(display->display, menuBar.win, pointer_leftptr);
1264
1309 XSelectInput(R->Xdisplay, R->menuBar.win, 1265 XSelectInput(display->display, menuBar.win,
1310 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1266 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1311 | Button1MotionMask)); 1267 | Button1MotionMask));
1268 menubar_ev.start (display, menuBar.win);
1312 } 1269 }
1313#endif 1270#endif
1271
1314#ifdef XPM_BACKGROUND 1272#ifdef XPM_BACKGROUND
1315 if (R->rs[Rs_backgroundPixmap] != NULL 1273 if (rs[Rs_backgroundPixmap] != NULL
1316 && !(R->Options & Opt_transparent)) 1274 && !(Options & Opt_transparent))
1317 { 1275 {
1318 const char *p = R->rs[Rs_backgroundPixmap]; 1276 const char *p = rs[Rs_backgroundPixmap];
1319 1277
1320 if ((p = STRCHR(p, ';')) != NULL) 1278 if ((p = STRCHR(p, ';')) != NULL)
1321 { 1279 {
1322 p++; 1280 p++;
1323 rxvt_scale_pixmap(aR_ p); 1281 scale_pixmap (p);
1324 } 1282 }
1325 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1283 set_bgPixmap (rs[Rs_backgroundPixmap]);
1326 rxvt_scr_touch(aR_ True); 1284 scr_touch (True);
1327 } 1285 }
1328#endif 1286#endif
1329 1287
1330 /* graphics context for the vt window */ 1288 /* graphics context for the vt window */
1331 gcvalue.foreground = R->PixColors[Color_fg]; 1289 gcvalue.foreground = PixColors[Color_fg];
1332 gcvalue.background = R->PixColors[Color_bg]; 1290 gcvalue.background = PixColors[Color_bg];
1333 gcvalue.graphics_exposures = 1; 1291 gcvalue.graphics_exposures = 1;
1334 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1292 TermWin.gc = XCreateGC(display->display, TermWin.vt,
1335 GCForeground | GCBackground 1293 GCForeground | GCBackground
1336 | GCGraphicsExposures, &gcvalue); 1294 | GCGraphicsExposures, &gcvalue);
1337 1295
1338#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1296#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1339
1340 gcvalue.foreground = R->PixColors[Color_topShadow]; 1297 gcvalue.foreground = PixColors[Color_topShadow];
1341 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1298 topShadowGC = XCreateGC(display->display, TermWin.vt,
1342 GCForeground, &gcvalue); 1299 GCForeground, &gcvalue);
1343 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1300 gcvalue.foreground = PixColors[Color_bottomShadow];
1344 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1301 botShadowGC = XCreateGC(display->display, TermWin.vt,
1345 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1346 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1303 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1347 : Color_scroll)]; 1304 : Color_scroll)];
1348 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1305 scrollbarGC = XCreateGC(display->display, TermWin.vt,
1349 GCForeground, &gcvalue); 1306 GCForeground, &gcvalue);
1350#endif 1307#endif
1351} 1308}
1352 1309
1353/*----------------------------------------------------------------------*/ 1310/*----------------------------------------------------------------------*/
1354/* 1311/*
1355 * Run the command in a subprocess and return a file descriptor for the 1312 * Run the command in a subprocess and return a file descriptor for the
1356 * master end of the pseudo-teletype pair with the command talking to 1313 * master end of the pseudo-teletype pair with the command talking to
1357 * the slave. 1314 * the slave.
1358 */ 1315 */
1359/* INTPROTO */
1360int 1316int
1361rxvt_run_command(pR_ const char *const *argv) 1317rxvt_term::run_command (const char *const *argv)
1362{ 1318{
1363 int cfd, er; 1319 int cfd, er;
1364 1320
1365 /* get master (pty) */ 1321 /* get master (pty) */
1366 if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->ttydev))) < 0) 1322 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0)
1367 { 1323 {
1368 rxvt_print_error("can't open pseudo-tty"); 1324 rxvt_print_error("can't open pseudo-tty");
1369 return -1; 1325 return -1;
1370 } 1326 }
1371 1327
1372#ifdef FD_SETSIZE
1373 if (R->Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1374 {
1375 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1376 rxvt_clean_exit();
1377 exit(EXIT_FAILURE);
1378 }
1379#endif
1380
1381 fcntl (cfd, F_SETFL, O_NONBLOCK); 1328 fcntl (cfd, F_SETFL, O_NONBLOCK);
1382 1329
1383 /* get slave (tty) */ 1330 /* get slave (tty) */
1384 if (R->tty_fd < 0) 1331 if (tty_fd < 0)
1385 { 1332 {
1386#ifndef NO_SETOWNER_TTYDEV 1333#ifndef NO_SETOWNER_TTYDEV
1387 rxvt_privileged_ttydev (aR_ SAVE); 1334 privileged_ttydev (SAVE);
1388#endif 1335#endif
1389 1336
1390 if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) 1337 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1391 { 1338 {
1392 close(cfd); 1339 close(cfd);
1393 rxvt_print_error("can't open slave tty %s", R->ttydev); 1340 rxvt_print_error("can't open slave tty %s", ttydev);
1394 return -1; 1341 return -1;
1395 } 1342 }
1396 } 1343 }
1397#ifndef NO_BACKSPACE_KEY 1344#ifndef NO_BACKSPACE_KEY
1398 if (R->key_backspace[0] && !R->key_backspace[1]) 1345 if (key_backspace[0] && !key_backspace[1])
1399 er = R->key_backspace[0]; 1346 er = key_backspace[0];
1400 else if (STRCMP(R->key_backspace, "DEC") == 0) 1347 else if (STRCMP(key_backspace, "DEC") == 0)
1401 er = '\177'; /* the initial state anyway */ 1348 er = '\177'; /* the initial state anyway */
1402 else 1349 else
1403#endif 1350#endif
1404 1351
1405 er = -1; 1352 er = -1;
1406 1353
1407 rxvt_get_ttymode (&(R->tio), er); 1354 rxvt_get_ttymode (&(tio), er);
1408 1355
1409#ifndef __QNX__ 1356#ifndef __QNX__
1410 /* spin off the command interpreter */ 1357 /* spin off the command interpreter */
1411 switch (R->cmd_pid = fork ()) 1358 switch (cmd_pid = fork ())
1412 { 1359 {
1413 case -1: 1360 case -1:
1414 rxvt_print_error("can't fork"); 1361 rxvt_print_error("can't fork");
1415 return -1; 1362 return -1;
1416 case 0: 1363 case 0:
1417 close (cfd); /* only keep R->tty_fd and STDERR open */ 1364 close (cfd); /* only keep tty_fd and STDERR open */
1418 close (R->Xfd); 1365
1419 if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) 1366 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1420 rxvt_print_error ("could not obtain control of tty"); 1367 rxvt_print_error ("could not obtain control of tty");
1421 else 1368 else
1369 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO);
1373 dup2 (tty_fd, STDERR_FILENO);
1374
1375 if (tty_fd > 2)
1376 close (tty_fd);
1377
1378 run_child (argv);
1379 }
1380 exit (EXIT_FAILURE);
1381 /* NOTREACHED */
1382 default:
1422 { 1383 {
1423 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin;
1386
1387 fdstdin = dup (STDIN_FILENO);
1424 dup2 (R->tty_fd, STDIN_FILENO); 1388 dup2 (tty_fd, STDIN_FILENO);
1389#endif
1390
1391#ifdef UTMP_SUPPORT
1392 privileged_utmp (SAVE);
1393#endif
1394
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396
1425 dup2 (R->tty_fd, STDOUT_FILENO); 1397 dup2 (fdstdin, STDIN_FILENO);
1426 dup2 (R->tty_fd, STDERR_FILENO);
1427
1428 if (R->tty_fd > 2)
1429 close (R->tty_fd); 1398 close (fdstdin);
1399#endif
1430 1400
1431 rxvt_run_child (aR_ argv);
1432 } 1401 }
1433 exit (EXIT_FAILURE);
1434 /* NOTREACHED */
1435 default:
1436 {
1437#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1438 int fdstdin;
1439
1440 fdstdin = dup (STDIN_FILENO);
1441 dup2 (R->tty_fd, STDIN_FILENO);
1442#endif
1443
1444 rxvt_privileged_utmp (aR_ SAVE);
1445#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1446
1447 dup2 (fdstdin, STDIN_FILENO);
1448 close (fdstdin);
1449#endif
1450
1451 }
1452 close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ 1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1453 break; 1403 break;
1454 } 1404 }
1455#else /* __QNX__ uses qnxspawn() */ 1405#else /* __QNX__ uses qnxspawn() */
1456 fchmod (R->tty_fd, 0622); 1406 fchmod (tty_fd, 0622);
1457 fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); 1407 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1458 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1408 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1459 1409
1460 if (rxvt_run_child (aR_ argv) == -1) 1410 if (run_child (argv) == -1)
1461 exit (EXIT_FAILURE); 1411 exit (EXIT_FAILURE);
1462#endif 1412#endif
1463 1413
1464 return cfd; 1414 return cfd;
1465} 1415}
… …
1469 * ------------------------------------------------------------------------- */ 1419 * ------------------------------------------------------------------------- */
1470/* 1420/*
1471 * The only open file descriptor is the slave tty - so no error messages. 1421 * The only open file descriptor is the slave tty - so no error messages.
1472 * returns are fatal 1422 * returns are fatal
1473 */ 1423 */
1474/* INTPROTO */
1475int 1424int
1476rxvt_run_child(pR_ const char *const *argv) 1425rxvt_term::run_child (const char *const *argv)
1477{ 1426{
1478 char *login; 1427 char *login;
1479 1428
1480 SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ 1429 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */
1481 1430
1482 if (R->Options & Opt_console) 1431 if (Options & Opt_console)
1483 { /* be virtual console, fail silently */ 1432 { /* be virtual console, fail silently */
1484#ifdef TIOCCONS 1433#ifdef TIOCCONS
1485 unsigned int on = 1; 1434 unsigned int on = 1;
1486 1435
1487 ioctl (STDIN_FILENO, TIOCCONS, &on); 1436 ioctl (STDIN_FILENO, TIOCCONS, &on);
1488#elif defined (SRIOCSREDIR) 1437#elif defined (SRIOCSREDIR)
1489
1490 int fd; 1438 int fd;
1491 1439
1492 fd = open (CONSOLE, O_WRONLY, 0); 1440 fd = open (CONSOLE, O_WRONLY, 0);
1493 if (fd >= 0) 1441 if (fd >= 0)
1494 { 1442 {
… …
1506 /* 1454 /*
1507 * mimick login's behavior by disabling the job control signals 1455 * mimick login's behavior by disabling the job control signals
1508 * a shell that wants them can turn them back on 1456 * a shell that wants them can turn them back on
1509 */ 1457 */
1510#ifdef SIGTSTP 1458#ifdef SIGTSTP
1511
1512 signal (SIGTSTP, SIG_IGN); 1459 signal (SIGTSTP, SIG_IGN);
1513 signal (SIGTTIN, SIG_IGN); 1460 signal (SIGTTIN, SIG_IGN);
1514 signal (SIGTTOU, SIG_IGN); 1461 signal (SIGTTOU, SIG_IGN);
1515#endif /* SIGTSTP */ 1462#endif /* SIGTSTP */
1516 1463
1517 /* set window size */ 1464 /* set window size */
1518 struct winsize ws; 1465 struct winsize ws;
1519 1466
1520 ws.ws_col = R->TermWin.ncol; 1467 ws.ws_col = TermWin.ncol;
1521 ws.ws_row = R->TermWin.nrow; 1468 ws.ws_row = TermWin.nrow;
1522 ws.ws_xpixel = ws.ws_ypixel = 0; 1469 ws.ws_xpixel = ws.ws_ypixel = 0;
1523 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); 1470 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1524 1471
1525 // unblock signals (signals are blocked by iom.C 1472 // unblock signals (signals are blocked by iom.C
1526 sigset_t ss; 1473 sigset_t ss;
… …
1547 1494
1548 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1495 if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
1549 shell = "/bin/sh"; 1496 shell = "/bin/sh";
1550 1497
1551 argv0 = (const char *)rxvt_r_basename(shell); 1498 argv0 = (const char *)rxvt_r_basename(shell);
1552 if (R->Options & Opt_loginShell) 1499 if (Options & Opt_loginShell)
1553 { 1500 {
1554 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1501 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char));
1555 1502
1556 login[0] = '-'; 1503 login[0] = '-';
1557 STRCPY(&login[1], argv0); 1504 STRCPY(&login[1], argv0);
1558 argv0 = login; 1505 argv0 = login;
1559 } 1506 }
1560 execlp(shell, argv0, NULL); 1507 execlp(shell, argv0, NULL);
1561 /* no error message: STDERR is closed! */ 1508 /* no error message: STDERR is closed! */
1562 } 1509 }
1510
1563#else /* __QNX__ uses qnxspawn() */ 1511#else /* __QNX__ uses qnxspawn() */
1564 { 1512
1565 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1513 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566 char *command = NULL, fullcommand[_MAX_PATH]; 1514 char *command = NULL, fullcommand[_MAX_PATH];
1567 char **arg_v, *arg_a[2] = { NULL, NULL }; 1515 char **arg_v, *arg_a[2] = { NULL, NULL };
1568 1516
1569 if (argv != NULL) 1517 if (argv != NULL)
1570 { 1518 {
1571 if (access(argv[0], X_OK) == -1) 1519 if (access(argv[0], X_OK) == -1)
1572 { 1520 {
1573 if (STRCHR(argv[0], '/') == NULL) 1521 if (STRCHR(argv[0], '/') == NULL)
1574 { 1522 {
1575 searchenv(argv[0], "PATH", fullcommand); 1523 searchenv(argv[0], "PATH", fullcommand);
1576 if (fullcommand[0] != '\0') 1524 if (fullcommand[0] != '\0')
1577 command = fullcommand; 1525 command = fullcommand;
1578 } 1526 }
1579 if (access(command, X_OK) == -1) 1527 if (access(command, X_OK) == -1)
1580 return -1; 1528 return -1;
1581 } 1529 }
1582 else 1530 else
1583 command = argv[0]; 1531 command = argv[0];
1584 arg_v = argv; 1532 arg_v = argv;
1585 } 1533 }
1586 else 1534 else
1587 { 1535 {
1588 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1536 if ((command = getenv("SHELL")) == NULL || *command == '\0')
1589 command = "/bin/sh"; 1537 command = "/bin/sh";
1590 1538
1591 arg_a[0] = my_basename(command); 1539 arg_a[0] = my_basename(command);
1592 if (R->Options & Opt_loginShell) 1540 if (Options & Opt_loginShell)
1593 { 1541 {
1594 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1542 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char));
1595 1543
1596 login[0] = '-'; 1544 login[0] = '-';
1597 STRCPY(&login[1], arg_a[0]); 1545 STRCPY(&login[1], arg_a[0]);
1598 arg_a[0] = login; 1546 arg_a[0] = login;
1599 } 1547 }
1600 arg_v = arg_a; 1548 arg_v = arg_a;
1601 } 1549 }
1602 iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; 1550 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1603 R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1551 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1604 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1552 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1605 command, arg_v, environ, iov_a, 0); 1553 command, arg_v, environ, iov_a, 0);
1606 if (login) 1554 if (login)
1607 free(login); 1555 free(login);
1556
1608 close(R->tty_fd); 1557 close(tty_fd);
1609 return R->cmd_fd; 1558 return cmd_fd;
1610 } 1559
1611#endif 1560#endif
1612 return -1; 1561 return -1;
1613} 1562}
1614 1563
1615/* ------------------------------------------------------------------------- * 1564/* ------------------------------------------------------------------------- *
1616 * GET TTY CURRENT STATE * 1565 * GET TTY CURRENT STATE *
1617 * ------------------------------------------------------------------------- */ 1566 * ------------------------------------------------------------------------- */
1618/* rxvt_get_ttymode() */ 1567/* rxvt_get_ttymode() */
1619/* INTPROTO */ 1568/* EXTPROTO */
1620void 1569void
1621rxvt_get_ttymode(ttymode_t *tio, int erase) 1570rxvt_get_ttymode(ttymode_t *tio, int erase)
1622{ 1571{
1623#ifdef HAVE_TERMIOS_H 1572#ifdef HAVE_TERMIOS_H
1624 /* 1573 /*

Diff Legend

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