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.66 by root, Sat Jan 14 09:28:57 2006 UTC vs.
Revision 1.69 by root, Mon Jan 16 15:00:20 2006 UTC

… …
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
… …
349 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
350 { 350 {
351 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
352 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
353 353
354 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
355 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 355 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
356 356
357 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
358 { 358 {
359 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 text_t t = *t1; *t1++ = *t2; *t2++ = t;
360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
… …
407 perl_free (perl); 407 perl_free (perl);
408 } 408 }
409} 409}
410 410
411void 411void
412rxvt_perl_interp::init () 412rxvt_perl_interp::init (rxvt_term *term)
413{ 413{
414 if (!perl) 414 if (!perl)
415 { 415 {
416 rxvt_push_locale (""); // perl init destroys current locale
417
416 perl_environ = rxvt_environ; 418 perl_environ = rxvt_environ;
417 swap (perl_environ, environ); 419 swap (perl_environ, environ);
418 420
419 char *argv[] = { 421 char *argv[] = {
420 "", 422 "",
… …
434 perl_free (perl); 436 perl_free (perl);
435 perl = 0; 437 perl = 0;
436 } 438 }
437 439
438 swap (perl_environ, environ); 440 swap (perl_environ, environ);
441
442 rxvt_pop_locale ();
439 } 443 }
444
445 // runs outside of perls ENV
446 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
447 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
440} 448}
441 449
442static void 450static void
443ungrab (rxvt_term *THIS) 451ungrab (rxvt_term *THIS)
444{ 452{
… …
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 456 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 457 THIS->perl.grabtime = 0;
450 } 458 }
451} 459}
452 460
461static void
462swap_overlays (rxvt_term *term)
463{
464 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
465
466 if (HvKEYS (hv))
467 {
468 hv_iterinit (hv);
469
470 while (HE *he = hv_iternext (hv))
471 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
472 }
473}
474
453bool 475bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 476rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 477{
456 if (!perl) 478 if (!perl || !term->perl.self)
457 return false; 479 return false;
458 480
459 if (htype == HOOK_INIT) // first hook ever called 481 // pre-handling of some events
460 { 482 if (htype == HOOK_REFRESH_END)
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 483 swap_overlays (term);
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 484
463 } 485 swap (perl_environ, environ);
464 else if (!term->perl.self) 486
465 return false; // perl not initialized for this instance 487 bool event_consumed;
466 else if (htype == HOOK_DESTROY) 488
467 { 489 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
468 // handled later 490 || term->perl.should_invoke [htype])
469 } 491 try
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 { 492 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 493 dSP;
494 va_list ap;
475 495
476 if (HvKEYS (hv)) 496 va_start (ap, htype);
497
498 ENTER;
499 SAVETMPS;
500
501 PUSHMARK (SP);
502
503 XPUSHs (sv_2mortal (newSVterm (term)));
504 XPUSHs (sv_2mortal (newSViv (htype)));
505
506 for (;;) {
507 data_type dt = (data_type)va_arg (ap, int);
508
509 switch (dt)
477 { 510 {
478 hv_iterinit (hv);
479
480 while (HE *he = hv_iternext (hv))
481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
488 }
489
490 swap (perl_environ, environ);
491
492 try
493 {
494 dSP;
495 va_list ap;
496
497 va_start (ap, htype);
498
499 ENTER;
500 SAVETMPS;
501
502 PUSHMARK (SP);
503
504 XPUSHs (sv_2mortal (newSVterm (term)));
505 XPUSHs (sv_2mortal (newSViv (htype)));
506
507 for (;;) {
508 data_type dt = (data_type)va_arg (ap, int);
509
510 switch (dt)
511 {
512 case DT_INT: 511 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break; 513 break;
515 514
516 case DT_LONG: 515 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 516 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break; 517 break;
519 518
520 case DT_STR: 519 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 520 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522 break; 521 break;
523 522
524 case DT_STR_LEN: 523 case DT_STR_LEN:
525 { 524 {
526 char *str = va_arg (ap, char *); 525 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int); 526 int len = va_arg (ap, int);
528 527
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 528 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530 } 529 }
531 break; 530 break;
532 531
533 case DT_WCS_LEN: 532 case DT_WCS_LEN:
534 { 533 {
535 wchar_t *wstr = va_arg (ap, wchar_t *); 534 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int); 535 int wlen = va_arg (ap, int);
537 536
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 537 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539 } 538 }
540 break; 539 break;
541 540
542 case DT_XEVENT: 541 case DT_XEVENT:
543 { 542 {
544 XEvent *xe = va_arg (ap, XEvent *); 543 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV (); 544 HV *hv = newHV ();
546 545
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 546# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 547# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set 548# undef set
550 549
551 setiv (type, xe->type); 550 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event); 551 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial); 552 setiv (serial, xe->xany.serial);
554 553
555 switch (xe->type) 554 switch (xe->type)
556 { 555 {
557 case KeyPress: 556 case KeyPress:
558 case KeyRelease: 557 case KeyRelease:
559 case ButtonPress: 558 case ButtonPress:
560 case ButtonRelease: 559 case ButtonRelease:
561 case MotionNotify: 560 case MotionNotify:
562 setiv (time, xe->xmotion.time); 561 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x); 562 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y); 563 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight); 564 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth); 565 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root); 566 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root); 567 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state); 568 setiv (state, xe->xmotion.state);
570 break; 569 break;
571 } 570 }
572 571
573 switch (xe->type) 572 switch (xe->type)
574 { 573 {
575 case KeyPress: 574 case KeyPress:
576 case KeyRelease: 575 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode); 576 setiv (keycode, xe->xkey.keycode);
578 break; 577 break;
579 578
580 case ButtonPress: 579 case ButtonPress:
581 case ButtonRelease: 580 case ButtonRelease:
582 setiv (button, xe->xbutton.button); 581 setiv (button, xe->xbutton.button);
583 break; 582 break;
584 583
585 case MotionNotify: 584 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint); 585 setiv (is_hint, xe->xmotion.is_hint);
587 break; 586 break;
588 } 587 }
589 588
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 589 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 } 590 }
592 break; 591 break;
593 592
594 case DT_END: 593 case DT_END:
595 { 594 goto call;
596 va_end (ap);
597 595
598 PUTBACK;
599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
600 SPAGAIN;
601
602 if (count)
603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
626 }
627
628 default: 596 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 597 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 } 598 }
599 }
600
601 call:
602 va_end (ap);
603
604 PUTBACK;
605 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
606 SPAGAIN;
607
608 if (count)
609 {
610 SV *status = POPs;
611 count = SvTRUE (status);
612 }
613
614 PUTBACK;
615 FREETMPS;
616 LEAVE;
617
618 if (SvTRUE (ERRSV))
619 {
620 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
621 ungrab (term); // better lose the grab than the session
622 }
623
624 event_consumed = !!count;
631 } 625 }
626 catch (...)
627 {
628 swap (perl_environ, environ);
629 throw;
630 }
631 else
632 event_consumed = false;
633
634 // post-handling of some events
635 if (htype == HOOK_REFRESH_BEGIN)
636 swap_overlays (term);
637 else if (htype == HOOK_DESTROY)
638 {
639 clearSVptr ((SV *)term->perl.self);
640 SvREFCNT_dec ((SV *)term->perl.self);
632 } 641 }
633 catch (...) 642
634 {
635 swap (perl_environ, environ); 643 swap (perl_environ, environ);
636 throw; 644
637 } 645 return event_consumed;
638} 646}
639 647
640///////////////////////////////////////////////////////////////////////////// 648/////////////////////////////////////////////////////////////////////////////
641 649
642MODULE = urxvt PACKAGE = urxvt 650MODULE = urxvt PACKAGE = urxvt
… …
1099#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1107#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1100#define TERM_OFFSET_focus TERM_OFFSET(focus) 1108#define TERM_OFFSET_focus TERM_OFFSET(focus)
1101#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1109#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1102#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1110#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1103#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1111#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1104#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1112#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1105 1113
1106int 1114int
1107rxvt_term::width () 1115rxvt_term::width ()
1108 ALIAS: 1116 ALIAS:
1109 width = TERM_OFFSET_width 1117 width = TERM_OFFSET_width
… …
1115 ncol = TERM_OFFSET_ncol 1123 ncol = TERM_OFFSET_ncol
1116 focus = TERM_OFFSET_focus 1124 focus = TERM_OFFSET_focus
1117 mapped = TERM_OFFSET_mapped 1125 mapped = TERM_OFFSET_mapped
1118 saveLines = TERM_OFFSET_saveLines 1126 saveLines = TERM_OFFSET_saveLines
1119 total_rows = TERM_OFFSET_total_rows 1127 total_rows = TERM_OFFSET_total_rows
1120 nsaved = TERM_OFFSET_nsaved 1128 top_row = TERM_OFFSET_top_row
1121 CODE: 1129 CODE:
1122 RETVAL = *(int *)((char *)THIS + ix); 1130 RETVAL = *(int *)((char *)THIS + ix);
1123 OUTPUT: 1131 OUTPUT:
1124 RETVAL 1132 RETVAL
1125 1133
… …
1209 THIS->rstyle = new_rstyle; 1217 THIS->rstyle = new_rstyle;
1210 OUTPUT: 1218 OUTPUT:
1211 RETVAL 1219 RETVAL
1212 1220
1213int 1221int
1214rxvt_term::view_start (int newval = -1) 1222rxvt_term::view_start (int newval = 1)
1215 PROTOTYPE: $;$ 1223 PROTOTYPE: $;$
1216 CODE: 1224 CODE:
1217{ 1225{
1218 RETVAL = THIS->view_start; 1226 RETVAL = THIS->view_start;
1219 1227
1220 if (newval >= 0) 1228 if (newval <= 0)
1221 { 1229 THIS->scr_changeview (max (newval, THIS->top_row));
1222 THIS->view_start = min (newval, THIS->nsaved);
1223 THIS->scr_changeview (RETVAL);
1224 }
1225} 1230}
1226 OUTPUT: 1231 OUTPUT:
1227 RETVAL 1232 RETVAL
1228 1233
1229void 1234void
… …
1233 1238
1234void 1239void
1235rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1240rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1236 PPCODE: 1241 PPCODE:
1237{ 1242{
1238 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1243 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1239 XSRETURN_EMPTY; 1244 XSRETURN_EMPTY;
1240 1245
1241 line_t &l = ROW(row_number); 1246 line_t &l = ROW(row_number);
1242 1247
1243 if (GIMME_V != G_VOID) 1248 if (GIMME_V != G_VOID)
… …
1276 1281
1277void 1282void
1278rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1283rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1279 PPCODE: 1284 PPCODE:
1280{ 1285{
1281 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1286 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1282 XSRETURN_EMPTY; 1287 XSRETURN_EMPTY;
1283 1288
1284 line_t &l = ROW(row_number); 1289 line_t &l = ROW(row_number);
1285 1290
1286 if (GIMME_V != G_VOID) 1291 if (GIMME_V != G_VOID)
… …
1316 1321
1317int 1322int
1318rxvt_term::ROW_l (int row_number, int new_length = -1) 1323rxvt_term::ROW_l (int row_number, int new_length = -1)
1319 CODE: 1324 CODE:
1320{ 1325{
1321 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1326 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1322 XSRETURN_EMPTY; 1327 XSRETURN_EMPTY;
1323 1328
1324 line_t &l = ROW(row_number); 1329 line_t &l = ROW(row_number);
1325 RETVAL = l.l; 1330 RETVAL = l.l;
1326 1331
… …
1332 1337
1333bool 1338bool
1334rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1339rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1335 CODE: 1340 CODE:
1336{ 1341{
1337 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1342 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1338 XSRETURN_EMPTY; 1343 XSRETURN_EMPTY;
1339 1344
1340 line_t &l = ROW(row_number); 1345 line_t &l = ROW(row_number);
1341 RETVAL = l.is_longer (); 1346 RETVAL = l.is_longer ();
1342 1347
… …
1532 PUSHs (sv_2mortal (newSViv (rc.col))); 1537 PUSHs (sv_2mortal (newSViv (rc.col)));
1533 } 1538 }
1534 1539
1535 if (items == 3) 1540 if (items == 3)
1536 { 1541 {
1537 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1542 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1538 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1543 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1539 1544
1540 if (ix) 1545 if (ix)
1541 THIS->want_refresh = 1; 1546 THIS->want_refresh = 1;
1542 } 1547 }

Diff Legend

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