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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines