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.122 by root, Sun Jun 15 14:07:58 2008 UTC vs.
Revision 1.134 by root, Thu Dec 16 23:03:50 2010 UTC

… …
107 107
108///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
109 109
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 111
112class overlay { 112class overlay : overlay_base
113{
113 rxvt_term *THIS; 114 rxvt_term *THIS;
114 AV *overlay_av; 115 AV *overlay_av;
115 int x, y, w, h;
116 int border; 116 int border;
117 text_t **text;
118 rend_t **rend;
119 117
120public: 118public:
121 HV *self; 119 HV *self;
122 120
123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
130 128
131 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
132}; 130};
133 131
134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
136{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
137 if (w < 0) w = 0; 140 if (w < 0) w = 0;
138 if (h < 0) h = 0; 141 if (h < 0) h = 0;
139 142
140 if (border == 2) 143 if (border == 2)
141 { 144 {
… …
245 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
246 249
247 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
249 252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
257
250 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
251 { 259 {
252 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
254 262
… …
310{ 318{
311 if (perl) 319 if (perl)
312 { 320 {
313 perl_destruct (perl); 321 perl_destruct (perl);
314 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
315 } 324 }
316} 325}
317 326
318void 327void
319rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
320{ 329{
321 if (!perl) 330 if (!perl)
322 { 331 {
323 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
324 333
334 {
325 perl_environ = rxvt_environ; 335 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 336 localise_env set_environ (perl_environ);
327 337
328 char *argv[] = { 338 char *args[] = {
329 "", 339 "",
330 "-e" 340 "-e"
331 "BEGIN {" 341 "BEGIN {"
332 " urxvt->bootstrap;" 342 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 343 " unshift @INC, '" LIBDIR "';"
334 "}" 344 "}"
335 "" 345 ""
336 "use urxvt;" 346 "use urxvt;"
337 }; 347 };
348 int argc = sizeof (args) / sizeof (args[0]);
349 char **argv = args;
338 350
351 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 352 perl = perl_alloc ();
340 perl_construct (perl); 353 perl_construct (perl);
341 354
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 355 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 356 || perl_run (perl))
344 { 357 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 358 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 359
347 perl_destruct (perl); 360 perl_destruct (perl);
348 perl_free (perl); 361 perl_free (perl);
349 perl = 0; 362 perl = 0;
350 } 363 }
351 364 }
352 swap (perl_environ, environ);
353 365
354 rxvt_pop_locale (); 366 rxvt_pop_locale ();
355 } 367 }
356 368
357 if (perl) 369 if (perl)
… …
377rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
378{ 390{
379 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
380 return false; 392 return false;
381 393
394 localise_env set_environ (perl_environ);
395
382 // pre-handling of some events 396 // pre-handling of some events
383 if (htype == HOOK_REFRESH_END) 397 if (htype == HOOK_REFRESH_END)
384 { 398 {
385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
386 400
387 for (int i = 0; i <= AvFILL (av); i++) 401 for (int i = 0; i <= AvFILL (av); i++)
388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
389 } 403 }
390 404
391 swap (perl_environ, environ);
392
393 bool event_consumed; 405 bool event_consumed;
394 406
395 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 407 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
396 || term->perl.should_invoke [htype]) 408 || term->perl.should_invoke [htype])
397 try
398 { 409 {
399 dSP; 410 dSP;
400 va_list ap; 411 va_list ap;
401 412
402 va_start (ap, htype); 413 va_start (ap, htype);
403 414
404 ENTER; 415 ENTER;
405 SAVETMPS; 416 SAVETMPS;
406 417
407 PUSHMARK (SP); 418 PUSHMARK (SP);
408 419
409 XPUSHs (sv_2mortal (newSVterm (term))); 420 XPUSHs (sv_2mortal (newSVterm (term)));
410 XPUSHs (sv_2mortal (newSViv (htype))); 421 XPUSHs (sv_2mortal (newSViv (htype)));
411 422
412 for (;;) { 423 for (;;) {
413 data_type dt = (data_type)va_arg (ap, int); 424 data_type dt = (data_type)va_arg (ap, int);
414 425
415 switch (dt) 426 switch (dt)
416 { 427 {
417 case DT_INT: 428 case DT_INT:
418 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 429 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
419 break; 430 break;
420 431
421 case DT_LONG: 432 case DT_LONG:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 433 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
423 break; 434 break;
424 435
425 case DT_STR: 436 case DT_STR:
426 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 437 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
427 break; 438 break;
428 439
429 case DT_STR_LEN: 440 case DT_STR_LEN:
430 { 441 {
431 char *str = va_arg (ap, char *); 442 char *str = va_arg (ap, char *);
432 int len = va_arg (ap, int); 443 int len = va_arg (ap, int);
433 444
434 XPUSHs (sv_2mortal (newSVpvn (str, len))); 445 XPUSHs (sv_2mortal (newSVpvn (str, len)));
435 } 446 }
436 break; 447 break;
437 448
438 case DT_WCS_LEN: 449 case DT_WCS_LEN:
439 { 450 {
440 wchar_t *wstr = va_arg (ap, wchar_t *); 451 wchar_t *wstr = va_arg (ap, wchar_t *);
441 int wlen = va_arg (ap, int); 452 int wlen = va_arg (ap, int);
442 453
443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 454 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 } 455 }
445 break; 456 break;
446 457
447 case DT_LCS_LEN: 458 case DT_LCS_LEN:
448 { 459 {
449 long *lstr = va_arg (ap, long *); 460 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int); 461 int llen = va_arg (ap, int);
451 462
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 463 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
453 } 464 }
454 break; 465 break;
455 466
456 case DT_XEVENT: 467 case DT_XEVENT:
457 { 468 {
458 XEvent *xe = va_arg (ap, XEvent *); 469 XEvent *xe = va_arg (ap, XEvent *);
459 HV *hv = newHV (); 470 HV *hv = newHV ();
460 471
461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 472# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
462# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 473# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
463# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 474# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
464# undef set 475# undef set
465 476
466 setiv (type, xe->type); 477 setiv (type, xe->type);
467 setiv (send_event, xe->xany.send_event); 478 setiv (send_event, xe->xany.send_event);
468 setiv (serial, xe->xany.serial); 479 setiv (serial, xe->xany.serial);
469 480
470 switch (xe->type) 481 switch (xe->type)
471 { 482 {
472 case KeyPress: 483 case KeyPress:
473 case KeyRelease: 484 case KeyRelease:
474 case ButtonPress: 485 case ButtonPress:
475 case ButtonRelease: 486 case ButtonRelease:
476 case MotionNotify: 487 case MotionNotify:
477 setuv (window, xe->xmotion.window); 488 setuv (window, xe->xmotion.window);
478 setuv (root, xe->xmotion.root); 489 setuv (root, xe->xmotion.root);
479 setuv (subwindow, xe->xmotion.subwindow); 490 setuv (subwindow, xe->xmotion.subwindow);
480 setuv (time, xe->xmotion.time); 491 setuv (time, xe->xmotion.time);
481 setiv (x, xe->xmotion.x); 492 setiv (x, xe->xmotion.x);
482 setiv (y, xe->xmotion.y); 493 setiv (y, xe->xmotion.y);
483 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 494 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
484 setiv (col, xe->xmotion.x / term->fwidth); 495 setiv (col, xe->xmotion.x / term->fwidth);
485 setiv (x_root, xe->xmotion.x_root); 496 setiv (x_root, xe->xmotion.x_root);
486 setiv (y_root, xe->xmotion.y_root); 497 setiv (y_root, xe->xmotion.y_root);
487 setuv (state, xe->xmotion.state); 498 setuv (state, xe->xmotion.state);
488 499
489 switch (xe->type) 500 switch (xe->type)
490 { 501 {
491 case KeyPress: 502 case KeyPress:
492 case KeyRelease: 503 case KeyRelease:
493 setuv (keycode, xe->xkey.keycode); 504 setuv (keycode, xe->xkey.keycode);
494 break; 505 break;
495 506
496 case ButtonPress: 507 case ButtonPress:
497 case ButtonRelease: 508 case ButtonRelease:
498 setuv (button, xe->xbutton.button); 509 setuv (button, xe->xbutton.button);
499 break; 510 break;
500 511
501 case MotionNotify: 512 case MotionNotify:
502 setiv (is_hint, xe->xmotion.is_hint); 513 setiv (is_hint, xe->xmotion.is_hint);
503 break; 514 break;
504 } 515 }
505 516
506 break; 517 break;
507 518
508 case MapNotify: 519 case MapNotify:
509 case UnmapNotify: 520 case UnmapNotify:
510 case ConfigureNotify: 521 case ConfigureNotify:
511 setuv (event, xe->xconfigure.event); 522 setuv (event, xe->xconfigure.event);
512 setuv (window, xe->xconfigure.window); 523 setuv (window, xe->xconfigure.window);
513 524
514 switch (xe->type) 525 switch (xe->type)
515 { 526 {
516 case ConfigureNotify: 527 case ConfigureNotify:
517 setiv (x, xe->xconfigure.x); 528 setiv (x, xe->xconfigure.x);
518 setiv (y, xe->xconfigure.y); 529 setiv (y, xe->xconfigure.y);
519 setiv (width, xe->xconfigure.width); 530 setiv (width, xe->xconfigure.width);
520 setiv (height, xe->xconfigure.height); 531 setiv (height, xe->xconfigure.height);
521 setuv (above, xe->xconfigure.above); 532 setuv (above, xe->xconfigure.above);
522 break; 533 break;
523 } 534 }
524 535
525 break; 536 break;
526 537
527 case PropertyNotify: 538 case PropertyNotify:
528 setuv (window, xe->xproperty.window); 539 setuv (window, xe->xproperty.window);
529 setuv (atom, xe->xproperty.atom); 540 setuv (atom, xe->xproperty.atom);
530 setuv (time, xe->xproperty.time); 541 setuv (time, xe->xproperty.time);
531 setiv (state, xe->xproperty.state); 542 setiv (state, xe->xproperty.state);
532 break; 543 break;
533 544
534 case ClientMessage: 545 case ClientMessage:
535 setuv (window, xe->xclient.window); 546 setuv (window, xe->xclient.window);
536 setuv (message_type, xe->xclient.message_type); 547 setuv (message_type, xe->xclient.message_type);
537 setuv (format, xe->xclient.format); 548 setuv (format, xe->xclient.format);
538 setuv (l0, xe->xclient.data.l[0]); 549 setuv (l0, xe->xclient.data.l[0]);
539 setuv (l1, xe->xclient.data.l[1]); 550 setuv (l1, xe->xclient.data.l[1]);
540 setuv (l2, xe->xclient.data.l[2]); 551 setuv (l2, xe->xclient.data.l[2]);
541 setuv (l3, xe->xclient.data.l[3]); 552 setuv (l3, xe->xclient.data.l[3]);
542 setuv (l4, xe->xclient.data.l[4]); 553 setuv (l4, xe->xclient.data.l[4]);
543 break; 554 break;
544 } 555 }
545 556
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 557 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
547 } 558 }
548 break; 559 break;
549 560
550 case DT_END: 561 case DT_END:
551 goto call; 562 goto call;
552 563
553 default: 564 default:
554 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 565 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
555 } 566 }
567 }
568
569 call:
570 va_end (ap);
571
572 PUTBACK;
573 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
574 SPAGAIN;
575
576 if (count)
577 {
578 SV *status = POPs;
579 count = SvTRUE (status);
556 } 580 }
557 581
558 call:
559 va_end (ap);
560
561 PUTBACK; 582 PUTBACK;
562 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
563 SPAGAIN;
564
565 if (count)
566 {
567 SV *status = POPs;
568 count = SvTRUE (status);
569 }
570
571 PUTBACK;
572 FREETMPS; 583 FREETMPS;
573 LEAVE; 584 LEAVE;
574 585
575 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
576 { 587 {
577 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 588 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
578 ungrab (term); // better lose the grab than the session 589 ungrab (term); // better lose the grab than the session
579 } 590 }
580 591
581 event_consumed = !!count; 592 event_consumed = !!count;
582 } 593 }
583 catch (...)
584 {
585 swap (perl_environ, environ);
586 throw;
587 }
588 else 594 else
589 event_consumed = false; 595 event_consumed = false;
590 596
591 // post-handling of some events 597 // post-handling of some events
592 if (htype == HOOK_REFRESH_BEGIN) 598 if (htype == HOOK_REFRESH_BEGIN)
… …
603 609
604 // don't allow further calls 610 // don't allow further calls
605 term->perl.self = 0; 611 term->perl.self = 0;
606 } 612 }
607 613
608 swap (perl_environ, environ);
609
610 return event_consumed; 614 return event_consumed;
611} 615}
612 616
613///////////////////////////////////////////////////////////////////////////// 617/////////////////////////////////////////////////////////////////////////////
614 618
… …
627# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 631# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
628# include "hookinc.h" 632# include "hookinc.h"
629# undef def 633# undef def
630 634
631 HV *option = get_hv ("urxvt::OPTION", 1); 635 HV *option = get_hv ("urxvt::OPTION", 1);
632# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 636# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
633# define nodef(name) 637# define nodef(name)
634# include "optinc.h" 638# include "optinc.h"
635# undef nodef 639# undef nodef
636# undef def 640# undef def
637 641
… …
639 static const struct { 643 static const struct {
640 const char *name; 644 const char *name;
641 IV iv; 645 IV iv;
642 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES),
644 const_iv (DEFAULT_RSTYLE), 649 const_iv (DEFAULT_RSTYLE),
645 const_iv (OVERLAY_RSTYLE), 650 const_iv (OVERLAY_RSTYLE),
651 const_iv (Color_Bits),
652 const_iv (RS_bgShift), const_iv (RS_bgMask),
653 const_iv (RS_fgShift), const_iv (RS_fgMask),
654 const_iv (RS_Careful),
655 const_iv (RS_fontCount),
656 const_iv (RS_fontShift),
657 const_iv (RS_fontMask),
658 const_iv (RS_baseattrMask),
659 const_iv (RS_attrMask),
660 const_iv (RS_redraw),
661 const_iv (RS_Sel),
646 const_iv (RS_Bold), 662 const_iv (RS_Bold),
647 const_iv (RS_Italic), 663 const_iv (RS_Italic),
648 const_iv (RS_Blink), 664 const_iv (RS_Blink),
649 const_iv (RS_RVid), 665 const_iv (RS_RVid),
650 const_iv (RS_Uline), 666 const_iv (RS_Uline),
… …
1042 OUTPUT: 1058 OUTPUT:
1043 RETVAL 1059 RETVAL
1044 1060
1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1061#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1046 1062
1047#define TERM_OFFSET_width TERM_OFFSET(width) 1063#define TERM_OFFSET_width TERM_OFFSET(width)
1048#define TERM_OFFSET_height TERM_OFFSET(height) 1064#define TERM_OFFSET_height TERM_OFFSET(height)
1049#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1065#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1050#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1066#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1051#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1067#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1052#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1068#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1053#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1069#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1054#define TERM_OFFSET_focus TERM_OFFSET(focus) 1070#define TERM_OFFSET_focus TERM_OFFSET(focus)
1055#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1071#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1056#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1072#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1057#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1073#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1058#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1074#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1075#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1059#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1076#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1060#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1077#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1061#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1078#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1062 1079
1063int 1080int
1064rxvt_term::width () 1081rxvt_term::width ()
1065 ALIAS: 1082 ALIAS:
1066 width = TERM_OFFSET_width 1083 width = TERM_OFFSET_width
1067 height = TERM_OFFSET_height 1084 height = TERM_OFFSET_height
1068 fwidth = TERM_OFFSET_fwidth 1085 fwidth = TERM_OFFSET_fwidth
1069 fheight = TERM_OFFSET_fheight 1086 fheight = TERM_OFFSET_fheight
1070 fbase = TERM_OFFSET_fbase 1087 fbase = TERM_OFFSET_fbase
1071 nrow = TERM_OFFSET_nrow 1088 nrow = TERM_OFFSET_nrow
1072 ncol = TERM_OFFSET_ncol 1089 ncol = TERM_OFFSET_ncol
1073 focus = TERM_OFFSET_focus 1090 focus = TERM_OFFSET_focus
1074 mapped = TERM_OFFSET_mapped 1091 mapped = TERM_OFFSET_mapped
1075 int_bwidth = TERM_OFFSET_int_bwidth 1092 int_bwidth = TERM_OFFSET_int_bwidth
1076 ext_bwidth = TERM_OFFSET_ext_bwidth 1093 ext_bwidth = TERM_OFFSET_ext_bwidth
1077 lineSpace = TERM_OFFSET_lineSpace 1094 lineSpace = TERM_OFFSET_lineSpace
1095 letterSpace = TERM_OFFSET_letterSpace
1078 saveLines = TERM_OFFSET_saveLines 1096 saveLines = TERM_OFFSET_saveLines
1079 total_rows = TERM_OFFSET_total_rows 1097 total_rows = TERM_OFFSET_total_rows
1080 top_row = TERM_OFFSET_top_row 1098 top_row = TERM_OFFSET_top_row
1081 CODE: 1099 CODE:
1082 RETVAL = *(int *)((char *)THIS + ix); 1100 RETVAL = *(int *)((char *)THIS + ix);
1083 OUTPUT: 1101 OUTPUT:
1084 RETVAL 1102 RETVAL
1085 1103
… …
1096 { 1114 {
1097 case 0: RETVAL = THIS->ModLevel3Mask; break; 1115 case 0: RETVAL = THIS->ModLevel3Mask; break;
1098 case 1: RETVAL = THIS->ModMetaMask; break; 1116 case 1: RETVAL = THIS->ModMetaMask; break;
1099 case 2: RETVAL = THIS->ModNumLockMask; break; 1117 case 2: RETVAL = THIS->ModNumLockMask; break;
1100 case 3: RETVAL = THIS->current_screen; break; 1118 case 3: RETVAL = THIS->current_screen; break;
1119#ifdef CURSOR_BLINK
1101 case 4: RETVAL = THIS->hidden_cursor; break; 1120 case 4: RETVAL = THIS->hidden_cursor; break;
1121#endif
1102 } 1122 }
1103 OUTPUT: 1123 OUTPUT:
1104 RETVAL 1124 RETVAL
1105 1125
1106char * 1126char *
… …
1430# undef reserve 1450# undef reserve
1431 }; 1451 };
1432 1452
1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1453 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1434 1454
1455 if (*name)
1435 do { 1456 {
1457 do {
1436 if (rs-- == rslist) 1458 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1459 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1460 } while (strcmp (name, rs->name));
1439 1461
1440 index += rs->value; 1462 index += rs->value;
1463 }
1464 else
1465 {
1466 --rs;
1467 name = "";
1468 }
1441 1469
1442 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1470 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1443 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1471 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1444 1472
1445 if (GIMME_V != G_VOID) 1473 if (GIMME_V != G_VOID)
… …
1525 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
1526 PUSHs (sv_2mortal (newSViv (rc.row))); 1554 PUSHs (sv_2mortal (newSViv (rc.row)));
1527 PUSHs (sv_2mortal (newSViv (rc.col))); 1555 PUSHs (sv_2mortal (newSViv (rc.col)));
1528 } 1556 }
1529 1557
1530 if (items == 3) 1558 if (items >= 3)
1531 { 1559 {
1532 rc.row = SvIV (ST (1)); 1560 rc.row = SvIV (ST (1));
1533 rc.col = SvIV (ST (2)); 1561 rc.col = SvIV (ST (2));
1534 1562
1535 if (ix == 2) 1563 if (ix == 2)
… …
1551 clamp_it (rc.col, 0, THIS->ncol); 1579 clamp_it (rc.col, 0, THIS->ncol);
1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1580 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1553 1581
1554 if (ix) 1582 if (ix)
1555 { 1583 {
1584 THIS->selection.screen = THIS->current_screen;
1585
1556 THIS->want_refresh = 1; 1586 THIS->want_refresh = 1;
1557 THIS->refresh_check (); 1587 THIS->refresh_check ();
1558 } 1588 }
1559 } 1589 }
1560} 1590}
1561 1591
1562char 1592int
1563rxvt_term::cur_charset () 1593rxvt_term::selection_screen (int screen = -1)
1564 CODE: 1594 CODE:
1565 RETVAL = THIS->charsets [THIS->screen.charset]; 1595 RETVAL = THIS->selection.screen;
1566 OUTPUT: 1596 if (screen >= 0)
1597 THIS->selection.screen = screen;
1598 OUTPUT:
1567 RETVAL 1599 RETVAL
1568 1600
1569void 1601void
1570rxvt_term::selection_clear () 1602rxvt_term::selection_clear (bool clipboard = false)
1571 1603
1572void 1604void
1573rxvt_term::selection_make (Time eventtime, bool rect = false) 1605rxvt_term::selection_make (Time eventtime, bool rect = false)
1574 CODE: 1606 CODE:
1575 THIS->selection.op = SELECTION_CONT; 1607 THIS->selection.op = SELECTION_CONT;
1576 THIS->selection.rect = rect; 1608 THIS->selection.rect = rect;
1577 THIS->selection_make (eventtime); 1609 THIS->selection_make (eventtime);
1578 1610
1579int 1611int
1580rxvt_term::selection_grab (Time eventtime) 1612rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1581 1613
1582void 1614void
1583rxvt_term::selection (SV *newtext = 0) 1615rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1584 PPCODE: 1616 PPCODE:
1585{ 1617{
1618 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1619 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1620
1586 if (GIMME_V != G_VOID) 1621 if (GIMME_V != G_VOID)
1587 XPUSHs (THIS->selection.text 1622 XPUSHs (text
1588 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1623 ? sv_2mortal (wcs2sv (text, len))
1589 : &PL_sv_undef); 1624 : &PL_sv_undef);
1590 1625
1591 if (newtext) 1626 if (newtext)
1592 { 1627 {
1593 free (THIS->selection.text); 1628 free (text);
1594 1629
1595 THIS->selection.text = sv2wcs (newtext); 1630 text = sv2wcs (newtext);
1596 THIS->selection.len = wcslen (THIS->selection.text); 1631 len = wcslen (text);
1597 } 1632 }
1598} 1633}
1634
1635char
1636rxvt_term::cur_charset ()
1637 CODE:
1638 RETVAL = THIS->charsets [THIS->screen.charset];
1639 OUTPUT:
1640 RETVAL
1599 1641
1600void 1642void
1601rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1643rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1602 1644
1603void 1645void
… …
1625 char *str = SvPVbyte (octets, len); 1667 char *str = SvPVbyte (octets, len);
1626 C_ARGS: 1668 C_ARGS:
1627 str, len 1669 str, len
1628 1670
1629void 1671void
1672rxvt_term::tt_paste (SV *octets)
1673 INIT:
1674 STRLEN len;
1675 char *str = SvPVbyte (octets, len);
1676 C_ARGS:
1677 str, len
1678
1679void
1630rxvt_term::cmd_parse (SV *octets) 1680rxvt_term::cmd_parse (SV *octets)
1631 CODE: 1681 CODE:
1632{ 1682{
1633 STRLEN len; 1683 STRLEN len;
1634 char *str = SvPVbyte (octets, len); 1684 char *str = SvPVbyte (octets, len);

Diff Legend

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