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.4 by root, Mon Jan 2 19:05:05 2006 UTC vs.
Revision 1.25 by root, Thu Jan 5 01:04:10 2006 UTC

35#include "rxvtutil.h" 35#include "rxvtutil.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include "perlxsi.c" 38#include "perlxsi.c"
39 39
40#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)]
44
40///////////////////////////////////////////////////////////////////////////// 45/////////////////////////////////////////////////////////////////////////////
41 46
42static wchar_t * 47static wchar_t *
43sv2wcs (SV *sv) 48sv2wcs (SV *sv)
44{ 49{
46 char *str = SvPVutf8 (sv, len); 51 char *str = SvPVutf8 (sv, len);
47 return rxvt_utf8towcs (str, len); 52 return rxvt_utf8towcs (str, len);
48} 53}
49 54
50static 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 *
51new_ref (HV *hv, const char *klass) 68new_ref (HV *hv, const char *klass)
52{ 69{
53 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 70 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
54} 71}
55 72
56//TODO: use magic 73//TODO: use magic
57static SV * 74static SV *
58newSVptr (void *ptr, const char *klass) 75newSVptr (void *ptr, const char *klass)
59{ 76{
60 HV *hv = newHV (); 77 HV *hv = newHV ();
61 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 78 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
62 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);
63} 90}
64 91
65static long 92static long
66SvPTR (SV *sv, const char *klass) 93SvPTR (SV *sv, const char *klass)
67{ 94{
68 if (!sv_derived_from (sv, klass)) 95 if (!sv_derived_from (sv, klass))
69 croak ("object of type %s expected", klass); 96 croak ("object of type %s expected", klass);
70 97
71 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 98 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
72 99
73 if (!iv) 100 if (!mg)
74 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);
75 102
76 return (long)iv; 103 return (long)mg->mg_ptr;
77} 104}
78 105
79#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self)
80#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
81 108
134#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 161#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
135#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 162#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
136 163
137struct timer : time_watcher, perl_watcher 164struct timer : time_watcher, perl_watcher
138{ 165{
166 tstamp interval;
167
139 timer () 168 timer ()
140 : time_watcher (this, &timer::execute) 169 : time_watcher (this, &timer::execute)
141 { 170 {
142 } 171 }
143 172
144 void execute (time_watcher &w) 173 void execute (time_watcher &w)
145 { 174 {
175 if (interval)
176 start (at + interval);
177
146 invoke ("urxvt::timer", newSVtimer (this)); 178 invoke ("urxvt::timer", newSVtimer (this));
147 } 179 }
148}; 180};
149 181
150#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 182#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
160 void execute (io_watcher &w, short revents) 192 void execute (io_watcher &w, short revents)
161 { 193 {
162 invoke ("urxvt::iow", newSViow (this), revents); 194 invoke ("urxvt::iow", newSViow (this), revents);
163 } 195 }
164}; 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
165 367
166///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
167 369
168struct rxvt_perl_interp rxvt_perl; 370struct rxvt_perl_interp rxvt_perl;
169 371
208} 410}
209 411
210bool 412bool
211rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
212{ 414{
213 // INIT and DESTROY must be requested by the runtime 415 if (!perl)
214
215 if (!perl || !should_invoke [htype])
216 return false; 416 return false;
217 417
218 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
419 {
219 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;
220 443
221 dSP; 444 dSP;
222 va_list ap; 445 va_list ap;
223 446
224 va_start (ap, htype); 447 va_start (ap, htype);
242 465
243 case DT_LONG: 466 case DT_LONG:
244 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
245 break; 468 break;
246 469
470 case DT_STRING:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
472 break;
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
247 case DT_END: 488 case DT_END:
248 { 489 {
249 va_end (ap); 490 va_end (ap);
250 491
251 PUTBACK; 492 PUTBACK;
265 if (SvTRUE (ERRSV)) 506 if (SvTRUE (ERRSV))
266 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));
267 508
268 if (htype == HOOK_DESTROY) 509 if (htype == HOOK_DESTROY)
269 { 510 {
270 // TODO: clear magic
271 hv_clear ((HV *)SvRV ((SV *)term->self)); 511 clearSVptr ((SV *)term->self);
272 SvREFCNT_dec ((SV *)term->self); 512 SvREFCNT_dec ((SV *)term->self);
273 } 513 }
274 514
275 return count; 515 return count;
276 } 516 }
287 527
288PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
289 529
290BOOT: 530BOOT:
291{ 531{
292# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
293 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 533 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
294 set_hookname (LOAD); 534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
295 set_hookname (INIT); 535# include "hookinc.h"
296 set_hookname (RESET); 536# undef def
297 set_hookname (START); 537
298 set_hookname (DESTROY); 538 export_const (DEFAULT_RSTYLE);
299 set_hookname (SEL_BEGIN); 539 export_const (OVERLAY_RSTYLE);
300 set_hookname (SEL_EXTEND); 540 export_const (RS_Bold);
301 set_hookname (SEL_MAKE); 541 export_const (RS_Italic);
302 set_hookname (SEL_GRAB); 542 export_const (RS_Blink);
303 set_hookname (FOCUS_IN); 543 export_const (RS_RVid);
304 set_hookname (FOCUS_OUT); 544 export_const (RS_Uline);
305 set_hookname (VIEW_CHANGE);
306 set_hookname (SCROLL_BACK);
307 set_hookname (TTY_ACTIVITY);
308 set_hookname (REFRESH_BEGIN);
309 set_hookname (REFRESH_END);
310 545
311 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
312} 547}
313 548
314void 549void
329NV 564NV
330NOW () 565NOW ()
331 CODE: 566 CODE:
332 RETVAL = NOW; 567 RETVAL = NOW;
333 OUTPUT: 568 OUTPUT:
569 RETVAL
570
571int
572GET_BASEFG (int rend)
573 CODE:
574 RETVAL = GET_BASEFG (rend);
575 OUTPUT:
576 RETVAL
577
578int
579GET_BASEBG (int rend)
580 CODE:
581 RETVAL = GET_BASEBG (rend);
582 OUTPUT:
583 RETVAL
584
585int
586SET_FGCOLOR (int rend, int new_color)
587 CODE:
588 RETVAL = SET_FGCOLOR (rend, new_color);
589 OUTPUT:
590 RETVAL
591
592int
593SET_BGCOLOR (int rend, int new_color)
594 CODE:
595 RETVAL = SET_BGCOLOR (rend, new_color);
596 OUTPUT:
597 RETVAL
598
599int
600GET_CUSTOM (int rend)
601 CODE:
602 RETVAL = (rend && RS_customMask) >> RS_customShift;
603 OUTPUT:
604 RETVAL
605
606int
607SET_CUSTOM (int rend, int new_value)
608 CODE:
609{
610 if (!IN_RANGE_EXC (new_value, 0, RS_customCount))
611 croak ("custom value out of range, must be 0..%d", RS_customCount - 1);
612
613 RETVAL = (rend & ~RS_customMask)
614 | ((new_value << RS_customShift) & RS_customMask);
615}
616 OUTPUT:
334 RETVAL 617 RETVAL
335 618
336MODULE = urxvt PACKAGE = urxvt::term 619MODULE = urxvt PACKAGE = urxvt::term
337 620
338int 621int
377 660
378 rxvt_push_locale (THIS->locale); 661 rxvt_push_locale (THIS->locale);
379 wchar_t *wstr = rxvt_mbstowcs (data, len); 662 wchar_t *wstr = rxvt_mbstowcs (data, len);
380 rxvt_pop_locale (); 663 rxvt_pop_locale ();
381 664
382 char *str = rxvt_wcstoutf8 (wstr); 665 RETVAL = wcs2sv (wstr);
383 free (wstr); 666 free (wstr);
384
385 RETVAL = newSVpv (str, 0);
386 SvUTF8_on (RETVAL);
387 free (str);
388} 667}
389 OUTPUT: 668 OUTPUT:
390 RETVAL 669 RETVAL
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
687int
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
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{
711 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle;
713}
714 OUTPUT:
715 RETVAL
716
717int
718rxvt_term::view_start (int newval = -1)
719 CODE:
720{
721 RETVAL = THIS->view_start;
722
723 if (newval >= 0)
724 {
725 THIS->view_start = min (newval, THIS->nsaved);
726 THIS->scr_changeview (RETVAL);
727 }
728}
729 OUTPUT:
730 RETVAL
731
732void
733rxvt_term::want_refresh ()
734 CODE:
735 THIS->want_refresh = 1;
736
737void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
739 PPCODE:
740{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY;
743
744 line_t &l = ROW(row_number);
745
746 if (GIMME_V != G_VOID)
747 {
748 wchar_t *wstr = new wchar_t [THIS->ncol];
749
750 for (int col = 0; col <THIS->ncol; col++)
751 wstr [col] = l.t [col];
752
753 XPUSHs (sv_2mortal (wcs2sv (wstr)));
754
755 delete [] wstr;
756 }
757
758 if (new_text)
759 {
760 wchar_t *wstr = sv2wcs (new_text);
761
762 int len = wcslen (wstr);
763
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 {
766 free (wstr);
767 croak ("new_text extends beyond horizontal margins");
768 }
769
770 for (int col = start_col; col < start_col + len; col++)
771 {
772 l.t [col] = wstr [col - start_col];
773 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 }
775
776 free (wstr);
777 }
778}
779
780void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
782 PPCODE:
783{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY;
786
787 line_t &l = ROW(row_number);
788
789 if (GIMME_V != G_VOID)
790 {
791 AV *av = newAV ();
792
793 av_extend (av, THIS->ncol - 1);
794 for (int col = 0; col < THIS->ncol; col++)
795 av_store (av, col, newSViv (l.r [col]));
796
797 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
798 }
799
800 if (new_rend)
801 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref");
804
805 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1;
807
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins");
810
811 for (int col = start_col; col < start_col + len; col++)
812 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;
814
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 }
817 }
818}
819
820int
821rxvt_term::ROW_l (int row_number, int new_length = -2)
822 CODE:
823{
824 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
825 XSRETURN_EMPTY;
826
827 line_t &l = ROW(row_number);
828 RETVAL = l.l < 0 ? THIS->ncol : l.l;
829
830 if (new_length >= -1)
831 l.l = new_length;
832}
833 OUTPUT:
834 RETVAL
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
849SV *
850rxvt_term::special_encode (SV *str)
851 CODE:
852 abort ();//TODO
853
854SV *
855rxvt_term::special_decode (SV *str)
856 CODE:
857 abort ();//TODO
391 858
392void 859void
393rxvt_term::_resource (char *name, int index, SV *newval = 0) 860rxvt_term::_resource (char *name, int index, SV *newval = 0)
394 PPCODE: 861 PPCODE:
395{ 862{
396 struct resval { const char *name; int value; } rslist [] = { 863 struct resval { const char *name; int value; } rslist [] = {
397# define Rs_def(name) { # name, Rs_ ## name }, 864# define def(name) { # name, Rs_ ## name },
398# define Rs_reserve(name,count) 865# define reserve(name,count)
399# include "rsinc.h" 866# include "rsinc.h"
400# undef Rs_def 867# undef def
401# undef Rs_reserve 868# undef reserve
402 }; 869 };
403 870
404 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 871 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
405 872
406 do { 873 do {
428 THIS->rs [index] = 0; 895 THIS->rs [index] = 0;
429 } 896 }
430} 897}
431 898
432void 899void
433rxvt_term::selection_mark (...) 900rxvt_term::cur (...)
434 PROTOTYPE: $;$$ 901 PROTOTYPE: $;$$
435 ALIAS: 902 ALIAS:
903 screen_cur = 0
436 selection_beg = 1 904 selection_beg = 1
437 selection_end = 2 905 selection_end = 2
906 selection_mark = 3
438 PPCODE: 907 PPCODE:
439{ 908{
440 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
441 : ix == 2 ? THIS->selection.end 911 : ix == 2 ? THIS->selection.end
442 : THIS->selection.mark; 912 : THIS->selection.mark;
443 913
444 if (GIMME_V != G_VOID) 914 if (GIMME_V != G_VOID)
445 { 915 {
446 EXTEND (SP, 2); 916 EXTEND (SP, 2);
447 PUSHs (sv_2mortal (newSViv (sel.row))); 917 PUSHs (sv_2mortal (newSViv (rc.row)));
448 PUSHs (sv_2mortal (newSViv (sel.col))); 918 PUSHs (sv_2mortal (newSViv (rc.col)));
449 } 919 }
450 920
451 if (items == 3) 921 if (items == 3)
452 { 922 {
453 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 923 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
454 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 924 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
455 925
456 if (ix) 926 if (ix)
457 THIS->want_refresh = 1; 927 THIS->want_refresh = 1;
458 } 928 }
459} 929}
460 930
461int 931int
462rxvt_term::selection_grab (int eventtime) 932rxvt_term::selection_grab (int eventtime = CurrentTime)
463 933
464void 934void
465rxvt_term::selection (SV *newtext = 0) 935rxvt_term::selection (SV *newtext = 0)
466 PPCODE: 936 PPCODE:
467{ 937{
468 if (GIMME_V != G_VOID) 938 if (GIMME_V != G_VOID)
469 { 939 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
470 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
471 SV *sv = newSVpv (sel, 0);
472 SvUTF8_on (sv);
473 free (sel);
474 XPUSHs (sv_2mortal (sv));
475 }
476 940
477 if (newtext) 941 if (newtext)
478 { 942 {
479 free (THIS->selection.text); 943 free (THIS->selection.text);
480 944
481 THIS->selection.text = sv2wcs (newtext); 945 THIS->selection.text = sv2wcs (newtext);
482 THIS->selection.len = wcslen (THIS->selection.text); 946 THIS->selection.len = wcslen (THIS->selection.text);
483 } 947 }
484} 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--; )
485 960 {
486void 961 ustr [i] = wstr [i];
487rxvt_term::scr_overlay_new (int x, int y, int w, int h) 962 nlines += ustr [i] == '\012';
963 }
488 964
489void 965 THIS->scr_add_lines (ustr, nlines, wlen);
490rxvt_term::scr_overlay_off ()
491 966
492void
493rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE)
494 CODE:
495 THIS->scr_overlay_set (x, y, text, rend);
496
497void
498rxvt_term::scr_overlay_set (int x, int y, SV *text)
499 CODE:
500{
501 wchar_t *wtext = sv2wcs (text);
502 THIS->scr_overlay_set (x, y, wtext);
503 free (wtext); 967 free (wstr);
968 delete [] ustr;
504} 969}
505 970
506void 971void
507rxvt_term::tt_write (SV *octets) 972rxvt_term::tt_write (SV *octets)
508 INIT: 973 INIT:
509 STRLEN len; 974 STRLEN len;
510 char *str = SvPVbyte (octets, len); 975 char *str = SvPVbyte (octets, len);
511 C_ARGS: 976 C_ARGS:
512 (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 ()
513 1003
514MODULE = urxvt PACKAGE = urxvt::timer 1004MODULE = urxvt PACKAGE = urxvt::timer
515 1005
516SV * 1006SV *
517timer::new () 1007timer::new ()
518 CODE: 1008 CODE:
519 timer *w = new timer; 1009 timer *w = new timer;
1010 w->start (NOW);
520 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1011 RETVAL = newSVptr ((void *)w, "urxvt::timer");
521 w->self = (HV *)SvRV (RETVAL); 1012 w->self = (HV *)SvRV (RETVAL);
522 OUTPUT: 1013 OUTPUT:
523 RETVAL 1014 RETVAL
524 1015
532 1023
533NV 1024NV
534timer::at () 1025timer::at ()
535 CODE: 1026 CODE:
536 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;
537 OUTPUT: 1036 OUTPUT:
538 RETVAL 1037 RETVAL
539 1038
540timer * 1039timer *
541timer::set (NV tstamp) 1040timer::set (NV tstamp)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines