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.78 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.91 by root, Wed Jan 25 00:42:21 2006 UTC

… …
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1 55typedef int CHAINED UNUSED;
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58 58
59static wchar_t * 59static wchar_t *
60sv2wcs (SV *sv) 60sv2wcs (SV *sv)
… …
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
120 120
121///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
122 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
123struct perl_watcher 125struct perl_watcher
124{ 126{
125 SV *cbsv; 127 SV *cbsv;
126 HV *self; 128 HV *self;
127 129
128 perl_watcher () 130 perl_watcher ()
129 : cbsv (newSV (0)) 131 : cbsv (0)
130 { 132 {
131 } 133 }
132 134
133 ~perl_watcher () 135 ~perl_watcher ()
134 { 136 {
135 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
136 } 138 }
137 139
138 void cb (SV *cb) 140 void cb (SV *cb)
139 { 141 {
140 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
141 } 144 }
142 145
143 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
144}; 147};
145 148
… …
169 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171} 174}
172 175
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
175 178
176struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
177{ 180{
178 tstamp interval; 181 tstamp interval;
179 182
180 timer () 183 timer ()
181 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
… …
190 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
191 } 194 }
192}; 195};
193 196
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
196 199
197struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
198{ 201{
199 iow () 202 iow ()
200 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
201 { 204 {
202 } 205 }
203 206
204 void execute (io_watcher &w, short revents) 207 void execute (io_watcher &w, short revents)
205 { 208 {
206 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
210 }
211};
212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
207 } 242 }
208}; 243};
209 244
210///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
211 246
… …
519 break; 554 break;
520 555
521 case DT_STR_LEN: 556 case DT_STR_LEN:
522 { 557 {
523 char *str = va_arg (ap, char *); 558 char *str = va_arg (ap, char *);
524 int len = va_arg (ap, int); 559 int len = va_arg (ap, int);
525 560
561 printf ("pushing str %p:%d\n", str,len);//D
526 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
527 } 563 }
528 break; 564 break;
529 565
530 case DT_WCS_LEN: 566 case DT_WCS_LEN:
531 { 567 {
532 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
533 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
534 570
535 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
536 } 581 }
537 break; 582 break;
538 583
539 case DT_XEVENT: 584 case DT_XEVENT:
540 { 585 {
541 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
542 HV *hv = newHV (); 587 HV *hv = newHV ();
543 588
544# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
545# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
546# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
547# undef set 592# undef set
548 593
549 setiv (type, xe->type); 594 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
552 597
… …
561 setuv (root, xe->xmotion.root); 606 setuv (root, xe->xmotion.root);
562 setuv (subwindow, xe->xmotion.subwindow); 607 setuv (subwindow, xe->xmotion.subwindow);
563 setuv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
564 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
565 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
566 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
567 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
568 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
569 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
570 setuv (state, xe->xmotion.state); 615 setuv (state, xe->xmotion.state);
571 616
… …
603 setiv (height, xe->xconfigure.height); 648 setiv (height, xe->xconfigure.height);
604 setuv (above, xe->xconfigure.above); 649 setuv (above, xe->xconfigure.above);
605 break; 650 break;
606 } 651 }
607 652
653 break;
654
655 case PropertyNotify:
656 setuv (window, xe->xproperty.window);
657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
660 break;
661
662 case ClientMessage:
663 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]);
608 break; 671 break;
609 } 672 }
610 673
611 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
612 } 675 }
… …
663 } 726 }
664 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
665 { 728 {
666 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
667 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
668 } 734 }
669 735
670 swap (perl_environ, environ); 736 swap (perl_environ, environ);
671 737
672 return event_consumed; 738 return event_consumed;
… …
789 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
790 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
791 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
792 const_iv (ClientMessage), 858 const_iv (ClientMessage),
793 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
794 }; 884 };
795 885
796 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 886 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
797 civ-- > const_iv; ) 887 civ-- > const_iv; )
798 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
875 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 965 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
876 croak ("first argument to urxvt::term->_new must be arrayref"); 966 croak ("first argument to urxvt::term->_new must be arrayref");
877 967
878 rxvt_term *term = new rxvt_term; 968 rxvt_term *term = new rxvt_term;
879 969
880 term->argv = new stringvec; 970 stringvec *argv = new stringvec;
881 term->envv = new stringvec; 971 stringvec *envv = new stringvec;
882 972
883 for (int i = 1; i < items; i++) 973 for (int i = 1; i < items; i++)
884 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 974 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
885 975
886 AV *envv = (AV *)SvRV (ST (0)); 976 AV *env = (AV *)SvRV (ST (0));
887 for (int i = AvFILL (envv) + 1; i--; ) 977 for (int i = AvFILL (env) + 1; i--; )
888 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 978 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
889 979
890 term->envv->push_back (0); 980 envv->push_back (0);
891 981
892 bool success; 982 bool success;
893 983
894 try 984 try
895 { 985 {
896 success = term->init (term->argv->size (), term->argv->begin ()); 986 success = term->init (argv, envv);
897 } 987 }
898 catch (const class rxvt_failure_exception &e) 988 catch (const class rxvt_failure_exception &e)
899 { 989 {
900 success = false; 990 success = false;
901 } 991 }
… …
913 RETVAL 1003 RETVAL
914 1004
915void 1005void
916rxvt_term::destroy () 1006rxvt_term::destroy ()
917 1007
918#if ENABLE_PERL_FRILLS
919
920void
921rxvt_term::XListProperties (U32 window)
922 PPCODE:
923{
924 int count;
925 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
926
927 EXTEND (SP, count);
928 while (count--)
929 PUSHs (newSVuv ((U32)props [count]));
930
931 XFree (props);
932}
933
934void
935rxvt_term::XGetWindowProperty (U32 window, U32 property)
936 PPCODE:
937{
938 Atom type;
939 int format;
940 unsigned long nitems;
941 unsigned long bytes_after;
942 unsigned char *prop;
943 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
944 0, 1<<30, 0, AnyPropertyType,
945 &type, &format, &nitems, &bytes_after, &prop);
946 if (type != None)
947 {
948 EXTEND (SP, 3);
949 PUSHs (newSVuv ((U32)type));
950 PUSHs (newSViv (format));
951 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
952 XFree (prop);
953 }
954}
955
956void
957rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
958 CODE:
959{
960 STRLEN len;
961 char *data_ = SvPVbyte (data, len);
962
963 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
964 type, format, PropModeReplace,
965 (unsigned char *)data, len * 8 / format);
966}
967
968void
969rxvt_term::XDeleteProperty (U32 window, U32 property)
970 CODE:
971 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
972
973U32
974rxvt_term::DefaultRootWindow ()
975 CODE:
976 RETVAL = (U32)THIS->display->root;
977 OUTPUT:
978 RETVAL
979
980U32
981rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
982 CODE:
983 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
984 x, y, width, height, 0,
985 THIS->pix_colors_focused[Color_border],
986 THIS->pix_colors_focused[Color_border]);
987 OUTPUT:
988 RETVAL
989
990void
991rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
992 CODE:
993 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
994
995void
996rxvt_term::XMapWindow (U32 window)
997 CODE:
998 XMapWindow (THIS->display->display, (Window)window);
999
1000void
1001rxvt_term::XUnmapWindow (U32 window)
1002 CODE:
1003 XUnmapWindow (THIS->display->display, (Window)window);
1004
1005#endif
1006
1007void 1008void
1008rxvt_term::set_should_invoke (int htype, int inc) 1009rxvt_term::set_should_invoke (int htype, int inc)
1009 CODE: 1010 CODE:
1010 THIS->perl.should_invoke [htype] += inc; 1011 THIS->perl.should_invoke [htype] += inc;
1011 1012
… …
1015 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1016 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1016 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1017 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1018 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1018 1019
1019bool 1020bool
1020rxvt_term::grab (U32 eventtime, int sync = 0) 1021rxvt_term::grab (Time eventtime, int sync = 0)
1021 CODE: 1022 CODE:
1022{ 1023{
1023 int mode = sync ? GrabModeSync : GrabModeAsync; 1024 int mode = sync ? GrabModeSync : GrabModeAsync;
1024 1025
1025 THIS->perl.grabtime = 0; 1026 THIS->perl.grabtime = 0;
… …
1117#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1118#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1118#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1119#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1119#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1120#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1120#define TERM_OFFSET_focus TERM_OFFSET(focus) 1121#define TERM_OFFSET_focus TERM_OFFSET(focus)
1121#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1122#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1123#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1124#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1125#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1122#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1126#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1123#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1127#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1124#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1128#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1125 1129
1126int 1130int
… …
1133 fbase = TERM_OFFSET_fbase 1137 fbase = TERM_OFFSET_fbase
1134 nrow = TERM_OFFSET_nrow 1138 nrow = TERM_OFFSET_nrow
1135 ncol = TERM_OFFSET_ncol 1139 ncol = TERM_OFFSET_ncol
1136 focus = TERM_OFFSET_focus 1140 focus = TERM_OFFSET_focus
1137 mapped = TERM_OFFSET_mapped 1141 mapped = TERM_OFFSET_mapped
1142 int_bwidth = TERM_OFFSET_int_bwidth
1143 ext_bwidth = TERM_OFFSET_ext_bwidth
1144 lineSpace = TERM_OFFSET_lineSpace
1138 saveLines = TERM_OFFSET_saveLines 1145 saveLines = TERM_OFFSET_saveLines
1139 total_rows = TERM_OFFSET_total_rows 1146 total_rows = TERM_OFFSET_total_rows
1140 top_row = TERM_OFFSET_top_row 1147 top_row = TERM_OFFSET_top_row
1141 CODE: 1148 CODE:
1142 RETVAL = *(int *)((char *)THIS + ix); 1149 RETVAL = *(int *)((char *)THIS + ix);
… …
1147rxvt_term::ModLevel3Mask () 1154rxvt_term::ModLevel3Mask ()
1148 ALIAS: 1155 ALIAS:
1149 ModLevel3Mask = 0 1156 ModLevel3Mask = 0
1150 ModMetaMask = 1 1157 ModMetaMask = 1
1151 ModNumLockMask = 2 1158 ModNumLockMask = 2
1159 current_screen = 3
1160 hidden_cursor = 4
1152 CODE: 1161 CODE:
1153 switch (ix) 1162 switch (ix)
1154 { 1163 {
1155 case 0: RETVAL = THIS->ModLevel3Mask; break; 1164 case 0: RETVAL = THIS->ModLevel3Mask; break;
1156 case 1: RETVAL = THIS->ModMetaMask; break; 1165 case 1: RETVAL = THIS->ModMetaMask; break;
1157 case 2: RETVAL = THIS->ModNumLockMask; break; 1166 case 2: RETVAL = THIS->ModNumLockMask; break;
1167 case 3: RETVAL = THIS->current_screen; break;
1168 case 4: RETVAL = THIS->hidden_cursor; break;
1158 } 1169 }
1159 OUTPUT: 1170 OUTPUT:
1160 RETVAL 1171 RETVAL
1161 1172
1162char * 1173char *
… …
1200 if (events != EVENT_UNDEF) 1211 if (events != EVENT_UNDEF)
1201 THIS->pty_ev.set (events); 1212 THIS->pty_ev.set (events);
1202 OUTPUT: 1213 OUTPUT:
1203 RETVAL 1214 RETVAL
1204 1215
1205U32 1216int
1217rxvt_term::pty_fd ()
1218 CODE:
1219 RETVAL = THIS->pty->pty;
1220 OUTPUT:
1221 RETVAL
1222
1223Window
1206rxvt_term::parent () 1224rxvt_term::parent ()
1207 CODE: 1225 CODE:
1208 RETVAL = (U32)THIS->parent [0]; 1226 RETVAL = THIS->parent [0];
1209 OUTPUT: 1227 OUTPUT:
1210 RETVAL 1228 RETVAL
1211 1229
1212U32 1230Window
1213rxvt_term::vt () 1231rxvt_term::vt ()
1214 CODE: 1232 CODE:
1215 RETVAL = (U32)THIS->vt; 1233 RETVAL = THIS->vt;
1216 OUTPUT: 1234 OUTPUT:
1217 RETVAL 1235 RETVAL
1218 1236
1219void 1237void
1220rxvt_term::vt_emask_add (U32 emask) 1238rxvt_term::vt_emask_add (U32 emask)
… …
1242} 1260}
1243 OUTPUT: 1261 OUTPUT:
1244 RETVAL 1262 RETVAL
1245 1263
1246void 1264void
1265rxvt_term::focus_in ()
1266
1267void
1268rxvt_term::focus_out ()
1269
1270void
1247rxvt_term::want_refresh () 1271rxvt_term::want_refresh ()
1248 CODE: 1272 CODE:
1249 THIS->want_refresh = 1; 1273 THIS->want_refresh = 1;
1250 1274
1251void 1275void
… …
1257 1281
1258 line_t &l = ROW(row_number); 1282 line_t &l = ROW(row_number);
1259 1283
1260 if (GIMME_V != G_VOID) 1284 if (GIMME_V != G_VOID)
1261 { 1285 {
1262 wchar_t *wstr = new wchar_t [THIS->ncol]; 1286 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1263 1287
1264 for (int col = 0; col < THIS->ncol; col++) 1288 for (int col = 0; col < THIS->ncol; col++)
1265 wstr [col] = l.t [col]; 1289 wstr [col] = l.t [col];
1266 1290
1267 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1291 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1268
1269 delete [] wstr;
1270 } 1292 }
1271 1293
1272 if (new_text) 1294 if (new_text)
1273 { 1295 {
1274 wchar_t *wstr = sv2wcs (new_text); 1296 wchar_t *wstr = sv2wcs (new_text);
1275 1297
1276 int len = min (wcslen (wstr) - start_ofs, max_len); 1298 int len = min (wcslen (wstr) - start_ofs, max_len);
1277 1299
1278 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1300 if (start_col < 0 || start_col + len > THIS->ncol)
1279 { 1301 {
1280 free (wstr); 1302 free (wstr);
1281 croak ("new_text extends beyond horizontal margins"); 1303 croak ("new_text extends beyond horizontal margins");
1282 } 1304 }
1283 1305
… …
1317 croak ("new_rend must be arrayref"); 1339 croak ("new_rend must be arrayref");
1318 1340
1319 AV *av = (AV *)SvRV (new_rend); 1341 AV *av = (AV *)SvRV (new_rend);
1320 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1342 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1321 1343
1322 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1344 if (start_col < 0 || start_col + len > THIS->ncol)
1323 croak ("new_rend array extends beyond horizontal margins"); 1345 croak ("new_rend array extends beyond horizontal margins");
1324 1346
1325 for (int col = start_col; col < start_col + len; col++) 1347 for (int col = start_col; col < start_col + len; col++)
1326 { 1348 {
1327 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1349 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1367rxvt_term::special_encode (SV *string) 1389rxvt_term::special_encode (SV *string)
1368 CODE: 1390 CODE:
1369{ 1391{
1370 wchar_t *wstr = sv2wcs (string); 1392 wchar_t *wstr = sv2wcs (string);
1371 int wlen = wcslen (wstr); 1393 int wlen = wcslen (wstr);
1372 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1394 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1373 1395
1374 rxvt_push_locale (THIS->locale); 1396 rxvt_push_locale (THIS->locale);
1375 1397
1376 wchar_t *r = rstr; 1398 wchar_t *r = rstr;
1377 for (wchar_t *s = wstr; *s; s++) 1399 for (wchar_t *s = wstr; *s; s++)
1400 {
1401 int w = WCWIDTH (*s);
1402
1378 if (wcwidth (*s) == 0) 1403 if (w == 0)
1379 { 1404 {
1380 if (r == rstr) 1405 if (r == rstr)
1381 croak ("leading combining character unencodable"); 1406 croak ("leading combining character unencodable");
1382 1407
1383 unicode_t n = rxvt_compose (r[-1], *s); 1408 unicode_t n = rxvt_compose (r[-1], *s);
1384 if (n == NOCHAR) 1409 if (n == NOCHAR)
1385 n = rxvt_composite.compose (r[-1], *s); 1410 n = rxvt_composite.compose (r[-1], *s);
1386 1411
1387 r[-1] = n; 1412 r[-1] = n;
1388 } 1413 }
1389#if !UNICODE_3 1414#if !UNICODE_3
1390 else if (*s >= 0x10000) 1415 else if (*s >= 0x10000)
1391 *r++ = rxvt_composite.compose (*s); 1416 *r++ = rxvt_composite.compose (*s);
1392#endif 1417#endif
1393 else 1418 else
1394 *r++ = *s; 1419 *r++ = *s;
1420
1421 // the *2 above only allows wcwidth <= 2
1422 if (w > 1)
1423 *r++ = NOCHAR;
1424 }
1395 1425
1396 rxvt_pop_locale (); 1426 rxvt_pop_locale ();
1397 1427
1398 RETVAL = wcs2sv (rstr, r - rstr); 1428 RETVAL = wcs2sv (rstr, r - rstr);
1399
1400 delete [] rstr;
1401} 1429}
1402 OUTPUT: 1430 OUTPUT:
1403 RETVAL 1431 RETVAL
1404 1432
1405SV * 1433SV *
… …
1417 else if (IS_COMPOSE (*s)) 1445 else if (IS_COMPOSE (*s))
1418 dlen += rxvt_composite.expand (*s, 0); 1446 dlen += rxvt_composite.expand (*s, 0);
1419 else 1447 else
1420 dlen++; 1448 dlen++;
1421 1449
1422 wchar_t *rstr = new wchar_t [dlen]; 1450 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1423 1451
1424 // decode 1452 // decode
1425 wchar_t *r = rstr; 1453 wchar_t *r = rstr;
1426 for (wchar_t *s = wstr; *s; s++) 1454 for (wchar_t *s = wstr; *s; s++)
1427 if (*s == NOCHAR) 1455 if (*s == NOCHAR)
… …
1430 r += rxvt_composite.expand (*s, r); 1458 r += rxvt_composite.expand (*s, r);
1431 else 1459 else
1432 *r++ = *s; 1460 *r++ = *s;
1433 1461
1434 RETVAL = wcs2sv (rstr, r - rstr); 1462 RETVAL = wcs2sv (rstr, r - rstr);
1435
1436 delete [] rstr;
1437} 1463}
1438 OUTPUT: 1464 OUTPUT:
1439 RETVAL 1465 RETVAL
1440 1466
1441void 1467void
… …
1551 if (items == 3) 1577 if (items == 3)
1552 { 1578 {
1553 rc.row = SvIV (ST (1)); 1579 rc.row = SvIV (ST (1));
1554 rc.col = SvIV (ST (2)); 1580 rc.col = SvIV (ST (2));
1555 1581
1556 if (ix == 2 && rc.col == 0) 1582 if (ix == 2)
1557 { 1583 {
1584 if (rc.col == 0)
1585 {
1586 // col == 0 means end of previous line
1558 rc.row--; 1587 rc.row--;
1559 rc.col = THIS->ncol; 1588 rc.col = THIS->ncol;
1589 }
1590 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1591 && rc.col > ROW(rc.row).l)
1592 {
1593 // col >= length means while line and add newline
1594 rc.col = THIS->ncol;
1595 }
1560 } 1596 }
1561 1597
1562 clamp_it (rc.col, 0, THIS->ncol); 1598 clamp_it (rc.col, 0, THIS->ncol);
1563 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1599 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1564 1600
… …
1576 1612
1577#void 1613#void
1578#rxvt_term::selection_clear () 1614#rxvt_term::selection_clear ()
1579 1615
1580void 1616void
1581rxvt_term::selection_make (U32 eventtime, bool rect = false) 1617rxvt_term::selection_make (Time eventtime, bool rect = false)
1582 CODE: 1618 CODE:
1583 THIS->selection.op = SELECTION_CONT; 1619 THIS->selection.op = SELECTION_CONT;
1584 THIS->selection.rect = rect; 1620 THIS->selection.rect = rect;
1585 THIS->selection_make (eventtime); 1621 THIS->selection_make (eventtime);
1586 1622
1587int 1623int
1588rxvt_term::selection_grab (U32 eventtime) 1624rxvt_term::selection_grab (Time eventtime)
1589 1625
1590void 1626void
1591rxvt_term::selection (SV *newtext = 0) 1627rxvt_term::selection (SV *newtext = 0)
1592 PPCODE: 1628 PPCODE:
1593{ 1629{
… …
1611void 1647void
1612rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1648rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1613 1649
1614void 1650void
1615rxvt_term::scr_bell () 1651rxvt_term::scr_bell ()
1652
1653void
1654rxvt_term::scr_change_screen (int screen)
1616 1655
1617void 1656void
1618rxvt_term::scr_add_lines (SV *string) 1657rxvt_term::scr_add_lines (SV *string)
1619 CODE: 1658 CODE:
1620{ 1659{
… …
1661 o->self = (HV *)SvRV (RETVAL); 1700 o->self = (HV *)SvRV (RETVAL);
1662} 1701}
1663 OUTPUT: 1702 OUTPUT:
1664 RETVAL 1703 RETVAL
1665 1704
1705#############################################################################
1706# Various X Utility Functions
1707#############################################################################
1708
1709void
1710rxvt_term::XListProperties (Window window)
1711 PPCODE:
1712{
1713 int count;
1714 Atom *props = XListProperties (THIS->display->display, window, &count);
1715
1716 EXTEND (SP, count);
1717 while (count--)
1718 PUSHs (newSVuv ((U32)props [count]));
1719
1720 XFree (props);
1721}
1722
1723void
1724rxvt_term::XGetWindowProperty (Window window, Atom property)
1725 PPCODE:
1726{
1727 Atom type;
1728 int format;
1729 unsigned long nitems;
1730 unsigned long bytes_after;
1731 unsigned char *prop;
1732
1733 XGetWindowProperty (THIS->display->display, window, property,
1734 0, 1<<24, 0, AnyPropertyType,
1735 &type, &format, &nitems, &bytes_after, &prop);
1736
1737 if (type != None)
1738 {
1739 int elemsize = format == 16 ? sizeof (short)
1740 : format == 32 ? sizeof (long)
1741 : 1;
1742
1743 EXTEND (SP, 3);
1744 PUSHs (newSVuv ((U32)type));
1745 PUSHs (newSViv (format));
1746 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1747 XFree (prop);
1748 }
1749}
1750
1751void
1752rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1753 CODE:
1754{
1755 STRLEN len;
1756 char *data_ = SvPVbyte (data, len);
1757
1758 int elemsize = format == 16 ? sizeof (short)
1759 : format == 32 ? sizeof (long)
1760 : 1;
1761
1762 XChangeProperty (THIS->display->display, window, property,
1763 type, format, PropModeReplace,
1764 (unsigned char *)data_, len / elemsize);
1765 XSync (THIS->display->display, 0);
1766}
1767
1768Atom
1769XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1770 C_ARGS: term->display->display, atom_name, only_if_exists
1771
1772char *
1773XGetAtomName (rxvt_term *term, Atom atom)
1774 C_ARGS: term->display->display, atom
1775 CLEANUP:
1776 XFree (RETVAL);
1777
1778void
1779XDeleteProperty (rxvt_term *term, Window window, Atom property)
1780 C_ARGS: term->display->display, window, property
1781
1782Window
1783rxvt_term::DefaultRootWindow ()
1784 CODE:
1785 RETVAL = THIS->display->root;
1786 OUTPUT:
1787 RETVAL
1788
1789#if 0
1790
1791Window
1792XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1793 C_ARGS: term->display->display, (Window)parent,
1794 x, y, width, height, 0,
1795 term->pix_colors_focused[Color_border],
1796 term->pix_colors_focused[Color_border]
1797
1798#endif
1799
1800void
1801XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1802 C_ARGS: term->display->display, window, parent, x, y
1803
1804void
1805XMapWindow (rxvt_term *term, Window window)
1806 C_ARGS: term->display->display, window
1807
1808void
1809XUnmapWindow (rxvt_term *term, Window window)
1810 C_ARGS: term->display->display, window
1811
1812void
1813XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1814 C_ARGS: term->display->display, window, x, y, width, height
1815
1816void
1817rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1818 CODE:
1819{
1820 XWindowAttributes attr;
1821 XGetWindowAttributes (THIS->display->display, window, &attr);
1822 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1823}
1824
1825void
1826rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1827 PPCODE:
1828{
1829 int dx, dy;
1830 Window child;
1831
1832 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1833 {
1834 EXTEND (SP, 3);
1835 PUSHs (newSViv (dx));
1836 PUSHs (newSViv (dy));
1837 PUSHs (newSVuv (child));
1838 }
1839}
1840
1841#############################################################################
1842# urxvt::overlay
1843#############################################################################
1844
1666MODULE = urxvt PACKAGE = urxvt::overlay 1845MODULE = urxvt PACKAGE = urxvt::overlay
1667 1846
1668void 1847void
1669overlay::set (int x, int y, SV *text, SV *rend = 0) 1848overlay::set (int x, int y, SV *text, SV *rend = 0)
1670 1849
… …
1674void 1853void
1675overlay::hide () 1854overlay::hide ()
1676 1855
1677void 1856void
1678overlay::DESTROY () 1857overlay::DESTROY ()
1858
1859#############################################################################
1860# urxvt::watcher
1861#############################################################################
1862
1863MODULE = urxvt PACKAGE = urxvt::watcher
1864
1865CHAINED
1866perl_watcher::cb (SV *cb)
1867 CODE:
1868 THIS->cb (cb);
1869 OUTPUT:
1870 RETVAL
1871
1872#############################################################################
1873# urxvt::timer
1874#############################################################################
1679 1875
1680MODULE = urxvt PACKAGE = urxvt::timer 1876MODULE = urxvt PACKAGE = urxvt::timer
1681 1877
1682SV * 1878SV *
1683timer::new () 1879timer::new ()
1684 CODE: 1880 CODE:
1685 timer *w = new timer; 1881 timer *w = new timer;
1686 w->start (NOW); 1882 w->start (NOW);
1687 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1883 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1688 w->self = (HV *)SvRV (RETVAL); 1884 w->self = (HV *)SvRV (RETVAL);
1689 OUTPUT:
1690 RETVAL
1691
1692timer *
1693timer::cb (SV *cb)
1694 CODE:
1695 THIS->cb (cb);
1696 RETVAL = THIS;
1697 OUTPUT: 1885 OUTPUT:
1698 RETVAL 1886 RETVAL
1699 1887
1700NV 1888NV
1701timer::at () 1889timer::at ()
1702 CODE: 1890 CODE:
1703 RETVAL = THIS->at; 1891 RETVAL = THIS->at;
1704 OUTPUT: 1892 OUTPUT:
1705 RETVAL 1893 RETVAL
1706 1894
1707timer * 1895CHAINED
1708timer::interval (NV interval) 1896timer::interval (NV interval)
1709 CODE: 1897 CODE:
1710 THIS->interval = interval; 1898 THIS->interval = interval;
1899 OUTPUT:
1711 RETVAL = THIS; 1900 RETVAL
1712 OUTPUT:
1713 RETVAL
1714 1901
1715timer * 1902CHAINED
1716timer::set (NV tstamp) 1903timer::set (NV tstamp)
1717 CODE: 1904 CODE:
1718 THIS->set (tstamp); 1905 THIS->set (tstamp);
1906 OUTPUT:
1719 RETVAL = THIS; 1907 RETVAL
1720 OUTPUT:
1721 RETVAL
1722 1908
1723timer * 1909CHAINED
1724timer::start (NV tstamp = THIS->at) 1910timer::start (NV tstamp = THIS->at)
1725 CODE: 1911 CODE:
1726 THIS->start (tstamp); 1912 THIS->start (tstamp);
1913 OUTPUT:
1727 RETVAL = THIS; 1914 RETVAL
1728 OUTPUT:
1729 RETVAL
1730 1915
1731timer * 1916CHAINED
1732timer::after (NV delay) 1917timer::after (NV delay)
1733 CODE: 1918 CODE:
1734 THIS->start (NOW + delay); 1919 THIS->start (NOW + delay);
1920 OUTPUT:
1735 RETVAL = THIS; 1921 RETVAL
1736 OUTPUT:
1737 RETVAL
1738 1922
1739timer * 1923CHAINED
1740timer::stop () 1924timer::stop ()
1741 CODE: 1925 CODE:
1742 THIS->stop (); 1926 THIS->stop ();
1743 RETVAL = THIS;
1744 OUTPUT: 1927 OUTPUT:
1745 RETVAL 1928 RETVAL
1746 1929
1747void 1930void
1748timer::DESTROY () 1931timer::DESTROY ()
1932
1933#############################################################################
1934# urxvt::iow
1935#############################################################################
1749 1936
1750MODULE = urxvt PACKAGE = urxvt::iow 1937MODULE = urxvt PACKAGE = urxvt::iow
1751 1938
1752SV * 1939SV *
1753iow::new () 1940iow::new ()
1754 CODE: 1941 CODE:
1755 iow *w = new iow; 1942 iow *w = new iow;
1756 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1943 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1757 w->self = (HV *)SvRV (RETVAL); 1944 w->self = (HV *)SvRV (RETVAL);
1758 OUTPUT: 1945 OUTPUT:
1759 RETVAL 1946 RETVAL
1760 1947
1761iow * 1948CHAINED
1762iow::cb (SV *cb)
1763 CODE:
1764 THIS->cb (cb);
1765 RETVAL = THIS;
1766 OUTPUT:
1767 RETVAL
1768
1769iow *
1770iow::fd (int fd) 1949iow::fd (int fd)
1771 CODE: 1950 CODE:
1772 THIS->fd = fd; 1951 THIS->fd = fd;
1952 OUTPUT:
1773 RETVAL = THIS; 1953 RETVAL
1774 OUTPUT:
1775 RETVAL
1776 1954
1777iow * 1955CHAINED
1778iow::events (short events) 1956iow::events (short events)
1779 CODE: 1957 CODE:
1780 THIS->events = events; 1958 THIS->events = events;
1959 OUTPUT:
1781 RETVAL = THIS; 1960 RETVAL
1782 OUTPUT:
1783 RETVAL
1784 1961
1785iow * 1962CHAINED
1786iow::start () 1963iow::start ()
1787 CODE: 1964 CODE:
1788 THIS->start (); 1965 THIS->start ();
1966 OUTPUT:
1789 RETVAL = THIS; 1967 RETVAL
1790 OUTPUT:
1791 RETVAL
1792 1968
1793iow * 1969CHAINED
1794iow::stop () 1970iow::stop ()
1795 CODE: 1971 CODE:
1796 THIS->stop (); 1972 THIS->stop ();
1797 RETVAL = THIS;
1798 OUTPUT: 1973 OUTPUT:
1799 RETVAL 1974 RETVAL
1800 1975
1801void 1976void
1802iow::DESTROY () 1977iow::DESTROY ()
1803 1978
1979#############################################################################
1980# urxvt::iw
1981#############################################################################
1804 1982
1983MODULE = urxvt PACKAGE = urxvt::iw
1984
1985SV *
1986iw::new ()
1987 CODE:
1988 iw *w = new iw;
1989 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1990 w->self = (HV *)SvRV (RETVAL);
1991 OUTPUT:
1992 RETVAL
1993
1994CHAINED
1995iw::start ()
1996 CODE:
1997 THIS->start ();
1998 OUTPUT:
1999 RETVAL
2000
2001CHAINED
2002iw::stop ()
2003 CODE:
2004 THIS->stop ();
2005 OUTPUT:
2006 RETVAL
2007
2008void
2009iw::DESTROY ()
2010
2011#############################################################################
2012# urxvt::pw
2013#############################################################################
2014
2015MODULE = urxvt PACKAGE = urxvt::pw
2016
2017SV *
2018pw::new ()
2019 CODE:
2020 pw *w = new pw;
2021 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2022 w->self = (HV *)SvRV (RETVAL);
2023 OUTPUT:
2024 RETVAL
2025
2026CHAINED
2027pw::start (int pid)
2028 CODE:
2029 THIS->start (pid);
2030 OUTPUT:
2031 RETVAL
2032
2033CHAINED
2034pw::stop ()
2035 CODE:
2036 THIS->stop ();
2037 OUTPUT:
2038 RETVAL
2039
2040void
2041pw::DESTROY ()
2042
2043

Diff Legend

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