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.206 by root, Sat Jul 7 07:00:17 2012 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"
57typedef int render_repeat_mode; 64typedef int render_repeat_mode;
58 65
59#if HAVE_PIXBUF 66#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 67typedef GdkPixbuf * urxvt__pixbuf;
61#endif 68#endif
69#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 70typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 71typedef rxvt_img::nv rxvt_img__nv;
64 72
65///////////////////////////////////////////////////////////////////////////// 73/////////////////////////////////////////////////////////////////////////////
66 74
81 if (len != 1 && len != 3 && len != 4) 89 if (len != 1 && len != 3 && len != 4)
82 croak ("component colour array must have 1, 3 or 4 components,"); 90 croak ("component colour array must have 1, 3 or 4 components,");
83 91
84 c.a = rgba::MAX_CC; 92 c.a = rgba::MAX_CC;
85 93
86 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)));
87 95
88 if (len >= 3) 96 if (len >= 3)
89 { 97 {
90 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); 98 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
91 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); 99 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
92 100
93 if (len >= 4) 101 if (len >= 4)
94 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); 102 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
95 } 103 }
96 } 104 }
97 else if (s) 105 else if (s)
98 { 106 {
99 rxvt_color rc; 107 rxvt_color rc;
105 113
106 return c; 114 return c;
107} 115}
108 116
109///////////////////////////////////////////////////////////////////////////// 117/////////////////////////////////////////////////////////////////////////////
118#endif
110 119
111static wchar_t * 120static wchar_t *
112sv2wcs (SV *sv) 121sv2wcs (SV *sv)
113{ 122{
114 STRLEN len; 123 STRLEN len;
289 break; 298 break;
290 299
291 for (; i < AvFILL (overlay_av); i++) 300 for (; i < AvFILL (overlay_av); i++)
292 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)));
293 302
294 av_pop (overlay_av); 303 SvREFCNT_dec (av_pop (overlay_av));
295 304
296 SvREFCNT_dec (overlay_av); 305 SvREFCNT_dec (overlay_av);
297 overlay_av = 0; 306 overlay_av = 0;
298 307
299 THIS->want_refresh = 1; 308 THIS->want_refresh = 1;
368 377
369struct rxvt_perl_interp rxvt_perl; 378struct rxvt_perl_interp rxvt_perl;
370 379
371static PerlInterpreter *perl; 380static PerlInterpreter *perl;
372 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... */
373rxvt_perl_interp::~rxvt_perl_interp () 385rxvt_perl_interp::~rxvt_perl_interp ()
374{ 386{
375 if (perl) 387 if (perl)
376 { 388 {
389 localise_env set_environ (perl_environ);
377 perl_destruct (perl); 390 perl_destruct (perl);
378 perl_free (perl); 391 perl_free (perl);
379 PERL_SYS_TERM (); 392 PERL_SYS_TERM ();
380 } 393 }
381} 394}
395#endif
382 396
383void 397void
384rxvt_perl_interp::init () 398rxvt_perl_interp::init ()
385{ 399{
386 if (!perl) 400 if (!perl)
387 { 401 {
388 rxvt_push_locale (""); // perl init destroys current locale 402 rxvt_push_locale ("C"); // perl init destroys current locale
389 403
390 { 404 {
391 perl_environ = rxvt_environ; 405 perl_environ = rxvt_environ;
392 localise_env set_environ (perl_environ); 406 localise_env set_environ (perl_environ);
393 407
394 char *args[] = { 408 const char *args[] = {
395 "", 409 "",
396 "-e" 410 "-e"
397 "BEGIN {" 411 "BEGIN {"
398 " urxvt->bootstrap;" 412 " urxvt->bootstrap;"
399 " unshift @INC, '" LIBDIR "';" 413 " unshift @INC, '" LIBDIR "';"
400 "}" 414 "}"
401 "" 415 ""
402 "use urxvt;" 416 "use urxvt;",
417 0
403 }; 418 };
404 int argc = ecb_array_length (args); 419 int argc = ecb_array_length (args) - 1;
405 char **argv = args; 420 char **argv = (char **)args;
406 421
407 PERL_SYS_INIT3 (&argc, &argv, &environ); 422 PERL_SYS_INIT3 (&argc, &argv, &environ);
408 perl = perl_alloc (); 423 perl = perl_alloc ();
409 perl_construct (perl); 424 perl_construct (perl);
410 425
491 506
492 return ret; 507 return ret;
493} 508}
494 509
495static 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
496ungrab (rxvt_term *THIS) 530ungrab (rxvt_term *THIS)
497{ 531{
498 if (THIS->perl.grabtime) 532 if (THIS->perl.grabtime)
499 { 533 {
500 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime); 534 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
502 THIS->perl.grabtime = 0; 536 THIS->perl.grabtime = 0;
503 } 537 }
504} 538}
505 539
506bool 540bool
507rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 541rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
508{ 542{
509 if (!perl || !term->perl.self) 543 if (!perl || !term->perl.self)
510 return false; 544 return false;
511 545
512 localise_env set_environ (perl_environ); 546 localise_env set_environ (perl_environ);
791 static const struct { 825 static const struct {
792 const char *name; 826 const char *name;
793 IV iv; 827 IV iv;
794 } *civ, const_iv[] = { 828 } *civ, const_iv[] = {
795# 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
796 const_iv (NUM_RESOURCES), 836 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 837 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 838 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 839 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 840 const_iv (RS_bgShift), const_iv (RS_bgMask),
811 const_iv (RS_Italic), 851 const_iv (RS_Italic),
812 const_iv (RS_Blink), 852 const_iv (RS_Blink),
813 const_iv (RS_RVid), 853 const_iv (RS_RVid),
814 const_iv (RS_Uline), 854 const_iv (RS_Uline),
815 855
856 // TODO: should support all colour constants, create colorinc.h &c
857 const_iv (Color_fg),
858 const_iv (Color_bg),
859# if OFF_FOCUS_FADING
860 const_iv (Color_fade),
861# endif
862 const_iv (Color_pointer_fg),
863 const_iv (Color_pointer_bg),
864 const_iv (Color_border),
865 const_iv (NRS_COLORS),
866 const_iv (TOTAL_COLORS),
867
868 const_iv (None),
816 const_iv (CurrentTime), 869 const_iv (CurrentTime),
817 const_iv (ShiftMask), 870 const_iv (ShiftMask),
818 const_iv (LockMask), 871 const_iv (LockMask),
819 const_iv (ControlMask), 872 const_iv (ControlMask),
820 const_iv (Mod1Mask), 873 const_iv (Mod1Mask),
891 const_iv (SelectionRequest), 944 const_iv (SelectionRequest),
892 const_iv (SelectionNotify), 945 const_iv (SelectionNotify),
893 const_iv (ColormapNotify), 946 const_iv (ColormapNotify),
894 const_iv (ClientMessage), 947 const_iv (ClientMessage),
895 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
896# if ENABLE_XIM_ONTHESPOT 962# if ENABLE_XIM_ONTHESPOT
897 const_iv (XIMReverse), 963 const_iv (XIMReverse),
898 const_iv (XIMUnderline), 964 const_iv (XIMUnderline),
899 const_iv (XIMHighlight), 965 const_iv (XIMHighlight),
900 const_iv (XIMPrimary), 966 const_iv (XIMPrimary),
901 const_iv (XIMSecondary), 967 const_iv (XIMSecondary),
902 const_iv (XIMTertiary), 968 const_iv (XIMTertiary),
903 const_iv (XIMVisibleToForward), 969 const_iv (XIMVisibleToForward),
904 const_iv (XIMVisibleToBackword), 970 const_iv (XIMVisibleToBackword),
905 const_iv (XIMVisibleToCenter), 971 const_iv (XIMVisibleToCenter),
972# endif
906#if XRENDER 973# if XRENDER
907 const_iv (PictStandardARGB32), 974 const_iv (PictStandardARGB32),
908 const_iv (PictStandardRGB24), 975 const_iv (PictStandardRGB24),
909 const_iv (PictStandardA8), 976 const_iv (PictStandardA8),
910 const_iv (PictStandardA4), 977 const_iv (PictStandardA4),
911 const_iv (PictStandardA1), 978 const_iv (PictStandardA1),
967 const_iv (PictOpExclusion), 1034 const_iv (PictOpExclusion),
968 const_iv (PictOpHSLHue), 1035 const_iv (PictOpHSLHue),
969 const_iv (PictOpHSLSaturation), 1036 const_iv (PictOpHSLSaturation),
970 const_iv (PictOpHSLColor), 1037 const_iv (PictOpHSLColor),
971 const_iv (PictOpHSLLuminosity), 1038 const_iv (PictOpHSLLuminosity),
972#endif 1039# endif
973# if 0 1040# if 0
974 const_iv (XIMForwardChar), 1041 const_iv (XIMForwardChar),
975 const_iv (XIMBackwardChar), 1042 const_iv (XIMBackwardChar),
976 const_iv (XIMForwardWord), 1043 const_iv (XIMForwardWord),
977 const_iv (XIMBackwardWord), 1044 const_iv (XIMBackwardWord),
982 const_iv (XIMLineStart), 1049 const_iv (XIMLineStart),
983 const_iv (XIMLineEnd), 1050 const_iv (XIMLineEnd),
984 const_iv (XIMAbsolutePosition), 1051 const_iv (XIMAbsolutePosition),
985 const_iv (XIMDontChange), 1052 const_iv (XIMDontChange),
986# endif 1053# endif
987# 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),
988 }; 1084 };
989 1085
990 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--)
991 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1087 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
992} 1088}
993 1089
994void 1090void
995log (const char *msg) 1091log (utf8_string msg)
996 CODE: 1092 CODE:
997 rxvt_log ("%s", msg); 1093 rxvt_log ("%s", msg);
998 1094
999void 1095void
1000warn (const char *msg) 1096warn (utf8_string msg)
1001 CODE: 1097 CODE:
1002 rxvt_warn ("%s", msg); 1098 rxvt_warn ("%s", msg);
1003 1099
1004void 1100void
1005fatal (const char *msg) 1101fatal (utf8_string msg)
1006 CODE: 1102 CODE:
1007 rxvt_fatal ("%s", msg); 1103 rxvt_fatal ("%s", msg);
1008 1104
1009void 1105void
1010_exit (int status) 1106_exit (int status)
1070int 1166int
1071SET_CUSTOM (int rend, int new_value) 1167SET_CUSTOM (int rend, int new_value)
1072 CODE: 1168 CODE:
1073{ 1169{
1074 if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) 1170 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
1075 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);
1076 1172
1077 RETVAL = (rend & ~RS_customMask) 1173 RETVAL = (rend & ~RS_customMask)
1078 | ((new_value << RS_customShift) & RS_customMask); 1174 | ((new_value << RS_customShift) & RS_customMask);
1079} 1175}
1080 OUTPUT: 1176 OUTPUT:
1117 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)));
1118 1214
1119 av_pop (av); 1215 av_pop (av);
1120 1216
1121 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)
1122 1253
1123MODULE = urxvt PACKAGE = urxvt::term 1254MODULE = urxvt PACKAGE = urxvt::term
1124 1255
1125SV * 1256SV *
1126_new (AV *env, AV *arg) 1257_new (AV *env, AV *arg)
1175void 1306void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1307rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1308 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1309 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1310
1311void
1312rxvt_term::_keysym_resources ()
1313 PPCODE:
1314 PUTBACK;
1315 _keysym_resources (THIS);
1316 SPAGAIN;
1317
1180int 1318int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1319rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1320 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1321 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1322 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1243rxvt_term::ungrab () 1381rxvt_term::ungrab ()
1244 CODE: 1382 CODE:
1245 ungrab (THIS); 1383 ungrab (THIS);
1246 1384
1247int 1385int
1248rxvt_term::XStringToKeysym (char *string) 1386rxvt_term::XStringToKeysym (octet_string string)
1249 CODE: 1387 CODE:
1250 RETVAL = XStringToKeysym (string); 1388 RETVAL = XStringToKeysym (string);
1251 OUTPUT: RETVAL 1389 OUTPUT: RETVAL
1252 1390
1253char * 1391char *
1263 OUTPUT: RETVAL 1401 OUTPUT: RETVAL
1264 1402
1265int 1403int
1266rxvt_term::XKeycodeToKeysym (int code, int index) 1404rxvt_term::XKeycodeToKeysym (int code, int index)
1267 CODE: 1405 CODE:
1268 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1406 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1269 OUTPUT: RETVAL 1407 OUTPUT: RETVAL
1270 1408
1271int 1409int
1272rxvt_term::strwidth (SV *str) 1410rxvt_term::strwidth (SV *str)
1273 CODE: 1411 CODE:
1292 1430
1293SV * 1431SV *
1294rxvt_term::locale_encode (SV *str) 1432rxvt_term::locale_encode (SV *str)
1295 CODE: 1433 CODE:
1296{ 1434{
1435 if (!SvOK (str))
1436 XSRETURN_UNDEF;
1437
1297 wchar_t *wstr = sv2wcs (str); 1438 wchar_t *wstr = sv2wcs (str);
1298 1439
1299 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1300 char *mbstr = rxvt_wcstombs (wstr); 1441 char *mbstr = rxvt_wcstombs (wstr);
1301 rxvt_pop_locale (); 1442 rxvt_pop_locale ();
1310 1451
1311SV * 1452SV *
1312rxvt_term::locale_decode (SV *octets) 1453rxvt_term::locale_decode (SV *octets)
1313 CODE: 1454 CODE:
1314{ 1455{
1456 if (!SvOK (octets))
1457 XSRETURN_UNDEF;
1458
1315 STRLEN len; 1459 STRLEN len;
1316 char *data = SvPVbyte (octets, len); 1460 char *data = SvPVbyte (octets, len);
1317 1461
1318 rxvt_push_locale (THIS->locale); 1462 rxvt_push_locale (THIS->locale);
1319 wchar_t *wstr = rxvt_mbstowcs (data, len); 1463 wchar_t *wstr = rxvt_mbstowcs (data, len);
1343#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1487#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1344#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1488#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1345#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1489#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1346 1490
1347int 1491int
1348rxvt_term::width () 1492rxvt_term::width (int new_value = NO_INIT)
1349 ALIAS: 1493 ALIAS:
1350 width = TERM_OFFSET_width 1494 width = TERM_OFFSET_width
1351 height = TERM_OFFSET_height 1495 height = TERM_OFFSET_height
1352 fwidth = TERM_OFFSET_fwidth 1496 fwidth = TERM_OFFSET_fwidth
1353 fheight = TERM_OFFSET_fheight 1497 fheight = TERM_OFFSET_fheight
1363 saveLines = TERM_OFFSET_saveLines 1507 saveLines = TERM_OFFSET_saveLines
1364 total_rows = TERM_OFFSET_total_rows 1508 total_rows = TERM_OFFSET_total_rows
1365 top_row = TERM_OFFSET_top_row 1509 top_row = TERM_OFFSET_top_row
1366 CODE: 1510 CODE:
1367 RETVAL = *(int *)((char *)THIS + ix); 1511 RETVAL = *(int *)((char *)THIS + ix);
1512 if (items > 1)
1513 *(int *)((char *)THIS + ix) = new_value;
1368 OUTPUT: 1514 OUTPUT:
1369 RETVAL 1515 RETVAL
1370 1516
1371unsigned int 1517unsigned int
1372rxvt_term::ModLevel3Mask () 1518rxvt_term::ModLevel3Mask ()
1374 ModLevel3Mask = 0 1520 ModLevel3Mask = 0
1375 ModMetaMask = 1 1521 ModMetaMask = 1
1376 ModNumLockMask = 2 1522 ModNumLockMask = 2
1377 current_screen = 3 1523 current_screen = 3
1378 hidden_cursor = 4 1524 hidden_cursor = 4
1525 priv_modes = 5
1379 CODE: 1526 CODE:
1380 switch (ix) 1527 switch (ix)
1381 { 1528 {
1382 case 0: RETVAL = THIS->ModLevel3Mask; break; 1529 case 0: RETVAL = THIS->ModLevel3Mask; break;
1383 case 1: RETVAL = THIS->ModMetaMask; break; 1530 case 1: RETVAL = THIS->ModMetaMask; break;
1384 case 2: RETVAL = THIS->ModNumLockMask; break; 1531 case 2: RETVAL = THIS->ModNumLockMask; break;
1385 case 3: RETVAL = THIS->current_screen; break; 1532 case 3: RETVAL = THIS->current_screen; break;
1386#ifdef CURSOR_BLINK 1533#ifdef CURSOR_BLINK
1387 case 4: RETVAL = THIS->hidden_cursor; break; 1534 case 4: RETVAL = THIS->hidden_cursor; break;
1535#else
1536 case 4: RETVAL = 0; break;
1388#endif 1537#endif
1538 case 5: RETVAL = THIS->priv_modes; break;
1389 } 1539 }
1390 OUTPUT: 1540 OUTPUT:
1391 RETVAL 1541 RETVAL
1392 1542
1393char * 1543char *
1476 THIS->rstyle = new_rstyle; 1626 THIS->rstyle = new_rstyle;
1477 OUTPUT: 1627 OUTPUT:
1478 RETVAL 1628 RETVAL
1479 1629
1480int 1630int
1481rxvt_term::view_start (int newval = 1) 1631rxvt_term::view_start (int newval = 0)
1482 PROTOTYPE: $;$ 1632 PROTOTYPE: $;$
1483 CODE: 1633 CODE:
1484{ 1634{
1485 RETVAL = THIS->view_start; 1635 RETVAL = THIS->view_start;
1486 1636 if (items > 1)
1487 if (newval <= 0)
1488 THIS->scr_changeview (max (newval, THIS->top_row)); 1637 THIS->scr_changeview (newval);
1489} 1638}
1490 OUTPUT: 1639 OUTPUT:
1491 RETVAL 1640 RETVAL
1492 1641
1493void 1642void
1528void 1677void
1529rxvt_term::want_refresh () 1678rxvt_term::want_refresh ()
1530 CODE: 1679 CODE:
1531 THIS->want_refresh = 1; 1680 THIS->want_refresh = 1;
1532 THIS->refresh_check (); 1681 THIS->refresh_check ();
1682
1683void
1684rxvt_term::refresh_check ()
1533 1685
1534void 1686void
1535rxvt_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)
1536 PPCODE: 1688 PPCODE:
1537{ 1689{
1682 *r++ = NOCHAR; 1834 *r++ = NOCHAR;
1683 } 1835 }
1684 1836
1685 rxvt_pop_locale (); 1837 rxvt_pop_locale ();
1686 1838
1839 free (wstr);
1687 RETVAL = wcs2sv (rstr, r - rstr); 1840 RETVAL = wcs2sv (rstr, r - rstr);
1688} 1841}
1689 OUTPUT: 1842 OUTPUT:
1690 RETVAL 1843 RETVAL
1691 1844
1699 // find length 1852 // find length
1700 for (wchar_t *s = wstr; *s; s++) 1853 for (wchar_t *s = wstr; *s; s++)
1701 if (*s == NOCHAR) 1854 if (*s == NOCHAR)
1702 ; 1855 ;
1703 else if (IS_COMPOSE (*s)) 1856 else if (IS_COMPOSE (*s))
1704 dlen += rxvt_composite.expand (*s, 0); 1857 dlen += rxvt_composite.expand (*s);
1705 else 1858 else
1706 dlen++; 1859 dlen++;
1707 1860
1708 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1861 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1709 1862
1715 else if (IS_COMPOSE (*s)) 1868 else if (IS_COMPOSE (*s))
1716 r += rxvt_composite.expand (*s, r); 1869 r += rxvt_composite.expand (*s, r);
1717 else 1870 else
1718 *r++ = *s; 1871 *r++ = *s;
1719 1872
1873 free (wstr);
1720 RETVAL = wcs2sv (rstr, r - rstr); 1874 RETVAL = wcs2sv (rstr, r - rstr);
1721} 1875}
1722 OUTPUT: 1876 OUTPUT:
1723 RETVAL 1877 RETVAL
1724 1878
1725void 1879void
1726rxvt_term::_resource (char *name, int index, SV *newval = 0) 1880rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1727 PPCODE: 1881 PPCODE:
1728{ 1882{
1729 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1883 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1730# define def(name) { # name, Rs_ ## name }, 1884# define def(name) { # name, Rs_ ## name },
1731# define reserve(name,count) 1885# define reserve(name,count)
1746 index += rs->value; 1900 index += rs->value;
1747 } 1901 }
1748 else 1902 else
1749 { 1903 {
1750 --rs; 1904 --rs;
1751 name = ""; 1905 name = (octet_string)"";
1752 } 1906 }
1753 1907
1754 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1908 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1755 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);
1756 1910
1769 THIS->rs [index] = 0; 1923 THIS->rs [index] = 0;
1770 } 1924 }
1771} 1925}
1772 1926
1773const char * 1927const char *
1774rxvt_term::x_resource (const char *name) 1928rxvt_term::x_resource (octet_string name)
1775 1929
1776bool 1930bool
1777rxvt_term::option (U8 optval, int set = -1) 1931rxvt_term::option (U8 optval, int set = -1)
1778 CODE: 1932 CODE:
1779{ 1933{
1798 THIS->cursor_blink_reset (); 1952 THIS->cursor_blink_reset ();
1799 break; 1953 break;
1800#endif 1954#endif
1801 1955
1802 case Opt_cursorUnderline: 1956 case Opt_cursorUnderline:
1957 THIS->cursor_type = set ? 1 : 0;
1803 THIS->want_refresh = 1; 1958 THIS->want_refresh = 1;
1804 THIS->refresh_check (); 1959 THIS->refresh_check ();
1805 break; 1960 break;
1806 1961
1807# case Opt_scrollBar_floating: 1962# case Opt_scrollBar_floating:
1812 } 1967 }
1813} 1968}
1814 OUTPUT: 1969 OUTPUT:
1815 RETVAL 1970 RETVAL
1816 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
1817bool 1982bool
1818rxvt_term::parse_keysym (char *keysym, char *str) 1983rxvt_term::bind_action (octet_string keysym, octet_string action)
1984 ALIAS:
1985 parse_keysym = 1
1819 CODE: 1986 CODE:
1820 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1987 RETVAL = 0 < THIS->bind_action (keysym, action);
1821 THIS->keyboard->register_done (); 1988 THIS->keyboard->register_done ();
1822 OUTPUT: 1989 OUTPUT:
1823 RETVAL 1990 RETVAL
1824 1991
1825void 1992void
1826rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1993rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1827 CODE: 1994 CODE:
1828 wchar_t *wstr = sv2wcs (str); 1995 wchar_t *wstr = sv2wcs (str);
1829 THIS->keyboard->register_user_translation (keysym, state, wstr); 1996 THIS->keyboard->register_action (keysym, state, wstr);
1830 free (wstr); 1997 free (wstr);
1831 1998
1832void 1999void
1833rxvt_term::screen_cur (...) 2000rxvt_term::screen_cur (...)
1834 PROTOTYPE: $;$$ 2001 PROTOTYPE: $;$$
1877 2044
1878 if (ix) 2045 if (ix)
1879 { 2046 {
1880 THIS->selection.screen = THIS->current_screen; 2047 THIS->selection.screen = THIS->current_screen;
1881 2048
1882 THIS->want_refresh = 1; 2049 THIS->selection_changed ();
1883 THIS->refresh_check (); 2050 THIS->refresh_check ();
1884 } 2051 }
1885 } 2052 }
1886} 2053}
1887 2054
1893 THIS->selection.screen = screen; 2060 THIS->selection.screen = screen;
1894 OUTPUT: 2061 OUTPUT:
1895 RETVAL 2062 RETVAL
1896 2063
1897void 2064void
2065rxvt_term::selection_request (Time tm, int selnum)
2066
2067void
1898rxvt_term::selection_clear (bool clipboard = false) 2068rxvt_term::selection_clear (bool clipboard = false)
1899 2069
1900void 2070void
1901rxvt_term::selection_make (Time eventtime, bool rect = false) 2071rxvt_term::selection_make (Time eventtime, bool rect = false)
1902 CODE: 2072 CODE:
1943 2113
1944void 2114void
1945rxvt_term::scr_bell () 2115rxvt_term::scr_bell ()
1946 2116
1947void 2117void
1948rxvt_term::scr_recolour (bool refresh = true); 2118rxvt_term::scr_recolor (bool refresh = true);
1949 2119
1950void 2120void
1951rxvt_term::scr_change_screen (int screen) 2121rxvt_term::scr_change_screen (int screen)
1952 2122
1953void 2123void
1956{ 2126{
1957 wchar_t *wstr = sv2wcs (string); 2127 wchar_t *wstr = sv2wcs (string);
1958 THIS->scr_add_lines (wstr, wcslen (wstr)); 2128 THIS->scr_add_lines (wstr, wcslen (wstr));
1959 free (wstr); 2129 free (wstr);
1960} 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
1961 2139
1962void 2140void
1963rxvt_term::tt_write (SV *octets) 2141rxvt_term::tt_write (SV *octets)
1964 INIT: 2142 INIT:
1965 STRLEN len; 2143 STRLEN len;
2018 int count; 2196 int count;
2019 Atom *props = XListProperties (THIS->dpy, window, &count); 2197 Atom *props = XListProperties (THIS->dpy, window, &count);
2020 2198
2021 EXTEND (SP, count); 2199 EXTEND (SP, count);
2022 while (count--) 2200 while (count--)
2023 PUSHs (newSVuv ((U32)props [count])); 2201 PUSHs (sv_2mortal (newSVuv ((U32)props [count])));
2024 2202
2025 XFree (props); 2203 XFree (props);
2026} 2204}
2027 2205
2028void 2206void
2044 int elemsize = format == 16 ? sizeof (short) 2222 int elemsize = format == 16 ? sizeof (short)
2045 : format == 32 ? sizeof (long) 2223 : format == 32 ? sizeof (long)
2046 : 1; 2224 : 1;
2047 2225
2048 EXTEND (SP, 3); 2226 EXTEND (SP, 3);
2049 PUSHs (newSVuv ((U32)type)); 2227 PUSHs (sv_2mortal (newSVuv ((U32)type)));
2050 PUSHs (newSViv (format)); 2228 PUSHs (sv_2mortal (newSViv (format)));
2051 PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); 2229 PUSHs (sv_2mortal (newSVpvn ((char *)prop, nitems * elemsize)));
2052 XFree (prop); 2230 XFree (prop);
2053 } 2231 }
2054} 2232}
2055 2233
2056void 2234void
2080 XFree (RETVAL); 2258 XFree (RETVAL);
2081 2259
2082void 2260void
2083XDeleteProperty (rxvt_term *term, Window window, Atom property) 2261XDeleteProperty (rxvt_term *term, Window window, Atom property)
2084 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
2085 2286
2086Window 2287Window
2087rxvt_term::DefaultRootWindow () 2288rxvt_term::DefaultRootWindow ()
2088 CODE: 2289 CODE:
2089 RETVAL = THIS->display->root; 2290 RETVAL = THIS->display->root;
2134 Window child; 2335 Window child;
2135 2336
2136 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child)) 2337 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
2137 { 2338 {
2138 EXTEND (SP, 3); 2339 EXTEND (SP, 3);
2139 PUSHs (newSViv (dx)); 2340 PUSHs (sv_2mortal (newSViv (dx)));
2140 PUSHs (newSViv (dy)); 2341 PUSHs (sv_2mortal (newSViv (dy)));
2141 PUSHs (newSVuv (child)); 2342 PUSHs (sv_2mortal (newSVuv (child)));
2142 } 2343 }
2143} 2344}
2144 2345
2145############################################################################# 2346#############################################################################
2146# fancy bg bloatstuff (TODO: should be moved up somewhere) 2347# fancy bg bloatstuff (TODO: should be moved up somewhere)
2201 OUTPUT: 2402 OUTPUT:
2202 RETVAL 2403 RETVAL
2203 2404
2204#endif 2405#endif
2205 2406
2206#if HAVE_BG_PIXMAP 2407void
2408rxvt_term::clr_background ()
2409 CODE:
2410 delete THIS->bg_img;
2411 THIS->bg_img = 0;
2412 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2207 2413
2208void 2414void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2415rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2416 CODE:
2211 THIS->bg_destroy (); 2417 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2418 THIS->bg_img = 0;
2419 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2213 2420
2214 if (img) // TODO: cannot be false 2421 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2215 { 2422 {
2216 img = img->clone (); // own the img 2423 img = img->clone (); // own the img
2217 2424
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2425 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2426 img->sub_rect (0, 0,
2227 2434
2228 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])
2229 ->replace (img); 2436 ->replace (img);
2230 2437
2231 THIS->bg_img = img; 2438 THIS->bg_img = img;
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2439
2234 if (!border) 2440 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2441 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2442 }
2237
2238#endif
2239 2443
2240#endif 2444#endif
2241 2445
2242############################################################################# 2446#############################################################################
2243# urxvt::overlay 2447# urxvt::overlay
2316 2520
2317void 2521void
2318rxvt_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)
2319 PROTOTYPE: $;$$$$ 2523 PROTOTYPE: $;$$$$
2320 INIT: 2524 INIT:
2321 rgba cc = parse_rgba (c, THIS->s); 2525 rxvt_screen screen;
2526 screen.set (THIS->d);
2527 rgba cc = parse_rgba (c, &screen);
2322 C_ARGS: cc, x, y, w, h 2528 C_ARGS: cc, x, y, w, h
2323 2529
2324void 2530void
2325rxvt_img::DESTROY () 2531rxvt_img::DESTROY ()
2326 CODE: 2532 CODE:
2384rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2590rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2385 2591
2386rxvt_img * 2592rxvt_img *
2387rxvt_img::tint (SV *c) 2593rxvt_img::tint (SV *c)
2388 INIT: 2594 INIT:
2389 rgba cc = parse_rgba (c, THIS->s); 2595 rxvt_screen screen;
2596 screen.set (THIS->d);
2597 rgba cc = parse_rgba (c, &screen);
2390 C_ARGS: cc 2598 C_ARGS: cc
2599
2600rxvt_img *
2601rxvt_img::shade (rxvt_img::nv factor)
2391 2602
2392rxvt_img * 2603rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2604rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE: 2605 CODE:
2395 rxvt_img::nv *vparams = 0; 2606 rxvt_img::nv *vparams = 0;
2396 int nparams = 0; 2607 int nparams = 0;
2397 2608
2398 if (SvOK (params)) 2609 if (SvOK (params))
2399 { 2610 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2611 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2612 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405 2613
2406 nparams = av_len ((AV *)SvRV (params)) + 1; 2614 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2615 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2408 2616
2409 for (int i = 0; i < nparams; ++i) 2617 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2618 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 } 2619 }
2412 2620
2413 RETVAL = THIS->filter (name, nparams, vparams); 2621 RETVAL = THIS->filter (name, nparams, vparams);
2622 free (vparams);
2414 OUTPUT: 2623 OUTPUT:
2415 RETVAL 2624 RETVAL
2416 2625
2417#endif 2626#endif
2418 2627

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines