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.21 by root, Wed Jan 4 02:37:30 2006 UTC vs.
Revision 1.37 by root, Sat Jan 7 20:23:52 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{
588 HV *stash = gv_stashpv ("urxvt", 1);
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 589# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
590
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 591 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 592# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 593# include "hookinc.h"
510# undef def 594# undef def
511 595
596
512 export_const (DEFAULT_RSTYLE); 597 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 598 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 599 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 600 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 601 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 602 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 603 export_const_iv (RS_Uline);
604 export_const_iv (CurrentTime);
519 605
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 606 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
521} 607}
608
609SV *
610new (...)
611 CODE:
612{
613 stringvec *argv = new stringvec;
614 bool success;
615
616 for (int i = 0; i < items ;i++)
617 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
618
619 rxvt_term *term = new rxvt_term;
620
621 term->argv = argv;
622
623 try
624 {
625 if (!term->init (argv->size (), argv->begin ()))
626 term = 0;
627 }
628 catch (const class rxvt_failure_exception &e)
629 {
630 term->destroy ();
631 croak ("exception caught while initializing new terminal instance");
632 }
633
634 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
635}
636 OUTPUT:
637 RETVAL
522 638
523void 639void
524set_should_invoke (int htype, int value) 640set_should_invoke (int htype, int value)
525 CODE: 641 CODE:
526 rxvt_perl.should_invoke [htype] = value; 642 rxvt_perl.should_invoke [htype] = value;
… …
589} 705}
590 OUTPUT: 706 OUTPUT:
591 RETVAL 707 RETVAL
592 708
593MODULE = urxvt PACKAGE = urxvt::term 709MODULE = urxvt PACKAGE = urxvt::term
710
711void
712rxvt_term::destroy ()
713
714void
715rxvt_term::grab_button (int button, U32 modifiers)
716 CODE:
717 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
718 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
719 GrabModeSync, GrabModeSync, None, None);
720
721bool
722rxvt_term::grab (U32 eventtime, int sync = 0)
723 CODE:
724{
725 int mode = sync ? GrabModeSync : GrabModeAsync;
726
727 THIS->perl.grabtime = 0;
728
729 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
730 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
731 mode, mode, None, None, eventtime))
732 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
733 THIS->perl.grabtime = eventtime;
734 else
735 XUngrabPointer (THIS->display->display, eventtime);
736
737 RETVAL = !!THIS->perl.grabtime;
738}
739 OUTPUT:
740 RETVAL
741
742void
743rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
744 CODE:
745 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
746
747void
748rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
749 CODE:
750 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
751
752void
753rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
754 CODE:
755 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
756 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
757
758void
759rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
760 CODE:
761 THIS->perl.grabtime = 0;
762 XUngrabKeyboard (THIS->display->display, eventtime);
763 XUngrabPointer (THIS->display->display, eventtime);
594 764
595int 765int
596rxvt_term::strwidth (SV *str) 766rxvt_term::strwidth (SV *str)
597 CODE: 767 CODE:
598{ 768{
… …
634 804
635 rxvt_push_locale (THIS->locale); 805 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 806 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 807 rxvt_pop_locale ();
638 808
639 char *str = rxvt_wcstoutf8 (wstr); 809 RETVAL = wcs2sv (wstr);
640 free (wstr); 810 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 811}
646 OUTPUT: 812 OUTPUT:
647 RETVAL 813 RETVAL
648 814
815# very portable, especially on objects as opposed to pods
816#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
817
818#define TERM_OFFSET_width TERM_OFFSET(width)
819#define TERM_OFFSET_height TERM_OFFSET(height)
820#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
821#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
822#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
823#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
824#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
825#define TERM_OFFSET_focus TERM_OFFSET(focus)
826#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
827#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
828#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
829#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
830
649int 831int
832rxvt_term::width ()
833 ALIAS:
834 width = TERM_OFFSET_width
835 height = TERM_OFFSET_height
836 fwidth = TERM_OFFSET_fwidth
837 fheight = TERM_OFFSET_fheight
838 fbase = TERM_OFFSET_fbase
839 nrow = TERM_OFFSET_nrow
840 ncol = TERM_OFFSET_ncol
841 focus = TERM_OFFSET_focus
842 mapped = TERM_OFFSET_mapped
843 saveLines = TERM_OFFSET_saveLines
844 total_rows = TERM_OFFSET_total_rows
845 nsaved = TERM_OFFSET_nsaved
846 CODE:
847 RETVAL = *(int *)((char *)THIS + ix);
848 OUTPUT:
849 RETVAL
850
851U32
852rxvt_term::parent ()
853 CODE:
854 RETVAL = (U32)THIS->parent [0];
855 OUTPUT:
856 RETVAL
857
858U32
650rxvt_term::nsaved () 859rxvt_term::vt ()
651 CODE: 860 CODE:
861 RETVAL = (U32)THIS->vt;
862 OUTPUT:
863 RETVAL
864
865U32
866rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
867 CODE:
868{
652 RETVAL = THIS->nsaved; 869 RETVAL = THIS->rstyle;
870 THIS->rstyle = new_rstyle;
871}
653 OUTPUT: 872 OUTPUT:
654 RETVAL 873 RETVAL
655 874
656int 875int
657rxvt_term::view_start (int newval = -1) 876rxvt_term::view_start (int newval = -1)
658 CODE: 877 CODE:
659{ 878{
… …
666 } 885 }
667} 886}
668 OUTPUT: 887 OUTPUT:
669 RETVAL 888 RETVAL
670 889
671int
672rxvt_term::nrow ()
673 CODE:
674 RETVAL = THIS->nrow;
675 OUTPUT:
676 RETVAL
677
678int
679rxvt_term::ncol ()
680 CODE:
681 RETVAL = THIS->ncol;
682 OUTPUT:
683 RETVAL
684
685void 890void
686rxvt_term::want_refresh () 891rxvt_term::want_refresh ()
687 CODE: 892 CODE:
688 THIS->want_refresh = 1; 893 THIS->want_refresh = 1;
689 894
690void 895void
691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 896rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
692 PPCODE: 897 PPCODE:
693{ 898{
694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 899 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
695 XSRETURN_EMPTY; 900 XSRETURN_EMPTY;
696 901
… …
698 903
699 if (GIMME_V != G_VOID) 904 if (GIMME_V != G_VOID)
700 { 905 {
701 wchar_t *wstr = new wchar_t [THIS->ncol]; 906 wchar_t *wstr = new wchar_t [THIS->ncol];
702 907
703 for (int col = 0; col <THIS->ncol; col++) 908 for (int col = 0; col < THIS->ncol; col++)
704 wstr [col] = l.t [col]; 909 wstr [col] = l.t [col];
705 910
706 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
707 free (wstr);
708
709 SV *sv = newSVpv (str, 0);
710 SvUTF8_on (sv);
711 XPUSHs (sv_2mortal (sv)); 911 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
712 free (str); 912
913 delete [] wstr;
713 } 914 }
714 915
715 if (new_text) 916 if (new_text)
716 { 917 {
717 wchar_t *wstr = sv2wcs (new_text); 918 wchar_t *wstr = sv2wcs (new_text);
718 919
719 int len = wcslen (wstr); 920 int len = min (wcslen (wstr) - start_ofs, max_len);
720 921
721 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 922 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
722 { 923 {
723 free (wstr); 924 free (wstr);
724 croak ("new_text extends beyond horizontal margins"); 925 croak ("new_text extends beyond horizontal margins");
725 } 926 }
726 927
727 for (int col = start_col; col < start_col + len; col++) 928 for (int col = start_col; col < start_col + len; col++)
728 { 929 {
729 l.t [col] = wstr [col - start_col]; 930 l.t [col] = wstr [start_ofs + col - start_col];
730 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 931 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
731 } 932 }
732 933
733 free (wstr); 934 free (wstr);
734 } 935 }
735} 936}
736 937
737void 938void
738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 939rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
739 PPCODE: 940 PPCODE:
740{ 941{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 942 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 943 XSRETURN_EMPTY;
743 944
… …
758 { 959 {
759 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 960 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
760 croak ("new_rend must be arrayref"); 961 croak ("new_rend must be arrayref");
761 962
762 AV *av = (AV *)SvRV (new_rend); 963 AV *av = (AV *)SvRV (new_rend);
763 int len = av_len (av) + 1; 964 int len = min (av_len (av) + 1 - start_ofs, max_len);
764 965
765 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 966 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
766 croak ("new_rend array extends beyond horizontal margins"); 967 croak ("new_rend array extends beyond horizontal margins");
767 968
768 for (int col = start_col; col < start_col + len; col++) 969 for (int col = start_col; col < start_col + len; col++)
769 { 970 {
770 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 971 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
771 972
772 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 973 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
773 } 974 }
774 } 975 }
775} 976}
776 977
777int 978int
778rxvt_term::ROW_l (int row_number, int new_length = -2) 979rxvt_term::ROW_l (int row_number, int new_length = -1)
779 CODE: 980 CODE:
780{ 981{
781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 982 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
782 XSRETURN_EMPTY; 983 XSRETURN_EMPTY;
783 984
784 line_t &l = ROW(row_number); 985 line_t &l = ROW(row_number);
785 RETVAL = l.l < 0 ? THIS->ncol : l.l; 986 RETVAL = l.l;
786 987
787 if (new_length >= -1) 988 if (new_length >= 0)
788 l.l = new_length; 989 l.l = new_length;
789} 990}
790 OUTPUT: 991 OUTPUT:
791 RETVAL 992 RETVAL
792 993
793bool 994bool
794rxvt_term::ROW_is_longer (int row_number) 995rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
795 CODE: 996 CODE:
796{ 997{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 998 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
798 XSRETURN_EMPTY; 999 XSRETURN_EMPTY;
799 1000
800 line_t &l = ROW(row_number); 1001 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0; 1002 RETVAL = l.is_longer ();
1003
1004 if (new_is_longer >= 0)
1005 l.is_longer (new_is_longer);
802} 1006}
803 OUTPUT: 1007 OUTPUT:
804 RETVAL 1008 RETVAL
805 1009
806SV * 1010SV *
807rxvt_term::special_encode (SV *str) 1011rxvt_term::special_encode (SV *string)
808 CODE: 1012 CODE:
809 abort ();//TODO 1013{
1014 wchar_t *wstr = sv2wcs (string);
1015 int wlen = wcslen (wstr);
1016 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1017
1018 rxvt_push_locale (THIS->locale);
1019
1020 wchar_t *r = rstr;
1021 for (wchar_t *s = wstr; *s; s++)
1022 if (wcwidth (*s) == 0)
1023 {
1024 if (r == rstr)
1025 croak ("leading combining character unencodable");
1026
1027 unicode_t n = rxvt_compose (r[-1], *s);
1028 if (n == NOCHAR)
1029 n = rxvt_composite.compose (r[-1], *s);
1030
1031 r[-1] = n;
1032 }
1033#if !UNICODE_3
1034 else if (*s >= 0x10000)
1035 *r++ = rxvt_composite.compose (*s);
1036#endif
1037 else
1038 *r++ = *s;
1039
1040 rxvt_pop_locale ();
1041
1042 RETVAL = wcs2sv (rstr, r - rstr);
1043
1044 delete [] rstr;
1045}
1046 OUTPUT:
1047 RETVAL
810 1048
811SV * 1049SV *
812rxvt_term::special_decode (SV *str) 1050rxvt_term::special_decode (SV *text)
813 CODE: 1051 CODE:
814 abort ();//TODO 1052{
1053 wchar_t *wstr = sv2wcs (text);
1054 int wlen = wcslen (wstr);
1055 int dlen = 0;
1056
1057 // find length
1058 for (wchar_t *s = wstr; *s; s++)
1059 if (*s == NOCHAR)
1060 ;
1061 else if (IS_COMPOSE (*s))
1062 dlen += rxvt_composite.expand (*s, 0);
1063 else
1064 dlen++;
1065
1066 wchar_t *rstr = new wchar_t [dlen];
1067
1068 // decode
1069 wchar_t *r = rstr;
1070 for (wchar_t *s = wstr; *s; s++)
1071 if (*s == NOCHAR)
1072 ;
1073 else if (IS_COMPOSE (*s))
1074 r += rxvt_composite.expand (*s, r);
1075 else
1076 *r++ = *s;
1077
1078 RETVAL = wcs2sv (rstr, r - rstr);
1079
1080 delete [] rstr;
1081}
1082 OUTPUT:
1083 RETVAL
815 1084
816void 1085void
817rxvt_term::_resource (char *name, int index, SV *newval = 0) 1086rxvt_term::_resource (char *name, int index, SV *newval = 0)
818 PPCODE: 1087 PPCODE:
819{ 1088{
… …
852 THIS->rs [index] = 0; 1121 THIS->rs [index] = 0;
853 } 1122 }
854} 1123}
855 1124
856void 1125void
857rxvt_term::selection_mark (...) 1126rxvt_term::cur (...)
858 PROTOTYPE: $;$$ 1127 PROTOTYPE: $;$$
859 ALIAS: 1128 ALIAS:
1129 screen_cur = 0
860 selection_beg = 1 1130 selection_beg = 1
861 selection_end = 2 1131 selection_end = 2
1132 selection_mark = 3
862 PPCODE: 1133 PPCODE:
863{ 1134{
864 row_col_t &sel = ix == 1 ? THIS->selection.beg 1135 row_col_t &rc = ix == 0 ? THIS->screen.cur
1136 : ix == 1 ? THIS->selection.beg
865 : ix == 2 ? THIS->selection.end 1137 : ix == 2 ? THIS->selection.end
866 : THIS->selection.mark; 1138 : THIS->selection.mark;
867 1139
868 if (GIMME_V != G_VOID) 1140 if (GIMME_V != G_VOID)
869 { 1141 {
870 EXTEND (SP, 2); 1142 EXTEND (SP, 2);
871 PUSHs (sv_2mortal (newSViv (sel.row))); 1143 PUSHs (sv_2mortal (newSViv (rc.row)));
872 PUSHs (sv_2mortal (newSViv (sel.col))); 1144 PUSHs (sv_2mortal (newSViv (rc.col)));
873 } 1145 }
874 1146
875 if (items == 3) 1147 if (items == 3)
876 { 1148 {
877 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1149 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
878 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1150 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
879 1151
880 if (ix) 1152 if (ix)
881 THIS->want_refresh = 1; 1153 THIS->want_refresh = 1;
882 } 1154 }
883} 1155}
884 1156
885int 1157int
886rxvt_term::selection_grab (int eventtime = CurrentTime) 1158rxvt_term::selection_grab (U32 eventtime)
887 1159
888void 1160void
889rxvt_term::selection (SV *newtext = 0) 1161rxvt_term::selection (SV *newtext = 0)
890 PPCODE: 1162 PPCODE:
891{ 1163{
892 if (GIMME_V != G_VOID) 1164 if (GIMME_V != G_VOID)
893 { 1165 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
894 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
895 SV *sv = newSVpv (sel, 0);
896 SvUTF8_on (sv);
897 free (sel);
898 XPUSHs (sv_2mortal (sv));
899 }
900 1166
901 if (newtext) 1167 if (newtext)
902 { 1168 {
903 free (THIS->selection.text); 1169 free (THIS->selection.text);
904 1170
905 THIS->selection.text = sv2wcs (newtext); 1171 THIS->selection.text = sv2wcs (newtext);
906 THIS->selection.len = wcslen (THIS->selection.text); 1172 THIS->selection.len = wcslen (THIS->selection.text);
907 } 1173 }
908} 1174}
909 1175
1176void
1177rxvt_term::scr_add_lines (SV *string)
1178 CODE:
1179{
1180 wchar_t *wstr = sv2wcs (string);
1181 THIS->scr_add_lines (wstr, wcslen (wstr));
1182 free (wstr);
1183}
1184
910void 1185void
911rxvt_term::tt_write (SV *octets) 1186rxvt_term::tt_write (SV *octets)
912 INIT: 1187 INIT:
913 STRLEN len; 1188 STRLEN len;
914 char *str = SvPVbyte (octets, len); 1189 char *str = SvPVbyte (octets, len);
915 C_ARGS: 1190 C_ARGS:
916 (unsigned char *)str, len 1191 str, len
1192
1193void
1194rxvt_term::cmd_parse (SV *octets)
1195 CODE:
1196{
1197 STRLEN len;
1198 char *str = SvPVbyte (octets, len);
1199
1200 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1201 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1202
1203 THIS->cmdbuf_ptr = str;
1204 THIS->cmdbuf_endp = str + len;
1205
1206 rxvt_push_locale (THIS->locale);
1207 THIS->cmd_parse ();
1208 rxvt_pop_locale ();
1209
1210 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1211 THIS->cmdbuf_endp = old_cmdbuf_endp;
1212}
917 1213
918SV * 1214SV *
919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1215rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
920 CODE: 1216 CODE:
921{ 1217{

Diff Legend

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