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.76 by root, Thu Jan 19 11:56:00 2006 UTC vs.
Revision 1.92 by root, Wed Jan 25 00:57:57 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# if 0
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
884# endif
794 }; 885 };
795 886
796 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
797 civ-- > const_iv; ) 888 civ-- > const_iv; )
798 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
875 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) 966 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
876 croak ("first argument to urxvt::term->_new must be arrayref"); 967 croak ("first argument to urxvt::term->_new must be arrayref");
877 968
878 rxvt_term *term = new rxvt_term; 969 rxvt_term *term = new rxvt_term;
879 970
880 term->argv = new stringvec; 971 stringvec *argv = new stringvec;
881 term->envv = new stringvec; 972 stringvec *envv = new stringvec;
882 973
883 for (int i = 1; i < items; i++) 974 for (int i = 1; i < items; i++)
884 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 975 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
885 976
886 AV *envv = (AV *)SvRV (ST (0)); 977 AV *env = (AV *)SvRV (ST (0));
887 for (int i = AvFILL (envv) + 1; i--; ) 978 for (int i = AvFILL (env) + 1; i--; )
888 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 979 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
889 980
890 term->envv->push_back (0); 981 envv->push_back (0);
891 982
892 bool success; 983 bool success;
893 984
894 try 985 try
895 { 986 {
896 success = term->init (term->argv->size (), term->argv->begin ()); 987 success = term->init (argv, envv);
897 } 988 }
898 catch (const class rxvt_failure_exception &e) 989 catch (const class rxvt_failure_exception &e)
899 { 990 {
900 success = false; 991 success = false;
901 } 992 }
… …
913 RETVAL 1004 RETVAL
914 1005
915void 1006void
916rxvt_term::destroy () 1007rxvt_term::destroy ()
917 1008
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 1009void
1008rxvt_term::set_should_invoke (int htype, int inc) 1010rxvt_term::set_should_invoke (int htype, int inc)
1009 CODE: 1011 CODE:
1010 THIS->perl.should_invoke [htype] += inc; 1012 THIS->perl.should_invoke [htype] += inc;
1011 1013
… …
1015 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1017 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
1016 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1018 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1017 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1019 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1018 1020
1019bool 1021bool
1020rxvt_term::grab (U32 eventtime, int sync = 0) 1022rxvt_term::grab (Time eventtime, int sync = 0)
1021 CODE: 1023 CODE:
1022{ 1024{
1023 int mode = sync ? GrabModeSync : GrabModeAsync; 1025 int mode = sync ? GrabModeSync : GrabModeAsync;
1024 1026
1025 THIS->perl.grabtime = 0; 1027 THIS->perl.grabtime = 0;
… …
1117#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1119#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1118#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1120#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1119#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1121#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1120#define TERM_OFFSET_focus TERM_OFFSET(focus) 1122#define TERM_OFFSET_focus TERM_OFFSET(focus)
1121#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1123#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1124#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1125#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1126#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1122#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1127#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1123#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1128#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1124#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1129#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1125 1130
1126int 1131int
… …
1133 fbase = TERM_OFFSET_fbase 1138 fbase = TERM_OFFSET_fbase
1134 nrow = TERM_OFFSET_nrow 1139 nrow = TERM_OFFSET_nrow
1135 ncol = TERM_OFFSET_ncol 1140 ncol = TERM_OFFSET_ncol
1136 focus = TERM_OFFSET_focus 1141 focus = TERM_OFFSET_focus
1137 mapped = TERM_OFFSET_mapped 1142 mapped = TERM_OFFSET_mapped
1143 int_bwidth = TERM_OFFSET_int_bwidth
1144 ext_bwidth = TERM_OFFSET_ext_bwidth
1145 lineSpace = TERM_OFFSET_lineSpace
1138 saveLines = TERM_OFFSET_saveLines 1146 saveLines = TERM_OFFSET_saveLines
1139 total_rows = TERM_OFFSET_total_rows 1147 total_rows = TERM_OFFSET_total_rows
1140 top_row = TERM_OFFSET_top_row 1148 top_row = TERM_OFFSET_top_row
1141 CODE: 1149 CODE:
1142 RETVAL = *(int *)((char *)THIS + ix); 1150 RETVAL = *(int *)((char *)THIS + ix);
… …
1147rxvt_term::ModLevel3Mask () 1155rxvt_term::ModLevel3Mask ()
1148 ALIAS: 1156 ALIAS:
1149 ModLevel3Mask = 0 1157 ModLevel3Mask = 0
1150 ModMetaMask = 1 1158 ModMetaMask = 1
1151 ModNumLockMask = 2 1159 ModNumLockMask = 2
1160 current_screen = 3
1161 hidden_cursor = 4
1152 CODE: 1162 CODE:
1153 switch (ix) 1163 switch (ix)
1154 { 1164 {
1155 case 0: RETVAL = THIS->ModLevel3Mask; break; 1165 case 0: RETVAL = THIS->ModLevel3Mask; break;
1156 case 1: RETVAL = THIS->ModMetaMask; break; 1166 case 1: RETVAL = THIS->ModMetaMask; break;
1157 case 2: RETVAL = THIS->ModNumLockMask; break; 1167 case 2: RETVAL = THIS->ModNumLockMask; break;
1168 case 3: RETVAL = THIS->current_screen; break;
1169 case 4: RETVAL = THIS->hidden_cursor; break;
1158 } 1170 }
1159 OUTPUT: 1171 OUTPUT:
1160 RETVAL 1172 RETVAL
1161 1173
1162char * 1174char *
… …
1200 if (events != EVENT_UNDEF) 1212 if (events != EVENT_UNDEF)
1201 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1202 OUTPUT: 1214 OUTPUT:
1203 RETVAL 1215 RETVAL
1204 1216
1205U32 1217int
1218rxvt_term::pty_fd ()
1219 CODE:
1220 RETVAL = THIS->pty->pty;
1221 OUTPUT:
1222 RETVAL
1223
1224Window
1206rxvt_term::parent () 1225rxvt_term::parent ()
1207 CODE: 1226 CODE:
1208 RETVAL = (U32)THIS->parent [0]; 1227 RETVAL = THIS->parent [0];
1209 OUTPUT: 1228 OUTPUT:
1210 RETVAL 1229 RETVAL
1211 1230
1212U32 1231Window
1213rxvt_term::vt () 1232rxvt_term::vt ()
1214 CODE: 1233 CODE:
1215 RETVAL = (U32)THIS->vt; 1234 RETVAL = THIS->vt;
1216 OUTPUT: 1235 OUTPUT:
1217 RETVAL 1236 RETVAL
1218 1237
1219void 1238void
1220rxvt_term::vt_emask_add (U32 emask) 1239rxvt_term::vt_emask_add (U32 emask)
… …
1242} 1261}
1243 OUTPUT: 1262 OUTPUT:
1244 RETVAL 1263 RETVAL
1245 1264
1246void 1265void
1266rxvt_term::focus_in ()
1267
1268void
1269rxvt_term::focus_out ()
1270
1271void
1247rxvt_term::want_refresh () 1272rxvt_term::want_refresh ()
1248 CODE: 1273 CODE:
1249 THIS->want_refresh = 1; 1274 THIS->want_refresh = 1;
1250 1275
1251void 1276void
… …
1257 1282
1258 line_t &l = ROW(row_number); 1283 line_t &l = ROW(row_number);
1259 1284
1260 if (GIMME_V != G_VOID) 1285 if (GIMME_V != G_VOID)
1261 { 1286 {
1262 wchar_t *wstr = new wchar_t [THIS->ncol]; 1287 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1263 1288
1264 for (int col = 0; col < THIS->ncol; col++) 1289 for (int col = 0; col < THIS->ncol; col++)
1265 wstr [col] = l.t [col]; 1290 wstr [col] = l.t [col];
1266 1291
1267 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1292 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1268
1269 delete [] wstr;
1270 } 1293 }
1271 1294
1272 if (new_text) 1295 if (new_text)
1273 { 1296 {
1274 wchar_t *wstr = sv2wcs (new_text); 1297 wchar_t *wstr = sv2wcs (new_text);
1275 1298
1276 int len = min (wcslen (wstr) - start_ofs, max_len); 1299 int len = min (wcslen (wstr) - start_ofs, max_len);
1277 1300
1278 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1301 if (start_col < 0 || start_col + len > THIS->ncol)
1279 { 1302 {
1280 free (wstr); 1303 free (wstr);
1281 croak ("new_text extends beyond horizontal margins"); 1304 croak ("new_text extends beyond horizontal margins");
1282 } 1305 }
1283 1306
… …
1317 croak ("new_rend must be arrayref"); 1340 croak ("new_rend must be arrayref");
1318 1341
1319 AV *av = (AV *)SvRV (new_rend); 1342 AV *av = (AV *)SvRV (new_rend);
1320 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1343 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1321 1344
1322 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1345 if (start_col < 0 || start_col + len > THIS->ncol)
1323 croak ("new_rend array extends beyond horizontal margins"); 1346 croak ("new_rend array extends beyond horizontal margins");
1324 1347
1325 for (int col = start_col; col < start_col + len; col++) 1348 for (int col = start_col; col < start_col + len; col++)
1326 { 1349 {
1327 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1350 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1367rxvt_term::special_encode (SV *string) 1390rxvt_term::special_encode (SV *string)
1368 CODE: 1391 CODE:
1369{ 1392{
1370 wchar_t *wstr = sv2wcs (string); 1393 wchar_t *wstr = sv2wcs (string);
1371 int wlen = wcslen (wstr); 1394 int wlen = wcslen (wstr);
1372 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1395 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1373 1396
1374 rxvt_push_locale (THIS->locale); 1397 rxvt_push_locale (THIS->locale);
1375 1398
1376 wchar_t *r = rstr; 1399 wchar_t *r = rstr;
1377 for (wchar_t *s = wstr; *s; s++) 1400 for (wchar_t *s = wstr; *s; s++)
1401 {
1402 int w = WCWIDTH (*s);
1403
1378 if (wcwidth (*s) == 0) 1404 if (w == 0)
1379 { 1405 {
1380 if (r == rstr) 1406 if (r == rstr)
1381 croak ("leading combining character unencodable"); 1407 croak ("leading combining character unencodable");
1382 1408
1383 unicode_t n = rxvt_compose (r[-1], *s); 1409 unicode_t n = rxvt_compose (r[-1], *s);
1384 if (n == NOCHAR) 1410 if (n == NOCHAR)
1385 n = rxvt_composite.compose (r[-1], *s); 1411 n = rxvt_composite.compose (r[-1], *s);
1386 1412
1387 r[-1] = n; 1413 r[-1] = n;
1388 } 1414 }
1389#if !UNICODE_3 1415#if !UNICODE_3
1390 else if (*s >= 0x10000) 1416 else if (*s >= 0x10000)
1391 *r++ = rxvt_composite.compose (*s); 1417 *r++ = rxvt_composite.compose (*s);
1392#endif 1418#endif
1393 else 1419 else
1394 *r++ = *s; 1420 *r++ = *s;
1421
1422 // the *2 above only allows wcwidth <= 2
1423 if (w > 1)
1424 *r++ = NOCHAR;
1425 }
1395 1426
1396 rxvt_pop_locale (); 1427 rxvt_pop_locale ();
1397 1428
1398 RETVAL = wcs2sv (rstr, r - rstr); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1399
1400 delete [] rstr;
1401} 1430}
1402 OUTPUT: 1431 OUTPUT:
1403 RETVAL 1432 RETVAL
1404 1433
1405SV * 1434SV *
… …
1417 else if (IS_COMPOSE (*s)) 1446 else if (IS_COMPOSE (*s))
1418 dlen += rxvt_composite.expand (*s, 0); 1447 dlen += rxvt_composite.expand (*s, 0);
1419 else 1448 else
1420 dlen++; 1449 dlen++;
1421 1450
1422 wchar_t *rstr = new wchar_t [dlen]; 1451 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1423 1452
1424 // decode 1453 // decode
1425 wchar_t *r = rstr; 1454 wchar_t *r = rstr;
1426 for (wchar_t *s = wstr; *s; s++) 1455 for (wchar_t *s = wstr; *s; s++)
1427 if (*s == NOCHAR) 1456 if (*s == NOCHAR)
… …
1430 r += rxvt_composite.expand (*s, r); 1459 r += rxvt_composite.expand (*s, r);
1431 else 1460 else
1432 *r++ = *s; 1461 *r++ = *s;
1433 1462
1434 RETVAL = wcs2sv (rstr, r - rstr); 1463 RETVAL = wcs2sv (rstr, r - rstr);
1435
1436 delete [] rstr;
1437} 1464}
1438 OUTPUT: 1465 OUTPUT:
1439 RETVAL 1466 RETVAL
1440 1467
1441void 1468void
… …
1492 if (set) 1519 if (set)
1493 THIS->options |= optval; 1520 THIS->options |= optval;
1494 else 1521 else
1495 THIS->options &= ~optval; 1522 THIS->options &= ~optval;
1496 1523
1524 if (THIS->check_ev.is_active ()) // avoid doing this before START
1497 switch (optval) 1525 switch (optval)
1498 { 1526 {
1499 case Opt_skipBuiltinGlyphs: 1527 case Opt_skipBuiltinGlyphs:
1500 THIS->set_fonts (); 1528 THIS->set_fonts ();
1501 THIS->scr_remap_chars (); 1529 THIS->scr_remap_chars ();
1502 THIS->scr_touch (true); 1530 THIS->scr_touch (true);
1503 THIS->want_refresh = 1; 1531 THIS->want_refresh = 1;
1504 break; 1532 break;
1505 1533
1506 case Opt_cursorUnderline: 1534 case Opt_cursorUnderline:
1507 THIS->want_refresh = 1; 1535 THIS->want_refresh = 1;
1508 break; 1536 break;
1509 1537
1510# case Opt_scrollBar_floating: 1538# case Opt_scrollBar_floating:
1511# case Opt_scrollBar_right: 1539# case Opt_scrollBar_right:
1512# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1540# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1513# break; 1541# break;
1514 } 1542 }
1515 } 1543 }
1516} 1544}
1517 OUTPUT: 1545 OUTPUT:
1518 RETVAL 1546 RETVAL
1519 1547
… …
1550 if (items == 3) 1578 if (items == 3)
1551 { 1579 {
1552 rc.row = SvIV (ST (1)); 1580 rc.row = SvIV (ST (1));
1553 rc.col = SvIV (ST (2)); 1581 rc.col = SvIV (ST (2));
1554 1582
1555 if (ix == 2 && rc.col == 0) 1583 if (ix == 2)
1556 { 1584 {
1585 if (rc.col == 0)
1586 {
1587 // col == 0 means end of previous line
1557 rc.row--; 1588 rc.row--;
1558 rc.col = THIS->ncol; 1589 rc.col = THIS->ncol;
1590 }
1591 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1592 && rc.col > ROW(rc.row).l)
1593 {
1594 // col >= length means while line and add newline
1595 rc.col = THIS->ncol;
1596 }
1559 } 1597 }
1560 1598
1561 clamp_it (rc.col, 0, THIS->ncol); 1599 clamp_it (rc.col, 0, THIS->ncol);
1562 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1600 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1563 1601
… …
1575 1613
1576#void 1614#void
1577#rxvt_term::selection_clear () 1615#rxvt_term::selection_clear ()
1578 1616
1579void 1617void
1580rxvt_term::selection_make (U32 eventtime, bool rect = false) 1618rxvt_term::selection_make (Time eventtime, bool rect = false)
1581 CODE: 1619 CODE:
1582 THIS->selection.op = SELECTION_CONT; 1620 THIS->selection.op = SELECTION_CONT;
1583 THIS->selection.rect = rect; 1621 THIS->selection.rect = rect;
1584 THIS->selection_make (eventtime); 1622 THIS->selection_make (eventtime);
1585 1623
1586int 1624int
1587rxvt_term::selection_grab (U32 eventtime) 1625rxvt_term::selection_grab (Time eventtime)
1588 1626
1589void 1627void
1590rxvt_term::selection (SV *newtext = 0) 1628rxvt_term::selection (SV *newtext = 0)
1591 PPCODE: 1629 PPCODE:
1592{ 1630{
… …
1610void 1648void
1611rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1649rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1612 1650
1613void 1651void
1614rxvt_term::scr_bell () 1652rxvt_term::scr_bell ()
1653
1654void
1655rxvt_term::scr_change_screen (int screen)
1615 1656
1616void 1657void
1617rxvt_term::scr_add_lines (SV *string) 1658rxvt_term::scr_add_lines (SV *string)
1618 CODE: 1659 CODE:
1619{ 1660{
… …
1660 o->self = (HV *)SvRV (RETVAL); 1701 o->self = (HV *)SvRV (RETVAL);
1661} 1702}
1662 OUTPUT: 1703 OUTPUT:
1663 RETVAL 1704 RETVAL
1664 1705
1706#############################################################################
1707# Various X Utility Functions
1708#############################################################################
1709
1710void
1711rxvt_term::XListProperties (Window window)
1712 PPCODE:
1713{
1714 int count;
1715 Atom *props = XListProperties (THIS->display->display, window, &count);
1716
1717 EXTEND (SP, count);
1718 while (count--)
1719 PUSHs (newSVuv ((U32)props [count]));
1720
1721 XFree (props);
1722}
1723
1724void
1725rxvt_term::XGetWindowProperty (Window window, Atom property)
1726 PPCODE:
1727{
1728 Atom type;
1729 int format;
1730 unsigned long nitems;
1731 unsigned long bytes_after;
1732 unsigned char *prop;
1733
1734 XGetWindowProperty (THIS->display->display, window, property,
1735 0, 1<<24, 0, AnyPropertyType,
1736 &type, &format, &nitems, &bytes_after, &prop);
1737
1738 if (type != None)
1739 {
1740 int elemsize = format == 16 ? sizeof (short)
1741 : format == 32 ? sizeof (long)
1742 : 1;
1743
1744 EXTEND (SP, 3);
1745 PUSHs (newSVuv ((U32)type));
1746 PUSHs (newSViv (format));
1747 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1748 XFree (prop);
1749 }
1750}
1751
1752void
1753rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1754 CODE:
1755{
1756 STRLEN len;
1757 char *data_ = SvPVbyte (data, len);
1758
1759 int elemsize = format == 16 ? sizeof (short)
1760 : format == 32 ? sizeof (long)
1761 : 1;
1762
1763 XChangeProperty (THIS->display->display, window, property,
1764 type, format, PropModeReplace,
1765 (unsigned char *)data_, len / elemsize);
1766 XSync (THIS->display->display, 0);
1767}
1768
1769Atom
1770XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1771 C_ARGS: term->display->display, atom_name, only_if_exists
1772
1773char *
1774XGetAtomName (rxvt_term *term, Atom atom)
1775 C_ARGS: term->display->display, atom
1776 CLEANUP:
1777 XFree (RETVAL);
1778
1779void
1780XDeleteProperty (rxvt_term *term, Window window, Atom property)
1781 C_ARGS: term->display->display, window, property
1782
1783Window
1784rxvt_term::DefaultRootWindow ()
1785 CODE:
1786 RETVAL = THIS->display->root;
1787 OUTPUT:
1788 RETVAL
1789
1790#if 0
1791
1792Window
1793XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1794 C_ARGS: term->display->display, (Window)parent,
1795 x, y, width, height, 0,
1796 term->pix_colors_focused[Color_border],
1797 term->pix_colors_focused[Color_border]
1798
1799#endif
1800
1801void
1802XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1803 C_ARGS: term->display->display, window, parent, x, y
1804
1805void
1806XMapWindow (rxvt_term *term, Window window)
1807 C_ARGS: term->display->display, window
1808
1809void
1810XUnmapWindow (rxvt_term *term, Window window)
1811 C_ARGS: term->display->display, window
1812
1813void
1814XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1815 C_ARGS: term->display->display, window, x, y, width, height
1816
1817void
1818rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1819 CODE:
1820{
1821 XWindowAttributes attr;
1822 XGetWindowAttributes (THIS->display->display, window, &attr);
1823 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1824}
1825
1826void
1827rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1828 PPCODE:
1829{
1830 int dx, dy;
1831 Window child;
1832
1833 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1834 {
1835 EXTEND (SP, 3);
1836 PUSHs (newSViv (dx));
1837 PUSHs (newSViv (dy));
1838 PUSHs (newSVuv (child));
1839 }
1840}
1841
1842#############################################################################
1843# urxvt::overlay
1844#############################################################################
1845
1665MODULE = urxvt PACKAGE = urxvt::overlay 1846MODULE = urxvt PACKAGE = urxvt::overlay
1666 1847
1667void 1848void
1668overlay::set (int x, int y, SV *text, SV *rend = 0) 1849overlay::set (int x, int y, SV *text, SV *rend = 0)
1669 1850
… …
1673void 1854void
1674overlay::hide () 1855overlay::hide ()
1675 1856
1676void 1857void
1677overlay::DESTROY () 1858overlay::DESTROY ()
1859
1860#############################################################################
1861# urxvt::watcher
1862#############################################################################
1863
1864MODULE = urxvt PACKAGE = urxvt::watcher
1865
1866CHAINED
1867perl_watcher::cb (SV *cb)
1868 CODE:
1869 THIS->cb (cb);
1870 OUTPUT:
1871 RETVAL
1872
1873#############################################################################
1874# urxvt::timer
1875#############################################################################
1678 1876
1679MODULE = urxvt PACKAGE = urxvt::timer 1877MODULE = urxvt PACKAGE = urxvt::timer
1680 1878
1681SV * 1879SV *
1682timer::new () 1880timer::new ()
1683 CODE: 1881 CODE:
1684 timer *w = new timer; 1882 timer *w = new timer;
1685 w->start (NOW); 1883 w->start (NOW);
1686 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1884 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1687 w->self = (HV *)SvRV (RETVAL); 1885 w->self = (HV *)SvRV (RETVAL);
1688 OUTPUT:
1689 RETVAL
1690
1691timer *
1692timer::cb (SV *cb)
1693 CODE:
1694 THIS->cb (cb);
1695 RETVAL = THIS;
1696 OUTPUT: 1886 OUTPUT:
1697 RETVAL 1887 RETVAL
1698 1888
1699NV 1889NV
1700timer::at () 1890timer::at ()
1701 CODE: 1891 CODE:
1702 RETVAL = THIS->at; 1892 RETVAL = THIS->at;
1703 OUTPUT: 1893 OUTPUT:
1704 RETVAL 1894 RETVAL
1705 1895
1706timer * 1896CHAINED
1707timer::interval (NV interval) 1897timer::interval (NV interval)
1708 CODE: 1898 CODE:
1709 THIS->interval = interval; 1899 THIS->interval = interval;
1900 OUTPUT:
1710 RETVAL = THIS; 1901 RETVAL
1711 OUTPUT:
1712 RETVAL
1713 1902
1714timer * 1903CHAINED
1715timer::set (NV tstamp) 1904timer::set (NV tstamp)
1716 CODE: 1905 CODE:
1717 THIS->set (tstamp); 1906 THIS->set (tstamp);
1907 OUTPUT:
1718 RETVAL = THIS; 1908 RETVAL
1719 OUTPUT:
1720 RETVAL
1721 1909
1722timer * 1910CHAINED
1723timer::start (NV tstamp = THIS->at) 1911timer::start (NV tstamp = THIS->at)
1724 CODE: 1912 CODE:
1725 THIS->start (tstamp); 1913 THIS->start (tstamp);
1914 OUTPUT:
1726 RETVAL = THIS; 1915 RETVAL
1727 OUTPUT:
1728 RETVAL
1729 1916
1730timer * 1917CHAINED
1731timer::after (NV delay) 1918timer::after (NV delay)
1732 CODE: 1919 CODE:
1733 THIS->start (NOW + delay); 1920 THIS->start (NOW + delay);
1734 OUTPUT: 1921 OUTPUT:
1735 RETVAL 1922 RETVAL
1736 1923
1737timer * 1924CHAINED
1738timer::stop () 1925timer::stop ()
1739 CODE: 1926 CODE:
1740 THIS->stop (); 1927 THIS->stop ();
1741 RETVAL = THIS;
1742 OUTPUT: 1928 OUTPUT:
1743 RETVAL 1929 RETVAL
1744 1930
1745void 1931void
1746timer::DESTROY () 1932timer::DESTROY ()
1933
1934#############################################################################
1935# urxvt::iow
1936#############################################################################
1747 1937
1748MODULE = urxvt PACKAGE = urxvt::iow 1938MODULE = urxvt PACKAGE = urxvt::iow
1749 1939
1750SV * 1940SV *
1751iow::new () 1941iow::new ()
1752 CODE: 1942 CODE:
1753 iow *w = new iow; 1943 iow *w = new iow;
1754 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1944 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1755 w->self = (HV *)SvRV (RETVAL); 1945 w->self = (HV *)SvRV (RETVAL);
1756 OUTPUT: 1946 OUTPUT:
1757 RETVAL 1947 RETVAL
1758 1948
1759iow * 1949CHAINED
1760iow::cb (SV *cb)
1761 CODE:
1762 THIS->cb (cb);
1763 RETVAL = THIS;
1764 OUTPUT:
1765 RETVAL
1766
1767iow *
1768iow::fd (int fd) 1950iow::fd (int fd)
1769 CODE: 1951 CODE:
1770 THIS->fd = fd; 1952 THIS->fd = fd;
1953 OUTPUT:
1771 RETVAL = THIS; 1954 RETVAL
1772 OUTPUT:
1773 RETVAL
1774 1955
1775iow * 1956CHAINED
1776iow::events (short events) 1957iow::events (short events)
1777 CODE: 1958 CODE:
1778 THIS->events = events; 1959 THIS->events = events;
1960 OUTPUT:
1779 RETVAL = THIS; 1961 RETVAL
1780 OUTPUT:
1781 RETVAL
1782 1962
1783iow * 1963CHAINED
1784iow::start () 1964iow::start ()
1785 CODE: 1965 CODE:
1786 THIS->start (); 1966 THIS->start ();
1967 OUTPUT:
1787 RETVAL = THIS; 1968 RETVAL
1788 OUTPUT:
1789 RETVAL
1790 1969
1791iow * 1970CHAINED
1792iow::stop () 1971iow::stop ()
1793 CODE: 1972 CODE:
1794 THIS->stop (); 1973 THIS->stop ();
1795 RETVAL = THIS;
1796 OUTPUT: 1974 OUTPUT:
1797 RETVAL 1975 RETVAL
1798 1976
1799void 1977void
1800iow::DESTROY () 1978iow::DESTROY ()
1801 1979
1980#############################################################################
1981# urxvt::iw
1982#############################################################################
1802 1983
1984MODULE = urxvt PACKAGE = urxvt::iw
1985
1986SV *
1987iw::new ()
1988 CODE:
1989 iw *w = new iw;
1990 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1991 w->self = (HV *)SvRV (RETVAL);
1992 OUTPUT:
1993 RETVAL
1994
1995CHAINED
1996iw::start ()
1997 CODE:
1998 THIS->start ();
1999 OUTPUT:
2000 RETVAL
2001
2002CHAINED
2003iw::stop ()
2004 CODE:
2005 THIS->stop ();
2006 OUTPUT:
2007 RETVAL
2008
2009void
2010iw::DESTROY ()
2011
2012#############################################################################
2013# urxvt::pw
2014#############################################################################
2015
2016MODULE = urxvt PACKAGE = urxvt::pw
2017
2018SV *
2019pw::new ()
2020 CODE:
2021 pw *w = new pw;
2022 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2023 w->self = (HV *)SvRV (RETVAL);
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028pw::start (int pid)
2029 CODE:
2030 THIS->start (pid);
2031 OUTPUT:
2032 RETVAL
2033
2034CHAINED
2035pw::stop ()
2036 CODE:
2037 THIS->stop ();
2038 OUTPUT:
2039 RETVAL
2040
2041void
2042pw::DESTROY ()
2043
2044

Diff Legend

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