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.138 by root, Mon Feb 21 08:10:10 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-2006 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.
… …
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
… …
298 THIS->refresh_check (); 302 THIS->refresh_check ();
299} 303}
300 304
301///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
302 306
303#define IOM_CLASS "urxvt"
304#define IOM_WARN rxvt_warn
305#include "iom_perl.h" 307#include "iom_perl.h"
306 308
307///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
308 310
309struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
… …
314{ 316{
315 if (perl) 317 if (perl)
316 { 318 {
317 perl_destruct (perl); 319 perl_destruct (perl);
318 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
319 } 322 }
320} 323}
321 324
322void 325void
323rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
324{ 327{
325 if (!perl) 328 if (!perl)
326 { 329 {
327 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
328 331
332 {
329 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
330 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
331 335
332 char *argv[] = { 336 char *args[] = {
333 "", 337 "",
334 "-e" 338 "-e"
335 "BEGIN {" 339 "BEGIN {"
336 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
337 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
338 "}" 342 "}"
339 "" 343 ""
340 "use urxvt;" 344 "use urxvt;"
341 }; 345 };
346 int argc = ARRAY_LENGTH(args);
347 char **argv = args;
342 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
343 perl = perl_alloc (); 350 perl = perl_alloc ();
344 perl_construct (perl); 351 perl_construct (perl);
345 352
346 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
347 || perl_run (perl)) 354 || perl_run (perl))
348 { 355 {
349 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
350 357
351 perl_destruct (perl); 358 perl_destruct (perl);
352 perl_free (perl); 359 perl_free (perl);
353 perl = 0; 360 perl = 0;
354 } 361 }
355 362 }
356 swap (perl_environ, environ);
357 363
358 rxvt_pop_locale (); 364 rxvt_pop_locale ();
359 } 365 }
360 366
361 if (perl) 367 if (perl)
… …
381rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 387rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
382{ 388{
383 if (!perl || !term->perl.self) 389 if (!perl || !term->perl.self)
384 return false; 390 return false;
385 391
392 localise_env set_environ (perl_environ);
393
386 // pre-handling of some events 394 // pre-handling of some events
387 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
388 { 396 {
389 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));
390 398
391 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
393 } 401 }
394 402
395 swap (perl_environ, environ);
396
397 bool event_consumed; 403 bool event_consumed;
398 404
399 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
400 || term->perl.should_invoke [htype]) 406 || term->perl.should_invoke [htype])
401 try
402 { 407 {
403 dSP; 408 dSP;
404 va_list ap; 409 va_list ap;
405 410
406 va_start (ap, htype); 411 va_start (ap, htype);
407 412
408 ENTER; 413 ENTER;
409 SAVETMPS; 414 SAVETMPS;
410 415
411 PUSHMARK (SP); 416 PUSHMARK (SP);
412 417
418 EXTEND (SP, 2);
413 XPUSHs (sv_2mortal (newSVterm (term))); 419 PUSHs (sv_2mortal (newSVterm (term)));
414 XPUSHs (sv_2mortal (newSViv (htype))); 420 PUSHs (sv_2mortal (newSViv (htype)));
415 421
416 for (;;) { 422 for (;;) {
417 data_type dt = (data_type)va_arg (ap, int); 423 data_type dt = (data_type)va_arg (ap, int);
418 424
419 switch (dt) 425 switch (dt)
420 { 426 {
421 case DT_INT: 427 case DT_INT:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 428 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
423 break; 429 break;
424 430
425 case DT_LONG: 431 case DT_LONG:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 432 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
427 break; 433 break;
428 434
429 case DT_STR: 435 case DT_STR:
430 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 436 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
431 break; 437 break;
432 438
433 case DT_STR_LEN: 439 case DT_STR_LEN:
434 { 440 {
435 char *str = va_arg (ap, char *); 441 char *str = va_arg (ap, char *);
436 int len = va_arg (ap, int); 442 int len = va_arg (ap, int);
437 443
438 XPUSHs (sv_2mortal (newSVpvn (str, len))); 444 XPUSHs (sv_2mortal (newSVpvn (str, len)));
439 } 445 }
440 break; 446 break;
441 447
442 case DT_WCS_LEN: 448 case DT_WCS_LEN:
443 { 449 {
444 wchar_t *wstr = va_arg (ap, wchar_t *); 450 wchar_t *wstr = va_arg (ap, wchar_t *);
445 int wlen = va_arg (ap, int); 451 int wlen = va_arg (ap, int);
446 452
447 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 453 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
448 } 454 }
449 break; 455 break;
450 456
451 case DT_LCS_LEN: 457 case DT_LCS_LEN:
452 { 458 {
453 long *lstr = va_arg (ap, long *); 459 long *lstr = va_arg (ap, long *);
454 int llen = va_arg (ap, int); 460 int llen = va_arg (ap, int);
455 461
456 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 462 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
457 } 463 }
458 break; 464 break;
459 465
460 case DT_XEVENT: 466 case DT_XEVENT:
461 { 467 {
462 XEvent *xe = va_arg (ap, XEvent *); 468 XEvent *xe = va_arg (ap, XEvent *);
463 HV *hv = newHV (); 469 HV *hv = newHV ();
464 470
465# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 471# 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) 472# 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) 473# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
468# undef set 474# undef set
469 475
470 setiv (type, xe->type); 476 setiv (type, xe->type);
471 setiv (send_event, xe->xany.send_event); 477 setiv (send_event, xe->xany.send_event);
472 setiv (serial, xe->xany.serial); 478 setiv (serial, xe->xany.serial);
473 479
474 switch (xe->type) 480 switch (xe->type)
475 { 481 {
476 case KeyPress: 482 case KeyPress:
477 case KeyRelease: 483 case KeyRelease:
478 case ButtonPress: 484 case ButtonPress:
479 case ButtonRelease: 485 case ButtonRelease:
480 case MotionNotify: 486 case MotionNotify:
481 setuv (window, xe->xmotion.window); 487 setuv (window, xe->xmotion.window);
482 setuv (root, xe->xmotion.root); 488 setuv (root, xe->xmotion.root);
483 setuv (subwindow, xe->xmotion.subwindow); 489 setuv (subwindow, xe->xmotion.subwindow);
484 setuv (time, xe->xmotion.time); 490 setuv (time, xe->xmotion.time);
485 setiv (x, xe->xmotion.x); 491 setiv (x, xe->xmotion.x);
486 setiv (y, xe->xmotion.y); 492 setiv (y, xe->xmotion.y);
487 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 493 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
488 setiv (col, xe->xmotion.x / term->fwidth); 494 setiv (col, xe->xmotion.x / term->fwidth);
489 setiv (x_root, xe->xmotion.x_root); 495 setiv (x_root, xe->xmotion.x_root);
490 setiv (y_root, xe->xmotion.y_root); 496 setiv (y_root, xe->xmotion.y_root);
491 setuv (state, xe->xmotion.state); 497 setuv (state, xe->xmotion.state);
492 498
493 switch (xe->type) 499 switch (xe->type)
494 { 500 {
495 case KeyPress: 501 case KeyPress:
496 case KeyRelease: 502 case KeyRelease:
497 setuv (keycode, xe->xkey.keycode); 503 setuv (keycode, xe->xkey.keycode);
498 break; 504 break;
499 505
500 case ButtonPress: 506 case ButtonPress:
501 case ButtonRelease: 507 case ButtonRelease:
502 setuv (button, xe->xbutton.button); 508 setuv (button, xe->xbutton.button);
503 break; 509 break;
504 510
505 case MotionNotify: 511 case MotionNotify:
506 setiv (is_hint, xe->xmotion.is_hint); 512 setiv (is_hint, xe->xmotion.is_hint);
507 break; 513 break;
508 } 514 }
509 515
510 break; 516 break;
511 517
512 case MapNotify: 518 case MapNotify:
513 case UnmapNotify: 519 case UnmapNotify:
514 case ConfigureNotify: 520 case ConfigureNotify:
515 setuv (event, xe->xconfigure.event); 521 setuv (event, xe->xconfigure.event);
516 setuv (window, xe->xconfigure.window); 522 setuv (window, xe->xconfigure.window);
517 523
518 switch (xe->type) 524 switch (xe->type)
519 { 525 {
520 case ConfigureNotify: 526 case ConfigureNotify:
521 setiv (x, xe->xconfigure.x); 527 setiv (x, xe->xconfigure.x);
522 setiv (y, xe->xconfigure.y); 528 setiv (y, xe->xconfigure.y);
523 setiv (width, xe->xconfigure.width); 529 setiv (width, xe->xconfigure.width);
524 setiv (height, xe->xconfigure.height); 530 setiv (height, xe->xconfigure.height);
525 setuv (above, xe->xconfigure.above); 531 setuv (above, xe->xconfigure.above);
526 break; 532 break;
527 } 533 }
528 534
529 break; 535 break;
530 536
531 case PropertyNotify: 537 case PropertyNotify:
532 setuv (window, xe->xproperty.window); 538 setuv (window, xe->xproperty.window);
533 setuv (atom, xe->xproperty.atom); 539 setuv (atom, xe->xproperty.atom);
534 setuv (time, xe->xproperty.time); 540 setuv (time, xe->xproperty.time);
535 setiv (state, xe->xproperty.state); 541 setiv (state, xe->xproperty.state);
536 break; 542 break;
537 543
538 case ClientMessage: 544 case ClientMessage:
539 setuv (window, xe->xclient.window); 545 setuv (window, xe->xclient.window);
540 setuv (message_type, xe->xclient.message_type); 546 setuv (message_type, xe->xclient.message_type);
541 setuv (format, xe->xclient.format); 547 setuv (format, xe->xclient.format);
542 setuv (l0, xe->xclient.data.l[0]); 548 setuv (l0, xe->xclient.data.l[0]);
543 setuv (l1, xe->xclient.data.l[1]); 549 setuv (l1, xe->xclient.data.l[1]);
544 setuv (l2, xe->xclient.data.l[2]); 550 setuv (l2, xe->xclient.data.l[2]);
545 setuv (l3, xe->xclient.data.l[3]); 551 setuv (l3, xe->xclient.data.l[3]);
546 setuv (l4, xe->xclient.data.l[4]); 552 setuv (l4, xe->xclient.data.l[4]);
547 break; 553 break;
548 } 554 }
549 555
550 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 556 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
551 } 557 }
552 break; 558 break;
553 559
554 case DT_END: 560 case DT_END:
555 goto call; 561 goto call;
556 562
557 default: 563 default:
558 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 564 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
559 } 565 }
566 }
567
568 call:
569 va_end (ap);
570
571 PUTBACK;
572 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
573 SPAGAIN;
574
575 if (count)
576 {
577 SV *status = POPs;
578 count = SvTRUE (status);
560 } 579 }
561 580
562 call:
563 va_end (ap);
564
565 PUTBACK; 581 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; 582 FREETMPS;
577 LEAVE; 583 LEAVE;
578 584
579 if (SvTRUE (ERRSV)) 585 if (SvTRUE (ERRSV))
580 { 586 {
581 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
582 ungrab (term); // better lose the grab than the session 588 ungrab (term); // better lose the grab than the session
583 } 589 }
584 590
585 event_consumed = !!count; 591 event_consumed = !!count;
586 } 592 }
587 catch (...)
588 {
589 swap (perl_environ, environ);
590 throw;
591 }
592 else 593 else
593 event_consumed = false; 594 event_consumed = false;
594 595
595 // post-handling of some events 596 // post-handling of some events
596 if (htype == HOOK_REFRESH_BEGIN) 597 if (htype == HOOK_REFRESH_BEGIN)
… …
607 608
608 // don't allow further calls 609 // don't allow further calls
609 term->perl.self = 0; 610 term->perl.self = 0;
610 } 611 }
611 612
612 swap (perl_environ, environ);
613
614 return event_consumed; 613 return event_consumed;
614}
615
616void
617rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
618{
619 localise_env set_environ (perl_environ);
620
621 ENTER;
622 SAVETMPS;
623
624 dSP;
625 XPUSHs (sv_2mortal (newSVpvn (data, len)));
626 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
627
628 if (SvTRUE (ERRSV))
629 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
630
631 FREETMPS;
632 LEAVE;
615} 633}
616 634
617///////////////////////////////////////////////////////////////////////////// 635/////////////////////////////////////////////////////////////////////////////
618 636
619MODULE = urxvt PACKAGE = urxvt 637MODULE = urxvt PACKAGE = urxvt
… …
631# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 649# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
632# include "hookinc.h" 650# include "hookinc.h"
633# undef def 651# undef def
634 652
635 HV *option = get_hv ("urxvt::OPTION", 1); 653 HV *option = get_hv ("urxvt::OPTION", 1);
636# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 654# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
637# define nodef(name) 655# define nodef(name)
638# include "optinc.h" 656# include "optinc.h"
639# undef nodef 657# undef nodef
640# undef def 658# undef def
641 659
… …
643 static const struct { 661 static const struct {
644 const char *name; 662 const char *name;
645 IV iv; 663 IV iv;
646 } *civ, const_iv[] = { 664 } *civ, const_iv[] = {
647# define const_iv(name) { # name, (IV)name } 665# define const_iv(name) { # name, (IV)name }
666 const_iv (NUM_RESOURCES),
648 const_iv (DEFAULT_RSTYLE), 667 const_iv (DEFAULT_RSTYLE),
649 const_iv (OVERLAY_RSTYLE), 668 const_iv (OVERLAY_RSTYLE),
669 const_iv (Color_Bits),
670 const_iv (RS_bgShift), const_iv (RS_bgMask),
671 const_iv (RS_fgShift), const_iv (RS_fgMask),
672 const_iv (RS_Careful),
673 const_iv (RS_fontCount),
674 const_iv (RS_fontShift),
675 const_iv (RS_fontMask),
676 const_iv (RS_baseattrMask),
677 const_iv (RS_attrMask),
678 const_iv (RS_redraw),
679 const_iv (RS_Sel),
650 const_iv (RS_Bold), 680 const_iv (RS_Bold),
651 const_iv (RS_Italic), 681 const_iv (RS_Italic),
652 const_iv (RS_Blink), 682 const_iv (RS_Blink),
653 const_iv (RS_RVid), 683 const_iv (RS_RVid),
654 const_iv (RS_Uline), 684 const_iv (RS_Uline),
… …
758 const_iv (XIMDontChange), 788 const_iv (XIMDontChange),
759# endif 789# endif
760# endif 790# endif
761 }; 791 };
762 792
763 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; )
764 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
765} 795}
766 796
767void 797void
768warn (const char *msg) 798warn (const char *msg)
… …
1046 OUTPUT: 1076 OUTPUT:
1047 RETVAL 1077 RETVAL
1048 1078
1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1079#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1050 1080
1051#define TERM_OFFSET_width TERM_OFFSET(width) 1081#define TERM_OFFSET_width TERM_OFFSET(width)
1052#define TERM_OFFSET_height TERM_OFFSET(height) 1082#define TERM_OFFSET_height TERM_OFFSET(height)
1053#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1083#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1054#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1084#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1055#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1085#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1056#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1086#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1057#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1087#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1058#define TERM_OFFSET_focus TERM_OFFSET(focus) 1088#define TERM_OFFSET_focus TERM_OFFSET(focus)
1059#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1089#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1060#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1090#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1061#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1091#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1062#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1092#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1093#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1063#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1094#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1064#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1095#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1065#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1096#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1066 1097
1067int 1098int
1068rxvt_term::width () 1099rxvt_term::width ()
1069 ALIAS: 1100 ALIAS:
1070 width = TERM_OFFSET_width 1101 width = TERM_OFFSET_width
1071 height = TERM_OFFSET_height 1102 height = TERM_OFFSET_height
1072 fwidth = TERM_OFFSET_fwidth 1103 fwidth = TERM_OFFSET_fwidth
1073 fheight = TERM_OFFSET_fheight 1104 fheight = TERM_OFFSET_fheight
1074 fbase = TERM_OFFSET_fbase 1105 fbase = TERM_OFFSET_fbase
1075 nrow = TERM_OFFSET_nrow 1106 nrow = TERM_OFFSET_nrow
1076 ncol = TERM_OFFSET_ncol 1107 ncol = TERM_OFFSET_ncol
1077 focus = TERM_OFFSET_focus 1108 focus = TERM_OFFSET_focus
1078 mapped = TERM_OFFSET_mapped 1109 mapped = TERM_OFFSET_mapped
1079 int_bwidth = TERM_OFFSET_int_bwidth 1110 int_bwidth = TERM_OFFSET_int_bwidth
1080 ext_bwidth = TERM_OFFSET_ext_bwidth 1111 ext_bwidth = TERM_OFFSET_ext_bwidth
1081 lineSpace = TERM_OFFSET_lineSpace 1112 lineSpace = TERM_OFFSET_lineSpace
1113 letterSpace = TERM_OFFSET_letterSpace
1082 saveLines = TERM_OFFSET_saveLines 1114 saveLines = TERM_OFFSET_saveLines
1083 total_rows = TERM_OFFSET_total_rows 1115 total_rows = TERM_OFFSET_total_rows
1084 top_row = TERM_OFFSET_top_row 1116 top_row = TERM_OFFSET_top_row
1085 CODE: 1117 CODE:
1086 RETVAL = *(int *)((char *)THIS + ix); 1118 RETVAL = *(int *)((char *)THIS + ix);
1087 OUTPUT: 1119 OUTPUT:
1088 RETVAL 1120 RETVAL
1089 1121
… …
1100 { 1132 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1133 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1134 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1135 case 2: RETVAL = THIS->ModNumLockMask; break;
1104 case 3: RETVAL = THIS->current_screen; break; 1136 case 3: RETVAL = THIS->current_screen; break;
1137#ifdef CURSOR_BLINK
1105 case 4: RETVAL = THIS->hidden_cursor; break; 1138 case 4: RETVAL = THIS->hidden_cursor; break;
1139#endif
1106 } 1140 }
1107 OUTPUT: 1141 OUTPUT:
1108 RETVAL 1142 RETVAL
1109 1143
1110char * 1144char *
… …
1432# include "rsinc.h" 1466# include "rsinc.h"
1433# undef def 1467# undef def
1434# undef reserve 1468# undef reserve
1435 }; 1469 };
1436 1470
1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1471 rs = rslist + ARRAY_LENGTH(rslist);
1438 1472
1473 if (*name)
1439 do { 1474 {
1475 do {
1440 if (rs-- == rslist) 1476 if (rs-- == rslist)
1441 croak ("no such resource '%s', requested", name); 1477 croak ("no such resource '%s', requested", name);
1442 } while (strcmp (name, rs->name)); 1478 } while (strcmp (name, rs->name));
1443 1479
1444 index += rs->value; 1480 index += rs->value;
1481 }
1482 else
1483 {
1484 --rs;
1485 name = "";
1486 }
1445 1487
1446 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1488 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1447 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1489 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1448 1490
1449 if (GIMME_V != G_VOID) 1491 if (GIMME_V != G_VOID)
… …
1529 EXTEND (SP, 2); 1571 EXTEND (SP, 2);
1530 PUSHs (sv_2mortal (newSViv (rc.row))); 1572 PUSHs (sv_2mortal (newSViv (rc.row)));
1531 PUSHs (sv_2mortal (newSViv (rc.col))); 1573 PUSHs (sv_2mortal (newSViv (rc.col)));
1532 } 1574 }
1533 1575
1534 if (items == 3) 1576 if (items >= 3)
1535 { 1577 {
1536 rc.row = SvIV (ST (1)); 1578 rc.row = SvIV (ST (1));
1537 rc.col = SvIV (ST (2)); 1579 rc.col = SvIV (ST (2));
1538 1580
1539 if (ix == 2) 1581 if (ix == 2)
… …
1555 clamp_it (rc.col, 0, THIS->ncol); 1597 clamp_it (rc.col, 0, THIS->ncol);
1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1598 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1557 1599
1558 if (ix) 1600 if (ix)
1559 { 1601 {
1602 THIS->selection.screen = THIS->current_screen;
1603
1560 THIS->want_refresh = 1; 1604 THIS->want_refresh = 1;
1561 THIS->refresh_check (); 1605 THIS->refresh_check ();
1562 } 1606 }
1563 } 1607 }
1564} 1608}
1565 1609
1566char 1610int
1567rxvt_term::cur_charset () 1611rxvt_term::selection_screen (int screen = -1)
1568 CODE: 1612 CODE:
1569 RETVAL = THIS->charsets [THIS->screen.charset]; 1613 RETVAL = THIS->selection.screen;
1570 OUTPUT: 1614 if (screen >= 0)
1615 THIS->selection.screen = screen;
1616 OUTPUT:
1571 RETVAL 1617 RETVAL
1572 1618
1573void 1619void
1574rxvt_term::selection_clear () 1620rxvt_term::selection_clear (bool clipboard = false)
1575 1621
1576void 1622void
1577rxvt_term::selection_make (Time eventtime, bool rect = false) 1623rxvt_term::selection_make (Time eventtime, bool rect = false)
1578 CODE: 1624 CODE:
1579 THIS->selection.op = SELECTION_CONT; 1625 THIS->selection.op = SELECTION_CONT;
1580 THIS->selection.rect = rect; 1626 THIS->selection.rect = rect;
1581 THIS->selection_make (eventtime); 1627 THIS->selection_make (eventtime);
1582 1628
1583int 1629int
1584rxvt_term::selection_grab (Time eventtime) 1630rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1585 1631
1586void 1632void
1587rxvt_term::selection (SV *newtext = 0) 1633rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1588 PPCODE: 1634 PPCODE:
1589{ 1635{
1636 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1637 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1638
1590 if (GIMME_V != G_VOID) 1639 if (GIMME_V != G_VOID)
1591 XPUSHs (THIS->selection.text 1640 XPUSHs (text
1592 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1641 ? sv_2mortal (wcs2sv (text, len))
1593 : &PL_sv_undef); 1642 : &PL_sv_undef);
1594 1643
1595 if (newtext) 1644 if (newtext)
1596 { 1645 {
1597 free (THIS->selection.text); 1646 free (text);
1598 1647
1599 THIS->selection.text = sv2wcs (newtext); 1648 text = sv2wcs (newtext);
1600 THIS->selection.len = wcslen (THIS->selection.text); 1649 len = wcslen (text);
1601 } 1650 }
1602} 1651}
1652
1653char
1654rxvt_term::cur_charset ()
1655 CODE:
1656 RETVAL = THIS->charsets [THIS->screen.charset];
1657 OUTPUT:
1658 RETVAL
1603 1659
1604void 1660void
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) 1661rxvt_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 1662
1607void 1663void
… …
1629 char *str = SvPVbyte (octets, len); 1685 char *str = SvPVbyte (octets, len);
1630 C_ARGS: 1686 C_ARGS:
1631 str, len 1687 str, len
1632 1688
1633void 1689void
1690rxvt_term::tt_paste (SV *octets)
1691 INIT:
1692 STRLEN len;
1693 char *str = SvPVbyte (octets, len);
1694 C_ARGS:
1695 str, len
1696
1697void
1634rxvt_term::cmd_parse (SV *octets) 1698rxvt_term::cmd_parse (SV *octets)
1635 CODE: 1699 CODE:
1636{ 1700{
1637 STRLEN len; 1701 STRLEN len;
1638 char *str = SvPVbyte (octets, len); 1702 char *str = SvPVbyte (octets, len);
… …
1707 XFree (prop); 1771 XFree (prop);
1708 } 1772 }
1709} 1773}
1710 1774
1711void 1775void
1712rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1776rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1713 CODE: 1777 CODE:
1714{ 1778{
1715 STRLEN len; 1779 STRLEN len;
1716 char *data_ = SvPVbyte (data, len); 1780 char *data_ = SvPVbyte (data, len);
1717 1781

Diff Legend

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