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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.26 by root, Thu Jan 5 21:21:49 2006 UTC vs.
Revision 1.36 by root, Sat Jan 7 19:29:17 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 102
103 return (long)mg->mg_ptr; 103 return (long)mg->mg_ptr;
104} 104}
105 105
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 108
109///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
110 110
111struct perl_watcher 111struct perl_watcher
290void 290void
291overlay::show () 291overlay::show ()
292{ 292{
293 char key[33]; sprintf (key, "%32lx", (long)this); 293 char key[33]; sprintf (key, "%32lx", (long)this);
294 294
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 296 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 297}
298 298
299void 299void
300overlay::hide () 300overlay::hide ()
301{ 301{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 303
304 if (ovs) 304 if (ovs)
305 { 305 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 306 char key[33]; sprintf (key, "%32lx", (long)this);
307 307
415 if (!perl) 415 if (!perl)
416 return false; 416 return false;
417 417
418 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
419 { 419 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 420 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 421 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 422 }
423 else if (!term->self) 423 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 424 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 425 else if (htype == HOOK_DESTROY)
426 { 426 {
427 // handled later 427 // handled later
428 } 428 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 430 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 432
433 if (HvKEYS (hv)) 433 if (HvKEYS (hv))
434 { 434 {
435 hv_iterinit (hv); 435 hv_iterinit (hv);
436 436
465 465
466 case DT_LONG: 466 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 468 break;
469 469
470 case DT_STRING: 470 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
472 break; 472 break;
473 473
474 case DT_USTRING_LEN: 474 case DT_STR_LEN:
475 { 475 {
476 unicode_t *ustr = va_arg (ap, unicode_t *); 476 char *str = va_arg (ap, char *);
477 int ulen = va_arg (ap, int); 477 int len = va_arg (ap, int);
478
479 XPUSHs (sv_2mortal (newSVpvn (str, len)));
480 }
481 break;
482
483 case DT_WCS_LEN:
484 {
478 wchar_t *wstr = new wchar_t [ulen]; 485 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int);
479 487
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); 488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
489 }
490 break;
484 491
485 delete [] wstr; 492 case DT_XEVENT:
486 } 493 {
494 XEvent *xe = va_arg (ap, XEvent *);
495 HV *hv = newHV ();
496
497# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
498# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
499# undef set
500
501 setiv (type, xe->type);
502 setiv (send_event, xe->xany.send_event);
503 setiv (serial, xe->xany.serial);
504
505 switch (xe->type)
506 {
507 case KeyPress:
508 case KeyRelease:
509 case ButtonPress:
510 case ButtonRelease:
511 case MotionNotify:
512 setiv (time, xe->xmotion.time);
513 setiv (x, xe->xmotion.x);
514 setiv (y, xe->xmotion.y);
515 setiv (row, xe->xmotion.y / term->fheight);
516 setiv (col, xe->xmotion.x / term->fwidth);
517 setiv (x_root, xe->xmotion.x_root);
518 setiv (y_root, xe->xmotion.y_root);
519 setiv (state, xe->xmotion.state);
520 break;
521 }
522
523 switch (xe->type)
524 {
525 case KeyPress:
526 case KeyRelease:
527 setiv (keycode, xe->xkey.keycode);
528 break;
529
530 case ButtonPress:
531 case ButtonRelease:
532 setiv (button, xe->xbutton.button);
533 break;
534
535 case MotionNotify:
536 setiv (is_hint, xe->xmotion.is_hint);
537 break;
538 }
539
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
541 }
542 break;
487 543
488 case DT_END: 544 case DT_END:
489 { 545 {
490 va_end (ap); 546 va_end (ap);
491 547
506 if (SvTRUE (ERRSV)) 562 if (SvTRUE (ERRSV))
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 563 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
508 564
509 if (htype == HOOK_DESTROY) 565 if (htype == HOOK_DESTROY)
510 { 566 {
511 clearSVptr ((SV *)term->self); 567 clearSVptr ((SV *)term->perl.self);
512 SvREFCNT_dec ((SV *)term->self); 568 SvREFCNT_dec ((SV *)term->perl.self);
513 } 569 }
514 570
515 return count; 571 return count;
516 } 572 }
517 573
540 export_const (RS_Bold); 596 export_const (RS_Bold);
541 export_const (RS_Italic); 597 export_const (RS_Italic);
542 export_const (RS_Blink); 598 export_const (RS_Blink);
543 export_const (RS_RVid); 599 export_const (RS_RVid);
544 export_const (RS_Uline); 600 export_const (RS_Uline);
601 export_const (CurrentTime);
545 602
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 603 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
547} 604}
605
606SV *
607new (...)
608 CODE:
609{
610 stringvec *argv = new stringvec;
611 bool success;
612
613 for (int i = 0; i < items ;i++)
614 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
615
616 rxvt_term *term = new rxvt_term;
617
618 term->argv = argv;
619
620 try
621 {
622 if (!term->init (argv->size (), argv->begin ()))
623 term = 0;
624 }
625 catch (const class rxvt_failure_exception &e)
626 {
627 term->destroy ();
628 croak ("exception caught while initializing new terminal instance");
629 }
630
631 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
632}
633 OUTPUT:
634 RETVAL
548 635
549void 636void
550set_should_invoke (int htype, int value) 637set_should_invoke (int htype, int value)
551 CODE: 638 CODE:
552 rxvt_perl.should_invoke [htype] = value; 639 rxvt_perl.should_invoke [htype] = value;
615} 702}
616 OUTPUT: 703 OUTPUT:
617 RETVAL 704 RETVAL
618 705
619MODULE = urxvt PACKAGE = urxvt::term 706MODULE = urxvt PACKAGE = urxvt::term
707
708void
709rxvt_term::destroy ()
710
711void
712rxvt_term::grab_button (int button, U32 modifiers)
713 CODE:
714 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
715 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
716 GrabModeSync, GrabModeSync, None, None);
717
718bool
719rxvt_term::grab (U32 eventtime, int sync = 0)
720 CODE:
721{
722 int mode = sync ? GrabModeSync : GrabModeAsync;
723
724 THIS->perl.grabtime = 0;
725
726 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
727 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
728 mode, mode, None, None, eventtime))
729 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
730 THIS->perl.grabtime = eventtime;
731 else
732 XUngrabPointer (THIS->display->display, eventtime);
733
734 RETVAL = !!THIS->perl.grabtime;
735}
736 OUTPUT:
737 RETVAL
738
739void
740rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
741 CODE:
742 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
743
744void
745rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
746 CODE:
747 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
748
749void
750rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
751 CODE:
752 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
753 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
754
755void
756rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
757 CODE:
758 THIS->perl.grabtime = 0;
759 XUngrabKeyboard (THIS->display->display, eventtime);
760 XUngrabPointer (THIS->display->display, eventtime);
620 761
621int 762int
622rxvt_term::strwidth (SV *str) 763rxvt_term::strwidth (SV *str)
623 CODE: 764 CODE:
624{ 765{
703 RETVAL = *(int *)((char *)THIS + ix); 844 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 845 OUTPUT:
705 RETVAL 846 RETVAL
706 847
707U32 848U32
849rxvt_term::parent ()
850 CODE:
851 RETVAL = (U32)THIS->parent [0];
852 OUTPUT:
853 RETVAL
854
855U32
856rxvt_term::vt ()
857 CODE:
858 RETVAL = (U32)THIS->vt;
859 OUTPUT:
860 RETVAL
861
862U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 863rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 864 CODE:
710{ 865{
711 RETVAL = THIS->rstyle; 866 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle; 867 THIS->rstyle = new_rstyle;
733rxvt_term::want_refresh () 888rxvt_term::want_refresh ()
734 CODE: 889 CODE:
735 THIS->want_refresh = 1; 890 THIS->want_refresh = 1;
736 891
737void 892void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 893rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
739 PPCODE: 894 PPCODE:
740{ 895{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 896 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 897 XSRETURN_EMPTY;
743 898
745 900
746 if (GIMME_V != G_VOID) 901 if (GIMME_V != G_VOID)
747 { 902 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 903 wchar_t *wstr = new wchar_t [THIS->ncol];
749 904
750 for (int col = 0; col <THIS->ncol; col++) 905 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 906 wstr [col] = l.t [col];
752 907
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 908 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
754 909
755 delete [] wstr; 910 delete [] wstr;
756 } 911 }
757 912
758 if (new_text) 913 if (new_text)
759 { 914 {
760 wchar_t *wstr = sv2wcs (new_text); 915 wchar_t *wstr = sv2wcs (new_text);
761 916
762 int len = wcslen (wstr); 917 int len = min (wcslen (wstr) - start_ofs, max_len);
763 918
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 919 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 { 920 {
766 free (wstr); 921 free (wstr);
767 croak ("new_text extends beyond horizontal margins"); 922 croak ("new_text extends beyond horizontal margins");
768 } 923 }
769 924
770 for (int col = start_col; col < start_col + len; col++) 925 for (int col = start_col; col < start_col + len; col++)
771 { 926 {
772 l.t [col] = wstr [col - start_col]; 927 l.t [col] = wstr [start_ofs + col - start_col];
773 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 928 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 } 929 }
775 930
776 free (wstr); 931 free (wstr);
777 } 932 }
778} 933}
779 934
780void 935void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 936rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
782 PPCODE: 937 PPCODE:
783{ 938{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 939 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY; 940 XSRETURN_EMPTY;
786 941
801 { 956 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 957 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref"); 958 croak ("new_rend must be arrayref");
804 959
805 AV *av = (AV *)SvRV (new_rend); 960 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1; 961 int len = min (av_len (av) + 1 - start_ofs, max_len);
807 962
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 963 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins"); 964 croak ("new_rend array extends beyond horizontal margins");
810 965
811 for (int col = start_col; col < start_col + len; col++) 966 for (int col = start_col; col < start_col + len; col++)
812 { 967 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 968 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
814 969
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 970 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 } 971 }
817 } 972 }
818} 973}
848} 1003}
849 OUTPUT: 1004 OUTPUT:
850 RETVAL 1005 RETVAL
851 1006
852SV * 1007SV *
853rxvt_term::special_encode (SV *str) 1008rxvt_term::special_encode (SV *string)
854 CODE: 1009 CODE:
855 abort ();//TODO 1010{
1011 wchar_t *wstr = sv2wcs (string);
1012 int wlen = wcslen (wstr);
1013 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1014
1015 rxvt_push_locale (THIS->locale);
1016
1017 wchar_t *r = rstr;
1018 for (wchar_t *s = wstr; *s; s++)
1019 if (wcwidth (*s) == 0)
1020 {
1021 if (r == rstr)
1022 croak ("leading combining character unencodable");
1023
1024 unicode_t n = rxvt_compose (r[-1], *s);
1025 if (n == NOCHAR)
1026 n = rxvt_composite.compose (r[-1], *s);
1027
1028 r[-1] = n;
1029 }
1030#if !UNICODE_3
1031 else if (*s >= 0x10000)
1032 *r++ = rxvt_composite.compose (*s);
1033#endif
1034 else
1035 *r++ = *s;
1036
1037 rxvt_pop_locale ();
1038
1039 RETVAL = wcs2sv (rstr, r - rstr);
1040
1041 delete [] rstr;
1042}
1043 OUTPUT:
1044 RETVAL
856 1045
857SV * 1046SV *
858rxvt_term::special_decode (SV *str) 1047rxvt_term::special_decode (SV *text)
859 CODE: 1048 CODE:
860 abort ();//TODO 1049{
1050 wchar_t *wstr = sv2wcs (text);
1051 int wlen = wcslen (wstr);
1052 int dlen = 0;
1053
1054 // find length
1055 for (wchar_t *s = wstr; *s; s++)
1056 if (*s == NOCHAR)
1057 ;
1058 else if (IS_COMPOSE (*s))
1059 dlen += rxvt_composite.expand (*s, 0);
1060 else
1061 dlen++;
1062
1063 wchar_t *rstr = new wchar_t [dlen];
1064
1065 // decode
1066 wchar_t *r = rstr;
1067 for (wchar_t *s = wstr; *s; s++)
1068 if (*s == NOCHAR)
1069 ;
1070 else if (IS_COMPOSE (*s))
1071 r += rxvt_composite.expand (*s, r);
1072 else
1073 *r++ = *s;
1074
1075 RETVAL = wcs2sv (rstr, r - rstr);
1076
1077 delete [] rstr;
1078}
1079 OUTPUT:
1080 RETVAL
861 1081
862void 1082void
863rxvt_term::_resource (char *name, int index, SV *newval = 0) 1083rxvt_term::_resource (char *name, int index, SV *newval = 0)
864 PPCODE: 1084 PPCODE:
865{ 1085{
930 THIS->want_refresh = 1; 1150 THIS->want_refresh = 1;
931 } 1151 }
932} 1152}
933 1153
934int 1154int
935rxvt_term::selection_grab (int eventtime = CurrentTime) 1155rxvt_term::selection_grab (U32 eventtime)
936 1156
937void 1157void
938rxvt_term::selection (SV *newtext = 0) 1158rxvt_term::selection (SV *newtext = 0)
939 PPCODE: 1159 PPCODE:
940{ 1160{
953void 1173void
954rxvt_term::scr_add_lines (SV *string) 1174rxvt_term::scr_add_lines (SV *string)
955 CODE: 1175 CODE:
956{ 1176{
957 wchar_t *wstr = sv2wcs (string); 1177 wchar_t *wstr = sv2wcs (string);
958 int wlen = wcslen (wstr);
959 unicode_t *ustr = new unicode_t [wlen];
960 int nlines = 0;
961
962 for (int i = wlen; i--; )
963 {
964 ustr [i] = wstr [i];
965 nlines += ustr [i] == '\012';
966 }
967
968 THIS->scr_add_lines (ustr, nlines, wlen); 1178 THIS->scr_add_lines (wstr, wcslen (wstr));
969
970 free (wstr); 1179 free (wstr);
971 delete [] ustr;
972} 1180}
973 1181
974void 1182void
975rxvt_term::tt_write (SV *octets) 1183rxvt_term::tt_write (SV *octets)
976 INIT: 1184 INIT:
977 STRLEN len; 1185 STRLEN len;
978 char *str = SvPVbyte (octets, len); 1186 char *str = SvPVbyte (octets, len);
979 C_ARGS: 1187 C_ARGS:
980 str, len 1188 str, len
981 1189
1190void
1191rxvt_term::cmd_parse (SV *octets)
1192 CODE:
1193{
1194 STRLEN len;
1195 char *str = SvPVbyte (octets, len);
1196
1197 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1198 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1199
1200 THIS->cmdbuf_ptr = str;
1201 THIS->cmdbuf_endp = str + len;
1202
1203 rxvt_push_locale (THIS->locale);
1204 THIS->cmd_parse ();
1205 rxvt_pop_locale ();
1206
1207 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1208 THIS->cmdbuf_endp = old_cmdbuf_endp;
1209}
1210
982SV * 1211SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1212rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE: 1213 CODE:
985{ 1214{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1215 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines