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.200 by root, Sun Jun 17 21:58:18 2012 UTC vs.
Revision 1.248 by sf-exg, Sat May 8 06:16:21 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2014 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
… …
81 if (len != 1 && len != 3 && len != 4) 82 if (len != 1 && len != 3 && len != 4)
82 croak ("component colour array must have 1, 3 or 4 components,"); 83 croak ("component colour array must have 1, 3 or 4 components,");
83 84
84 c.a = rgba::MAX_CC; 85 c.a = rgba::MAX_CC;
85 86
86 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)));
87 88
88 if (len >= 3) 89 if (len >= 3)
89 { 90 {
90 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); 91 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
91 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); 92 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
92 93
93 if (len >= 4) 94 if (len >= 4)
94 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); 95 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
95 } 96 }
96 } 97 }
97 else if (s) 98 else if (s)
98 { 99 {
99 rxvt_color rc; 100 rxvt_color rc;
… …
105 106
106 return c; 107 return c;
107} 108}
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
110 112
111static wchar_t * 113static wchar_t *
112sv2wcs (SV *sv) 114sv2wcs (SV *sv)
113{ 115{
114 STRLEN len; 116 STRLEN len;
… …
289 break; 291 break;
290 292
291 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
292 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)));
293 295
294 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
295 297
296 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
297 overlay_av = 0; 299 overlay_av = 0;
298 300
299 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
… …
368 370
369struct rxvt_perl_interp rxvt_perl; 371struct rxvt_perl_interp rxvt_perl;
370 372
371static PerlInterpreter *perl; 373static PerlInterpreter *perl;
372 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... */
373rxvt_perl_interp::~rxvt_perl_interp () 378rxvt_perl_interp::~rxvt_perl_interp ()
374{ 379{
375 if (perl) 380 if (perl)
376 { 381 {
377 perl_destruct (perl); 382 perl_destruct (perl);
378 perl_free (perl); 383 perl_free (perl);
379 PERL_SYS_TERM (); 384 PERL_SYS_TERM ();
380 } 385 }
381} 386}
387#endif
382 388
383void 389void
384rxvt_perl_interp::init () 390rxvt_perl_interp::init ()
385{ 391{
386 if (!perl) 392 if (!perl)
… …
389 395
390 { 396 {
391 perl_environ = rxvt_environ; 397 perl_environ = rxvt_environ;
392 localise_env set_environ (perl_environ); 398 localise_env set_environ (perl_environ);
393 399
394 char *args[] = { 400 const char *args[] = {
395 "", 401 "",
396 "-e" 402 "-e"
397 "BEGIN {" 403 "BEGIN {"
398 " urxvt->bootstrap;" 404 " urxvt->bootstrap;"
399 " unshift @INC, '" LIBDIR "';" 405 " unshift @INC, '" LIBDIR "';"
400 "}" 406 "}"
401 "" 407 ""
402 "use urxvt;" 408 "use urxvt;",
409 0
403 }; 410 };
404 int argc = ecb_array_length (args); 411 int argc = ecb_array_length (args) - 1;
405 char **argv = args; 412 char **argv = (char **)args;
406 413
407 PERL_SYS_INIT3 (&argc, &argv, &environ); 414 PERL_SYS_INIT3 (&argc, &argv, &environ);
408 perl = perl_alloc (); 415 perl = perl_alloc ();
409 perl_construct (perl); 416 perl_construct (perl);
410 417
… …
488 495
489 FREETMPS; 496 FREETMPS;
490 LEAVE; 497 LEAVE;
491 498
492 return ret; 499 return ret;
500}
501
502static void
503_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
504{
505 unsigned int state;
506
507 if (term->parse_keysym (k, state) == -1)
508 return;
509
510 dSP;
511 XPUSHs (sv_2mortal (newSVpv (v, 0)));
512 PUTBACK;
513}
514
515static void
516_keysym_resources (rxvt_term *term)
517{
518 term->enumerate_keysym_resources (_keysym_resource_push);
493} 519}
494 520
495static void 521static void
496ungrab (rxvt_term *THIS) 522ungrab (rxvt_term *THIS)
497{ 523{
… …
791 static const struct { 817 static const struct {
792 const char *name; 818 const char *name;
793 IV iv; 819 IV iv;
794 } *civ, const_iv[] = { 820 } *civ, const_iv[] = {
795# define const_iv(name) { # name, (IV)name } 821# define const_iv(name) { # name, (IV)name }
822 const_iv (HOOK_INIT),
823 const_iv (HOOK_DESTROY),
824 const_iv (HOOK_ACTION),
825
796 const_iv (NUM_RESOURCES), 826 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 827 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 828 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 829 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 830 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
810 const_iv (RS_Bold), 840 const_iv (RS_Bold),
811 const_iv (RS_Italic), 841 const_iv (RS_Italic),
812 const_iv (RS_Blink), 842 const_iv (RS_Blink),
813 const_iv (RS_RVid), 843 const_iv (RS_RVid),
814 const_iv (RS_Uline), 844 const_iv (RS_Uline),
845
846 // TODO: should support all colour constants, create colorinc.h &c
847 const_iv (Color_fg),
848 const_iv (Color_bg),
849#if OFF_FOCUS_FADING
850 const_iv (Color_fade),
851#endif
852 const_iv (Color_pointer_fg),
853 const_iv (Color_pointer_bg),
854 const_iv (Color_border),
855 const_iv (NRS_COLORS),
856 const_iv (TOTAL_COLORS),
815 857
816 const_iv (CurrentTime), 858 const_iv (CurrentTime),
817 const_iv (ShiftMask), 859 const_iv (ShiftMask),
818 const_iv (LockMask), 860 const_iv (LockMask),
819 const_iv (ControlMask), 861 const_iv (ControlMask),
… …
983 const_iv (XIMLineEnd), 1025 const_iv (XIMLineEnd),
984 const_iv (XIMAbsolutePosition), 1026 const_iv (XIMAbsolutePosition),
985 const_iv (XIMDontChange), 1027 const_iv (XIMDontChange),
986# endif 1028# endif
987# endif 1029# endif
1030
1031 /* DEC private modes */
1032 const_iv (PrivMode_132),
1033 const_iv (PrivMode_132OK),
1034 const_iv (PrivMode_rVideo),
1035 const_iv (PrivMode_relOrigin),
1036 const_iv (PrivMode_Screen),
1037 const_iv (PrivMode_Autowrap),
1038 const_iv (PrivMode_aplCUR),
1039 const_iv (PrivMode_aplKP),
1040 const_iv (PrivMode_HaveBackSpace),
1041 const_iv (PrivMode_BackSpace),
1042 const_iv (PrivMode_ShiftKeys),
1043 const_iv (PrivMode_VisibleCursor),
1044 const_iv (PrivMode_MouseX10),
1045 const_iv (PrivMode_MouseX11),
1046 const_iv (PrivMode_scrollBar),
1047 const_iv (PrivMode_TtyOutputInh),
1048 const_iv (PrivMode_Keypress),
1049 const_iv (PrivMode_smoothScroll),
1050 const_iv (PrivMode_vt52),
1051 const_iv (PrivMode_LFNL),
1052 const_iv (PrivMode_MouseBtnEvent),
1053 const_iv (PrivMode_MouseAnyEvent),
1054 const_iv (PrivMode_BracketPaste),
1055 const_iv (PrivMode_ExtMouseUTF8),
1056 const_iv (PrivMode_ExtMouseUrxvt),
1057 const_iv (PrivMode_BlinkingCursor),
1058 const_iv (PrivMode_mouse_report),
1059 const_iv (PrivMode_Default),
988 }; 1060 };
989 1061
990 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1062 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
991 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1063 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
992} 1064}
993 1065
994void 1066void
995log (const char *msg) 1067log (utf8_string msg)
996 CODE: 1068 CODE:
997 rxvt_log ("%s", msg); 1069 rxvt_log ("%s", msg);
998 1070
999void 1071void
1000warn (const char *msg) 1072warn (utf8_string msg)
1001 CODE: 1073 CODE:
1002 rxvt_warn ("%s", msg); 1074 rxvt_warn ("%s", msg);
1003 1075
1004void 1076void
1005fatal (const char *msg) 1077fatal (utf8_string msg)
1006 CODE: 1078 CODE:
1007 rxvt_fatal ("%s", msg); 1079 rxvt_fatal ("%s", msg);
1008 1080
1009void 1081void
1010_exit (int status) 1082_exit (int status)
… …
1175void 1247void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1248rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1249 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1250 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1251
1252void
1253rxvt_term::_keysym_resources ()
1254 PPCODE:
1255 PUTBACK;
1256 _keysym_resources (THIS);
1257 SPAGAIN;
1258
1180int 1259int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1260rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1261 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1262 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1263 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1243rxvt_term::ungrab () 1322rxvt_term::ungrab ()
1244 CODE: 1323 CODE:
1245 ungrab (THIS); 1324 ungrab (THIS);
1246 1325
1247int 1326int
1248rxvt_term::XStringToKeysym (char *string) 1327rxvt_term::XStringToKeysym (octet_string string)
1249 CODE: 1328 CODE:
1250 RETVAL = XStringToKeysym (string); 1329 RETVAL = XStringToKeysym (string);
1251 OUTPUT: RETVAL 1330 OUTPUT: RETVAL
1252 1331
1253char * 1332char *
… …
1263 OUTPUT: RETVAL 1342 OUTPUT: RETVAL
1264 1343
1265int 1344int
1266rxvt_term::XKeycodeToKeysym (int code, int index) 1345rxvt_term::XKeycodeToKeysym (int code, int index)
1267 CODE: 1346 CODE:
1268 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1347 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1269 OUTPUT: RETVAL 1348 OUTPUT: RETVAL
1270 1349
1271int 1350int
1272rxvt_term::strwidth (SV *str) 1351rxvt_term::strwidth (SV *str)
1273 CODE: 1352 CODE:
… …
1343#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1422#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1344#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1423#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1345#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1424#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1346 1425
1347int 1426int
1348rxvt_term::width () 1427rxvt_term::width (int new_value = NO_INIT)
1349 ALIAS: 1428 ALIAS:
1350 width = TERM_OFFSET_width 1429 width = TERM_OFFSET_width
1351 height = TERM_OFFSET_height 1430 height = TERM_OFFSET_height
1352 fwidth = TERM_OFFSET_fwidth 1431 fwidth = TERM_OFFSET_fwidth
1353 fheight = TERM_OFFSET_fheight 1432 fheight = TERM_OFFSET_fheight
… …
1363 saveLines = TERM_OFFSET_saveLines 1442 saveLines = TERM_OFFSET_saveLines
1364 total_rows = TERM_OFFSET_total_rows 1443 total_rows = TERM_OFFSET_total_rows
1365 top_row = TERM_OFFSET_top_row 1444 top_row = TERM_OFFSET_top_row
1366 CODE: 1445 CODE:
1367 RETVAL = *(int *)((char *)THIS + ix); 1446 RETVAL = *(int *)((char *)THIS + ix);
1447 if (items > 1)
1448 *(int *)((char *)THIS + ix) = new_value;
1368 OUTPUT: 1449 OUTPUT:
1369 RETVAL 1450 RETVAL
1370 1451
1371unsigned int 1452unsigned int
1372rxvt_term::ModLevel3Mask () 1453rxvt_term::ModLevel3Mask ()
… …
1374 ModLevel3Mask = 0 1455 ModLevel3Mask = 0
1375 ModMetaMask = 1 1456 ModMetaMask = 1
1376 ModNumLockMask = 2 1457 ModNumLockMask = 2
1377 current_screen = 3 1458 current_screen = 3
1378 hidden_cursor = 4 1459 hidden_cursor = 4
1460 priv_modes = 5
1379 CODE: 1461 CODE:
1380 switch (ix) 1462 switch (ix)
1381 { 1463 {
1382 case 0: RETVAL = THIS->ModLevel3Mask; break; 1464 case 0: RETVAL = THIS->ModLevel3Mask; break;
1383 case 1: RETVAL = THIS->ModMetaMask; break; 1465 case 1: RETVAL = THIS->ModMetaMask; break;
1384 case 2: RETVAL = THIS->ModNumLockMask; break; 1466 case 2: RETVAL = THIS->ModNumLockMask; break;
1385 case 3: RETVAL = THIS->current_screen; break; 1467 case 3: RETVAL = THIS->current_screen; break;
1386#ifdef CURSOR_BLINK 1468#ifdef CURSOR_BLINK
1387 case 4: RETVAL = THIS->hidden_cursor; break; 1469 case 4: RETVAL = THIS->hidden_cursor; break;
1470#else
1471 case 4: RETVAL = 0; break;
1388#endif 1472#endif
1473 case 5: RETVAL = THIS->priv_modes; break;
1389 } 1474 }
1390 OUTPUT: 1475 OUTPUT:
1391 RETVAL 1476 RETVAL
1392 1477
1393char * 1478char *
… …
1454 CODE: 1539 CODE:
1455 RETVAL = THIS->parent_y; 1540 RETVAL = THIS->parent_y;
1456 OUTPUT: 1541 OUTPUT:
1457 RETVAL 1542 RETVAL
1458 1543
1544Window
1545rxvt_term::vt ()
1546 CODE:
1547 RETVAL = THIS->vt;
1548 OUTPUT:
1549 RETVAL
1550
1459void 1551void
1460rxvt_term::vt_emask_add (U32 emask) 1552rxvt_term::vt_emask_add (U32 emask)
1461 CODE: 1553 CODE:
1462 THIS->vt_emask_perl |= emask; 1554 THIS->vt_emask_perl |= emask;
1463 THIS->vt_select_input (); 1555 THIS->vt_select_input ();
… …
1521void 1613void
1522rxvt_term::want_refresh () 1614rxvt_term::want_refresh ()
1523 CODE: 1615 CODE:
1524 THIS->want_refresh = 1; 1616 THIS->want_refresh = 1;
1525 THIS->refresh_check (); 1617 THIS->refresh_check ();
1618
1619void
1620rxvt_term::refresh_check ()
1526 1621
1527void 1622void
1528rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1623rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1529 PPCODE: 1624 PPCODE:
1530{ 1625{
… …
1675 *r++ = NOCHAR; 1770 *r++ = NOCHAR;
1676 } 1771 }
1677 1772
1678 rxvt_pop_locale (); 1773 rxvt_pop_locale ();
1679 1774
1775 free (wstr);
1680 RETVAL = wcs2sv (rstr, r - rstr); 1776 RETVAL = wcs2sv (rstr, r - rstr);
1681} 1777}
1682 OUTPUT: 1778 OUTPUT:
1683 RETVAL 1779 RETVAL
1684 1780
… …
1708 else if (IS_COMPOSE (*s)) 1804 else if (IS_COMPOSE (*s))
1709 r += rxvt_composite.expand (*s, r); 1805 r += rxvt_composite.expand (*s, r);
1710 else 1806 else
1711 *r++ = *s; 1807 *r++ = *s;
1712 1808
1809 free (wstr);
1713 RETVAL = wcs2sv (rstr, r - rstr); 1810 RETVAL = wcs2sv (rstr, r - rstr);
1714} 1811}
1715 OUTPUT: 1812 OUTPUT:
1716 RETVAL 1813 RETVAL
1717 1814
1718void 1815void
1719rxvt_term::_resource (char *name, int index, SV *newval = 0) 1816rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1720 PPCODE: 1817 PPCODE:
1721{ 1818{
1722 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1819 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1723# define def(name) { # name, Rs_ ## name }, 1820# define def(name) { # name, Rs_ ## name },
1724# define reserve(name,count) 1821# define reserve(name,count)
… …
1739 index += rs->value; 1836 index += rs->value;
1740 } 1837 }
1741 else 1838 else
1742 { 1839 {
1743 --rs; 1840 --rs;
1744 name = ""; 1841 name = (octet_string)"";
1745 } 1842 }
1746 1843
1747 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1844 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1748 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1845 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1749 1846
… …
1762 THIS->rs [index] = 0; 1859 THIS->rs [index] = 0;
1763 } 1860 }
1764} 1861}
1765 1862
1766const char * 1863const char *
1767rxvt_term::x_resource (const char *name) 1864rxvt_term::x_resource (octet_string name)
1768 1865
1769bool 1866bool
1770rxvt_term::option (U8 optval, int set = -1) 1867rxvt_term::option (U8 optval, int set = -1)
1771 CODE: 1868 CODE:
1772{ 1869{
… …
1791 THIS->cursor_blink_reset (); 1888 THIS->cursor_blink_reset ();
1792 break; 1889 break;
1793#endif 1890#endif
1794 1891
1795 case Opt_cursorUnderline: 1892 case Opt_cursorUnderline:
1893 THIS->cursor_type = set ? 1 : 0;
1796 THIS->want_refresh = 1; 1894 THIS->want_refresh = 1;
1797 THIS->refresh_check (); 1895 THIS->refresh_check ();
1798 break; 1896 break;
1799 1897
1800# case Opt_scrollBar_floating: 1898# case Opt_scrollBar_floating:
… …
1805 } 1903 }
1806} 1904}
1807 OUTPUT: 1905 OUTPUT:
1808 RETVAL 1906 RETVAL
1809 1907
1908SV *
1909rxvt_term::lookup_keysym (int keysym, unsigned int state)
1910 CODE:
1911{
1912 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1913 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1914}
1915 OUTPUT:
1916 RETVAL
1917
1810bool 1918bool
1811rxvt_term::parse_keysym (char *keysym, char *str) 1919rxvt_term::bind_action (octet_string keysym, octet_string action)
1920 ALIAS:
1921 parse_keysym = 1
1812 CODE: 1922 CODE:
1813 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1923 RETVAL = 0 < THIS->bind_action (keysym, action);
1814 THIS->keyboard->register_done (); 1924 THIS->keyboard->register_done ();
1815 OUTPUT: 1925 OUTPUT:
1816 RETVAL 1926 RETVAL
1817 1927
1818void 1928void
1819rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1929rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1820 CODE: 1930 CODE:
1821 wchar_t *wstr = sv2wcs (str); 1931 wchar_t *wstr = sv2wcs (str);
1822 THIS->keyboard->register_user_translation (keysym, state, wstr); 1932 THIS->keyboard->register_action (keysym, state, wstr);
1823 free (wstr); 1933 free (wstr);
1824 1934
1825void 1935void
1826rxvt_term::screen_cur (...) 1936rxvt_term::screen_cur (...)
1827 PROTOTYPE: $;$$ 1937 PROTOTYPE: $;$$
… …
1870 1980
1871 if (ix) 1981 if (ix)
1872 { 1982 {
1873 THIS->selection.screen = THIS->current_screen; 1983 THIS->selection.screen = THIS->current_screen;
1874 1984
1875 THIS->want_refresh = 1; 1985 THIS->selection_changed ();
1876 THIS->refresh_check (); 1986 THIS->refresh_check ();
1877 } 1987 }
1878 } 1988 }
1879} 1989}
1880 1990
… …
1886 THIS->selection.screen = screen; 1996 THIS->selection.screen = screen;
1887 OUTPUT: 1997 OUTPUT:
1888 RETVAL 1998 RETVAL
1889 1999
1890void 2000void
2001rxvt_term::selection_request (Time tm, int selnum)
2002
2003void
1891rxvt_term::selection_clear (bool clipboard = false) 2004rxvt_term::selection_clear (bool clipboard = false)
1892 2005
1893void 2006void
1894rxvt_term::selection_make (Time eventtime, bool rect = false) 2007rxvt_term::selection_make (Time eventtime, bool rect = false)
1895 CODE: 2008 CODE:
… …
1936 2049
1937void 2050void
1938rxvt_term::scr_bell () 2051rxvt_term::scr_bell ()
1939 2052
1940void 2053void
1941rxvt_term::scr_recolour (bool refresh = true); 2054rxvt_term::scr_recolor (bool refresh = true);
1942 2055
1943void 2056void
1944rxvt_term::scr_change_screen (int screen) 2057rxvt_term::scr_change_screen (int screen)
1945 2058
1946void 2059void
… …
1949{ 2062{
1950 wchar_t *wstr = sv2wcs (string); 2063 wchar_t *wstr = sv2wcs (string);
1951 THIS->scr_add_lines (wstr, wcslen (wstr)); 2064 THIS->scr_add_lines (wstr, wcslen (wstr));
1952 free (wstr); 2065 free (wstr);
1953} 2066}
2067
2068void
2069rxvt_term::tt_write_user_input (SV *octets)
2070 INIT:
2071 STRLEN len;
2072 char *str = SvPVbyte (octets, len);
2073 C_ARGS:
2074 str, len
1954 2075
1955void 2076void
1956rxvt_term::tt_write (SV *octets) 2077rxvt_term::tt_write (SV *octets)
1957 INIT: 2078 INIT:
1958 STRLEN len; 2079 STRLEN len;
… …
2194 OUTPUT: 2315 OUTPUT:
2195 RETVAL 2316 RETVAL
2196 2317
2197#endif 2318#endif
2198 2319
2199#if HAVE_BG_PIXMAP 2320void
2321rxvt_term::clr_background ()
2322 CODE:
2323 delete THIS->bg_img;
2324 THIS->bg_img = 0;
2325 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2200 2326
2201void 2327void
2202rxvt_term::set_background (rxvt_img *img, bool border = false) 2328rxvt_term::set_background (rxvt_img *img, bool border = false)
2203 CODE: 2329 CODE:
2204 THIS->bg_destroy (); 2330 delete THIS->bg_img;
2205 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2331 THIS->bg_img = 0;
2332 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2206 2333
2207 if (img) // TODO: cannot be false 2334 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2208 { 2335 {
2209 img = img->clone (); // own the img 2336 img = img->clone (); // own the img
2210 2337
2211 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2338 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2212 img->sub_rect (0, 0, 2339 img->sub_rect (0, 0,
2213 border ? THIS->vt_width : THIS->szHint.width, 2340 border ? THIS->vt_width : THIS->szHint.width,
2214 border ? THIS->vt_height : THIS->szHint.height) 2341 border ? THIS->vt_height : THIS->szHint.height)
2215 ->replace (img); 2342 ->replace (img);
2216 2343
2217 // just in case, should usually be a nop 2344 // just in case, should usually be a nop
2218 img->reify () 2345 img->reify ()
2219 ->replace (img); 2346 ->replace (img);
2220 2347
2221 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2348 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2222 ->replace (img); 2349 ->replace (img);
2223 2350
2224 THIS->bg_img = img; 2351 THIS->bg_img = img;
2225 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2226 2352
2227 if (!border) 2353 if (!border)
2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2354 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2229 } 2355 }
2230
2231#endif
2232 2356
2233#endif 2357#endif
2234 2358
2235############################################################################# 2359#############################################################################
2236# urxvt::overlay 2360# urxvt::overlay
… …
2260 C_ARGS: filename, 0 2384 C_ARGS: filename, 0
2261 2385
2262void 2386void
2263DESTROY (urxvt::pixbuf self) 2387DESTROY (urxvt::pixbuf self)
2264 CODE: 2388 CODE:
2265 gdk_pixbuf_unref (self); 2389 g_object_unref (self);
2266 2390
2267#endif 2391#endif
2268 2392
2269MODULE = urxvt PACKAGE = urxvt::img 2393MODULE = urxvt PACKAGE = urxvt::img
2270 2394
… …
2306 RETVAL = THIS->pm; 2430 RETVAL = THIS->pm;
2307 OUTPUT: 2431 OUTPUT:
2308 RETVAL 2432 RETVAL
2309 2433
2310void 2434void
2311rxvt_img::fill (SV *c) 2435rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2436 PROTOTYPE: $;$$$$
2312 INIT: 2437 INIT:
2313 rgba cc = parse_rgba (c, THIS->s); 2438 rxvt_screen screen;
2314 C_ARGS: cc 2439 screen.set (THIS->d);
2440 rgba cc = parse_rgba (c, &screen);
2441 C_ARGS: cc, x, y, w, h
2315 2442
2316void 2443void
2317rxvt_img::DESTROY () 2444rxvt_img::DESTROY ()
2318 CODE: 2445 CODE:
2319 delete THIS; 2446 delete THIS;
… …
2353rxvt_img * 2480rxvt_img *
2354rxvt_img::sub_rect (int x, int y, int width, int height) 2481rxvt_img::sub_rect (int x, int y, int width, int height)
2355 2482
2356rxvt_img * 2483rxvt_img *
2357rxvt_img::blur (int rh, int rv) 2484rxvt_img::blur (int rh, int rv)
2485
2486rxvt_img *
2487rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2358 2488
2359rxvt_img * 2489rxvt_img *
2360rxvt_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) 2490rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2361 INIT: 2491 INIT:
2362 rxvt_img::nv matrix[3][3] = { 2492 rxvt_img::nv matrix[3][3] = {
… …
2370rxvt_img::scale (int new_width, int new_height) 2500rxvt_img::scale (int new_width, int new_height)
2371 2501
2372rxvt_img * 2502rxvt_img *
2373rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2503rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2374 2504
2375void 2505rxvt_img *
2376rxvt_img::tint (SV *c) 2506rxvt_img::tint (SV *c)
2377 INIT: 2507 INIT:
2378 rgba cc = parse_rgba (c, THIS->s); 2508 rxvt_screen screen;
2509 screen.set (THIS->d);
2510 rgba cc = parse_rgba (c, &screen);
2379 C_ARGS: cc 2511 C_ARGS: cc
2512
2513rxvt_img *
2514rxvt_img::shade (rxvt_img::nv factor)
2380 2515
2381rxvt_img * 2516rxvt_img *
2382rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2517rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2383 CODE: 2518 CODE:
2384 rxvt_img::nv *vparams = 0; 2519 rxvt_img::nv *vparams = 0;
2385 int nparams = 0; 2520 int nparams = 0;
2386 2521
2387 if (SvOK (params)) 2522 if (SvOK (params))
2388 { 2523 {
2389 // we overlay rxvt_temp_buf, what a hack
2390 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2391
2392 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2524 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2393 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2525 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2394 2526
2395 nparams = av_len ((AV *)SvRV (params)) + 1; 2527 nparams = av_len ((AV *)SvRV (params)) + 1;
2396 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2528 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2397 2529
2398 for (int i = 0; i < nparams; ++i) 2530 for (int i = 0; i < nparams; ++i)
2399 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2531 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2400 } 2532 }
2401 2533
2402 RETVAL = THIS->filter (name, nparams, vparams); 2534 RETVAL = THIS->filter (name, nparams, vparams);
2535 free (vparams);
2403 OUTPUT: 2536 OUTPUT:
2404 RETVAL 2537 RETVAL
2405 2538
2406#endif 2539#endif
2407 2540

Diff Legend

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