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

Diff Legend

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