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.12 by root, Tue Jan 3 02:42:17 2006 UTC vs.
Revision 1.25 by root, Thu Jan 5 01:04:10 2006 UTC

… …
51 char *str = SvPVutf8 (sv, len); 51 char *str = SvPVutf8 (sv, len);
52 return rxvt_utf8towcs (str, len); 52 return rxvt_utf8towcs (str, len);
53} 53}
54 54
55static SV * 55static SV *
56wcs2sv (wchar_t *wstr, int len = -1)
57{
58 char *str = rxvt_wcstoutf8 (wstr, len);
59
60 SV *sv = newSVpv (str, 0);
61 SvUTF8_on (sv);
62 free (str);
63
64 return sv;
65}
66
67static SV *
56new_ref (HV *hv, const char *klass) 68new_ref (HV *hv, const char *klass)
57{ 69{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 70 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 71}
60 72
61//TODO: use magic 73//TODO: use magic
62static SV * 74static SV *
63newSVptr (void *ptr, const char *klass) 75newSVptr (void *ptr, const char *klass)
64{ 76{
65 HV *hv = newHV (); 77 HV *hv = newHV ();
66 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 78 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 79 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
80}
81
82static void
83clearSVptr (SV *sv)
84{
85 if (SvROK (sv))
86 sv = SvRV (sv);
87
88 hv_clear ((HV *)sv);
89 sv_unmagic (sv, PERL_MAGIC_ext);
68} 90}
69 91
70static long 92static long
71SvPTR (SV *sv, const char *klass) 93SvPTR (SV *sv, const char *klass)
72{ 94{
73 if (!sv_derived_from (sv, klass)) 95 if (!sv_derived_from (sv, klass))
74 croak ("object of type %s expected", klass); 96 croak ("object of type %s expected", klass);
75 97
76 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 98 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
77 99
78 if (!iv) 100 if (!mg)
79 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
80 102
81 return (long)iv; 103 return (long)mg->mg_ptr;
82} 104}
83 105
84#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self)
85#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
86 108
… …
139#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 161#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
140#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 162#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
141 163
142struct timer : time_watcher, perl_watcher 164struct timer : time_watcher, perl_watcher
143{ 165{
166 tstamp interval;
167
144 timer () 168 timer ()
145 : time_watcher (this, &timer::execute) 169 : time_watcher (this, &timer::execute)
146 { 170 {
147 } 171 }
148 172
149 void execute (time_watcher &w) 173 void execute (time_watcher &w)
150 { 174 {
175 if (interval)
176 start (at + interval);
177
151 invoke ("urxvt::timer", newSVtimer (this)); 178 invoke ("urxvt::timer", newSVtimer (this));
152 } 179 }
153}; 180};
154 181
155#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 182#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
… …
165 void execute (io_watcher &w, short revents) 192 void execute (io_watcher &w, short revents)
166 { 193 {
167 invoke ("urxvt::iow", newSViow (this), revents); 194 invoke ("urxvt::iow", newSViow (this), revents);
168 } 195 }
169}; 196};
197
198/////////////////////////////////////////////////////////////////////////////
199
200#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
201
202struct overlay {
203 HV *self;
204 rxvt_term *THIS;
205 int x, y, w, h;
206 int border;
207 text_t **text;
208 rend_t **rend;
209
210 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
211 ~overlay ();
212
213 void show ();
214 void hide ();
215
216 void swap ();
217
218 void set (int x, int y, SV *str, SV *rend);
219};
220
221overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
222: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2)
223{
224 if (border == 2)
225 {
226 w += 2;
227 h += 2;
228 }
229
230 text = new text_t *[h];
231 rend = new rend_t *[h];
232
233 for (int y = 0; y < h; y++)
234 {
235 text_t *tp = text[y] = new text_t[w];
236 rend_t *rp = rend[y] = new rend_t[w];
237
238 text_t t0, t1, t2;
239 rend_t r = rstyle;
240
241 if (border == 2)
242 {
243 if (y == 0)
244 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
245 else if (y < h - 1)
246 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
247 else
248 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
249
250 *tp++ = t0;
251 *rp++ = r;
252
253 for (int x = w - 2; x-- > 0; )
254 {
255 *tp++ = t1;
256 *rp++ = r;
257 }
258
259 *tp = t2;
260 *rp = r;
261 }
262 else
263 for (int x = w; x-- > 0; )
264 {
265 *tp++ = 0x0020;
266 *rp++ = r;
267 }
268 }
269
270 show ();
271 THIS->want_refresh = 1;
272}
273
274overlay::~overlay ()
275{
276 hide ();
277
278 for (int y = h; y--; )
279 {
280 delete [] text[y];
281 delete [] rend[y];
282 }
283
284 delete [] text;
285 delete [] rend;
286
287 THIS->want_refresh = 1;
288}
289
290void
291overlay::show ()
292{
293 char key[33]; sprintf (key, "%32lx", (long)this);
294
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0);
297}
298
299void
300overlay::hide ()
301{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0);
303
304 if (ovs)
305 {
306 char key[33]; sprintf (key, "%32lx", (long)this);
307
308 HV *hv = (HV *)SvRV (*ovs);
309 hv_delete (hv, key, 32, G_DISCARD);
310 }
311}
312
313void overlay::swap ()
314{
315 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
316 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
317
318 int ov_w = min (w, THIS->ncol - ov_x);
319 int ov_h = min (h, THIS->nrow - ov_y);
320
321 for (int y = ov_h; y--; )
322 {
323 text_t *t1 = text [y];
324 rend_t *r1 = rend [y];
325
326 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
327 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
328
329 for (int x = ov_w; x--; )
330 {
331 text_t t = *t1; *t1++ = *t2; *t2++ = t;
332 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
333 }
334 }
335
336}
337
338void overlay::set (int x, int y, SV *text, SV *rend)
339{
340 x += border;
341 y += border;
342
343 if (!IN_RANGE_EXC (y, 0, h - border))
344 return;
345
346 wchar_t *wtext = sv2wcs (text);
347
348 for (int col = min (wcslen (wtext), w - x - border); col--; )
349 this->text [y][x + col] = wtext [col];
350
351 free (wtext);
352
353 if (rend)
354 {
355 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
356 croak ("rend must be arrayref");
357
358 AV *av = (AV *)SvRV (rend);
359
360 for (int col = min (av_len (av) + 1, w - x - border); col--; )
361 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
362 }
363
364 THIS->want_refresh = 1;
365}
366
170 367
171///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
172 369
173struct rxvt_perl_interp rxvt_perl; 370struct rxvt_perl_interp rxvt_perl;
174 371
… …
213} 410}
214 411
215bool 412bool
216rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
217{ 414{
218 if (!perl 415 if (!perl)
219 || (!should_invoke [htype] && htype != HOOK_INIT && htype != HOOK_DESTROY))
220 return false; 416 return false;
221 417
222 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
419 {
223 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 420 term->self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 }
423 else if (!term->self)
424 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY)
426 {
427 // handled later
428 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0));
432
433 if (HvKEYS (hv))
434 {
435 hv_iterinit (hv);
436
437 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
439 }
440 }
441 else if (!should_invoke [htype])
442 return false;
224 443
225 dSP; 444 dSP;
226 va_list ap; 445 va_list ap;
227 446
228 va_start (ap, htype); 447 va_start (ap, htype);
… …
250 469
251 case DT_STRING: 470 case DT_STRING:
252 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
253 break; 472 break;
254 473
474 case DT_USTRING_LEN:
475 {
476 unicode_t *ustr = va_arg (ap, unicode_t *);
477 int ulen = va_arg (ap, int);
478 wchar_t *wstr = new wchar_t [ulen];
479
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
484
485 delete [] wstr;
486 }
487
255 case DT_END: 488 case DT_END:
256 { 489 {
257 va_end (ap); 490 va_end (ap);
258 491
259 PUTBACK; 492 PUTBACK;
… …
273 if (SvTRUE (ERRSV)) 506 if (SvTRUE (ERRSV))
274 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
275 508
276 if (htype == HOOK_DESTROY) 509 if (htype == HOOK_DESTROY)
277 { 510 {
278 // TODO: clear magic
279 hv_clear ((HV *)SvRV ((SV *)term->self)); 511 clearSVptr ((SV *)term->self);
280 SvREFCNT_dec ((SV *)term->self); 512 SvREFCNT_dec ((SV *)term->self);
281 } 513 }
282 514
283 return count; 515 return count;
284 } 516 }
… …
295 527
296PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
297 529
298BOOT: 530BOOT:
299{ 531{
300# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
301# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
302 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 533 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
303 set_hookname (INIT); 534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
304 set_hookname (RESET); 535# include "hookinc.h"
305 set_hookname (START); 536# undef def
306 set_hookname (DESTROY);
307 set_hookname (SEL_BEGIN);
308 set_hookname (SEL_EXTEND);
309 set_hookname (SEL_MAKE);
310 set_hookname (SEL_GRAB);
311 set_hookname (FOCUS_IN);
312 set_hookname (FOCUS_OUT);
313 set_hookname (VIEW_CHANGE);
314 set_hookname (SCROLL_BACK);
315 set_hookname (TTY_ACTIVITY);
316 set_hookname (REFRESH_BEGIN);
317 set_hookname (REFRESH_END);
318 set_hookname (KEYBOARD_COMMAND);
319 537
320 export_const (DEFAULT_RSTYLE); 538 export_const (DEFAULT_RSTYLE);
321 export_const (OVERLAY_RSTYLE); 539 export_const (OVERLAY_RSTYLE);
322 export_const (RS_Bold); 540 export_const (RS_Bold);
323 export_const (RS_Italic); 541 export_const (RS_Italic);
… …
442 660
443 rxvt_push_locale (THIS->locale); 661 rxvt_push_locale (THIS->locale);
444 wchar_t *wstr = rxvt_mbstowcs (data, len); 662 wchar_t *wstr = rxvt_mbstowcs (data, len);
445 rxvt_pop_locale (); 663 rxvt_pop_locale ();
446 664
447 char *str = rxvt_wcstoutf8 (wstr); 665 RETVAL = wcs2sv (wstr);
448 free (wstr); 666 free (wstr);
449
450 RETVAL = newSVpv (str, 0);
451 SvUTF8_on (RETVAL);
452 free (str);
453} 667}
454 OUTPUT: 668 OUTPUT:
455 RETVAL 669 RETVAL
456 670
671# very portable, especially on objects as opposed to pods
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673
674#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
678#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
679#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
680#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
681#define TERM_OFFSET_focus TERM_OFFSET(focus)
682#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
683#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
684#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
685#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
686
457int 687int
458rxvt_term::nsaved () 688rxvt_term::width ()
689 ALIAS:
690 width = TERM_OFFSET_width
691 height = TERM_OFFSET_height
692 fwidth = TERM_OFFSET_fwidth
693 fheight = TERM_OFFSET_fheight
694 fbase = TERM_OFFSET_fbase
695 nrow = TERM_OFFSET_nrow
696 ncol = TERM_OFFSET_ncol
697 focus = TERM_OFFSET_focus
698 mapped = TERM_OFFSET_mapped
699 saveLines = TERM_OFFSET_saveLines
700 total_rows = TERM_OFFSET_total_rows
701 nsaved = TERM_OFFSET_nsaved
459 CODE: 702 CODE:
703 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT:
705 RETVAL
706
707U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE:
710{
460 RETVAL = THIS->nsaved; 711 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle;
713}
461 OUTPUT: 714 OUTPUT:
462 RETVAL 715 RETVAL
463 716
464int 717int
465rxvt_term::view_start (int newval = -1) 718rxvt_term::view_start (int newval = -1)
466 CODE: 719 CODE:
467{ 720{
… …
474 } 727 }
475} 728}
476 OUTPUT: 729 OUTPUT:
477 RETVAL 730 RETVAL
478 731
479int
480rxvt_term::nrow ()
481 CODE:
482 RETVAL = THIS->nrow;
483 OUTPUT:
484 RETVAL
485
486int
487rxvt_term::ncol ()
488 CODE:
489 RETVAL = THIS->ncol;
490 OUTPUT:
491 RETVAL
492
493void 732void
494rxvt_term::want_refresh () 733rxvt_term::want_refresh ()
495 CODE: 734 CODE:
496 THIS->want_refresh = 1; 735 THIS->want_refresh = 1;
497 736
498void 737void
499rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
500 PPCODE: 739 PPCODE:
501{ 740{
502 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
503 croak ("row_number number of out range"); 742 XSRETURN_EMPTY;
504 743
505 line_t &l = ROW(row_number); 744 line_t &l = ROW(row_number);
506 745
507 if (GIMME_V != G_VOID) 746 if (GIMME_V != G_VOID)
508 { 747 {
509 wchar_t *wstr = new wchar_t [THIS->ncol]; 748 wchar_t *wstr = new wchar_t [THIS->ncol];
510 749
511 for (int col = 0; col <THIS->ncol; col++) 750 for (int col = 0; col <THIS->ncol; col++)
512 wstr [col] = l.t [col]; 751 wstr [col] = l.t [col];
513 752
514 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
515 free (wstr);
516
517 SV *sv = newSVpv (str, 0);
518 SvUTF8_on (sv);
519 XPUSHs (sv_2mortal (sv)); 753 XPUSHs (sv_2mortal (wcs2sv (wstr)));
520 free (str); 754
755 delete [] wstr;
521 } 756 }
522 757
523 if (new_text) 758 if (new_text)
524 { 759 {
525 STRLEN slen;
526 char *str = SvPVutf8 (new_text, slen); 760 wchar_t *wstr = sv2wcs (new_text);
527 wchar_t *wstr = rxvt_utf8towcs (str, slen);
528 761
529 int len = wcslen (wstr); 762 int len = wcslen (wstr);
530 763
531 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
532 { 765 {
… …
547void 780void
548rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
549 PPCODE: 782 PPCODE:
550{ 783{
551 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
552 croak ("row_number number of out range"); 785 XSRETURN_EMPTY;
553 786
554 line_t &l = ROW(row_number); 787 line_t &l = ROW(row_number);
555 788
556 if (GIMME_V != G_VOID) 789 if (GIMME_V != G_VOID)
557 { 790 {
… …
587int 820int
588rxvt_term::ROW_l (int row_number, int new_length = -2) 821rxvt_term::ROW_l (int row_number, int new_length = -2)
589 CODE: 822 CODE:
590{ 823{
591 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 824 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
592 croak ("row_number number of out range"); 825 XSRETURN_EMPTY;
593 826
594 line_t &l = ROW(row_number); 827 line_t &l = ROW(row_number);
595 RETVAL = l.l; 828 RETVAL = l.l < 0 ? THIS->ncol : l.l;
596 829
597 if (new_length >= -1) 830 if (new_length >= -1)
598 l.l = new_length; 831 l.l = new_length;
599} 832}
600 OUTPUT: 833 OUTPUT:
601 RETVAL 834 RETVAL
602 835
836bool
837rxvt_term::ROW_is_longer (int row_number)
838 CODE:
839{
840 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
841 XSRETURN_EMPTY;
842
843 line_t &l = ROW(row_number);
844 RETVAL = l.l < 0;
845}
846 OUTPUT:
847 RETVAL
848
603SV * 849SV *
604rxvt_term::special_encode (SV *str) 850rxvt_term::special_encode (SV *str)
605 CODE: 851 CODE:
606 abort ();//TODO 852 abort ();//TODO
607 853
… …
613void 859void
614rxvt_term::_resource (char *name, int index, SV *newval = 0) 860rxvt_term::_resource (char *name, int index, SV *newval = 0)
615 PPCODE: 861 PPCODE:
616{ 862{
617 struct resval { const char *name; int value; } rslist [] = { 863 struct resval { const char *name; int value; } rslist [] = {
618# define Rs_def(name) { # name, Rs_ ## name }, 864# define def(name) { # name, Rs_ ## name },
619# define Rs_reserve(name,count) 865# define reserve(name,count)
620# include "rsinc.h" 866# include "rsinc.h"
621# undef Rs_def 867# undef def
622# undef Rs_reserve 868# undef reserve
623 }; 869 };
624 870
625 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 871 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
626 872
627 do { 873 do {
… …
649 THIS->rs [index] = 0; 895 THIS->rs [index] = 0;
650 } 896 }
651} 897}
652 898
653void 899void
654rxvt_term::selection_mark (...) 900rxvt_term::cur (...)
655 PROTOTYPE: $;$$ 901 PROTOTYPE: $;$$
656 ALIAS: 902 ALIAS:
903 screen_cur = 0
657 selection_beg = 1 904 selection_beg = 1
658 selection_end = 2 905 selection_end = 2
906 selection_mark = 3
659 PPCODE: 907 PPCODE:
660{ 908{
661 row_col_t &sel = ix == 1 ? THIS->selection.beg 909 row_col_t &rc = ix == 0 ? THIS->screen.cur
910 : ix == 1 ? THIS->selection.beg
662 : ix == 2 ? THIS->selection.end 911 : ix == 2 ? THIS->selection.end
663 : THIS->selection.mark; 912 : THIS->selection.mark;
664 913
665 if (GIMME_V != G_VOID) 914 if (GIMME_V != G_VOID)
666 { 915 {
667 EXTEND (SP, 2); 916 EXTEND (SP, 2);
668 PUSHs (sv_2mortal (newSViv (sel.row))); 917 PUSHs (sv_2mortal (newSViv (rc.row)));
669 PUSHs (sv_2mortal (newSViv (sel.col))); 918 PUSHs (sv_2mortal (newSViv (rc.col)));
670 } 919 }
671 920
672 if (items == 3) 921 if (items == 3)
673 { 922 {
674 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 923 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
675 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 924 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
676 925
677 if (ix) 926 if (ix)
678 THIS->want_refresh = 1; 927 THIS->want_refresh = 1;
679 } 928 }
680} 929}
681 930
682int 931int
683rxvt_term::selection_grab (int eventtime) 932rxvt_term::selection_grab (int eventtime = CurrentTime)
684 933
685void 934void
686rxvt_term::selection (SV *newtext = 0) 935rxvt_term::selection (SV *newtext = 0)
687 PPCODE: 936 PPCODE:
688{ 937{
689 if (GIMME_V != G_VOID) 938 if (GIMME_V != G_VOID)
690 { 939 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
691 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
692 SV *sv = newSVpv (sel, 0);
693 SvUTF8_on (sv);
694 free (sel);
695 XPUSHs (sv_2mortal (sv));
696 }
697 940
698 if (newtext) 941 if (newtext)
699 { 942 {
700 free (THIS->selection.text); 943 free (THIS->selection.text);
701 944
702 THIS->selection.text = sv2wcs (newtext); 945 THIS->selection.text = sv2wcs (newtext);
703 THIS->selection.len = wcslen (THIS->selection.text); 946 THIS->selection.len = wcslen (THIS->selection.text);
704 } 947 }
705} 948}
949
950void
951rxvt_term::scr_add_lines (SV *string)
952 CODE:
953{
954 wchar_t *wstr = sv2wcs (string);
955 int wlen = wcslen (wstr);
956 unicode_t *ustr = new unicode_t [wlen];
957 int nlines = 0;
958
959 for (int i = wlen; i--; )
706 960 {
707void 961 ustr [i] = wstr [i];
708rxvt_term::scr_overlay_new (int x, int y, int w, int h) 962 nlines += ustr [i] == '\012';
963 }
709 964
710void 965 THIS->scr_add_lines (ustr, nlines, wlen);
711rxvt_term::scr_overlay_off ()
712 966
713void
714rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE)
715 CODE:
716 THIS->scr_overlay_set (x, y, text, rend);
717
718void
719rxvt_term::scr_overlay_set (int x, int y, SV *text)
720 CODE:
721{
722 wchar_t *wtext = sv2wcs (text);
723 THIS->scr_overlay_set (x, y, wtext);
724 free (wtext); 967 free (wstr);
968 delete [] ustr;
725} 969}
726 970
727void 971void
728rxvt_term::tt_write (SV *octets) 972rxvt_term::tt_write (SV *octets)
729 INIT: 973 INIT:
730 STRLEN len; 974 STRLEN len;
731 char *str = SvPVbyte (octets, len); 975 char *str = SvPVbyte (octets, len);
732 C_ARGS: 976 C_ARGS:
733 (unsigned char *)str, len 977 str, len
978
979SV *
980rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
981 CODE:
982{
983 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
984 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
985 o->self = (HV *)SvRV (RETVAL);
986}
987 OUTPUT:
988 RETVAL
989
990MODULE = urxvt PACKAGE = urxvt::overlay
991
992void
993overlay::set (int x, int y, SV *text, SV *rend = 0)
994
995void
996overlay::show ()
997
998void
999overlay::hide ()
1000
1001void
1002overlay::DESTROY ()
734 1003
735MODULE = urxvt PACKAGE = urxvt::timer 1004MODULE = urxvt PACKAGE = urxvt::timer
736 1005
737SV * 1006SV *
738timer::new () 1007timer::new ()
739 CODE: 1008 CODE:
740 timer *w = new timer; 1009 timer *w = new timer;
1010 w->start (NOW);
741 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1011 RETVAL = newSVptr ((void *)w, "urxvt::timer");
742 w->self = (HV *)SvRV (RETVAL); 1012 w->self = (HV *)SvRV (RETVAL);
743 OUTPUT: 1013 OUTPUT:
744 RETVAL 1014 RETVAL
745 1015
… …
753 1023
754NV 1024NV
755timer::at () 1025timer::at ()
756 CODE: 1026 CODE:
757 RETVAL = THIS->at; 1027 RETVAL = THIS->at;
1028 OUTPUT:
1029 RETVAL
1030
1031timer *
1032timer::interval (NV interval)
1033 CODE:
1034 THIS->interval = interval;
1035 RETVAL = THIS;
758 OUTPUT: 1036 OUTPUT:
759 RETVAL 1037 RETVAL
760 1038
761timer * 1039timer *
762timer::set (NV tstamp) 1040timer::set (NV tstamp)

Diff Legend

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