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.19 by root, Tue Jan 3 20:47:36 2006 UTC vs.
Revision 1.36 by root, Sat Jan 7 19:29:17 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
… …
89 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);
90 102
91 return (long)mg->mg_ptr; 103 return (long)mg->mg_ptr;
92} 104}
93 105
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 108
97///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
98 110
99struct perl_watcher 111struct perl_watcher
… …
215 h += 2; 227 h += 2;
216 } 228 }
217 229
218 text = new text_t *[h]; 230 text = new text_t *[h];
219 rend = new rend_t *[h]; 231 rend = new rend_t *[h];
220 232
221 for (int y = 0; y < h; y++) 233 for (int y = 0; y < h; y++)
222 { 234 {
223 text_t *tp = text[y] = new text_t[w]; 235 text_t *tp = text[y] = new text_t[w];
224 rend_t *rp = rend[y] = new rend_t[w]; 236 rend_t *rp = rend[y] = new rend_t[w];
225 237
226 text_t t0, t1, t2; 238 text_t t0, t1, t2;
227 rend_t r = rstyle; 239 rend_t r = rstyle;
228 240
229 if (border == 2) 241 if (border == 2)
230 { 242 {
231 if (y == 0) 243 if (y == 0)
232 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 244 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
233 else if (y < h - 1) 245 else if (y < h - 1)
234 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 246 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
235 else 247 else
236 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 248 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
237 249
238 *tp++ = t0; 250 *tp++ = t0;
239 *rp++ = r; 251 *rp++ = r;
240 252
241 for (int x = w - 2; x-- > 0; ) 253 for (int x = w - 2; x-- > 0; )
242 { 254 {
243 *tp++ = t1; 255 *tp++ = t1;
244 *rp++ = r; 256 *rp++ = r;
245 } 257 }
246 258
247 *tp = t2; 259 *tp = t2;
248 *rp = r; 260 *rp = r;
249 } 261 }
250 else 262 else
251 for (int x = w; x-- > 0; ) 263 for (int x = w; x-- > 0; )
252 { 264 {
253 *tp++ = 0x0020; 265 *tp++ = 0x0020;
254 *rp++ = r; 266 *rp++ = r;
255 } 267 }
256 } 268 }
257 269
258 show (); 270 show ();
259 THIS->want_refresh = 1; 271 THIS->want_refresh = 1;
260} 272}
261 273
… …
278void 290void
279overlay::show () 291overlay::show ()
280{ 292{
281 char key[33]; sprintf (key, "%32lx", (long)this); 293 char key[33]; sprintf (key, "%32lx", (long)this);
282 294
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
284 hv_store (hv, key, 32, newSViv ((long)this), 0); 296 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 297}
286 298
287void 299void
288overlay::hide () 300overlay::hide ()
289{ 301{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
291 303
292 if (ovs) 304 if (ovs)
293 { 305 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 306 char key[33]; sprintf (key, "%32lx", (long)this);
295 307
… …
308 320
309 for (int y = ov_h; y--; ) 321 for (int y = ov_h; y--; )
310 { 322 {
311 text_t *t1 = text [y]; 323 text_t *t1 = text [y];
312 rend_t *r1 = rend [y]; 324 rend_t *r1 = rend [y];
313 325
314 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;
315 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;
316 328
317 for (int x = ov_w; x--; ) 329 for (int x = ov_w; x--; )
318 { 330 {
319 text_t t = *t1; *t1++ = *t2; *t2++ = t; 331 text_t t = *t1; *t1++ = *t2; *t2++ = t;
320 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));
321 } 333 }
322 } 334 }
323 335
… …
333 345
334 wchar_t *wtext = sv2wcs (text); 346 wchar_t *wtext = sv2wcs (text);
335 347
336 for (int col = min (wcslen (wtext), w - x - border); col--; ) 348 for (int col = min (wcslen (wtext), w - x - border); col--; )
337 this->text [y][x + col] = wtext [col]; 349 this->text [y][x + col] = wtext [col];
338 350
339 free (wtext); 351 free (wtext);
340 352
341 if (rend) 353 if (rend)
342 { 354 {
343 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 355 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
… …
400bool 412bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 414{
403 if (!perl) 415 if (!perl)
404 return false; 416 return false;
405 417
406 if (htype == HOOK_INIT) // first hook ever called 418 if (htype == HOOK_INIT) // first hook ever called
407 { 419 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 420 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 421 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 422 }
411 else if (!term->self) 423 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 424 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 425 else if (htype == HOOK_DESTROY)
414 { 426 {
415 // handled later 427 // handled later
416 } 428 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
418 { 430 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
420 432
421 if (HvKEYS (hv)) 433 if (HvKEYS (hv))
422 { 434 {
423 hv_iterinit (hv); 435 hv_iterinit (hv);
424 436
… …
453 465
454 case DT_LONG: 466 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 468 break;
457 469
458 case DT_STRING: 470 case DT_STR:
459 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 break;
491
492 case DT_XEVENT:
493 {
494 XEvent *xe = va_arg (ap, XEvent *);
495 HV *hv = newHV ();
496
497# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
498# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
499# undef set
500
501 setiv (type, xe->type);
502 setiv (send_event, xe->xany.send_event);
503 setiv (serial, xe->xany.serial);
504
505 switch (xe->type)
506 {
507 case KeyPress:
508 case KeyRelease:
509 case ButtonPress:
510 case ButtonRelease:
511 case MotionNotify:
512 setiv (time, xe->xmotion.time);
513 setiv (x, xe->xmotion.x);
514 setiv (y, xe->xmotion.y);
515 setiv (row, xe->xmotion.y / term->fheight);
516 setiv (col, xe->xmotion.x / term->fwidth);
517 setiv (x_root, xe->xmotion.x_root);
518 setiv (y_root, xe->xmotion.y_root);
519 setiv (state, xe->xmotion.state);
520 break;
521 }
522
523 switch (xe->type)
524 {
525 case KeyPress:
526 case KeyRelease:
527 setiv (keycode, xe->xkey.keycode);
528 break;
529
530 case ButtonPress:
531 case ButtonRelease:
532 setiv (button, xe->xbutton.button);
533 break;
534
535 case MotionNotify:
536 setiv (is_hint, xe->xmotion.is_hint);
537 break;
538 }
539
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
541 }
460 break; 542 break;
461 543
462 case DT_END: 544 case DT_END:
463 { 545 {
464 va_end (ap); 546 va_end (ap);
… …
480 if (SvTRUE (ERRSV)) 562 if (SvTRUE (ERRSV))
481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 563 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
482 564
483 if (htype == HOOK_DESTROY) 565 if (htype == HOOK_DESTROY)
484 { 566 {
485 clearSVptr ((SV *)term->self); 567 clearSVptr ((SV *)term->perl.self);
486 SvREFCNT_dec ((SV *)term->self); 568 SvREFCNT_dec ((SV *)term->perl.self);
487 } 569 }
488 570
489 return count; 571 return count;
490 } 572 }
491 573
… …
501 583
502PROTOTYPES: ENABLE 584PROTOTYPES: ENABLE
503 585
504BOOT: 586BOOT:
505{ 587{
506# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
507# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
508 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 589 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
509 set_hookname (INIT); 590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
510 set_hookname (RESET); 591# include "hookinc.h"
511 set_hookname (START); 592# undef def
512 set_hookname (DESTROY);
513 set_hookname (SEL_BEGIN);
514 set_hookname (SEL_EXTEND);
515 set_hookname (SEL_MAKE);
516 set_hookname (SEL_GRAB);
517 set_hookname (FOCUS_IN);
518 set_hookname (FOCUS_OUT);
519 set_hookname (VIEW_CHANGE);
520 set_hookname (SCROLL_BACK);
521 set_hookname (TTY_ACTIVITY);
522 set_hookname (REFRESH_BEGIN);
523 set_hookname (REFRESH_END);
524 set_hookname (KEYBOARD_COMMAND);
525 593
526 export_const (DEFAULT_RSTYLE); 594 export_const (DEFAULT_RSTYLE);
527 export_const (OVERLAY_RSTYLE); 595 export_const (OVERLAY_RSTYLE);
528 export_const (RS_Bold); 596 export_const (RS_Bold);
529 export_const (RS_Italic); 597 export_const (RS_Italic);
530 export_const (RS_Blink); 598 export_const (RS_Blink);
531 export_const (RS_RVid); 599 export_const (RS_RVid);
532 export_const (RS_Uline); 600 export_const (RS_Uline);
601 export_const (CurrentTime);
533 602
534 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 603 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR);
535} 604}
605
606SV *
607new (...)
608 CODE:
609{
610 stringvec *argv = new stringvec;
611 bool success;
612
613 for (int i = 0; i < items ;i++)
614 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
615
616 rxvt_term *term = new rxvt_term;
617
618 term->argv = argv;
619
620 try
621 {
622 if (!term->init (argv->size (), argv->begin ()))
623 term = 0;
624 }
625 catch (const class rxvt_failure_exception &e)
626 {
627 term->destroy ();
628 croak ("exception caught while initializing new terminal instance");
629 }
630
631 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
632}
633 OUTPUT:
634 RETVAL
536 635
537void 636void
538set_should_invoke (int htype, int value) 637set_should_invoke (int htype, int value)
539 CODE: 638 CODE:
540 rxvt_perl.should_invoke [htype] = value; 639 rxvt_perl.should_invoke [htype] = value;
… …
603} 702}
604 OUTPUT: 703 OUTPUT:
605 RETVAL 704 RETVAL
606 705
607MODULE = urxvt PACKAGE = urxvt::term 706MODULE = urxvt PACKAGE = urxvt::term
707
708void
709rxvt_term::destroy ()
710
711void
712rxvt_term::grab_button (int button, U32 modifiers)
713 CODE:
714 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
715 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
716 GrabModeSync, GrabModeSync, None, None);
717
718bool
719rxvt_term::grab (U32 eventtime, int sync = 0)
720 CODE:
721{
722 int mode = sync ? GrabModeSync : GrabModeAsync;
723
724 THIS->perl.grabtime = 0;
725
726 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
727 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
728 mode, mode, None, None, eventtime))
729 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
730 THIS->perl.grabtime = eventtime;
731 else
732 XUngrabPointer (THIS->display->display, eventtime);
733
734 RETVAL = !!THIS->perl.grabtime;
735}
736 OUTPUT:
737 RETVAL
738
739void
740rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
741 CODE:
742 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
743
744void
745rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
746 CODE:
747 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
748
749void
750rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
751 CODE:
752 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
753 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
754
755void
756rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
757 CODE:
758 THIS->perl.grabtime = 0;
759 XUngrabKeyboard (THIS->display->display, eventtime);
760 XUngrabPointer (THIS->display->display, eventtime);
608 761
609int 762int
610rxvt_term::strwidth (SV *str) 763rxvt_term::strwidth (SV *str)
611 CODE: 764 CODE:
612{ 765{
… …
648 801
649 rxvt_push_locale (THIS->locale); 802 rxvt_push_locale (THIS->locale);
650 wchar_t *wstr = rxvt_mbstowcs (data, len); 803 wchar_t *wstr = rxvt_mbstowcs (data, len);
651 rxvt_pop_locale (); 804 rxvt_pop_locale ();
652 805
653 char *str = rxvt_wcstoutf8 (wstr); 806 RETVAL = wcs2sv (wstr);
654 free (wstr); 807 free (wstr);
655
656 RETVAL = newSVpv (str, 0);
657 SvUTF8_on (RETVAL);
658 free (str);
659} 808}
660 OUTPUT: 809 OUTPUT:
661 RETVAL 810 RETVAL
662 811
812# very portable, especially on objects as opposed to pods
813#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
814
815#define TERM_OFFSET_width TERM_OFFSET(width)
816#define TERM_OFFSET_height TERM_OFFSET(height)
817#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
818#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
819#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
820#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
821#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
822#define TERM_OFFSET_focus TERM_OFFSET(focus)
823#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
824#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
825#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
826#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
827
663int 828int
829rxvt_term::width ()
830 ALIAS:
831 width = TERM_OFFSET_width
832 height = TERM_OFFSET_height
833 fwidth = TERM_OFFSET_fwidth
834 fheight = TERM_OFFSET_fheight
835 fbase = TERM_OFFSET_fbase
836 nrow = TERM_OFFSET_nrow
837 ncol = TERM_OFFSET_ncol
838 focus = TERM_OFFSET_focus
839 mapped = TERM_OFFSET_mapped
840 saveLines = TERM_OFFSET_saveLines
841 total_rows = TERM_OFFSET_total_rows
842 nsaved = TERM_OFFSET_nsaved
843 CODE:
844 RETVAL = *(int *)((char *)THIS + ix);
845 OUTPUT:
846 RETVAL
847
848U32
849rxvt_term::parent ()
850 CODE:
851 RETVAL = (U32)THIS->parent [0];
852 OUTPUT:
853 RETVAL
854
855U32
664rxvt_term::nsaved () 856rxvt_term::vt ()
665 CODE: 857 CODE:
858 RETVAL = (U32)THIS->vt;
859 OUTPUT:
860 RETVAL
861
862U32
863rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
864 CODE:
865{
666 RETVAL = THIS->nsaved; 866 RETVAL = THIS->rstyle;
867 THIS->rstyle = new_rstyle;
868}
667 OUTPUT: 869 OUTPUT:
668 RETVAL 870 RETVAL
669 871
670int 872int
671rxvt_term::view_start (int newval = -1) 873rxvt_term::view_start (int newval = -1)
672 CODE: 874 CODE:
673{ 875{
… …
680 } 882 }
681} 883}
682 OUTPUT: 884 OUTPUT:
683 RETVAL 885 RETVAL
684 886
685int
686rxvt_term::nrow ()
687 CODE:
688 RETVAL = THIS->nrow;
689 OUTPUT:
690 RETVAL
691
692int
693rxvt_term::ncol ()
694 CODE:
695 RETVAL = THIS->ncol;
696 OUTPUT:
697 RETVAL
698
699void 887void
700rxvt_term::want_refresh () 888rxvt_term::want_refresh ()
701 CODE: 889 CODE:
702 THIS->want_refresh = 1; 890 THIS->want_refresh = 1;
703 891
704void 892void
705rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 893rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
706 PPCODE: 894 PPCODE:
707{ 895{
708 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 896 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
709 XSRETURN_EMPTY; 897 XSRETURN_EMPTY;
710 898
… …
712 900
713 if (GIMME_V != G_VOID) 901 if (GIMME_V != G_VOID)
714 { 902 {
715 wchar_t *wstr = new wchar_t [THIS->ncol]; 903 wchar_t *wstr = new wchar_t [THIS->ncol];
716 904
717 for (int col = 0; col <THIS->ncol; col++) 905 for (int col = 0; col < THIS->ncol; col++)
718 wstr [col] = l.t [col]; 906 wstr [col] = l.t [col];
719 907
720 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
721 free (wstr);
722
723 SV *sv = newSVpv (str, 0);
724 SvUTF8_on (sv);
725 XPUSHs (sv_2mortal (sv)); 908 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
726 free (str); 909
910 delete [] wstr;
727 } 911 }
728 912
729 if (new_text) 913 if (new_text)
730 { 914 {
731 wchar_t *wstr = sv2wcs (new_text); 915 wchar_t *wstr = sv2wcs (new_text);
732 916
733 int len = wcslen (wstr); 917 int len = min (wcslen (wstr) - start_ofs, max_len);
734 918
735 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 919 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
736 { 920 {
737 free (wstr); 921 free (wstr);
738 croak ("new_text extends beyond horizontal margins"); 922 croak ("new_text extends beyond horizontal margins");
739 } 923 }
740 924
741 for (int col = start_col; col < start_col + len; col++) 925 for (int col = start_col; col < start_col + len; col++)
742 { 926 {
743 l.t [col] = wstr [col - start_col]; 927 l.t [col] = wstr [start_ofs + col - start_col];
744 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 928 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
745 } 929 }
746 930
747 free (wstr); 931 free (wstr);
748 } 932 }
749} 933}
750 934
751void 935void
752rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 936rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
753 PPCODE: 937 PPCODE:
754{ 938{
755 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 939 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
756 XSRETURN_EMPTY; 940 XSRETURN_EMPTY;
757 941
… …
772 { 956 {
773 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 957 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
774 croak ("new_rend must be arrayref"); 958 croak ("new_rend must be arrayref");
775 959
776 AV *av = (AV *)SvRV (new_rend); 960 AV *av = (AV *)SvRV (new_rend);
777 int len = av_len (av) + 1; 961 int len = min (av_len (av) + 1 - start_ofs, max_len);
778 962
779 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 963 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
780 croak ("new_rend array extends beyond horizontal margins"); 964 croak ("new_rend array extends beyond horizontal margins");
781 965
782 for (int col = start_col; col < start_col + len; col++) 966 for (int col = start_col; col < start_col + len; col++)
783 { 967 {
784 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 968 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
785 969
786 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 970 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
787 } 971 }
788 } 972 }
789} 973}
790 974
791int 975int
792rxvt_term::ROW_l (int row_number, int new_length = -2) 976rxvt_term::ROW_l (int row_number, int new_length = -1)
793 CODE: 977 CODE:
794{ 978{
795 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 979 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
796 XSRETURN_EMPTY; 980 XSRETURN_EMPTY;
797 981
798 line_t &l = ROW(row_number); 982 line_t &l = ROW(row_number);
799 RETVAL = l.l < 0 ? THIS->ncol : l.l; 983 RETVAL = l.l;
800 984
801 if (new_length >= -1) 985 if (new_length >= 0)
802 l.l = new_length; 986 l.l = new_length;
803} 987}
804 OUTPUT: 988 OUTPUT:
805 RETVAL 989 RETVAL
806 990
807bool 991bool
808rxvt_term::ROW_is_longer (int row_number) 992rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
809 CODE: 993 CODE:
810{ 994{
811 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 995 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
812 XSRETURN_EMPTY; 996 XSRETURN_EMPTY;
813 997
814 line_t &l = ROW(row_number); 998 line_t &l = ROW(row_number);
815 RETVAL = l.l < 0; 999 RETVAL = l.is_longer ();
1000
1001 if (new_is_longer >= 0)
1002 l.is_longer (new_is_longer);
816} 1003}
817 OUTPUT: 1004 OUTPUT:
818 RETVAL 1005 RETVAL
819 1006
820SV * 1007SV *
821rxvt_term::special_encode (SV *str) 1008rxvt_term::special_encode (SV *string)
822 CODE: 1009 CODE:
823 abort ();//TODO 1010{
1011 wchar_t *wstr = sv2wcs (string);
1012 int wlen = wcslen (wstr);
1013 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1014
1015 rxvt_push_locale (THIS->locale);
1016
1017 wchar_t *r = rstr;
1018 for (wchar_t *s = wstr; *s; s++)
1019 if (wcwidth (*s) == 0)
1020 {
1021 if (r == rstr)
1022 croak ("leading combining character unencodable");
1023
1024 unicode_t n = rxvt_compose (r[-1], *s);
1025 if (n == NOCHAR)
1026 n = rxvt_composite.compose (r[-1], *s);
1027
1028 r[-1] = n;
1029 }
1030#if !UNICODE_3
1031 else if (*s >= 0x10000)
1032 *r++ = rxvt_composite.compose (*s);
1033#endif
1034 else
1035 *r++ = *s;
1036
1037 rxvt_pop_locale ();
1038
1039 RETVAL = wcs2sv (rstr, r - rstr);
1040
1041 delete [] rstr;
1042}
1043 OUTPUT:
1044 RETVAL
824 1045
825SV * 1046SV *
826rxvt_term::special_decode (SV *str) 1047rxvt_term::special_decode (SV *text)
827 CODE: 1048 CODE:
828 abort ();//TODO 1049{
1050 wchar_t *wstr = sv2wcs (text);
1051 int wlen = wcslen (wstr);
1052 int dlen = 0;
1053
1054 // find length
1055 for (wchar_t *s = wstr; *s; s++)
1056 if (*s == NOCHAR)
1057 ;
1058 else if (IS_COMPOSE (*s))
1059 dlen += rxvt_composite.expand (*s, 0);
1060 else
1061 dlen++;
1062
1063 wchar_t *rstr = new wchar_t [dlen];
1064
1065 // decode
1066 wchar_t *r = rstr;
1067 for (wchar_t *s = wstr; *s; s++)
1068 if (*s == NOCHAR)
1069 ;
1070 else if (IS_COMPOSE (*s))
1071 r += rxvt_composite.expand (*s, r);
1072 else
1073 *r++ = *s;
1074
1075 RETVAL = wcs2sv (rstr, r - rstr);
1076
1077 delete [] rstr;
1078}
1079 OUTPUT:
1080 RETVAL
829 1081
830void 1082void
831rxvt_term::_resource (char *name, int index, SV *newval = 0) 1083rxvt_term::_resource (char *name, int index, SV *newval = 0)
832 PPCODE: 1084 PPCODE:
833{ 1085{
834 struct resval { const char *name; int value; } rslist [] = { 1086 struct resval { const char *name; int value; } rslist [] = {
835# define Rs_def(name) { # name, Rs_ ## name }, 1087# define def(name) { # name, Rs_ ## name },
836# define Rs_reserve(name,count) 1088# define reserve(name,count)
837# include "rsinc.h" 1089# include "rsinc.h"
838# undef Rs_def 1090# undef def
839# undef Rs_reserve 1091# undef reserve
840 }; 1092 };
841 1093
842 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1094 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
843 1095
844 do { 1096 do {
… …
866 THIS->rs [index] = 0; 1118 THIS->rs [index] = 0;
867 } 1119 }
868} 1120}
869 1121
870void 1122void
871rxvt_term::selection_mark (...) 1123rxvt_term::cur (...)
872 PROTOTYPE: $;$$ 1124 PROTOTYPE: $;$$
873 ALIAS: 1125 ALIAS:
1126 screen_cur = 0
874 selection_beg = 1 1127 selection_beg = 1
875 selection_end = 2 1128 selection_end = 2
1129 selection_mark = 3
876 PPCODE: 1130 PPCODE:
877{ 1131{
878 row_col_t &sel = ix == 1 ? THIS->selection.beg 1132 row_col_t &rc = ix == 0 ? THIS->screen.cur
1133 : ix == 1 ? THIS->selection.beg
879 : ix == 2 ? THIS->selection.end 1134 : ix == 2 ? THIS->selection.end
880 : THIS->selection.mark; 1135 : THIS->selection.mark;
881 1136
882 if (GIMME_V != G_VOID) 1137 if (GIMME_V != G_VOID)
883 { 1138 {
884 EXTEND (SP, 2); 1139 EXTEND (SP, 2);
885 PUSHs (sv_2mortal (newSViv (sel.row))); 1140 PUSHs (sv_2mortal (newSViv (rc.row)));
886 PUSHs (sv_2mortal (newSViv (sel.col))); 1141 PUSHs (sv_2mortal (newSViv (rc.col)));
887 } 1142 }
888 1143
889 if (items == 3) 1144 if (items == 3)
890 { 1145 {
891 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1146 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
892 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1147 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
893 1148
894 if (ix) 1149 if (ix)
895 THIS->want_refresh = 1; 1150 THIS->want_refresh = 1;
896 } 1151 }
897} 1152}
898 1153
899int 1154int
900rxvt_term::selection_grab (int eventtime = CurrentTime) 1155rxvt_term::selection_grab (U32 eventtime)
901 1156
902void 1157void
903rxvt_term::selection (SV *newtext = 0) 1158rxvt_term::selection (SV *newtext = 0)
904 PPCODE: 1159 PPCODE:
905{ 1160{
906 if (GIMME_V != G_VOID) 1161 if (GIMME_V != G_VOID)
907 { 1162 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
908 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
909 SV *sv = newSVpv (sel, 0);
910 SvUTF8_on (sv);
911 free (sel);
912 XPUSHs (sv_2mortal (sv));
913 }
914 1163
915 if (newtext) 1164 if (newtext)
916 { 1165 {
917 free (THIS->selection.text); 1166 free (THIS->selection.text);
918 1167
919 THIS->selection.text = sv2wcs (newtext); 1168 THIS->selection.text = sv2wcs (newtext);
920 THIS->selection.len = wcslen (THIS->selection.text); 1169 THIS->selection.len = wcslen (THIS->selection.text);
921 } 1170 }
922} 1171}
923 1172
1173void
1174rxvt_term::scr_add_lines (SV *string)
1175 CODE:
1176{
1177 wchar_t *wstr = sv2wcs (string);
1178 THIS->scr_add_lines (wstr, wcslen (wstr));
1179 free (wstr);
1180}
1181
924void 1182void
925rxvt_term::tt_write (SV *octets) 1183rxvt_term::tt_write (SV *octets)
926 INIT: 1184 INIT:
927 STRLEN len; 1185 STRLEN len;
928 char *str = SvPVbyte (octets, len); 1186 char *str = SvPVbyte (octets, len);
929 C_ARGS: 1187 C_ARGS:
930 (unsigned char *)str, len 1188 str, len
1189
1190void
1191rxvt_term::cmd_parse (SV *octets)
1192 CODE:
1193{
1194 STRLEN len;
1195 char *str = SvPVbyte (octets, len);
1196
1197 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1198 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1199
1200 THIS->cmdbuf_ptr = str;
1201 THIS->cmdbuf_endp = str + len;
1202
1203 rxvt_push_locale (THIS->locale);
1204 THIS->cmd_parse ();
1205 rxvt_pop_locale ();
1206
1207 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1208 THIS->cmdbuf_endp = old_cmdbuf_endp;
1209}
931 1210
932SV * 1211SV *
933rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1212rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
934 CODE: 1213 CODE:
935{ 1214{

Diff Legend

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