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.19 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.36 by pcg, Tue Feb 24 16:25:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.19 2004/01/28 23:40:50 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>
10 * - extensive modifications 9 * - extensive modifications
11 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
12 * - extensive modifications 11 * - extensive modifications
13 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
14 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
327#endif 327#endif
328#ifdef KEEP_SCROLLCOLOR 328#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 329 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 330 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332
332 }; 333 };
333 334
334const char *const xa_names[NUM_XA] = 335const char *const xa_names[NUM_XA] =
335 { 336 {
336 "TEXT", 337 "TEXT",
… …
372 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
373 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
374 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
375 want_refresh = 1; 376 want_refresh = 1;
376 cmd_pid = -1; 377 cmd_pid = -1;
377 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
378 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
379 TermWin.focus = 0; 380 TermWin.focus = 0;
380 TermWin.ncol = 80; 381 TermWin.ncol = 80;
381 TermWin.nrow = 24; 382 TermWin.nrow = 24;
382 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater; 400 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less; 401 ks_smallfont = XK_less;
401#endif 402#endif
402 403
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif
406
407 refresh_limit = 1; 404 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 405 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 406 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 407
417 oldcursor.row = oldcursor.col = -1; 408 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 409#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 410 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 411 bgPixmap.x = bgPixmap.y = 50;
… …
423 414
424 last_bot = last_state = -1; 415 last_bot = last_state = -1;
425 416
426#ifdef MENUBAR 417#ifdef MENUBAR
427 menu_readonly = 1; 418 menu_readonly = 1;
428# if !(MENUBAR_MAX > 1) 419# if ! (MENUBAR_MAX > 1)
429 CurrentBar = &(BarList); 420 CurrentBar = & (BarList);
430# endif /* (MENUBAR_MAX > 1) */ 421# endif /* (MENUBAR_MAX > 1) */
431#endif 422#endif
432 423
433 return true; 424 return true;
434} 425}
… …
445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 436 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
446 ttygid = gr->gr_gid; 437 ttygid = gr->gr_gid;
447 } 438 }
448 else 439 else
449#endif /* TTY_GID_SUPPORT */ 440#endif /* TTY_GID_SUPPORT */
441
450 { 442 {
451 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 443 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
452 ttygid = getgid (); 444 ttygid = getgid ();
453 } 445 }
454 446
… …
474 { 466 {
475#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 467#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
476 if (i == 4 || i == 7) 468 if (i == 4 || i == 7)
477 continue; 469 continue;
478#endif 470#endif
479 close(i); 471 close (i);
480 } 472 }
481#endif 473#endif
482} 474}
483 475
484/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
… …
491 483
492 /* 484 /*
493 * Look for -exec option. Find => split and make cmd_argv[] of command args 485 * Look for -exec option. Find => split and make cmd_argv[] of command args
494 */ 486 */
495 for (r_argc = 0; r_argc < argc; r_argc++) 487 for (r_argc = 0; r_argc < argc; r_argc++)
496 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 488 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
497 break; 489 break;
498 490
499 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 491 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
500 492
501 for (i = 0; i < r_argc; i++) 493 for (i = 0; i < r_argc; i++)
502 r_argv[i] = (const char *)argv[i]; 494 r_argv[i] = (const char *)argv[i];
503 495
504 r_argv[i] = NULL; 496 r_argv[i] = NULL;
505 497
506 if (r_argc == argc) 498 if (r_argc == argc)
507 cmd_argv = NULL; 499 cmd_argv = NULL;
508 else 500 else
509 { 501 {
510 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 502 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
511 503
512 for (i = 0; i < argc - r_argc - 1; i++) 504 for (i = 0; i < argc - r_argc - 1; i++)
513 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 505 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
514 506
515 cmd_argv[i] = NULL; 507 cmd_argv[i] = NULL;
… …
517 509
518 /* clear all resources */ 510 /* clear all resources */
519 for (i = 0; i < NUM_RESOURCES;) 511 for (i = 0; i < NUM_RESOURCES;)
520 rs[i++] = NULL; 512 rs[i++] = NULL;
521 513
522 rs[Rs_name] = rxvt_r_basename(argv[0]); 514 rs[Rs_name] = rxvt_r_basename (argv[0]);
523 515
524 /* 516 /*
525 * Open display, get options/resources and create the window 517 * Open display, get options/resources and create the window
526 */ 518 */
527 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 519 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
528 rs[Rs_display_name] = ":0"; 520 rs[Rs_display_name] = ":0";
529 521
530 rxvt_get_options (this, r_argc, r_argv); 522 get_options (r_argc, r_argv);
531 free (r_argv); 523 free (r_argv);
532 524
533#ifdef LOCAL_X_IS_UNIX 525#ifdef LOCAL_X_IS_UNIX
534 if (rs[Rs_display_name][0] == ':') 526 if (rs[Rs_display_name][0] == ':')
535 { 527 {
536 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 528 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
537 STRCPY (val, "unix"); 529 STRCPY (val, "unix");
538 STRCAT (val, rs[Rs_display_name]); 530 STRCAT (val, rs[Rs_display_name]);
539 Xdisplay = XOpenDisplay (val); 531 display = displays.get (val);
540 free (val); 532 free (val);
541 } 533 }
542#endif 534#endif
543 535
544 if (Xdisplay == NULL 536 if (!display
545 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 537 && ! (display = displays.get (rs[Rs_display_name])))
546 { 538 {
547 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
548 exit (EXIT_FAILURE); 540 exit (EXIT_FAILURE);
549 } 541 }
550 542
551 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 543 extract_resources (display->display, rs[Rs_name]);
552 544
553 /* 545 /*
554 * set any defaults not already set 546 * set any defaults not already set
555 */ 547 */
556 if (cmd_argv && cmd_argv[0]) 548 if (cmd_argv && cmd_argv[0])
557 { 549 {
558 if (!rs[Rs_title]) 550 if (!rs[Rs_title])
559 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 551 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
560 if (!rs[Rs_iconName]) 552 if (!rs[Rs_iconName])
561 rs[Rs_iconName] = rs[Rs_title]; 553 rs[Rs_iconName] = rs[Rs_title];
562 } 554 }
563 else 555 else
564 { 556 {
… …
566 rs[Rs_title] = rs[Rs_name]; 558 rs[Rs_title] = rs[Rs_name];
567 if (!rs[Rs_iconName]) 559 if (!rs[Rs_iconName])
568 rs[Rs_iconName] = rs[Rs_name]; 560 rs[Rs_iconName] = rs[Rs_name];
569 } 561 }
570 562
571 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 563 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
572 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 564 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
573 565
574#ifndef NO_FRILLS 566#ifndef NO_FRILLS
575 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 567 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
576 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 568 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
577 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 569 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
578 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 570 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
579#endif 571#endif
580 572
581#ifndef NO_LINESPACE 573#ifndef NO_LINESPACE
582 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 574 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
583 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 575 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
584#endif 576#endif
585 577
586#ifdef POINTER_BLANK 578#ifdef POINTER_BLANK
587 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 579 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
588 pointerBlankDelay = i; 580 pointerBlankDelay = i;
589 else 581 else
590 pointerBlankDelay = 2; 582 pointerBlankDelay = 2;
591#endif 583#endif
592 584
… …
603 rs[Rs_cutchars] = CUTCHARS; 595 rs[Rs_cutchars] = CUTCHARS;
604 596
605#ifdef ACS_ASCII 597#ifdef ACS_ASCII
606 if (!rs[Rs_acs_chars]) 598 if (!rs[Rs_acs_chars])
607 rs[Rs_acs_chars] = ACS_CHARS; 599 rs[Rs_acs_chars] = ACS_CHARS;
608 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
609 { 601 {
610 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
611 for (; i < 0x20; ) 603 for (; i < 0x20; )
612 val[i] = ' '; 604 val[i] = ' ';
613 rs[Rs_acs_chars] = val; 605 rs[Rs_acs_chars] = val;
614 } 606 }
615#endif 607#endif
… …
621# else 613# else
622 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 614 key_backspace = "DEC"; /* can toggle between \010 or \177 */
623# endif 615# endif
624 else 616 else
625 { 617 {
626 val = STRDUP(rs[Rs_backspace_key]); 618 val = STRDUP (rs[Rs_backspace_key]);
627 rxvt_Str_trim(val); 619 rxvt_Str_trim (val);
628 rxvt_Str_escaped(val); 620 rxvt_Str_escaped (val);
629 key_backspace = val; 621 key_backspace = val;
630 } 622 }
631#endif 623#endif
632 624
633#ifndef NO_DELETE_KEY 625#ifndef NO_DELETE_KEY
… …
637# else 629# else
638 key_delete = "\033[3~"; 630 key_delete = "\033[3~";
639# endif 631# endif
640 else 632 else
641 { 633 {
642 val = STRDUP(rs[Rs_delete_key]); 634 val = STRDUP (rs[Rs_delete_key]);
643 rxvt_Str_trim(val); 635 rxvt_Str_trim (val);
644 rxvt_Str_escaped(val); 636 rxvt_Str_escaped (val);
645 key_delete = val; 637 key_delete = val;
646 } 638 }
647#endif 639#endif
648 if (rs[Rs_answerbackstring]) 640 if (rs[Rs_answerbackstring])
649 { 641 {
650 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
651 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
652 } 644 }
653 645
654 if (rs[Rs_selectstyle]) 646 if (rs[Rs_selectstyle])
655 { 647 {
656 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
657 selection_style = OLD_WORD_SELECT; 649 selection_style = OLD_WORD_SELECT;
658#ifndef NO_OLD_SELECTION 650#ifndef NO_OLD_SELECTION
659 651
660 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
661 selection_style = OLD_SELECT; 653 selection_style = OLD_SELECT;
662#endif 654#endif
655
663 } 656 }
664 657
665#ifdef HAVE_SCROLLBARS 658#ifdef HAVE_SCROLLBARS
666 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
667 rs[Rs_scrollBar_thickness]); 660 rs[Rs_scrollBar_thickness]);
668#endif 661#endif
669
670 TermWin.fontset = new rxvt_fontset (this);
671 TermWin.fontset->populate (rs[Rs_font]);
672 TermWin.fwidth = TermWin.fontset->base_font ()->width;
673 TermWin.fheight = TermWin.fontset->base_font ()->height;
674 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
675 662
676#ifdef XTERM_REVERSE_VIDEO 663#ifdef XTERM_REVERSE_VIDEO
677 /* this is how xterm implements reverseVideo */ 664 /* this is how xterm implements reverseVideo */
678 if (Options & Opt_reverseVideo) 665 if (Options & Opt_reverseVideo)
679 { 666 {
… …
689 rs[Rs_color + i] = def_colorName[i]; 676 rs[Rs_color + i] = def_colorName[i];
690 677
691#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
692 /* this is how we implement reverseVideo */ 679 /* this is how we implement reverseVideo */
693 if (Options & Opt_reverseVideo) 680 if (Options & Opt_reverseVideo)
694 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 681 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
695#endif 682#endif
696 683
697 /* convenient aliases for setting fg/bg to colors */ 684 /* convenient aliases for setting fg/bg to colors */
698 color_aliases (Color_fg); 685 color_aliases (Color_fg);
699 color_aliases (Color_bg); 686 color_aliases (Color_bg);
… …
722 709
723#ifdef DISPLAY_IS_IP 710#ifdef DISPLAY_IS_IP
724 /* Fixup display_name for export over pty to any interested terminal 711 /* Fixup display_name for export over pty to any interested terminal
725 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 712 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
726 * (for the first non-loopback interface) that we get from 713 * (for the first non-loopback interface) that we get from
727 * rxvt_network_display(). This is more "name-resolution-portable", if you 714 * rxvt_network_display (). This is more "name-resolution-portable", if you
728 * will, and probably allows for faster x-client startup if your name 715 * will, and probably allows for faster x-client startup if your name
729 * server is beyond a slow link or overloaded at client startup. Of 716 * server is beyond a slow link or overloaded at client startup. Of
730 * course that only helps the shell's child processes, not us. 717 * course that only helps the shell's child processes, not us.
731 * 718 *
732 * Giving out the display_name also affords a potential security hole 719 * Giving out the display_name also affords a potential security hole
… …
734 val = rxvt_network_display (rs[Rs_display_name]); 721 val = rxvt_network_display (rs[Rs_display_name]);
735 rs[Rs_display_name] = (const char *)val; 722 rs[Rs_display_name] = (const char *)val;
736 723
737 if (val == NULL) 724 if (val == NULL)
738#endif /* DISPLAY_IS_IP */ 725#endif /* DISPLAY_IS_IP */
739 val = XDisplayString(Xdisplay); 726 val = XDisplayString (display->display);
740 727
741 if (rs[Rs_display_name] == NULL) 728 if (rs[Rs_display_name] == NULL)
742 rs[Rs_display_name] = val; /* use broken `:0' value */ 729 rs[Rs_display_name] = val; /* use broken `:0' value */
743 730
744 i = STRLEN (val); 731 i = STRLEN (val);
745 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 732 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
746 733
747 sprintf (env_display, "DISPLAY=%s", val); 734 sprintf (env_display, "DISPLAY=%s", val);
748 735
749 /* avoiding the math library: 736 /* avoiding the math library:
750 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 737 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
751 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 738 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
752 ; 739 ;
753 MAX_IT(i, 1); 740 MAX_IT (i, 1);
754 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 741 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
755 742
756 sprintf (env_windowid, "WINDOWID=%u", 743 sprintf (env_windowid, "WINDOWID=%u",
757 (unsigned int)TermWin.parent[0]); 744 (unsigned int)TermWin.parent[0]);
758 745
759 /* add entries to the environment: 746 /* add entries to the environment:
760 * @ DISPLAY: in case we started with -display 747 * @ DISPLAY: in case we started with -display
761 * @ WINDOWID: X window id number of the window 748 * @ WINDOWID: X window id number of the window
762 * @ COLORTERM: terminal sub-name and also indicates its color 749 * @ COLORTERM: terminal sub-name and also indicates its color
763 * @ TERM: terminal name 750 * @ TERM: terminal name
764 * @ TERMINFO: path to terminfo directory 751 * @ TERMINFO: path to terminfo directory
752 * @ COLORFGBG: fg;bg color codes
765 */ 753 */
766 putenv (env_display); 754 putenv (env_display);
767 putenv (env_windowid); 755 putenv (env_windowid);
756 if (env_colorfgbg)
757 putenv (env_colorfgbg);
768 758
769#ifdef RXVT_TERMINFO 759#ifdef RXVT_TERMINFO
770 putenv ("TERMINFO=" RXVT_TERMINFO); 760 putenv ("TERMINFO=" RXVT_TERMINFO);
771#endif 761#endif
772 762
773 if (Xdepth <= 2) 763 if (display->depth <= 2)
774 putenv ("COLORTERM=" COLORTERMENV "-mono"); 764 putenv ("COLORTERM=" COLORTERMENV "-mono");
775 else 765 else
776 putenv ("COLORTERM=" COLORTERMENVFULL); 766 putenv ("COLORTERM=" COLORTERMENVFULL);
777 767
778 if (rs[Rs_term_name] != NULL) 768 if (rs[Rs_term_name] != NULL)
779 { 769 {
780 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 770 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
781 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 771 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
782 putenv (env_term); 772 putenv (env_term);
783 } 773 }
784 else 774 else
785 putenv ("TERM=" TERMENV); 775 putenv ("TERM=" TERMENV);
… …
800void 790void
801rxvt_term::set_locale (const char *locale) 791rxvt_term::set_locale (const char *locale)
802{ 792{
803#if HAVE_XSETLOCALE || HAVE_SETLOCALE 793#if HAVE_XSETLOCALE || HAVE_SETLOCALE
804 free (this->locale); 794 free (this->locale);
805 this->locale = strdup (setlocale (LC_CTYPE, "")); 795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
796 SET_LOCALE (this->locale);
797 mbstate.reset ();
806#endif 798#endif
807#if HAVE_NL_LANGINFO 799#if HAVE_NL_LANGINFO
808 free (codeset); 800 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET)); 801 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 802 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8"); 803 || !STRCASECMP (codeset, "UTF8");
812#else 804#else
813 enc_utf8 = 1; 805 enc_utf8 = 1;
814#endif 806#endif
815} 807}
816 808
… …
822 rxvt_print_error ("Setting locale failed."); 814 rxvt_print_error ("Setting locale failed.");
823 else 815 else
824 { 816 {
825 Atom wmlocale; 817 Atom wmlocale;
826 818
827 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
828 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 820 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 821 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)locale, STRLEN(locale)); 822 (unsigned char *)locale, STRLEN (locale));
831 823
832 if (!XSupportsLocale ()) 824 if (!XSupportsLocale ())
833 { 825 {
834 rxvt_print_error ("The locale is not supported by Xlib"); 826 rxvt_print_error ("The locale is not supported by Xlib");
835 return; 827 return;
836 } 828 }
837 829
830 im_ev.start (display);
831
838 /* see if we can connect yet */ 832 /* see if we can connect already */
839 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 833 im_cb ();
840
841 /* To avoid Segmentation Fault in C locale: Solaris only? */
842 if (STRCMP (locale, "C"))
843 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
844 rxvt_IMInstantiateCallback, NULL);
845 } 834 }
846#endif 835#endif
847} 836}
848 837
849/*----------------------------------------------------------------------*/ 838/*----------------------------------------------------------------------*/
850void 839void
851rxvt_term::init_command(const char *const *argv) 840rxvt_term::init_command (const char *const *argv)
852{ 841{
853 /* 842 /*
854 * Initialize the command connection. 843 * Initialize the command connection.
855 * This should be called after the X server connection is established. 844 * This should be called after the X server connection is established.
856 */ 845 */
857 int i; 846 int i;
858 847
859 for (i = 0; i < NUM_XA; i++) 848 for (i = 0; i < NUM_XA; i++)
860 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 849 xa[i] = XInternAtom (display->display, xa_names[i], False);
861 850
862 /* Enable delete window protocol */ 851 /* Enable delete window protocol */
863 XSetWMProtocols (Xdisplay, TermWin.parent[0], 852 XSetWMProtocols (display->display, TermWin.parent[0],
864 &(xa[XA_WMDELETEWINDOW]), 1); 853 & (xa[XA_WMDELETEWINDOW]), 1);
865 854
866#ifdef USING_W11LIB 855#ifdef USING_W11LIB
867 /* enable W11 callbacks */ 856 /* enable W11 callbacks */
868 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 857 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
869#endif 858#endif
870 859
871#ifdef META8_OPTION 860#ifdef META8_OPTION
872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 861 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
873#endif 862#endif
874 863
875 rxvt_get_ourmods (this); 864 get_ourmods ();
876 865
877 if (!(Options & Opt_scrollTtyOutput)) 866 if (! (Options & Opt_scrollTtyOutput))
878 PrivateModes |= PrivMode_TtyOutputInh; 867 PrivateModes |= PrivMode_TtyOutputInh;
879 if (Options & Opt_scrollTtyKeypress) 868 if (Options & Opt_scrollTtyKeypress)
880 PrivateModes |= PrivMode_Keypress; 869 PrivateModes |= PrivMode_Keypress;
881 if (!(Options & Opt_jumpScroll)) 870 if (! (Options & Opt_jumpScroll))
882 PrivateModes |= PrivMode_smoothScroll; 871 PrivateModes |= PrivMode_smoothScroll;
883 872
884#ifndef NO_BACKSPACE_KEY 873#ifndef NO_BACKSPACE_KEY
885 if (STRCMP(key_backspace, "DEC") == 0) 874 if (STRCMP (key_backspace, "DEC") == 0)
886 PrivateModes |= PrivMode_HaveBackSpace; 875 PrivateModes |= PrivMode_HaveBackSpace;
887#endif 876#endif
888 877
889 /* add value for scrollBar */ 878 /* add value for scrollBar */
890 if (scrollbar_visible (this)) 879 if (scrollbar_visible ())
891 { 880 {
892 PrivateModes |= PrivMode_scrollBar; 881 PrivateModes |= PrivMode_scrollBar;
893 SavedModes |= PrivMode_scrollBar; 882 SavedModes |= PrivMode_scrollBar;
894 } 883 }
895 if (menubar_visible (this)) 884 if (menubar_visible ())
896 { 885 {
897 PrivateModes |= PrivMode_menuBar; 886 PrivateModes |= PrivMode_menuBar;
898 SavedModes |= PrivMode_menuBar; 887 SavedModes |= PrivMode_menuBar;
899 } 888 }
900 889
901#ifdef GREEK_SUPPORT
902 greek_init();
903#endif
904
905 Xfd = XConnectionNumber (Xdisplay);
906
907#ifdef CURSOR_BLINK 890#ifdef CURSOR_BLINK
908
909 if (Options & Opt_cursorBlink) 891 if (Options & Opt_cursorBlink)
910 (void)gettimeofday (&lastcursorchange, NULL); 892 (void)gettimeofday (&lastcursorchange, NULL);
911#endif 893#endif
912 894
913 if ((cmd_fd = run_command (argv)) < 0) 895 if ((cmd_fd = run_command (argv)) < 0)
… …
916 exit (EXIT_FAILURE); 898 exit (EXIT_FAILURE);
917 } 899 }
918} 900}
919 901
920/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
921/* INTPROTO */
922void 903void
923rxvt_Get_Colours (pR) 904rxvt_term::Get_Colours ()
924{ 905{
925 int i; 906 int i;
926 907
927 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 908 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
928 { 909 {
929 rxvt_color xcol; 910 rxvt_color xcol;
930 911
931 if (!R->rs[Rs_color + i]) 912 if (!rs[Rs_color + i])
932 continue; 913 continue;
933 914
934 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 915 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
935 { 916 {
936#ifndef XTERM_REVERSE_VIDEO 917#ifndef XTERM_REVERSE_VIDEO
937 if (i < 2 && (R->Options & Opt_reverseVideo)) 918 if (i < 2 && (Options & Opt_reverseVideo))
938 {
939 R->rs[Rs_color + i] = def_colorName[!i]; 919 rs[Rs_color + i] = def_colorName[!i];
940 }
941 else 920 else
942#endif 921#endif
943 R->rs[Rs_color + i] = def_colorName[i]; 922 rs[Rs_color + i] = def_colorName[i];
944 923
945 if (!R->rs[Rs_color + i]) 924 if (!rs[Rs_color + i])
946 continue; 925 continue;
947 926
948 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 927 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
949 { 928 {
950 switch (i) 929 switch (i)
951 { 930 {
952 case Color_fg: 931 case Color_fg:
953 case Color_bg: 932 case Color_bg:
954 /* fatal: need bg/fg color */ 933 /* fatal: need bg/fg color */
955 rxvt_print_error ("aborting"); 934 rxvt_print_error ("aborting");
956 exit (EXIT_FAILURE); 935 exit (EXIT_FAILURE);
957 /* NOTREACHED */ 936 /* NOTREACHED */
958 break; 937 break;
959#ifndef NO_CURSORCOLOR 938#ifndef NO_CURSORCOLOR
960 case Color_cursor2: 939 case Color_cursor2:
961 xcol = R->PixColors[Color_fg]; 940 xcol = PixColors[Color_fg];
962 break; 941 break;
963#endif /* ! NO_CURSORCOLOR */ 942#endif /* ! NO_CURSORCOLOR */
964 case Color_pointer: 943 case Color_pointer:
965 xcol = R->PixColors[Color_fg]; 944 xcol = PixColors[Color_fg];
966 break; 945 break;
967 default: 946 default:
968 xcol = R->PixColors[Color_bg]; /* None */ 947 xcol = PixColors[Color_bg]; /* None */
969 break; 948 break;
970 } 949 }
971 } 950 }
972 } 951 }
973 952
974 R->PixColors[i] = xcol; 953 PixColors[i] = xcol;
975 SET_PIXCOLOR (R, i); 954 SET_PIXCOLOR (i);
976 } 955 }
977 956
978 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 957 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
979 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 958 PixColors[Color_pointer] = PixColors[Color_fg];
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 959 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
981 R->PixColors[Color_border] = R->PixColors[Color_fg]; 960 PixColors[Color_border] = PixColors[Color_fg];
982 961
983 /* 962 /*
984 * get scrollBar/menuBar shadow colors 963 * get scrollBar/menuBar shadow colors
985 * 964 *
986 * The calculations of topShadow/bottomShadow values are adapted 965 * The calculations of topShadow/bottomShadow values are adapted
… …
988 */ 967 */
989#ifdef KEEP_SCROLLCOLOR 968#ifdef KEEP_SCROLLCOLOR
990 969
991 if (XDEPTH <= 2) 970 if (XDEPTH <= 2)
992 { /* Monochrome */ 971 { /* Monochrome */
993 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 972 PixColors[Color_scroll] = PixColors[Color_fg];
994 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 973 PixColors[Color_topShadow] = PixColors[Color_bg];
995 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 974 PixColors[Color_bottomShadow] = PixColors[Color_bg];
996 } 975 }
997 else 976 else
998 { 977 {
999 rxvt_color xcol[3]; 978 rxvt_color xcol[3];
1000 /* xcol[0] == white 979 /* xcol[0] == white
1001 * xcol[1] == top shadow 980 * xcol[1] == top shadow
1002 * xcol[2] == bot shadow */ 981 * xcol[2] == bot shadow */
1003 982
1004 xcol[1] = R->PixColors[Color_scroll]; 983 xcol[1] = PixColors[Color_scroll];
1005# ifdef PREFER_24BIT 984# ifdef PREFER_24BIT
1006 xcol[0].set (R, 65535, 65535, 65535); 985 xcol[0].set (display, 65535, 65535, 65535);
1007 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 986 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1008# else 987# else
1009 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 988 xcol[0].set (display, WhitePixel (display->display, display->screen));
1010# endif 989# endif
1011 990
1012 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 991 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1013 992
1014 xcol[0].get (R, pr0, pg0, pb0); 993 xcol[0].get (display, pr0, pg0, pb0);
1015 xcol[1].get (R, pr1, pg1, pb1); 994 xcol[1].get (display, pr1, pg1, pb1);
1016 995
1017 /* bottomShadowColor */ 996 /* bottomShadowColor */
1018 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 997 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1019 xcol[2] = R->PixColors[Color_Black]; 998 xcol[2] = PixColors[Color_Black];
1020 999
1021 R->PixColors[Color_bottomShadow] = xcol[2]; 1000 PixColors[Color_bottomShadow] = xcol[2];
1022 1001
1023 /* topShadowColor */ 1002 /* topShadowColor */
1024 if (!xcol[1].set (aR_ 1003 if (!xcol[1].set (display,
1025 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1004 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1026 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1005 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1027 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1006 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1028 xcol[1] = R->PixColors[Color_White]; 1007 xcol[1] = PixColors[Color_White];
1029 1008
1030 R->PixColors[Color_topShadow] = xcol[1]; 1009 PixColors[Color_topShadow] = xcol[1];
1031 } 1010 }
1032#endif /* KEEP_SCROLLCOLOR */ 1011#endif /* KEEP_SCROLLCOLOR */
1033} 1012}
1034 1013
1035/*----------------------------------------------------------------------*/ 1014/*----------------------------------------------------------------------*/
1036/* color aliases, fg/bg bright-bold */ 1015/* color aliases, fg/bg bright-bold */
1037void 1016void
1038rxvt_term::color_aliases(int idx) 1017rxvt_term::color_aliases (int idx)
1039{ 1018{
1040 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1019 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1041 { 1020 {
1042 int i = atoi (rs[Rs_color + idx]); 1021 int i = atoi (rs[Rs_color + idx]);
1043 1022
1044 if (i >= 8 && i <= 15) 1023 if (i >= 8 && i <= 15)
1045 { /* bright colors */ 1024 { /* bright colors */
1046 i -= 8; 1025 i -= 8;
1047#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1027 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1028 return;
1050#endif 1029#endif
1030
1051 } 1031 }
1052 1032
1053 if (i >= 0 && i <= 7) /* normal colors */ 1033 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1034 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1035 }
… …
1058/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
1059/* 1039/*
1060 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1040 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1061 * Use resource ``modifier'' to override the Meta modifier 1041 * Use resource ``modifier'' to override the Meta modifier
1062 */ 1042 */
1063/* INTPROTO */
1064void 1043void
1065rxvt_get_ourmods(pR) 1044rxvt_term::get_ourmods ()
1066{ 1045{
1067 int i, j, k; 1046 int i, j, k;
1068 int requestedmeta, realmeta, realalt; 1047 int requestedmeta, realmeta, realalt;
1069 const char *cm, *rsmod; 1048 const char *cm, *rsmod;
1070 XModifierKeymap *map; 1049 XModifierKeymap *map;
… …
1073 { 1052 {
1074 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1053 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1075 }; 1054 };
1076 1055
1077 requestedmeta = realmeta = realalt = 0; 1056 requestedmeta = realmeta = realalt = 0;
1078 rsmod = R->rs[Rs_modifier]; 1057 rsmod = rs[Rs_modifier];
1079 if (rsmod 1058 if (rsmod
1080 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1059 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1081 requestedmeta = rsmod[3] - '0'; 1060 requestedmeta = rsmod[3] - '0';
1082 1061
1083 map = XGetModifierMapping(R->Xdisplay); 1062 map = XGetModifierMapping (display->display);
1084 kc = map->modifiermap; 1063 kc = map->modifiermap;
1085 for (i = 1; i < 6; i++) 1064 for (i = 1; i < 6; i++)
1086 { 1065 {
1087 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1066 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1088 for (j = map->max_keypermod; j--; k++) 1067 for (j = map->max_keypermod; j--; k++)
1089 { 1068 {
1090 if (kc[k] == 0) 1069 if (kc[k] == 0)
1091 break; 1070 break;
1092 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1071 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1093 { 1072 {
1094 case XK_Num_Lock: 1073 case XK_Num_Lock:
1095 R->ModNumLockMask = modmasks[i - 1]; 1074 ModNumLockMask = modmasks[i - 1];
1096 /* FALLTHROUGH */ 1075 /* FALLTHROUGH */
1097 default: 1076 default:
1098 continue; /* for(;;) */ 1077 continue; /* for (;;) */
1099 case XK_Meta_L: 1078 case XK_Meta_L:
1100 case XK_Meta_R: 1079 case XK_Meta_R:
1101 cm = "meta"; 1080 cm = "meta";
1102 realmeta = i; 1081 realmeta = i;
1103 break; 1082 break;
1104 case XK_Alt_L: 1083 case XK_Alt_L:
1105 case XK_Alt_R: 1084 case XK_Alt_R:
1106 cm = "alt"; 1085 cm = "alt";
1107 realalt = i; 1086 realalt = i;
1108 break; 1087 break;
1109 case XK_Super_L: 1088 case XK_Super_L:
1110 case XK_Super_R: 1089 case XK_Super_R:
1111 cm = "super"; 1090 cm = "super";
1112 break; 1091 break;
1113 case XK_Hyper_L: 1092 case XK_Hyper_L:
1114 case XK_Hyper_R: 1093 case XK_Hyper_R:
1115 cm = "hyper"; 1094 cm = "hyper";
1116 break; 1095 break;
1117 } 1096 }
1118 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1097 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1119 requestedmeta = i; 1098 requestedmeta = i;
1120 } 1099 }
1121 } 1100 }
1122 XFreeModifiermap(map); 1101 XFreeModifiermap (map);
1123 i = (requestedmeta ? requestedmeta 1102 i = (requestedmeta ? requestedmeta
1124 : (realmeta ? realmeta 1103 : (realmeta ? realmeta
1125 : (realalt ? realalt : 0))); 1104 : (realalt ? realalt : 0)));
1126 if (i) 1105 if (i)
1127 R->ModMetaMask = modmasks[i - 1]; 1106 ModMetaMask = modmasks[i - 1];
1128} 1107}
1129 1108
1130/*----------------------------------------------------------------------*/ 1109/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1110/* rxvt_Create_Windows () - Open and map the window */
1132void 1111void
1133rxvt_term::create_windows (int argc, const char *const *argv) 1112rxvt_term::create_windows (int argc, const char *const *argv)
1134{ 1113{
1135 XClassHint classHint; 1114 XClassHint classHint;
1136 XWMHints wmHint; 1115 XWMHints wmHint;
1137 XGCValues gcvalue; 1116 XGCValues gcvalue;
1138 long vt_emask; 1117 long vt_emask;
1139 1118
1140 XSetWindowAttributes attributes;
1141 XWindowAttributes gattr; 1119 XWindowAttributes gattr;
1142 1120
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay);
1146
1147 if (Options & Opt_transparent) 1121 if (Options & Opt_transparent)
1148 { 1122 {
1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1123 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1150 Xdepth = gattr.depth; 1124 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1151 }
1152 else
1153 {
1154 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1155#ifdef PREFER_24BIT
1156 /*
1157 * If depth is not 24, look for a 24bit visual.
1158 */
1159 if (Xdepth != 24)
1160 {
1161 XVisualInfo vinfo;
1162
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 {
1165 Xdepth = 24;
1166 Xvisual = vinfo.visual;
1167 Xcmap = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen),
1169 Xvisual, AllocNone);
1170 }
1171 }
1172#endif
1173 } 1125 }
1174 1126
1175 /* grab colors before netscape does */ 1127 /* grab colors before netscape does */
1176 rxvt_Get_Colours (this); 1128 Get_Colours ();
1177 1129
1178 rxvt_change_font (this, 1, NULL); 1130 if (!change_font (rs[Rs_font]))
1131 {
1132 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1133 destroy ();
1134 return;
1135 }
1136
1179 window_calc (0, 0); 1137 window_calc (0, 0);
1180 old_width = szHint.width; 1138 old_width = szHint.width;
1181 old_height = szHint.height; 1139 old_height = szHint.height;
1182 1140
1183 /* parent window - reverse video so we can see placement errors 1141 /* parent window - reverse video so we can see placement errors
1184 * sub-window placement & size in rxvt_resize_subwindows() 1142 * sub-window placement & size in rxvt_resize_subwindows ()
1185 */ 1143 */
1186 1144
1187#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1146 XSetWindowAttributes attributes;
1147
1188 attributes.background_pixel = PixColors[Color_fg]; 1148 attributes.background_pixel = PixColors[Color_fg];
1189 attributes.border_pixel = PixColors[Color_border]; 1149 attributes.border_pixel = PixColors[Color_border];
1190 attributes.colormap = Xcmap; 1150 attributes.colormap = display->cmap;
1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1151 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1192 szHint.x, szHint.y, 1152 szHint.x, szHint.y,
1193 szHint.width, szHint.height, 1153 szHint.width, szHint.height,
1194 TermWin.ext_bwidth, 1154 TermWin.ext_bwidth,
1195 Xdepth, InputOutput, 1155 display->depth, InputOutput,
1196 Xvisual, 1156 display->visual,
1197 CWBackPixel | CWBorderPixel
1198 | CWColormap, &attributes); 1157 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1199#else 1158#else
1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1159 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1201 szHint.x, szHint.y, 1160 szHint.x, szHint.y,
1202 szHint.width, 1161 szHint.width,
1203 szHint.height, 1162 szHint.height,
1204 TermWin.ext_bwidth, 1163 TermWin.ext_bwidth,
1205 PixColors[Color_border], 1164 PixColors[Color_border],
1206 PixColors[Color_fg]); 1165 PixColors[Color_fg]);
1207#endif 1166#endif
1208 1167
1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1211 1170
1212 classHint.res_name = (char *)rs[Rs_name]; 1171 classHint.res_name = (char *)rs[Rs_name];
1213 classHint.res_class = (char *)APL_CLASS; 1172 classHint.res_class = (char *)APL_CLASS;
1214 1173
1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1216 wmHint.input = True; 1175 wmHint.input = True;
1217 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1218 : NormalState); 1177 : NormalState);
1219 wmHint.window_group = TermWin.parent[0]; 1178 wmHint.window_group = TermWin.parent[0];
1220 1179
1221 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1180 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1222 (char **)argv, argc, &szHint, &wmHint, &classHint); 1181 (char **)argv, argc, &szHint, &wmHint, &classHint);
1182
1223 XSelectInput(Xdisplay, TermWin.parent[0], 1183 XSelectInput (display->display, TermWin.parent[0],
1224 (KeyPressMask 1184 KeyPressMask
1225#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1185#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1226 | KeyReleaseMask 1186 | KeyReleaseMask
1227#endif 1187#endif
1228 | FocusChangeMask | VisibilityChangeMask 1188 | FocusChangeMask | VisibilityChangeMask
1229 | StructureNotifyMask)); 1189 | StructureNotifyMask);
1190 termwin_ev.start (display, TermWin.parent[0]);
1230 1191
1231 /* vt cursor: Black-on-White is standard, but this is more popular */ 1192 /* vt cursor: Black-on-White is standard, but this is more popular */
1232 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1193 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1233 1194
1234#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1195#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1235 /* cursor (menuBar/scrollBar): Black-on-White */ 1196 /* cursor (menuBar/scrollBar): Black-on-White */
1236 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1197 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1237#endif 1198#endif
1238 1199
1239#ifdef POINTER_BLANK 1200#ifdef POINTER_BLANK
1240
1241 { 1201 {
1242 XColor blackcolour; 1202 XColor blackcolour;
1243 blackcolour.red = 0; 1203 blackcolour.red = 0;
1244 blackcolour.green = 0; 1204 blackcolour.green = 0;
1245 blackcolour.blue = 0; 1205 blackcolour.blue = 0;
1246 Font f = XLoadFont (Xdisplay, "fixed"); 1206 Font f = XLoadFont (display->display, "fixed");
1247 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1207 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1248 &blackcolour, &blackcolour); 1208 &blackcolour, &blackcolour);
1249 XUnloadFont (Xdisplay, f); 1209 XUnloadFont (display->display, f);
1250 } 1210 }
1251#endif 1211#endif
1252 1212
1253 /* the vt window */ 1213 /* the vt window */
1254 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1214 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1255 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1256 TermWin_TotalWidth(), 1216 TermWin_TotalWidth (),
1257 TermWin_TotalHeight(), 1217 TermWin_TotalHeight (),
1258 0, 1218 0,
1259 PixColors[Color_fg], 1219 PixColors[Color_fg],
1260 PixColors[Color_bg]); 1220 PixColors[Color_bg]);
1221
1261#ifdef DEBUG_X 1222#ifdef DEBUG_X
1262 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1223 XStoreName (display->display, TermWin.vt, "vt window");
1263#endif 1224#endif
1264 1225
1265 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1226 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1266 | PropertyChangeMask); 1227 | PropertyChangeMask);
1267 1228
… …
1272 vt_emask |= PointerMotionMask; 1233 vt_emask |= PointerMotionMask;
1273 else 1234 else
1274#endif 1235#endif
1275 vt_emask |= (Button1MotionMask | Button3MotionMask); 1236 vt_emask |= (Button1MotionMask | Button3MotionMask);
1276 1237
1277 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1238 XSelectInput (display->display, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt);
1278 1240
1279#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1241#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1280
1281 if (menuBar_height()) 1242 if (menuBar_height ())
1282 { 1243 {
1283 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1284 window_vt_x, 0, 1245 window_vt_x, 0,
1285 TermWin_TotalWidth(), 1246 TermWin_TotalWidth (),
1286 menuBar_TotalHeight(), 1247 menuBar_TotalHeight (),
1287 0, 1248 0,
1288 PixColors[Color_fg], 1249 PixColors[Color_fg],
1289 PixColors[Color_scroll]); 1250 PixColors[Color_scroll]);
1251
1290#ifdef DEBUG_X 1252#ifdef DEBUG_X
1291
1292 XStoreName(Xdisplay, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1293#endif 1254#endif
1294 1255
1295 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257
1258 XDefineCursor (display->display, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr));
1260
1296 XSelectInput(Xdisplay, menuBar.win, 1261 XSelectInput (display->display, menuBar.win,
1297 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1298 | Button1MotionMask)); 1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win);
1299 } 1265 }
1300#endif 1266#endif
1267
1301#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1302 if (rs[Rs_backgroundPixmap] != NULL 1269 if (rs[Rs_backgroundPixmap] != NULL
1303 && !(Options & Opt_transparent)) 1270 && ! (Options & Opt_transparent))
1304 { 1271 {
1305 const char *p = rs[Rs_backgroundPixmap]; 1272 const char *p = rs[Rs_backgroundPixmap];
1306 1273
1307 if ((p = STRCHR(p, ';')) != NULL) 1274 if ((p = STRCHR (p, ';')) != NULL)
1308 { 1275 {
1309 p++; 1276 p++;
1310 rxvt_scale_pixmap (this, p); 1277 scale_pixmap (p);
1311 } 1278 }
1312 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1279 set_bgPixmap (rs[Rs_backgroundPixmap]);
1313 rxvt_scr_touch (this, True); 1280 scr_touch (True);
1314 } 1281 }
1315#endif 1282#endif
1316 1283
1317 /* graphics context for the vt window */ 1284 /* graphics context for the vt window */
1318 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = PixColors[Color_fg];
1319 gcvalue.background = PixColors[Color_bg]; 1286 gcvalue.background = PixColors[Color_bg];
1320 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1321 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1322 GCForeground | GCBackground 1289 GCForeground | GCBackground
1323 | GCGraphicsExposures, &gcvalue); 1290 | GCGraphicsExposures, &gcvalue);
1291
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1324 1293
1325#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1326
1327 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = PixColors[Color_topShadow];
1328 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1329 GCForeground, &gcvalue);
1330 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = PixColors[Color_bottomShadow];
1331 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1332 GCForeground, &gcvalue);
1333 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1299 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1334 : Color_scroll)]; 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1335 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1336 GCForeground, &gcvalue);
1337#endif 1301#endif
1338} 1302}
1339 1303
1340/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1341/* 1305/*
… …
1347rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1348{ 1312{
1349 int cfd, er; 1313 int cfd, er;
1350 1314
1351 /* get master (pty) */ 1315 /* get master (pty) */
1352 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1316 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1353 { 1317 {
1354 rxvt_print_error("can't open pseudo-tty"); 1318 rxvt_print_error ("can't open pseudo-tty");
1355 return -1; 1319 return -1;
1356 } 1320 }
1357
1358#ifdef FD_SETSIZE
1359 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1360 {
1361 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1362 rxvt_clean_exit();
1363 exit(EXIT_FAILURE);
1364 }
1365#endif
1366 1321
1367 fcntl (cfd, F_SETFL, O_NONBLOCK); 1322 fcntl (cfd, F_SETFL, O_NONBLOCK);
1368 1323
1369 /* get slave (tty) */ 1324 /* get slave (tty) */
1370 if (tty_fd < 0) 1325 if (tty_fd < 0)
1371 { 1326 {
1372#ifndef NO_SETOWNER_TTYDEV 1327#ifndef NO_SETOWNER_TTYDEV
1373 rxvt_privileged_ttydev (aR_ SAVE); 1328 privileged_ttydev (SAVE);
1374#endif 1329#endif
1375 1330
1376 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1331 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1377 { 1332 {
1378 close(cfd); 1333 close (cfd);
1379 rxvt_print_error("can't open slave tty %s", ttydev); 1334 rxvt_print_error ("can't open slave tty %s", ttydev);
1380 return -1; 1335 return -1;
1381 } 1336 }
1382 } 1337 }
1383#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1]) 1339 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0]; 1340 er = key_backspace[0];
1386 else if (STRCMP(key_backspace, "DEC") == 0) 1341 else if (STRCMP (key_backspace, "DEC") == 0)
1387 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1388 else 1343 else
1389#endif 1344#endif
1390 1345
1391 er = -1; 1346 er = -1;
1392 1347
1393 rxvt_get_ttymode (&(tio), er); 1348 rxvt_get_ttymode (& (tio), er);
1394 1349
1395#ifndef __QNX__ 1350#ifndef __QNX__
1396 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1398 { 1353 {
1399 case -1: 1354 case -1:
1400 rxvt_print_error("can't fork"); 1355 rxvt_print_error ("can't fork");
1401 return -1; 1356 return -1;
1402 case 0: 1357 case 0:
1403 close (cfd); /* only keep tty_fd and STDERR open */ 1358 close (cfd); /* only keep tty_fd and STDERR open */
1404 close (Xfd); 1359
1360 init_env ();
1361
1405 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1362 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1406 rxvt_print_error ("could not obtain control of tty"); 1363 rxvt_print_error ("could not obtain control of tty");
1407 else 1364 else
1365 {
1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1367 dup2 (tty_fd, STDIN_FILENO);
1368 dup2 (tty_fd, STDOUT_FILENO);
1369 dup2 (tty_fd, STDERR_FILENO);
1370
1371 if (tty_fd > 2)
1372 close (tty_fd);
1373
1374 run_child (argv);
1375 }
1376 exit (EXIT_FAILURE);
1377 /* NOTREACHED */
1378 default:
1408 { 1379 {
1409 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1381 int fdstdin;
1382
1383 fdstdin = dup (STDIN_FILENO);
1410 dup2 (tty_fd, STDIN_FILENO); 1384 dup2 (tty_fd, STDIN_FILENO);
1385#endif
1386
1387#ifdef UTMP_SUPPORT
1388 privileged_utmp (SAVE);
1389#endif
1390
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392
1411 dup2 (tty_fd, STDOUT_FILENO); 1393 dup2 (fdstdin, STDIN_FILENO);
1412 dup2 (tty_fd, STDERR_FILENO);
1413
1414 if (tty_fd > 2)
1415 close (tty_fd); 1394 close (fdstdin);
1395#endif
1416 1396
1417 run_child (argv);
1418 } 1397 }
1419 exit (EXIT_FAILURE);
1420 /* NOTREACHED */
1421 default:
1422 {
1423#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1424 int fdstdin;
1425
1426 fdstdin = dup (STDIN_FILENO);
1427 dup2 (tty_fd, STDIN_FILENO);
1428#endif
1429
1430#ifdef UTMP_SUPPORT
1431 rxvt_privileged_utmp (this, SAVE);
1432#endif
1433
1434#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1435
1436 dup2 (fdstdin, STDIN_FILENO);
1437 close (fdstdin);
1438#endif
1439
1440 }
1441 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1398 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1442 break; 1399 break;
1443 } 1400 }
1444#else /* __QNX__ uses qnxspawn() */ 1401#else /* __QNX__ uses qnxspawn () */
1445 fchmod (tty_fd, 0622); 1402 fchmod (tty_fd, 0622);
1446 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1403 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1447 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1404 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1448 1405
1449 if (run_child (argv) == -1) 1406 if (run_child (argv) == -1)
… …
1463int 1420int
1464rxvt_term::run_child (const char *const *argv) 1421rxvt_term::run_child (const char *const *argv)
1465{ 1422{
1466 char *login; 1423 char *login;
1467 1424
1468 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1425 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1469 1426
1470 if (Options & Opt_console) 1427 if (Options & Opt_console)
1471 { /* be virtual console, fail silently */ 1428 { /* be virtual console, fail silently */
1472#ifdef TIOCCONS 1429#ifdef TIOCCONS
1473 unsigned int on = 1; 1430 unsigned int on = 1;
… …
1481 { 1438 {
1482 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1439 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1483 close (fd); 1440 close (fd);
1484 } 1441 }
1485#endif /* SRIOCSREDIR */ 1442#endif /* SRIOCSREDIR */
1443
1486 } 1444 }
1487 1445
1488 /* reset signals and spin off the command interpreter */ 1446 /* reset signals and spin off the command interpreter */
1489 signal (SIGINT, SIG_DFL); 1447 signal (SIGINT, SIG_DFL);
1490 signal (SIGQUIT, SIG_DFL); 1448 signal (SIGQUIT, SIG_DFL);
… …
1518 { 1476 {
1519# ifdef DEBUG_CMD 1477# ifdef DEBUG_CMD
1520 int i; 1478 int i;
1521 1479
1522 for (i = 0; argv[i]; i++) 1480 for (i = 0; argv[i]; i++)
1523 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1481 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1524# endif 1482# endif
1525 1483
1526 execvp(argv[0], (char *const *)argv); 1484 execvp (argv[0], (char *const *)argv);
1527 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1528 } 1486 }
1529 else 1487 else
1530 { 1488 {
1531 const char *argv0, *shell; 1489 const char *argv0, *shell;
1532 1490
1533 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1491 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1534 shell = "/bin/sh"; 1492 shell = "/bin/sh";
1535 1493
1536 argv0 = (const char *)rxvt_r_basename(shell); 1494 argv0 = (const char *)rxvt_r_basename (shell);
1537 if (Options & Opt_loginShell) 1495 if (Options & Opt_loginShell)
1538 { 1496 {
1539 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1497 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1540 1498
1541 login[0] = '-'; 1499 login[0] = '-';
1542 STRCPY(&login[1], argv0); 1500 STRCPY (&login[1], argv0);
1543 argv0 = login; 1501 argv0 = login;
1544 } 1502 }
1545 execlp(shell, argv0, NULL); 1503 execlp (shell, argv0, NULL);
1546 /* no error message: STDERR is closed! */ 1504 /* no error message: STDERR is closed! */
1547 } 1505 }
1548 1506
1549#else /* __QNX__ uses qnxspawn() */ 1507#else /* __QNX__ uses qnxspawn () */
1550 1508
1551 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1509 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1552 char *command = NULL, fullcommand[_MAX_PATH]; 1510 char *command = NULL, fullcommand[_MAX_PATH];
1553 char **arg_v, *arg_a[2] = { NULL, NULL }; 1511 char **arg_v, *arg_a[2] = { NULL, NULL };
1554 1512
1555 if (argv != NULL) 1513 if (argv != NULL)
1556 { 1514 {
1557 if (access(argv[0], X_OK) == -1) 1515 if (access (argv[0], X_OK) == -1)
1558 { 1516 {
1559 if (STRCHR(argv[0], '/') == NULL) 1517 if (STRCHR (argv[0], '/') == NULL)
1560 { 1518 {
1561 searchenv(argv[0], "PATH", fullcommand); 1519 searchenv (argv[0], "PATH", fullcommand);
1562 if (fullcommand[0] != '\0') 1520 if (fullcommand[0] != '\0')
1563 command = fullcommand; 1521 command = fullcommand;
1564 } 1522 }
1565 if (access(command, X_OK) == -1) 1523 if (access (command, X_OK) == -1)
1566 return -1; 1524 return -1;
1567 } 1525 }
1568 else 1526 else
1569 command = argv[0]; 1527 command = argv[0];
1570 arg_v = argv; 1528 arg_v = argv;
1571 } 1529 }
1572 else 1530 else
1573 { 1531 {
1574 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1532 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1575 command = "/bin/sh"; 1533 command = "/bin/sh";
1576 1534
1577 arg_a[0] = my_basename(command); 1535 arg_a[0] = my_basename (command);
1578 if (Options & Opt_loginShell) 1536 if (Options & Opt_loginShell)
1579 { 1537 {
1580 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1538 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1581 1539
1582 login[0] = '-'; 1540 login[0] = '-';
1583 STRCPY(&login[1], arg_a[0]); 1541 STRCPY (&login[1], arg_a[0]);
1584 arg_a[0] = login; 1542 arg_a[0] = login;
1585 } 1543 }
1586 arg_v = arg_a; 1544 arg_v = arg_a;
1587 } 1545 }
1588 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1546 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1589 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1547 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1590 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1548 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1591 command, arg_v, environ, iov_a, 0); 1549 command, arg_v, environ, iov_a, 0);
1592 if (login) 1550 if (login)
1593 free(login); 1551 free (login);
1594 1552
1595 close(tty_fd); 1553 close (tty_fd);
1596 return cmd_fd; 1554 return cmd_fd;
1597 1555
1598#endif 1556#endif
1599 return -1; 1557 return -1;
1600} 1558}
1601 1559
1602/* ------------------------------------------------------------------------- * 1560/* ------------------------------------------------------------------------- *
1603 * GET TTY CURRENT STATE * 1561 * GET TTY CURRENT STATE *
1604 * ------------------------------------------------------------------------- */ 1562 * ------------------------------------------------------------------------- */
1605/* rxvt_get_ttymode() */ 1563/* rxvt_get_ttymode () */
1606/* INTPROTO */ 1564/* EXTPROTO */
1607void 1565void
1608rxvt_get_ttymode(ttymode_t *tio, int erase) 1566rxvt_get_ttymode (ttymode_t *tio, int erase)
1609{ 1567{
1610#ifdef HAVE_TERMIOS_H 1568#ifdef HAVE_TERMIOS_H
1611 /* 1569 /*
1612 * standard System V termios interface 1570 * standard System V termios interface
1613 */ 1571 */
1614 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1572 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1615 { 1573 {
1616 /* return error - use system defaults */ 1574 /* return error - use system defaults */
1617 tio->c_cc[VINTR] = CINTR; 1575 tio->c_cc[VINTR] = CINTR;
1618 tio->c_cc[VQUIT] = CQUIT; 1576 tio->c_cc[VQUIT] = CQUIT;
1619 tio->c_cc[VERASE] = CERASE; 1577 tio->c_cc[VERASE] = CERASE;
… …
1693 /* 1651 /*
1694 * sgtty interface 1652 * sgtty interface
1695 */ 1653 */
1696 1654
1697 /* get parameters -- gtty */ 1655 /* get parameters -- gtty */
1698 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1656 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1699 { 1657 {
1700 tio->sg.sg_erase = CERASE; /* ^H */ 1658 tio->sg.sg_erase = CERASE; /* ^H */
1701 tio->sg.sg_kill = CKILL; /* ^U */ 1659 tio->sg.sg_kill = CKILL; /* ^U */
1702 } 1660 }
1703 if (erase != -1) 1661 if (erase != -1)
1704 tio->sg.sg_erase = (char)erase; 1662 tio->sg.sg_erase = (char)erase;
1705 1663
1706 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1664 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1707 1665
1708 /* get special characters */ 1666 /* get special characters */
1709 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1710 { 1668 {
1711 tio->tc.t_intrc = CINTR; /* ^C */ 1669 tio->tc.t_intrc = CINTR; /* ^C */
1712 tio->tc.t_quitc = CQUIT; /* ^\ */ 1670 tio->tc.t_quitc = CQUIT; /* ^\ */
1713 tio->tc.t_startc = CSTART; /* ^Q */ 1671 tio->tc.t_startc = CSTART; /* ^Q */
1714 tio->tc.t_stopc = CSTOP; /* ^S */ 1672 tio->tc.t_stopc = CSTOP; /* ^S */
1715 tio->tc.t_eofc = CEOF; /* ^D */ 1673 tio->tc.t_eofc = CEOF; /* ^D */
1716 tio->tc.t_brkc = -1; 1674 tio->tc.t_brkc = -1;
1717 } 1675 }
1718 /* get local special chars */ 1676 /* get local special chars */
1719 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1677 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1720 { 1678 {
1721 tio->lc.t_suspc = CSUSP; /* ^Z */ 1679 tio->lc.t_suspc = CSUSP; /* ^Z */
1722 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1680 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1723 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1681 tio->lc.t_rprntc = CRPRNT; /* ^R */
1724 tio->lc.t_flushc = CFLUSH; /* ^O */ 1682 tio->lc.t_flushc = CFLUSH; /* ^O */
1725 tio->lc.t_werasc = CWERASE; /* ^W */ 1683 tio->lc.t_werasc = CWERASE; /* ^W */
1726 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1684 tio->lc.t_lnextc = CLNEXT; /* ^V */
1727 } 1685 }
1728 /* get line discipline */ 1686 /* get line discipline */
1729 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1687 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1730# ifdef NTTYDISC 1688# ifdef NTTYDISC
1731 1689
1732 tio->line = NTTYDISC; 1690 tio->line = NTTYDISC;
1733# endif /* NTTYDISC */ 1691# endif /* NTTYDISC */
1734 1692
… …
1739 * Debugging 1697 * Debugging
1740 */ 1698 */
1741#ifdef DEBUG_TTYMODE 1699#ifdef DEBUG_TTYMODE
1742#ifdef HAVE_TERMIOS_H 1700#ifdef HAVE_TERMIOS_H
1743 /* c_iflag bits */ 1701 /* c_iflag bits */
1744 fprintf(stderr, "Input flags\n"); 1702 fprintf (stderr, "Input flags\n");
1745 1703
1746 /* cpp token stringize doesn't work on all machines <sigh> */ 1704 /* cpp token stringize doesn't work on all machines <sigh> */
1747# define FOO(flag,name) \ 1705# define FOO(flag,name) \
1748 if ((tio->c_iflag) & flag) \ 1706 if ((tio->c_iflag) & flag) \
1749 fprintf (stderr, "%s ", name) 1707 fprintf (stderr, "%s ", name)
1750 1708
1751 /* c_iflag bits */ 1709 /* c_iflag bits */
1752 FOO(IGNBRK, "IGNBRK"); 1710 FOO (IGNBRK, "IGNBRK");
1753 FOO(BRKINT, "BRKINT"); 1711 FOO (BRKINT, "BRKINT");
1754 FOO(IGNPAR, "IGNPAR"); 1712 FOO (IGNPAR, "IGNPAR");
1755 FOO(PARMRK, "PARMRK"); 1713 FOO (PARMRK, "PARMRK");
1756 FOO(INPCK, "INPCK"); 1714 FOO (INPCK, "INPCK");
1757 FOO(ISTRIP, "ISTRIP"); 1715 FOO (ISTRIP, "ISTRIP");
1758 FOO(INLCR, "INLCR"); 1716 FOO (INLCR, "INLCR");
1759 FOO(IGNCR, "IGNCR"); 1717 FOO (IGNCR, "IGNCR");
1760 FOO(ICRNL, "ICRNL"); 1718 FOO (ICRNL, "ICRNL");
1761 FOO(IXON, "IXON"); 1719 FOO (IXON, "IXON");
1762 FOO(IXOFF, "IXOFF"); 1720 FOO (IXOFF, "IXOFF");
1763# ifdef IUCLC 1721# ifdef IUCLC
1764 1722
1765 FOO(IUCLC, "IUCLC"); 1723 FOO (IUCLC, "IUCLC");
1766# endif 1724# endif
1767# ifdef IXANY 1725# ifdef IXANY
1768 1726
1769 FOO(IXANY, "IXANY"); 1727 FOO (IXANY, "IXANY");
1770# endif 1728# endif
1771# ifdef IMAXBEL 1729# ifdef IMAXBEL
1772 1730
1773 FOO(IMAXBEL, "IMAXBEL"); 1731 FOO (IMAXBEL, "IMAXBEL");
1774# endif 1732# endif
1775 1733
1776 fprintf(stderr, "\n"); 1734 fprintf (stderr, "\n");
1777 1735
1778# undef FOO 1736# undef FOO
1779# define FOO(entry, name) \ 1737# define FOO(entry, name) \
1780 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1738 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1781 1739
1782 FOO(VINTR, "VINTR"); 1740 FOO (VINTR, "VINTR");
1783 FOO(VQUIT, "VQUIT"); 1741 FOO (VQUIT, "VQUIT");
1784 FOO(VERASE, "VERASE"); 1742 FOO (VERASE, "VERASE");
1785 FOO(VKILL, "VKILL"); 1743 FOO (VKILL, "VKILL");
1786 FOO(VEOF, "VEOF"); 1744 FOO (VEOF, "VEOF");
1787 FOO(VEOL, "VEOL"); 1745 FOO (VEOL, "VEOL");
1788# ifdef VEOL2 1746# ifdef VEOL2
1789 1747
1790 FOO(VEOL2, "VEOL2"); 1748 FOO (VEOL2, "VEOL2");
1791# endif 1749# endif
1792# ifdef VSWTC 1750# ifdef VSWTC
1793 1751
1794 FOO(VSWTC, "VSWTC"); 1752 FOO (VSWTC, "VSWTC");
1795# endif 1753# endif
1796# ifdef VSWTCH 1754# ifdef VSWTCH
1797 1755
1798 FOO(VSWTCH, "VSWTCH"); 1756 FOO (VSWTCH, "VSWTCH");
1799# endif 1757# endif
1800 1758
1801 FOO(VSTART, "VSTART"); 1759 FOO (VSTART, "VSTART");
1802 FOO(VSTOP, "VSTOP"); 1760 FOO (VSTOP, "VSTOP");
1803 FOO(VSUSP, "VSUSP"); 1761 FOO (VSUSP, "VSUSP");
1804# ifdef VDSUSP 1762# ifdef VDSUSP
1805 1763
1806 FOO(VDSUSP, "VDSUSP"); 1764 FOO (VDSUSP, "VDSUSP");
1807# endif 1765# endif
1808# ifdef VREPRINT 1766# ifdef VREPRINT
1809 1767
1810 FOO(VREPRINT, "VREPRINT"); 1768 FOO (VREPRINT, "VREPRINT");
1811# endif 1769# endif
1812# ifdef VDISCRD 1770# ifdef VDISCRD
1813 1771
1814 FOO(VDISCRD, "VDISCRD"); 1772 FOO (VDISCRD, "VDISCRD");
1815# endif 1773# endif
1816# ifdef VWERSE 1774# ifdef VWERSE
1817 1775
1818 FOO(VWERSE, "VWERSE"); 1776 FOO (VWERSE, "VWERSE");
1819# endif 1777# endif
1820# ifdef VLNEXT 1778# ifdef VLNEXT
1821 1779
1822 FOO(VLNEXT, "VLNEXT"); 1780 FOO (VLNEXT, "VLNEXT");
1823# endif 1781# endif
1824 1782
1825 fprintf(stderr, "\n"); 1783 fprintf (stderr, "\n");
1826# undef FOO 1784# undef FOO
1827# endif /* HAVE_TERMIOS_H */ 1785# endif /* HAVE_TERMIOS_H */
1828#endif /* DEBUG_TTYMODE */ 1786#endif /* DEBUG_TTYMODE */
1829} 1787}
1830 1788

Diff Legend

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