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.39 by root, Sat Jan 7 23:18:56 2006 UTC vs.
Revision 1.44 by root, Sun Jan 8 22:58:13 2006 UTC

… …
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include "perlxsi.c" 39#include "perlxsi.c"
40 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
41#undef LINENO 47#undef LINENO
42#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
43#undef ROW 49#undef ROW
44#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
45 51
46///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
47 69
48static wchar_t * 70static wchar_t *
49sv2wcs (SV *sv) 71sv2wcs (SV *sv)
50{ 72{
51 STRLEN len; 73 STRLEN len;
… …
390{ 412{
391 if (!perl) 413 if (!perl)
392 { 414 {
393 char *argv[] = { 415 char *argv[] = {
394 "", 416 "",
417 "-T",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396 }; 419 };
397 420
398 perl = perl_alloc (); 421 perl = perl_alloc ();
399 perl_construct (perl); 422 perl_construct (perl);
400 423
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402 || perl_run (perl)) 425 || perl_run (perl))
403 { 426 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 428
406 perl_destruct (perl); 429 perl_destruct (perl);
… …
467 case DT_LONG: 490 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 492 break;
470 493
471 case DT_STR: 494 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 496 break;
474 497
475 case DT_STR_LEN: 498 case DT_STR_LEN:
476 { 499 {
477 char *str = va_arg (ap, char *); 500 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 501 int len = va_arg (ap, int);
479 502
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 504 }
482 break; 505 break;
483 506
484 case DT_WCS_LEN: 507 case DT_WCS_LEN:
485 { 508 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 509 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 510 int wlen = va_arg (ap, int);
488 511
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 513 }
491 break; 514 break;
492 515
493 case DT_XEVENT: 516 case DT_XEVENT:
494 { 517 {
… …
735void 758void
736rxvt_term::grab_button (int button, U32 modifiers) 759rxvt_term::grab_button (int button, U32 modifiers)
737 CODE: 760 CODE:
738 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
739 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
740 GrabModeSync, GrabModeSync, None, None); 763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
741 764
742bool 765bool
743rxvt_term::grab (U32 eventtime, int sync = 0) 766rxvt_term::grab (U32 eventtime, int sync = 0)
744 CODE: 767 CODE:
745{ 768{
… …
747 770
748 THIS->perl.grabtime = 0; 771 THIS->perl.grabtime = 0;
749 772
750 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
751 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
752 mode, mode, None, None, eventtime)) 775 mode, mode, None, GRAB_CURSOR, eventtime))
753 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
754 THIS->perl.grabtime = eventtime; 777 THIS->perl.grabtime = eventtime;
755 else 778 else
756 XUngrabPointer (THIS->display->display, eventtime); 779 XUngrabPointer (THIS->display->display, eventtime);
757 780
… …
759} 782}
760 OUTPUT: 783 OUTPUT:
761 RETVAL 784 RETVAL
762 785
763void 786void
764rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 787rxvt_term::allow_events_async ()
765 CODE: 788 CODE:
766 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 789 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
767 790
768void 791void
769rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 792rxvt_term::allow_events_sync ()
770 CODE: 793 CODE:
771 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 794 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
772 795
773void 796void
774rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 797rxvt_term::allow_events_replay ()
775 CODE: 798 CODE:
776 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 799 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
777 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 800 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
778 801
779void 802void
780rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 803rxvt_term::ungrab ()
781 CODE: 804 CODE:
805{
806 if (THIS->perl.grabtime)
807 {
808 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
809 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
782 THIS->perl.grabtime = 0; 810 THIS->perl.grabtime = 0;
783 XUngrabKeyboard (THIS->display->display, eventtime); 811 }
784 XUngrabPointer (THIS->display->display, eventtime); 812}
785 813
786int 814int
787rxvt_term::strwidth (SV *str) 815rxvt_term::strwidth (SV *str)
788 CODE: 816 CODE:
789{ 817{
… …
808 char *mbstr = rxvt_wcstombs (wstr); 836 char *mbstr = rxvt_wcstombs (wstr);
809 rxvt_pop_locale (); 837 rxvt_pop_locale ();
810 838
811 free (wstr); 839 free (wstr);
812 840
813 RETVAL = newSVpv (mbstr, 0); 841 RETVAL = taint_if (newSVpv (mbstr, 0), str);
814 free (mbstr); 842 free (mbstr);
815} 843}
816 OUTPUT: 844 OUTPUT:
817 RETVAL 845 RETVAL
818 846
… …
825 853
826 rxvt_push_locale (THIS->locale); 854 rxvt_push_locale (THIS->locale);
827 wchar_t *wstr = rxvt_mbstowcs (data, len); 855 wchar_t *wstr = rxvt_mbstowcs (data, len);
828 rxvt_pop_locale (); 856 rxvt_pop_locale ();
829 857
830 RETVAL = wcs2sv (wstr); 858 RETVAL = taint_if (wcs2sv (wstr), octets);
831 free (wstr); 859 free (wstr);
832} 860}
833 OUTPUT: 861 OUTPUT:
834 RETVAL 862 RETVAL
835 863
… …
942 wchar_t *wstr = new wchar_t [THIS->ncol]; 970 wchar_t *wstr = new wchar_t [THIS->ncol];
943 971
944 for (int col = 0; col < THIS->ncol; col++) 972 for (int col = 0; col < THIS->ncol; col++)
945 wstr [col] = l.t [col]; 973 wstr [col] = l.t [col];
946 974
947 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 975 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
948 976
949 delete [] wstr; 977 delete [] wstr;
950 } 978 }
951 979
952 if (new_text) 980 if (new_text)
… …
1073 else 1101 else
1074 *r++ = *s; 1102 *r++ = *s;
1075 1103
1076 rxvt_pop_locale (); 1104 rxvt_pop_locale ();
1077 1105
1078 RETVAL = wcs2sv (rstr, r - rstr); 1106 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1079 1107
1080 delete [] rstr; 1108 delete [] rstr;
1081} 1109}
1082 OUTPUT: 1110 OUTPUT:
1083 RETVAL 1111 RETVAL
… …
1109 else if (IS_COMPOSE (*s)) 1137 else if (IS_COMPOSE (*s))
1110 r += rxvt_composite.expand (*s, r); 1138 r += rxvt_composite.expand (*s, r);
1111 else 1139 else
1112 *r++ = *s; 1140 *r++ = *s;
1113 1141
1114 RETVAL = wcs2sv (rstr, r - rstr); 1142 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1115 1143
1116 delete [] rstr; 1144 delete [] rstr;
1117} 1145}
1118 OUTPUT: 1146 OUTPUT:
1119 RETVAL 1147 RETVAL
… …
1141 1169
1142 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1170 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1143 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1171 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1144 1172
1145 if (GIMME_V != G_VOID) 1173 if (GIMME_V != G_VOID)
1146 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1174 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1147 1175
1148 if (newval) 1176 if (newval)
1149 { 1177 {
1150 if (SvOK (newval)) 1178 if (SvOK (newval))
1151 { 1179 {
… …
1156 else 1184 else
1157 THIS->rs [index] = 0; 1185 THIS->rs [index] = 0;
1158 } 1186 }
1159} 1187}
1160 1188
1189bool
1190rxvt_term::option (U32 optval, int set = -1)
1191 CODE:
1192{
1193 RETVAL = THIS->options & optval;
1194
1195 if (set >= 0)
1196 {
1197 if (set)
1198 THIS->options |= optval;
1199 else
1200 THIS->options &= ~optval;
1201
1202 switch (optval)
1203 {
1204 case Opt_skipBuiltinGlyphs:
1205 THIS->set_fonts ();
1206 THIS->scr_remap_chars ();
1207 THIS->scr_touch (true);
1208 THIS->want_refresh = 1;
1209 break;
1210
1211 case Opt_cursorUnderline:
1212 THIS->want_refresh = 1;
1213 break;
1214
1215# case Opt_scrollBar_floating:
1216# case Opt_scrollBar_right:
1217# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1218# break;
1219 }
1220 }
1221}
1222 OUTPUT:
1223 RETVAL
1224
1161void 1225void
1162rxvt_term::cur (...) 1226rxvt_term::cur (...)
1163 PROTOTYPE: $;$$ 1227 PROTOTYPE: $;$$
1164 ALIAS: 1228 ALIAS:
1165 screen_cur = 0 1229 screen_cur = 0
… …
1196void 1260void
1197rxvt_term::selection (SV *newtext = 0) 1261rxvt_term::selection (SV *newtext = 0)
1198 PPCODE: 1262 PPCODE:
1199{ 1263{
1200 if (GIMME_V != G_VOID) 1264 if (GIMME_V != G_VOID)
1201 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1265 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
1202 1266
1203 if (newtext) 1267 if (newtext)
1204 { 1268 {
1205 free (THIS->selection.text); 1269 free (THIS->selection.text);
1206 1270

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines