[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtperl.xs

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.255 by root, Sun Nov 21 23:00:48 2021 UTC

…		…
82	if (len != 1 && len != 3 && len != 4)	82	if (len != 1 && len != 3 && len != 4)
83	croak ("component colour array must have 1, 3 or 4 components,");	83	croak ("component colour array must have 1, 3 or 4 components,");
84		84
85	c.a = rgba::MAX_CC;	85	c.a = rgba::MAX_CC;
86		86
87	c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));	87	c.r = c.g = c.b = float_to_component (SvNV (*av_fetch (av, 0, 0)));
88		88
89	if (len >= 3)	89	if (len >= 3)
90	{	90	{
91	c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));	91	c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
92	c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));	92	c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
93		93
94	if (len >= 4)	94	if (len >= 4)
95	c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));	95	c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
96	}	96	}
97	}	97	}
98	else if (s)	98	else if (s)
99	{	99	{
100	rxvt_color rc;	100	rxvt_color rc;
…		…
291	break;	291	break;
292		292
293	for (; i < AvFILL (overlay_av); i++)	293	for (; i < AvFILL (overlay_av); i++)
294	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)));
295		295
296	av_pop (overlay_av);	296	SvREFCNT_dec (av_pop (overlay_av));
297		297
298	SvREFCNT_dec (overlay_av);	298	SvREFCNT_dec (overlay_av);
299	overlay_av = 0;	299	overlay_av = 0;
300		300
301	THIS->want_refresh = 1;	301	THIS->want_refresh = 1;
…		…
370		370
371	struct rxvt_perl_interp rxvt_perl;	371	struct rxvt_perl_interp rxvt_perl;
372		372
373	static PerlInterpreter *perl;	373	static PerlInterpreter *perl;
374		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... */
375	rxvt_perl_interp::~rxvt_perl_interp ()	378	rxvt_perl_interp::~rxvt_perl_interp ()
376	{	379	{
377	if (perl)	380	if (perl)
378	{	381	{
		382	localise_env set_environ (perl_environ);
379	perl_destruct (perl);	383	perl_destruct (perl);
380	perl_free (perl);	384	perl_free (perl);
381	PERL_SYS_TERM ();	385	PERL_SYS_TERM ();
382	}	386	}
383	}	387	}
		388	#endif
