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.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
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),
847 867
868 const_iv (None),
848 const_iv (CurrentTime), 869 const_iv (CurrentTime),
849 const_iv (ShiftMask), 870 const_iv (ShiftMask),
850 const_iv (LockMask), 871 const_iv (LockMask),
851 const_iv (ControlMask), 872 const_iv (ControlMask),
852 const_iv (Mod1Mask), 873 const_iv (Mod1Mask),
923 const_iv (SelectionRequest), 944 const_iv (SelectionRequest),
924 const_iv (SelectionNotify), 945 const_iv (SelectionNotify),
925 const_iv (ColormapNotify), 946 const_iv (ColormapNotify),
926 const_iv (ClientMessage), 947 const_iv (ClientMessage),
927 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
928# if ENABLE_XIM_ONTHESPOT 962# if ENABLE_XIM_ONTHESPOT
929 const_iv (XIMReverse), 963 const_iv (XIMReverse),
930 const_iv (XIMUnderline), 964 const_iv (XIMUnderline),
931 const_iv (XIMHighlight), 965 const_iv (XIMHighlight),
932 const_iv (XIMPrimary), 966 const_iv (XIMPrimary),
933 const_iv (XIMSecondary), 967 const_iv (XIMSecondary),
934 const_iv (XIMTertiary), 968 const_iv (XIMTertiary),
935 const_iv (XIMVisibleToForward), 969 const_iv (XIMVisibleToForward),
936 const_iv (XIMVisibleToBackword), 970 const_iv (XIMVisibleToBackword),
937 const_iv (XIMVisibleToCenter), 971 const_iv (XIMVisibleToCenter),
972# endif
938#if XRENDER 973# if XRENDER
939 const_iv (PictStandardARGB32), 974 const_iv (PictStandardARGB32),
940 const_iv (PictStandardRGB24), 975 const_iv (PictStandardRGB24),
941 const_iv (PictStandardA8), 976 const_iv (PictStandardA8),
942 const_iv (PictStandardA4), 977 const_iv (PictStandardA4),
943 const_iv (PictStandardA1), 978 const_iv (PictStandardA1),
999 const_iv (PictOpExclusion), 1034 const_iv (PictOpExclusion),
1000 const_iv (PictOpHSLHue), 1035 const_iv (PictOpHSLHue),
1001 const_iv (PictOpHSLSaturation), 1036 const_iv (PictOpHSLSaturation),
1002 const_iv (PictOpHSLColor), 1037 const_iv (PictOpHSLColor),
1003 const_iv (PictOpHSLLuminosity), 1038 const_iv (PictOpHSLLuminosity),
1004#endif 1039# endif
1005# if 0 1040# if 0
1006 const_iv (XIMForwardChar), 1041 const_iv (XIMForwardChar),
1007 const_iv (XIMBackwardChar), 1042 const_iv (XIMBackwardChar),
1008 const_iv (XIMForwardWord), 1043 const_iv (XIMForwardWord),
1009 const_iv (XIMBackwardWord), 1044 const_iv (XIMBackwardWord),
1014 const_iv (XIMLineStart), 1049 const_iv (XIMLineStart),
1015 const_iv (XIMLineEnd), 1050 const_iv (XIMLineEnd),
1016 const_iv (XIMAbsolutePosition), 1051 const_iv (XIMAbsolutePosition),
1017 const_iv (XIMDontChange), 1052 const_iv (XIMDontChange),
1018# endif 1053# endif
1019# 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),
1020 }; 1084 };
1021 1085
1022 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--)
1023 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1087 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1024} 1088}
1025 1089
1026void 1090void
1027log (const char *msg) 1091log (utf8_string msg)
1028 CODE: 1092 CODE:
1029 rxvt_log ("%s", msg); 1093 rxvt_log ("%s", msg);
1030 1094
1031void 1095void
1032warn (const char *msg) 1096warn (utf8_string msg)
1033 CODE: 1097 CODE:
1034 rxvt_warn ("%s", msg); 1098 rxvt_warn ("%s", msg);
1035 1099
1036void 1100void
1037fatal (const char *msg) 1101fatal (utf8_string msg)
1038 CODE: 1102 CODE:
1039 rxvt_fatal ("%s", msg); 1103 rxvt_fatal ("%s", msg);
1040 1104
1041void 1105void
1042_exit (int status) 1106_exit (int status)
1102int 1166int
1103SET_CUSTOM (int rend, int new_value) 1167SET_CUSTOM (int rend, int new_value)
1104 CODE: 1168 CODE:
1105{ 1169{
1106 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1170 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1107 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);
1108 1172
1109 RETVAL = (rend & ~RS_customMask) 1173 RETVAL = (rend & ~RS_customMask)
1110 | ((new_value << RS_customShift) & RS_customMask); 1174 | ((new_value << RS_customShift) & RS_customMask);
1111} 1175}
1112 OUTPUT: 1176 OUTPUT:
1149 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)));
1150 1214
1151 av_pop (av); 1215 av_pop (av);
1152 1216
1153 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)
1154 1253
1155MODULE = urxvt PACKAGE = urxvt::term 1254MODULE = urxvt PACKAGE = urxvt::term
1156 1255
1157SV * 1256SV *
1158_new (AV *env, AV *arg) 1257_new (AV *env, AV *arg)
1282rxvt_term::ungrab () 1381rxvt_term::ungrab ()
1283 CODE: 1382 CODE:
1284 ungrab (THIS); 1383 ungrab (THIS);
1285 1384
1286int 1385int
1287rxvt_term::XStringToKeysym (char *string) 1386rxvt_term::XStringToKeysym (octet_string string)
1288 CODE: 1387 CODE:
1289 RETVAL = XStringToKeysym (string); 1388 RETVAL = XStringToKeysym (string);
1290 OUTPUT: RETVAL 1389 OUTPUT: RETVAL
1291 1390
1292char * 1391char *
1302 OUTPUT: RETVAL 1401 OUTPUT: RETVAL
1303 1402
1304int 1403int
1305rxvt_term::XKeycodeToKeysym (int code, int index) 1404rxvt_term::XKeycodeToKeysym (int code, int index)
1306 CODE: 1405 CODE:
1307 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1406 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1308 OUTPUT: RETVAL 1407 OUTPUT: RETVAL
1309 1408
1310int 1409int
1311rxvt_term::strwidth (SV *str) 1410rxvt_term::strwidth (SV *str)
1312 CODE: 1411 CODE:
1331 1430
1332SV * 1431SV *
1333rxvt_term::locale_encode (SV *str) 1432rxvt_term::locale_encode (SV *str)
1334 CODE: 1433 CODE:
1335{ 1434{
1435 if (!SvOK (str))
1436 XSRETURN_UNDEF;
1437
1336 wchar_t *wstr = sv2wcs (str); 1438 wchar_t *wstr = sv2wcs (str);
1337 1439
1338 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1339 char *mbstr = rxvt_wcstombs (wstr); 1441 char *mbstr = rxvt_wcstombs (wstr);
1340 rxvt_pop_locale (); 1442 rxvt_pop_locale ();
1349 1451
1350SV * 1452SV *
1351rxvt_term::locale_decode (SV *octets) 1453rxvt_term::locale_decode (SV *octets)
1352 CODE: 1454 CODE:
1353{ 1455{
1456 if (!SvOK (octets))
1457 XSRETURN_UNDEF;
1458
1354 STRLEN len; 1459 STRLEN len;
1355 char *data = SvPVbyte (octets, len); 1460 char *data = SvPVbyte (octets, len);
1356 1461
1357 rxvt_push_locale (THIS->locale); 1462 rxvt_push_locale (THIS->locale);
1358 wchar_t *wstr = rxvt_mbstowcs (data, len); 1463 wchar_t *wstr = rxvt_mbstowcs (data, len);
1382#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1487#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1383#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1488#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1384#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1489#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1385 1490
1386int 1491int
1387rxvt_term::width () 1492rxvt_term::width (int new_value = NO_INIT)
1388 ALIAS: 1493 ALIAS:
1389 width = TERM_OFFSET_width 1494 width = TERM_OFFSET_width
1390 height = TERM_OFFSET_height 1495 height = TERM_OFFSET_height
1391 fwidth = TERM_OFFSET_fwidth 1496 fwidth = TERM_OFFSET_fwidth
1392 fheight = TERM_OFFSET_fheight 1497 fheight = TERM_OFFSET_fheight
1402 saveLines = TERM_OFFSET_saveLines 1507 saveLines = TERM_OFFSET_saveLines
1403 total_rows = TERM_OFFSET_total_rows 1508 total_rows = TERM_OFFSET_total_rows
1404 top_row = TERM_OFFSET_top_row 1509 top_row = TERM_OFFSET_top_row
1405 CODE: 1510 CODE:
1406 RETVAL = *(int *)((char *)THIS + ix); 1511 RETVAL = *(int *)((char *)THIS + ix);
1512 if (items > 1)
1513 *(int *)((char *)THIS + ix) = new_value;
1407 OUTPUT: 1514 OUTPUT:
1408 RETVAL 1515 RETVAL
1409 1516
1410unsigned int 1517unsigned int
1411rxvt_term::ModLevel3Mask () 1518rxvt_term::ModLevel3Mask ()
1413 ModLevel3Mask = 0 1520 ModLevel3Mask = 0
1414 ModMetaMask = 1 1521 ModMetaMask = 1
1415 ModNumLockMask = 2 1522 ModNumLockMask = 2
1416 current_screen = 3 1523 current_screen = 3
1417 hidden_cursor = 4 1524 hidden_cursor = 4
1525 priv_modes = 5
1418 CODE: 1526 CODE:
1419 switch (ix) 1527 switch (ix)
1420 { 1528 {
1421 case 0: RETVAL = THIS->ModLevel3Mask; break; 1529 case 0: RETVAL = THIS->ModLevel3Mask; break;
1422 case 1: RETVAL = THIS->ModMetaMask; break; 1530 case 1: RETVAL = THIS->ModMetaMask; break;
1423 case 2: RETVAL = THIS->ModNumLockMask; break; 1531 case 2: RETVAL = THIS->ModNumLockMask; break;
1424 case 3: RETVAL = THIS->current_screen; break; 1532 case 3: RETVAL = THIS->current_screen; break;
1425#ifdef CURSOR_BLINK 1533#ifdef CURSOR_BLINK
1426 case 4: RETVAL = THIS->hidden_cursor; break; 1534 case 4: RETVAL = THIS->hidden_cursor; break;
1535#else
1536 case 4: RETVAL = 0; break;
1427#endif 1537#endif
1538 case 5: RETVAL = THIS->priv_modes; break;
1428 } 1539 }
1429 OUTPUT: 1540 OUTPUT:
1430 RETVAL 1541 RETVAL
1431 1542
1432char * 1543char *
1515 THIS->rstyle = new_rstyle; 1626 THIS->rstyle = new_rstyle;
1516 OUTPUT: 1627 OUTPUT:
1517 RETVAL 1628 RETVAL
1518 1629
1519int 1630int
1520rxvt_term::view_start (int newval = 1) 1631rxvt_term::view_start (int newval = 0)
1521 PROTOTYPE: $;$ 1632 PROTOTYPE: $;$
1522 CODE: 1633 CODE:
1523{ 1634{
1524 RETVAL = THIS->view_start; 1635 RETVAL = THIS->view_start;
1525 1636 if (items > 1)
1526 if (newval <= 0)
1527 THIS->scr_changeview (max (newval, THIS->top_row)); 1637 THIS->scr_changeview (newval);
1528} 1638}
1529 OUTPUT: 1639 OUTPUT:
1530 RETVAL 1640 RETVAL
1531 1641
1532void 1642void
1567void 1677void
1568rxvt_term::want_refresh () 1678rxvt_term::want_refresh ()
1569 CODE: 1679 CODE:
1570 THIS->want_refresh = 1; 1680 THIS->want_refresh = 1;
1571 THIS->refresh_check (); 1681 THIS->refresh_check ();
1682
1683void
1684rxvt_term::refresh_check ()
1572 1685
1573void 1686void
1574rxvt_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)
1575 PPCODE: 1688 PPCODE:
1576{ 1689{
1721 *r++ = NOCHAR; 1834 *r++ = NOCHAR;
1722 } 1835 }
1723 1836
1724 rxvt_pop_locale (); 1837 rxvt_pop_locale ();
1725 1838
1839 free (wstr);
1726 RETVAL = wcs2sv (rstr, r - rstr); 1840 RETVAL = wcs2sv (rstr, r - rstr);
1727} 1841}
1728 OUTPUT: 1842 OUTPUT:
1729 RETVAL 1843 RETVAL
1730 1844
1738 // find length 1852 // find length
1739 for (wchar_t *s = wstr; *s; s++) 1853 for (wchar_t *s = wstr; *s; s++)
1740 if (*s == NOCHAR) 1854 if (*s == NOCHAR)
1741 ; 1855 ;
1742 else if (IS_COMPOSE (*s)) 1856 else if (IS_COMPOSE (*s))
1743 dlen += rxvt_composite.expand (*s, 0); 1857 dlen += rxvt_composite.expand (*s);
1744 else 1858 else
1745 dlen++; 1859 dlen++;
1746 1860
1747 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1861 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1748 1862
1754 else if (IS_COMPOSE (*s)) 1868 else if (IS_COMPOSE (*s))
1755 r += rxvt_composite.expand (*s, r); 1869 r += rxvt_composite.expand (*s, r);
1756 else 1870 else
1757 *r++ = *s; 1871 *r++ = *s;
1758 1872
1873 free (wstr);
1759 RETVAL = wcs2sv (rstr, r - rstr); 1874 RETVAL = wcs2sv (rstr, r - rstr);
1760} 1875}
1761 OUTPUT: 1876 OUTPUT:
1762 RETVAL 1877 RETVAL
1763 1878
1764void 1879void
1765rxvt_term::_resource (char *name, int index, SV *newval = 0) 1880rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1766 PPCODE: 1881 PPCODE:
1767{ 1882{
1768 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1883 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1769# define def(name) { # name, Rs_ ## name }, 1884# define def(name) { # name, Rs_ ## name },
1770# define reserve(name,count) 1885# define reserve(name,count)
1785 index += rs->value; 1900 index += rs->value;
1786 } 1901 }
1787 else 1902 else
1788 { 1903 {
1789 --rs; 1904 --rs;
1790 name = ""; 1905 name = (octet_string)"";
1791 } 1906 }
1792 1907
1793 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1908 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1794 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);
1795 1910
1808 THIS->rs [index] = 0; 1923 THIS->rs [index] = 0;
1809 } 1924 }
1810} 1925}
1811 1926
1812const char * 1927const char *
1813rxvt_term::x_resource (const char *name) 1928rxvt_term::x_resource (octet_string name)
1814 1929
1815bool 1930bool
1816rxvt_term::option (U8 optval, int set = -1) 1931rxvt_term::option (U8 optval, int set = -1)
1817 CODE: 1932 CODE:
1818{ 1933{
1852 } 1967 }
1853} 1968}
1854 OUTPUT: 1969 OUTPUT:
1855 RETVAL 1970 RETVAL
1856 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
1857bool 1982bool
1858rxvt_term::bind_action (char *keysym, char *str) 1983rxvt_term::bind_action (octet_string keysym, octet_string action)
1859 ALIAS: 1984 ALIAS:
1860 parse_keysym = 1 1985 parse_keysym = 1
1861 CODE: 1986 CODE:
1862 RETVAL = 0 < THIS->bind_action (keysym, str); 1987 RETVAL = 0 < THIS->bind_action (keysym, action);
1863 THIS->keyboard->register_done (); 1988 THIS->keyboard->register_done ();
1864 OUTPUT: 1989 OUTPUT:
1865 RETVAL 1990 RETVAL
1991
1992void
1993rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1994 CODE:
1995 wchar_t *wstr = sv2wcs (str);
1996 THIS->keyboard->register_action (keysym, state, wstr);
1997 free (wstr);
1866 1998
1867void 1999void
1868rxvt_term::screen_cur (...) 2000rxvt_term::screen_cur (...)
1869 PROTOTYPE: $;$$ 2001 PROTOTYPE: $;$$
1870 ALIAS: 2002 ALIAS:
1981 2113
1982void 2114void
1983rxvt_term::scr_bell () 2115rxvt_term::scr_bell ()
1984 2116
1985void 2117void
1986rxvt_term::scr_recolour (bool refresh = true); 2118rxvt_term::scr_recolor (bool refresh = true);
1987 2119
1988void 2120void
1989rxvt_term::scr_change_screen (int screen) 2121rxvt_term::scr_change_screen (int screen)
1990 2122
1991void 2123void
2064 int count; 2196 int count;
2065 Atom *props = XListProperties (THIS->dpy, window, &count); 2197 Atom *props = XListProperties (THIS->dpy, window, &count);
2066 2198
2067 EXTEND (SP, count); 2199 EXTEND (SP, count);
2068 while (count--) 2200 while (count--)
2069 PUSHs (newSVuv ((U32)props [count])); 2201 PUSHs (sv_2mortal (newSVuv ((U32)props [count])));
2070 2202
2071 XFree (props); 2203 XFree (props);
2072} 2204}
2073 2205
2074void 2206void
2090 int elemsize = format == 16 ? sizeof (short) 2222 int elemsize = format == 16 ? sizeof (short)
2091 : format == 32 ? sizeof (long) 2223 : format == 32 ? sizeof (long)
2092 : 1; 2224 : 1;
2093 2225
2094 EXTEND (SP, 3); 2226 EXTEND (SP, 3);
2095 PUSHs (newSVuv ((U32)type)); 2227 PUSHs (sv_2mortal (newSVuv ((U32)type)));
2096 PUSHs (newSViv (format)); 2228 PUSHs (sv_2mortal (newSViv (format)));
2097 PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); 2229 PUSHs (sv_2mortal (newSVpvn ((char *)prop, nitems * elemsize)));
2098 XFree (prop); 2230 XFree (prop);
2099 } 2231 }
2100} 2232}
2101 2233
2102void 2234void
2126 XFree (RETVAL); 2258 XFree (RETVAL);
2127 2259
2128void 2260void
2129XDeleteProperty (rxvt_term *term, Window window, Atom property) 2261XDeleteProperty (rxvt_term *term, Window window, Atom property)
2130 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
2131 2286
2132Window 2287Window
2133rxvt_term::DefaultRootWindow () 2288rxvt_term::DefaultRootWindow ()
2134 CODE: 2289 CODE:
2135 RETVAL = THIS->display->root; 2290 RETVAL = THIS->display->root;
2180 Window child; 2335 Window child;
2181 2336
2182 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child)) 2337 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2183 { 2338 {
2184 EXTEND (SP, 3); 2339 EXTEND (SP, 3);
2185 PUSHs (newSViv (dx)); 2340 PUSHs (sv_2mortal (newSViv (dx)));
2186 PUSHs (newSViv (dy)); 2341 PUSHs (sv_2mortal (newSViv (dy)));
2187 PUSHs (newSVuv (child)); 2342 PUSHs (sv_2mortal (newSVuv (child)));
2188 } 2343 }
2189} 2344}
2190 2345
2191############################################################################# 2346#############################################################################
2192# fancy bg bloatstuff (TODO: should be moved up somewhere) 2347# fancy bg bloatstuff (TODO: should be moved up somewhere)
2248 RETVAL 2403 RETVAL
2249 2404
2250#endif 2405#endif
2251 2406
2252void 2407void
2253rxvt_term::set_background (rxvt_img *img, bool border = false) 2408rxvt_term::clr_background ()
2254 CODE: 2409 CODE:
2255 delete THIS->bg_img; 2410 delete THIS->bg_img;
2256 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;
2257 THIS->bg_flags = 0; 2418 THIS->bg_img = 0;
2419 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2258 2420
2259 if (img) // TODO: cannot be false 2421 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2260 { 2422 {
2261 img = img->clone (); // own the img 2423 img = img->clone (); // own the img
2262 2424
2263 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2425 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2264 img->sub_rect (0, 0, 2426 img->sub_rect (0, 0,
2272 2434
2273 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])
2274 ->replace (img); 2436 ->replace (img);
2275 2437
2276 THIS->bg_img = img; 2438 THIS->bg_img = img;
2277 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2278 2439
2279 if (!border) 2440 if (!border)
2280 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2441 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2281 } 2442 }
2282 2443
2359 2520
2360void 2521void
2361rxvt_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)
2362 PROTOTYPE: $;$$$$ 2523 PROTOTYPE: $;$$$$
2363 INIT: 2524 INIT:
2364 rgba cc = parse_rgba (c, THIS->s); 2525 rxvt_screen screen;
2526 screen.set (THIS->d);
2527 rgba cc = parse_rgba (c, &screen);
2365 C_ARGS: cc, x, y, w, h 2528 C_ARGS: cc, x, y, w, h
2366 2529
2367void 2530void
2368rxvt_img::DESTROY () 2531rxvt_img::DESTROY ()
2369 CODE: 2532 CODE:
2427rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2590rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2428 2591
2429rxvt_img * 2592rxvt_img *
2430rxvt_img::tint (SV *c) 2593rxvt_img::tint (SV *c)
2431 INIT: 2594 INIT:
2432 rgba cc = parse_rgba (c, THIS->s); 2595 rxvt_screen screen;
2596 screen.set (THIS->d);
2597 rgba cc = parse_rgba (c, &screen);
2433 C_ARGS: cc 2598 C_ARGS: cc
2434 2599
2435rxvt_img * 2600rxvt_img *
2436rxvt_img::shade (rxvt_img::nv factor) 2601rxvt_img::shade (rxvt_img::nv factor)
2437 2602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines