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.216 by root, Thu Oct 3 01:11:38 2013 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-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
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
493 506
494 return ret; 507 return ret;
495} 508}
496 509
497static void 510static void
511_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
512{
513 unsigned int state;
514
515 if (term->parse_keysym (k, state) == -1)
516 return;
517
518 dSP;
519 XPUSHs (sv_2mortal (newSVpv (v, 0)));
520 PUTBACK;
521}
522
523static void
524_keysym_resources (rxvt_term *term)
525{
526 term->enumerate_keysym_resources (_keysym_resource_push);
527}
528
529static void
498ungrab (rxvt_term *THIS) 530ungrab (rxvt_term *THIS)
499{ 531{
500 if (THIS->perl.grabtime) 532 if (THIS->perl.grabtime)
501 { 533 {
502 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime); 534 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
504 THIS->perl.grabtime = 0; 536 THIS->perl.grabtime = 0;
505 } 537 }
506} 538}
507 539
508bool 540bool
509rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 541rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
510{ 542{
511 if (!perl || !term->perl.self) 543 if (!perl || !term->perl.self)
512 return false; 544 return false;
513 545
514 localise_env set_environ (perl_environ); 546 localise_env set_environ (perl_environ);
793 static const struct { 825 static const struct {
794 const char *name; 826 const char *name;
795 IV iv; 827 IV iv;
796 } *civ, const_iv[] = { 828 } *civ, const_iv[] = {
797# define const_iv(name) { # name, (IV)name } 829# define const_iv(name) { # name, (IV)name }
830 const_iv (HOOK_INIT),
831 const_iv (HOOK_DESTROY),
832 const_iv (HOOK_ACTION),
833 const_iv (HOOK_OSC_SEQ),
834 const_iv (HOOK_OSC_SEQ_PERL),
835
798 const_iv (NUM_RESOURCES), 836 const_iv (NUM_RESOURCES),
799 const_iv (DEFAULT_RSTYLE), 837 const_iv (DEFAULT_RSTYLE),
800 const_iv (OVERLAY_RSTYLE), 838 const_iv (OVERLAY_RSTYLE),
801 const_iv (Color_Bits), 839 const_iv (Color_Bits),
802 const_iv (RS_bgShift), const_iv (RS_bgMask), 840 const_iv (RS_bgShift), const_iv (RS_bgMask),
816 const_iv (RS_Uline), 854 const_iv (RS_Uline),
817 855
818 // TODO: should support all colour constants, create colorinc.h &c 856 // TODO: should support all colour constants, create colorinc.h &c
819 const_iv (Color_fg), 857 const_iv (Color_fg),
820 const_iv (Color_bg), 858 const_iv (Color_bg),
859# if OFF_FOCUS_FADING
821 const_iv (Color_fade), 860 const_iv (Color_fade),
861# endif
822 const_iv (Color_pointer_fg), 862 const_iv (Color_pointer_fg),
823 const_iv (Color_pointer_bg), 863 const_iv (Color_pointer_bg),
824 const_iv (Color_border), 864 const_iv (Color_border),
825 const_iv (NRS_COLORS), 865 const_iv (NRS_COLORS),
826 const_iv (TOTAL_COLORS), 866 const_iv (TOTAL_COLORS),
827 867
868 const_iv (None),
828 const_iv (CurrentTime), 869 const_iv (CurrentTime),
829 const_iv (ShiftMask), 870 const_iv (ShiftMask),
830 const_iv (LockMask), 871 const_iv (LockMask),
831 const_iv (ControlMask), 872 const_iv (ControlMask),
832 const_iv (Mod1Mask), 873 const_iv (Mod1Mask),
903 const_iv (SelectionRequest), 944 const_iv (SelectionRequest),
904 const_iv (SelectionNotify), 945 const_iv (SelectionNotify),
905 const_iv (ColormapNotify), 946 const_iv (ColormapNotify),
906 const_iv (ClientMessage), 947 const_iv (ClientMessage),
907 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
908# if ENABLE_XIM_ONTHESPOT 962# if ENABLE_XIM_ONTHESPOT
909 const_iv (XIMReverse), 963 const_iv (XIMReverse),
910 const_iv (XIMUnderline), 964 const_iv (XIMUnderline),
911 const_iv (XIMHighlight), 965 const_iv (XIMHighlight),
912 const_iv (XIMPrimary), 966 const_iv (XIMPrimary),
913 const_iv (XIMSecondary), 967 const_iv (XIMSecondary),
914 const_iv (XIMTertiary), 968 const_iv (XIMTertiary),
915 const_iv (XIMVisibleToForward), 969 const_iv (XIMVisibleToForward),
916 const_iv (XIMVisibleToBackword), 970 const_iv (XIMVisibleToBackword),
917 const_iv (XIMVisibleToCenter), 971 const_iv (XIMVisibleToCenter),
972# endif
918#if XRENDER 973# if XRENDER
919 const_iv (PictStandardARGB32), 974 const_iv (PictStandardARGB32),
920 const_iv (PictStandardRGB24), 975 const_iv (PictStandardRGB24),
921 const_iv (PictStandardA8), 976 const_iv (PictStandardA8),
922 const_iv (PictStandardA4), 977 const_iv (PictStandardA4),
923 const_iv (PictStandardA1), 978 const_iv (PictStandardA1),
979 const_iv (PictOpExclusion), 1034 const_iv (PictOpExclusion),
980 const_iv (PictOpHSLHue), 1035 const_iv (PictOpHSLHue),
981 const_iv (PictOpHSLSaturation), 1036 const_iv (PictOpHSLSaturation),
982 const_iv (PictOpHSLColor), 1037 const_iv (PictOpHSLColor),
983 const_iv (PictOpHSLLuminosity), 1038 const_iv (PictOpHSLLuminosity),
984#endif 1039# endif
985# if 0 1040# if 0
986 const_iv (XIMForwardChar), 1041 const_iv (XIMForwardChar),
987 const_iv (XIMBackwardChar), 1042 const_iv (XIMBackwardChar),
988 const_iv (XIMForwardWord), 1043 const_iv (XIMForwardWord),
989 const_iv (XIMBackwardWord), 1044 const_iv (XIMBackwardWord),
994 const_iv (XIMLineStart), 1049 const_iv (XIMLineStart),
995 const_iv (XIMLineEnd), 1050 const_iv (XIMLineEnd),
996 const_iv (XIMAbsolutePosition), 1051 const_iv (XIMAbsolutePosition),
997 const_iv (XIMDontChange), 1052 const_iv (XIMDontChange),
998# endif 1053# endif
999# 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),
1000 }; 1084 };
1001 1085
1002 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--)
1003 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1087 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1004} 1088}
1005 1089
1006void 1090void
1007log (const char *msg) 1091log (utf8_string msg)
1008 CODE: 1092 CODE:
1009 rxvt_log ("%s", msg); 1093 rxvt_log ("%s", msg);
1010 1094
1011void 1095void
1012warn (const char *msg) 1096warn (utf8_string msg)
1013 CODE: 1097 CODE:
1014 rxvt_warn ("%s", msg); 1098 rxvt_warn ("%s", msg);
1015 1099
1016void 1100void
1017fatal (const char *msg) 1101fatal (utf8_string msg)
1018 CODE: 1102 CODE:
1019 rxvt_fatal ("%s", msg); 1103 rxvt_fatal ("%s", msg);
1020 1104
1021void 1105void
1022_exit (int status) 1106_exit (int status)
1082int 1166int
1083SET_CUSTOM (int rend, int new_value) 1167SET_CUSTOM (int rend, int new_value)
1084 CODE: 1168 CODE:
1085{ 1169{
1086 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1170 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1087 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);
1088 1172
1089 RETVAL = (rend & ~RS_customMask) 1173 RETVAL = (rend & ~RS_customMask)
1090 | ((new_value << RS_customShift) & RS_customMask); 1174 | ((new_value << RS_customShift) & RS_customMask);
1091} 1175}
1092 OUTPUT: 1176 OUTPUT:
1129 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)));
1130 1214
1131 av_pop (av); 1215 av_pop (av);
1132 1216
1133 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)
1134 1253
1135MODULE = urxvt PACKAGE = urxvt::term 1254MODULE = urxvt PACKAGE = urxvt::term
1136 1255
1137SV * 1256SV *
1138_new (AV *env, AV *arg) 1257_new (AV *env, AV *arg)
1187void 1306void
1188rxvt_term::put_option_db (octet_string specifier, octet_string value) 1307rxvt_term::put_option_db (octet_string specifier, octet_string value)
1189 CODE: 1308 CODE:
1190 XrmPutStringResource (&THIS->option_db, specifier, value); 1309 XrmPutStringResource (&THIS->option_db, specifier, value);
1191 1310
1311void
1312rxvt_term::_keysym_resources ()
1313 PPCODE:
1314 PUTBACK;
1315 _keysym_resources (THIS);
1316 SPAGAIN;
1317
1192int 1318int
1193rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1319rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1194 CODE: 1320 CODE:
1195 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1321 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1196 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1322 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1255rxvt_term::ungrab () 1381rxvt_term::ungrab ()
1256 CODE: 1382 CODE:
1257 ungrab (THIS); 1383 ungrab (THIS);
1258 1384
1259int 1385int
1260rxvt_term::XStringToKeysym (char *string) 1386rxvt_term::XStringToKeysym (octet_string string)
1261 CODE: 1387 CODE:
1262 RETVAL = XStringToKeysym (string); 1388 RETVAL = XStringToKeysym (string);
1263 OUTPUT: RETVAL 1389 OUTPUT: RETVAL
1264 1390
1265char * 1391char *
1275 OUTPUT: RETVAL 1401 OUTPUT: RETVAL
1276 1402
1277int 1403int
1278rxvt_term::XKeycodeToKeysym (int code, int index) 1404rxvt_term::XKeycodeToKeysym (int code, int index)
1279 CODE: 1405 CODE:
1280 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1406 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1281 OUTPUT: RETVAL 1407 OUTPUT: RETVAL
1282 1408
1283int 1409int
1284rxvt_term::strwidth (SV *str) 1410rxvt_term::strwidth (SV *str)
1285 CODE: 1411 CODE:
1304 1430
1305SV * 1431SV *
1306rxvt_term::locale_encode (SV *str) 1432rxvt_term::locale_encode (SV *str)
1307 CODE: 1433 CODE:
1308{ 1434{
1435 if (!SvOK (str))
1436 XSRETURN_UNDEF;
1437
1309 wchar_t *wstr = sv2wcs (str); 1438 wchar_t *wstr = sv2wcs (str);
1310 1439
1311 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1312 char *mbstr = rxvt_wcstombs (wstr); 1441 char *mbstr = rxvt_wcstombs (wstr);
1313 rxvt_pop_locale (); 1442 rxvt_pop_locale ();
1322 1451
1323SV * 1452SV *
1324rxvt_term::locale_decode (SV *octets) 1453rxvt_term::locale_decode (SV *octets)
1325 CODE: 1454 CODE:
1326{ 1455{
1456 if (!SvOK (octets))
1457 XSRETURN_UNDEF;
1458
1327 STRLEN len; 1459 STRLEN len;
1328 char *data = SvPVbyte (octets, len); 1460 char *data = SvPVbyte (octets, len);
1329 1461
1330 rxvt_push_locale (THIS->locale); 1462 rxvt_push_locale (THIS->locale);
1331 wchar_t *wstr = rxvt_mbstowcs (data, len); 1463 wchar_t *wstr = rxvt_mbstowcs (data, len);
1355#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1487#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1356#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1488#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1357#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1489#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1358 1490
1359int 1491int
1360rxvt_term::width () 1492rxvt_term::width (int new_value = NO_INIT)
1361 ALIAS: 1493 ALIAS:
1362 width = TERM_OFFSET_width 1494 width = TERM_OFFSET_width
1363 height = TERM_OFFSET_height 1495 height = TERM_OFFSET_height
1364 fwidth = TERM_OFFSET_fwidth 1496 fwidth = TERM_OFFSET_fwidth
1365 fheight = TERM_OFFSET_fheight 1497 fheight = TERM_OFFSET_fheight
1375 saveLines = TERM_OFFSET_saveLines 1507 saveLines = TERM_OFFSET_saveLines
1376 total_rows = TERM_OFFSET_total_rows 1508 total_rows = TERM_OFFSET_total_rows
1377 top_row = TERM_OFFSET_top_row 1509 top_row = TERM_OFFSET_top_row
1378 CODE: 1510 CODE:
1379 RETVAL = *(int *)((char *)THIS + ix); 1511 RETVAL = *(int *)((char *)THIS + ix);
1512 if (items > 1)
1513 *(int *)((char *)THIS + ix) = new_value;
1380 OUTPUT: 1514 OUTPUT:
1381 RETVAL 1515 RETVAL
1382 1516
1383unsigned int 1517unsigned int
1384rxvt_term::ModLevel3Mask () 1518rxvt_term::ModLevel3Mask ()
1386 ModLevel3Mask = 0 1520 ModLevel3Mask = 0
1387 ModMetaMask = 1 1521 ModMetaMask = 1
1388 ModNumLockMask = 2 1522 ModNumLockMask = 2
1389 current_screen = 3 1523 current_screen = 3
1390 hidden_cursor = 4 1524 hidden_cursor = 4
1525 priv_modes = 5
1391 CODE: 1526 CODE:
1392 switch (ix) 1527 switch (ix)
1393 { 1528 {
1394 case 0: RETVAL = THIS->ModLevel3Mask; break; 1529 case 0: RETVAL = THIS->ModLevel3Mask; break;
1395 case 1: RETVAL = THIS->ModMetaMask; break; 1530 case 1: RETVAL = THIS->ModMetaMask; break;
1396 case 2: RETVAL = THIS->ModNumLockMask; break; 1531 case 2: RETVAL = THIS->ModNumLockMask; break;
1397 case 3: RETVAL = THIS->current_screen; break; 1532 case 3: RETVAL = THIS->current_screen; break;
1398#ifdef CURSOR_BLINK 1533#ifdef CURSOR_BLINK
1399 case 4: RETVAL = THIS->hidden_cursor; break; 1534 case 4: RETVAL = THIS->hidden_cursor; break;
1535#else
1536 case 4: RETVAL = 0; break;
1400#endif 1537#endif
1538 case 5: RETVAL = THIS->priv_modes; break;
1401 } 1539 }
1402 OUTPUT: 1540 OUTPUT:
1403 RETVAL 1541 RETVAL
1404 1542
1405char * 1543char *
1488 THIS->rstyle = new_rstyle; 1626 THIS->rstyle = new_rstyle;
1489 OUTPUT: 1627 OUTPUT:
1490 RETVAL 1628 RETVAL
1491 1629
1492int 1630int
1493rxvt_term::view_start (int newval = 1) 1631rxvt_term::view_start (int newval = 0)
1494 PROTOTYPE: $;$ 1632 PROTOTYPE: $;$
1495 CODE: 1633 CODE:
1496{ 1634{
1497 RETVAL = THIS->view_start; 1635 RETVAL = THIS->view_start;
1498 1636 if (items > 1)
1499 if (newval <= 0)
1500 THIS->scr_changeview (max (newval, THIS->top_row)); 1637 THIS->scr_changeview (newval);
1501} 1638}
1502 OUTPUT: 1639 OUTPUT:
1503 RETVAL 1640 RETVAL
1504 1641
1505void 1642void
1540void 1677void
1541rxvt_term::want_refresh () 1678rxvt_term::want_refresh ()
1542 CODE: 1679 CODE:
1543 THIS->want_refresh = 1; 1680 THIS->want_refresh = 1;
1544 THIS->refresh_check (); 1681 THIS->refresh_check ();
1682
1683void
1684rxvt_term::refresh_check ()
1545 1685
1546void 1686void
1547rxvt_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)
1548 PPCODE: 1688 PPCODE:
1549{ 1689{
1694 *r++ = NOCHAR; 1834 *r++ = NOCHAR;
1695 } 1835 }
1696 1836
1697 rxvt_pop_locale (); 1837 rxvt_pop_locale ();
1698 1838
1839 free (wstr);
1699 RETVAL = wcs2sv (rstr, r - rstr); 1840 RETVAL = wcs2sv (rstr, r - rstr);
1700} 1841}
1701 OUTPUT: 1842 OUTPUT:
1702 RETVAL 1843 RETVAL
1703 1844
1711 // find length 1852 // find length
1712 for (wchar_t *s = wstr; *s; s++) 1853 for (wchar_t *s = wstr; *s; s++)
1713 if (*s == NOCHAR) 1854 if (*s == NOCHAR)
1714 ; 1855 ;
1715 else if (IS_COMPOSE (*s)) 1856 else if (IS_COMPOSE (*s))
1716 dlen += rxvt_composite.expand (*s, 0); 1857 dlen += rxvt_composite.expand (*s);
1717 else 1858 else
1718 dlen++; 1859 dlen++;
1719 1860
1720 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1861 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1721 1862
1727 else if (IS_COMPOSE (*s)) 1868 else if (IS_COMPOSE (*s))
1728 r += rxvt_composite.expand (*s, r); 1869 r += rxvt_composite.expand (*s, r);
1729 else 1870 else
1730 *r++ = *s; 1871 *r++ = *s;
1731 1872
1873 free (wstr);
1732 RETVAL = wcs2sv (rstr, r - rstr); 1874 RETVAL = wcs2sv (rstr, r - rstr);
1733} 1875}
1734 OUTPUT: 1876 OUTPUT:
1735 RETVAL 1877 RETVAL
1736 1878
1737void 1879void
1738rxvt_term::_resource (char *name, int index, SV *newval = 0) 1880rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1739 PPCODE: 1881 PPCODE:
1740{ 1882{
1741 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1883 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1742# define def(name) { # name, Rs_ ## name }, 1884# define def(name) { # name, Rs_ ## name },
1743# define reserve(name,count) 1885# define reserve(name,count)
1758 index += rs->value; 1900 index += rs->value;
1759 } 1901 }
1760 else 1902 else
1761 { 1903 {
1762 --rs; 1904 --rs;
1763 name = ""; 1905 name = (octet_string)"";
1764 } 1906 }
1765 1907
1766 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1908 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1767 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);
1768 1910
1781 THIS->rs [index] = 0; 1923 THIS->rs [index] = 0;
1782 } 1924 }
1783} 1925}
1784 1926
1785const char * 1927const char *
1786rxvt_term::x_resource (const char *name) 1928rxvt_term::x_resource (octet_string name)
1787 1929
1788bool 1930bool
1789rxvt_term::option (U8 optval, int set = -1) 1931rxvt_term::option (U8 optval, int set = -1)
1790 CODE: 1932 CODE:
1791{ 1933{
1810 THIS->cursor_blink_reset (); 1952 THIS->cursor_blink_reset ();
1811 break; 1953 break;
1812#endif 1954#endif
1813 1955
1814 case Opt_cursorUnderline: 1956 case Opt_cursorUnderline:
1957 THIS->cursor_type = set ? 1 : 0;
1815 THIS->want_refresh = 1; 1958 THIS->want_refresh = 1;
1816 THIS->refresh_check (); 1959 THIS->refresh_check ();
1817 break; 1960 break;
1818 1961
1819# case Opt_scrollBar_floating: 1962# case Opt_scrollBar_floating:
1824 } 1967 }
1825} 1968}
1826 OUTPUT: 1969 OUTPUT:
1827 RETVAL 1970 RETVAL
1828 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
1829bool 1982bool
1830rxvt_term::parse_keysym (char *keysym, char *str) 1983rxvt_term::bind_action (octet_string keysym, octet_string action)
1984 ALIAS:
1985 parse_keysym = 1
1831 CODE: 1986 CODE:
1832 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1987 RETVAL = 0 < THIS->bind_action (keysym, action);
1833 THIS->keyboard->register_done (); 1988 THIS->keyboard->register_done ();
1834 OUTPUT: 1989 OUTPUT:
1835 RETVAL 1990 RETVAL
1836 1991
1837void 1992void
1838rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1993rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1839 CODE: 1994 CODE:
1840 wchar_t *wstr = sv2wcs (str); 1995 wchar_t *wstr = sv2wcs (str);
1841 THIS->keyboard->register_user_translation (keysym, state, wstr); 1996 THIS->keyboard->register_action (keysym, state, wstr);
1842 free (wstr); 1997 free (wstr);
1843 1998
1844void 1999void
1845rxvt_term::screen_cur (...) 2000rxvt_term::screen_cur (...)
1846 PROTOTYPE: $;$$ 2001 PROTOTYPE: $;$$
1958 2113
1959void 2114void
1960rxvt_term::scr_bell () 2115rxvt_term::scr_bell ()
1961 2116
1962void 2117void
1963rxvt_term::scr_recolour (bool refresh = true); 2118rxvt_term::scr_recolor (bool refresh = true);
1964 2119
1965void 2120void
1966rxvt_term::scr_change_screen (int screen) 2121rxvt_term::scr_change_screen (int screen)
1967 2122
1968void 2123void
1971{ 2126{
1972 wchar_t *wstr = sv2wcs (string); 2127 wchar_t *wstr = sv2wcs (string);
1973 THIS->scr_add_lines (wstr, wcslen (wstr)); 2128 THIS->scr_add_lines (wstr, wcslen (wstr));
1974 free (wstr); 2129 free (wstr);
1975} 2130}
2131
2132void
2133rxvt_term::tt_write_user_input (SV *octets)
2134 INIT:
2135 STRLEN len;
2136 char *str = SvPVbyte (octets, len);
2137 C_ARGS:
2138 str, len
1976 2139
1977void 2140void
1978rxvt_term::tt_write (SV *octets) 2141rxvt_term::tt_write (SV *octets)
1979 INIT: 2142 INIT:
1980 STRLEN len; 2143 STRLEN len;
2033 int count; 2196 int count;
2034 Atom *props = XListProperties (THIS->dpy, window, &count); 2197 Atom *props = XListProperties (THIS->dpy, window, &count);
2035 2198
2036 EXTEND (SP, count); 2199 EXTEND (SP, count);
2037 while (count--) 2200 while (count--)
2038 PUSHs (newSVuv ((U32)props [count])); 2201 PUSHs (sv_2mortal (newSVuv ((U32)props [count])));
2039 2202
2040 XFree (props); 2203 XFree (props);
2041} 2204}
2042 2205
2043void 2206void
2059 int elemsize = format == 16 ? sizeof (short) 2222 int elemsize = format == 16 ? sizeof (short)
2060 : format == 32 ? sizeof (long) 2223 : format == 32 ? sizeof (long)
2061 : 1; 2224 : 1;
2062 2225
2063 EXTEND (SP, 3); 2226 EXTEND (SP, 3);
2064 PUSHs (newSVuv ((U32)type)); 2227 PUSHs (sv_2mortal (newSVuv ((U32)type)));
2065 PUSHs (newSViv (format)); 2228 PUSHs (sv_2mortal (newSViv (format)));
2066 PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); 2229 PUSHs (sv_2mortal (newSVpvn ((char *)prop, nitems * elemsize)));
2067 XFree (prop); 2230 XFree (prop);
2068 } 2231 }
2069} 2232}
2070 2233
2071void 2234void
2095 XFree (RETVAL); 2258 XFree (RETVAL);
2096 2259
2097void 2260void
2098XDeleteProperty (rxvt_term *term, Window window, Atom property) 2261XDeleteProperty (rxvt_term *term, Window window, Atom property)
2099 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
2100 2286
2101Window 2287Window
2102rxvt_term::DefaultRootWindow () 2288rxvt_term::DefaultRootWindow ()
2103 CODE: 2289 CODE:
2104 RETVAL = THIS->display->root; 2290 RETVAL = THIS->display->root;
2149 Window child; 2335 Window child;
2150 2336
2151 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child)) 2337 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2152 { 2338 {
2153 EXTEND (SP, 3); 2339 EXTEND (SP, 3);
2154 PUSHs (newSViv (dx)); 2340 PUSHs (sv_2mortal (newSViv (dx)));
2155 PUSHs (newSViv (dy)); 2341 PUSHs (sv_2mortal (newSViv (dy)));
2156 PUSHs (newSVuv (child)); 2342 PUSHs (sv_2mortal (newSVuv (child)));
2157 } 2343 }
2158} 2344}
2159 2345
2160############################################################################# 2346#############################################################################
2161# fancy bg bloatstuff (TODO: should be moved up somewhere) 2347# fancy bg bloatstuff (TODO: should be moved up somewhere)
2217 RETVAL 2403 RETVAL
2218 2404
2219#endif 2405#endif
2220 2406
2221void 2407void
2222rxvt_term::set_background (rxvt_img *img, bool border = false) 2408rxvt_term::clr_background ()
2223 CODE: 2409 CODE:
2224 delete THIS->bg_img; 2410 delete THIS->bg_img;
2225 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;
2226 THIS->bg_flags = 0; 2418 THIS->bg_img = 0;
2419 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2227 2420
2228 if (img) // TODO: cannot be false 2421 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2229 { 2422 {
2230 img = img->clone (); // own the img 2423 img = img->clone (); // own the img
2231 2424
2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2425 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2233 img->sub_rect (0, 0, 2426 img->sub_rect (0, 0,
2241 2434
2242 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])
2243 ->replace (img); 2436 ->replace (img);
2244 2437
2245 THIS->bg_img = img; 2438 THIS->bg_img = img;
2246 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2247 2439
2248 if (!border) 2440 if (!border)
2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2441 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2250 } 2442 }
2251 2443
2328 2520
2329void 2521void
2330rxvt_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)
2331 PROTOTYPE: $;$$$$ 2523 PROTOTYPE: $;$$$$
2332 INIT: 2524 INIT:
2333 rgba cc = parse_rgba (c, THIS->s); 2525 rxvt_screen screen;
2526 screen.set (THIS->d);
2527 rgba cc = parse_rgba (c, &screen);
2334 C_ARGS: cc, x, y, w, h 2528 C_ARGS: cc, x, y, w, h
2335 2529
2336void 2530void
2337rxvt_img::DESTROY () 2531rxvt_img::DESTROY ()
2338 CODE: 2532 CODE:
2396rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2590rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2397 2591
2398rxvt_img * 2592rxvt_img *
2399rxvt_img::tint (SV *c) 2593rxvt_img::tint (SV *c)
2400 INIT: 2594 INIT:
2401 rgba cc = parse_rgba (c, THIS->s); 2595 rxvt_screen screen;
2596 screen.set (THIS->d);
2597 rgba cc = parse_rgba (c, &screen);
2402 C_ARGS: cc 2598 C_ARGS: cc
2403 2599
2404rxvt_img * 2600rxvt_img *
2405rxvt_img::shade (rxvt_img::nv factor) 2601rxvt_img::shade (rxvt_img::nv factor)
2406 2602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines