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.124 by root, Thu Jul 31 03:24:08 2008 UTC vs.
Revision 1.137 by root, Mon Feb 21 07:41:03 2011 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-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
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.
… …
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
… …
294 THIS->refresh_check (); 302 THIS->refresh_check ();
295} 303}
296 304
297///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
298 306
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h" 307#include "iom_perl.h"
302 308
303///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
304 310
305struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
… …
310{ 316{
311 if (perl) 317 if (perl)
312 { 318 {
313 perl_destruct (perl); 319 perl_destruct (perl);
314 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
315 } 322 }
316} 323}
317 324
318void 325void
319rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
320{ 327{
321 if (!perl) 328 if (!perl)
322 { 329 {
323 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
324 331
332 {
325 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
327 335
328 char *argv[] = { 336 char *args[] = {
329 "", 337 "",
330 "-e" 338 "-e"
331 "BEGIN {" 339 "BEGIN {"
332 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
334 "}" 342 "}"
335 "" 343 ""
336 "use urxvt;" 344 "use urxvt;"
337 }; 345 };
346 int argc = ARRAY_LENGTH(args);
347 char **argv = args;
338 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 350 perl = perl_alloc ();
340 perl_construct (perl); 351 perl_construct (perl);
341 352
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 354 || perl_run (perl))
344 { 355 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 357
347 perl_destruct (perl); 358 perl_destruct (perl);
348 perl_free (perl); 359 perl_free (perl);
349 perl = 0; 360 perl = 0;
350 } 361 }
351 362 }
352 swap (perl_environ, environ);
353 363
354 rxvt_pop_locale (); 364 rxvt_pop_locale ();
355 } 365 }
356 366
357 if (perl) 367 if (perl)
… …
377rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 387rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
378{ 388{
379 if (!perl || !term->perl.self) 389 if (!perl || !term->perl.self)
380 return false; 390 return false;
381 391
392 localise_env set_environ (perl_environ);
393
382 // pre-handling of some events 394 // pre-handling of some events
383 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
384 { 396 {
385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
386 398
387 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
389 } 401 }
390 402
391 swap (perl_environ, environ);
392
393 bool event_consumed; 403 bool event_consumed;
394 404
395 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
396 || term->perl.should_invoke [htype]) 406 || term->perl.should_invoke [htype])
397 try
398 { 407 {
399 dSP; 408 dSP;
400 va_list ap; 409 va_list ap;
401 410
402 va_start (ap, htype); 411 va_start (ap, htype);
403 412
404 ENTER; 413 ENTER;
405 SAVETMPS; 414 SAVETMPS;
406 415
407 PUSHMARK (SP); 416 PUSHMARK (SP);
408 417
409 XPUSHs (sv_2mortal (newSVterm (term))); 418 XPUSHs (sv_2mortal (newSVterm (term)));
410 XPUSHs (sv_2mortal (newSViv (htype))); 419 XPUSHs (sv_2mortal (newSViv (htype)));
411 420
412 for (;;) { 421 for (;;) {
413 data_type dt = (data_type)va_arg (ap, int); 422 data_type dt = (data_type)va_arg (ap, int);
414 423
415 switch (dt) 424 switch (dt)
416 { 425 {
417 case DT_INT: 426 case DT_INT:
418 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 427 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
419 break; 428 break;
420 429
421 case DT_LONG: 430 case DT_LONG:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 431 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
423 break; 432 break;
424 433
425 case DT_STR: 434 case DT_STR:
426 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 435 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
427 break; 436 break;
428 437
429 case DT_STR_LEN: 438 case DT_STR_LEN:
430 { 439 {
431 char *str = va_arg (ap, char *); 440 char *str = va_arg (ap, char *);
432 int len = va_arg (ap, int); 441 int len = va_arg (ap, int);
433 442
434 XPUSHs (sv_2mortal (newSVpvn (str, len))); 443 XPUSHs (sv_2mortal (newSVpvn (str, len)));
435 } 444 }
436 break; 445 break;
437 446
438 case DT_WCS_LEN: 447 case DT_WCS_LEN:
439 { 448 {
440 wchar_t *wstr = va_arg (ap, wchar_t *); 449 wchar_t *wstr = va_arg (ap, wchar_t *);
441 int wlen = va_arg (ap, int); 450 int wlen = va_arg (ap, int);
442 451
443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 452 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 } 453 }
445 break; 454 break;
446 455
447 case DT_LCS_LEN: 456 case DT_LCS_LEN:
448 { 457 {
449 long *lstr = va_arg (ap, long *); 458 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int); 459 int llen = va_arg (ap, int);
451 460
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 461 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
453 } 462 }
454 break; 463 break;
455 464
456 case DT_XEVENT: 465 case DT_XEVENT:
457 { 466 {
458 XEvent *xe = va_arg (ap, XEvent *); 467 XEvent *xe = va_arg (ap, XEvent *);
459 HV *hv = newHV (); 468 HV *hv = newHV ();
460 469
461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 470# 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) 471# 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) 472# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
464# undef set 473# undef set
465 474
466 setiv (type, xe->type); 475 setiv (type, xe->type);
467 setiv (send_event, xe->xany.send_event); 476 setiv (send_event, xe->xany.send_event);
468 setiv (serial, xe->xany.serial); 477 setiv (serial, xe->xany.serial);
469 478
470 switch (xe->type) 479 switch (xe->type)
471 { 480 {
472 case KeyPress: 481 case KeyPress:
473 case KeyRelease: 482 case KeyRelease:
474 case ButtonPress: 483 case ButtonPress:
475 case ButtonRelease: 484 case ButtonRelease:
476 case MotionNotify: 485 case MotionNotify:
477 setuv (window, xe->xmotion.window); 486 setuv (window, xe->xmotion.window);
478 setuv (root, xe->xmotion.root); 487 setuv (root, xe->xmotion.root);
479 setuv (subwindow, xe->xmotion.subwindow); 488 setuv (subwindow, xe->xmotion.subwindow);
480 setuv (time, xe->xmotion.time); 489 setuv (time, xe->xmotion.time);
481 setiv (x, xe->xmotion.x); 490 setiv (x, xe->xmotion.x);
482 setiv (y, xe->xmotion.y); 491 setiv (y, xe->xmotion.y);
483 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 492 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
484 setiv (col, xe->xmotion.x / term->fwidth); 493 setiv (col, xe->xmotion.x / term->fwidth);
485 setiv (x_root, xe->xmotion.x_root); 494 setiv (x_root, xe->xmotion.x_root);
486 setiv (y_root, xe->xmotion.y_root); 495 setiv (y_root, xe->xmotion.y_root);
487 setuv (state, xe->xmotion.state); 496 setuv (state, xe->xmotion.state);
488 497
489 switch (xe->type) 498 switch (xe->type)
490 { 499 {
491 case KeyPress: 500 case KeyPress:
492 case KeyRelease: 501 case KeyRelease:
493 setuv (keycode, xe->xkey.keycode); 502 setuv (keycode, xe->xkey.keycode);
494 break; 503 break;
495 504
496 case ButtonPress: 505 case ButtonPress:
497 case ButtonRelease: 506 case ButtonRelease:
498 setuv (button, xe->xbutton.button); 507 setuv (button, xe->xbutton.button);
499 break; 508 break;
500 509
501 case MotionNotify: 510 case MotionNotify:
502 setiv (is_hint, xe->xmotion.is_hint); 511 setiv (is_hint, xe->xmotion.is_hint);
503 break; 512 break;
504 } 513 }
505 514
506 break; 515 break;
507 516
508 case MapNotify: 517 case MapNotify:
509 case UnmapNotify: 518 case UnmapNotify:
510 case ConfigureNotify: 519 case ConfigureNotify:
511 setuv (event, xe->xconfigure.event); 520 setuv (event, xe->xconfigure.event);
512 setuv (window, xe->xconfigure.window); 521 setuv (window, xe->xconfigure.window);
513 522
514 switch (xe->type) 523 switch (xe->type)
515 { 524 {
516 case ConfigureNotify: 525 case ConfigureNotify:
517 setiv (x, xe->xconfigure.x); 526 setiv (x, xe->xconfigure.x);
518 setiv (y, xe->xconfigure.y); 527 setiv (y, xe->xconfigure.y);
519 setiv (width, xe->xconfigure.width); 528 setiv (width, xe->xconfigure.width);
520 setiv (height, xe->xconfigure.height); 529 setiv (height, xe->xconfigure.height);
521 setuv (above, xe->xconfigure.above); 530 setuv (above, xe->xconfigure.above);
522 break; 531 break;
523 } 532 }
524 533
525 break; 534 break;
526 535
527 case PropertyNotify: 536 case PropertyNotify:
528 setuv (window, xe->xproperty.window); 537 setuv (window, xe->xproperty.window);
529 setuv (atom, xe->xproperty.atom); 538 setuv (atom, xe->xproperty.atom);
530 setuv (time, xe->xproperty.time); 539 setuv (time, xe->xproperty.time);
531 setiv (state, xe->xproperty.state); 540 setiv (state, xe->xproperty.state);
532 break; 541 break;
533 542
534 case ClientMessage: 543 case ClientMessage:
535 setuv (window, xe->xclient.window); 544 setuv (window, xe->xclient.window);
536 setuv (message_type, xe->xclient.message_type); 545 setuv (message_type, xe->xclient.message_type);
537 setuv (format, xe->xclient.format); 546 setuv (format, xe->xclient.format);
538 setuv (l0, xe->xclient.data.l[0]); 547 setuv (l0, xe->xclient.data.l[0]);
539 setuv (l1, xe->xclient.data.l[1]); 548 setuv (l1, xe->xclient.data.l[1]);
540 setuv (l2, xe->xclient.data.l[2]); 549 setuv (l2, xe->xclient.data.l[2]);
541 setuv (l3, xe->xclient.data.l[3]); 550 setuv (l3, xe->xclient.data.l[3]);
542 setuv (l4, xe->xclient.data.l[4]); 551 setuv (l4, xe->xclient.data.l[4]);
543 break; 552 break;
544 } 553 }
545 554
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
547 } 556 }
548 break; 557 break;
549 558
550 case DT_END: 559 case DT_END:
551 goto call; 560 goto call;
552 561
553 default: 562 default:
554 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 563 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
555 } 564 }
565 }
566
567 call:
568 va_end (ap);
569
570 PUTBACK;
571 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
572 SPAGAIN;
573
574 if (count)
575 {
576 SV *status = POPs;
577 count = SvTRUE (status);
556 } 578 }
557 579
558 call:
559 va_end (ap);
560
561 PUTBACK; 580 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; 581 FREETMPS;
573 LEAVE; 582 LEAVE;
574 583
575 if (SvTRUE (ERRSV)) 584 if (SvTRUE (ERRSV))
576 { 585 {
577 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 586 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
578 ungrab (term); // better lose the grab than the session 587 ungrab (term); // better lose the grab than the session
579 } 588 }
580 589
581 event_consumed = !!count; 590 event_consumed = !!count;
582 } 591 }
583 catch (...)
584 {
585 swap (perl_environ, environ);
586 throw;
587 }
588 else 592 else
589 event_consumed = false; 593 event_consumed = false;
590 594
591 // post-handling of some events 595 // post-handling of some events
592 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
… …
603 607
604 // don't allow further calls 608 // don't allow further calls
605 term->perl.self = 0; 609 term->perl.self = 0;
606 } 610 }
607 611
608 swap (perl_environ, environ);
609
610 return event_consumed; 612 return event_consumed;
611} 613}
612 614
613///////////////////////////////////////////////////////////////////////////// 615/////////////////////////////////////////////////////////////////////////////
614 616
… …
627# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
628# include "hookinc.h" 630# include "hookinc.h"
629# undef def 631# undef def
630 632
631 HV *option = get_hv ("urxvt::OPTION", 1); 633 HV *option = get_hv ("urxvt::OPTION", 1);
632# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 634# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
633# define nodef(name) 635# define nodef(name)
634# include "optinc.h" 636# include "optinc.h"
635# undef nodef 637# undef nodef
636# undef def 638# undef def
637 639
… …
642 } *civ, const_iv[] = { 644 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 645# define const_iv(name) { # name, (IV)name }
644 const_iv (NUM_RESOURCES), 646 const_iv (NUM_RESOURCES),
645 const_iv (DEFAULT_RSTYLE), 647 const_iv (DEFAULT_RSTYLE),
646 const_iv (OVERLAY_RSTYLE), 648 const_iv (OVERLAY_RSTYLE),
649 const_iv (Color_Bits),
650 const_iv (RS_bgShift), const_iv (RS_bgMask),
651 const_iv (RS_fgShift), const_iv (RS_fgMask),
652 const_iv (RS_Careful),
653 const_iv (RS_fontCount),
654 const_iv (RS_fontShift),
655 const_iv (RS_fontMask),
656 const_iv (RS_baseattrMask),
657 const_iv (RS_attrMask),
658 const_iv (RS_redraw),
659 const_iv (RS_Sel),
647 const_iv (RS_Bold), 660 const_iv (RS_Bold),
648 const_iv (RS_Italic), 661 const_iv (RS_Italic),
649 const_iv (RS_Blink), 662 const_iv (RS_Blink),
650 const_iv (RS_RVid), 663 const_iv (RS_RVid),
651 const_iv (RS_Uline), 664 const_iv (RS_Uline),
… …
755 const_iv (XIMDontChange), 768 const_iv (XIMDontChange),
756# endif 769# endif
757# endif 770# endif
758 }; 771 };
759 772
760 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
762} 775}
763 776
764void 777void
765warn (const char *msg) 778warn (const char *msg)
… …
1043 OUTPUT: 1056 OUTPUT:
1044 RETVAL 1057 RETVAL
1045 1058
1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1047 1060
1048#define TERM_OFFSET_width TERM_OFFSET(width) 1061#define TERM_OFFSET_width TERM_OFFSET(width)
1049#define TERM_OFFSET_height TERM_OFFSET(height) 1062#define TERM_OFFSET_height TERM_OFFSET(height)
1050#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1063#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1051#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1064#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1052#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1053#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1054#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1055#define TERM_OFFSET_focus TERM_OFFSET(focus) 1068#define TERM_OFFSET_focus TERM_OFFSET(focus)
1056#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1057#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1058#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1059#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1073#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1060#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1074#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1061#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1075#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1062#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1076#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1063 1077
1064int 1078int
1065rxvt_term::width () 1079rxvt_term::width ()
1066 ALIAS: 1080 ALIAS:
1067 width = TERM_OFFSET_width 1081 width = TERM_OFFSET_width
1068 height = TERM_OFFSET_height 1082 height = TERM_OFFSET_height
1069 fwidth = TERM_OFFSET_fwidth 1083 fwidth = TERM_OFFSET_fwidth
1070 fheight = TERM_OFFSET_fheight 1084 fheight = TERM_OFFSET_fheight
1071 fbase = TERM_OFFSET_fbase 1085 fbase = TERM_OFFSET_fbase
1072 nrow = TERM_OFFSET_nrow 1086 nrow = TERM_OFFSET_nrow
1073 ncol = TERM_OFFSET_ncol 1087 ncol = TERM_OFFSET_ncol
1074 focus = TERM_OFFSET_focus 1088 focus = TERM_OFFSET_focus
1075 mapped = TERM_OFFSET_mapped 1089 mapped = TERM_OFFSET_mapped
1076 int_bwidth = TERM_OFFSET_int_bwidth 1090 int_bwidth = TERM_OFFSET_int_bwidth
1077 ext_bwidth = TERM_OFFSET_ext_bwidth 1091 ext_bwidth = TERM_OFFSET_ext_bwidth
1078 lineSpace = TERM_OFFSET_lineSpace 1092 lineSpace = TERM_OFFSET_lineSpace
1093 letterSpace = TERM_OFFSET_letterSpace
1079 saveLines = TERM_OFFSET_saveLines 1094 saveLines = TERM_OFFSET_saveLines
1080 total_rows = TERM_OFFSET_total_rows 1095 total_rows = TERM_OFFSET_total_rows
1081 top_row = TERM_OFFSET_top_row 1096 top_row = TERM_OFFSET_top_row
1082 CODE: 1097 CODE:
1083 RETVAL = *(int *)((char *)THIS + ix); 1098 RETVAL = *(int *)((char *)THIS + ix);
1084 OUTPUT: 1099 OUTPUT:
1085 RETVAL 1100 RETVAL
1086 1101
… …
1431# include "rsinc.h" 1446# include "rsinc.h"
1432# undef def 1447# undef def
1433# undef reserve 1448# undef reserve
1434 }; 1449 };
1435 1450
1436 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1451 rs = rslist + ARRAY_LENGTH(rslist);
1437 1452
1438 if (*name) 1453 if (*name)
1439 { 1454 {
1440 do { 1455 do {
1441 if (rs-- == rslist) 1456 if (rs-- == rslist)
… …
1536 EXTEND (SP, 2); 1551 EXTEND (SP, 2);
1537 PUSHs (sv_2mortal (newSViv (rc.row))); 1552 PUSHs (sv_2mortal (newSViv (rc.row)));
1538 PUSHs (sv_2mortal (newSViv (rc.col))); 1553 PUSHs (sv_2mortal (newSViv (rc.col)));
1539 } 1554 }
1540 1555
1541 if (items == 3) 1556 if (items >= 3)
1542 { 1557 {
1543 rc.row = SvIV (ST (1)); 1558 rc.row = SvIV (ST (1));
1544 rc.col = SvIV (ST (2)); 1559 rc.col = SvIV (ST (2));
1545 1560
1546 if (ix == 2) 1561 if (ix == 2)
… …
1562 clamp_it (rc.col, 0, THIS->ncol); 1577 clamp_it (rc.col, 0, THIS->ncol);
1563 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1578 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1564 1579
1565 if (ix) 1580 if (ix)
1566 { 1581 {
1582 THIS->selection.screen = THIS->current_screen;
1583
1567 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1568 THIS->refresh_check (); 1585 THIS->refresh_check ();
1569 } 1586 }
1570 } 1587 }
1571} 1588}
1572 1589
1573char 1590int
1574rxvt_term::cur_charset () 1591rxvt_term::selection_screen (int screen = -1)
1575 CODE: 1592 CODE:
1576 RETVAL = THIS->charsets [THIS->screen.charset]; 1593 RETVAL = THIS->selection.screen;
1577 OUTPUT: 1594 if (screen >= 0)
1595 THIS->selection.screen = screen;
1596 OUTPUT:
1578 RETVAL 1597 RETVAL
1579 1598
1580void 1599void
1581rxvt_term::selection_clear () 1600rxvt_term::selection_clear (bool clipboard = false)
1582 1601
1583void 1602void
1584rxvt_term::selection_make (Time eventtime, bool rect = false) 1603rxvt_term::selection_make (Time eventtime, bool rect = false)
1585 CODE: 1604 CODE:
1586 THIS->selection.op = SELECTION_CONT; 1605 THIS->selection.op = SELECTION_CONT;
1587 THIS->selection.rect = rect; 1606 THIS->selection.rect = rect;
1588 THIS->selection_make (eventtime); 1607 THIS->selection_make (eventtime);
1589 1608
1590int 1609int
1591rxvt_term::selection_grab (Time eventtime) 1610rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1592 1611
1593void 1612void
1594rxvt_term::selection (SV *newtext = 0) 1613rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1595 PPCODE: 1614 PPCODE:
1596{ 1615{
1616 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1617 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1618
1597 if (GIMME_V != G_VOID) 1619 if (GIMME_V != G_VOID)
1598 XPUSHs (THIS->selection.text 1620 XPUSHs (text
1599 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1621 ? sv_2mortal (wcs2sv (text, len))
1600 : &PL_sv_undef); 1622 : &PL_sv_undef);
1601 1623
1602 if (newtext) 1624 if (newtext)
1603 { 1625 {
1604 free (THIS->selection.text); 1626 free (text);
1605 1627
1606 THIS->selection.text = sv2wcs (newtext); 1628 text = sv2wcs (newtext);
1607 THIS->selection.len = wcslen (THIS->selection.text); 1629 len = wcslen (text);
1608 } 1630 }
1609} 1631}
1632
1633char
1634rxvt_term::cur_charset ()
1635 CODE:
1636 RETVAL = THIS->charsets [THIS->screen.charset];
1637 OUTPUT:
1638 RETVAL
1610 1639
1611void 1640void
1612rxvt_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) 1641rxvt_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)
1613 1642
1614void 1643void
… …
1636 char *str = SvPVbyte (octets, len); 1665 char *str = SvPVbyte (octets, len);
1637 C_ARGS: 1666 C_ARGS:
1638 str, len 1667 str, len
1639 1668
1640void 1669void
1670rxvt_term::tt_paste (SV *octets)
1671 INIT:
1672 STRLEN len;
1673 char *str = SvPVbyte (octets, len);
1674 C_ARGS:
1675 str, len
1676
1677void
1641rxvt_term::cmd_parse (SV *octets) 1678rxvt_term::cmd_parse (SV *octets)
1642 CODE: 1679 CODE:
1643{ 1680{
1644 STRLEN len; 1681 STRLEN len;
1645 char *str = SvPVbyte (octets, len); 1682 char *str = SvPVbyte (octets, len);

Diff Legend

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