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.9 by root, Tue Jan 3 01:15:00 2006 UTC vs.
Revision 1.24 by root, Wed Jan 4 21:37:55 2006 UTC

61//TODO: use magic 61//TODO: use magic
62static SV * 62static SV *
63newSVptr (void *ptr, const char *klass) 63newSVptr (void *ptr, const char *klass)
64{ 64{
65 HV *hv = newHV (); 65 HV *hv = newHV ();
66 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 66 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
68}
69
70static void
71clearSVptr (SV *sv)
72{
73 if (SvROK (sv))
74 sv = SvRV (sv);
75
76 hv_clear ((HV *)sv);
77 sv_unmagic (sv, PERL_MAGIC_ext);
68} 78}
69 79
70static long 80static long
71SvPTR (SV *sv, const char *klass) 81SvPTR (SV *sv, const char *klass)
72{ 82{
73 if (!sv_derived_from (sv, klass)) 83 if (!sv_derived_from (sv, klass))
74 croak ("object of type %s expected", klass); 84 croak ("object of type %s expected", klass);
75 85
76 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 86 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
77 87
78 if (!iv) 88 if (!mg)
79 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 89 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
80 90
81 return (long)iv; 91 return (long)mg->mg_ptr;
82} 92}
83 93
84#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self)
85#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
86 96
139#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 149#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
140#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 150#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
141 151
142struct timer : time_watcher, perl_watcher 152struct timer : time_watcher, perl_watcher
143{ 153{
154 tstamp interval;
155
144 timer () 156 timer ()
145 : time_watcher (this, &timer::execute) 157 : time_watcher (this, &timer::execute)
146 { 158 {
147 } 159 }
148 160
149 void execute (time_watcher &w) 161 void execute (time_watcher &w)
150 { 162 {
163 if (interval)
164 start (at + interval);
165
151 invoke ("urxvt::timer", newSVtimer (this)); 166 invoke ("urxvt::timer", newSVtimer (this));
152 } 167 }
153}; 168};
154 169
155#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 170#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
165 void execute (io_watcher &w, short revents) 180 void execute (io_watcher &w, short revents)
166 { 181 {
167 invoke ("urxvt::iow", newSViow (this), revents); 182 invoke ("urxvt::iow", newSViow (this), revents);
168 } 183 }
169}; 184};
185
186/////////////////////////////////////////////////////////////////////////////
187
188#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
189
190struct overlay {
191 HV *self;
192 rxvt_term *THIS;
193 int x, y, w, h;
194 int border;
195 text_t **text;
196 rend_t **rend;
197
198 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
199 ~overlay ();
200
201 void show ();
202 void hide ();
203
204 void swap ();
205
206 void set (int x, int y, SV *str, SV *rend);
207};
208
209overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
210: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2)
211{
212 if (border == 2)
213 {
214 w += 2;
215 h += 2;
216 }
217
218 text = new text_t *[h];
219 rend = new rend_t *[h];
220
221 for (int y = 0; y < h; y++)
222 {
223 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w];
225
226 text_t t0, t1, t2;
227 rend_t r = rstyle;
228
229 if (border == 2)
230 {
231 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237
238 *tp++ = t0;
239 *rp++ = r;
240
241 for (int x = w - 2; x-- > 0; )
242 {
243 *tp++ = t1;
244 *rp++ = r;
245 }
246
247 *tp = t2;
248 *rp = r;
249 }
250 else
251 for (int x = w; x-- > 0; )
252 {
253 *tp++ = 0x0020;
254 *rp++ = r;
255 }
256 }
257
258 show ();
259 THIS->want_refresh = 1;
260}
261
262overlay::~overlay ()
263{
264 hide ();
265
266 for (int y = h; y--; )
267 {
268 delete [] text[y];
269 delete [] rend[y];
270 }
271
272 delete [] text;
273 delete [] rend;
274
275 THIS->want_refresh = 1;
276}
277
278void
279overlay::show ()
280{
281 char key[33]; sprintf (key, "%32lx", (long)this);
282
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
284 hv_store (hv, key, 32, newSViv ((long)this), 0);
285}
286
287void
288overlay::hide ()
289{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0);
291
292 if (ovs)
293 {
294 char key[33]; sprintf (key, "%32lx", (long)this);
295
296 HV *hv = (HV *)SvRV (*ovs);
297 hv_delete (hv, key, 32, G_DISCARD);
298 }
299}
300
301void overlay::swap ()
302{
303 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
304 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
305
306 int ov_w = min (w, THIS->ncol - ov_x);
307 int ov_h = min (h, THIS->nrow - ov_y);
308
309 for (int y = ov_h; y--; )
310 {
311 text_t *t1 = text [y];
312 rend_t *r1 = rend [y];
313
314 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
315 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
316
317 for (int x = ov_w; x--; )
318 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t;
320 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
321 }
322 }
323
324}
325
326void overlay::set (int x, int y, SV *text, SV *rend)
327{
328 x += border;
329 y += border;
330
331 if (!IN_RANGE_EXC (y, 0, h - border))
332 return;
333
334 wchar_t *wtext = sv2wcs (text);
335
336 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col];
338
339 free (wtext);
340
341 if (rend)
342 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
344 croak ("rend must be arrayref");
345
346 AV *av = (AV *)SvRV (rend);
347
348 for (int col = min (av_len (av) + 1, w - x - border); col--; )
349 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
350 }
351
352 THIS->want_refresh = 1;
353}
354
170 355
171///////////////////////////////////////////////////////////////////////////// 356/////////////////////////////////////////////////////////////////////////////
172 357
173struct rxvt_perl_interp rxvt_perl; 358struct rxvt_perl_interp rxvt_perl;
174 359
213} 398}
214 399
215bool 400bool
216rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
217{ 402{
218 if (!perl 403 if (!perl)
219 || (!should_invoke [htype] && htype != HOOK_INIT && htype != HOOK_DESTROY))
220 return false; 404 return false;
221 405
222 if (htype == HOOK_INIT) // first hook ever called 406 if (htype == HOOK_INIT) // first hook ever called
407 {
223 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 408 term->self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 }
411 else if (!term->self)
412 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY)
414 {
415 // handled later
416 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
418 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0));
420
421 if (HvKEYS (hv))
422 {
423 hv_iterinit (hv);
424
425 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
427 }
428 }
429 else if (!should_invoke [htype])
430 return false;
224 431
225 dSP; 432 dSP;
226 va_list ap; 433 va_list ap;
227 434
228 va_start (ap, htype); 435 va_start (ap, htype);
273 if (SvTRUE (ERRSV)) 480 if (SvTRUE (ERRSV))
274 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
275 482
276 if (htype == HOOK_DESTROY) 483 if (htype == HOOK_DESTROY)
277 { 484 {
278 // TODO: clear magic
279 hv_clear ((HV *)SvRV ((SV *)term->self)); 485 clearSVptr ((SV *)term->self);
280 SvREFCNT_dec ((SV *)term->self); 486 SvREFCNT_dec ((SV *)term->self);
281 } 487 }
282 488
283 return count; 489 return count;
284 } 490 }
295 501
296PROTOTYPES: ENABLE 502PROTOTYPES: ENABLE
297 503
298BOOT: 504BOOT:
299{ 505{
300# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
301 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 507 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
302 set_hookname (INIT); 508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
303 set_hookname (RESET); 509# include "hookinc.h"
304 set_hookname (START); 510# undef def
305 set_hookname (DESTROY);
306 set_hookname (SEL_BEGIN);
307 set_hookname (SEL_EXTEND);
308 set_hookname (SEL_MAKE);
309 set_hookname (SEL_GRAB);
310 set_hookname (FOCUS_IN);
311 set_hookname (FOCUS_OUT);
312 set_hookname (VIEW_CHANGE);
313 set_hookname (SCROLL_BACK);
314 set_hookname (TTY_ACTIVITY);
315 set_hookname (REFRESH_BEGIN);
316 set_hookname (REFRESH_END);
317 set_hookname (KEYBOARD_COMMAND);
318 511
319 newCONSTSUB (gv_stashpv ("urxvt", 1), "DEFAULT_RSTYLE", newSViv (DEFAULT_RSTYLE)); 512 export_const (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE);
514 export_const (RS_Bold);
515 export_const (RS_Italic);
516 export_const (RS_Blink);
517 export_const (RS_RVid);
518 export_const (RS_Uline);
320 519
321 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
322} 521}
323 522
324void 523void
339NV 538NV
340NOW () 539NOW ()
341 CODE: 540 CODE:
342 RETVAL = NOW; 541 RETVAL = NOW;
343 OUTPUT: 542 OUTPUT:
543 RETVAL
544
545int
546GET_BASEFG (int rend)
547 CODE:
548 RETVAL = GET_BASEFG (rend);
549 OUTPUT:
550 RETVAL
551
552int
553GET_BASEBG (int rend)
554 CODE:
555 RETVAL = GET_BASEBG (rend);
556 OUTPUT:
557 RETVAL
558
559int
560SET_FGCOLOR (int rend, int new_color)
561 CODE:
562 RETVAL = SET_FGCOLOR (rend, new_color);
563 OUTPUT:
564 RETVAL
565
566int
567SET_BGCOLOR (int rend, int new_color)
568 CODE:
569 RETVAL = SET_BGCOLOR (rend, new_color);
570 OUTPUT:
571 RETVAL
572
573int
574GET_CUSTOM (int rend)
575 CODE:
576 RETVAL = (rend && RS_customMask) >> RS_customShift;
577 OUTPUT:
578 RETVAL
579
580int
581SET_CUSTOM (int rend, int new_value)
582 CODE:
583{
584 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
585 croak ("custom value out of range, must be 0..%d", RS_customCount - 1);
586
587 RETVAL = (rend & ~RS_customMask)
588 | ((new_value << RS_customShift) & RS_customMask);
589}
590 OUTPUT:
344 RETVAL 591 RETVAL
345 592
346MODULE = urxvt PACKAGE = urxvt::term 593MODULE = urxvt PACKAGE = urxvt::term
347 594
348int 595int
397 free (str); 644 free (str);
398} 645}
399 OUTPUT: 646 OUTPUT:
400 RETVAL 647 RETVAL
401 648
649# very portable, especially on objects as opposed to pods
650#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
651
652#define TERM_OFFSET_width TERM_OFFSET(width)
653#define TERM_OFFSET_height TERM_OFFSET(height)
654#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
655#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
656#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
657#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
658#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
659#define TERM_OFFSET_focus TERM_OFFSET(focus)
660#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
661#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
662#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
663#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
664
402int 665int
403rxvt_term::nsaved () 666rxvt_term::width ()
667 ALIAS:
668 width = TERM_OFFSET_width
669 height = TERM_OFFSET_height
670 fwidth = TERM_OFFSET_fwidth
671 fheight = TERM_OFFSET_fheight
672 fbase = TERM_OFFSET_fbase
673 nrow = TERM_OFFSET_nrow
674 ncol = TERM_OFFSET_ncol
675 focus = TERM_OFFSET_focus
676 mapped = TERM_OFFSET_mapped
677 saveLines = TERM_OFFSET_saveLines
678 total_rows = TERM_OFFSET_total_rows
679 nsaved = TERM_OFFSET_nsaved
404 CODE: 680 CODE:
681 RETVAL = *(int *)((char *)THIS + ix);
682 OUTPUT:
683 RETVAL
684
685U32
686rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle)
687 CODE:
688{
405 RETVAL = THIS->nsaved; 689 RETVAL = THIS->screen.s_rstyle;
690 THIS->screen.s_rstyle = new_rstyle;
691}
406 OUTPUT: 692 OUTPUT:
407 RETVAL 693 RETVAL
408 694
409int 695int
410rxvt_term::view_start (int newval = -1) 696rxvt_term::view_start (int newval = -1)
411 CODE: 697 CODE:
412{ 698{
419 } 705 }
420} 706}
421 OUTPUT: 707 OUTPUT:
422 RETVAL 708 RETVAL
423 709
424int
425rxvt_term::nrow ()
426 CODE:
427 RETVAL = THIS->nrow;
428 OUTPUT:
429 RETVAL
430
431int
432rxvt_term::ncol ()
433 CODE:
434 RETVAL = THIS->ncol;
435 OUTPUT:
436 RETVAL
437
438void 710void
439rxvt_term::want_refresh () 711rxvt_term::want_refresh ()
440 CODE: 712 CODE:
441 THIS->want_refresh = 1; 713 THIS->want_refresh = 1;
442 714
443void 715void
444rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 716rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
445 PPCODE: 717 PPCODE:
446{ 718{
447 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 719 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
448 croak ("row_number number of out range"); 720 XSRETURN_EMPTY;
449 721
450 line_t &l = ROW(row_number); 722 line_t &l = ROW(row_number);
451 723
452 if (GIMME_V != G_VOID) 724 if (GIMME_V != G_VOID)
453 { 725 {
465 free (str); 737 free (str);
466 } 738 }
467 739
468 if (new_text) 740 if (new_text)
469 { 741 {
470 STRLEN slen;
471 char *str = SvPVutf8 (new_text, slen); 742 wchar_t *wstr = sv2wcs (new_text);
472 wchar_t *wstr = rxvt_utf8towcs (str, slen);
473 743
474 int len = wcslen (wstr); 744 int len = wcslen (wstr);
475 745
476 if (start_col + len > THIS->ncol) 746 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
477 { 747 {
478 free (wstr); 748 free (wstr);
479 croak ("new_text extends beyond right margin"); 749 croak ("new_text extends beyond horizontal margins");
480 } 750 }
481 751
482 for (int col = start_col; col < start_col + len; col++) 752 for (int col = start_col; col < start_col + len; col++)
483 { 753 {
484 l.t [col] = wstr [col - start_col]; 754 l.t [col] = wstr [col - start_col];
492void 762void
493rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 763rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
494 PPCODE: 764 PPCODE:
495{ 765{
496 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 766 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
497 croak ("row_number number of out range"); 767 XSRETURN_EMPTY;
498 768
499 line_t &l = ROW(row_number); 769 line_t &l = ROW(row_number);
500 770
501 if (GIMME_V != G_VOID) 771 if (GIMME_V != G_VOID)
502 { 772 {
515 croak ("new_rend must be arrayref"); 785 croak ("new_rend must be arrayref");
516 786
517 AV *av = (AV *)SvRV (new_rend); 787 AV *av = (AV *)SvRV (new_rend);
518 int len = av_len (av) + 1; 788 int len = av_len (av) + 1;
519 789
520 if (start_col + len > THIS->ncol) 790 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
521 croak ("new_rend array extends beyond right margin"); 791 croak ("new_rend array extends beyond horizontal margins");
522 792
523 for (int col = start_col; col < start_col + len; col++) 793 for (int col = start_col; col < start_col + len; col++)
524 { 794 {
525 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 795 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;
526 796
532int 802int
533rxvt_term::ROW_l (int row_number, int new_length = -2) 803rxvt_term::ROW_l (int row_number, int new_length = -2)
534 CODE: 804 CODE:
535{ 805{
536 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 806 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
537 croak ("row_number number of out range"); 807 XSRETURN_EMPTY;
538 808
539 line_t &l = ROW(row_number); 809 line_t &l = ROW(row_number);
540 RETVAL = l.l; 810 RETVAL = l.l < 0 ? THIS->ncol : l.l;
541 811
542 if (new_length >= -1) 812 if (new_length >= -1)
543 l.l = new_length; 813 l.l = new_length;
544} 814}
545 OUTPUT: 815 OUTPUT:
546 RETVAL 816 RETVAL
547 817
818bool
819rxvt_term::ROW_is_longer (int row_number)
820 CODE:
821{
822 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
823 XSRETURN_EMPTY;
824
825 line_t &l = ROW(row_number);
826 RETVAL = l.l < 0;
827}
828 OUTPUT:
829 RETVAL
830
548SV * 831SV *
549rxvt_term::special_encode (SV *str) 832rxvt_term::special_encode (SV *str)
550 CODE: 833 CODE:
551 abort ();//TODO 834 abort ();//TODO
552 835
558void 841void
559rxvt_term::_resource (char *name, int index, SV *newval = 0) 842rxvt_term::_resource (char *name, int index, SV *newval = 0)
560 PPCODE: 843 PPCODE:
561{ 844{
562 struct resval { const char *name; int value; } rslist [] = { 845 struct resval { const char *name; int value; } rslist [] = {
563# define Rs_def(name) { # name, Rs_ ## name }, 846# define def(name) { # name, Rs_ ## name },
564# define Rs_reserve(name,count) 847# define reserve(name,count)
565# include "rsinc.h" 848# include "rsinc.h"
566# undef Rs_def 849# undef def
567# undef Rs_reserve 850# undef reserve
568 }; 851 };
569 852
570 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 853 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
571 854
572 do { 855 do {
594 THIS->rs [index] = 0; 877 THIS->rs [index] = 0;
595 } 878 }
596} 879}
597 880
598void 881void
599rxvt_term::selection_mark (...) 882rxvt_term::cur (...)
600 PROTOTYPE: $;$$ 883 PROTOTYPE: $;$$
601 ALIAS: 884 ALIAS:
885 screen_cur = 0
602 selection_beg = 1 886 selection_beg = 1
603 selection_end = 2 887 selection_end = 2
888 selection_mark = 3
604 PPCODE: 889 PPCODE:
605{ 890{
606 row_col_t &sel = ix == 1 ? THIS->selection.beg 891 row_col_t &rc = ix == 0 ? THIS->screen.cur
892 : ix == 1 ? THIS->selection.beg
607 : ix == 2 ? THIS->selection.end 893 : ix == 2 ? THIS->selection.end
608 : THIS->selection.mark; 894 : THIS->selection.mark;
609 895
610 if (GIMME_V != G_VOID) 896 if (GIMME_V != G_VOID)
611 { 897 {
612 EXTEND (SP, 2); 898 EXTEND (SP, 2);
613 PUSHs (sv_2mortal (newSViv (sel.row))); 899 PUSHs (sv_2mortal (newSViv (rc.row)));
614 PUSHs (sv_2mortal (newSViv (sel.col))); 900 PUSHs (sv_2mortal (newSViv (rc.col)));
615 } 901 }
616 902
617 if (items == 3) 903 if (items == 3)
618 { 904 {
619 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 905 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
620 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 906 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
621 907
622 if (ix) 908 if (ix)
623 THIS->want_refresh = 1; 909 THIS->want_refresh = 1;
624 } 910 }
625} 911}
626 912
627int 913int
628rxvt_term::selection_grab (int eventtime) 914rxvt_term::selection_grab (int eventtime = CurrentTime)
629 915
630void 916void
631rxvt_term::selection (SV *newtext = 0) 917rxvt_term::selection (SV *newtext = 0)
632 PPCODE: 918 PPCODE:
633{ 919{
646 932
647 THIS->selection.text = sv2wcs (newtext); 933 THIS->selection.text = sv2wcs (newtext);
648 THIS->selection.len = wcslen (THIS->selection.text); 934 THIS->selection.len = wcslen (THIS->selection.text);
649 } 935 }
650} 936}
651
652void
653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
654
655void
656rxvt_term::scr_overlay_off ()
657
658void
659rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE)
660 CODE:
661 THIS->scr_overlay_set (x, y, text, rend);
662
663void
664rxvt_term::scr_overlay_set (int x, int y, SV *text)
665 CODE:
666{
667 wchar_t *wtext = sv2wcs (text);
668 THIS->scr_overlay_set (x, y, wtext);
669 free (wtext);
670}
671 937
672void 938void
673rxvt_term::tt_write (SV *octets) 939rxvt_term::tt_write (SV *octets)
674 INIT: 940 INIT:
675 STRLEN len; 941 STRLEN len;
676 char *str = SvPVbyte (octets, len); 942 char *str = SvPVbyte (octets, len);
677 C_ARGS: 943 C_ARGS:
678 (unsigned char *)str, len 944 str, len
945
946SV *
947rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
948 CODE:
949{
950 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
951 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
952 o->self = (HV *)SvRV (RETVAL);
953}
954 OUTPUT:
955 RETVAL
956
957MODULE = urxvt PACKAGE = urxvt::overlay
958
959void
960overlay::set (int x, int y, SV *text, SV *rend = 0)
961
962void
963overlay::show ()
964
965void
966overlay::hide ()
967
968void
969overlay::DESTROY ()
679 970
680MODULE = urxvt PACKAGE = urxvt::timer 971MODULE = urxvt PACKAGE = urxvt::timer
681 972
682SV * 973SV *
683timer::new () 974timer::new ()
684 CODE: 975 CODE:
685 timer *w = new timer; 976 timer *w = new timer;
977 w->start (NOW);
686 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 978 RETVAL = newSVptr ((void *)w, "urxvt::timer");
687 w->self = (HV *)SvRV (RETVAL); 979 w->self = (HV *)SvRV (RETVAL);
688 OUTPUT: 980 OUTPUT:
689 RETVAL 981 RETVAL
690 982
698 990
699NV 991NV
700timer::at () 992timer::at ()
701 CODE: 993 CODE:
702 RETVAL = THIS->at; 994 RETVAL = THIS->at;
995 OUTPUT:
996 RETVAL
997
998timer *
999timer::interval (NV interval)
1000 CODE:
1001 THIS->interval = interval;
1002 RETVAL = THIS;
703 OUTPUT: 1003 OUTPUT:
704 RETVAL 1004 RETVAL
705 1005
706timer * 1006timer *
707timer::set (NV tstamp) 1007timer::set (NV tstamp)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines