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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.144 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.161 by root, Wed Jan 4 20:43:38 2006 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
162 sw_term (this, &rxvt_term::sig_term),
163 sw_int (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 178 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
… …
196 pty.put (); 206 pty.put ();
197} 207}
198 208
199rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
200{ 210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 214
203 emergency_cleanup (); 215 emergency_cleanup ();
204 216
205#if ENABLE_STYLES 217#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 220 delete fontset[i];
209#endif 221#endif
210 delete TermWin.fontset[0]; 222 delete fontset[0];
211 223
212 if (display) 224 if (display)
213 { 225 {
214 dDisp; 226 dDisp;
215 227
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 259#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
249 261
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 263 delete menuBar.drawable;
252 //if (menuBar.win) 264 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
254#endif 266#endif
255 delete TermWin.drawable; 267 delete drawable;
256 // destroy all windows 268 // destroy all windows
257 if (TermWin.parent[0]) 269 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
259 } 271 }
260 272
261 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
262 274
263 delete pix_colors_focused; 275 delete pix_colors_focused;
264#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
266#endif 278#endif
267 279
268 displays.put (display); 280 displays.put (display);
269 281
… …
287 delete argv; 299 delete argv;
288 300
289#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
290 delete keyboard; 302 delete keyboard;
291#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
292} 313}
293 314
294void 315void
295rxvt_term::destroy () 316rxvt_term::destroy ()
296{ 317{
… …
417{ 438{
418 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
420 else 441 else
421 { 442 {
422 //TODO: GET_R is most likely not the terminal which caused the error 443 // GET_R is most likely not the terminal which caused the error,
423 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
424#if ENABLE_FRILLS 445#if ENABLE_FRILLS
425 print_x_error (display, event); 446 print_x_error (display, event);
426#else 447#else
427 old_xerror_handler (display, event); 448 old_xerror_handler (display, event);
428#endif 449#endif
… …
438 DisplayString (display)); 459 DisplayString (display));
439 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
441} 462}
442 463
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 465bool
460rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
461{ 467{
462 SET_R (this); 468 SET_R (this);
463 469
… …
476 482
477#if MENUBAR_MAX 483#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
479#endif 485#endif
480#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END));
498 }
483#endif 499#endif
484 500
485 create_windows (argc, argv); 501 create_windows (argc, argv);
486 502
487 dDisp; 503 dDisp;
… …
493#if 0 509#if 0
494 XSynchronize (disp, True); 510 XSynchronize (disp, True);
495#endif 511#endif
496 512
497#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 514 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 515 resize_scrollbar (); /* create and map scrollbar */
500#endif 516#endif
501#if (MENUBAR_MAX) 517#if (MENUBAR_MAX)
502 if (menubar_visible ()) 518 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win); 519 XMapWindow (disp, menuBar.win);
504#endif 520#endif
505#ifdef TRANSPARENT 521#ifdef TRANSPARENT
506 if (options & Opt_transparent) 522 if (OPTION (Opt_transparent))
507 { 523 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 524 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 525 check_our_parents ();
510 rootwin_ev.start (display, display->root); 526 rootwin_ev.start (display, display->root);
511 } 527 }
512#endif 528#endif
513 529
514 XMapWindow (disp, TermWin.vt); 530 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 531 XMapWindow (disp, parent[0]);
516 532
517 set_colorfgbg (); 533 set_colorfgbg ();
518 534
519 init_command (cmd_argv); 535 init_command (cmd_argv);
520 536
… …
522 538
523 pty_ev.start (pty.pty, EVENT_READ); 539 pty_ev.start (pty.pty, EVENT_READ);
524 540
525 check_ev.start (); 541 check_ev.start ();
526 542
543 PERL_INVOKE ((this, HOOK_START, DT_END));
544
527 return true; 545 return true;
528} 546}
547
548static struct sig_handlers
549{
550 sig_watcher sw_chld, sw_term, sw_int;
551
552 void sig_chld (sig_watcher &w)
553 {
554 // we are being called for every SIGCHLD, find the corresponding term
555 int pid;
556
557 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
558 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
559 if (pid == (*t)->cmd_pid)
560 {
561 (*t)->child_exit ();
562 break;
563 }
564 }
565
566 /*
567 * Catch a fatal signal and tidy up before quitting
568 */
569 void
570 sig_term (sig_watcher &w)
571 {
572#ifdef DEBUG_CMD
573 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
574#endif
575 rxvt_emergency_cleanup ();
576 signal (w.signum, SIG_DFL);
577 kill (getpid (), w.signum);
578 }
579
580 sig_handlers ()
581 : sw_chld (this, &sig_handlers::sig_chld),
582 sw_term (this, &sig_handlers::sig_term),
583 sw_int (this, &sig_handlers::sig_term)
584 {
585 }
586} sig_handlers;
529 587
530void 588void
531rxvt_init () 589rxvt_init ()
532{ 590{
533 /* 591 /*
… …
541 rxvt_privileges (IGNORE); 599 rxvt_privileges (IGNORE);
542 600
543 signal (SIGHUP, SIG_IGN); 601 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 602 signal (SIGPIPE, SIG_IGN);
545 603
604 sig_handlers.sw_chld.start (SIGCHLD);
605 sig_handlers.sw_term.start (SIGTERM);
606 sig_handlers.sw_int.start (SIGINT);
607
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 608 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 609 /* signal (SIGURG, SIG_DFL); */
548 610
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 612 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 613 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553
554/* ------------------------------------------------------------------------- *
555 * SIGNAL HANDLING & EXIT HANDLER *
556 * ------------------------------------------------------------------------- */
557/*
558 * Catch a SIGCHLD signal and exit if the direct child has died
559 */
560
561void
562rxvt_term::sig_chld (sig_watcher &w)
563{
564 // we are being called for every SIGCHLD, not just ours
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->destroy ();
572 break;
573 }
574} 614}
575 615
576/* ------------------------------------------------------------------------- * 616/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 617 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 618 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
586 626
587 return p; 627 return p;
588} 628}
589 629
590void * 630void *
591rxvt_calloc (size_t number, size_t size) 631rxvt_calloc (size_t number, size_t size)
592{ 632{
593 void *p = calloc (number, size); 633 void *p = calloc (number, size);
594 634
595 if (!p) 635 if (!p)
… …
666 706
667#ifdef UTMP_SUPPORT 707#ifdef UTMP_SUPPORT
668void 708void
669rxvt_term::privileged_utmp (rxvt_privaction action) 709rxvt_term::privileged_utmp (rxvt_privaction action)
670{ 710{
671 if ((options & Opt_utmpInhibit) 711 if (OPTION (Opt_utmpInhibit)
672 || !pty.name || !*pty.name) 712 || !pty.name || !*pty.name)
673 return; 713 return;
674 714
675 rxvt_privileges (RESTORE); 715 rxvt_privileges (RESTORE);
676 716
… …
687/* 727/*
688 * window size/position calculcations for XSizeHint and other storage. 728 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 729 * if width/height are non-zero then override calculated width/height
690 */ 730 */
691void 731void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 732rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 733{
694 short recalc_x, recalc_y; 734 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 735 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 736 unsigned int w, h;
697 unsigned int max_width, max_height; 737 unsigned int max_width, max_height;
698 dDisp; 738 dDisp;
699 739
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 740 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 741 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 742
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 743 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 744 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 745 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 746
707 recalc_x = recalc_y = 0; 747 recalc_x = recalc_y = 0;
708 flags = 0; 748 flags = 0;
749
709 if (!parsed_geometry) 750 if (!parsed_geometry)
710 { 751 {
711 parsed_geometry = 1; 752 parsed_geometry = 1;
753
712 if (rs[Rs_geometry]) 754 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 755 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 756
715 if (flags & WidthValue) 757 if (flags & WidthValue)
716 { 758 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 759 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 760 szHint.flags |= USSize;
719 } 761 }
720 762
721 if (flags & HeightValue) 763 if (flags & HeightValue)
722 { 764 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 765 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 766 szHint.flags |= USSize;
725 } 767 }
726 768
727 if (flags & XValue) 769 if (flags & XValue)
728 { 770 {
729 szHint.x = x; 771 szHint.x = x;
730 szHint.flags |= USPosition; 772 szHint.flags |= USPosition;
773
731 if (flags & XNegative) 774 if (flags & XNegative)
732 { 775 {
733 recalc_x = 1; 776 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 777 szHint.win_gravity = NorthEastGravity;
735 } 778 }
… …
737 780
738 if (flags & YValue) 781 if (flags & YValue)
739 { 782 {
740 szHint.y = y; 783 szHint.y = y;
741 szHint.flags |= USPosition; 784 szHint.flags |= USPosition;
785
742 if (flags & YNegative) 786 if (flags & YNegative)
743 { 787 {
744 recalc_y = 1; 788 recalc_y = 1;
789
745 if (szHint.win_gravity == NorthEastGravity) 790 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 791 szHint.win_gravity = SouthEastGravity;
747 else 792 else
748 szHint.win_gravity = SouthWestGravity; 793 szHint.win_gravity = SouthWestGravity;
749 } 794 }
750 } 795 }
751 } 796 }
752 797
753 /* TODO: BOUNDS */ 798 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 799 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 800 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 801 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 802 max_height = MAX_ROWS * fheight;
758 803
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 804 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 805
761 sb_w = mb_h = 0; 806 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 807 window_vt_x = window_vt_y = int_bwidth;
763 808
764 if (scrollbar_visible ()) 809 if (scrollbar_visible ())
765 { 810 {
766 sb_w = scrollbar_TotalWidth (); 811 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 812 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 813 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 814 window_vt_x += sb_w;
770 } 815 }
771 816
772 if (menubar_visible ()) 817 if (menubar_visible ())
773 { 818 {
774 mb_h = menuBar_TotalHeight (); 819 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 820 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 821 window_vt_y += mb_h;
777 } 822 }
778 823
779 szHint.width_inc = TermWin.fwidth; 824 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 825 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 826 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 827 szHint.min_height = szHint.base_height + szHint.height_inc;
783 828
784 if (width && width - szHint.base_width < max_width) 829 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 830 {
786 szHint.width = width; 831 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 832 width = newwidth - szHint.base_width;
788 } 833 }
789 else 834 else
790 { 835 {
791 MIN_IT (TermWin.width, max_width); 836 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 837 szHint.width = szHint.base_width + width;
793 } 838 }
794 839
795 if (height && height - szHint.base_height < max_height) 840 if (newheight && newheight - szHint.base_height < max_height)
796 { 841 {
797 szHint.height = height; 842 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 843 height = newheight - szHint.base_height;
799 } 844 }
800 else 845 else
801 { 846 {
802 MIN_IT (TermWin.height, max_height); 847 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 848 szHint.height = szHint.base_height + height;
804 } 849 }
805 850
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 851 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 852 window_sb_x = szHint.width - sb_w;
808 853
809 if (recalc_x) 854 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 855 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 856 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 857 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 858
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 859 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 860 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 861 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 862 ncol, nrow, szHint.width,
820 szHint.height)); 863 szHint.height));
821 return; 864 return;
822} 865}
823 866
824/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 875 if (pty.pty < 0)
833 return; 876 return;
834 877
835 struct winsize ws; 878 struct winsize ws;
836 879
837 ws.ws_col = TermWin.ncol; 880 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 881 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 882 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 883 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 884 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 885
843#if 0 886#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 887 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 888 if (cmd_pid) /* force through to the command */
… …
847#endif 890#endif
848} 891}
849 892
850/*----------------------------------------------------------------------*/ 893/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 894/* set_fonts () - load and set the various fonts
852/* 895 *
853 * init = 1 - initialize 896 * init = 1 - initialize
854 * 897 *
855 * fontname == FONT_UP - switch to bigger font 898 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 899 * fontname == FONT_DN - switch to smaller font
857 */ 900 */
… …
869 return false; 912 return false;
870 } 913 }
871 914
872#if ENABLE_STYLES 915#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 916 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 917 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 918 delete fontset[i];
876#endif 919#endif
877 920
878 delete TermWin.fontset[0]; 921 delete fontset[0];
879 TermWin.fontset[0] = fs; 922 fontset[0] = fs;
880 923
881 prop = (*fs)[1]->properties (); 924 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 925 prop.height += lineSpace;
883 fs->set_prop (prop); 926 fs->set_prop (prop);
884 927
885 TermWin.fwidth = prop.width; 928 fwidth = prop.width;
886 TermWin.fheight = prop.height; 929 fheight = prop.height;
887 TermWin.fweight = prop.weight; 930 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 931
891 for (int style = 1; style < 4; style++) 932 for (int style = 1; style < 4; style++)
892 { 933 {
893#if ENABLE_STYLES 934#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 935 const char *res = rs[Rs_font + style];
895 936
896 if (res && !*res) 937 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 938 fontset[style] = fontset[0];
898 else 939 else
899 { 940 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 941 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 942 rxvt_fontprop prop2 = prop;
902 943
903 if (res) 944 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 945 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 946 else
906 { 947 {
907 res = TermWin.fontset[0]->fontdesc; 948 res = fontset[0]->fontdesc;
908 949
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 950 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
910 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 951 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 952 }
912 953
913 fs->populate (res); 954 fs->populate (res);
914 fs->set_prop (prop2); 955 fs->set_prop (prop2);
915 } 956 }
916#else 957#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 958 fontset[style] = fontset[0];
918#endif 959#endif
919 } 960 }
920 961
921 if (TermWin.parent[0]) 962 if (parent[0])
922 { 963 {
923 resize_all_windows (0, 0, 0); 964 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 965 scr_remap_chars ();
925 scr_touch (true); 966 scr_touch (true);
926 } 967 }
… …
928 return true; 969 return true;
929} 970}
930 971
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 972void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 973{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 974 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 975 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 976 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 977}
938 978
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 979void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 980{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 981 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 982 char *s = rxvt_wcstoutf8 (ws);
944 983
945 XChangeProperty (display->display, TermWin.parent[0], 984 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 985 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 986 (const unsigned char *)s, strlen (s));
948 987
949 free (s); 988 free (s);
950 free (ws); 989 free (ws);
… …
987 i = atoi (color); 1026 i = atoi (color);
988 1027
989 if (i >= 8 && i <= 15) 1028 if (i >= 8 && i <= 15)
990 { /* bright colors */ 1029 { /* bright colors */
991 i -= 8; 1030 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1031 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 1032 SET_PIXCOLOR (idx);
995 goto Done; 1033 goto done;
996# endif
997 } 1034 }
998 1035
999 if (i >= 0 && i <= 7) 1036 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 1037 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1002 SET_PIXCOLOR (idx); 1039 SET_PIXCOLOR (idx);
1003 goto Done; 1040 goto done;
1004 } 1041 }
1005 } 1042 }
1006 1043
1007 if (!rXParseAllocColor (&xcol, color)) 1044 if (!rXParseAllocColor (&xcol, color))
1008 return; 1045 return;
… …
1028 pix_colors_focused[idx] = xcol; 1065 pix_colors_focused[idx] = xcol;
1029 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1030 1067
1031 /* XSetWindowAttributes attr; */ 1068 /* XSetWindowAttributes attr; */
1032 /* Cursor cursor; */ 1069 /* Cursor cursor; */
1033Done: 1070done:
1071
1034#ifdef OFF_FOCUS_FADING 1072#if OFF_FOCUS_FADING
1035 if (rs[Rs_fade]) 1073 if (rs[Rs_fade])
1036 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1074 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1037#endif 1075#endif
1038 1076
1039 /*TODO: handle Color_BD, scrollbar background, etc. */ 1077 /*TODO: handle Color_BD, scrollbar background, etc. */
1040 1078
1041 recolour_cursor (); 1079 recolour_cursor ();
… …
1112 1150
1113/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
1114 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
1115 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
1116void 1154void
1117rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1118{ 1156{
1119 int fix_screen; 1157 int fix_screen;
1120#ifdef SMART_RESIZE
1121 int old_width = szHint.width, old_height = szHint.height; 1158 int old_width = szHint.width, old_height = szHint.height;
1122#endif
1123 dDisp; 1159 dDisp;
1124 1160
1125 window_calc (width, height); 1161 window_calc (newwidth, newheight);
1126 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1162 XSetWMNormalHints (disp, parent[0], &szHint);
1127 1163
1128 if (!ignoreparent) 1164 if (!ignoreparent)
1129 { 1165 {
1130#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
1131 /* 1167 /*
… …
1135 int x, y, x1, y1; 1171 int x, y, x1, y1;
1136 int dx, dy; 1172 int dx, dy;
1137 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1138 Window unused_cr; 1174 Window unused_cr;
1139 1175
1140 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1176 XTranslateCoordinates (disp, parent[0], display->root,
1141 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
1142 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1143 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1144 /* 1180 /*
1145 * if display->root isn't the parent window, a WM will probably have offset 1181 * if display->root isn't the parent window, a WM will probably have offset
1146 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
1147 */ 1183 */
… …
1164 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
1165 dy = 0; 1201 dy = 0;
1166 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
1167 dy /= 2; 1203 dy /= 2;
1168 1204
1169 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1170 szHint.width, szHint.height); 1206 szHint.width, szHint.height);
1171#else 1207#else
1172 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1173#endif 1209#endif
1174 } 1210 }
1175 1211
1176 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1177 1213
1178 if (fix_screen || width != old_width || height != old_height) 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1179 { 1215 {
1180 if (scrollbar_visible ()) 1216 if (scrollbar_visible ())
1181 { 1217 {
1182 XMoveResizeWindow (disp, scrollBar.win, 1218 XMoveResizeWindow (disp, scrollBar.win,
1183 window_sb_x, 0, 1219 window_sb_x, 0,
… …
1186 } 1222 }
1187 1223
1188 if (menubar_visible ()) 1224 if (menubar_visible ())
1189 XMoveResizeWindow (disp, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1190 window_vt_x, 0, 1226 window_vt_x, 0,
1191 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 width, menuBar_TotalHeight ());
1192 1228
1193 XMoveResizeWindow (disp, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1194 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1195 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 width, height);
1196 1232
1197 scr_clear (); 1233 scr_clear ();
1198#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1199 resize_pixmap (); 1235 resize_pixmap ();
1200#endif 1236#endif
… …
1206 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1207 1243
1208 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1209 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1210 { 1246 {
1211 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1212 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1213 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1214 TermWin.ncol = ncol; 1250 ncol = ocol;
1215 } 1251 }
1216 1252
1217 scr_reset (); 1253 scr_reset ();
1218 1254
1219 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1220 { 1256 {
1221 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1222 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1223 } 1259 }
1224 } 1260 }
1225 1261
1226 old_width = szHint.width; 1262 old_width = szHint.width;
1227 old_height = szHint.height; 1263 old_height = szHint.height;
1228 1264
1229#ifdef XPM_BACKGROUND 1265#ifdef XPM_BACKGROUND
1230 if (TermWin.pixmap) 1266 if (pixmap)
1231 scr_touch (false); 1267 scr_touch (false);
1232#endif 1268#endif
1233 1269
1234#ifdef USE_XIM 1270#ifdef USE_XIM
1235 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
… …
1239/* 1275/*
1240 * Set the width/height of the vt window in characters. Units are pixels. 1276 * Set the width/height of the vt window in characters. Units are pixels.
1241 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1242 */ 1278 */
1243void 1279void
1244rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1245{ 1281{
1246 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1247 1283
1248 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1249 { 1285 {
1250 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1251 1287
1252 if (width == 0) 1288 if (newwidth == 0)
1253 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1254 if (height == 0) 1290 if (newheight == 0)
1255 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1256 }
1257
1258 if (width != TermWin.width || height != TermWin.height)
1259 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1260 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1261 height += szHint.base_height; 1297 newheight += szHint.base_height;
1262 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1263 } 1299 }
1264} 1300}
1265 1301
1266/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1267 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1277 1313
1278void 1314void
1279rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1280{ 1316{
1281 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1282 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1283 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1284 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1285 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1286} 1322}
1287 1323
1288void 1324void
1289rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1290 XRectangle &status_rect, 1326 XRectangle &status_rect,
1291 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1292{ 1328{
1293 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1294 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1295 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1296 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1297 1333
1298 status_rect.x = 0; 1334 status_rect.x = 0;
1299 status_rect.y = 0; 1335 status_rect.y = 0;
1300 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1336 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1301 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1302} 1338}
1303 1339
1304/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1305bool 1341bool
1306rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1334{ 1370{
1335 XPoint nspot; 1371 XPoint nspot;
1336 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1337 1373
1338 if (!Input_Context 1374 if (!Input_Context
1339 || !TermWin.focus 1375 || !focus
1340 || !(input_style & XIMPreeditPosition)) 1376 || !(input_style & XIMPreeditPosition))
1341 return; 1377 return;
1342 1378
1343 im_set_position (nspot); 1379 im_set_position (nspot);
1344 1380
… …
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "*", 1504 "*",
1469 TermWin.fheight, 1505 fheight,
1470 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1471 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1472 1508
1473 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1474 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1475 1511
1476 if (missing_charset_list) 1512 if (missing_charset_list)
… …
1522 NULL); 1558 NULL);
1523 } 1559 }
1524 1560
1525 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1526 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1527 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1528 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1529 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1530 preedit_attr, 1566 preedit_attr,
1531 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1532 status_attr, NULL); 1568 status_attr, NULL);
1533 1569
… …
1550} 1586}
1551 1587
1552void 1588void
1553rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1554{ 1590{
1555 int i, found, had_im; 1591 int i;
1556 const char *p; 1592 const char *p;
1557 char **s; 1593 char **s;
1558 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1559 1595
1560 SET_R (this); 1596 SET_R (this);
… …
1617{ 1653{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1620 1656
1621 if (!Input_Context 1657 if (!Input_Context
1622 || !TermWin.focus 1658 || !focus
1623 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1624 || !IMisRunning ()) 1660 || !IMisRunning ())
1625 return; 1661 return;
1626 1662
1627 /* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */

Diff Legend

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