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.235 by sf-exg, Tue Feb 17 14:48:59 2015 UTC vs.
Revision 1.257 by root, Fri Dec 30 16:51:59 2022 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;
291 break; 298 break;
292 299
293 for (; i < AvFILL (overlay_av); i++) 300 for (; i < AvFILL (overlay_av); i++)
294 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 301 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
295 302
296 av_pop (overlay_av); 303 SvREFCNT_dec (av_pop (overlay_av));
297 304
298 SvREFCNT_dec (overlay_av); 305 SvREFCNT_dec (overlay_av);
299 overlay_av = 0; 306 overlay_av = 0;
300 307
301 THIS->want_refresh = 1; 308 THIS->want_refresh = 1;
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)
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),
928 const_iv (SelectionRequest), 943 const_iv (SelectionRequest),
929 const_iv (SelectionNotify), 944 const_iv (SelectionNotify),
930 const_iv (ColormapNotify), 945 const_iv (ColormapNotify),
931 const_iv (ClientMessage), 946 const_iv (ClientMessage),
932 const_iv (MappingNotify), 947 const_iv (MappingNotify),
948
949 // shape extension
950 const_iv (ShapeSet),
951 const_iv (ShapeUnion),
952 const_iv (ShapeIntersect),
953 const_iv (ShapeSubtract),
954 const_iv (ShapeInvert),
955
956 const_iv (ShapeBounding),
957 const_iv (ShapeClip),
958 const_iv (ShapeInput),
959
960 // XIM
933# if ENABLE_XIM_ONTHESPOT 961# if ENABLE_XIM_ONTHESPOT
934 const_iv (XIMReverse), 962 const_iv (XIMReverse),
935 const_iv (XIMUnderline), 963 const_iv (XIMUnderline),
936 const_iv (XIMHighlight), 964 const_iv (XIMHighlight),
937 const_iv (XIMPrimary), 965 const_iv (XIMPrimary),
938 const_iv (XIMSecondary), 966 const_iv (XIMSecondary),
939 const_iv (XIMTertiary), 967 const_iv (XIMTertiary),
940 const_iv (XIMVisibleToForward), 968 const_iv (XIMVisibleToForward),
941 const_iv (XIMVisibleToBackword), 969 const_iv (XIMVisibleToBackword),
942 const_iv (XIMVisibleToCenter), 970 const_iv (XIMVisibleToCenter),
971# endif
943#if XRENDER 972# if XRENDER
944 const_iv (PictStandardARGB32), 973 const_iv (PictStandardARGB32),
945 const_iv (PictStandardRGB24), 974 const_iv (PictStandardRGB24),
946 const_iv (PictStandardA8), 975 const_iv (PictStandardA8),
947 const_iv (PictStandardA4), 976 const_iv (PictStandardA4),
948 const_iv (PictStandardA1), 977 const_iv (PictStandardA1),
1004 const_iv (PictOpExclusion), 1033 const_iv (PictOpExclusion),
1005 const_iv (PictOpHSLHue), 1034 const_iv (PictOpHSLHue),
1006 const_iv (PictOpHSLSaturation), 1035 const_iv (PictOpHSLSaturation),
1007 const_iv (PictOpHSLColor), 1036 const_iv (PictOpHSLColor),
1008 const_iv (PictOpHSLLuminosity), 1037 const_iv (PictOpHSLLuminosity),
1009#endif 1038# endif
1010# if 0 1039# if 0
1011 const_iv (XIMForwardChar), 1040 const_iv (XIMForwardChar),
1012 const_iv (XIMBackwardChar), 1041 const_iv (XIMBackwardChar),
1013 const_iv (XIMForwardWord), 1042 const_iv (XIMForwardWord),
1014 const_iv (XIMBackwardWord), 1043 const_iv (XIMBackwardWord),
1019 const_iv (XIMLineStart), 1048 const_iv (XIMLineStart),
1020 const_iv (XIMLineEnd), 1049 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1050 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1051 const_iv (XIMDontChange),
1023# endif 1052# endif
1024# endif 1053
1054 /* DEC private modes */
1055 const_iv (PrivMode_132),
1056 const_iv (PrivMode_132OK),
1057 const_iv (PrivMode_rVideo),
1058 const_iv (PrivMode_relOrigin),
1059 const_iv (PrivMode_Screen),
1060 const_iv (PrivMode_Autowrap),
1061 const_iv (PrivMode_aplCUR),
1062 const_iv (PrivMode_aplKP),
1063 const_iv (PrivMode_HaveBackSpace),
1064 const_iv (PrivMode_BackSpace),
1065 const_iv (PrivMode_ShiftKeys),
1066 const_iv (PrivMode_VisibleCursor),
1067 const_iv (PrivMode_MouseX10),
1068 const_iv (PrivMode_MouseX11),
1069 const_iv (PrivMode_scrollBar),
1070 const_iv (PrivMode_TtyOutputInh),
1071 const_iv (PrivMode_Keypress),
1072 const_iv (PrivMode_smoothScroll),
1073 const_iv (PrivMode_vt52),
1074 const_iv (PrivMode_LFNL),
1075 const_iv (PrivMode_MouseBtnEvent),
1076 const_iv (PrivMode_MouseAnyEvent),
1077 const_iv (PrivMode_BracketPaste),
1078 const_iv (PrivMode_ExtMouseUTF8),
1079 const_iv (PrivMode_ExtMouseUrxvt),
1080 const_iv (PrivMode_BlinkingCursor),
1081 const_iv (PrivMode_mouse_report),
1082 const_iv (PrivMode_Default),
1025 }; 1083 };
1026 1084
1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1085 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1086 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1087}
1107int 1165int
1108SET_CUSTOM (int rend, int new_value) 1166SET_CUSTOM (int rend, int new_value)
1109 CODE: 1167 CODE:
1110{ 1168{
1111 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1169 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1112 croak ("custom value out of range, must be 0..%d", RS_customCount - 1); 1170 croak ("custom value out of range, must be 0..%lu", RS_customCount - 1);
1113 1171
1114 RETVAL = (rend & ~RS_customMask) 1172 RETVAL = (rend & ~RS_customMask)
1115 | ((new_value << RS_customShift) & RS_customMask); 1173 | ((new_value << RS_customShift) & RS_customMask);
1116} 1174}
1117 OUTPUT: 1175 OUTPUT:
1336 1394
1337SV * 1395SV *
1338rxvt_term::locale_encode (SV *str) 1396rxvt_term::locale_encode (SV *str)
1339 CODE: 1397 CODE:
1340{ 1398{
1399 if (!SvOK (str))
1400 XSRETURN_UNDEF;
1401
1341 wchar_t *wstr = sv2wcs (str); 1402 wchar_t *wstr = sv2wcs (str);
1342 1403
1343 rxvt_push_locale (THIS->locale); 1404 rxvt_push_locale (THIS->locale);
1344 char *mbstr = rxvt_wcstombs (wstr); 1405 char *mbstr = rxvt_wcstombs (wstr);
1345 rxvt_pop_locale (); 1406 rxvt_pop_locale ();
1354 1415
1355SV * 1416SV *
1356rxvt_term::locale_decode (SV *octets) 1417rxvt_term::locale_decode (SV *octets)
1357 CODE: 1418 CODE:
1358{ 1419{
1420 if (!SvOK (octets))
1421 XSRETURN_UNDEF;
1422
1359 STRLEN len; 1423 STRLEN len;
1360 char *data = SvPVbyte (octets, len); 1424 char *data = SvPVbyte (octets, len);
1361 1425
1362 rxvt_push_locale (THIS->locale); 1426 rxvt_push_locale (THIS->locale);
1363 wchar_t *wstr = rxvt_mbstowcs (data, len); 1427 wchar_t *wstr = rxvt_mbstowcs (data, len);
1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1451#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1452#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1453#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1390 1454
1391int 1455int
1392rxvt_term::width () 1456rxvt_term::width (int new_value = NO_INIT)
1393 ALIAS: 1457 ALIAS:
1394 width = TERM_OFFSET_width 1458 width = TERM_OFFSET_width
1395 height = TERM_OFFSET_height 1459 height = TERM_OFFSET_height
1396 fwidth = TERM_OFFSET_fwidth 1460 fwidth = TERM_OFFSET_fwidth
1397 fheight = TERM_OFFSET_fheight 1461 fheight = TERM_OFFSET_fheight
1407 saveLines = TERM_OFFSET_saveLines 1471 saveLines = TERM_OFFSET_saveLines
1408 total_rows = TERM_OFFSET_total_rows 1472 total_rows = TERM_OFFSET_total_rows
1409 top_row = TERM_OFFSET_top_row 1473 top_row = TERM_OFFSET_top_row
1410 CODE: 1474 CODE:
1411 RETVAL = *(int *)((char *)THIS + ix); 1475 RETVAL = *(int *)((char *)THIS + ix);
1476 if (items > 1)
1477 *(int *)((char *)THIS + ix) = new_value;
1412 OUTPUT: 1478 OUTPUT:
1413 RETVAL 1479 RETVAL
1414 1480
1415unsigned int 1481unsigned int
1416rxvt_term::ModLevel3Mask () 1482rxvt_term::ModLevel3Mask ()
1418 ModLevel3Mask = 0 1484 ModLevel3Mask = 0
1419 ModMetaMask = 1 1485 ModMetaMask = 1
1420 ModNumLockMask = 2 1486 ModNumLockMask = 2
1421 current_screen = 3 1487 current_screen = 3
1422 hidden_cursor = 4 1488 hidden_cursor = 4
1489 priv_modes = 5
1423 CODE: 1490 CODE:
1424 switch (ix) 1491 switch (ix)
1425 { 1492 {
1426 case 0: RETVAL = THIS->ModLevel3Mask; break; 1493 case 0: RETVAL = THIS->ModLevel3Mask; break;
1427 case 1: RETVAL = THIS->ModMetaMask; break; 1494 case 1: RETVAL = THIS->ModMetaMask; break;
1428 case 2: RETVAL = THIS->ModNumLockMask; break; 1495 case 2: RETVAL = THIS->ModNumLockMask; break;
1429 case 3: RETVAL = THIS->current_screen; break; 1496 case 3: RETVAL = THIS->current_screen; break;
1430#ifdef CURSOR_BLINK 1497#ifdef CURSOR_BLINK
1431 case 4: RETVAL = THIS->hidden_cursor; break; 1498 case 4: RETVAL = THIS->hidden_cursor; break;
1499#else
1500 case 4: RETVAL = 0; break;
1432#endif 1501#endif
1502 case 5: RETVAL = THIS->priv_modes; break;
1433 } 1503 }
1434 OUTPUT: 1504 OUTPUT:
1435 RETVAL 1505 RETVAL
1436 1506
1437char * 1507char *
1520 THIS->rstyle = new_rstyle; 1590 THIS->rstyle = new_rstyle;
1521 OUTPUT: 1591 OUTPUT:
1522 RETVAL 1592 RETVAL
1523 1593
1524int 1594int
1525rxvt_term::view_start (int newval = 1) 1595rxvt_term::view_start (int newval = 0)
1526 PROTOTYPE: $;$ 1596 PROTOTYPE: $;$
1527 CODE: 1597 CODE:
1528{ 1598{
1529 RETVAL = THIS->view_start; 1599 RETVAL = THIS->view_start;
1530 1600 if (items > 1)
1531 if (newval <= 0)
1532 THIS->scr_changeview (max (newval, THIS->top_row)); 1601 THIS->scr_changeview (newval);
1533} 1602}
1534 OUTPUT: 1603 OUTPUT:
1535 RETVAL 1604 RETVAL
1536 1605
1537void 1606void
1747 // find length 1816 // find length
1748 for (wchar_t *s = wstr; *s; s++) 1817 for (wchar_t *s = wstr; *s; s++)
1749 if (*s == NOCHAR) 1818 if (*s == NOCHAR)
1750 ; 1819 ;
1751 else if (IS_COMPOSE (*s)) 1820 else if (IS_COMPOSE (*s))
1752 dlen += rxvt_composite.expand (*s, 0); 1821 dlen += rxvt_composite.expand (*s);
1753 else 1822 else
1754 dlen++; 1823 dlen++;
1755 1824
1756 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1825 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1757 1826
1795 index += rs->value; 1864 index += rs->value;
1796 } 1865 }
1797 else 1866 else
1798 { 1867 {
1799 --rs; 1868 --rs;
1800 name = ""; 1869 name = (octet_string)"";
1801 } 1870 }
1802 1871
1803 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1872 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1804 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1873 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1805 1874
1862 } 1931 }
1863} 1932}
1864 OUTPUT: 1933 OUTPUT:
1865 RETVAL 1934 RETVAL
1866 1935
1936SV *
1937rxvt_term::lookup_keysym (int keysym, unsigned int state)
1938 CODE:
1939{
1940 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1941 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1942}
1943 OUTPUT:
1944 RETVAL
1945
1867bool 1946bool
1868rxvt_term::bind_action (octet_string keysym, octet_string action) 1947rxvt_term::bind_action (octet_string keysym, octet_string action)
1869 ALIAS: 1948 ALIAS:
1870 parse_keysym = 1 1949 parse_keysym = 1
1871 CODE: 1950 CODE:
2144 2223
2145void 2224void
2146XDeleteProperty (rxvt_term *term, Window window, Atom property) 2225XDeleteProperty (rxvt_term *term, Window window, Atom property)
2147 C_ARGS: term->dpy, window, property 2226 C_ARGS: term->dpy, window, property
2148 2227
2228Region
2229XCreateRegion ()
2230
2231int
2232XUnionRectWithRegion (int x, int y, int w, int h, Region src, Region dst)
2233 CODE:
2234 XRectangle rect;
2235 rect.x = x;
2236 rect.y = y;
2237 rect.width = w;
2238 rect.height = h;
2239 RETVAL = XUnionRectWithRegion (&rect, src, dst);
2240 OUTPUT: RETVAL
2241
2242int
2243XIntersectRegion (Region src1, Region src2, Region res)
2244
2245int
2246XUnionRegion (Region src1, Region src2, Region res)
2247
2248int
2249XSubtractRegion (Region src1, Region src2, Region res)
2250
2251int
2252XXorRegion (Region src1, Region src2, Region res)
2253
2254int
2255XOffsetRegion (Region r, int dx, int dy)
2256
2257int
2258XShrinkRegion (Region r, int dx, int dy)
2259
2260int
2261XDestroyRegion (Region r)
2262
2263void
2264rxvt_term::XShapeQueryVersion ()
2265 PPCODE:
2266 int major, minor;
2267 EXTEND (SP, 2);
2268 if (XShapeQueryVersion (THIS->display->dpy, &major, &minor))
2269 {
2270 PUSHs (sv_2mortal (newSViv (major)));
2271 PUSHs (sv_2mortal (newSViv (minor)));
2272 }
2273
2274void
2275XShapeCombineRegion (rxvt_term *term, Window dest, int destKind, int xOff, int yOff, Region r, int op)
2276 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, r, op
2277
2278void
2279XShapeCombineMask (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int op)
2280 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, op
2281
2282void
2283XShapeCombineShape (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int srcKind, int op)
2284 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, srcKind, op
2285
2149Window 2286Window
2150rxvt_term::DefaultRootWindow () 2287rxvt_term::DefaultRootWindow ()
2151 CODE: 2288 CODE:
2152 RETVAL = THIS->display->root; 2289 RETVAL = THIS->display->root;
2153 OUTPUT: 2290 OUTPUT:
2265 RETVAL 2402 RETVAL
2266 2403
2267#endif 2404#endif
2268 2405
2269void 2406void
2270rxvt_term::set_background (rxvt_img *img, bool border = false) 2407rxvt_term::clr_background ()
2271 CODE: 2408 CODE:
2272 delete THIS->bg_img; 2409 delete THIS->bg_img;
2273 THIS->bg_img = 0; 2410 THIS->bg_img = 0;
2411 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2412
2413void
2414rxvt_term::set_background (rxvt_img *img, bool border = false)
2415 CODE:
2416 delete THIS->bg_img;
2274 THIS->bg_flags = 0; 2417 THIS->bg_img = 0;
2418 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2275 2419
2276 if (img) // TODO: cannot be false 2420 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2277 { 2421 {
2278 img = img->clone (); // own the img 2422 img = img->clone (); // own the img
2279 2423
2280 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2424 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2281 img->sub_rect (0, 0, 2425 img->sub_rect (0, 0,
2289 2433
2290 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2434 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2291 ->replace (img); 2435 ->replace (img);
2292 2436
2293 THIS->bg_img = img; 2437 THIS->bg_img = img;
2294 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2295 2438
2296 if (!border) 2439 if (!border)
2297 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2440 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2298 } 2441 }
2299 2442
2376 2519
2377void 2520void
2378rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2521rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2379 PROTOTYPE: $;$$$$ 2522 PROTOTYPE: $;$$$$
2380 INIT: 2523 INIT:
2381 rgba cc = parse_rgba (c, THIS->s); 2524 rxvt_screen screen;
2525 screen.set (THIS->d);
2526 rgba cc = parse_rgba (c, &screen);
2382 C_ARGS: cc, x, y, w, h 2527 C_ARGS: cc, x, y, w, h
2383 2528
2384void 2529void
2385rxvt_img::DESTROY () 2530rxvt_img::DESTROY ()
2386 CODE: 2531 CODE:
2444rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2589rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2445 2590
2446rxvt_img * 2591rxvt_img *
2447rxvt_img::tint (SV *c) 2592rxvt_img::tint (SV *c)
2448 INIT: 2593 INIT:
2449 rgba cc = parse_rgba (c, THIS->s); 2594 rxvt_screen screen;
2595 screen.set (THIS->d);
2596 rgba cc = parse_rgba (c, &screen);
2450 C_ARGS: cc 2597 C_ARGS: cc
2451 2598
2452rxvt_img * 2599rxvt_img *
2453rxvt_img::shade (rxvt_img::nv factor) 2600rxvt_img::shade (rxvt_img::nv factor)
2454 2601

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines