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.13 by root, Tue Jan 3 04:18:47 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
… …
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
285} 336}
286 337
287void overlay::set (int x, int y, SV *str, SV *rend) 338void overlay::set (int x, int y, SV *text, SV *rend)
288{ 339{
289 x += border; 340 x += border;
290 y += border; 341 y += border;
291 342
292 if (!IN_RANGE_EXC (y, 0, h - border)) 343 if (!IN_RANGE_EXC (y, 0, h - border))
293 return; 344 return;
294 345
295 wchar_t *wstr = sv2wcs (str); 346 wchar_t *wtext = sv2wcs (text);
296 347
297 for (int col = min (wcslen (wstr), w - x - border); col--; ) 348 for (int col = min (wcslen (wtext), w - x - border); col--; )
298 text [y][x + col] = wstr [col]; 349 this->text [y][x + col] = wtext [col];
299 350
300 free (wstr); 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 }
301 363
302 THIS->want_refresh = 1; 364 THIS->want_refresh = 1;
303} 365}
304 366
305 367
… …
350bool 412bool
351rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
352{ 414{
353 if (!perl) 415 if (!perl)
354 return false; 416 return false;
355 417
356 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
357 { 419 {
358 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 420 term->self = (void *)newSVptr ((void *)term, "urxvt::term");
359 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);
360 } 422 }
423 else if (!term->self)
424 return false; // perl not initialized for this instance
361 else if (htype == HOOK_DESTROY) 425 else if (htype == HOOK_DESTROY)
362 { 426 {
363 // handled later 427 // handled later
364 } 428 }
365 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
… …
405 469
406 case DT_STRING: 470 case DT_STRING:
407 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
408 break; 472 break;
409 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
410 case DT_END: 488 case DT_END:
411 { 489 {
412 va_end (ap); 490 va_end (ap);
413 491
414 PUTBACK; 492 PUTBACK;
… …
428 if (SvTRUE (ERRSV)) 506 if (SvTRUE (ERRSV))
429 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));
430 508
431 if (htype == HOOK_DESTROY) 509 if (htype == HOOK_DESTROY)
432 { 510 {
433 // TODO: clear magic
434 hv_clear ((HV *)SvRV ((SV *)term->self)); 511 clearSVptr ((SV *)term->self);
435 SvREFCNT_dec ((SV *)term->self); 512 SvREFCNT_dec ((SV *)term->self);
436 } 513 }
437 514
438 return count; 515 return count;
439 } 516 }
… …
450 527
451PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
452 529
453BOOT: 530BOOT:
454{ 531{
455# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
456# 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));
457 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 533 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
458 set_hookname (INIT); 534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
459 set_hookname (RESET); 535# include "hookinc.h"
460 set_hookname (START); 536# undef def
461 set_hookname (DESTROY);
462 set_hookname (SEL_BEGIN);
463 set_hookname (SEL_EXTEND);
464 set_hookname (SEL_MAKE);
465 set_hookname (SEL_GRAB);
466 set_hookname (FOCUS_IN);
467 set_hookname (FOCUS_OUT);
468 set_hookname (VIEW_CHANGE);
469 set_hookname (SCROLL_BACK);
470 set_hookname (TTY_ACTIVITY);
471 set_hookname (REFRESH_BEGIN);
472 set_hookname (REFRESH_END);
473 set_hookname (KEYBOARD_COMMAND);
474 537
475 export_const (DEFAULT_RSTYLE); 538 export_const (DEFAULT_RSTYLE);
476 export_const (OVERLAY_RSTYLE); 539 export_const (OVERLAY_RSTYLE);
477 export_const (RS_Bold); 540 export_const (RS_Bold);
478 export_const (RS_Italic); 541 export_const (RS_Italic);
… …
597 660
598 rxvt_push_locale (THIS->locale); 661 rxvt_push_locale (THIS->locale);
599 wchar_t *wstr = rxvt_mbstowcs (data, len); 662 wchar_t *wstr = rxvt_mbstowcs (data, len);
600 rxvt_pop_locale (); 663 rxvt_pop_locale ();
601 664
602 char *str = rxvt_wcstoutf8 (wstr); 665 RETVAL = wcs2sv (wstr);
603 free (wstr); 666 free (wstr);
604
605 RETVAL = newSVpv (str, 0);
606 SvUTF8_on (RETVAL);
607 free (str);
608} 667}
609 OUTPUT: 668 OUTPUT:
610 RETVAL 669 RETVAL
611 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
612int 687int
613rxvt_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
614 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{
615 RETVAL = THIS->nsaved; 711 RETVAL = THIS->rstyle;
712 THIS->rstyle = new_rstyle;
713}
616 OUTPUT: 714 OUTPUT:
617 RETVAL 715 RETVAL
618 716
619int 717int
620rxvt_term::view_start (int newval = -1) 718rxvt_term::view_start (int newval = -1)
621 CODE: 719 CODE:
622{ 720{
… …
629 } 727 }
630} 728}
631 OUTPUT: 729 OUTPUT:
632 RETVAL 730 RETVAL
633 731
634int
635rxvt_term::nrow ()
636 CODE:
637 RETVAL = THIS->nrow;
638 OUTPUT:
639 RETVAL
640
641int
642rxvt_term::ncol ()
643 CODE:
644 RETVAL = THIS->ncol;
645 OUTPUT:
646 RETVAL
647
648void 732void
649rxvt_term::want_refresh () 733rxvt_term::want_refresh ()
650 CODE: 734 CODE:
651 THIS->want_refresh = 1; 735 THIS->want_refresh = 1;
652 736
653void 737void
654rxvt_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)
655 PPCODE: 739 PPCODE:
656{ 740{
657 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
658 croak ("row_number number of out range"); 742 XSRETURN_EMPTY;
659 743
660 line_t &l = ROW(row_number); 744 line_t &l = ROW(row_number);
661 745
662 if (GIMME_V != G_VOID) 746 if (GIMME_V != G_VOID)
663 { 747 {
664 wchar_t *wstr = new wchar_t [THIS->ncol]; 748 wchar_t *wstr = new wchar_t [THIS->ncol];
665 749
666 for (int col = 0; col <THIS->ncol; col++) 750 for (int col = 0; col <THIS->ncol; col++)
667 wstr [col] = l.t [col]; 751 wstr [col] = l.t [col];
668 752
669 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
670 free (wstr);
671
672 SV *sv = newSVpv (str, 0);
673 SvUTF8_on (sv);
674 XPUSHs (sv_2mortal (sv)); 753 XPUSHs (sv_2mortal (wcs2sv (wstr)));
675 free (str); 754
755 delete [] wstr;
676 } 756 }
677 757
678 if (new_text) 758 if (new_text)
679 { 759 {
680 wchar_t *wstr = sv2wcs (new_text); 760 wchar_t *wstr = sv2wcs (new_text);
… …
700void 780void
701rxvt_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)
702 PPCODE: 782 PPCODE:
703{ 783{
704 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
705 croak ("row_number number of out range"); 785 XSRETURN_EMPTY;
706 786
707 line_t &l = ROW(row_number); 787 line_t &l = ROW(row_number);
708 788
709 if (GIMME_V != G_VOID) 789 if (GIMME_V != G_VOID)
710 { 790 {
… …
740int 820int
741rxvt_term::ROW_l (int row_number, int new_length = -2) 821rxvt_term::ROW_l (int row_number, int new_length = -2)
742 CODE: 822 CODE:
743{ 823{
744 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 824 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
745 croak ("row_number number of out range"); 825 XSRETURN_EMPTY;
746 826
747 line_t &l = ROW(row_number); 827 line_t &l = ROW(row_number);
748 RETVAL = l.l; 828 RETVAL = l.l < 0 ? THIS->ncol : l.l;
749 829
750 if (new_length >= -1) 830 if (new_length >= -1)
751 l.l = new_length; 831 l.l = new_length;
752} 832}
753 OUTPUT: 833 OUTPUT:
754 RETVAL 834 RETVAL
755 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
756SV * 849SV *
757rxvt_term::special_encode (SV *str) 850rxvt_term::special_encode (SV *str)
758 CODE: 851 CODE:
759 abort ();//TODO 852 abort ();//TODO
760 853
… …
766void 859void
767rxvt_term::_resource (char *name, int index, SV *newval = 0) 860rxvt_term::_resource (char *name, int index, SV *newval = 0)
768 PPCODE: 861 PPCODE:
769{ 862{
770 struct resval { const char *name; int value; } rslist [] = { 863 struct resval { const char *name; int value; } rslist [] = {
771# define Rs_def(name) { # name, Rs_ ## name }, 864# define def(name) { # name, Rs_ ## name },
772# define Rs_reserve(name,count) 865# define reserve(name,count)
773# include "rsinc.h" 866# include "rsinc.h"
774# undef Rs_def 867# undef def
775# undef Rs_reserve 868# undef reserve
776 }; 869 };
777 870
778 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 871 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
779 872
780 do { 873 do {
… …
802 THIS->rs [index] = 0; 895 THIS->rs [index] = 0;
803 } 896 }
804} 897}
805 898
806void 899void
807rxvt_term::selection_mark (...) 900rxvt_term::cur (...)
808 PROTOTYPE: $;$$ 901 PROTOTYPE: $;$$
809 ALIAS: 902 ALIAS:
903 screen_cur = 0
810 selection_beg = 1 904 selection_beg = 1
811 selection_end = 2 905 selection_end = 2
906 selection_mark = 3
812 PPCODE: 907 PPCODE:
813{ 908{
814 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
815 : ix == 2 ? THIS->selection.end 911 : ix == 2 ? THIS->selection.end
816 : THIS->selection.mark; 912 : THIS->selection.mark;
817 913
818 if (GIMME_V != G_VOID) 914 if (GIMME_V != G_VOID)
819 { 915 {
820 EXTEND (SP, 2); 916 EXTEND (SP, 2);
821 PUSHs (sv_2mortal (newSViv (sel.row))); 917 PUSHs (sv_2mortal (newSViv (rc.row)));
822 PUSHs (sv_2mortal (newSViv (sel.col))); 918 PUSHs (sv_2mortal (newSViv (rc.col)));
823 } 919 }
824 920
825 if (items == 3) 921 if (items == 3)
826 { 922 {
827 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 923 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
828 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 924 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
829 925
830 if (ix) 926 if (ix)
831 THIS->want_refresh = 1; 927 THIS->want_refresh = 1;
832 } 928 }
833} 929}
834 930
835int 931int
836rxvt_term::selection_grab (int eventtime) 932rxvt_term::selection_grab (int eventtime = CurrentTime)
837 933
838void 934void
839rxvt_term::selection (SV *newtext = 0) 935rxvt_term::selection (SV *newtext = 0)
840 PPCODE: 936 PPCODE:
841{ 937{
842 if (GIMME_V != G_VOID) 938 if (GIMME_V != G_VOID)
843 { 939 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
844 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
845 SV *sv = newSVpv (sel, 0);
846 SvUTF8_on (sv);
847 free (sel);
848 XPUSHs (sv_2mortal (sv));
849 }
850 940
851 if (newtext) 941 if (newtext)
852 { 942 {
853 free (THIS->selection.text); 943 free (THIS->selection.text);
854 944
855 THIS->selection.text = sv2wcs (newtext); 945 THIS->selection.text = sv2wcs (newtext);
856 THIS->selection.len = wcslen (THIS->selection.text); 946 THIS->selection.len = wcslen (THIS->selection.text);
857 } 947 }
858} 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--; )
859 960 {
961 ustr [i] = wstr [i];
962 nlines += ustr [i] == '\012';
963 }
964
965 THIS->scr_add_lines (ustr, nlines, wlen);
966
967 free (wstr);
968 delete [] ustr;
969}
970
860void 971void
861rxvt_term::tt_write (SV *octets) 972rxvt_term::tt_write (SV *octets)
862 INIT: 973 INIT:
863 STRLEN len; 974 STRLEN len;
864 char *str = SvPVbyte (octets, len); 975 char *str = SvPVbyte (octets, len);
865 C_ARGS: 976 C_ARGS:
866 (unsigned char *)str, len 977 str, len
867 978
868SV * 979SV *
869rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 980rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
870 CODE: 981 CODE:
871{ 982{
872 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 983 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
873 RETVAL = newSVptr ((void *)o, "urxvt::overlay"); 984 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
874 o->self = (HV *)SvRV (RETVAL); 985 o->self = (HV *)SvRV (RETVAL);
875
876 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
877 char key[33]; sprintf (key, "%32lx", (long)o);
878 hv_store (hv, key, 32, newSViv ((long)o), 0);
879} 986}
880 OUTPUT: 987 OUTPUT:
881 RETVAL 988 RETVAL
882 989
883MODULE = urxvt PACKAGE = urxvt::overlay 990MODULE = urxvt PACKAGE = urxvt::overlay
884 991
885void 992void
886overlay::set (int x, int y, SV *text, SV *rend = 0) 993overlay::set (int x, int y, SV *text, SV *rend = 0)
887 994
888void 995void
996overlay::show ()
997
998void
999overlay::hide ()
1000
1001void
889overlay::DESTROY () 1002overlay::DESTROY ()
890 CODE:
891{
892 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0);
893 if (ovs)
894 {
895 HV *hv = (HV *)SvRV (*ovs);
896 char key[33]; sprintf (key, "%32lx", (long)THIS);
897 hv_delete (hv, key, 32, G_DISCARD);
898 }
899
900 delete THIS;
901}
902 1003
903MODULE = urxvt PACKAGE = urxvt::timer 1004MODULE = urxvt PACKAGE = urxvt::timer
904 1005
905SV * 1006SV *
906timer::new () 1007timer::new ()

Diff Legend

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