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.65 by root, Fri Jan 13 15:45:44 2006 UTC vs.
Revision 1.70 by root, Tue Jan 17 09:34:21 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
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 0 55#define ENABLE_PERL_FRILLS 1
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58 58
59static SV * 59static SV *
60taint (SV *sv) 60taint (SV *sv)
… …
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 ();
443 }
444
445 if (perl)
446 {
447 // runs outside of perls ENV
448 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
449 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
439 } 450 }
440} 451}
441 452
442static void 453static void
443ungrab (rxvt_term *THIS) 454ungrab (rxvt_term *THIS)
… …
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 459 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 460 THIS->perl.grabtime = 0;
450 } 461 }
451} 462}
452 463
464static void
465swap_overlays (rxvt_term *term)
466{
467 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
468
469 if (HvKEYS (hv))
470 {
471 hv_iterinit (hv);
472
473 while (HE *he = hv_iternext (hv))
474 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
475 }
476}
477
453bool 478bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 479rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 480{
456 if (!perl) 481 if (!perl || !term->perl.self)
457 return false; 482 return false;
458 483
459 if (htype == HOOK_INIT) // first hook ever called 484 // pre-handling of some events
460 { 485 if (htype == HOOK_REFRESH_END)
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 486 swap_overlays (term);
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 487
463 } 488 swap (perl_environ, environ);
464 else if (!term->perl.self) 489
465 return false; // perl not initialized for this instance 490 bool event_consumed;
466 else if (htype == HOOK_DESTROY) 491
467 { 492 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
468 // handled later 493 || term->perl.should_invoke [htype])
469 } 494 try
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 { 495 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 496 dSP;
497 va_list ap;
475 498
476 if (HvKEYS (hv)) 499 va_start (ap, htype);
500
501 ENTER;
502 SAVETMPS;
503
504 PUSHMARK (SP);
505
506 XPUSHs (sv_2mortal (newSVterm (term)));
507 XPUSHs (sv_2mortal (newSViv (htype)));
508
509 for (;;) {
510 data_type dt = (data_type)va_arg (ap, int);
511
512 switch (dt)
477 { 513 {
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: 514 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break; 516 break;
515 517
516 case DT_LONG: 518 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 519 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break; 520 break;
519 521
520 case DT_STR: 522 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 523 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522 break; 524 break;
523 525
524 case DT_STR_LEN: 526 case DT_STR_LEN:
525 { 527 {
526 char *str = va_arg (ap, char *); 528 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int); 529 int len = va_arg (ap, int);
528 530
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 531 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530 } 532 }
531 break; 533 break;
532 534
533 case DT_WCS_LEN: 535 case DT_WCS_LEN:
534 { 536 {
535 wchar_t *wstr = va_arg (ap, wchar_t *); 537 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int); 538 int wlen = va_arg (ap, int);
537 539
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 540 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539 } 541 }
540 break; 542 break;
541 543
542 case DT_XEVENT: 544 case DT_XEVENT:
543 { 545 {
544 XEvent *xe = va_arg (ap, XEvent *); 546 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV (); 547 HV *hv = newHV ();
546 548
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 549# 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) 550# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set 551# undef set
550 552
551 setiv (type, xe->type); 553 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event); 554 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial); 555 setiv (serial, xe->xany.serial);
554 556
555 switch (xe->type) 557 switch (xe->type)
556 { 558 {
557 case KeyPress: 559 case KeyPress:
558 case KeyRelease: 560 case KeyRelease:
559 case ButtonPress: 561 case ButtonPress:
560 case ButtonRelease: 562 case ButtonRelease:
561 case MotionNotify: 563 case MotionNotify:
562 setiv (time, xe->xmotion.time); 564 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x); 565 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y); 566 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight); 567 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth); 568 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root); 569 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root); 570 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state); 571 setiv (state, xe->xmotion.state);
570 break; 572 break;
571 } 573 }
572 574
573 switch (xe->type) 575 switch (xe->type)
574 { 576 {
575 case KeyPress: 577 case KeyPress:
576 case KeyRelease: 578 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode); 579 setiv (keycode, xe->xkey.keycode);
578 break; 580 break;
579 581
580 case ButtonPress: 582 case ButtonPress:
581 case ButtonRelease: 583 case ButtonRelease:
582 setiv (button, xe->xbutton.button); 584 setiv (button, xe->xbutton.button);
583 break; 585 break;
584 586
585 case MotionNotify: 587 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint); 588 setiv (is_hint, xe->xmotion.is_hint);
587 break; 589 break;
588 } 590 }
589 591
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 592 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 } 593 }
592 break; 594 break;
593 595
594 case DT_END: 596 case DT_END:
595 { 597 goto call;
596 va_end (ap);
597 598
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: 599 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 600 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 } 601 }
602 }
603
604 call:
605 va_end (ap);
606
607 PUTBACK;
608 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
609 SPAGAIN;
610
611 if (count)
612 {
613 SV *status = POPs;
614 count = SvTRUE (status);
615 }
616
617 PUTBACK;
618 FREETMPS;
619 LEAVE;
620
621 if (SvTRUE (ERRSV))
622 {
623 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
624 ungrab (term); // better lose the grab than the session
625 }
626
627 event_consumed = !!count;
631 } 628 }
629 catch (...)
630 {
631 swap (perl_environ, environ);
632 throw;
633 }
634 else
635 event_consumed = false;
636
637 // post-handling of some events
638 if (htype == HOOK_REFRESH_BEGIN)
639 swap_overlays (term);
640 else if (htype == HOOK_DESTROY)
641 {
642 clearSVptr ((SV *)term->perl.self);
643 SvREFCNT_dec ((SV *)term->perl.self);
632 } 644 }
633 catch (...) 645
634 {
635 swap (perl_environ, environ); 646 swap (perl_environ, environ);
636 throw; 647
637 } 648 return event_consumed;
638} 649}
639 650
640///////////////////////////////////////////////////////////////////////////// 651/////////////////////////////////////////////////////////////////////////////
641 652
642MODULE = urxvt PACKAGE = urxvt 653MODULE = urxvt PACKAGE = urxvt
… …
968 RETVAL 979 RETVAL
969 980
970void 981void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0) 982rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE: 983 CODE:
973 XReparentWindow (THIS->display->display, window, parent, x, y); 984 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
985
986void
987rxvt_term::XMapWindow (U32 window)
988 CODE:
989 XMapWindow (THIS->display->display, (Window)window);
990
991void
992rxvt_term::XUnmapWindow (U32 window)
993 CODE:
994 XUnmapWindow (THIS->display->display, (Window)window);
974 995
975#endif 996#endif
976 997
977void 998void
978rxvt_term::set_should_invoke (int htype, int inc) 999rxvt_term::set_should_invoke (int htype, int inc)
… …
1089#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1110#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090#define TERM_OFFSET_focus TERM_OFFSET(focus) 1111#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1112#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1092#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1113#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1114#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1115#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1095 1116
1096int 1117int
1097rxvt_term::width () 1118rxvt_term::width ()
1098 ALIAS: 1119 ALIAS:
1099 width = TERM_OFFSET_width 1120 width = TERM_OFFSET_width
… …
1105 ncol = TERM_OFFSET_ncol 1126 ncol = TERM_OFFSET_ncol
1106 focus = TERM_OFFSET_focus 1127 focus = TERM_OFFSET_focus
1107 mapped = TERM_OFFSET_mapped 1128 mapped = TERM_OFFSET_mapped
1108 saveLines = TERM_OFFSET_saveLines 1129 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows 1130 total_rows = TERM_OFFSET_total_rows
1110 nsaved = TERM_OFFSET_nsaved 1131 top_row = TERM_OFFSET_top_row
1111 CODE: 1132 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix); 1133 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT: 1134 OUTPUT:
1114 RETVAL 1135 RETVAL
1115 1136
… …
1199 THIS->rstyle = new_rstyle; 1220 THIS->rstyle = new_rstyle;
1200 OUTPUT: 1221 OUTPUT:
1201 RETVAL 1222 RETVAL
1202 1223
1203int 1224int
1204rxvt_term::view_start (int newval = -1) 1225rxvt_term::view_start (int newval = 1)
1205 PROTOTYPE: $;$ 1226 PROTOTYPE: $;$
1206 CODE: 1227 CODE:
1207{ 1228{
1208 RETVAL = THIS->view_start; 1229 RETVAL = THIS->view_start;
1209 1230
1210 if (newval >= 0) 1231 if (newval <= 0)
1211 { 1232 THIS->scr_changeview (max (newval, THIS->top_row));
1212 THIS->view_start = min (newval, THIS->nsaved);
1213 THIS->scr_changeview (RETVAL);
1214 }
1215} 1233}
1216 OUTPUT: 1234 OUTPUT:
1217 RETVAL 1235 RETVAL
1218 1236
1219void 1237void
… …
1223 1241
1224void 1242void
1225rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1243rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1226 PPCODE: 1244 PPCODE:
1227{ 1245{
1228 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1246 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1229 XSRETURN_EMPTY; 1247 XSRETURN_EMPTY;
1230 1248
1231 line_t &l = ROW(row_number); 1249 line_t &l = ROW(row_number);
1232 1250
1233 if (GIMME_V != G_VOID) 1251 if (GIMME_V != G_VOID)
… …
1266 1284
1267void 1285void
1268rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1286rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1269 PPCODE: 1287 PPCODE:
1270{ 1288{
1271 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1289 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1272 XSRETURN_EMPTY; 1290 XSRETURN_EMPTY;
1273 1291
1274 line_t &l = ROW(row_number); 1292 line_t &l = ROW(row_number);
1275 1293
1276 if (GIMME_V != G_VOID) 1294 if (GIMME_V != G_VOID)
… …
1306 1324
1307int 1325int
1308rxvt_term::ROW_l (int row_number, int new_length = -1) 1326rxvt_term::ROW_l (int row_number, int new_length = -1)
1309 CODE: 1327 CODE:
1310{ 1328{
1311 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1329 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1312 XSRETURN_EMPTY; 1330 XSRETURN_EMPTY;
1313 1331
1314 line_t &l = ROW(row_number); 1332 line_t &l = ROW(row_number);
1315 RETVAL = l.l; 1333 RETVAL = l.l;
1316 1334
… …
1322 1340
1323bool 1341bool
1324rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1342rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1325 CODE: 1343 CODE:
1326{ 1344{
1327 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1345 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1328 XSRETURN_EMPTY; 1346 XSRETURN_EMPTY;
1329 1347
1330 line_t &l = ROW(row_number); 1348 line_t &l = ROW(row_number);
1331 RETVAL = l.is_longer (); 1349 RETVAL = l.is_longer ();
1332 1350
… …
1522 PUSHs (sv_2mortal (newSViv (rc.col))); 1540 PUSHs (sv_2mortal (newSViv (rc.col)));
1523 } 1541 }
1524 1542
1525 if (items == 3) 1543 if (items == 3)
1526 { 1544 {
1527 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1545 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1528 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1546 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1529 1547
1530 if (ix) 1548 if (ix)
1531 THIS->want_refresh = 1; 1549 THIS->want_refresh = 1;
1532 } 1550 }

Diff Legend

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