384		389
385	void	390	void
386	rxvt_perl_interp::init ()	391	rxvt_perl_interp::init ()
387	{	392	{
388	if (!perl)	393	if (!perl)
…		…
391		396
392	{	397	{
393	perl_environ = rxvt_environ;	398	perl_environ = rxvt_environ;
394	localise_env set_environ (perl_environ);	399	localise_env set_environ (perl_environ);
395		400
396	char *args[] = {	401	const char *args[] = {
397	"",	402	"",
398	"-e"	403	"-e"
399	"BEGIN {"	404	"BEGIN {"
400	" urxvt->bootstrap;"	405	" urxvt->bootstrap;"
401	" unshift @INC, '" LIBDIR "';"	406	" unshift @INC, '" LIBDIR "';"
402	"}"	407	"}"
403	""	408	""
404	"use urxvt;"	409	"use urxvt;",
		410	0
405	};	411	};
406	int argc = ecb_array_length (args);	412	int argc = ecb_array_length (args) - 1;
407	char **argv = args;	413	char argv = (char )args;
408		414
409	PERL_SYS_INIT3 (&argc, &argv, &environ);	415	PERL_SYS_INIT3 (&argc, &argv, &environ);
410	perl = perl_alloc ();	416	perl = perl_alloc ();
411	perl_construct (perl);	417	perl_construct (perl);
412		418
…		…
523	THIS->perl.grabtime = 0;	529	THIS->perl.grabtime = 0;
524	}	530	}
525	}	531	}
526		532
527	bool	533	bool
528	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	534	rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
529	{	535	{
530	if (!perl \|\| !term->perl.self)	536	if (!perl \|\| !term->perl.self)
531	return false;	537	return false;
532		538
533	localise_env set_environ (perl_environ);	539	localise_env set_environ (perl_environ);
…		…
815	} *civ, const_iv[] = {	821	} *civ, const_iv[] = {
816	# define const_iv(name) { # name, (IV)name }	822	# define const_iv(name) { # name, (IV)name }
817	const_iv (HOOK_INIT),	823	const_iv (HOOK_INIT),
818	const_iv (HOOK_DESTROY),	824	const_iv (HOOK_DESTROY),
819	const_iv (HOOK_ACTION),	825	const_iv (HOOK_ACTION),
		826	const_iv (HOOK_OSC_SEQ),
		827	const_iv (HOOK_OSC_SEQ_PERL),
820		828
821	const_iv (NUM_RESOURCES),	829	const_iv (NUM_RESOURCES),
822	const_iv (DEFAULT_RSTYLE),	830	const_iv (DEFAULT_RSTYLE),
823	const_iv (OVERLAY_RSTYLE),	831	const_iv (OVERLAY_RSTYLE),
824	const_iv (Color_Bits),	832	const_iv (Color_Bits),
…		…
1020	const_iv (XIMLineEnd),	1028	const_iv (XIMLineEnd),
1021	const_iv (XIMAbsolutePosition),	1029	const_iv (XIMAbsolutePosition),
1022	const_iv (XIMDontChange),	1030	const_iv (XIMDontChange),
1023	# endif	1031	# endif
1024	# endif	1032	# endif
		1033
		1034	/* DEC private modes */
		1035	const_iv (PrivMode_132),
		1036	const_iv (PrivMode_132OK),
		1037	const_iv (PrivMode_rVideo),
		1038	const_iv (PrivMode_relOrigin),
		1039	const_iv (PrivMode_Screen),
		1040	const_iv (PrivMode_Autowrap),
		1041	const_iv (PrivMode_aplCUR),
		1042	const_iv (PrivMode_aplKP),
		1043	const_iv (PrivMode_HaveBackSpace),
		1044	const_iv (PrivMode_BackSpace),
		1045	const_iv (PrivMode_ShiftKeys),
		1046	const_iv (PrivMode_VisibleCursor),
		1047	const_iv (PrivMode_MouseX10),
		1048	const_iv (PrivMode_MouseX11),
		1049	const_iv (PrivMode_scrollBar),
		1050	const_iv (PrivMode_TtyOutputInh),
		1051	const_iv (PrivMode_Keypress),
		1052	const_iv (PrivMode_smoothScroll),
		1053	const_iv (PrivMode_vt52),
		1054	const_iv (PrivMode_LFNL),
		1055	const_iv (PrivMode_MouseBtnEvent),
		1056	const_iv (PrivMode_MouseAnyEvent),
		1057	const_iv (PrivMode_BracketPaste),
		1058	const_iv (PrivMode_ExtMouseUTF8),
		1059	const_iv (PrivMode_ExtMouseUrxvt),
		1060	const_iv (PrivMode_BlinkingCursor),
		1061	const_iv (PrivMode_mouse_report),
		1062	const_iv (PrivMode_Default),
1025	};	1063	};
1026		1064
1027	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	1065	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	1066	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029	}	1067	}
…		…
1336		1374
1337	SV *	1375	SV *
1338	rxvt_term::locale_encode (SV *str)	1376	rxvt_term::locale_encode (SV *str)
1339	CODE:	1377	CODE:
1340	{	1378	{
		1379	if (!SvOK (str))
		1380	XSRETURN_UNDEF;
		1381
1341	wchar_t *wstr = sv2wcs (str);	1382	wchar_t *wstr = sv2wcs (str);
1342		1383
1343	rxvt_push_locale (THIS->locale);	1384	rxvt_push_locale (THIS->locale);
1344	char *mbstr = rxvt_wcstombs (wstr);	1385	char *mbstr = rxvt_wcstombs (wstr);
1345	rxvt_pop_locale ();	1386	rxvt_pop_locale ();
…		…
1354		1395
1355	SV *	1396	SV *
1356	rxvt_term::locale_decode (SV *octets)	1397	rxvt_term::locale_decode (SV *octets)
1357	CODE:	1398	CODE:
1358	{	1399	{
		1400	if (!SvOK (octets))
		1401	XSRETURN_UNDEF;
		1402
1359	STRLEN len;	1403	STRLEN len;
1360	char *data = SvPVbyte (octets, len);	1404	char *data = SvPVbyte (octets, len);
1361		1405
1362	rxvt_push_locale (THIS->locale);	1406	rxvt_push_locale (THIS->locale);
1363	wchar_t *wstr = rxvt_mbstowcs (data, len);	1407	wchar_t *wstr = rxvt_mbstowcs (data, len);
…		…
1387	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1431	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1388	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1432	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1389	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)	1433	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1390		1434
1391	int	1435	int
1392	rxvt_term::width ()	1436	rxvt_term::width (int new_value = NO_INIT)
1393	ALIAS:	1437	ALIAS:
1394	width = TERM_OFFSET_width	1438	width = TERM_OFFSET_width
1395	height = TERM_OFFSET_height	1439	height = TERM_OFFSET_height
1396	fwidth = TERM_OFFSET_fwidth	1440	fwidth = TERM_OFFSET_fwidth
1397	fheight = TERM_OFFSET_fheight	1441	fheight = TERM_OFFSET_fheight
…		…
1407	saveLines = TERM_OFFSET_saveLines	1451	saveLines = TERM_OFFSET_saveLines
1408	total_rows = TERM_OFFSET_total_rows	1452	total_rows = TERM_OFFSET_total_rows
1409	top_row = TERM_OFFSET_top_row	1453	top_row = TERM_OFFSET_top_row
1410	CODE:	1454	CODE:
1411	RETVAL = (int )((char *)THIS + ix);	1455	RETVAL = (int )((char *)THIS + ix);
		1456	if (items > 1)
		1457	(int )((char *)THIS + ix) = new_value;
1412	OUTPUT:	1458	OUTPUT:
1413	RETVAL	1459	RETVAL
1414		1460
1415	unsigned int	1461	unsigned int
1416	rxvt_term::ModLevel3Mask ()	1462	rxvt_term::ModLevel3Mask ()
…		…
1418	ModLevel3Mask = 0	1464	ModLevel3Mask = 0
1419	ModMetaMask = 1	1465	ModMetaMask = 1
1420	ModNumLockMask = 2	1466	ModNumLockMask = 2
1421	current_screen = 3	1467	current_screen = 3
1422	hidden_cursor = 4	1468	hidden_cursor = 4
		1469	priv_modes = 5
1423	CODE:	1470	CODE:
1424	switch (ix)	1471	switch (ix)
1425	{	1472	{
1426	case 0: RETVAL = THIS->ModLevel3Mask; break;	1473	case 0: RETVAL = THIS->ModLevel3Mask; break;
1427	case 1: RETVAL = THIS->ModMetaMask; break;	1474	case 1: RETVAL = THIS->ModMetaMask; break;
1428	case 2: RETVAL = THIS->ModNumLockMask; break;	1475	case 2: RETVAL = THIS->ModNumLockMask; break;
1429	case 3: RETVAL = THIS->current_screen; break;	1476	case 3: RETVAL = THIS->current_screen; break;
1430	#ifdef CURSOR_BLINK	1477	#ifdef CURSOR_BLINK
1431	case 4: RETVAL = THIS->hidden_cursor; break;	1478	case 4: RETVAL = THIS->hidden_cursor; break;
		1479	#else
		1480	case 4: RETVAL = 0; break;
1432	#endif	1481	#endif
		1482	case 5: RETVAL = THIS->priv_modes; break;
1433	}	1483	}
1434	OUTPUT:	1484	OUTPUT:
1435	RETVAL	1485	RETVAL
1436		1486
1437	char *	1487	char *
…		…
1520	THIS->rstyle = new_rstyle;	1570	THIS->rstyle = new_rstyle;
1521	OUTPUT:	1571	OUTPUT:
1522	RETVAL	1572	RETVAL
1523		1573
1524	int	1574	int
1525	rxvt_term::view_start (int newval = 1)	1575	rxvt_term::view_start (int newval = 0)
1526	PROTOTYPE: $;$	1576	PROTOTYPE: $;$
1527	CODE:	1577	CODE:
1528	{	1578	{
1529	RETVAL = THIS->view_start;	1579	RETVAL = THIS->view_start;
1530		1580	if (items > 1)
1531	if (newval <= 0)
1532	THIS->scr_changeview (max (newval, THIS->top_row));	1581	THIS->scr_changeview (newval);
1533	}	1582	}
1534	OUTPUT:	1583	OUTPUT:
1535	RETVAL	1584	RETVAL
1536		1585
1537	void	1586	void
…		…
1747	// find length	1796	// find length
1748	for (wchar_t s = wstr; s; s++)	1797	for (wchar_t s = wstr; s; s++)
1749	if (*s == NOCHAR)	1798	if (*s == NOCHAR)
1750	;	1799	;
1751	else if (IS_COMPOSE (*s))	1800	else if (IS_COMPOSE (*s))
1752	dlen += rxvt_composite.expand (*s, 0);	1801	dlen += rxvt_composite.expand (*s);
1753	else	1802	else
1754	dlen++;	1803	dlen++;
1755		1804
1756	wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);	1805	wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1757		1806
…		…
1795	index += rs->value;	1844	index += rs->value;
1796	}	1845	}
1797	else	1846	else
1798	{	1847	{
1799	--rs;	1848	--rs;
1800	name = "";	1849	name = (octet_string)"";
1801	}	1850	}
1802		1851
1803	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1852	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1804	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1853	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1805		1854
…		…
1862	}	1911	}
1863	}	1912	}
1864	OUTPUT:	1913	OUTPUT:
1865	RETVAL	1914	RETVAL
1866		1915
		1916	SV *
		1917	rxvt_term::lookup_keysym (int keysym, unsigned int state)
		1918	CODE:
		1919	{
		1920	keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
		1921	RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
		1922	}
		1923	OUTPUT:
		1924	RETVAL
		1925
