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.240 by root, Thu Jun 22 23:46:38 2017 UTC vs.
Revision 1.260 by root, Fri Jul 7 06:10:37 2023 UTC

30#include "../config.h" 30#include "../config.h"
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdarg.h> 33#include <stdarg.h>
34 34
35#include "unistd.h" 35#include <unistd.h>
36
37#include <X11/extensions/shape.h>
38
39// support old includes (https://bugs.freedesktop.org/show_bug.cgi?id=2799, https://lists.x.org/archives/xorg-arch/2005-March/000004.html)
40#ifndef ShapeInput
41# define ShapeInput 2
42#endif
36 43
37#include "ev_cpp.h" 44#include "ev_cpp.h"
38#include "rxvt.h" 45#include "rxvt.h"
39#include "keyboard.h" 46#include "keyboard.h"
40#include "rxvtutil.h" 47#include "rxvtutil.h"
82 if (len != 1 && len != 3 && len != 4) 89 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,"); 90 croak ("component colour array must have 1, 3 or 4 components,");
84 91
85 c.a = rgba::MAX_CC; 92 c.a = rgba::MAX_CC;
86 93
87 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0))); 94 c.r = c.g = c.b = float_to_component (SvNV (*av_fetch (av, 0, 0)));
88 95
89 if (len >= 3) 96 if (len >= 3)
90 { 97 {
91 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); 98 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); 99 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
93 100
94 if (len >= 4) 101 if (len >= 4)
95 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); 102 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
96 } 103 }
97 } 104 }
98 else if (s) 105 else if (s)
99 { 106 {
100 rxvt_color rc; 107 rxvt_color rc;
370 377
371struct rxvt_perl_interp rxvt_perl; 378struct rxvt_perl_interp rxvt_perl;
372 379
373static PerlInterpreter *perl; 380static PerlInterpreter *perl;
374 381
382#if 0 /* we are not a library anymore, so doing this is just not worth it */
383/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
384/* but therse are not guaranteed anyway... */
375rxvt_perl_interp::~rxvt_perl_interp () 385rxvt_perl_interp::~rxvt_perl_interp ()
376{ 386{
377 if (perl) 387 if (perl)
378 { 388 {
389 localise_env set_environ (perl_environ);
379 perl_destruct (perl); 390 perl_destruct (perl);
380 perl_free (perl); 391 perl_free (perl);
381 PERL_SYS_TERM (); 392 PERL_SYS_TERM ();
382 } 393 }
383} 394}
395#endif
384 396
385void 397void
386rxvt_perl_interp::init () 398rxvt_perl_interp::init ()
387{ 399{
388 if (!perl) 400 if (!perl)
389 { 401 {
390 rxvt_push_locale (""); // perl init destroys current locale 402 rxvt_push_locale ("C"); // perl init destroys current locale
391 403
392 { 404 {
393 perl_environ = rxvt_environ; 405 perl_environ = rxvt_environ;
394 localise_env set_environ (perl_environ); 406 localise_env set_environ (perl_environ);
395 407
396 char *args[] = { 408 const char *args[] = {
397 "", 409 "",
398 "-e" 410 "-e"
399 "BEGIN {" 411 "BEGIN {"
400 " urxvt->bootstrap;" 412 " urxvt->bootstrap;"
401 " unshift @INC, '" LIBDIR "';" 413 " unshift @INC, '" LIBDIR "';"
402 "}" 414 "}"
403 "" 415 ""
404 "use urxvt;" 416 "use urxvt;",
417 0
405 }; 418 };
406 int argc = ecb_array_length (args); 419 int argc = ecb_array_length (args) - 1;
407 char **argv = args; 420 char **argv = (char **)args;
408 421
409 PERL_SYS_INIT3 (&argc, &argv, &environ); 422 PERL_SYS_INIT3 (&argc, &argv, &environ);
410 perl = perl_alloc (); 423 perl = perl_alloc ();
411 perl_construct (perl); 424 perl_construct (perl);
412 425
523 THIS->perl.grabtime = 0; 536 THIS->perl.grabtime = 0;
524 } 537 }
525} 538}
526 539
527bool 540bool
528rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 541rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
529{ 542{
530 if (!perl || !term->perl.self) 543 if (!perl || !term->perl.self)
531 return false; 544 return false;
532 545
533 localise_env set_environ (perl_environ); 546 localise_env set_environ (perl_environ);
815 } *civ, const_iv[] = { 828 } *civ, const_iv[] = {
816# define const_iv(name) { # name, (IV)name } 829# define const_iv(name) { # name, (IV)name }
817 const_iv (HOOK_INIT), 830 const_iv (HOOK_INIT),
818 const_iv (HOOK_DESTROY), 831 const_iv (HOOK_DESTROY),
819 const_iv (HOOK_ACTION), 832 const_iv (HOOK_ACTION),
833 const_iv (HOOK_OSC_SEQ),
834 const_iv (HOOK_OSC_SEQ_PERL),
820 835
821 const_iv (NUM_RESOURCES), 836 const_iv (NUM_RESOURCES),
822 const_iv (DEFAULT_RSTYLE), 837 const_iv (DEFAULT_RSTYLE),
823 const_iv (OVERLAY_RSTYLE), 838 const_iv (OVERLAY_RSTYLE),
824 const_iv (Color_Bits), 839 const_iv (Color_Bits),
839 const_iv (RS_Uline), 854 const_iv (RS_Uline),
840 855
841 // TODO: should support all colour constants, create colorinc.h &c 856 // TODO: should support all colour constants, create colorinc.h &c
842 const_iv (Color_fg), 857 const_iv (Color_fg),
843 const_iv (Color_bg), 858 const_iv (Color_bg),
844#if OFF_FOCUS_FADING 859# if OFF_FOCUS_FADING
845 const_iv (Color_fade), 860 const_iv (Color_fade),
846#endif 861# endif
847 const_iv (Color_pointer_fg), 862 const_iv (Color_pointer_fg),
848 const_iv (Color_pointer_bg), 863 const_iv (Color_pointer_bg),
849 const_iv (Color_border), 864 const_iv (Color_border),
850 const_iv (NRS_COLORS), 865 const_iv (NRS_COLORS),
851 const_iv (TOTAL_COLORS), 866 const_iv (TOTAL_COLORS),
852 867
868 const_iv (None),
853 const_iv (CurrentTime), 869 const_iv (CurrentTime),
854 const_iv (ShiftMask), 870 const_iv (ShiftMask),
855 const_iv (LockMask), 871 const_iv (LockMask),
856 const_iv (ControlMask), 872 const_iv (ControlMask),
857 const_iv (Mod1Mask), 873 const_iv (Mod1Mask),
928 const_iv (SelectionRequest), 944 const_iv (SelectionRequest),
929 const_iv (SelectionNotify), 945 const_iv (SelectionNotify),
930 const_iv (ColormapNotify), 946 const_iv (ColormapNotify),
931 const_iv (ClientMessage), 947 const_iv (ClientMessage),
932 const_iv (MappingNotify), 948 const_iv (MappingNotify),
949
950 // shape extension
951 const_iv (ShapeSet),
952 const_iv (ShapeUnion),
953 const_iv (ShapeIntersect),
954 const_iv (ShapeSubtract),
955 const_iv (ShapeInvert),
956
957 const_iv (ShapeBounding),
958 const_iv (ShapeClip),
959 const_iv (ShapeInput),
960
961 // XIM
933# if ENABLE_XIM_ONTHESPOT 962# if ENABLE_XIM_ONTHESPOT
934 const_iv (XIMReverse), 963 const_iv (XIMReverse),
935 const_iv (XIMUnderline), 964 const_iv (XIMUnderline),
936 const_iv (XIMHighlight), 965 const_iv (XIMHighlight),
937 const_iv (XIMPrimary), 966 const_iv (XIMPrimary),
938 const_iv (XIMSecondary), 967 const_iv (XIMSecondary),
939 const_iv (XIMTertiary), 968 const_iv (XIMTertiary),
940 const_iv (XIMVisibleToForward), 969 const_iv (XIMVisibleToForward),
941 const_iv (XIMVisibleToBackword), 970 const_iv (XIMVisibleToBackword),
942 const_iv (XIMVisibleToCenter), 971 const_iv (XIMVisibleToCenter),
972# endif
943#if XRENDER 973# if XRENDER
944 const_iv (PictStandardARGB32), 974 const_iv (PictStandardARGB32),
945 const_iv (PictStandardRGB24), 975 const_iv (PictStandardRGB24),
946 const_iv (PictStandardA8), 976 const_iv (PictStandardA8),
947 const_iv (PictStandardA4), 977 const_iv (PictStandardA4),
948 const_iv (PictStandardA1), 978 const_iv (PictStandardA1),
1004 const_iv (PictOpExclusion), 1034 const_iv (PictOpExclusion),
1005 const_iv (PictOpHSLHue), 1035 const_iv (PictOpHSLHue),
1006 const_iv (PictOpHSLSaturation), 1036 const_iv (PictOpHSLSaturation),
1007 const_iv (PictOpHSLColor), 1037 const_iv (PictOpHSLColor),
1008 const_iv (PictOpHSLLuminosity), 1038 const_iv (PictOpHSLLuminosity),
1009#endif 1039# endif
1010# if 0 1040# if 0
1011 const_iv (XIMForwardChar), 1041 const_iv (XIMForwardChar),
1012 const_iv (XIMBackwardChar), 1042 const_iv (XIMBackwardChar),
1013 const_iv (XIMForwardWord), 1043 const_iv (XIMForwardWord),
1014 const_iv (XIMBackwardWord), 1044 const_iv (XIMBackwardWord),
1019 const_iv (XIMLineStart), 1049 const_iv (XIMLineStart),
1020 const_iv (XIMLineEnd), 1050 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1051 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1052 const_iv (XIMDontChange),
1023# endif 1053# endif
1024# endif 1054
1055 /* DEC private modes */
1056 const_iv (PrivMode_132),
1057 const_iv (PrivMode_132OK),
1058 const_iv (PrivMode_rVideo),
1059 const_iv (PrivMode_relOrigin),
1060 const_iv (PrivMode_Screen),
1061 const_iv (PrivMode_Autowrap),
1062 const_iv (PrivMode_aplCUR),
1063 const_iv (PrivMode_aplKP),
1064 const_iv (PrivMode_HaveBackSpace),
1065 const_iv (PrivMode_BackSpace),
1066 const_iv (PrivMode_ShiftKeys),
1067 const_iv (PrivMode_VisibleCursor),
1068 const_iv (PrivMode_MouseX10),
1069 const_iv (PrivMode_MouseX11),
1070 const_iv (PrivMode_scrollBar),
1071 const_iv (PrivMode_TtyOutputInh),
1072 const_iv (PrivMode_Keypress),
1073 const_iv (PrivMode_smoothScroll),
1074 const_iv (PrivMode_vt52),
1075 const_iv (PrivMode_LFNL),
1076 const_iv (PrivMode_MouseBtnEvent),
1077 const_iv (PrivMode_MouseAnyEvent),
1078 const_iv (PrivMode_BracketPaste),
1079 const_iv (PrivMode_ExtMouseUTF8),
1080 const_iv (PrivMode_ExtMouseUrxvt),
1081 const_iv (PrivMode_BlinkingCursor),
1082 const_iv (PrivMode_mouse_report),
1083 const_iv (PrivMode_Default),
1025 }; 1084 };
1026 1085
1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1086 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1087 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1088}
1107int 1166int
1108SET_CUSTOM (int rend, int new_value) 1167SET_CUSTOM (int rend, int new_value)
1109 CODE: 1168 CODE:
1110{ 1169{
1111 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1170 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1112 croak ("custom value out of range, must be 0..%d", RS_customCount - 1); 1171 croak ("custom value out of range, must be 0..%lu", RS_customCount - 1);
1113 1172
1114 RETVAL = (rend & ~RS_customMask) 1173 RETVAL = (rend & ~RS_customMask)
1115 | ((new_value << RS_customShift) & RS_customMask); 1174 | ((new_value << RS_customShift) & RS_customMask);
1116} 1175}
1117 OUTPUT: 1176 OUTPUT:
1154 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 1213 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
1155 1214
1156 av_pop (av); 1215 av_pop (av);
1157 1216
1158 delete req; 1217 delete req;
1218
1219Region
1220XCreateRegion ()
1221
1222int
1223XUnionRectWithRegion (int x, int y, int w, int h, Region src, Region dst)
1224 CODE:
1225 XRectangle rect;
1226 rect.x = x;
1227 rect.y = y;
1228 rect.width = w;
1229 rect.height = h;
1230 RETVAL = XUnionRectWithRegion (&rect, src, dst);
1231 OUTPUT: RETVAL
1232
1233int
1234XIntersectRegion (Region src1, Region src2, Region res)
1235
1236int
1237XUnionRegion (Region src1, Region src2, Region res)
1238
1239int
1240XSubtractRegion (Region src1, Region src2, Region res)
1241
1242int
1243XXorRegion (Region src1, Region src2, Region res)
1244
1245int
1246XOffsetRegion (Region r, int dx, int dy)
1247
1248int
1249XShrinkRegion (Region r, int dx, int dy)
1250
1251int
1252XDestroyRegion (Region r)
1159 1253
1160MODULE = urxvt PACKAGE = urxvt::term 1254MODULE = urxvt PACKAGE = urxvt::term
1161 1255
1162SV * 1256SV *
1163_new (AV *env, AV *arg) 1257_new (AV *env, AV *arg)
1336 1430
1337SV * 1431SV *
1338rxvt_term::locale_encode (SV *str) 1432rxvt_term::locale_encode (SV *str)
1339 CODE: 1433 CODE:
1340{ 1434{
1435 if (!SvOK (str))
1436 XSRETURN_UNDEF;
1437
1341 wchar_t *wstr = sv2wcs (str); 1438 wchar_t *wstr = sv2wcs (str);
1342 1439
1343 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1344 char *mbstr = rxvt_wcstombs (wstr); 1441 char *mbstr = rxvt_wcstombs (wstr);
1345 rxvt_pop_locale (); 1442 rxvt_pop_locale ();
1354 1451
1355SV * 1452SV *
1356rxvt_term::locale_decode (SV *octets) 1453rxvt_term::locale_decode (SV *octets)
1357 CODE: 1454 CODE:
1358{ 1455{
1456 if (!SvOK (octets))
1457 XSRETURN_UNDEF;
1458
1359 STRLEN len; 1459 STRLEN len;
1360 char *data = SvPVbyte (octets, len); 1460 char *data = SvPVbyte (octets, len);
1361 1461
1362 rxvt_push_locale (THIS->locale); 1462 rxvt_push_locale (THIS->locale);
1363 wchar_t *wstr = rxvt_mbstowcs (data, len); 1463 wchar_t *wstr = rxvt_mbstowcs (data, len);
1420 ModLevel3Mask = 0 1520 ModLevel3Mask = 0
1421 ModMetaMask = 1 1521 ModMetaMask = 1
1422 ModNumLockMask = 2 1522 ModNumLockMask = 2
1423 current_screen = 3 1523 current_screen = 3
1424 hidden_cursor = 4 1524 hidden_cursor = 4
1525 priv_modes = 5
1425 CODE: 1526 CODE:
1426 switch (ix) 1527 switch (ix)
1427 { 1528 {
1428 case 0: RETVAL = THIS->ModLevel3Mask; break; 1529 case 0: RETVAL = THIS->ModLevel3Mask; break;
1429 case 1: RETVAL = THIS->ModMetaMask; break; 1530 case 1: RETVAL = THIS->ModMetaMask; break;
1432#ifdef CURSOR_BLINK 1533#ifdef CURSOR_BLINK
1433 case 4: RETVAL = THIS->hidden_cursor; break; 1534 case 4: RETVAL = THIS->hidden_cursor; break;
1434#else 1535#else
1435 case 4: RETVAL = 0; break; 1536 case 4: RETVAL = 0; break;
1436#endif 1537#endif
1538 case 5: RETVAL = THIS->priv_modes; break;
1437 } 1539 }
1438 OUTPUT: 1540 OUTPUT:
1439 RETVAL 1541 RETVAL
1440 1542
1441char * 1543char *
1524 THIS->rstyle = new_rstyle; 1626 THIS->rstyle = new_rstyle;
1525 OUTPUT: 1627 OUTPUT:
1526 RETVAL 1628 RETVAL
1527 1629
1528int 1630int
1529rxvt_term::view_start (int newval = 1) 1631rxvt_term::view_start (int newval = 0)
1530 PROTOTYPE: $;$ 1632 PROTOTYPE: $;$
1531 CODE: 1633 CODE:
1532{ 1634{
1533 RETVAL = THIS->view_start; 1635 RETVAL = THIS->view_start;
1534 1636 if (items > 1)
1535 if (newval <= 0)
1536 THIS->scr_changeview (max (newval, THIS->top_row)); 1637 THIS->scr_changeview (newval);
1537} 1638}
1538 OUTPUT: 1639 OUTPUT:
1539 RETVAL 1640 RETVAL
1540 1641
1541void 1642void
1751 // find length 1852 // find length
1752 for (wchar_t *s = wstr; *s; s++) 1853 for (wchar_t *s = wstr; *s; s++)
1753 if (*s == NOCHAR) 1854 if (*s == NOCHAR)
1754 ; 1855 ;
1755 else if (IS_COMPOSE (*s)) 1856 else if (IS_COMPOSE (*s))
1756 dlen += rxvt_composite.expand (*s, 0); 1857 dlen += rxvt_composite.expand (*s);
1757 else 1858 else
1758 dlen++; 1859 dlen++;
1759 1860
1760 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1861 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1761 1862
1799 index += rs->value; 1900 index += rs->value;
1800 } 1901 }
1801 else 1902 else
1802 { 1903 {
1803 --rs; 1904 --rs;
1804 name = ""; 1905 name = (octet_string)"";
1805 } 1906 }
1806 1907
1807 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1908 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1808 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1909 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1809 1910
2095 int count; 2196 int count;
2096 Atom *props = XListProperties (THIS->dpy, window, &count); 2197 Atom *props = XListProperties (THIS->dpy, window, &count);
2097 2198
2098 EXTEND (SP, count); 2199 EXTEND (SP, count);
2099 while (count--) 2200 while (count--)
2100 PUSHs (newSVuv ((U32)props [count])); 2201 PUSHs (sv_2mortal (newSVuv ((U32)props [count])));
2101 2202
2102 XFree (props); 2203 XFree (props);
2103} 2204}
2104 2205
2105void 2206void
2121 int elemsize = format == 16 ? sizeof (short) 2222 int elemsize = format == 16 ? sizeof (short)
2122 : format == 32 ? sizeof (long) 2223 : format == 32 ? sizeof (long)
2123 : 1; 2224 : 1;
2124 2225
2125 EXTEND (SP, 3); 2226 EXTEND (SP, 3);
2126 PUSHs (newSVuv ((U32)type)); 2227 PUSHs (sv_2mortal (newSVuv ((U32)type)));
2127 PUSHs (newSViv (format)); 2228 PUSHs (sv_2mortal (newSViv (format)));
2128 PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); 2229 PUSHs (sv_2mortal (newSVpvn ((char *)prop, nitems * elemsize)));
2129 XFree (prop); 2230 XFree (prop);
2130 } 2231 }
2131} 2232}
2132 2233
2133void 2234void
2157 XFree (RETVAL); 2258 XFree (RETVAL);
2158 2259
2159void 2260void
2160XDeleteProperty (rxvt_term *term, Window window, Atom property) 2261XDeleteProperty (rxvt_term *term, Window window, Atom property)
2161 C_ARGS: term->dpy, window, property 2262 C_ARGS: term->dpy, window, property
2263
2264void
2265rxvt_term::XShapeQueryVersion ()
2266 PPCODE:
2267 int major, minor;
2268 EXTEND (SP, 2);
2269 if (XShapeQueryVersion (THIS->display->dpy, &major, &minor))
2270 {
2271 PUSHs (sv_2mortal (newSViv (major)));
2272 PUSHs (sv_2mortal (newSViv (minor)));
2273 }
2274
2275void
2276XShapeCombineRegion (rxvt_term *term, Window dest, int destKind, int xOff, int yOff, Region r, int op)
2277 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, r, op
2278
2279void
2280XShapeCombineMask (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int op)
2281 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, op
2282
2283void
2284XShapeCombineShape (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int srcKind, int op)
2285 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, srcKind, op
2162 2286
2163Window 2287Window
2164rxvt_term::DefaultRootWindow () 2288rxvt_term::DefaultRootWindow ()
2165 CODE: 2289 CODE:
2166 RETVAL = THIS->display->root; 2290 RETVAL = THIS->display->root;
2211 Window child; 2335 Window child;
2212 2336
2213 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child)) 2337 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2214 { 2338 {
2215 EXTEND (SP, 3); 2339 EXTEND (SP, 3);
2216 PUSHs (newSViv (dx)); 2340 PUSHs (sv_2mortal (newSViv (dx)));
2217 PUSHs (newSViv (dy)); 2341 PUSHs (sv_2mortal (newSViv (dy)));
2218 PUSHs (newSVuv (child)); 2342 PUSHs (sv_2mortal (newSVuv (child)));
2219 } 2343 }
2220} 2344}
2221 2345
2222############################################################################# 2346#############################################################################
2223# fancy bg bloatstuff (TODO: should be moved up somewhere) 2347# fancy bg bloatstuff (TODO: should be moved up somewhere)
2279 RETVAL 2403 RETVAL
2280 2404
2281#endif 2405#endif
2282 2406
2283void 2407void
2284rxvt_term::set_background (rxvt_img *img, bool border = false) 2408rxvt_term::clr_background ()
2285 CODE: 2409 CODE:
2286 delete THIS->bg_img; 2410 delete THIS->bg_img;
2287 THIS->bg_img = 0; 2411 THIS->bg_img = 0;
2412 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2413
2414void
2415rxvt_term::set_background (rxvt_img *img, bool border = false)
2416 CODE:
2417 delete THIS->bg_img;
2288 THIS->bg_flags = 0; 2418 THIS->bg_img = 0;
2419 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2289 2420
2290 if (img) // TODO: cannot be false 2421 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2291 { 2422 {
2292 img = img->clone (); // own the img 2423 img = img->clone (); // own the img
2293 2424
2294 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2425 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2295 img->sub_rect (0, 0, 2426 img->sub_rect (0, 0,
2303 2434
2304 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2435 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2305 ->replace (img); 2436 ->replace (img);
2306 2437
2307 THIS->bg_img = img; 2438 THIS->bg_img = img;
2308 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2309 2439
2310 if (!border) 2440 if (!border)
2311 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2441 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2312 } 2442 }
2313 2443
2390 2520
2391void 2521void
2392rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2522rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2393 PROTOTYPE: $;$$$$ 2523 PROTOTYPE: $;$$$$
2394 INIT: 2524 INIT:
2395 rgba cc = parse_rgba (c, THIS->s); 2525 rxvt_screen screen;
2526 screen.set (THIS->d);
2527 rgba cc = parse_rgba (c, &screen);
2396 C_ARGS: cc, x, y, w, h 2528 C_ARGS: cc, x, y, w, h
2397 2529
2398void 2530void
2399rxvt_img::DESTROY () 2531rxvt_img::DESTROY ()
2400 CODE: 2532 CODE:
2458rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2590rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2459 2591
2460rxvt_img * 2592rxvt_img *
2461rxvt_img::tint (SV *c) 2593rxvt_img::tint (SV *c)
2462 INIT: 2594 INIT:
2463 rgba cc = parse_rgba (c, THIS->s); 2595 rxvt_screen screen;
2596 screen.set (THIS->d);
2597 rgba cc = parse_rgba (c, &screen);
2464 C_ARGS: cc 2598 C_ARGS: cc
2465 2599
2466rxvt_img * 2600rxvt_img *
2467rxvt_img::shade (rxvt_img::nv factor) 2601rxvt_img::shade (rxvt_img::nv factor)
2468 2602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines