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.31 by root, Fri Jan 6 05:37:59 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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_STRING_LEN:
475 {
476 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int);
478
479 XPUSHs (sv_2mortal (newSVpvn (str, len)));
480 }
481 break;
482
483 case DT_XEVENT:
484 {
485 XEvent *xe = va_arg (ap, XEvent *);
486 HV *hv = newHV ();
487
488# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
489# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
490# undef set
491
492 setiv (type, xe->type);
493 setiv (send_event, xe->xany.send_event);
494 setiv (serial, xe->xany.serial);
495
496 switch (xe->type)
497 {
498 case KeyPress:
499 case KeyRelease:
500 case ButtonPress:
501 case ButtonRelease:
502 case MotionNotify:
503 setiv (time, xe->xmotion.time);
504 setiv (x, xe->xmotion.x);
505 setiv (y, xe->xmotion.y);
506 setiv (row, xe->xmotion.y / term->fheight);
507 setiv (col, xe->xmotion.x / term->fwidth);
508 setiv (x_root, xe->xmotion.x_root);
509 setiv (y_root, xe->xmotion.y_root);
510 setiv (state, xe->xmotion.state);
511 break;
512 }
513
514 switch (xe->type)
515 {
516 case KeyPress:
517 case KeyRelease:
518 setiv (keycode, xe->xkey.keycode);
519 break;
520
521 case ButtonPress:
522 case ButtonRelease:
523 setiv (button, xe->xbutton.button);
524 break;
525
526 case MotionNotify:
527 setiv (is_hint, xe->xmotion.is_hint);
528 break;
529 }
530
531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
532 }
533 break;
534
535 case DT_USTRING_LEN:
536 {
537 unicode_t *ustr = va_arg (ap, unicode_t *);
538 int ulen = va_arg (ap, int);
539 wchar_t *wstr = new wchar_t [ulen];
540
541 for (int i = ulen; i--; )
542 wstr [i] = ustr [i];
543
544 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
545
546 delete [] wstr;
547 }
548
410 case DT_END: 549 case DT_END:
411 { 550 {
412 va_end (ap); 551 va_end (ap);
413 552
414 PUTBACK; 553 PUTBACK;
… …
428 if (SvTRUE (ERRSV)) 567 if (SvTRUE (ERRSV))
429 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 568 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
430 569
431 if (htype == HOOK_DESTROY) 570 if (htype == HOOK_DESTROY)
432 { 571 {
433 // TODO: clear magic
434 hv_clear ((HV *)SvRV ((SV *)term->self)); 572 clearSVptr ((SV *)term->self);
435 SvREFCNT_dec ((SV *)term->self); 573 SvREFCNT_dec ((SV *)term->self);
436 } 574 }
437 575
438 return count; 576 return count;
439 } 577 }
… …
450 588
451PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
452 590
453BOOT: 591BOOT:
454{ 592{
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)); 593# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
457 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 594 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
458 set_hookname (INIT); 595# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
459 set_hookname (RESET); 596# include "hookinc.h"
460 set_hookname (START); 597# 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 598
475 export_const (DEFAULT_RSTYLE); 599 export_const (DEFAULT_RSTYLE);
476 export_const (OVERLAY_RSTYLE); 600 export_const (OVERLAY_RSTYLE);
477 export_const (RS_Bold); 601 export_const (RS_Bold);
478 export_const (RS_Italic); 602 export_const (RS_Italic);
… …
481 export_const (RS_Uline); 605 export_const (RS_Uline);
482 606
483 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 607 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
484} 608}
485 609
610SV *
611new (...)
612 CODE:
613{
614 stringvec *argv = new stringvec;
615 bool success;
616
617 for (int i = 0; i < items ;i++)
618 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
619
620 rxvt_term *term = new rxvt_term;
621
622 term->argv = argv;
623
624 try
625 {
626 if (!term->init (argv->size (), argv->begin ()))
627 term = 0;
628 }
629 catch (const class rxvt_failure_exception &e)
630 {
631 term->destroy ();
632 croak ("exception caught while initializing new terminal instance");
633 }
634
635 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
636}
637 OUTPUT:
638 RETVAL
639
486void 640void
487set_should_invoke (int htype, int value) 641set_should_invoke (int htype, int value)
488 CODE: 642 CODE:
489 rxvt_perl.should_invoke [htype] = value; 643 rxvt_perl.should_invoke [htype] = value;
490 644
… …
552} 706}
553 OUTPUT: 707 OUTPUT:
554 RETVAL 708 RETVAL
555 709
556MODULE = urxvt PACKAGE = urxvt::term 710MODULE = urxvt PACKAGE = urxvt::term
711
712void
713rxvt_term::destroy ()
557 714
558int 715int
559rxvt_term::strwidth (SV *str) 716rxvt_term::strwidth (SV *str)
560 CODE: 717 CODE:
561{ 718{
… …
597 754
598 rxvt_push_locale (THIS->locale); 755 rxvt_push_locale (THIS->locale);
599 wchar_t *wstr = rxvt_mbstowcs (data, len); 756 wchar_t *wstr = rxvt_mbstowcs (data, len);
600 rxvt_pop_locale (); 757 rxvt_pop_locale ();
601 758
602 char *str = rxvt_wcstoutf8 (wstr); 759 RETVAL = wcs2sv (wstr);
603 free (wstr); 760 free (wstr);
604
605 RETVAL = newSVpv (str, 0);
606 SvUTF8_on (RETVAL);
607 free (str);
608} 761}
609 OUTPUT: 762 OUTPUT:
610 RETVAL 763 RETVAL
611 764
765# very portable, especially on objects as opposed to pods
766#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
767
768#define TERM_OFFSET_width TERM_OFFSET(width)
769#define TERM_OFFSET_height TERM_OFFSET(height)
770#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
771#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
772#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
773#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
774#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
775#define TERM_OFFSET_focus TERM_OFFSET(focus)
776#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
777#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
778#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
779#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
780
612int 781int
782rxvt_term::width ()
783 ALIAS:
784 width = TERM_OFFSET_width
785 height = TERM_OFFSET_height
786 fwidth = TERM_OFFSET_fwidth
787 fheight = TERM_OFFSET_fheight
788 fbase = TERM_OFFSET_fbase
789 nrow = TERM_OFFSET_nrow
790 ncol = TERM_OFFSET_ncol
791 focus = TERM_OFFSET_focus
792 mapped = TERM_OFFSET_mapped
793 saveLines = TERM_OFFSET_saveLines
794 total_rows = TERM_OFFSET_total_rows
795 nsaved = TERM_OFFSET_nsaved
796 CODE:
797 RETVAL = *(int *)((char *)THIS + ix);
798 OUTPUT:
799 RETVAL
800
801U32
802rxvt_term::parent ()
803 CODE:
804 RETVAL = (U32)THIS->parent [0];
805 OUTPUT:
806 RETVAL
807
808U32
613rxvt_term::nsaved () 809rxvt_term::vt ()
614 CODE: 810 CODE:
811 RETVAL = (U32)THIS->vt;
812 OUTPUT:
813 RETVAL
814
815U32
816rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
817 CODE:
818{
615 RETVAL = THIS->nsaved; 819 RETVAL = THIS->rstyle;
820 THIS->rstyle = new_rstyle;
821}
616 OUTPUT: 822 OUTPUT:
617 RETVAL 823 RETVAL
618 824
619int 825int
620rxvt_term::view_start (int newval = -1) 826rxvt_term::view_start (int newval = -1)
621 CODE: 827 CODE:
622{ 828{
… …
629 } 835 }
630} 836}
631 OUTPUT: 837 OUTPUT:
632 RETVAL 838 RETVAL
633 839
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 840void
649rxvt_term::want_refresh () 841rxvt_term::want_refresh ()
650 CODE: 842 CODE:
651 THIS->want_refresh = 1; 843 THIS->want_refresh = 1;
652 844
653void 845void
654rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 846rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
655 PPCODE: 847 PPCODE:
656{ 848{
657 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 849 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
658 croak ("row_number number of out range"); 850 XSRETURN_EMPTY;
659 851
660 line_t &l = ROW(row_number); 852 line_t &l = ROW(row_number);
661 853
662 if (GIMME_V != G_VOID) 854 if (GIMME_V != G_VOID)
663 { 855 {
664 wchar_t *wstr = new wchar_t [THIS->ncol]; 856 wchar_t *wstr = new wchar_t [THIS->ncol];
665 857
666 for (int col = 0; col <THIS->ncol; col++) 858 for (int col = 0; col <THIS->ncol; col++)
667 wstr [col] = l.t [col]; 859 wstr [col] = l.t [col];
668 860
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)); 861 XPUSHs (sv_2mortal (wcs2sv (wstr)));
675 free (str); 862
863 delete [] wstr;
676 } 864 }
677 865
678 if (new_text) 866 if (new_text)
679 { 867 {
680 wchar_t *wstr = sv2wcs (new_text); 868 wchar_t *wstr = sv2wcs (new_text);
681 869
682 int len = wcslen (wstr); 870 int len = min (wcslen (wstr) - start_ofs, max_len);
683 871
684 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 872 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
685 { 873 {
686 free (wstr); 874 free (wstr);
687 croak ("new_text extends beyond horizontal margins"); 875 croak ("new_text extends beyond horizontal margins");
688 } 876 }
689 877
690 for (int col = start_col; col < start_col + len; col++) 878 for (int col = start_col; col < start_col + len; col++)
691 { 879 {
692 l.t [col] = wstr [col - start_col]; 880 l.t [col] = wstr [start_ofs + col - start_col];
693 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 881 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
694 } 882 }
695 883
696 free (wstr); 884 free (wstr);
697 } 885 }
698} 886}
699 887
700void 888void
701rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 889rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
702 PPCODE: 890 PPCODE:
703{ 891{
704 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 892 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
705 croak ("row_number number of out range"); 893 XSRETURN_EMPTY;
706 894
707 line_t &l = ROW(row_number); 895 line_t &l = ROW(row_number);
708 896
709 if (GIMME_V != G_VOID) 897 if (GIMME_V != G_VOID)
710 { 898 {
… …
721 { 909 {
722 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 910 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
723 croak ("new_rend must be arrayref"); 911 croak ("new_rend must be arrayref");
724 912
725 AV *av = (AV *)SvRV (new_rend); 913 AV *av = (AV *)SvRV (new_rend);
726 int len = av_len (av) + 1; 914 int len = min (av_len (av) + 1 - start_ofs, max_len);
727 915
728 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 916 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
729 croak ("new_rend array extends beyond horizontal margins"); 917 croak ("new_rend array extends beyond horizontal margins");
730 918
731 for (int col = start_col; col < start_col + len; col++) 919 for (int col = start_col; col < start_col + len; col++)
732 { 920 {
733 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 921 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
734 922
735 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 923 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
736 } 924 }
737 } 925 }
738} 926}
739 927
740int 928int
741rxvt_term::ROW_l (int row_number, int new_length = -2) 929rxvt_term::ROW_l (int row_number, int new_length = -1)
742 CODE: 930 CODE:
743{ 931{
744 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 932 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
745 croak ("row_number number of out range"); 933 XSRETURN_EMPTY;
746 934
747 line_t &l = ROW(row_number); 935 line_t &l = ROW(row_number);
748 RETVAL = l.l; 936 RETVAL = l.l;
749 937
750 if (new_length >= -1) 938 if (new_length >= 0)
751 l.l = new_length; 939 l.l = new_length;
940}
941 OUTPUT:
942 RETVAL
943
944bool
945rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
946 CODE:
947{
948 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
949 XSRETURN_EMPTY;
950
951 line_t &l = ROW(row_number);
952 RETVAL = l.is_longer ();
953
954 if (new_is_longer >= 0)
955 l.is_longer (new_is_longer);
752} 956}
753 OUTPUT: 957 OUTPUT:
754 RETVAL 958 RETVAL
755 959
756SV * 960SV *
… …
766void 970void
767rxvt_term::_resource (char *name, int index, SV *newval = 0) 971rxvt_term::_resource (char *name, int index, SV *newval = 0)
768 PPCODE: 972 PPCODE:
769{ 973{
770 struct resval { const char *name; int value; } rslist [] = { 974 struct resval { const char *name; int value; } rslist [] = {
771# define Rs_def(name) { # name, Rs_ ## name }, 975# define def(name) { # name, Rs_ ## name },
772# define Rs_reserve(name,count) 976# define reserve(name,count)
773# include "rsinc.h" 977# include "rsinc.h"
774# undef Rs_def 978# undef def
775# undef Rs_reserve 979# undef reserve
776 }; 980 };
777 981
778 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 982 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
779 983
780 do { 984 do {
… …
802 THIS->rs [index] = 0; 1006 THIS->rs [index] = 0;
803 } 1007 }
804} 1008}
805 1009
806void 1010void
807rxvt_term::selection_mark (...) 1011rxvt_term::cur (...)
808 PROTOTYPE: $;$$ 1012 PROTOTYPE: $;$$
809 ALIAS: 1013 ALIAS:
1014 screen_cur = 0
810 selection_beg = 1 1015 selection_beg = 1
811 selection_end = 2 1016 selection_end = 2
1017 selection_mark = 3
812 PPCODE: 1018 PPCODE:
813{ 1019{
814 row_col_t &sel = ix == 1 ? THIS->selection.beg 1020 row_col_t &rc = ix == 0 ? THIS->screen.cur
1021 : ix == 1 ? THIS->selection.beg
815 : ix == 2 ? THIS->selection.end 1022 : ix == 2 ? THIS->selection.end
816 : THIS->selection.mark; 1023 : THIS->selection.mark;
817 1024
818 if (GIMME_V != G_VOID) 1025 if (GIMME_V != G_VOID)
819 { 1026 {
820 EXTEND (SP, 2); 1027 EXTEND (SP, 2);
821 PUSHs (sv_2mortal (newSViv (sel.row))); 1028 PUSHs (sv_2mortal (newSViv (rc.row)));
822 PUSHs (sv_2mortal (newSViv (sel.col))); 1029 PUSHs (sv_2mortal (newSViv (rc.col)));
823 } 1030 }
824 1031
825 if (items == 3) 1032 if (items == 3)
826 { 1033 {
827 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1034 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
828 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1035 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
829 1036
830 if (ix) 1037 if (ix)
831 THIS->want_refresh = 1; 1038 THIS->want_refresh = 1;
832 } 1039 }
833} 1040}
834 1041
835int 1042int
836rxvt_term::selection_grab (int eventtime) 1043rxvt_term::selection_grab (int eventtime = CurrentTime)
837 1044
838void 1045void
839rxvt_term::selection (SV *newtext = 0) 1046rxvt_term::selection (SV *newtext = 0)
840 PPCODE: 1047 PPCODE:
841{ 1048{
842 if (GIMME_V != G_VOID) 1049 if (GIMME_V != G_VOID)
843 { 1050 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 1051
851 if (newtext) 1052 if (newtext)
852 { 1053 {
853 free (THIS->selection.text); 1054 free (THIS->selection.text);
854 1055
855 THIS->selection.text = sv2wcs (newtext); 1056 THIS->selection.text = sv2wcs (newtext);
856 THIS->selection.len = wcslen (THIS->selection.text); 1057 THIS->selection.len = wcslen (THIS->selection.text);
857 } 1058 }
858} 1059}
1060
1061void
1062rxvt_term::scr_add_lines (SV *string)
1063 CODE:
1064{
1065 wchar_t *wstr = sv2wcs (string);
1066 int wlen = wcslen (wstr);
1067 unicode_t *ustr = new unicode_t [wlen];
1068 int nlines = 0;
1069
1070 for (int i = wlen; i--; )
859 1071 {
1072 ustr [i] = wstr [i];
1073 nlines += ustr [i] == '\012';
1074 }
1075
1076 THIS->scr_add_lines (ustr, nlines, wlen);
1077
1078 free (wstr);
1079 delete [] ustr;
1080}
1081
860void 1082void
861rxvt_term::tt_write (SV *octets) 1083rxvt_term::tt_write (SV *octets)
862 INIT: 1084 INIT:
863 STRLEN len; 1085 STRLEN len;
864 char *str = SvPVbyte (octets, len); 1086 char *str = SvPVbyte (octets, len);
865 C_ARGS: 1087 C_ARGS:
866 (unsigned char *)str, len 1088 str, len
1089
1090void
1091rxvt_term::cmd_parse (SV *octets)
1092 CODE:
1093{
1094 STRLEN len;
1095 char *str = SvPVbyte (octets, len);
1096
1097 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1098 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1099
1100 THIS->cmdbuf_ptr = str;
1101 THIS->cmdbuf_endp = str + len;
1102
1103 THIS->cmd_parse ();
1104
1105 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1106 THIS->cmdbuf_endp = old_cmdbuf_endp;
1107}
867 1108
868SV * 1109SV *
869rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1110rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
870 CODE: 1111 CODE:
871{ 1112{
872 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1113 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
873 RETVAL = newSVptr ((void *)o, "urxvt::overlay"); 1114 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
874 o->self = (HV *)SvRV (RETVAL); 1115 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} 1116}
880 OUTPUT: 1117 OUTPUT:
881 RETVAL 1118 RETVAL
882 1119
883MODULE = urxvt PACKAGE = urxvt::overlay 1120MODULE = urxvt PACKAGE = urxvt::overlay
884 1121
885void 1122void
886overlay::set (int x, int y, SV *text, SV *rend = 0) 1123overlay::set (int x, int y, SV *text, SV *rend = 0)
887 1124
888void 1125void
1126overlay::show ()
1127
1128void
1129overlay::hide ()
1130
1131void
889overlay::DESTROY () 1132overlay::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 1133
903MODULE = urxvt PACKAGE = urxvt::timer 1134MODULE = urxvt PACKAGE = urxvt::timer
904 1135
905SV * 1136SV *
906timer::new () 1137timer::new ()

Diff Legend

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