1867	bool	1926	bool
1868	rxvt_term::bind_action (octet_string keysym, octet_string action)	1927	rxvt_term::bind_action (octet_string keysym, octet_string action)
1869	ALIAS:	1928	ALIAS:
1870	parse_keysym = 1	1929	parse_keysym = 1
1871	CODE:	1930	CODE:
…		…
2265	RETVAL	2324	RETVAL
2266		2325
2267	#endif	2326	#endif
2268		2327
2269	void	2328	void
2270	rxvt_term::set_background (rxvt_img *img, bool border = false)	2329	rxvt_term::clr_background ()
2271	CODE:	2330	CODE:
2272	delete THIS->bg_img;	2331	delete THIS->bg_img;
2273	THIS->bg_img = 0;	2332	THIS->bg_img = 0;
		2333	THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
		2334
		2335	void
		2336	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2337	CODE:
		2338	delete THIS->bg_img;
2274	THIS->bg_flags = 0;	2339	THIS->bg_img = 0;
		2340	THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2275		2341
2276	if (img) // TODO: cannot be false	2342	//if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2277	{	2343	{
2278	img = img->clone (); // own the img	2344	img = img->clone (); // own the img
2279		2345
2280	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap	2346	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2281	img->sub_rect (0, 0,	2347	img->sub_rect (0, 0,
…		…
2289		2355
2290	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])	2356	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2291	->replace (img);	2357	->replace (img);
2292		2358
2293	THIS->bg_img = img;	2359	THIS->bg_img = img;
2294	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
2295		2360
2296	if (!border)	2361	if (!border)
2297	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;	2362	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2298	}	2363	}
2299		2364
…		…
2376		2441
2377	void	2442	void
2378	rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)	2443	rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2379	PROTOTYPE: $;$$$$	2444	PROTOTYPE: $;$$$$
2380	INIT:	2445	INIT:
2381	rgba cc = parse_rgba (c, THIS->s);	2446	rxvt_screen screen;
		2447	screen.set (THIS->d);
		2448	rgba cc = parse_rgba (c, &screen);
2382	C_ARGS: cc, x, y, w, h	2449	C_ARGS: cc, x, y, w, h
2383		2450
2384	void	2451	void
2385	rxvt_img::DESTROY ()	2452	rxvt_img::DESTROY ()
2386	CODE:	2453	CODE:
…		…
2444	rxvt_img::rotate (int x, int y, rxvt_img::nv phi)	2511	rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2445		2512
2446	rxvt_img *	2513	rxvt_img *
2447	rxvt_img::tint (SV *c)	2514	rxvt_img::tint (SV *c)
2448	INIT:	2515	INIT:
2449	rgba cc = parse_rgba (c, THIS->s);	2516	rxvt_screen screen;
		2517	screen.set (THIS->d);
		2518	rgba cc = parse_rgba (c, &screen);
2450	C_ARGS: cc	2519	C_ARGS: cc
2451		2520
2452	rxvt_img *	2521	rxvt_img *
2453	rxvt_img::shade (rxvt_img::nv factor)	2522	rxvt_img::shade (rxvt_img::nv factor)
2454		2523

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

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.255 by root, Sun Nov 21 23:00:48 2021 UTC

Diff Legend

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.255 by root, Sun Nov 21 23:00:48 2021 UTC