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.190 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs.
Revision 1.246 by root, Mon Jan 20 09:35:12 2020 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;
64typedef rxvt_img::nv rxvt_img__nv;
63 65
64///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
65 67
66static void 68static rgba
67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 70{
69 //TODO: support component stuff, 0..1 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;
70 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;
71} 108}
72 109
73///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
74 112
75static wchar_t * 113static wchar_t *
76sv2wcs (SV *sv) 114sv2wcs (SV *sv)
77{ 115{
78 STRLEN len; 116 STRLEN len;
253 break; 291 break;
254 292
255 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
256 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)));
257 295
258 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
259 297
260 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
261 overlay_av = 0; 299 overlay_av = 0;
262 300
263 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
343 PERL_SYS_TERM (); 381 PERL_SYS_TERM ();
344 } 382 }
345} 383}
346 384
347void 385void
348rxvt_perl_interp::init (rxvt_term *term) 386rxvt_perl_interp::init ()
349{ 387{
350 if (!perl) 388 if (!perl)
351 { 389 {
352 rxvt_push_locale (""); // perl init destroys current locale 390 rxvt_push_locale (""); // perl init destroys current locale
353 391
354 { 392 {
355 perl_environ = rxvt_environ; 393 perl_environ = rxvt_environ;
356 localise_env set_environ (perl_environ); 394 localise_env set_environ (perl_environ);
357 395
358 char *args[] = { 396 const char *args[] = {
359 "", 397 "",
360 "-e" 398 "-e"
361 "BEGIN {" 399 "BEGIN {"
362 " urxvt->bootstrap;" 400 " urxvt->bootstrap;"
363 " unshift @INC, '" LIBDIR "';" 401 " unshift @INC, '" LIBDIR "';"
364 "}" 402 "}"
365 "" 403 ""
366 "use urxvt;" 404 "use urxvt;",
405 0
367 }; 406 };
368 int argc = ecb_array_length (args); 407 int argc = ecb_array_length (args) - 1;
369 char **argv = args; 408 char **argv = (char **)args;
370 409
371 PERL_SYS_INIT3 (&argc, &argv, &environ); 410 PERL_SYS_INIT3 (&argc, &argv, &environ);
372 perl = perl_alloc (); 411 perl = perl_alloc ();
373 perl_construct (perl); 412 perl_construct (perl);
374 413
383 } 422 }
384 } 423 }
385 424
386 rxvt_pop_locale (); 425 rxvt_pop_locale ();
387 } 426 }
427}
428
429void
430rxvt_perl_interp::init (rxvt_term *term)
431{
432 init ();
388 433
389 if (perl && !term->perl.self) 434 if (perl && !term->perl.self)
390 { 435 {
391 // runs outside of perls ENV 436 // runs outside of perls ENV
392 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
393 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
394 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 439 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
395 } 440 }
441}
442
443void
444rxvt_perl_interp::eval (const char *str)
445{
446 eval_pv (str, 1);
396} 447}
397 448
398void 449void
399rxvt_perl_interp::usage (rxvt_term *term, int type) 450rxvt_perl_interp::usage (rxvt_term *term, int type)
400{ 451{
440 491
441 FREETMPS; 492 FREETMPS;
442 LEAVE; 493 LEAVE;
443 494
444 return ret; 495 return ret;
496}
497
498static void
499_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
500{
501 unsigned int state;
502
503 if (term->parse_keysym (k, state) == -1)
504 return;
505
506 dSP;
507 XPUSHs (sv_2mortal (newSVpv (v, 0)));
508 PUTBACK;
509}
510
511static void
512_keysym_resources (rxvt_term *term)
513{
514 term->enumerate_keysym_resources (_keysym_resource_push);
445} 515}
446 516
447static void 517static void
448ungrab (rxvt_term *THIS) 518ungrab (rxvt_term *THIS)
449{ 519{
743 static const struct { 813 static const struct {
744 const char *name; 814 const char *name;
745 IV iv; 815 IV iv;
746 } *civ, const_iv[] = { 816 } *civ, const_iv[] = {
747# define const_iv(name) { # name, (IV)name } 817# define const_iv(name) { # name, (IV)name }
818 const_iv (HOOK_INIT),
819 const_iv (HOOK_DESTROY),
820 const_iv (HOOK_ACTION),
821
748 const_iv (NUM_RESOURCES), 822 const_iv (NUM_RESOURCES),
749 const_iv (DEFAULT_RSTYLE), 823 const_iv (DEFAULT_RSTYLE),
750 const_iv (OVERLAY_RSTYLE), 824 const_iv (OVERLAY_RSTYLE),
751 const_iv (Color_Bits), 825 const_iv (Color_Bits),
752 const_iv (RS_bgShift), const_iv (RS_bgMask), 826 const_iv (RS_bgShift), const_iv (RS_bgMask),
762 const_iv (RS_Bold), 836 const_iv (RS_Bold),
763 const_iv (RS_Italic), 837 const_iv (RS_Italic),
764 const_iv (RS_Blink), 838 const_iv (RS_Blink),
765 const_iv (RS_RVid), 839 const_iv (RS_RVid),
766 const_iv (RS_Uline), 840 const_iv (RS_Uline),
841
842 // TODO: should support all colour constants, create colorinc.h &c
843 const_iv (Color_fg),
844 const_iv (Color_bg),
845#if OFF_FOCUS_FADING
846 const_iv (Color_fade),
847#endif
848 const_iv (Color_pointer_fg),
849 const_iv (Color_pointer_bg),
850 const_iv (Color_border),
851 const_iv (NRS_COLORS),
852 const_iv (TOTAL_COLORS),
767 853
768 const_iv (CurrentTime), 854 const_iv (CurrentTime),
769 const_iv (ShiftMask), 855 const_iv (ShiftMask),
770 const_iv (LockMask), 856 const_iv (LockMask),
771 const_iv (ControlMask), 857 const_iv (ControlMask),
863 const_iv (PictStandardA1), 949 const_iv (PictStandardA1),
864 const_iv (RepeatNone), 950 const_iv (RepeatNone),
865 const_iv (RepeatNormal), 951 const_iv (RepeatNormal),
866 const_iv (RepeatPad), 952 const_iv (RepeatPad),
867 const_iv (RepeatReflect), 953 const_iv (RepeatReflect),
954 // all versions
955 const_iv (PictOpClear),
956 const_iv (PictOpSrc),
957 const_iv (PictOpDst),
958 const_iv (PictOpOver),
959 const_iv (PictOpOverReverse),
960 const_iv (PictOpIn),
961 const_iv (PictOpInReverse),
962 const_iv (PictOpOut),
963 const_iv (PictOpOutReverse),
964 const_iv (PictOpAtop),
965 const_iv (PictOpAtopReverse),
966 const_iv (PictOpXor),
967 const_iv (PictOpAdd),
968 const_iv (PictOpSaturate),
969 // 0.2+
970 const_iv (PictOpDisjointClear),
971 const_iv (PictOpDisjointSrc),
972 const_iv (PictOpDisjointDst),
973 const_iv (PictOpDisjointOver),
974 const_iv (PictOpDisjointOverReverse),
975 const_iv (PictOpDisjointIn),
976 const_iv (PictOpDisjointInReverse),
977 const_iv (PictOpDisjointOut),
978 const_iv (PictOpDisjointOutReverse),
979 const_iv (PictOpDisjointAtop),
980 const_iv (PictOpDisjointAtopReverse),
981 const_iv (PictOpDisjointXor),
982 const_iv (PictOpConjointClear),
983 const_iv (PictOpConjointSrc),
984 const_iv (PictOpConjointDst),
985 const_iv (PictOpConjointOver),
986 const_iv (PictOpConjointOverReverse),
987 const_iv (PictOpConjointIn),
988 const_iv (PictOpConjointInReverse),
989 const_iv (PictOpConjointOut),
990 const_iv (PictOpConjointOutReverse),
991 const_iv (PictOpConjointAtop),
992 const_iv (PictOpConjointAtopReverse),
993 const_iv (PictOpConjointXor),
994 // 0.11+
995 const_iv (PictOpMultiply),
996 const_iv (PictOpScreen),
997 const_iv (PictOpOverlay),
998 const_iv (PictOpDarken),
999 const_iv (PictOpLighten),
1000 const_iv (PictOpColorDodge),
1001 const_iv (PictOpColorBurn),
1002 const_iv (PictOpHardLight),
1003 const_iv (PictOpSoftLight),
1004 const_iv (PictOpDifference),
1005 const_iv (PictOpExclusion),
1006 const_iv (PictOpHSLHue),
1007 const_iv (PictOpHSLSaturation),
1008 const_iv (PictOpHSLColor),
1009 const_iv (PictOpHSLLuminosity),
868#endif 1010#endif
869# if 0 1011# if 0
870 const_iv (XIMForwardChar), 1012 const_iv (XIMForwardChar),
871 const_iv (XIMBackwardChar), 1013 const_iv (XIMBackwardChar),
872 const_iv (XIMForwardWord), 1014 const_iv (XIMForwardWord),
879 const_iv (XIMLineEnd), 1021 const_iv (XIMLineEnd),
880 const_iv (XIMAbsolutePosition), 1022 const_iv (XIMAbsolutePosition),
881 const_iv (XIMDontChange), 1023 const_iv (XIMDontChange),
882# endif 1024# endif
883# endif 1025# endif
1026
1027 /* DEC private modes */
1028 const_iv (PrivMode_132),
1029 const_iv (PrivMode_132OK),
1030 const_iv (PrivMode_rVideo),
1031 const_iv (PrivMode_relOrigin),
1032 const_iv (PrivMode_Screen),
1033 const_iv (PrivMode_Autowrap),
1034 const_iv (PrivMode_aplCUR),
1035 const_iv (PrivMode_aplKP),
1036 const_iv (PrivMode_HaveBackSpace),
1037 const_iv (PrivMode_BackSpace),
1038 const_iv (PrivMode_ShiftKeys),
1039 const_iv (PrivMode_VisibleCursor),
1040 const_iv (PrivMode_MouseX10),
1041 const_iv (PrivMode_MouseX11),
1042 const_iv (PrivMode_scrollBar),
1043 const_iv (PrivMode_TtyOutputInh),
1044 const_iv (PrivMode_Keypress),
1045 const_iv (PrivMode_smoothScroll),
1046 const_iv (PrivMode_vt52),
1047 const_iv (PrivMode_LFNL),
1048 const_iv (PrivMode_MouseBtnEvent),
1049 const_iv (PrivMode_MouseAnyEvent),
1050 const_iv (PrivMode_BracketPaste),
1051 const_iv (PrivMode_ExtModeMouse),
1052 const_iv (PrivMode_ExtMouseRight),
1053 const_iv (PrivMode_BlinkingCursor),
1054 const_iv (PrivMode_mouse_report),
1055 const_iv (PrivMode_Default),
884 }; 1056 };
885 1057
886 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1058 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
887 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1059 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
888} 1060}
889 1061
890void 1062void
891log (const char *msg) 1063log (utf8_string msg)
892 CODE: 1064 CODE:
893 rxvt_log ("%s", msg); 1065 rxvt_log ("%s", msg);
894 1066
895void 1067void
896warn (const char *msg) 1068warn (utf8_string msg)
897 CODE: 1069 CODE:
898 rxvt_warn ("%s", msg); 1070 rxvt_warn ("%s", msg);
899 1071
900void 1072void
901fatal (const char *msg) 1073fatal (utf8_string msg)
902 CODE: 1074 CODE:
903 rxvt_fatal ("%s", msg); 1075 rxvt_fatal ("%s", msg);
904 1076
905void 1077void
906_exit (int status) 1078_exit (int status)
1071void 1243void
1072rxvt_term::put_option_db (octet_string specifier, octet_string value) 1244rxvt_term::put_option_db (octet_string specifier, octet_string value)
1073 CODE: 1245 CODE:
1074 XrmPutStringResource (&THIS->option_db, specifier, value); 1246 XrmPutStringResource (&THIS->option_db, specifier, value);
1075 1247
1248void
1249rxvt_term::_keysym_resources ()
1250 PPCODE:
1251 PUTBACK;
1252 _keysym_resources (THIS);
1253 SPAGAIN;
1254
1076int 1255int
1077rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1256rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1078 CODE: 1257 CODE:
1079 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1258 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1080 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1259 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1139rxvt_term::ungrab () 1318rxvt_term::ungrab ()
1140 CODE: 1319 CODE:
1141 ungrab (THIS); 1320 ungrab (THIS);
1142 1321
1143int 1322int
1144rxvt_term::XStringToKeysym (char *string) 1323rxvt_term::XStringToKeysym (octet_string string)
1145 CODE: 1324 CODE:
1146 RETVAL = XStringToKeysym (string); 1325 RETVAL = XStringToKeysym (string);
1147 OUTPUT: RETVAL 1326 OUTPUT: RETVAL
1148 1327
1149char * 1328char *
1159 OUTPUT: RETVAL 1338 OUTPUT: RETVAL
1160 1339
1161int 1340int
1162rxvt_term::XKeycodeToKeysym (int code, int index) 1341rxvt_term::XKeycodeToKeysym (int code, int index)
1163 CODE: 1342 CODE:
1164 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1343 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1165 OUTPUT: RETVAL 1344 OUTPUT: RETVAL
1166 1345
1167int 1346int
1168rxvt_term::strwidth (SV *str) 1347rxvt_term::strwidth (SV *str)
1169 CODE: 1348 CODE:
1239#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1418#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1240#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1419#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1241#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1420#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1242 1421
1243int 1422int
1244rxvt_term::width () 1423rxvt_term::width (int new_value = NO_INIT)
1245 ALIAS: 1424 ALIAS:
1246 width = TERM_OFFSET_width 1425 width = TERM_OFFSET_width
1247 height = TERM_OFFSET_height 1426 height = TERM_OFFSET_height
1248 fwidth = TERM_OFFSET_fwidth 1427 fwidth = TERM_OFFSET_fwidth
1249 fheight = TERM_OFFSET_fheight 1428 fheight = TERM_OFFSET_fheight
1259 saveLines = TERM_OFFSET_saveLines 1438 saveLines = TERM_OFFSET_saveLines
1260 total_rows = TERM_OFFSET_total_rows 1439 total_rows = TERM_OFFSET_total_rows
1261 top_row = TERM_OFFSET_top_row 1440 top_row = TERM_OFFSET_top_row
1262 CODE: 1441 CODE:
1263 RETVAL = *(int *)((char *)THIS + ix); 1442 RETVAL = *(int *)((char *)THIS + ix);
1443 if (items > 1)
1444 *(int *)((char *)THIS + ix) = new_value;
1264 OUTPUT: 1445 OUTPUT:
1265 RETVAL 1446 RETVAL
1266 1447
1267unsigned int 1448unsigned int
1268rxvt_term::ModLevel3Mask () 1449rxvt_term::ModLevel3Mask ()
1270 ModLevel3Mask = 0 1451 ModLevel3Mask = 0
1271 ModMetaMask = 1 1452 ModMetaMask = 1
1272 ModNumLockMask = 2 1453 ModNumLockMask = 2
1273 current_screen = 3 1454 current_screen = 3
1274 hidden_cursor = 4 1455 hidden_cursor = 4
1456 priv_modes = 5
1275 CODE: 1457 CODE:
1276 switch (ix) 1458 switch (ix)
1277 { 1459 {
1278 case 0: RETVAL = THIS->ModLevel3Mask; break; 1460 case 0: RETVAL = THIS->ModLevel3Mask; break;
1279 case 1: RETVAL = THIS->ModMetaMask; break; 1461 case 1: RETVAL = THIS->ModMetaMask; break;
1280 case 2: RETVAL = THIS->ModNumLockMask; break; 1462 case 2: RETVAL = THIS->ModNumLockMask; break;
1281 case 3: RETVAL = THIS->current_screen; break; 1463 case 3: RETVAL = THIS->current_screen; break;
1282#ifdef CURSOR_BLINK 1464#ifdef CURSOR_BLINK
1283 case 4: RETVAL = THIS->hidden_cursor; break; 1465 case 4: RETVAL = THIS->hidden_cursor; break;
1466#else
1467 case 4: RETVAL = 0; break;
1284#endif 1468#endif
1469 case 5: RETVAL = THIS->priv_modes; break;
1285 } 1470 }
1286 OUTPUT: 1471 OUTPUT:
1287 RETVAL 1472 RETVAL
1288 1473
1289char * 1474char *
1350 CODE: 1535 CODE:
1351 RETVAL = THIS->parent_y; 1536 RETVAL = THIS->parent_y;
1352 OUTPUT: 1537 OUTPUT:
1353 RETVAL 1538 RETVAL
1354 1539
1540Window
1541rxvt_term::vt ()
1542 CODE:
1543 RETVAL = THIS->vt;
1544 OUTPUT:
1545 RETVAL
1546
1355void 1547void
1356rxvt_term::vt_emask_add (U32 emask) 1548rxvt_term::vt_emask_add (U32 emask)
1357 CODE: 1549 CODE:
1358 THIS->vt_emask_perl |= emask; 1550 THIS->vt_emask_perl |= emask;
1359 THIS->vt_select_input (); 1551 THIS->vt_select_input ();
1417void 1609void
1418rxvt_term::want_refresh () 1610rxvt_term::want_refresh ()
1419 CODE: 1611 CODE:
1420 THIS->want_refresh = 1; 1612 THIS->want_refresh = 1;
1421 THIS->refresh_check (); 1613 THIS->refresh_check ();
1614
1615void
1616rxvt_term::refresh_check ()
1422 1617
1423void 1618void
1424rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1619rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1425 PPCODE: 1620 PPCODE:
1426{ 1621{
1571 *r++ = NOCHAR; 1766 *r++ = NOCHAR;
1572 } 1767 }
1573 1768
1574 rxvt_pop_locale (); 1769 rxvt_pop_locale ();
1575 1770
1771 free (wstr);
1576 RETVAL = wcs2sv (rstr, r - rstr); 1772 RETVAL = wcs2sv (rstr, r - rstr);
1577} 1773}
1578 OUTPUT: 1774 OUTPUT:
1579 RETVAL 1775 RETVAL
1580 1776
1604 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1605 r += rxvt_composite.expand (*s, r); 1801 r += rxvt_composite.expand (*s, r);
1606 else 1802 else
1607 *r++ = *s; 1803 *r++ = *s;
1608 1804
1805 free (wstr);
1609 RETVAL = wcs2sv (rstr, r - rstr); 1806 RETVAL = wcs2sv (rstr, r - rstr);
1610} 1807}
1611 OUTPUT: 1808 OUTPUT:
1612 RETVAL 1809 RETVAL
1613 1810
1614void 1811void
1615rxvt_term::_resource (char *name, int index, SV *newval = 0) 1812rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1616 PPCODE: 1813 PPCODE:
1617{ 1814{
1618 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1815 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1619# define def(name) { # name, Rs_ ## name }, 1816# define def(name) { # name, Rs_ ## name },
1620# define reserve(name,count) 1817# define reserve(name,count)
1635 index += rs->value; 1832 index += rs->value;
1636 } 1833 }
1637 else 1834 else
1638 { 1835 {
1639 --rs; 1836 --rs;
1640 name = ""; 1837 name = (octet_string)"";
1641 } 1838 }
1642 1839
1643 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1840 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1644 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1841 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1645 1842
1658 THIS->rs [index] = 0; 1855 THIS->rs [index] = 0;
1659 } 1856 }
1660} 1857}
1661 1858
1662const char * 1859const char *
1663rxvt_term::x_resource (const char *name) 1860rxvt_term::x_resource (octet_string name)
1664 1861
1665bool 1862bool
1666rxvt_term::option (U8 optval, int set = -1) 1863rxvt_term::option (U8 optval, int set = -1)
1667 CODE: 1864 CODE:
1668{ 1865{
1687 THIS->cursor_blink_reset (); 1884 THIS->cursor_blink_reset ();
1688 break; 1885 break;
1689#endif 1886#endif
1690 1887
1691 case Opt_cursorUnderline: 1888 case Opt_cursorUnderline:
1889 THIS->cursor_type = set ? 1 : 0;
1692 THIS->want_refresh = 1; 1890 THIS->want_refresh = 1;
1693 THIS->refresh_check (); 1891 THIS->refresh_check ();
1694 break; 1892 break;
1695 1893
1696# case Opt_scrollBar_floating: 1894# case Opt_scrollBar_floating:
1701 } 1899 }
1702} 1900}
1703 OUTPUT: 1901 OUTPUT:
1704 RETVAL 1902 RETVAL
1705 1903
1904SV *
1905rxvt_term::lookup_keysym (int keysym, unsigned int state)
1906 CODE:
1907{
1908 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1909 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1910}
1911 OUTPUT:
1912 RETVAL
1913
1706bool 1914bool
1707rxvt_term::parse_keysym (char *keysym, char *str) 1915rxvt_term::bind_action (octet_string keysym, octet_string action)
1916 ALIAS:
1917 parse_keysym = 1
1708 CODE: 1918 CODE:
1709 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1919 RETVAL = 0 < THIS->bind_action (keysym, action);
1710 THIS->keyboard->register_done (); 1920 THIS->keyboard->register_done ();
1711 OUTPUT: 1921 OUTPUT:
1712 RETVAL 1922 RETVAL
1713 1923
1714void 1924void
1715rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1925rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1716 CODE: 1926 CODE:
1717 wchar_t *wstr = sv2wcs (str); 1927 wchar_t *wstr = sv2wcs (str);
1718 THIS->keyboard->register_user_translation (keysym, state, wstr); 1928 THIS->keyboard->register_action (keysym, state, wstr);
1719 free (wstr); 1929 free (wstr);
1720 1930
1721void 1931void
1722rxvt_term::screen_cur (...) 1932rxvt_term::screen_cur (...)
1723 PROTOTYPE: $;$$ 1933 PROTOTYPE: $;$$
1766 1976
1767 if (ix) 1977 if (ix)
1768 { 1978 {
1769 THIS->selection.screen = THIS->current_screen; 1979 THIS->selection.screen = THIS->current_screen;
1770 1980
1771 THIS->want_refresh = 1; 1981 THIS->selection_changed ();
1772 THIS->refresh_check (); 1982 THIS->refresh_check ();
1773 } 1983 }
1774 } 1984 }
1775} 1985}
1776 1986
1782 THIS->selection.screen = screen; 1992 THIS->selection.screen = screen;
1783 OUTPUT: 1993 OUTPUT:
1784 RETVAL 1994 RETVAL
1785 1995
1786void 1996void
1997rxvt_term::selection_request (Time tm, int selnum)
1998
1999void
1787rxvt_term::selection_clear (bool clipboard = false) 2000rxvt_term::selection_clear (bool clipboard = false)
1788 2001
1789void 2002void
1790rxvt_term::selection_make (Time eventtime, bool rect = false) 2003rxvt_term::selection_make (Time eventtime, bool rect = false)
1791 CODE: 2004 CODE:
1832 2045
1833void 2046void
1834rxvt_term::scr_bell () 2047rxvt_term::scr_bell ()
1835 2048
1836void 2049void
1837rxvt_term::scr_recolour (bool refresh = true); 2050rxvt_term::scr_recolor (bool refresh = true);
1838 2051
1839void 2052void
1840rxvt_term::scr_change_screen (int screen) 2053rxvt_term::scr_change_screen (int screen)
1841 2054
1842void 2055void
1845{ 2058{
1846 wchar_t *wstr = sv2wcs (string); 2059 wchar_t *wstr = sv2wcs (string);
1847 THIS->scr_add_lines (wstr, wcslen (wstr)); 2060 THIS->scr_add_lines (wstr, wcslen (wstr));
1848 free (wstr); 2061 free (wstr);
1849} 2062}
2063
2064void
2065rxvt_term::tt_write_user_input (SV *octets)
2066 INIT:
2067 STRLEN len;
2068 char *str = SvPVbyte (octets, len);
2069 C_ARGS:
2070 str, len
1850 2071
1851void 2072void
1852rxvt_term::tt_write (SV *octets) 2073rxvt_term::tt_write (SV *octets)
1853 INIT: 2074 INIT:
1854 STRLEN len; 2075 STRLEN len;
2032} 2253}
2033 2254
2034############################################################################# 2255#############################################################################
2035# fancy bg bloatstuff (TODO: should be moved up somewhere) 2256# fancy bg bloatstuff (TODO: should be moved up somewhere)
2036 2257
2037# TODO: ugly 2258bool
2259rxvt_term::has_render ()
2260 CODE:
2261 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2262 OUTPUT:
2263 RETVAL
2264
2038void 2265void
2039rxvt_term::background_geometry (bool border = false) 2266rxvt_term::background_geometry (bool border = false)
2040 PPCODE: 2267 PPCODE:
2041 EXTEND (SP, 4); 2268 EXTEND (SP, 4);
2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); 2269 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2272 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2046 2273
2047#if HAVE_IMG 2274#if HAVE_IMG
2048 2275
2049rxvt_img * 2276rxvt_img *
2050rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2277rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2051 CODE: 2278 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2279 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2280 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2281 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2282 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2056 RETVAL->alloc (); 2283 RETVAL->alloc ();
2057 OUTPUT: 2284 OUTPUT:
2058 RETVAL 2285 RETVAL
2059 2286
2060#if ENABLE_TRANSPARENCY 2287#if ENABLE_TRANSPARENCY
2084 OUTPUT: 2311 OUTPUT:
2085 RETVAL 2312 RETVAL
2086 2313
2087#endif 2314#endif
2088 2315
2089#if HAVE_BG_PIXMAP 2316void
2317rxvt_term::clr_background ()
2318 CODE:
2319 delete THIS->bg_img;
2320 THIS->bg_img = 0;
2321 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2090 2322
2091void 2323void
2092rxvt_term::set_background (rxvt_img *img, bool border = false) 2324rxvt_term::set_background (rxvt_img *img, bool border = false)
2093 CODE: 2325 CODE:
2094 THIS->bg_destroy (); 2326 delete THIS->bg_img;
2095 THIS->bg_img = 0; 2327 THIS->bg_img = 0;
2096 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2328 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2097 2329
2098 if (img) // TODO: cannot be false 2330 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2099 { 2331 {
2100 img = img->clone (); // own the img 2332 img = img->clone (); // own the img
2101 2333
2102 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2334 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2103 img->sub_rect (0, 0, 2335 img->sub_rect (0, 0,
2104 border ? THIS->vt_width : THIS->szHint.width, 2336 border ? THIS->vt_width : THIS->szHint.width,
2105 border ? THIS->vt_height : THIS->szHint.height) 2337 border ? THIS->vt_height : THIS->szHint.height)
2106 ->replace (img); 2338 ->replace (img);
2107 2339
2108 // just in case, should usually be a nop 2340 // just in case, should usually be a nop
2109 img->reify () 2341 img->reify ()
2110 ->replace (img); 2342 ->replace (img);
2111 2343
2112 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2344 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2113 ->replace (img); 2345 ->replace (img);
2114 2346
2115 THIS->bg_img = img; 2347 THIS->bg_img = img;
2116 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2117 2348
2118 if (!border) 2349 if (!border)
2119 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2350 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2120
2121 delete img;
2122 } 2351 }
2123
2124#endif
2125 2352
2126#endif 2353#endif
2127 2354
2128############################################################################# 2355#############################################################################
2129# urxvt::overlay 2356# urxvt::overlay
2153 C_ARGS: filename, 0 2380 C_ARGS: filename, 0
2154 2381
2155void 2382void
2156DESTROY (urxvt::pixbuf self) 2383DESTROY (urxvt::pixbuf self)
2157 CODE: 2384 CODE:
2158 gdk_pixbuf_unref (self); 2385 g_object_unref (self);
2159 2386
2160#endif 2387#endif
2161 2388
2162MODULE = urxvt PACKAGE = urxvt::img 2389MODULE = urxvt PACKAGE = urxvt::img
2163 2390
2164#if HAVE_IMG 2391#if HAVE_IMG
2165 2392
2166# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2393# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2167# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2394# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2168 2395
2396void
2397rxvt_img::geometry ()
2398 PPCODE:
2399 EXTEND (SP, 4);
2400 PUSHs (sv_2mortal (newSViv (THIS->x)));
2401 PUSHs (sv_2mortal (newSViv (THIS->y)));
2402 PUSHs (sv_2mortal (newSViv (THIS->w)));
2403 PUSHs (sv_2mortal (newSViv (THIS->h)));
2404
2169int 2405int
2170rxvt_img::w () 2406rxvt_img::x ()
2407 ALIAS:
2408 x = 0
2409 y = 1
2410 w = 2
2411 h = 3
2171 CODE: 2412 CODE:
2172 RETVAL = THIS->w; 2413 switch (ix)
2173 OUTPUT: 2414 {
2174 RETVAL 2415 case 0: RETVAL = THIS->x; break;
2175 2416 case 1: RETVAL = THIS->y; break;
2176int 2417 case 2: RETVAL = THIS->w; break;
2177rxvt_img::h () 2418 case 3: RETVAL = THIS->h; break;
2178 CODE: 2419 }
2179 RETVAL = THIS->h;
2180 OUTPUT: 2420 OUTPUT:
2181 RETVAL 2421 RETVAL
2182 2422
2183Pixmap 2423Pixmap
2184rxvt_img::pm () 2424rxvt_img::pm ()
2186 RETVAL = THIS->pm; 2426 RETVAL = THIS->pm;
2187 OUTPUT: 2427 OUTPUT:
2188 RETVAL 2428 RETVAL
2189 2429
2190void 2430void
2191rxvt_img::fill (SV *c) 2431rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2432 PROTOTYPE: $;$$$$
2192 INIT: 2433 INIT:
2193 rxvt_color rc; 2434 rxvt_screen screen;
2194 parse_color (THIS->s, rc, c); 2435 screen.set (THIS->d);
2195 C_ARGS: rc 2436 rgba cc = parse_rgba (c, &screen);
2437 C_ARGS: cc, x, y, w, h
2196 2438
2197void 2439void
2198rxvt_img::DESTROY () 2440rxvt_img::DESTROY ()
2199 CODE: 2441 CODE:
2200 delete THIS; 2442 delete THIS;
2201 2443
2202void 2444void
2445rxvt_img::add_alpha ()
2446
2447void
2203rxvt_img::unshare () 2448rxvt_img::unshare ()
2204 2449
2205int 2450void
2206rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2451rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2207 CODE: 2452 PPCODE:
2208 if (items >= 2) 2453 if (items >= 2)
2209 THIS->repeat_mode (repeat); 2454 THIS->repeat_mode (repeat);
2210 if (GIMME_V != G_VOID) 2455 if (GIMME_V != G_VOID)
2211 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2456 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2212 2457
2213void 2458void
2214rxvt_img::move (int dx, int dy) 2459rxvt_img::move (int dx, int dy)
2215 2460
2216void 2461void
2217rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2462rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2218 2463
2219void 2464void
2220rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2465rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2466
2467void
2468rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2221 2469
2222rxvt_img * 2470rxvt_img *
2223rxvt_img::clone () 2471rxvt_img::clone ()
2224 2472
2225rxvt_img * 2473rxvt_img *
2230 2478
2231rxvt_img * 2479rxvt_img *
2232rxvt_img::blur (int rh, int rv) 2480rxvt_img::blur (int rh, int rv)
2233 2481
2234rxvt_img * 2482rxvt_img *
2235rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33) 2483rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2484
2485rxvt_img *
2486rxvt_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)
2236 INIT: 2487 INIT:
2237 double matrix[9] = { 2488 rxvt_img::nv matrix[3][3] = {
2238 p11, p12, p13, 2489 { p11, p12, p13 },
2239 p21, p22, p23, 2490 { p21, p22, p23 },
2240 p31, p32, p33 2491 { p31, p32, p33 }
2241 }; 2492 };
2242 C_ARGS: new_width, new_height, matrix 2493 C_ARGS: matrix
2243 2494
2244rxvt_img * 2495rxvt_img *
2245rxvt_img::scale (int new_width, int new_height) 2496rxvt_img::scale (int new_width, int new_height)
2246 2497
2247rxvt_img * 2498rxvt_img *
2248rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2499rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2500
2501rxvt_img *
2502rxvt_img::tint (SV *c)
2503 INIT:
2504 rxvt_screen screen;
2505 screen.set (THIS->d);
2506 rgba cc = parse_rgba (c, &screen);
2507 C_ARGS: cc
2508
2509rxvt_img *
2510rxvt_img::shade (rxvt_img::nv factor)
2511
2512rxvt_img *
2513rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2514 CODE:
2515 rxvt_img::nv *vparams = 0;
2516 int nparams = 0;
2517
2518 if (SvOK (params))
2519 {
2520 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2521 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2522
2523 nparams = av_len ((AV *)SvRV (params)) + 1;
2524 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2525
2526 for (int i = 0; i < nparams; ++i)
2527 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2528 }
2529
2530 RETVAL = THIS->filter (name, nparams, vparams);
2531 free (vparams);
2532 OUTPUT:
2533 RETVAL
2249 2534
2250#endif 2535#endif
2251 2536

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines