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.16 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.28 by root, Fri Jan 6 02:58:02 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
… …
186 rend_t **rend; 208 rend_t **rend;
187 209
188 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 210 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
189 ~overlay (); 211 ~overlay ();
190 212
213 void show ();
214 void hide ();
215
191 void swap (); 216 void swap ();
192 217
193 void set (int x, int y, SV *str, SV *rend); 218 void set (int x, int y, SV *str, SV *rend);
194}; 219};
195 220
… …
202 h += 2; 227 h += 2;
203 } 228 }
204 229
205 text = new text_t *[h]; 230 text = new text_t *[h];
206 rend = new rend_t *[h]; 231 rend = new rend_t *[h];
207 232
208 for (int y = 0; y < h; y++) 233 for (int y = 0; y < h; y++)
209 { 234 {
210 text_t *tp = text[y] = new text_t[w]; 235 text_t *tp = text[y] = new text_t[w];
211 rend_t *rp = rend[y] = new rend_t[w]; 236 rend_t *rp = rend[y] = new rend_t[w];
212 237
213 text_t t0, t1, t2; 238 text_t t0, t1, t2;
214 rend_t r = rstyle; 239 rend_t r = rstyle;
215 240
216 if (border == 2) 241 if (border == 2)
217 { 242 {
218 if (y == 0) 243 if (y == 0)
219 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 244 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
220 else if (y < h - 1) 245 else if (y < h - 1)
221 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 246 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
222 else 247 else
223 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 248 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
224 249
225 *tp++ = t0; 250 *tp++ = t0;
226 *rp++ = r; 251 *rp++ = r;
227 252
228 for (int x = w - 2; x-- > 0; ) 253 for (int x = w - 2; x-- > 0; )
229 { 254 {
230 *tp++ = t1; 255 *tp++ = t1;
231 *rp++ = r; 256 *rp++ = r;
232 } 257 }
233 258
234 *tp = t2; 259 *tp = t2;
235 *rp = r; 260 *rp = r;
236 } 261 }
237 else 262 else
238 for (int x = w; x-- > 0; ) 263 for (int x = w; x-- > 0; )
239 { 264 {
240 *tp++ = 0x0020; 265 *tp++ = 0x0020;
241 *rp++ = r; 266 *rp++ = r;
242 } 267 }
243 } 268 }
244 269
270 show ();
245 THIS->want_refresh = 1; 271 THIS->want_refresh = 1;
246} 272}
247 273
248overlay::~overlay () 274overlay::~overlay ()
249{ 275{
276 hide ();
277
250 for (int y = h; y--; ) 278 for (int y = h; y--; )
251 { 279 {
252 delete [] text[y]; 280 delete [] text[y];
253 delete [] rend[y]; 281 delete [] rend[y];
254 } 282 }
… …
257 delete [] rend; 285 delete [] rend;
258 286
259 THIS->want_refresh = 1; 287 THIS->want_refresh = 1;
260} 288}
261 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
262void overlay::swap () 313void overlay::swap ()
263{ 314{
264 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 315 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
265 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 316 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
266 317
… …
269 320
270 for (int y = ov_h; y--; ) 321 for (int y = ov_h; y--; )
271 { 322 {
272 text_t *t1 = text [y]; 323 text_t *t1 = text [y];
273 rend_t *r1 = rend [y]; 324 rend_t *r1 = rend [y];
274 325
275 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 326 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
276 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 327 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
277 328
278 for (int x = ov_w; x--; ) 329 for (int x = ov_w; x--; )
279 { 330 {
280 text_t t = *t1; *t1++ = *t2; *t2++ = t; 331 text_t t = *t1; *t1++ = *t2; *t2++ = t;
281 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 332 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
282 } 333 }
283 } 334 }
284 335
… …
294 345
295 wchar_t *wtext = sv2wcs (text); 346 wchar_t *wtext = sv2wcs (text);
296 347
297 for (int col = min (wcslen (wtext), w - x - border); col--; ) 348 for (int col = min (wcslen (wtext), w - x - border); col--; )
298 this->text [y][x + col] = wtext [col]; 349 this->text [y][x + col] = wtext [col];
299 350
300 free (wtext); 351 free (wtext);
301 352
302 if (rend) 353 if (rend)
303 { 354 {
304 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 355 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
361bool 412bool
362rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
363{ 414{
364 if (!perl) 415 if (!perl)
365 return false; 416 return false;
366 417
367 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
368 { 419 {
369 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 420 term->self = (void *)newSVptr ((void *)term, "urxvt::term");
370 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
371 } 422 }
423 else if (!term->self)
424 return false; // perl not initialized for this instance
372 else if (htype == HOOK_DESTROY) 425 else if (htype == HOOK_DESTROY)
373 { 426 {
374 // handled later 427 // handled later
375 } 428 }
376 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
… …
416 469
417 case DT_STRING: 470 case DT_STRING:
418 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
419 break; 472 break;
420 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
421 case DT_END: 488 case DT_END:
422 { 489 {
423 va_end (ap); 490 va_end (ap);
424 491
425 PUTBACK; 492 PUTBACK;
… …
439 if (SvTRUE (ERRSV)) 506 if (SvTRUE (ERRSV))
440 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));
441 508
442 if (htype == HOOK_DESTROY) 509 if (htype == HOOK_DESTROY)
443 { 510 {
444 // TODO: clear magic
445 hv_clear ((HV *)SvRV ((SV *)term->self)); 511 clearSVptr ((SV *)term->self);
446 SvREFCNT_dec ((SV *)term->self); 512 SvREFCNT_dec ((SV *)term->self);
447 } 513 }
448 514
449 return count; 515 return count;
450 } 516 }
… …
461 527
462PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
463 529
464BOOT: 530BOOT:
465{ 531{
466# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
467# 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));
468 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 533 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
469 set_hookname (INIT); 534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
470 set_hookname (RESET); 535# include "hookinc.h"
471 set_hookname (START); 536# undef def
472 set_hookname (DESTROY);
473 set_hookname (SEL_BEGIN);
474 set_hookname (SEL_EXTEND);
475 set_hookname (SEL_MAKE);
476 set_hookname (SEL_GRAB);
477 set_hookname (SEL_CLICK);
478 set_hookname (FOCUS_IN);
479 set_hookname (FOCUS_OUT);
480 set_hookname (VIEW_CHANGE);
481 set_hookname (SCROLL_BACK);
482 set_hookname (TTY_ACTIVITY);
483 set_hookname (REFRESH_BEGIN);
484 set_hookname (REFRESH_END);
485 set_hookname (KEYBOARD_COMMAND);
486 set_hookname (MOUSE_CLICK);
487 set_hookname (MOUSE_MOVE);
488 537
489 export_const (DEFAULT_RSTYLE); 538 export_const (DEFAULT_RSTYLE);
490 export_const (OVERLAY_RSTYLE); 539 export_const (OVERLAY_RSTYLE);
491 export_const (RS_Bold); 540 export_const (RS_Bold);
492 export_const (RS_Italic); 541 export_const (RS_Italic);
… …
495 export_const (RS_Uline); 544 export_const (RS_Uline);
496 545
497 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
498} 547}
499 548
549SV *
550new (...)
551 CODE:
552{
553 stringvec *argv = new stringvec;
554 bool success;
555
556 for (int i = 0; i < items ;i++)
557 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
558
559 rxvt_term *term = new rxvt_term;
560
561 term->argv = argv;
562
563 try
564 {
565 if (!term->init (argv->size (), argv->begin ()))
566 term = 0;
567 }
568 catch (const class rxvt_failure_exception &e)
569 {
570 term->destroy ();
571 croak ("exception caught while initializing new terminal instance");
572 }
573
574 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
575}
576 OUTPUT:
577 RETVAL
578
500void 579void
501set_should_invoke (int htype, int value) 580set_should_invoke (int htype, int value)
502 CODE: 581 CODE:
503 rxvt_perl.should_invoke [htype] = value; 582 rxvt_perl.should_invoke [htype] = value;
504 583
… …
566} 645}
567 OUTPUT: 646 OUTPUT:
568 RETVAL 647 RETVAL
569 648
570MODULE = urxvt PACKAGE = urxvt::term 649MODULE = urxvt PACKAGE = urxvt::term
650
651void
652rxvt_term::destroy ()
571 653
572int 654int
573rxvt_term::strwidth (SV *str) 655rxvt_term::strwidth (SV *str)
574 CODE: 656 CODE:
575{ 657{
… …
611 693
612 rxvt_push_locale (THIS->locale); 694 rxvt_push_locale (THIS->locale);
613 wchar_t *wstr = rxvt_mbstowcs (data, len); 695 wchar_t *wstr = rxvt_mbstowcs (data, len);
614 rxvt_pop_locale (); 696 rxvt_pop_locale ();
615 697
616 char *str = rxvt_wcstoutf8 (wstr); 698 RETVAL = wcs2sv (wstr);
617 free (wstr); 699 free (wstr);
618
619 RETVAL = newSVpv (str, 0);
620 SvUTF8_on (RETVAL);
621 free (str);
622} 700}
623 OUTPUT: 701 OUTPUT:
624 RETVAL 702 RETVAL
625 703
704# very portable, especially on objects as opposed to pods
705#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
706
707#define TERM_OFFSET_width TERM_OFFSET(width)
708#define TERM_OFFSET_height TERM_OFFSET(height)
709#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
710#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
711#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
712#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
713#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
714#define TERM_OFFSET_focus TERM_OFFSET(focus)
715#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
716#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
717#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
718#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
719
626int 720int
627rxvt_term::nsaved () 721rxvt_term::width ()
722 ALIAS:
723 width = TERM_OFFSET_width
724 height = TERM_OFFSET_height
725 fwidth = TERM_OFFSET_fwidth
726 fheight = TERM_OFFSET_fheight
727 fbase = TERM_OFFSET_fbase
728 nrow = TERM_OFFSET_nrow
729 ncol = TERM_OFFSET_ncol
730 focus = TERM_OFFSET_focus
731 mapped = TERM_OFFSET_mapped
732 saveLines = TERM_OFFSET_saveLines
733 total_rows = TERM_OFFSET_total_rows
734 nsaved = TERM_OFFSET_nsaved
628 CODE: 735 CODE:
736 RETVAL = *(int *)((char *)THIS + ix);
737 OUTPUT:
738 RETVAL
739
740U32
741rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
742 CODE:
743{
629 RETVAL = THIS->nsaved; 744 RETVAL = THIS->rstyle;
745 THIS->rstyle = new_rstyle;
746}
630 OUTPUT: 747 OUTPUT:
631 RETVAL 748 RETVAL
632 749
633int 750int
634rxvt_term::view_start (int newval = -1) 751rxvt_term::view_start (int newval = -1)
635 CODE: 752 CODE:
636{ 753{
… …
643 } 760 }
644} 761}
645 OUTPUT: 762 OUTPUT:
646 RETVAL 763 RETVAL
647 764
648int
649rxvt_term::nrow ()
650 CODE:
651 RETVAL = THIS->nrow;
652 OUTPUT:
653 RETVAL
654
655int
656rxvt_term::ncol ()
657 CODE:
658 RETVAL = THIS->ncol;
659 OUTPUT:
660 RETVAL
661
662void 765void
663rxvt_term::want_refresh () 766rxvt_term::want_refresh ()
664 CODE: 767 CODE:
665 THIS->want_refresh = 1; 768 THIS->want_refresh = 1;
666 769
667void 770void
668rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 771rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
669 PPCODE: 772 PPCODE:
670{ 773{
671 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 774 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
672 croak ("row_number number of out range"); 775 XSRETURN_EMPTY;
673 776
674 line_t &l = ROW(row_number); 777 line_t &l = ROW(row_number);
675 778
676 if (GIMME_V != G_VOID) 779 if (GIMME_V != G_VOID)
677 { 780 {
678 wchar_t *wstr = new wchar_t [THIS->ncol]; 781 wchar_t *wstr = new wchar_t [THIS->ncol];
679 782
680 for (int col = 0; col <THIS->ncol; col++) 783 for (int col = 0; col <THIS->ncol; col++)
681 wstr [col] = l.t [col]; 784 wstr [col] = l.t [col];
682 785
683 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
684 free (wstr);
685
686 SV *sv = newSVpv (str, 0);
687 SvUTF8_on (sv);
688 XPUSHs (sv_2mortal (sv)); 786 XPUSHs (sv_2mortal (wcs2sv (wstr)));
689 free (str); 787
788 delete [] wstr;
690 } 789 }
691 790
692 if (new_text) 791 if (new_text)
693 { 792 {
694 wchar_t *wstr = sv2wcs (new_text); 793 wchar_t *wstr = sv2wcs (new_text);
695 794
696 int len = wcslen (wstr); 795 int len = min (wcslen (wstr) - start_ofs, max_len);
697 796
698 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 797 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
699 { 798 {
700 free (wstr); 799 free (wstr);
701 croak ("new_text extends beyond horizontal margins"); 800 croak ("new_text extends beyond horizontal margins");
702 } 801 }
703 802
704 for (int col = start_col; col < start_col + len; col++) 803 for (int col = start_col; col < start_col + len; col++)
705 { 804 {
706 l.t [col] = wstr [col - start_col]; 805 l.t [col] = wstr [start_ofs + col - start_col];
707 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 806 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
708 } 807 }
709 808
710 free (wstr); 809 free (wstr);
711 } 810 }
712} 811}
713 812
714void 813void
715rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 814rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
716 PPCODE: 815 PPCODE:
717{ 816{
718 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 817 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
719 croak ("row_number number of out range"); 818 XSRETURN_EMPTY;
720 819
721 line_t &l = ROW(row_number); 820 line_t &l = ROW(row_number);
722 821
723 if (GIMME_V != G_VOID) 822 if (GIMME_V != G_VOID)
724 { 823 {
… …
735 { 834 {
736 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 835 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
737 croak ("new_rend must be arrayref"); 836 croak ("new_rend must be arrayref");
738 837
739 AV *av = (AV *)SvRV (new_rend); 838 AV *av = (AV *)SvRV (new_rend);
740 int len = av_len (av) + 1; 839 int len = min (av_len (av) + 1 - start_ofs, max_len);
741 840
742 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 841 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
743 croak ("new_rend array extends beyond horizontal margins"); 842 croak ("new_rend array extends beyond horizontal margins");
744 843
745 for (int col = start_col; col < start_col + len; col++) 844 for (int col = start_col; col < start_col + len; col++)
746 { 845 {
747 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 846 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
748 847
749 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 848 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
750 } 849 }
751 } 850 }
752} 851}
753 852
754int 853int
755rxvt_term::ROW_l (int row_number, int new_length = -2) 854rxvt_term::ROW_l (int row_number, int new_length = -1)
756 CODE: 855 CODE:
757{ 856{
758 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 857 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
759 croak ("row_number number of out range"); 858 XSRETURN_EMPTY;
760 859
761 line_t &l = ROW(row_number); 860 line_t &l = ROW(row_number);
762 RETVAL = l.l; 861 RETVAL = l.l;
763 862
764 if (new_length >= -1) 863 if (new_length >= 0)
765 l.l = new_length; 864 l.l = new_length;
865}
866 OUTPUT:
867 RETVAL
868
869bool
870rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
871 CODE:
872{
873 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
874 XSRETURN_EMPTY;
875
876 line_t &l = ROW(row_number);
877 RETVAL = l.is_longer ();
878
879 if (new_is_longer >= 0)
880 l.is_longer (new_is_longer);
766} 881}
767 OUTPUT: 882 OUTPUT:
768 RETVAL 883 RETVAL
769 884
770SV * 885SV *
… …
780void 895void
781rxvt_term::_resource (char *name, int index, SV *newval = 0) 896rxvt_term::_resource (char *name, int index, SV *newval = 0)
782 PPCODE: 897 PPCODE:
783{ 898{
784 struct resval { const char *name; int value; } rslist [] = { 899 struct resval { const char *name; int value; } rslist [] = {
785# define Rs_def(name) { # name, Rs_ ## name }, 900# define def(name) { # name, Rs_ ## name },
786# define Rs_reserve(name,count) 901# define reserve(name,count)
787# include "rsinc.h" 902# include "rsinc.h"
788# undef Rs_def 903# undef def
789# undef Rs_reserve 904# undef reserve
790 }; 905 };
791 906
792 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 907 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
793 908
794 do { 909 do {
… …
816 THIS->rs [index] = 0; 931 THIS->rs [index] = 0;
817 } 932 }
818} 933}
819 934
820void 935void
821rxvt_term::selection_mark (...) 936rxvt_term::cur (...)
822 PROTOTYPE: $;$$ 937 PROTOTYPE: $;$$
823 ALIAS: 938 ALIAS:
939 screen_cur = 0
824 selection_beg = 1 940 selection_beg = 1
825 selection_end = 2 941 selection_end = 2
942 selection_mark = 3
826 PPCODE: 943 PPCODE:
827{ 944{
828 row_col_t &sel = ix == 1 ? THIS->selection.beg 945 row_col_t &rc = ix == 0 ? THIS->screen.cur
946 : ix == 1 ? THIS->selection.beg
829 : ix == 2 ? THIS->selection.end 947 : ix == 2 ? THIS->selection.end
830 : THIS->selection.mark; 948 : THIS->selection.mark;
831 949
832 if (GIMME_V != G_VOID) 950 if (GIMME_V != G_VOID)
833 { 951 {
834 EXTEND (SP, 2); 952 EXTEND (SP, 2);
835 PUSHs (sv_2mortal (newSViv (sel.row))); 953 PUSHs (sv_2mortal (newSViv (rc.row)));
836 PUSHs (sv_2mortal (newSViv (sel.col))); 954 PUSHs (sv_2mortal (newSViv (rc.col)));
837 } 955 }
838 956
839 if (items == 3) 957 if (items == 3)
840 { 958 {
841 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 959 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
842 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 960 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
843 961
844 if (ix) 962 if (ix)
845 THIS->want_refresh = 1; 963 THIS->want_refresh = 1;
846 } 964 }
847} 965}
… …
852void 970void
853rxvt_term::selection (SV *newtext = 0) 971rxvt_term::selection (SV *newtext = 0)
854 PPCODE: 972 PPCODE:
855{ 973{
856 if (GIMME_V != G_VOID) 974 if (GIMME_V != G_VOID)
857 { 975 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
858 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
859 SV *sv = newSVpv (sel, 0);
860 SvUTF8_on (sv);
861 free (sel);
862 XPUSHs (sv_2mortal (sv));
863 }
864 976
865 if (newtext) 977 if (newtext)
866 { 978 {
867 free (THIS->selection.text); 979 free (THIS->selection.text);
868 980
869 THIS->selection.text = sv2wcs (newtext); 981 THIS->selection.text = sv2wcs (newtext);
870 THIS->selection.len = wcslen (THIS->selection.text); 982 THIS->selection.len = wcslen (THIS->selection.text);
871 } 983 }
872} 984}
985
986void
987rxvt_term::scr_add_lines (SV *string)
988 CODE:
989{
990 wchar_t *wstr = sv2wcs (string);
991 int wlen = wcslen (wstr);
992 unicode_t *ustr = new unicode_t [wlen];
993 int nlines = 0;
994
995 for (int i = wlen; i--; )
873 996 {
997 ustr [i] = wstr [i];
998 nlines += ustr [i] == '\012';
999 }
1000
1001 THIS->scr_add_lines (ustr, nlines, wlen);
1002
1003 free (wstr);
1004 delete [] ustr;
1005}
1006
874void 1007void
875rxvt_term::tt_write (SV *octets) 1008rxvt_term::tt_write (SV *octets)
876 INIT: 1009 INIT:
877 STRLEN len; 1010 STRLEN len;
878 char *str = SvPVbyte (octets, len); 1011 char *str = SvPVbyte (octets, len);
879 C_ARGS: 1012 C_ARGS:
880 (unsigned char *)str, len 1013 str, len
1014
1015void
1016rxvt_term::cmd_parse (SV *octets)
1017 CODE:
1018{
1019 STRLEN len;
1020 char *str = SvPVbyte (octets, len);
1021
1022 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1023 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1024
1025 THIS->cmdbuf_ptr = str;
1026 THIS->cmdbuf_endp = str + len;
1027
1028 THIS->cmd_parse ();
1029
1030 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1031 THIS->cmdbuf_endp = old_cmdbuf_endp;
1032}
881 1033
882SV * 1034SV *
883rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1035rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
884 CODE: 1036 CODE:
885{ 1037{
886 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1038 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
887 RETVAL = newSVptr ((void *)o, "urxvt::overlay"); 1039 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
888 o->self = (HV *)SvRV (RETVAL); 1040 o->self = (HV *)SvRV (RETVAL);
889
890 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
891 char key[33]; sprintf (key, "%32lx", (long)o);
892 hv_store (hv, key, 32, newSViv ((long)o), 0);
893} 1041}
894 OUTPUT: 1042 OUTPUT:
895 RETVAL 1043 RETVAL
896 1044
897MODULE = urxvt PACKAGE = urxvt::overlay 1045MODULE = urxvt PACKAGE = urxvt::overlay
898 1046
899void 1047void
900overlay::set (int x, int y, SV *text, SV *rend = 0) 1048overlay::set (int x, int y, SV *text, SV *rend = 0)
901 1049
902void 1050void
1051overlay::show ()
1052
1053void
1054overlay::hide ()
1055
1056void
903overlay::DESTROY () 1057overlay::DESTROY ()
904 CODE:
905{
906 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0);
907 if (ovs)
908 {
909 HV *hv = (HV *)SvRV (*ovs);
910 char key[33]; sprintf (key, "%32lx", (long)THIS);
911 hv_delete (hv, key, 32, G_DISCARD);
912 }
913
914 delete THIS;
915}
916 1058
917MODULE = urxvt PACKAGE = urxvt::timer 1059MODULE = urxvt PACKAGE = urxvt::timer
918 1060
919SV * 1061SV *
920timer::new () 1062timer::new ()

Diff Legend

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