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.23 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.32 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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