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.226 by sf-exg, Wed Sep 3 18:20:37 2014 UTC vs.
Revision 1.257 by root, Fri Dec 30 16:51:59 2022 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-2014,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 3 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.
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
495} 508}
496 509
497static void 510static void
498_keysym_resource_push (rxvt_term *term, const char *k, const char *v) 511_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
499{ 512{
513 unsigned int state;
514
515 if (term->parse_keysym (k, state) == -1)
516 return;
517
500 dSP; 518 dSP;
501 XPUSHs (sv_2mortal (newSVpv (v, 0))); 519 XPUSHs (sv_2mortal (newSVpv (v, 0)));
502 PUTBACK; 520 PUTBACK;
503} 521}
504 522
518 THIS->perl.grabtime = 0; 536 THIS->perl.grabtime = 0;
519 } 537 }
520} 538}
521 539
522bool 540bool
523rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 541rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
524{ 542{
525 if (!perl || !term->perl.self) 543 if (!perl || !term->perl.self)
526 return false; 544 return false;
527 545
528 localise_env set_environ (perl_environ); 546 localise_env set_environ (perl_environ);
810 } *civ, const_iv[] = { 828 } *civ, const_iv[] = {
811# define const_iv(name) { # name, (IV)name } 829# define const_iv(name) { # name, (IV)name }
812 const_iv (HOOK_INIT), 830 const_iv (HOOK_INIT),
813 const_iv (HOOK_DESTROY), 831 const_iv (HOOK_DESTROY),
814 const_iv (HOOK_ACTION), 832 const_iv (HOOK_ACTION),
833 const_iv (HOOK_OSC_SEQ),
834 const_iv (HOOK_OSC_SEQ_PERL),
815 835
816 const_iv (NUM_RESOURCES), 836 const_iv (NUM_RESOURCES),
817 const_iv (DEFAULT_RSTYLE), 837 const_iv (DEFAULT_RSTYLE),
818 const_iv (OVERLAY_RSTYLE), 838 const_iv (OVERLAY_RSTYLE),
819 const_iv (Color_Bits), 839 const_iv (Color_Bits),
834 const_iv (RS_Uline), 854 const_iv (RS_Uline),
835 855
836 // TODO: should support all colour constants, create colorinc.h &c 856 // TODO: should support all colour constants, create colorinc.h &c
837 const_iv (Color_fg), 857 const_iv (Color_fg),
838 const_iv (Color_bg), 858 const_iv (Color_bg),
839#if OFF_FOCUS_FADING 859# if OFF_FOCUS_FADING
840 const_iv (Color_fade), 860 const_iv (Color_fade),
841#endif 861# endif
842 const_iv (Color_pointer_fg), 862 const_iv (Color_pointer_fg),
843 const_iv (Color_pointer_bg), 863 const_iv (Color_pointer_bg),
844 const_iv (Color_border), 864 const_iv (Color_border),
845 const_iv (NRS_COLORS), 865 const_iv (NRS_COLORS),
846 const_iv (TOTAL_COLORS), 866 const_iv (TOTAL_COLORS),
923 const_iv (SelectionRequest), 943 const_iv (SelectionRequest),
924 const_iv (SelectionNotify), 944 const_iv (SelectionNotify),
925 const_iv (ColormapNotify), 945 const_iv (ColormapNotify),
926 const_iv (ClientMessage), 946 const_iv (ClientMessage),
927 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
928# if ENABLE_XIM_ONTHESPOT 961# if ENABLE_XIM_ONTHESPOT
929 const_iv (XIMReverse), 962 const_iv (XIMReverse),
930 const_iv (XIMUnderline), 963 const_iv (XIMUnderline),
931 const_iv (XIMHighlight), 964 const_iv (XIMHighlight),
932 const_iv (XIMPrimary), 965 const_iv (XIMPrimary),
933 const_iv (XIMSecondary), 966 const_iv (XIMSecondary),
934 const_iv (XIMTertiary), 967 const_iv (XIMTertiary),
935 const_iv (XIMVisibleToForward), 968 const_iv (XIMVisibleToForward),
936 const_iv (XIMVisibleToBackword), 969 const_iv (XIMVisibleToBackword),
937 const_iv (XIMVisibleToCenter), 970 const_iv (XIMVisibleToCenter),
971# endif
938#if XRENDER 972# if XRENDER
939 const_iv (PictStandardARGB32), 973 const_iv (PictStandardARGB32),
940 const_iv (PictStandardRGB24), 974 const_iv (PictStandardRGB24),
941 const_iv (PictStandardA8), 975 const_iv (PictStandardA8),
942 const_iv (PictStandardA4), 976 const_iv (PictStandardA4),
943 const_iv (PictStandardA1), 977 const_iv (PictStandardA1),
999 const_iv (PictOpExclusion), 1033 const_iv (PictOpExclusion),
1000 const_iv (PictOpHSLHue), 1034 const_iv (PictOpHSLHue),
1001 const_iv (PictOpHSLSaturation), 1035 const_iv (PictOpHSLSaturation),
1002 const_iv (PictOpHSLColor), 1036 const_iv (PictOpHSLColor),
1003 const_iv (PictOpHSLLuminosity), 1037 const_iv (PictOpHSLLuminosity),
1004#endif 1038# endif
1005# if 0 1039# if 0
1006 const_iv (XIMForwardChar), 1040 const_iv (XIMForwardChar),
1007 const_iv (XIMBackwardChar), 1041 const_iv (XIMBackwardChar),
1008 const_iv (XIMForwardWord), 1042 const_iv (XIMForwardWord),
1009 const_iv (XIMBackwardWord), 1043 const_iv (XIMBackwardWord),
1014 const_iv (XIMLineStart), 1048 const_iv (XIMLineStart),
1015 const_iv (XIMLineEnd), 1049 const_iv (XIMLineEnd),
1016 const_iv (XIMAbsolutePosition), 1050 const_iv (XIMAbsolutePosition),
1017 const_iv (XIMDontChange), 1051 const_iv (XIMDontChange),
1018# endif 1052# endif
1019# 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),
1020 }; 1083 };
1021 1084
1022 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--)
1023 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1086 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1024} 1087}
1025 1088
1026void 1089void
1027log (const char *msg) 1090log (utf8_string msg)
1028 CODE: 1091 CODE:
1029 rxvt_log ("%s", msg); 1092 rxvt_log ("%s", msg);
1030 1093
1031void 1094void
1032warn (const char *msg) 1095warn (utf8_string msg)
1033 CODE: 1096 CODE:
1034 rxvt_warn ("%s", msg); 1097 rxvt_warn ("%s", msg);
1035 1098
1036void 1099void
1037fatal (const char *msg) 1100fatal (utf8_string msg)
1038 CODE: 1101 CODE:
1039 rxvt_fatal ("%s", msg); 1102 rxvt_fatal ("%s", msg);
1040 1103
1041void 1104void
1042_exit (int status) 1105_exit (int status)
1102int 1165int
1103SET_CUSTOM (int rend, int new_value) 1166SET_CUSTOM (int rend, int new_value)
1104 CODE: 1167 CODE:
1105{ 1168{
1106 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1169 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1107 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);
1108 1171
1109 RETVAL = (rend & ~RS_customMask) 1172 RETVAL = (rend & ~RS_customMask)
1110 | ((new_value << RS_customShift) & RS_customMask); 1173 | ((new_value << RS_customShift) & RS_customMask);
1111} 1174}
1112 OUTPUT: 1175 OUTPUT:
1282rxvt_term::ungrab () 1345rxvt_term::ungrab ()
1283 CODE: 1346 CODE:
1284 ungrab (THIS); 1347 ungrab (THIS);
1285 1348
1286int 1349int
1287rxvt_term::XStringToKeysym (char *string) 1350rxvt_term::XStringToKeysym (octet_string string)
1288 CODE: 1351 CODE:
1289 RETVAL = XStringToKeysym (string); 1352 RETVAL = XStringToKeysym (string);
1290 OUTPUT: RETVAL 1353 OUTPUT: RETVAL
1291 1354
1292char * 1355char *
1302 OUTPUT: RETVAL 1365 OUTPUT: RETVAL
1303 1366
1304int 1367int
1305rxvt_term::XKeycodeToKeysym (int code, int index) 1368rxvt_term::XKeycodeToKeysym (int code, int index)
1306 CODE: 1369 CODE:
1307 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1370 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1308 OUTPUT: RETVAL 1371 OUTPUT: RETVAL
1309 1372
1310int 1373int
1311rxvt_term::strwidth (SV *str) 1374rxvt_term::strwidth (SV *str)
1312 CODE: 1375 CODE:
1331 1394
1332SV * 1395SV *
1333rxvt_term::locale_encode (SV *str) 1396rxvt_term::locale_encode (SV *str)
1334 CODE: 1397 CODE:
1335{ 1398{
1399 if (!SvOK (str))
1400 XSRETURN_UNDEF;
1401
1336 wchar_t *wstr = sv2wcs (str); 1402 wchar_t *wstr = sv2wcs (str);
1337 1403
1338 rxvt_push_locale (THIS->locale); 1404 rxvt_push_locale (THIS->locale);
1339 char *mbstr = rxvt_wcstombs (wstr); 1405 char *mbstr = rxvt_wcstombs (wstr);
1340 rxvt_pop_locale (); 1406 rxvt_pop_locale ();
1349 1415
1350SV * 1416SV *
1351rxvt_term::locale_decode (SV *octets) 1417rxvt_term::locale_decode (SV *octets)
1352 CODE: 1418 CODE:
1353{ 1419{
1420 if (!SvOK (octets))
1421 XSRETURN_UNDEF;
1422
1354 STRLEN len; 1423 STRLEN len;
1355 char *data = SvPVbyte (octets, len); 1424 char *data = SvPVbyte (octets, len);
1356 1425
1357 rxvt_push_locale (THIS->locale); 1426 rxvt_push_locale (THIS->locale);
1358 wchar_t *wstr = rxvt_mbstowcs (data, len); 1427 wchar_t *wstr = rxvt_mbstowcs (data, len);
1382#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1451#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1383#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1452#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1384#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1453#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1385 1454
1386int 1455int
1387rxvt_term::width () 1456rxvt_term::width (int new_value = NO_INIT)
1388 ALIAS: 1457 ALIAS:
1389 width = TERM_OFFSET_width 1458 width = TERM_OFFSET_width
1390 height = TERM_OFFSET_height 1459 height = TERM_OFFSET_height
1391 fwidth = TERM_OFFSET_fwidth 1460 fwidth = TERM_OFFSET_fwidth
1392 fheight = TERM_OFFSET_fheight 1461 fheight = TERM_OFFSET_fheight
1402 saveLines = TERM_OFFSET_saveLines 1471 saveLines = TERM_OFFSET_saveLines
1403 total_rows = TERM_OFFSET_total_rows 1472 total_rows = TERM_OFFSET_total_rows
1404 top_row = TERM_OFFSET_top_row 1473 top_row = TERM_OFFSET_top_row
1405 CODE: 1474 CODE:
1406 RETVAL = *(int *)((char *)THIS + ix); 1475 RETVAL = *(int *)((char *)THIS + ix);
1476 if (items > 1)
1477 *(int *)((char *)THIS + ix) = new_value;
1407 OUTPUT: 1478 OUTPUT:
1408 RETVAL 1479 RETVAL
1409 1480
1410unsigned int 1481unsigned int
1411rxvt_term::ModLevel3Mask () 1482rxvt_term::ModLevel3Mask ()
1413 ModLevel3Mask = 0 1484 ModLevel3Mask = 0
1414 ModMetaMask = 1 1485 ModMetaMask = 1
1415 ModNumLockMask = 2 1486 ModNumLockMask = 2
1416 current_screen = 3 1487 current_screen = 3
1417 hidden_cursor = 4 1488 hidden_cursor = 4
1489 priv_modes = 5
1418 CODE: 1490 CODE:
1419 switch (ix) 1491 switch (ix)
1420 { 1492 {
1421 case 0: RETVAL = THIS->ModLevel3Mask; break; 1493 case 0: RETVAL = THIS->ModLevel3Mask; break;
1422 case 1: RETVAL = THIS->ModMetaMask; break; 1494 case 1: RETVAL = THIS->ModMetaMask; break;
1423 case 2: RETVAL = THIS->ModNumLockMask; break; 1495 case 2: RETVAL = THIS->ModNumLockMask; break;
1424 case 3: RETVAL = THIS->current_screen; break; 1496 case 3: RETVAL = THIS->current_screen; break;
1425#ifdef CURSOR_BLINK 1497#ifdef CURSOR_BLINK
1426 case 4: RETVAL = THIS->hidden_cursor; break; 1498 case 4: RETVAL = THIS->hidden_cursor; break;
1499#else
1500 case 4: RETVAL = 0; break;
1427#endif 1501#endif
1502 case 5: RETVAL = THIS->priv_modes; break;
1428 } 1503 }
1429 OUTPUT: 1504 OUTPUT:
1430 RETVAL 1505 RETVAL
1431 1506
1432char * 1507char *
1515 THIS->rstyle = new_rstyle; 1590 THIS->rstyle = new_rstyle;
1516 OUTPUT: 1591 OUTPUT:
1517 RETVAL 1592 RETVAL
1518 1593
1519int 1594int
1520rxvt_term::view_start (int newval = 1) 1595rxvt_term::view_start (int newval = 0)
1521 PROTOTYPE: $;$ 1596 PROTOTYPE: $;$
1522 CODE: 1597 CODE:
1523{ 1598{
1524 RETVAL = THIS->view_start; 1599 RETVAL = THIS->view_start;
1525 1600 if (items > 1)
1526 if (newval <= 0)
1527 THIS->scr_changeview (max (newval, THIS->top_row)); 1601 THIS->scr_changeview (newval);
1528} 1602}
1529 OUTPUT: 1603 OUTPUT:
1530 RETVAL 1604 RETVAL
1531 1605
1532void 1606void
1567void 1641void
1568rxvt_term::want_refresh () 1642rxvt_term::want_refresh ()
1569 CODE: 1643 CODE:
1570 THIS->want_refresh = 1; 1644 THIS->want_refresh = 1;
1571 THIS->refresh_check (); 1645 THIS->refresh_check ();
1646
1647void
1648rxvt_term::refresh_check ()
1572 1649
1573void 1650void
1574rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1651rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1575 PPCODE: 1652 PPCODE:
1576{ 1653{
1721 *r++ = NOCHAR; 1798 *r++ = NOCHAR;
1722 } 1799 }
1723 1800
1724 rxvt_pop_locale (); 1801 rxvt_pop_locale ();
1725 1802
1803 free (wstr);
1726 RETVAL = wcs2sv (rstr, r - rstr); 1804 RETVAL = wcs2sv (rstr, r - rstr);
1727} 1805}
1728 OUTPUT: 1806 OUTPUT:
1729 RETVAL 1807 RETVAL
1730 1808
1738 // find length 1816 // find length
1739 for (wchar_t *s = wstr; *s; s++) 1817 for (wchar_t *s = wstr; *s; s++)
1740 if (*s == NOCHAR) 1818 if (*s == NOCHAR)
1741 ; 1819 ;
1742 else if (IS_COMPOSE (*s)) 1820 else if (IS_COMPOSE (*s))
1743 dlen += rxvt_composite.expand (*s, 0); 1821 dlen += rxvt_composite.expand (*s);
1744 else 1822 else
1745 dlen++; 1823 dlen++;
1746 1824
1747 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1825 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1748 1826
1754 else if (IS_COMPOSE (*s)) 1832 else if (IS_COMPOSE (*s))
1755 r += rxvt_composite.expand (*s, r); 1833 r += rxvt_composite.expand (*s, r);
1756 else 1834 else
1757 *r++ = *s; 1835 *r++ = *s;
1758 1836
1837 free (wstr);
1759 RETVAL = wcs2sv (rstr, r - rstr); 1838 RETVAL = wcs2sv (rstr, r - rstr);
1760} 1839}
1761 OUTPUT: 1840 OUTPUT:
1762 RETVAL 1841 RETVAL
1763 1842
1764void 1843void
1765rxvt_term::_resource (char *name, int index, SV *newval = 0) 1844rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1766 PPCODE: 1845 PPCODE:
1767{ 1846{
1768 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1847 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1769# define def(name) { # name, Rs_ ## name }, 1848# define def(name) { # name, Rs_ ## name },
1770# define reserve(name,count) 1849# define reserve(name,count)
1785 index += rs->value; 1864 index += rs->value;
1786 } 1865 }
1787 else 1866 else
1788 { 1867 {
1789 --rs; 1868 --rs;
1790 name = ""; 1869 name = (octet_string)"";
1791 } 1870 }
1792 1871
1793 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1872 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1794 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);
1795 1874
1808 THIS->rs [index] = 0; 1887 THIS->rs [index] = 0;
1809 } 1888 }
1810} 1889}
1811 1890
1812const char * 1891const char *
1813rxvt_term::x_resource (const char *name) 1892rxvt_term::x_resource (octet_string name)
1814 1893
1815bool 1894bool
1816rxvt_term::option (U8 optval, int set = -1) 1895rxvt_term::option (U8 optval, int set = -1)
1817 CODE: 1896 CODE:
1818{ 1897{
1852 } 1931 }
1853} 1932}
1854 OUTPUT: 1933 OUTPUT:
1855 RETVAL 1934 RETVAL
1856 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
1857bool 1946bool
1858rxvt_term::bind_action (char *keysym, char *str) 1947rxvt_term::bind_action (octet_string keysym, octet_string action)
1859 ALIAS: 1948 ALIAS:
1860 parse_keysym = 1 1949 parse_keysym = 1
1861 CODE: 1950 CODE:
1862 RETVAL = 0 < THIS->bind_action (keysym, str); 1951 RETVAL = 0 < THIS->bind_action (keysym, action);
1863 THIS->keyboard->register_done (); 1952 THIS->keyboard->register_done ();
1864 OUTPUT: 1953 OUTPUT:
1865 RETVAL 1954 RETVAL
1955
1956void
1957rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1958 CODE:
1959 wchar_t *wstr = sv2wcs (str);
1960 THIS->keyboard->register_action (keysym, state, wstr);
1961 free (wstr);
1866 1962
1867void 1963void
1868rxvt_term::screen_cur (...) 1964rxvt_term::screen_cur (...)
1869 PROTOTYPE: $;$$ 1965 PROTOTYPE: $;$$
1870 ALIAS: 1966 ALIAS:
1981 2077
1982void 2078void
1983rxvt_term::scr_bell () 2079rxvt_term::scr_bell ()
1984 2080
1985void 2081void
1986rxvt_term::scr_recolour (bool refresh = true); 2082rxvt_term::scr_recolor (bool refresh = true);
1987 2083
1988void 2084void
1989rxvt_term::scr_change_screen (int screen) 2085rxvt_term::scr_change_screen (int screen)
1990 2086
1991void 2087void
2126 XFree (RETVAL); 2222 XFree (RETVAL);
2127 2223
2128void 2224void
2129XDeleteProperty (rxvt_term *term, Window window, Atom property) 2225XDeleteProperty (rxvt_term *term, Window window, Atom property)
2130 C_ARGS: term->dpy, window, property 2226 C_ARGS: term->dpy, window, property
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
2131 2285
2132Window 2286Window
2133rxvt_term::DefaultRootWindow () 2287rxvt_term::DefaultRootWindow ()
2134 CODE: 2288 CODE:
2135 RETVAL = THIS->display->root; 2289 RETVAL = THIS->display->root;
2248 RETVAL 2402 RETVAL
2249 2403
2250#endif 2404#endif
2251 2405
2252void 2406void
2253rxvt_term::set_background (rxvt_img *img, bool border = false) 2407rxvt_term::clr_background ()
2254 CODE: 2408 CODE:
2255 delete THIS->bg_img; 2409 delete THIS->bg_img;
2256 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;
2257 THIS->bg_flags = 0; 2417 THIS->bg_img = 0;
2418 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2258 2419
2259 if (img) // TODO: cannot be false 2420 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2260 { 2421 {
2261 img = img->clone (); // own the img 2422 img = img->clone (); // own the img
2262 2423
2263 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2424 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2264 img->sub_rect (0, 0, 2425 img->sub_rect (0, 0,
2272 2433
2273 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])
2274 ->replace (img); 2435 ->replace (img);
2275 2436
2276 THIS->bg_img = img; 2437 THIS->bg_img = img;
2277 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2278 2438
2279 if (!border) 2439 if (!border)
2280 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2440 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2281 } 2441 }
2282 2442
2359 2519
2360void 2520void
2361rxvt_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)
2362 PROTOTYPE: $;$$$$ 2522 PROTOTYPE: $;$$$$
2363 INIT: 2523 INIT:
2364 rgba cc = parse_rgba (c, THIS->s); 2524 rxvt_screen screen;
2525 screen.set (THIS->d);
2526 rgba cc = parse_rgba (c, &screen);
2365 C_ARGS: cc, x, y, w, h 2527 C_ARGS: cc, x, y, w, h
2366 2528
2367void 2529void
2368rxvt_img::DESTROY () 2530rxvt_img::DESTROY ()
2369 CODE: 2531 CODE:
2427rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2589rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2428 2590
2429rxvt_img * 2591rxvt_img *
2430rxvt_img::tint (SV *c) 2592rxvt_img::tint (SV *c)
2431 INIT: 2593 INIT:
2432 rgba cc = parse_rgba (c, THIS->s); 2594 rxvt_screen screen;
2595 screen.set (THIS->d);
2596 rgba cc = parse_rgba (c, &screen);
2433 C_ARGS: cc 2597 C_ARGS: cc
2434 2598
2435rxvt_img * 2599rxvt_img *
2436rxvt_img::shade (rxvt_img::nv factor) 2600rxvt_img::shade (rxvt_img::nv factor)
2437 2601

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines