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.11 by root, Tue Jan 3 02:01:27 2006 UTC vs.
Revision 1.27 by root, Fri Jan 6 01:16:58 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);
… …
363 RETVAL = GET_BASEBG (rend); 581 RETVAL = GET_BASEBG (rend);
364 OUTPUT: 582 OUTPUT:
365 RETVAL 583 RETVAL
366 584
367int 585int
368SET_FGCOLOR (int rend, int color) 586SET_FGCOLOR (int rend, int new_color)
369 CODE: 587 CODE:
370 RETVAL = SET_FGCOLOR (rend, color); 588 RETVAL = SET_FGCOLOR (rend, new_color);
371 OUTPUT: 589 OUTPUT:
372 RETVAL 590 RETVAL
373 591
374int 592int
375SET_BGCOLOR (int rend, int color) 593SET_BGCOLOR (int rend, int new_color)
376 CODE: 594 CODE:
377 RETVAL = SET_BGCOLOR (rend, color); 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}
378 OUTPUT: 616 OUTPUT:
379 RETVAL 617 RETVAL
380 618
381MODULE = urxvt PACKAGE = urxvt::term 619MODULE = urxvt PACKAGE = urxvt::term
382 620
… …
422 660
423 rxvt_push_locale (THIS->locale); 661 rxvt_push_locale (THIS->locale);
424 wchar_t *wstr = rxvt_mbstowcs (data, len); 662 wchar_t *wstr = rxvt_mbstowcs (data, len);
425 rxvt_pop_locale (); 663 rxvt_pop_locale ();
426 664
427 char *str = rxvt_wcstoutf8 (wstr); 665 RETVAL = wcs2sv (wstr);
428 free (wstr); 666 free (wstr);
429
430 RETVAL = newSVpv (str, 0);
431 SvUTF8_on (RETVAL);
432 free (str);
433} 667}
434 OUTPUT: 668 OUTPUT:
435 RETVAL 669 RETVAL
436 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
437int 687int
438rxvt_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
439 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{
440 RETVAL = THIS->nsaved; 711 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle;
713}
441 OUTPUT: 714 OUTPUT:
442 RETVAL 715 RETVAL
443 716
444int 717int
445rxvt_term::view_start (int newval = -1) 718rxvt_term::view_start (int newval = -1)
446 CODE: 719 CODE:
447{ 720{
… …
454 } 727 }
455} 728}
456 OUTPUT: 729 OUTPUT:
457 RETVAL 730 RETVAL
458 731
459int
460rxvt_term::nrow ()
461 CODE:
462 RETVAL = THIS->nrow;
463 OUTPUT:
464 RETVAL
465
466int
467rxvt_term::ncol ()
468 CODE:
469 RETVAL = THIS->ncol;
470 OUTPUT:
471 RETVAL
472
473void 732void
474rxvt_term::want_refresh () 733rxvt_term::want_refresh ()
475 CODE: 734 CODE:
476 THIS->want_refresh = 1; 735 THIS->want_refresh = 1;
477 736
478void 737void
479rxvt_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, int start_ofs = 0, int max_len = MAX_COLS)
480 PPCODE: 739 PPCODE:
481{ 740{
482 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
483 croak ("row_number number of out range"); 742 XSRETURN_EMPTY;
484 743
485 line_t &l = ROW(row_number); 744 line_t &l = ROW(row_number);
486 745
487 if (GIMME_V != G_VOID) 746 if (GIMME_V != G_VOID)
488 { 747 {
489 wchar_t *wstr = new wchar_t [THIS->ncol]; 748 wchar_t *wstr = new wchar_t [THIS->ncol];
490 749
491 for (int col = 0; col <THIS->ncol; col++) 750 for (int col = 0; col <THIS->ncol; col++)
492 wstr [col] = l.t [col]; 751 wstr [col] = l.t [col];
493 752
494 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
495 free (wstr);
496
497 SV *sv = newSVpv (str, 0);
498 SvUTF8_on (sv);
499 XPUSHs (sv_2mortal (sv)); 753 XPUSHs (sv_2mortal (wcs2sv (wstr)));
500 free (str); 754
755 delete [] wstr;
501 } 756 }
502 757
503 if (new_text) 758 if (new_text)
504 { 759 {
505 STRLEN slen;
506 char *str = SvPVutf8 (new_text, slen); 760 wchar_t *wstr = sv2wcs (new_text);
507 wchar_t *wstr = rxvt_utf8towcs (str, slen);
508 761
509 int len = wcslen (wstr); 762 int len = min (wcslen (wstr) - start_ofs, max_len);
510 763
511 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
512 { 765 {
513 free (wstr); 766 free (wstr);
514 croak ("new_text extends beyond horizontal margins"); 767 croak ("new_text extends beyond horizontal margins");
515 } 768 }
516 769
517 for (int col = start_col; col < start_col + len; col++) 770 for (int col = start_col; col < start_col + len; col++)
518 { 771 {
519 l.t [col] = wstr [col - start_col]; 772 l.t [col] = wstr [start_ofs + col - start_col];
520 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 773 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
521 } 774 }
522 775
523 free (wstr); 776 free (wstr);
524 } 777 }
525} 778}
526 779
527void 780void
528rxvt_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, int start_ofs = 0, int max_len = MAX_COLS)
529 PPCODE: 782 PPCODE:
530{ 783{
531 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
532 croak ("row_number number of out range"); 785 XSRETURN_EMPTY;
533 786
534 line_t &l = ROW(row_number); 787 line_t &l = ROW(row_number);
535 788
536 if (GIMME_V != G_VOID) 789 if (GIMME_V != G_VOID)
537 { 790 {
… …
548 { 801 {
549 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
550 croak ("new_rend must be arrayref"); 803 croak ("new_rend must be arrayref");
551 804
552 AV *av = (AV *)SvRV (new_rend); 805 AV *av = (AV *)SvRV (new_rend);
553 int len = av_len (av) + 1; 806 int len = min (av_len (av) + 1 - start_ofs, max_len);
554 807
555 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
556 croak ("new_rend array extends beyond horizontal margins"); 809 croak ("new_rend array extends beyond horizontal margins");
557 810
558 for (int col = start_col; col < start_col + len; col++) 811 for (int col = start_col; col < start_col + len; col++)
559 { 812 {
560 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 813 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
561 814
562 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
563 } 816 }
564 } 817 }
565} 818}
566 819
567int 820int
568rxvt_term::ROW_l (int row_number, int new_length = -2) 821rxvt_term::ROW_l (int row_number, int new_length = -1)
569 CODE: 822 CODE:
570{ 823{
571 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 824 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
572 croak ("row_number number of out range"); 825 XSRETURN_EMPTY;
573 826
574 line_t &l = ROW(row_number); 827 line_t &l = ROW(row_number);
575 RETVAL = l.l; 828 RETVAL = l.l;
576 829
577 if (new_length >= -1) 830 if (new_length >= 0)
578 l.l = new_length; 831 l.l = new_length;
832}
833 OUTPUT:
834 RETVAL
835
836bool
837rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
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.is_longer ();
845
846 if (new_is_longer >= 0)
847 l.is_longer (new_is_longer);
579} 848}
580 OUTPUT: 849 OUTPUT:
581 RETVAL 850 RETVAL
582 851
583SV * 852SV *
… …
593void 862void
594rxvt_term::_resource (char *name, int index, SV *newval = 0) 863rxvt_term::_resource (char *name, int index, SV *newval = 0)
595 PPCODE: 864 PPCODE:
596{ 865{
597 struct resval { const char *name; int value; } rslist [] = { 866 struct resval { const char *name; int value; } rslist [] = {
598# define Rs_def(name) { # name, Rs_ ## name }, 867# define def(name) { # name, Rs_ ## name },
599# define Rs_reserve(name,count) 868# define reserve(name,count)
600# include "rsinc.h" 869# include "rsinc.h"
601# undef Rs_def 870# undef def
602# undef Rs_reserve 871# undef reserve
603 }; 872 };
604 873
605 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 874 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
606 875
607 do { 876 do {
… …
629 THIS->rs [index] = 0; 898 THIS->rs [index] = 0;
630 } 899 }
631} 900}
632 901
633void 902void
634rxvt_term::selection_mark (...) 903rxvt_term::cur (...)
635 PROTOTYPE: $;$$ 904 PROTOTYPE: $;$$
636 ALIAS: 905 ALIAS:
906 screen_cur = 0
637 selection_beg = 1 907 selection_beg = 1
638 selection_end = 2 908 selection_end = 2
909 selection_mark = 3
639 PPCODE: 910 PPCODE:
640{ 911{
641 row_col_t &sel = ix == 1 ? THIS->selection.beg 912 row_col_t &rc = ix == 0 ? THIS->screen.cur
913 : ix == 1 ? THIS->selection.beg
642 : ix == 2 ? THIS->selection.end 914 : ix == 2 ? THIS->selection.end
643 : THIS->selection.mark; 915 : THIS->selection.mark;
644 916
645 if (GIMME_V != G_VOID) 917 if (GIMME_V != G_VOID)
646 { 918 {
647 EXTEND (SP, 2); 919 EXTEND (SP, 2);
648 PUSHs (sv_2mortal (newSViv (sel.row))); 920 PUSHs (sv_2mortal (newSViv (rc.row)));
649 PUSHs (sv_2mortal (newSViv (sel.col))); 921 PUSHs (sv_2mortal (newSViv (rc.col)));
650 } 922 }
651 923
652 if (items == 3) 924 if (items == 3)
653 { 925 {
654 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 926 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
655 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 927 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
656 928
657 if (ix) 929 if (ix)
658 THIS->want_refresh = 1; 930 THIS->want_refresh = 1;
659 } 931 }
660} 932}
661 933
662int 934int
663rxvt_term::selection_grab (int eventtime) 935rxvt_term::selection_grab (int eventtime = CurrentTime)
664 936
665void 937void
666rxvt_term::selection (SV *newtext = 0) 938rxvt_term::selection (SV *newtext = 0)
667 PPCODE: 939 PPCODE:
668{ 940{
669 if (GIMME_V != G_VOID) 941 if (GIMME_V != G_VOID)
670 { 942 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
671 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
672 SV *sv = newSVpv (sel, 0);
673 SvUTF8_on (sv);
674 free (sel);
675 XPUSHs (sv_2mortal (sv));
676 }
677 943
678 if (newtext) 944 if (newtext)
679 { 945 {
680 free (THIS->selection.text); 946 free (THIS->selection.text);
681 947
682 THIS->selection.text = sv2wcs (newtext); 948 THIS->selection.text = sv2wcs (newtext);
683 THIS->selection.len = wcslen (THIS->selection.text); 949 THIS->selection.len = wcslen (THIS->selection.text);
684 } 950 }
685} 951}
952
953void
954rxvt_term::scr_add_lines (SV *string)
955 CODE:
956{
957 wchar_t *wstr = sv2wcs (string);
958 int wlen = wcslen (wstr);
959 unicode_t *ustr = new unicode_t [wlen];
960 int nlines = 0;
961
962 for (int i = wlen; i--; )
686 963 {
687void 964 ustr [i] = wstr [i];
688rxvt_term::scr_overlay_new (int x, int y, int w, int h) 965 nlines += ustr [i] == '\012';
966 }
689 967
690void 968 THIS->scr_add_lines (ustr, nlines, wlen);
691rxvt_term::scr_overlay_off ()
692 969
693void
694rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE)
695 CODE:
696 THIS->scr_overlay_set (x, y, text, rend);
697
698void
699rxvt_term::scr_overlay_set (int x, int y, SV *text)
700 CODE:
701{
702 wchar_t *wtext = sv2wcs (text);
703 THIS->scr_overlay_set (x, y, wtext);
704 free (wtext); 970 free (wstr);
971 delete [] ustr;
705} 972}
706 973
707void 974void
708rxvt_term::tt_write (SV *octets) 975rxvt_term::tt_write (SV *octets)
709 INIT: 976 INIT:
710 STRLEN len; 977 STRLEN len;
711 char *str = SvPVbyte (octets, len); 978 char *str = SvPVbyte (octets, len);
712 C_ARGS: 979 C_ARGS:
713 (unsigned char *)str, len 980 str, len
981
982SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE:
985{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
987 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
988 o->self = (HV *)SvRV (RETVAL);
989}
990 OUTPUT:
991 RETVAL
992
993MODULE = urxvt PACKAGE = urxvt::overlay
994
995void
996overlay::set (int x, int y, SV *text, SV *rend = 0)
997
998void
999overlay::show ()
1000
1001void
1002overlay::hide ()
1003
1004void
1005overlay::DESTROY ()
714 1006
715MODULE = urxvt PACKAGE = urxvt::timer 1007MODULE = urxvt PACKAGE = urxvt::timer
716 1008
717SV * 1009SV *
718timer::new () 1010timer::new ()
719 CODE: 1011 CODE:
720 timer *w = new timer; 1012 timer *w = new timer;
1013 w->start (NOW);
721 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1014 RETVAL = newSVptr ((void *)w, "urxvt::timer");
722 w->self = (HV *)SvRV (RETVAL); 1015 w->self = (HV *)SvRV (RETVAL);
723 OUTPUT: 1016 OUTPUT:
724 RETVAL 1017 RETVAL
725 1018
… …
733 1026
734NV 1027NV
735timer::at () 1028timer::at ()
736 CODE: 1029 CODE:
737 RETVAL = THIS->at; 1030 RETVAL = THIS->at;
1031 OUTPUT:
1032 RETVAL
1033
1034timer *
1035timer::interval (NV interval)
1036 CODE:
1037 THIS->interval = interval;
1038 RETVAL = THIS;
738 OUTPUT: 1039 OUTPUT:
739 RETVAL 1040 RETVAL
740 1041
741timer * 1042timer *
742timer::set (NV tstamp) 1043timer::set (NV tstamp)

Diff Legend

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