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

Diff Legend

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