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.156 by root, Sun Jun 3 15:54:05 2012 UTC vs.
Revision 1.248 by sf-exg, Sat May 8 06:16:21 2021 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-2008,2011 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2014 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51 51
52///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
53 53
54typedef char * octet_string; 54typedef char * octet_string;
55typedef char * utf8_string; 55typedef char * utf8_string;
56typedef SV * urxvt_color;
57 56
57typedef int render_repeat_mode;
58
59#if HAVE_PIXBUF
58typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif
62#if HAVE_IMG
59typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
64typedef rxvt_img::nv rxvt_img__nv;
60 65
61///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
62 67
63static void 68static rgba
64parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
65{ 70{
66 //TODO: support component stuff 71 rgba c;
72
73 if (SvROK (sv))
74 {
75 AV *av = (AV *)SvRV (sv);
76
77 if (SvTYPE ((SV *)av) != SVt_PVAV)
78 croak ("colour must be either a colour string, or an array,");
79
80 int len = av_len (av) + 1;
81
82 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,");
84
85 c.a = rgba::MAX_CC;
86
87 c.r = c.g = c.b = float_to_component (SvNV (*av_fetch (av, 0, 0)));
88
89 if (len >= 3)
90 {
91 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
93
94 if (len >= 4)
95 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
96 }
97 }
98 else if (s)
99 {
100 rxvt_color rc;
67 c.set (s, SvPVbyte_nolen (sv)); 101 rc.set (s, SvPVbyte_nolen (sv));
102 rc.get (c);
103 }
104 else
105 croak ("unable to parse colour,");
106
107 return c;
68} 108}
69 109
70///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
71 112
72static wchar_t * 113static wchar_t *
73sv2wcs (SV *sv) 114sv2wcs (SV *sv)
74{ 115{
75 STRLEN len; 116 STRLEN len;
250 break; 291 break;
251 292
252 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
253 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 294 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
254 295
255 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
256 297
257 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
258 overlay_av = 0; 299 overlay_av = 0;
259 300
260 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
329 370
330struct rxvt_perl_interp rxvt_perl; 371struct rxvt_perl_interp rxvt_perl;
331 372
332static PerlInterpreter *perl; 373static PerlInterpreter *perl;
333 374
375#if 0 /* we are not a library anymore, so doing this is just not worth it */
376/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
377/* but therse are not guaranteed anyway... */
334rxvt_perl_interp::~rxvt_perl_interp () 378rxvt_perl_interp::~rxvt_perl_interp ()
335{ 379{
336 if (perl) 380 if (perl)
337 { 381 {
338 perl_destruct (perl); 382 perl_destruct (perl);
339 perl_free (perl); 383 perl_free (perl);
340 PERL_SYS_TERM (); 384 PERL_SYS_TERM ();
341 } 385 }
342} 386}
387#endif
343 388
344void 389void
345rxvt_perl_interp::init (rxvt_term *term) 390rxvt_perl_interp::init ()
346{ 391{
347 if (!perl) 392 if (!perl)
348 { 393 {
349 rxvt_push_locale (""); // perl init destroys current locale 394 rxvt_push_locale (""); // perl init destroys current locale
350 395
351 { 396 {
352 perl_environ = rxvt_environ; 397 perl_environ = rxvt_environ;
353 localise_env set_environ (perl_environ); 398 localise_env set_environ (perl_environ);
354 399
355 char *args[] = { 400 const char *args[] = {
356 "", 401 "",
357 "-e" 402 "-e"
358 "BEGIN {" 403 "BEGIN {"
359 " urxvt->bootstrap;" 404 " urxvt->bootstrap;"
360 " unshift @INC, '" LIBDIR "';" 405 " unshift @INC, '" LIBDIR "';"
361 "}" 406 "}"
362 "" 407 ""
363 "use urxvt;" 408 "use urxvt;",
409 0
364 }; 410 };
365 int argc = ecb_array_length (args); 411 int argc = ecb_array_length (args) - 1;
366 char **argv = args; 412 char **argv = (char **)args;
367 413
368 PERL_SYS_INIT3 (&argc, &argv, &environ); 414 PERL_SYS_INIT3 (&argc, &argv, &environ);
369 perl = perl_alloc (); 415 perl = perl_alloc ();
370 perl_construct (perl); 416 perl_construct (perl);
371 417
380 } 426 }
381 } 427 }
382 428
383 rxvt_pop_locale (); 429 rxvt_pop_locale ();
384 } 430 }
431}
385 432
386 if (perl) 433void
434rxvt_perl_interp::init (rxvt_term *term)
435{
436 init ();
437
438 if (perl && !term->perl.self)
387 { 439 {
388 // runs outside of perls ENV 440 // runs outside of perls ENV
389 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 441 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
390 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 442 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 443 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
392 } 444 }
393} 445}
394 446
447void
448rxvt_perl_interp::eval (const char *str)
449{
450 eval_pv (str, 1);
451}
452
453void
454rxvt_perl_interp::usage (rxvt_term *term, int type)
455{
456 localise_env set_environ (perl_environ);
457
458 ENTER;
459 SAVETMPS;
460
461 dSP;
462 PUSHMARK (SP);
463 EXTEND (SP, 2);
464 PUSHs (sv_2mortal (newSVterm (term)));
465 PUSHs (sv_2mortal (newSViv (type)));
466 PUTBACK;
467 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
468
469 FREETMPS;
470 LEAVE;
471}
472
473uint8_t
474rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
475{
476 localise_env set_environ (perl_environ);
477
478 ENTER;
479 SAVETMPS;
480
481 dSP;
482 PUSHMARK (SP);
483 EXTEND (SP, 6);
484 PUSHs (sv_2mortal (newSVterm (term)));
485 PUSHs (sv_2mortal (newSVpv (name, 0)));
486 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
487 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
488 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
489 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
490 PUTBACK;
491 call_pv ("urxvt::parse_resource", G_SCALAR);
492 SPAGAIN;
493
494 uint8_t ret = POPi;
495
496 FREETMPS;
497 LEAVE;
498
499 return ret;
500}
501
502static void
503_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
504{
505 unsigned int state;
506
507 if (term->parse_keysym (k, state) == -1)
508 return;
509
510 dSP;
511 XPUSHs (sv_2mortal (newSVpv (v, 0)));
512 PUTBACK;
513}
514
515static void
516_keysym_resources (rxvt_term *term)
517{
518 term->enumerate_keysym_resources (_keysym_resource_push);
519}
520
395static void 521static void
396ungrab (rxvt_term *THIS) 522ungrab (rxvt_term *THIS)
397{ 523{
398 if (THIS->perl.grabtime) 524 if (THIS->perl.grabtime)
399 { 525 {
430 } 556 }
431 } 557 }
432 558
433 bool event_consumed; 559 bool event_consumed;
434 560
435 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
436 || term->perl.should_invoke [htype]) 561 if (term->perl.should_invoke [htype])
437 { 562 {
438 dSP; 563 dSP;
439 va_list ap; 564 va_list ap;
440 565
441 va_start (ap, htype); 566 va_start (ap, htype);
651 ENTER; 776 ENTER;
652 SAVETMPS; 777 SAVETMPS;
653 778
654 dSP; 779 dSP;
655 XPUSHs (sv_2mortal (newSVpvn (data, len))); 780 XPUSHs (sv_2mortal (newSVpvn (data, len)));
781 PUTBACK;
656 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL); 782 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
657 783
658 if (SvTRUE (ERRSV)) 784 if (SvTRUE (ERRSV))
659 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV)); 785 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
660 786
691 static const struct { 817 static const struct {
692 const char *name; 818 const char *name;
693 IV iv; 819 IV iv;
694 } *civ, const_iv[] = { 820 } *civ, const_iv[] = {
695# define const_iv(name) { # name, (IV)name } 821# define const_iv(name) { # name, (IV)name }
822 const_iv (HOOK_INIT),
823 const_iv (HOOK_DESTROY),
824 const_iv (HOOK_ACTION),
825
696 const_iv (NUM_RESOURCES), 826 const_iv (NUM_RESOURCES),
697 const_iv (DEFAULT_RSTYLE), 827 const_iv (DEFAULT_RSTYLE),
698 const_iv (OVERLAY_RSTYLE), 828 const_iv (OVERLAY_RSTYLE),
699 const_iv (Color_Bits), 829 const_iv (Color_Bits),
700 const_iv (RS_bgShift), const_iv (RS_bgMask), 830 const_iv (RS_bgShift), const_iv (RS_bgMask),
710 const_iv (RS_Bold), 840 const_iv (RS_Bold),
711 const_iv (RS_Italic), 841 const_iv (RS_Italic),
712 const_iv (RS_Blink), 842 const_iv (RS_Blink),
713 const_iv (RS_RVid), 843 const_iv (RS_RVid),
714 const_iv (RS_Uline), 844 const_iv (RS_Uline),
845
846 // TODO: should support all colour constants, create colorinc.h &c
847 const_iv (Color_fg),
848 const_iv (Color_bg),
849#if OFF_FOCUS_FADING
850 const_iv (Color_fade),
851#endif
852 const_iv (Color_pointer_fg),
853 const_iv (Color_pointer_bg),
854 const_iv (Color_border),
855 const_iv (NRS_COLORS),
856 const_iv (TOTAL_COLORS),
715 857
716 const_iv (CurrentTime), 858 const_iv (CurrentTime),
717 const_iv (ShiftMask), 859 const_iv (ShiftMask),
718 const_iv (LockMask), 860 const_iv (LockMask),
719 const_iv (ControlMask), 861 const_iv (ControlMask),
801 const_iv (XIMSecondary), 943 const_iv (XIMSecondary),
802 const_iv (XIMTertiary), 944 const_iv (XIMTertiary),
803 const_iv (XIMVisibleToForward), 945 const_iv (XIMVisibleToForward),
804 const_iv (XIMVisibleToBackword), 946 const_iv (XIMVisibleToBackword),
805 const_iv (XIMVisibleToCenter), 947 const_iv (XIMVisibleToCenter),
948#if XRENDER
949 const_iv (PictStandardARGB32),
950 const_iv (PictStandardRGB24),
951 const_iv (PictStandardA8),
952 const_iv (PictStandardA4),
953 const_iv (PictStandardA1),
954 const_iv (RepeatNone),
955 const_iv (RepeatNormal),
956 const_iv (RepeatPad),
957 const_iv (RepeatReflect),
958 // all versions
959 const_iv (PictOpClear),
960 const_iv (PictOpSrc),
961 const_iv (PictOpDst),
962 const_iv (PictOpOver),
963 const_iv (PictOpOverReverse),
964 const_iv (PictOpIn),
965 const_iv (PictOpInReverse),
966 const_iv (PictOpOut),
967 const_iv (PictOpOutReverse),
968 const_iv (PictOpAtop),
969 const_iv (PictOpAtopReverse),
970 const_iv (PictOpXor),
971 const_iv (PictOpAdd),
972 const_iv (PictOpSaturate),
973 // 0.2+
974 const_iv (PictOpDisjointClear),
975 const_iv (PictOpDisjointSrc),
976 const_iv (PictOpDisjointDst),
977 const_iv (PictOpDisjointOver),
978 const_iv (PictOpDisjointOverReverse),
979 const_iv (PictOpDisjointIn),
980 const_iv (PictOpDisjointInReverse),
981 const_iv (PictOpDisjointOut),
982 const_iv (PictOpDisjointOutReverse),
983 const_iv (PictOpDisjointAtop),
984 const_iv (PictOpDisjointAtopReverse),
985 const_iv (PictOpDisjointXor),
986 const_iv (PictOpConjointClear),
987 const_iv (PictOpConjointSrc),
988 const_iv (PictOpConjointDst),
989 const_iv (PictOpConjointOver),
990 const_iv (PictOpConjointOverReverse),
991 const_iv (PictOpConjointIn),
992 const_iv (PictOpConjointInReverse),
993 const_iv (PictOpConjointOut),
994 const_iv (PictOpConjointOutReverse),
995 const_iv (PictOpConjointAtop),
996 const_iv (PictOpConjointAtopReverse),
997 const_iv (PictOpConjointXor),
998 // 0.11+
999 const_iv (PictOpMultiply),
1000 const_iv (PictOpScreen),
1001 const_iv (PictOpOverlay),
1002 const_iv (PictOpDarken),
1003 const_iv (PictOpLighten),
1004 const_iv (PictOpColorDodge),
1005 const_iv (PictOpColorBurn),
1006 const_iv (PictOpHardLight),
1007 const_iv (PictOpSoftLight),
1008 const_iv (PictOpDifference),
1009 const_iv (PictOpExclusion),
1010 const_iv (PictOpHSLHue),
1011 const_iv (PictOpHSLSaturation),
1012 const_iv (PictOpHSLColor),
1013 const_iv (PictOpHSLLuminosity),
1014#endif
806# if 0 1015# if 0
807 const_iv (XIMForwardChar), 1016 const_iv (XIMForwardChar),
808 const_iv (XIMBackwardChar), 1017 const_iv (XIMBackwardChar),
809 const_iv (XIMForwardWord), 1018 const_iv (XIMForwardWord),
810 const_iv (XIMBackwardWord), 1019 const_iv (XIMBackwardWord),
816 const_iv (XIMLineEnd), 1025 const_iv (XIMLineEnd),
817 const_iv (XIMAbsolutePosition), 1026 const_iv (XIMAbsolutePosition),
818 const_iv (XIMDontChange), 1027 const_iv (XIMDontChange),
819# endif 1028# endif
820# endif 1029# endif
1030
1031 /* DEC private modes */
1032 const_iv (PrivMode_132),
1033 const_iv (PrivMode_132OK),
1034 const_iv (PrivMode_rVideo),
1035 const_iv (PrivMode_relOrigin),
1036 const_iv (PrivMode_Screen),
1037 const_iv (PrivMode_Autowrap),
1038 const_iv (PrivMode_aplCUR),
1039 const_iv (PrivMode_aplKP),
1040 const_iv (PrivMode_HaveBackSpace),
1041 const_iv (PrivMode_BackSpace),
1042 const_iv (PrivMode_ShiftKeys),
1043 const_iv (PrivMode_VisibleCursor),
1044 const_iv (PrivMode_MouseX10),
1045 const_iv (PrivMode_MouseX11),
1046 const_iv (PrivMode_scrollBar),
1047 const_iv (PrivMode_TtyOutputInh),
1048 const_iv (PrivMode_Keypress),
1049 const_iv (PrivMode_smoothScroll),
1050 const_iv (PrivMode_vt52),
1051 const_iv (PrivMode_LFNL),
1052 const_iv (PrivMode_MouseBtnEvent),
1053 const_iv (PrivMode_MouseAnyEvent),
1054 const_iv (PrivMode_BracketPaste),
1055 const_iv (PrivMode_ExtMouseUTF8),
1056 const_iv (PrivMode_ExtMouseUrxvt),
1057 const_iv (PrivMode_BlinkingCursor),
1058 const_iv (PrivMode_mouse_report),
1059 const_iv (PrivMode_Default),
821 }; 1060 };
822 1061
823 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1062 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
824 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1063 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
825} 1064}
826 1065
827void 1066void
828warn (const char *msg) 1067log (utf8_string msg)
1068 CODE:
1069 rxvt_log ("%s", msg);
1070
1071void
1072warn (utf8_string msg)
829 CODE: 1073 CODE:
830 rxvt_warn ("%s", msg); 1074 rxvt_warn ("%s", msg);
831 1075
832void 1076void
833fatal (const char *msg) 1077fatal (utf8_string msg)
834 CODE: 1078 CODE:
835 rxvt_fatal ("%s", msg); 1079 rxvt_fatal ("%s", msg);
836 1080
837void 1081void
838_exit (int status) 1082_exit (int status)
1083
1084void
1085catch_fatal (SV *block)
1086 PROTOTYPE: &
1087 CODE:
1088 try
1089 {
1090 PUSHMARK (SP);
1091 PUTBACK;
1092 call_sv (block, G_VOID | G_DISCARD);
1093 SPAGAIN;
1094 }
1095 catch (const rxvt_failure_exception &e)
1096 {
1097 croak ("rxvt_fatal exception caught, trying to continue.");
1098 }
839 1099
840NV 1100NV
841NOW () 1101NOW ()
842 CODE: 1102 CODE:
843 RETVAL = ev::now (); 1103 RETVAL = ev::now ();
968rxvt_term::destroy () 1228rxvt_term::destroy ()
969 1229
970void 1230void
971rxvt_term::set_should_invoke (int htype, int inc) 1231rxvt_term::set_should_invoke (int htype, int inc)
972 CODE: 1232 CODE:
973 THIS->perl.should_invoke [htype] += inc; 1233 uint8_t &count = THIS->perl.should_invoke [htype];
1234 uint8_t prev = count;
1235 count += inc;
1236 if (!prev != !count)
1237 {
1238 // hook status changed, react
1239 switch (htype)
1240 {
1241 case HOOK_POSITION_CHANGE:
1242 if (count)
1243 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1244 }
1245 }
1246
1247void
1248rxvt_term::put_option_db (octet_string specifier, octet_string value)
1249 CODE:
1250 XrmPutStringResource (&THIS->option_db, specifier, value);
1251
1252void
1253rxvt_term::_keysym_resources ()
1254 PPCODE:
1255 PUTBACK;
1256 _keysym_resources (THIS);
1257 SPAGAIN;
974 1258
975int 1259int
976rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1260rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
977 CODE: 1261 CODE:
978 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1262 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1038rxvt_term::ungrab () 1322rxvt_term::ungrab ()
1039 CODE: 1323 CODE:
1040 ungrab (THIS); 1324 ungrab (THIS);
1041 1325
1042int 1326int
1043rxvt_term::XStringToKeysym (char *string) 1327rxvt_term::XStringToKeysym (octet_string string)
1044 CODE: 1328 CODE:
1045 RETVAL = XStringToKeysym (string); 1329 RETVAL = XStringToKeysym (string);
1046 OUTPUT: RETVAL 1330 OUTPUT: RETVAL
1047 1331
1048char * 1332char *
1058 OUTPUT: RETVAL 1342 OUTPUT: RETVAL
1059 1343
1060int 1344int
1061rxvt_term::XKeycodeToKeysym (int code, int index) 1345rxvt_term::XKeycodeToKeysym (int code, int index)
1062 CODE: 1346 CODE:
1063 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1347 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1064 OUTPUT: RETVAL 1348 OUTPUT: RETVAL
1065 1349
1066int 1350int
1067rxvt_term::strwidth (SV *str) 1351rxvt_term::strwidth (SV *str)
1068 CODE: 1352 CODE:
1138#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1422#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1139#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1423#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1140#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1424#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1141 1425
1142int 1426int
1143rxvt_term::width () 1427rxvt_term::width (int new_value = NO_INIT)
1144 ALIAS: 1428 ALIAS:
1145 width = TERM_OFFSET_width 1429 width = TERM_OFFSET_width
1146 height = TERM_OFFSET_height 1430 height = TERM_OFFSET_height
1147 fwidth = TERM_OFFSET_fwidth 1431 fwidth = TERM_OFFSET_fwidth
1148 fheight = TERM_OFFSET_fheight 1432 fheight = TERM_OFFSET_fheight
1158 saveLines = TERM_OFFSET_saveLines 1442 saveLines = TERM_OFFSET_saveLines
1159 total_rows = TERM_OFFSET_total_rows 1443 total_rows = TERM_OFFSET_total_rows
1160 top_row = TERM_OFFSET_top_row 1444 top_row = TERM_OFFSET_top_row
1161 CODE: 1445 CODE:
1162 RETVAL = *(int *)((char *)THIS + ix); 1446 RETVAL = *(int *)((char *)THIS + ix);
1447 if (items > 1)
1448 *(int *)((char *)THIS + ix) = new_value;
1163 OUTPUT: 1449 OUTPUT:
1164 RETVAL 1450 RETVAL
1165 1451
1166unsigned int 1452unsigned int
1167rxvt_term::ModLevel3Mask () 1453rxvt_term::ModLevel3Mask ()
1169 ModLevel3Mask = 0 1455 ModLevel3Mask = 0
1170 ModMetaMask = 1 1456 ModMetaMask = 1
1171 ModNumLockMask = 2 1457 ModNumLockMask = 2
1172 current_screen = 3 1458 current_screen = 3
1173 hidden_cursor = 4 1459 hidden_cursor = 4
1460 priv_modes = 5
1174 CODE: 1461 CODE:
1175 switch (ix) 1462 switch (ix)
1176 { 1463 {
1177 case 0: RETVAL = THIS->ModLevel3Mask; break; 1464 case 0: RETVAL = THIS->ModLevel3Mask; break;
1178 case 1: RETVAL = THIS->ModMetaMask; break; 1465 case 1: RETVAL = THIS->ModMetaMask; break;
1179 case 2: RETVAL = THIS->ModNumLockMask; break; 1466 case 2: RETVAL = THIS->ModNumLockMask; break;
1180 case 3: RETVAL = THIS->current_screen; break; 1467 case 3: RETVAL = THIS->current_screen; break;
1181#ifdef CURSOR_BLINK 1468#ifdef CURSOR_BLINK
1182 case 4: RETVAL = THIS->hidden_cursor; break; 1469 case 4: RETVAL = THIS->hidden_cursor; break;
1470#else
1471 case 4: RETVAL = 0; break;
1183#endif 1472#endif
1473 case 5: RETVAL = THIS->priv_modes; break;
1184 } 1474 }
1185 OUTPUT: 1475 OUTPUT:
1186 RETVAL 1476 RETVAL
1187 1477
1188char * 1478char *
1235 CODE: 1525 CODE:
1236 RETVAL = THIS->parent; 1526 RETVAL = THIS->parent;
1237 OUTPUT: 1527 OUTPUT:
1238 RETVAL 1528 RETVAL
1239 1529
1530int
1531rxvt_term::parent_x ()
1532 CODE:
1533 RETVAL = THIS->parent_x;
1534 OUTPUT:
1535 RETVAL
1536
1537int
1538rxvt_term::parent_y ()
1539 CODE:
1540 RETVAL = THIS->parent_y;
1541 OUTPUT:
1542 RETVAL
1543
1240Window 1544Window
1241rxvt_term::vt () 1545rxvt_term::vt ()
1242 CODE: 1546 CODE:
1243 RETVAL = THIS->vt; 1547 RETVAL = THIS->vt;
1244 OUTPUT: 1548 OUTPUT:
1309void 1613void
1310rxvt_term::want_refresh () 1614rxvt_term::want_refresh ()
1311 CODE: 1615 CODE:
1312 THIS->want_refresh = 1; 1616 THIS->want_refresh = 1;
1313 THIS->refresh_check (); 1617 THIS->refresh_check ();
1618
1619void
1620rxvt_term::refresh_check ()
1314 1621
1315void 1622void
1316rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1623rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1317 PPCODE: 1624 PPCODE:
1318{ 1625{
1463 *r++ = NOCHAR; 1770 *r++ = NOCHAR;
1464 } 1771 }
1465 1772
1466 rxvt_pop_locale (); 1773 rxvt_pop_locale ();
1467 1774
1775 free (wstr);
1468 RETVAL = wcs2sv (rstr, r - rstr); 1776 RETVAL = wcs2sv (rstr, r - rstr);
1469} 1777}
1470 OUTPUT: 1778 OUTPUT:
1471 RETVAL 1779 RETVAL
1472 1780
1496 else if (IS_COMPOSE (*s)) 1804 else if (IS_COMPOSE (*s))
1497 r += rxvt_composite.expand (*s, r); 1805 r += rxvt_composite.expand (*s, r);
1498 else 1806 else
1499 *r++ = *s; 1807 *r++ = *s;
1500 1808
1809 free (wstr);
1501 RETVAL = wcs2sv (rstr, r - rstr); 1810 RETVAL = wcs2sv (rstr, r - rstr);
1502} 1811}
1503 OUTPUT: 1812 OUTPUT:
1504 RETVAL 1813 RETVAL
1505 1814
1506void 1815void
1507rxvt_term::_resource (char *name, int index, SV *newval = 0) 1816rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1508 PPCODE: 1817 PPCODE:
1509{ 1818{
1510 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1819 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1511# define def(name) { # name, Rs_ ## name }, 1820# define def(name) { # name, Rs_ ## name },
1512# define reserve(name,count) 1821# define reserve(name,count)
1527 index += rs->value; 1836 index += rs->value;
1528 } 1837 }
1529 else 1838 else
1530 { 1839 {
1531 --rs; 1840 --rs;
1532 name = ""; 1841 name = (octet_string)"";
1533 } 1842 }
1534 1843
1535 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1844 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1536 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1845 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1537 1846
1550 THIS->rs [index] = 0; 1859 THIS->rs [index] = 0;
1551 } 1860 }
1552} 1861}
1553 1862
1554const char * 1863const char *
1555rxvt_term::x_resource (const char *name) 1864rxvt_term::x_resource (octet_string name)
1556 1865
1557bool 1866bool
1558rxvt_term::option (U8 optval, int set = -1) 1867rxvt_term::option (U8 optval, int set = -1)
1559 CODE: 1868 CODE:
1560{ 1869{
1579 THIS->cursor_blink_reset (); 1888 THIS->cursor_blink_reset ();
1580 break; 1889 break;
1581#endif 1890#endif
1582 1891
1583 case Opt_cursorUnderline: 1892 case Opt_cursorUnderline:
1893 THIS->cursor_type = set ? 1 : 0;
1584 THIS->want_refresh = 1; 1894 THIS->want_refresh = 1;
1585 THIS->refresh_check (); 1895 THIS->refresh_check ();
1586 break; 1896 break;
1587 1897
1588# case Opt_scrollBar_floating: 1898# case Opt_scrollBar_floating:
1593 } 1903 }
1594} 1904}
1595 OUTPUT: 1905 OUTPUT:
1596 RETVAL 1906 RETVAL
1597 1907
1908SV *
1909rxvt_term::lookup_keysym (int keysym, unsigned int state)
1910 CODE:
1911{
1912 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1913 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1914}
1915 OUTPUT:
1916 RETVAL
1917
1598bool 1918bool
1599rxvt_term::parse_keysym (char *keysym, char *str) 1919rxvt_term::bind_action (octet_string keysym, octet_string action)
1920 ALIAS:
1921 parse_keysym = 1
1600 CODE: 1922 CODE:
1601 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1923 RETVAL = 0 < THIS->bind_action (keysym, action);
1602 THIS->keyboard->register_done (); 1924 THIS->keyboard->register_done ();
1603 OUTPUT: 1925 OUTPUT:
1604 RETVAL 1926 RETVAL
1605 1927
1606void 1928void
1607rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1929rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1608 CODE: 1930 CODE:
1609 wchar_t *wstr = sv2wcs (str); 1931 wchar_t *wstr = sv2wcs (str);
1610 THIS->keyboard->register_user_translation (keysym, state, wstr); 1932 THIS->keyboard->register_action (keysym, state, wstr);
1611 free (wstr); 1933 free (wstr);
1612 1934
1613void 1935void
1614rxvt_term::screen_cur (...) 1936rxvt_term::screen_cur (...)
1615 PROTOTYPE: $;$$ 1937 PROTOTYPE: $;$$
1658 1980
1659 if (ix) 1981 if (ix)
1660 { 1982 {
1661 THIS->selection.screen = THIS->current_screen; 1983 THIS->selection.screen = THIS->current_screen;
1662 1984
1663 THIS->want_refresh = 1; 1985 THIS->selection_changed ();
1664 THIS->refresh_check (); 1986 THIS->refresh_check ();
1665 } 1987 }
1666 } 1988 }
1667} 1989}
1668 1990
1674 THIS->selection.screen = screen; 1996 THIS->selection.screen = screen;
1675 OUTPUT: 1997 OUTPUT:
1676 RETVAL 1998 RETVAL
1677 1999
1678void 2000void
2001rxvt_term::selection_request (Time tm, int selnum)
2002
2003void
1679rxvt_term::selection_clear (bool clipboard = false) 2004rxvt_term::selection_clear (bool clipboard = false)
1680 2005
1681void 2006void
1682rxvt_term::selection_make (Time eventtime, bool rect = false) 2007rxvt_term::selection_make (Time eventtime, bool rect = false)
1683 CODE: 2008 CODE:
1724 2049
1725void 2050void
1726rxvt_term::scr_bell () 2051rxvt_term::scr_bell ()
1727 2052
1728void 2053void
2054rxvt_term::scr_recolor (bool refresh = true);
2055
2056void
1729rxvt_term::scr_change_screen (int screen) 2057rxvt_term::scr_change_screen (int screen)
1730 2058
1731void 2059void
1732rxvt_term::scr_add_lines (SV *string) 2060rxvt_term::scr_add_lines (SV *string)
1733 CODE: 2061 CODE:
1734{ 2062{
1735 wchar_t *wstr = sv2wcs (string); 2063 wchar_t *wstr = sv2wcs (string);
1736 THIS->scr_add_lines (wstr, wcslen (wstr)); 2064 THIS->scr_add_lines (wstr, wcslen (wstr));
1737 free (wstr); 2065 free (wstr);
1738} 2066}
2067
2068void
2069rxvt_term::tt_write_user_input (SV *octets)
2070 INIT:
2071 STRLEN len;
2072 char *str = SvPVbyte (octets, len);
2073 C_ARGS:
2074 str, len
1739 2075
1740void 2076void
1741rxvt_term::tt_write (SV *octets) 2077rxvt_term::tt_write (SV *octets)
1742 INIT: 2078 INIT:
1743 STRLEN len; 2079 STRLEN len;
1846 type, format, PropModeReplace, 2182 type, format, PropModeReplace,
1847 (unsigned char *)data_, len / elemsize); 2183 (unsigned char *)data_, len / elemsize);
1848} 2184}
1849 2185
1850Atom 2186Atom
1851XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 2187XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1852 C_ARGS: term->dpy, atom_name, only_if_exists 2188 C_ARGS: term->dpy, atom_name, only_if_exists
1853 2189
1854char * 2190char *
1855XGetAtomName (rxvt_term *term, Atom atom) 2191XGetAtomName (rxvt_term *term, Atom atom)
1856 C_ARGS: term->dpy, atom 2192 C_ARGS: term->dpy, atom
1857 CLEANUP: 2193 CLEANUP:
1858 XFree (RETVAL); 2194 XFree (RETVAL);
1859 2195
1860void 2196void
1861XDeleteProperty (rxvt_term *term, Window window, Atom property) 2197XDeleteProperty (rxvt_term *term, Window window, Atom property)
1862 C_ARGS: term->dpy, window, property 2198 C_ARGS: term->dpy, window, property
1863 2199
1864Window 2200Window
1865rxvt_term::DefaultRootWindow () 2201rxvt_term::DefaultRootWindow ()
1866 CODE: 2202 CODE:
1867 RETVAL = THIS->display->root; 2203 RETVAL = THIS->display->root;
1919 PUSHs (newSVuv (child)); 2255 PUSHs (newSVuv (child));
1920 } 2256 }
1921} 2257}
1922 2258
1923############################################################################# 2259#############################################################################
2260# fancy bg bloatstuff (TODO: should be moved up somewhere)
2261
2262bool
2263rxvt_term::has_render ()
2264 CODE:
2265 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2266 OUTPUT:
2267 RETVAL
2268
2269void
2270rxvt_term::background_geometry (bool border = false)
2271 PPCODE:
2272 EXTEND (SP, 4);
2273 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2274 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2275 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2276 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2277
2278#if HAVE_IMG
2279
2280rxvt_img *
2281rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2282 CODE:
2283 XRenderPictFormat *f = SvOK (format)
2284 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2285 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2286 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2287 RETVAL->alloc ();
2288 OUTPUT:
2289 RETVAL
2290
2291#if ENABLE_TRANSPARENCY
2292
2293rxvt_img *
2294rxvt_term::new_img_from_root ()
2295 CODE:
2296 RETVAL = rxvt_img::new_from_root (THIS);
2297 OUTPUT:
2298 RETVAL
2299
2300#endif
2301
2302#if HAVE_PIXBUF
2303
2304rxvt_img *
2305rxvt_term::new_img_from_file (octet_string filename)
2306 CODE:
2307 try
2308 {
2309 RETVAL = rxvt_img::new_from_file (THIS, filename);
2310 }
2311 catch (const class rxvt_failure_exception &e)
2312 {
2313 croak ("new_img_from_file failed");
2314 }
2315 OUTPUT:
2316 RETVAL
2317
2318#endif
2319
2320void
2321rxvt_term::clr_background ()
2322 CODE:
2323 delete THIS->bg_img;
2324 THIS->bg_img = 0;
2325 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2326
2327void
2328rxvt_term::set_background (rxvt_img *img, bool border = false)
2329 CODE:
2330 delete THIS->bg_img;
2331 THIS->bg_img = 0;
2332 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2333
2334 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2335 {
2336 img = img->clone (); // own the img
2337
2338 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2339 img->sub_rect (0, 0,
2340 border ? THIS->vt_width : THIS->szHint.width,
2341 border ? THIS->vt_height : THIS->szHint.height)
2342 ->replace (img);
2343
2344 // just in case, should usually be a nop
2345 img->reify ()
2346 ->replace (img);
2347
2348 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2349 ->replace (img);
2350
2351 THIS->bg_img = img;
2352
2353 if (!border)
2354 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2355 }
2356
2357#endif
2358
2359#############################################################################
1924# urxvt::overlay 2360# urxvt::overlay
1925############################################################################# 2361#############################################################################
1926 2362
1927MODULE = urxvt PACKAGE = urxvt::overlay 2363MODULE = urxvt PACKAGE = urxvt::overlay
1928 2364
1948 C_ARGS: filename, 0 2384 C_ARGS: filename, 0
1949 2385
1950void 2386void
1951DESTROY (urxvt::pixbuf self) 2387DESTROY (urxvt::pixbuf self)
1952 CODE: 2388 CODE:
1953 gdk_pixbuf_unref (self); 2389 g_object_unref (self);
1954 2390
1955#endif 2391#endif
1956 2392
1957MODULE = urxvt PACKAGE = urxvt::img 2393MODULE = urxvt PACKAGE = urxvt::img
1958 2394
1959#if HAVE_IMG 2395#if HAVE_IMG
1960 2396
1961# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height); 2397# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
1962# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2398# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1963 2399
1964void fill (urxvt::img self, SV *c) 2400void
2401rxvt_img::geometry ()
1965 CODE: 2402 PPCODE:
1966 rxvt_color rc; 2403 EXTEND (SP, 4);
1967 parse_color (self->s, rc, c); 2404 PUSHs (sv_2mortal (newSViv (THIS->x)));
1968 self->fill (rc); 2405 PUSHs (sv_2mortal (newSViv (THIS->y)));
2406 PUSHs (sv_2mortal (newSViv (THIS->w)));
2407 PUSHs (sv_2mortal (newSViv (THIS->h)));
1969 2408
1970void blur (urxvt::img self, int rh, int rv) 2409int
2410rxvt_img::x ()
2411 ALIAS:
2412 x = 0
2413 y = 1
2414 w = 2
2415 h = 3
1971 CODE: 2416 CODE:
1972 self->blur (rh, rv); 2417 switch (ix)
1973 2418 {
1974void brightness (urxvt::img self, double r, double g, double b, double a = 1.) 2419 case 0: RETVAL = THIS->x; break;
1975 CODE: 2420 case 1: RETVAL = THIS->y; break;
1976 self->brightness (r, g, b, a); 2421 case 2: RETVAL = THIS->w; break;
1977 2422 case 3: RETVAL = THIS->h; break;
1978void contrast (urxvt::img self, double r, double g, double b, double a = 1.) 2423 }
1979 CODE:
1980 self->contrast (r, g, b, a);
1981
1982urxvt::img copy (urxvt::img self)
1983 CODE:
1984 RETVAL = self->copy ();
1985 OUTPUT: 2424 OUTPUT:
1986 RETVAL 2425 RETVAL
1987 2426
1988urxvt::img scale (urxvt::img self, int new_width, int new_height) 2427Pixmap
2428rxvt_img::pm ()
1989 CODE: 2429 CODE:
1990 RETVAL = self->scale (new_width, new_height); 2430 RETVAL = THIS->pm;
1991 OUTPUT: 2431 OUTPUT:
1992 RETVAL 2432 RETVAL
1993 2433
1994# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]); 2434void
2435rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2436 PROTOTYPE: $;$$$$
2437 INIT:
2438 rxvt_screen screen;
2439 screen.set (THIS->d);
2440 rgba cc = parse_rgba (c, &screen);
2441 C_ARGS: cc, x, y, w, h
2442
2443void
2444rxvt_img::DESTROY ()
2445 CODE:
2446 delete THIS;
2447
2448void
2449rxvt_img::add_alpha ()
2450
2451void
2452rxvt_img::unshare ()
2453
2454void
2455rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2456 PPCODE:
2457 if (items >= 2)
2458 THIS->repeat_mode (repeat);
2459 if (GIMME_V != G_VOID)
2460 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2461
2462void
2463rxvt_img::move (int dx, int dy)
2464
2465void
2466rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2467
2468void
2469rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2470
2471void
2472rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2473
2474rxvt_img *
2475rxvt_img::clone ()
2476
2477rxvt_img *
2478rxvt_img::reify ()
2479
2480rxvt_img *
2481rxvt_img::sub_rect (int x, int y, int width, int height)
2482
2483rxvt_img *
2484rxvt_img::blur (int rh, int rv)
2485
2486rxvt_img *
2487rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2488
2489rxvt_img *
2490rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2491 INIT:
2492 rxvt_img::nv matrix[3][3] = {
2493 { p11, p12, p13 },
2494 { p21, p22, p23 },
2495 { p31, p32, p33 }
2496 };
2497 C_ARGS: matrix
2498
2499rxvt_img *
2500rxvt_img::scale (int new_width, int new_height)
2501
2502rxvt_img *
2503rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2504
2505rxvt_img *
2506rxvt_img::tint (SV *c)
2507 INIT:
2508 rxvt_screen screen;
2509 screen.set (THIS->d);
2510 rgba cc = parse_rgba (c, &screen);
2511 C_ARGS: cc
2512
2513rxvt_img *
2514rxvt_img::shade (rxvt_img::nv factor)
2515
2516rxvt_img *
2517rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2518 CODE:
2519 rxvt_img::nv *vparams = 0;
2520 int nparams = 0;
2521
2522 if (SvOK (params))
2523 {
2524 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2525 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2526
2527 nparams = av_len ((AV *)SvRV (params)) + 1;
2528 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2529
2530 for (int i = 0; i < nparams; ++i)
2531 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2532 }
2533
2534 RETVAL = THIS->filter (name, nparams, vparams);
2535 free (vparams);
2536 OUTPUT:
2537 RETVAL
1995 2538
1996#endif 2539#endif
1997 2540

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines