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.230 by sf-exg, Wed Oct 29 09:05:51 2014 UTC vs.
Revision 1.261 by root, Tue Jul 25 18:06:07 2023 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 these 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)
389 { 401 {
390 rxvt_push_locale (""); // perl init destroys current locale 402 rxvt_push_locale ("C"); // perl init destroys current locale
391 403
392 { 404 {
393 perl_environ = rxvt_environ; 405 perl_environ = rxvt_environ;
394 localise_env set_environ (perl_environ); 406 localise_env set_environ (perl_environ);
395 407
396 char *args[] = { 408 const char *args[] = {
397 "", 409 "",
398 "-e" 410 "-e"
399 "BEGIN {" 411 "BEGIN {"
400 " urxvt->bootstrap;" 412 " urxvt->bootstrap;"
401 " unshift @INC, '" LIBDIR "';" 413 " unshift @INC, '" LIBDIR "';"
402 "}" 414 "}"
403 "" 415 ""
404 "use urxvt;" 416 "use urxvt;",
417 0
405 }; 418 };
406 int argc = ecb_array_length (args); 419 int argc = ecb_array_length (args) - 1;
407 char **argv = args; 420 char **argv = (char **)args;
408 421
409 PERL_SYS_INIT3 (&argc, &argv, &environ); 422 PERL_SYS_INIT3 (&argc, &argv, &environ);
410 perl = perl_alloc (); 423 perl = perl_alloc ();
411 perl_construct (perl); 424 perl_construct (perl);
412 425
523 THIS->perl.grabtime = 0; 536 THIS->perl.grabtime = 0;
524 } 537 }
525} 538}
526 539
527bool 540bool
528rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 541rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
529{ 542{
530 if (!perl || !term->perl.self) 543 if (!perl || !term->perl.self)
531 return false; 544 return false;
532 545
533 localise_env set_environ (perl_environ); 546 localise_env set_environ (perl_environ);
815 } *civ, const_iv[] = { 828 } *civ, const_iv[] = {
816# define const_iv(name) { # name, (IV)name } 829# define const_iv(name) { # name, (IV)name }
817 const_iv (HOOK_INIT), 830 const_iv (HOOK_INIT),
818 const_iv (HOOK_DESTROY), 831 const_iv (HOOK_DESTROY),
819 const_iv (HOOK_ACTION), 832 const_iv (HOOK_ACTION),
833 const_iv (HOOK_OSC_SEQ),
834 const_iv (HOOK_OSC_SEQ_PERL),
820 835
821 const_iv (NUM_RESOURCES), 836 const_iv (NUM_RESOURCES),
822 const_iv (DEFAULT_RSTYLE), 837 const_iv (DEFAULT_RSTYLE),
823 const_iv (OVERLAY_RSTYLE), 838 const_iv (OVERLAY_RSTYLE),
824 const_iv (Color_Bits), 839 const_iv (Color_Bits),
839 const_iv (RS_Uline), 854 const_iv (RS_Uline),
840 855
841 // TODO: should support all colour constants, create colorinc.h &c 856 // TODO: should support all colour constants, create colorinc.h &c
842 const_iv (Color_fg), 857 const_iv (Color_fg),
843 const_iv (Color_bg), 858 const_iv (Color_bg),
844#if OFF_FOCUS_FADING 859# if OFF_FOCUS_FADING
845 const_iv (Color_fade), 860 const_iv (Color_fade),
846#endif 861# endif
847 const_iv (Color_pointer_fg), 862 const_iv (Color_pointer_fg),
848 const_iv (Color_pointer_bg), 863 const_iv (Color_pointer_bg),
849 const_iv (Color_border), 864 const_iv (Color_border),
850 const_iv (NRS_COLORS), 865 const_iv (NRS_COLORS),
851 const_iv (TOTAL_COLORS), 866 const_iv (TOTAL_COLORS),
852 867
868 const_iv (None),
853 const_iv (CurrentTime), 869 const_iv (CurrentTime),
854 const_iv (ShiftMask), 870 const_iv (ShiftMask),
855 const_iv (LockMask), 871 const_iv (LockMask),
856 const_iv (ControlMask), 872 const_iv (ControlMask),
857 const_iv (Mod1Mask), 873 const_iv (Mod1Mask),
928 const_iv (SelectionRequest), 944 const_iv (SelectionRequest),
929 const_iv (SelectionNotify), 945 const_iv (SelectionNotify),
930 const_iv (ColormapNotify), 946 const_iv (ColormapNotify),
931 const_iv (ClientMessage), 947 const_iv (ClientMessage),
932 const_iv (MappingNotify), 948 const_iv (MappingNotify),
949
950 // shape extension
951 const_iv (ShapeSet),
952 const_iv (ShapeUnion),
953 const_iv (ShapeIntersect),
954 const_iv (ShapeSubtract),
955 const_iv (ShapeInvert),
956
957 const_iv (ShapeBounding),
958 const_iv (ShapeClip),
959 const_iv (ShapeInput),
960
961 // XIM
933# if ENABLE_XIM_ONTHESPOT 962# if ENABLE_XIM_ONTHESPOT
934 const_iv (XIMReverse), 963 const_iv (XIMReverse),
935 const_iv (XIMUnderline), 964 const_iv (XIMUnderline),
936 const_iv (XIMHighlight), 965 const_iv (XIMHighlight),
937 const_iv (XIMPrimary), 966 const_iv (XIMPrimary),
938 const_iv (XIMSecondary), 967 const_iv (XIMSecondary),
939 const_iv (XIMTertiary), 968 const_iv (XIMTertiary),
940 const_iv (XIMVisibleToForward), 969 const_iv (XIMVisibleToForward),
941 const_iv (XIMVisibleToBackword), 970 const_iv (XIMVisibleToBackword),
942 const_iv (XIMVisibleToCenter), 971 const_iv (XIMVisibleToCenter),
972# endif
943#if XRENDER 973# if XRENDER
944 const_iv (PictStandardARGB32), 974 const_iv (PictStandardARGB32),
945 const_iv (PictStandardRGB24), 975 const_iv (PictStandardRGB24),
946 const_iv (PictStandardA8), 976 const_iv (PictStandardA8),
947 const_iv (PictStandardA4), 977 const_iv (PictStandardA4),
948 const_iv (PictStandardA1), 978 const_iv (PictStandardA1),
1004 const_iv (PictOpExclusion), 1034 const_iv (PictOpExclusion),
1005 const_iv (PictOpHSLHue), 1035 const_iv (PictOpHSLHue),
1006 const_iv (PictOpHSLSaturation), 1036 const_iv (PictOpHSLSaturation),
1007 const_iv (PictOpHSLColor), 1037 const_iv (PictOpHSLColor),
1008 const_iv (PictOpHSLLuminosity), 1038 const_iv (PictOpHSLLuminosity),
1009#endif 1039# endif
1010# if 0 1040# if 0
1011 const_iv (XIMForwardChar), 1041 const_iv (XIMForwardChar),
1012 const_iv (XIMBackwardChar), 1042 const_iv (XIMBackwardChar),
1013 const_iv (XIMForwardWord), 1043 const_iv (XIMForwardWord),
1014 const_iv (XIMBackwardWord), 1044 const_iv (XIMBackwardWord),
1019 const_iv (XIMLineStart), 1049 const_iv (XIMLineStart),
1020 const_iv (XIMLineEnd), 1050 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1051 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1052 const_iv (XIMDontChange),
1023# endif 1053# endif
1024# endif 1054
1055 /* DEC private modes */
1056 const_iv (PrivMode_132),
1057 const_iv (PrivMode_132OK),
1058 const_iv (PrivMode_rVideo),
1059 const_iv (PrivMode_relOrigin),
1060 const_iv (PrivMode_Screen),
1061 const_iv (PrivMode_Autowrap),
1062 const_iv (PrivMode_aplCUR),
1063 const_iv (PrivMode_aplKP),
1064 const_iv (PrivMode_HaveBackSpace),
1065 const_iv (PrivMode_BackSpace),
1066 const_iv (PrivMode_ShiftKeys),
1067 const_iv (PrivMode_VisibleCursor),
1068 const_iv (PrivMode_MouseX10),
1069 const_iv (PrivMode_MouseX11),
1070 const_iv (PrivMode_scrollBar),
1071 const_iv (PrivMode_TtyOutputInh),
1072 const_iv (PrivMode_Keypress),
1073 const_iv (PrivMode_smoothScroll),
1074 const_iv (PrivMode_vt52),
1075 const_iv (PrivMode_LFNL),
1076 const_iv (PrivMode_MouseBtnEvent),
1077 const_iv (PrivMode_MouseAnyEvent),
1078 const_iv (PrivMode_BracketPaste),
1079 const_iv (PrivMode_ExtMouseUTF8),
1080 const_iv (PrivMode_ExtMouseUrxvt),
1081 const_iv (PrivMode_BlinkingCursor),
1082 const_iv (PrivMode_mouse_report),
1083 const_iv (PrivMode_Default),
1025 }; 1084 };
1026 1085
1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1086 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1087 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1088}
1030 1089
1031void 1090void
1032log (const char *msg) 1091log (utf8_string msg)
1033 CODE: 1092 CODE:
1034 rxvt_log ("%s", msg); 1093 rxvt_log ("%s", msg);
1035 1094
1036void 1095void
1037warn (const char *msg) 1096warn (utf8_string msg)
1038 CODE: 1097 CODE:
1039 rxvt_warn ("%s", msg); 1098 rxvt_warn ("%s", msg);
1040 1099
1041void 1100void
1042fatal (const char *msg) 1101fatal (utf8_string msg)
1043 CODE: 1102 CODE:
1044 rxvt_fatal ("%s", msg); 1103 rxvt_fatal ("%s", msg);
1045 1104
1046void 1105void
1047_exit (int status) 1106_exit (int status)
1107int 1166int
1108SET_CUSTOM (int rend, int new_value) 1167SET_CUSTOM (int rend, int new_value)
1109 CODE: 1168 CODE:
1110{ 1169{
1111 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1170 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1112 croak ("custom value out of range, must be 0..%d", RS_customCount - 1); 1171 croak ("custom value out of range, must be 0..%lu", RS_customCount - 1);
1113 1172
1114 RETVAL = (rend & ~RS_customMask) 1173 RETVAL = (rend & ~RS_customMask)
1115 | ((new_value << RS_customShift) & RS_customMask); 1174 | ((new_value << RS_customShift) & RS_customMask);
1116} 1175}
1117 OUTPUT: 1176 OUTPUT:
1154 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 1213 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
1155 1214
1156 av_pop (av); 1215 av_pop (av);
1157 1216
1158 delete req; 1217 delete req;
1218
1219Region
1220XCreateRegion ()
1221
1222int
1223XUnionRectWithRegion (int x, int y, int w, int h, Region src, Region dst)
1224 CODE:
1225 XRectangle rect;
1226 rect.x = x;
1227 rect.y = y;
1228 rect.width = w;
1229 rect.height = h;
1230 RETVAL = XUnionRectWithRegion (&rect, src, dst);
1231 OUTPUT: RETVAL
1232
1233int
1234XIntersectRegion (Region src1, Region src2, Region res)
1235
1236int
1237XUnionRegion (Region src1, Region src2, Region res)
1238
1239int
1240XSubtractRegion (Region src1, Region src2, Region res)
1241
1242int
1243XXorRegion (Region src1, Region src2, Region res)
1244
1245int
1246XOffsetRegion (Region r, int dx, int dy)
1247
1248int
1249XShrinkRegion (Region r, int dx, int dy)
1250
1251int
1252XDestroyRegion (Region r)
1159 1253
1160MODULE = urxvt PACKAGE = urxvt::term 1254MODULE = urxvt PACKAGE = urxvt::term
1161 1255
1162SV * 1256SV *
1163_new (AV *env, AV *arg) 1257_new (AV *env, AV *arg)
1287rxvt_term::ungrab () 1381rxvt_term::ungrab ()
1288 CODE: 1382 CODE:
1289 ungrab (THIS); 1383 ungrab (THIS);
1290 1384
1291int 1385int
1292rxvt_term::XStringToKeysym (char *string) 1386rxvt_term::XStringToKeysym (octet_string string)
1293 CODE: 1387 CODE:
1294 RETVAL = XStringToKeysym (string); 1388 RETVAL = XStringToKeysym (string);
1295 OUTPUT: RETVAL 1389 OUTPUT: RETVAL
1296 1390
1297char * 1391char *
1336 1430
1337SV * 1431SV *
1338rxvt_term::locale_encode (SV *str) 1432rxvt_term::locale_encode (SV *str)
1339 CODE: 1433 CODE:
1340{ 1434{
1435 if (!SvOK (str))
1436 XSRETURN_UNDEF;
1437
1341 wchar_t *wstr = sv2wcs (str); 1438 wchar_t *wstr = sv2wcs (str);
1342 1439
1343 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1344 char *mbstr = rxvt_wcstombs (wstr); 1441 char *mbstr = rxvt_wcstombs (wstr);
1345 rxvt_pop_locale (); 1442 rxvt_pop_locale ();
1354 1451
1355SV * 1452SV *
1356rxvt_term::locale_decode (SV *octets) 1453rxvt_term::locale_decode (SV *octets)
1357 CODE: 1454 CODE:
1358{ 1455{
1456 if (!SvOK (octets))
1457 XSRETURN_UNDEF;
1458
1359 STRLEN len; 1459 STRLEN len;
1360 char *data = SvPVbyte (octets, len); 1460 char *data = SvPVbyte (octets, len);
1361 1461
1362 rxvt_push_locale (THIS->locale); 1462 rxvt_push_locale (THIS->locale);
1363 wchar_t *wstr = rxvt_mbstowcs (data, len); 1463 wchar_t *wstr = rxvt_mbstowcs (data, len);
1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1487#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1488#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1489#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1390 1490
1391int 1491int
1392rxvt_term::width () 1492rxvt_term::width (int new_value = NO_INIT)
1393 ALIAS: 1493 ALIAS:
1394 width = TERM_OFFSET_width 1494 width = TERM_OFFSET_width
1395 height = TERM_OFFSET_height 1495 height = TERM_OFFSET_height
1396 fwidth = TERM_OFFSET_fwidth 1496 fwidth = TERM_OFFSET_fwidth
1397 fheight = TERM_OFFSET_fheight 1497 fheight = TERM_OFFSET_fheight
1407 saveLines = TERM_OFFSET_saveLines 1507 saveLines = TERM_OFFSET_saveLines
1408 total_rows = TERM_OFFSET_total_rows 1508 total_rows = TERM_OFFSET_total_rows
1409 top_row = TERM_OFFSET_top_row 1509 top_row = TERM_OFFSET_top_row
1410 CODE: 1510 CODE:
1411 RETVAL = *(int *)((char *)THIS + ix); 1511 RETVAL = *(int *)((char *)THIS + ix);
1512 if (items > 1)
1513 *(int *)((char *)THIS + ix) = new_value;
1412 OUTPUT: 1514 OUTPUT:
1413 RETVAL 1515 RETVAL
1414 1516
1415unsigned int 1517unsigned int
1416rxvt_term::ModLevel3Mask () 1518rxvt_term::ModLevel3Mask ()
1418 ModLevel3Mask = 0 1520 ModLevel3Mask = 0
1419 ModMetaMask = 1 1521 ModMetaMask = 1
1420 ModNumLockMask = 2 1522 ModNumLockMask = 2
1421 current_screen = 3 1523 current_screen = 3
1422 hidden_cursor = 4 1524 hidden_cursor = 4
1525 priv_modes = 5
1423 CODE: 1526 CODE:
1424 switch (ix) 1527 switch (ix)
1425 { 1528 {
1426 case 0: RETVAL = THIS->ModLevel3Mask; break; 1529 case 0: RETVAL = THIS->ModLevel3Mask; break;
1427 case 1: RETVAL = THIS->ModMetaMask; break; 1530 case 1: RETVAL = THIS->ModMetaMask; break;
1428 case 2: RETVAL = THIS->ModNumLockMask; break; 1531 case 2: RETVAL = THIS->ModNumLockMask; break;
1429 case 3: RETVAL = THIS->current_screen; break; 1532 case 3: RETVAL = THIS->current_screen; break;
1430#ifdef CURSOR_BLINK 1533#ifdef CURSOR_BLINK
1431 case 4: RETVAL = THIS->hidden_cursor; break; 1534 case 4: RETVAL = THIS->hidden_cursor; break;
1535#else
1536 case 4: RETVAL = 0; break;
1432#endif 1537#endif
1538 case 5: RETVAL = THIS->priv_modes; break;
1433 } 1539 }
1434 OUTPUT: 1540 OUTPUT:
1435 RETVAL 1541 RETVAL
1436 1542
1437char * 1543char *
1520 THIS->rstyle = new_rstyle; 1626 THIS->rstyle = new_rstyle;
1521 OUTPUT: 1627 OUTPUT:
1522 RETVAL 1628 RETVAL
1523 1629
1524int 1630int
1525rxvt_term::view_start (int newval = 1) 1631rxvt_term::view_start (int newval = 0)
1526 PROTOTYPE: $;$ 1632 PROTOTYPE: $;$
1527 CODE: 1633 CODE:
1528{ 1634{
1529 RETVAL = THIS->view_start; 1635 RETVAL = THIS->view_start;
1530 1636 if (items > 1)
1531 if (newval <= 0)
1532 THIS->scr_changeview (max (newval, THIS->top_row)); 1637 THIS->scr_changeview (newval);
1533} 1638}
1534 OUTPUT: 1639 OUTPUT:
1535 RETVAL 1640 RETVAL
1536 1641
1537void 1642void
1572void 1677void
1573rxvt_term::want_refresh () 1678rxvt_term::want_refresh ()
1574 CODE: 1679 CODE:
1575 THIS->want_refresh = 1; 1680 THIS->want_refresh = 1;
1576 THIS->refresh_check (); 1681 THIS->refresh_check ();
1682
1683void
1684rxvt_term::refresh_check ()
1577 1685
1578void 1686void
1579rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1687rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1580 PPCODE: 1688 PPCODE:
1581{ 1689{
1744 // find length 1852 // find length
1745 for (wchar_t *s = wstr; *s; s++) 1853 for (wchar_t *s = wstr; *s; s++)
1746 if (*s == NOCHAR) 1854 if (*s == NOCHAR)
1747 ; 1855 ;
1748 else if (IS_COMPOSE (*s)) 1856 else if (IS_COMPOSE (*s))
1749 dlen += rxvt_composite.expand (*s, 0); 1857 dlen += rxvt_composite.expand (*s);
1750 else 1858 else
1751 dlen++; 1859 dlen++;
1752 1860
1753 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1861 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1754 1862
1767} 1875}
1768 OUTPUT: 1876 OUTPUT:
1769 RETVAL 1877 RETVAL
1770 1878
1771void 1879void
1772rxvt_term::_resource (char *name, int index, SV *newval = 0) 1880rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1773 PPCODE: 1881 PPCODE:
1774{ 1882{
1775 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1883 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1776# define def(name) { # name, Rs_ ## name }, 1884# define def(name) { # name, Rs_ ## name },
1777# define reserve(name,count) 1885# define reserve(name,count)
1792 index += rs->value; 1900 index += rs->value;
1793 } 1901 }
1794 else 1902 else
1795 { 1903 {
1796 --rs; 1904 --rs;
1797 name = ""; 1905 name = (octet_string)"";
1798 } 1906 }
1799 1907
1800 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1908 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1801 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1909 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1802 1910
1815 THIS->rs [index] = 0; 1923 THIS->rs [index] = 0;
1816 } 1924 }
1817} 1925}
1818 1926
1819const char * 1927const char *
1820rxvt_term::x_resource (const char *name) 1928rxvt_term::x_resource (octet_string name)
1821 1929
1822bool 1930bool
1823rxvt_term::option (U8 optval, int set = -1) 1931rxvt_term::option (U8 optval, int set = -1)
1824 CODE: 1932 CODE:
1825{ 1933{
1859 } 1967 }
1860} 1968}
1861 OUTPUT: 1969 OUTPUT:
1862 RETVAL 1970 RETVAL
1863 1971
1972SV *
1973rxvt_term::lookup_keysym (int keysym, unsigned int state)
1974 CODE:
1975{
1976 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1977 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1978}
1979 OUTPUT:
1980 RETVAL
1981
1864bool 1982bool
1865rxvt_term::bind_action (char *keysym, char *str) 1983rxvt_term::bind_action (octet_string keysym, octet_string action)
1866 ALIAS: 1984 ALIAS:
1867 parse_keysym = 1 1985 parse_keysym = 1
1868 CODE: 1986 CODE:
1869 RETVAL = 0 < THIS->bind_action (keysym, str); 1987 RETVAL = 0 < THIS->bind_action (keysym, action);
1870 THIS->keyboard->register_done (); 1988 THIS->keyboard->register_done ();
1871 OUTPUT: 1989 OUTPUT:
1872 RETVAL 1990 RETVAL
1873 1991
1874void 1992void
1995 2113
1996void 2114void
1997rxvt_term::scr_bell () 2115rxvt_term::scr_bell ()
1998 2116
1999void 2117void
2000rxvt_term::scr_recolour (bool refresh = true); 2118rxvt_term::scr_recolor (bool refresh = true);
2001 2119
2002void 2120void
2003rxvt_term::scr_change_screen (int screen) 2121rxvt_term::scr_change_screen (int screen)
2004 2122
2005void 2123void
2078 int count; 2196 int count;
2079 Atom *props = XListProperties (THIS->dpy, window, &count); 2197 Atom *props = XListProperties (THIS->dpy, window, &count);
2080 2198
2081 EXTEND (SP, count); 2199 EXTEND (SP, count);
2082 while (count--) 2200 while (count--)
2083 PUSHs (newSVuv ((U32)props [count])); 2201 PUSHs (sv_2mortal (newSVuv ((U32)props [count])));
2084 2202
2085 XFree (props); 2203 XFree (props);
2086} 2204}
2087 2205
2088void 2206void
2104 int elemsize = format == 16 ? sizeof (short) 2222 int elemsize = format == 16 ? sizeof (short)
2105 : format == 32 ? sizeof (long) 2223 : format == 32 ? sizeof (long)
2106 : 1; 2224 : 1;
2107 2225
2108 EXTEND (SP, 3); 2226 EXTEND (SP, 3);
2109 PUSHs (newSVuv ((U32)type)); 2227 PUSHs (sv_2mortal (newSVuv ((U32)type)));
2110 PUSHs (newSViv (format)); 2228 PUSHs (sv_2mortal (newSViv (format)));
2111 PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); 2229 PUSHs (sv_2mortal (newSVpvn ((char *)prop, nitems * elemsize)));
2112 XFree (prop); 2230 XFree (prop);
2113 } 2231 }
2114} 2232}
2115 2233
2116void 2234void
2140 XFree (RETVAL); 2258 XFree (RETVAL);
2141 2259
2142void 2260void
2143XDeleteProperty (rxvt_term *term, Window window, Atom property) 2261XDeleteProperty (rxvt_term *term, Window window, Atom property)
2144 C_ARGS: term->dpy, window, property 2262 C_ARGS: term->dpy, window, property
2263
2264void
2265rxvt_term::XShapeQueryVersion ()
2266 PPCODE:
2267 int major, minor;
2268 EXTEND (SP, 2);
2269 if (XShapeQueryVersion (THIS->display->dpy, &major, &minor))
2270 {
2271 PUSHs (sv_2mortal (newSViv (major)));
2272 PUSHs (sv_2mortal (newSViv (minor)));
2273 }
2274
2275void
2276XShapeCombineRegion (rxvt_term *term, Window dest, int destKind, int xOff, int yOff, Region r, int op)
2277 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, r, op
2278
2279void
2280XShapeCombineMask (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int op)
2281 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, op
2282
2283void
2284XShapeCombineShape (rxvt_term *term, XID dest, int destKind, int xOff, int yOff, Pixmap src, int srcKind, int op)
2285 C_ARGS: term->display->dpy, dest, destKind, xOff, yOff, src, srcKind, op
2145 2286
2146Window 2287Window
2147rxvt_term::DefaultRootWindow () 2288rxvt_term::DefaultRootWindow ()
2148 CODE: 2289 CODE:
2149 RETVAL = THIS->display->root; 2290 RETVAL = THIS->display->root;
2194 Window child; 2335 Window child;
2195 2336
2196 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child)) 2337 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2197 { 2338 {
2198 EXTEND (SP, 3); 2339 EXTEND (SP, 3);
2199 PUSHs (newSViv (dx)); 2340 PUSHs (sv_2mortal (newSViv (dx)));
2200 PUSHs (newSViv (dy)); 2341 PUSHs (sv_2mortal (newSViv (dy)));
2201 PUSHs (newSVuv (child)); 2342 PUSHs (sv_2mortal (newSVuv (child)));
2202 } 2343 }
2203} 2344}
2204 2345
2205############################################################################# 2346#############################################################################
2206# fancy bg bloatstuff (TODO: should be moved up somewhere) 2347# fancy bg bloatstuff (TODO: should be moved up somewhere)
2262 RETVAL 2403 RETVAL
2263 2404
2264#endif 2405#endif
2265 2406
2266void 2407void
2267rxvt_term::set_background (rxvt_img *img, bool border = false) 2408rxvt_term::clr_background ()
2268 CODE: 2409 CODE:
2269 delete THIS->bg_img; 2410 delete THIS->bg_img;
2270 THIS->bg_img = 0; 2411 THIS->bg_img = 0;
2412 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2413
2414void
2415rxvt_term::set_background (rxvt_img *img, bool border = false)
2416 CODE:
2417 delete THIS->bg_img;
2271 THIS->bg_flags = 0; 2418 THIS->bg_img = 0;
2419 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2272 2420
2273 if (img) // TODO: cannot be false 2421 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2274 { 2422 {
2275 img = img->clone (); // own the img 2423 img = img->clone (); // own the img
2276 2424
2277 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2425 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2278 img->sub_rect (0, 0, 2426 img->sub_rect (0, 0,
2286 2434
2287 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2435 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2288 ->replace (img); 2436 ->replace (img);
2289 2437
2290 THIS->bg_img = img; 2438 THIS->bg_img = img;
2291 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2292 2439
2293 if (!border) 2440 if (!border)
2294 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2441 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2295 } 2442 }
2296 2443
2373 2520
2374void 2521void
2375rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2522rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2376 PROTOTYPE: $;$$$$ 2523 PROTOTYPE: $;$$$$
2377 INIT: 2524 INIT:
2378 rgba cc = parse_rgba (c, THIS->s); 2525 rxvt_screen screen;
2526 screen.set (THIS->d);
2527 rgba cc = parse_rgba (c, &screen);
2379 C_ARGS: cc, x, y, w, h 2528 C_ARGS: cc, x, y, w, h
2380 2529
2381void 2530void
2382rxvt_img::DESTROY () 2531rxvt_img::DESTROY ()
2383 CODE: 2532 CODE:
2441rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2590rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2442 2591
2443rxvt_img * 2592rxvt_img *
2444rxvt_img::tint (SV *c) 2593rxvt_img::tint (SV *c)
2445 INIT: 2594 INIT:
2446 rgba cc = parse_rgba (c, THIS->s); 2595 rxvt_screen screen;
2596 screen.set (THIS->d);
2597 rgba cc = parse_rgba (c, &screen);
2447 C_ARGS: cc 2598 C_ARGS: cc
2448 2599
2449rxvt_img * 2600rxvt_img *
2450rxvt_img::shade (rxvt_img::nv factor) 2601rxvt_img::shade (rxvt_img::nv factor)
2451 2602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines