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.118 by root, Fri Dec 14 05:25:25 2007 UTC vs.
Revision 1.142 by sf-exg, Fri Jul 1 19:07:08 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->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;
310 312
… …
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 = ecb_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)
362 { 368 {
363 // runs outside of perls ENV 369 // runs outside of perls ENV
364 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
365 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 371 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
366 } 373 }
367} 374}
368 375
369static void 376static void
370ungrab (rxvt_term *THIS) 377ungrab (rxvt_term *THIS)
… …
381rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 388rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
382{ 389{
383 if (!perl || !term->perl.self) 390 if (!perl || !term->perl.self)
384 return false; 391 return false;
385 392
393 localise_env set_environ (perl_environ);
394
386 // pre-handling of some events 395 // pre-handling of some events
387 if (htype == HOOK_REFRESH_END) 396 if (htype == HOOK_REFRESH_END)
388 { 397 {
389 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 398 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
390 399
391 for (int i = 0; i <= AvFILL (av); i++) 400 for (int i = 0; i <= AvFILL (av); i++)
392 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 401 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
393 } 402 }
403 else if (htype == HOOK_DESTROY)
404 {
405 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
394 406
395 swap (perl_environ, environ); 407 for (int i = AvFILL (av); i >= 0; i--)
408 {
409 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
410 delete req;
411 }
412 }
396 413
397 bool event_consumed; 414 bool event_consumed;
398 415
399 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 416 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
400 || term->perl.should_invoke [htype]) 417 || term->perl.should_invoke [htype])
401 try
402 { 418 {
403 dSP; 419 dSP;
404 va_list ap; 420 va_list ap;
405 421
406 va_start (ap, htype); 422 va_start (ap, htype);
407 423
408 ENTER; 424 ENTER;
409 SAVETMPS; 425 SAVETMPS;
410 426
411 PUSHMARK (SP); 427 PUSHMARK (SP);
412 428
429 EXTEND (SP, 2);
413 XPUSHs (sv_2mortal (newSVterm (term))); 430 PUSHs (sv_2mortal (newSVterm (term)));
414 XPUSHs (sv_2mortal (newSViv (htype))); 431 PUSHs (sv_2mortal (newSViv (htype)));
415 432
416 for (;;) { 433 for (;;) {
417 data_type dt = (data_type)va_arg (ap, int); 434 data_type dt = (data_type)va_arg (ap, int);
418 435
419 switch (dt) 436 switch (dt)
420 { 437 {
421 case DT_INT: 438 case DT_INT:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 439 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
423 break; 440 break;
424 441
425 case DT_LONG: 442 case DT_LONG:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 443 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
427 break; 444 break;
428 445
429 case DT_STR: 446 case DT_STR:
430 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 447 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
431 break; 448 break;
432 449
433 case DT_STR_LEN: 450 case DT_STR_LEN:
434 { 451 {
435 char *str = va_arg (ap, char *); 452 char *str = va_arg (ap, char *);
436 int len = va_arg (ap, int); 453 int len = va_arg (ap, int);
437 454
438 XPUSHs (sv_2mortal (newSVpvn (str, len))); 455 XPUSHs (sv_2mortal (newSVpvn (str, len)));
439 } 456 }
440 break; 457 break;
441 458
442 case DT_WCS_LEN: 459 case DT_WCS_LEN:
443 { 460 {
444 wchar_t *wstr = va_arg (ap, wchar_t *); 461 wchar_t *wstr = va_arg (ap, wchar_t *);
445 int wlen = va_arg (ap, int); 462 int wlen = va_arg (ap, int);
446 463
447 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 464 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
448 } 465 }
449 break; 466 break;
450 467
451 case DT_LCS_LEN: 468 case DT_LCS_LEN:
452 { 469 {
453 long *lstr = va_arg (ap, long *); 470 long *lstr = va_arg (ap, long *);
454 int llen = va_arg (ap, int); 471 int llen = va_arg (ap, int);
455 472
456 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 473 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
457 } 474 }
458 break; 475 break;
459 476
460 case DT_XEVENT: 477 case DT_XEVENT:
461 { 478 {
462 XEvent *xe = va_arg (ap, XEvent *); 479 XEvent *xe = va_arg (ap, XEvent *);
463 HV *hv = newHV (); 480 HV *hv = newHV ();
464 481
465# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 482# 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) 483# 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) 484# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
468# undef set 485# undef set
469 486
470 setiv (type, xe->type); 487 setiv (type, xe->type);
471 setiv (send_event, xe->xany.send_event); 488 setiv (send_event, xe->xany.send_event);
472 setiv (serial, xe->xany.serial); 489 setiv (serial, xe->xany.serial);
473 490
474 switch (xe->type) 491 switch (xe->type)
475 { 492 {
476 case KeyPress: 493 case KeyPress:
477 case KeyRelease: 494 case KeyRelease:
478 case ButtonPress: 495 case ButtonPress:
479 case ButtonRelease: 496 case ButtonRelease:
480 case MotionNotify: 497 case MotionNotify:
481 setuv (window, xe->xmotion.window); 498 setuv (window, xe->xmotion.window);
482 setuv (root, xe->xmotion.root); 499 setuv (root, xe->xmotion.root);
483 setuv (subwindow, xe->xmotion.subwindow); 500 setuv (subwindow, xe->xmotion.subwindow);
484 setuv (time, xe->xmotion.time); 501 setuv (time, xe->xmotion.time);
485 setiv (x, xe->xmotion.x); 502 setiv (x, xe->xmotion.x);
486 setiv (y, xe->xmotion.y); 503 setiv (y, xe->xmotion.y);
487 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 504 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
488 setiv (col, xe->xmotion.x / term->fwidth); 505 setiv (col, xe->xmotion.x / term->fwidth);
489 setiv (x_root, xe->xmotion.x_root); 506 setiv (x_root, xe->xmotion.x_root);
490 setiv (y_root, xe->xmotion.y_root); 507 setiv (y_root, xe->xmotion.y_root);
491 setuv (state, xe->xmotion.state); 508 setuv (state, xe->xmotion.state);
492 509
493 switch (xe->type) 510 switch (xe->type)
494 { 511 {
495 case KeyPress: 512 case KeyPress:
496 case KeyRelease: 513 case KeyRelease:
497 setuv (keycode, xe->xkey.keycode); 514 setuv (keycode, xe->xkey.keycode);
498 break; 515 break;
499 516
500 case ButtonPress: 517 case ButtonPress:
501 case ButtonRelease: 518 case ButtonRelease:
502 setuv (button, xe->xbutton.button); 519 setuv (button, xe->xbutton.button);
503 break; 520 break;
504 521
505 case MotionNotify: 522 case MotionNotify:
506 setiv (is_hint, xe->xmotion.is_hint); 523 setiv (is_hint, xe->xmotion.is_hint);
507 break; 524 break;
508 } 525 }
509 526
510 break; 527 break;
511 528
512 case MapNotify: 529 case MapNotify:
513 case UnmapNotify: 530 case UnmapNotify:
514 case ConfigureNotify: 531 case ConfigureNotify:
515 setuv (event, xe->xconfigure.event); 532 setuv (event, xe->xconfigure.event);
516 setuv (window, xe->xconfigure.window); 533 setuv (window, xe->xconfigure.window);
517 534
518 switch (xe->type) 535 switch (xe->type)
519 { 536 {
520 case ConfigureNotify: 537 case ConfigureNotify:
521 setiv (x, xe->xconfigure.x); 538 setiv (x, xe->xconfigure.x);
522 setiv (y, xe->xconfigure.y); 539 setiv (y, xe->xconfigure.y);
523 setiv (width, xe->xconfigure.width); 540 setiv (width, xe->xconfigure.width);
524 setiv (height, xe->xconfigure.height); 541 setiv (height, xe->xconfigure.height);
525 setuv (above, xe->xconfigure.above); 542 setuv (above, xe->xconfigure.above);
526 break; 543 break;
527 } 544 }
528 545
529 break; 546 break;
530 547
531 case PropertyNotify: 548 case PropertyNotify:
532 setuv (window, xe->xproperty.window); 549 setuv (window, xe->xproperty.window);
533 setuv (atom, xe->xproperty.atom); 550 setuv (atom, xe->xproperty.atom);
534 setuv (time, xe->xproperty.time); 551 setuv (time, xe->xproperty.time);
535 setiv (state, xe->xproperty.state); 552 setiv (state, xe->xproperty.state);
536 break; 553 break;
537 554
538 case ClientMessage: 555 case ClientMessage:
539 setuv (window, xe->xclient.window); 556 setuv (window, xe->xclient.window);
540 setuv (message_type, xe->xclient.message_type); 557 setuv (message_type, xe->xclient.message_type);
541 setuv (format, xe->xclient.format); 558 setuv (format, xe->xclient.format);
542 setuv (l0, xe->xclient.data.l[0]); 559 setuv (l0, xe->xclient.data.l[0]);
543 setuv (l1, xe->xclient.data.l[1]); 560 setuv (l1, xe->xclient.data.l[1]);
544 setuv (l2, xe->xclient.data.l[2]); 561 setuv (l2, xe->xclient.data.l[2]);
545 setuv (l3, xe->xclient.data.l[3]); 562 setuv (l3, xe->xclient.data.l[3]);
546 setuv (l4, xe->xclient.data.l[4]); 563 setuv (l4, xe->xclient.data.l[4]);
547 break; 564 break;
548 } 565 }
549 566
550 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
551 } 568 }
552 break; 569 break;
553 570
554 case DT_END: 571 case DT_END:
555 goto call; 572 goto call;
556 573
557 default: 574 default:
558 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
559 } 576 }
577 }
578
579 call:
580 va_end (ap);
581
582 PUTBACK;
583 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
584 SPAGAIN;
585
586 if (count)
587 {
588 SV *status = POPs;
589 count = SvTRUE (status);
560 } 590 }
561 591
562 call:
563 va_end (ap);
564
565 PUTBACK; 592 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; 593 FREETMPS;
577 LEAVE; 594 LEAVE;
578 595
579 if (SvTRUE (ERRSV)) 596 if (SvTRUE (ERRSV))
580 { 597 {
581 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 598 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
582 ungrab (term); // better lose the grab than the session 599 ungrab (term); // better lose the grab than the session
583 } 600 }
584 601
585 event_consumed = !!count; 602 event_consumed = !!count;
586 } 603 }
587 catch (...)
588 {
589 swap (perl_environ, environ);
590 throw;
591 }
592 else 604 else
593 event_consumed = false; 605 event_consumed = false;
594 606
595 // post-handling of some events 607 // post-handling of some events
596 if (htype == HOOK_REFRESH_BEGIN) 608 if (htype == HOOK_REFRESH_BEGIN)
… …
607 619
608 // don't allow further calls 620 // don't allow further calls
609 term->perl.self = 0; 621 term->perl.self = 0;
610 } 622 }
611 623
612 swap (perl_environ, environ);
613
614 return event_consumed; 624 return event_consumed;
625}
626
627void
628rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
629{
630 localise_env set_environ (perl_environ);
631
632 ENTER;
633 SAVETMPS;
634
635 dSP;
636 XPUSHs (sv_2mortal (newSVpvn (data, len)));
637 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
638
639 if (SvTRUE (ERRSV))
640 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
641
642 FREETMPS;
643 LEAVE;
615} 644}
616 645
617///////////////////////////////////////////////////////////////////////////// 646/////////////////////////////////////////////////////////////////////////////
618 647
619MODULE = urxvt PACKAGE = urxvt 648MODULE = urxvt PACKAGE = urxvt
… …
631# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 660# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
632# include "hookinc.h" 661# include "hookinc.h"
633# undef def 662# undef def
634 663
635 HV *option = get_hv ("urxvt::OPTION", 1); 664 HV *option = get_hv ("urxvt::OPTION", 1);
636# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 665# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
637# define nodef(name) 666# define nodef(name)
638# include "optinc.h" 667# include "optinc.h"
639# undef nodef 668# undef nodef
640# undef def 669# undef def
641 670
… …
643 static const struct { 672 static const struct {
644 const char *name; 673 const char *name;
645 IV iv; 674 IV iv;
646 } *civ, const_iv[] = { 675 } *civ, const_iv[] = {
647# define const_iv(name) { # name, (IV)name } 676# define const_iv(name) { # name, (IV)name }
677 const_iv (NUM_RESOURCES),
648 const_iv (DEFAULT_RSTYLE), 678 const_iv (DEFAULT_RSTYLE),
649 const_iv (OVERLAY_RSTYLE), 679 const_iv (OVERLAY_RSTYLE),
680 const_iv (Color_Bits),
681 const_iv (RS_bgShift), const_iv (RS_bgMask),
682 const_iv (RS_fgShift), const_iv (RS_fgMask),
683 const_iv (RS_Careful),
684 const_iv (RS_fontCount),
685 const_iv (RS_fontShift),
686 const_iv (RS_fontMask),
687 const_iv (RS_baseattrMask),
688 const_iv (RS_attrMask),
689 const_iv (RS_redraw),
690 const_iv (RS_Sel),
650 const_iv (RS_Bold), 691 const_iv (RS_Bold),
651 const_iv (RS_Italic), 692 const_iv (RS_Italic),
652 const_iv (RS_Blink), 693 const_iv (RS_Blink),
653 const_iv (RS_RVid), 694 const_iv (RS_RVid),
654 const_iv (RS_Uline), 695 const_iv (RS_Uline),
… …
758 const_iv (XIMDontChange), 799 const_iv (XIMDontChange),
759# endif 800# endif
760# endif 801# endif
761 }; 802 };
762 803
763 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 804 for (civ = const_iv + ecb_array_length (const_iv); civ-- > const_iv; )
764 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 805 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
765} 806}
766 807
767void 808void
768warn (const char *msg) 809warn (const char *msg)
… …
840 881
841 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 882 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
842 if ((*t)->perl.self) 883 if ((*t)->perl.self)
843 PUSHs (sv_2mortal (newSVterm (*t))); 884 PUSHs (sv_2mortal (newSVterm (*t)));
844} 885}
886
887IV
888_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
889 CODE:
890 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
891 req->cb_sv = newSVsv (cb);
892 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
893 av_push (av, newSViv ((IV)req));
894 RETVAL = (IV)req;
895 OUTPUT:
896 RETVAL
897
898void
899_delete_selection_request (IV req_)
900 CODE:
901 rxvt_selection *req = (rxvt_selection *)req_;
902 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
903 int i;
904
905 for (i = AvFILL (av); i >= 0; i--)
906 if (SvIV (*av_fetch (av, i, 1)) == req_)
907 break;
908
909 for (; i < AvFILL (av); i++)
910 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
911
912 av_pop (av);
913
914 delete req;
845 915
846MODULE = urxvt PACKAGE = urxvt::term 916MODULE = urxvt PACKAGE = urxvt::term
847 917
848SV * 918SV *
849_new (AV *env, AV *arg) 919_new (AV *env, AV *arg)
… …
1046 OUTPUT: 1116 OUTPUT:
1047 RETVAL 1117 RETVAL
1048 1118
1049#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1119#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1050 1120
1051#define TERM_OFFSET_width TERM_OFFSET(width) 1121#define TERM_OFFSET_width TERM_OFFSET(width)
1052#define TERM_OFFSET_height TERM_OFFSET(height) 1122#define TERM_OFFSET_height TERM_OFFSET(height)
1053#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1123#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1054#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1124#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1055#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1125#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1056#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1126#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1057#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1127#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1058#define TERM_OFFSET_focus TERM_OFFSET(focus) 1128#define TERM_OFFSET_focus TERM_OFFSET(focus)
1059#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1129#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1060#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1130#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1061#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1131#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1062#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1132#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1133#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1063#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1134#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1064#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1135#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1065#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1136#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1066 1137
1067int 1138int
1068rxvt_term::width () 1139rxvt_term::width ()
1069 ALIAS: 1140 ALIAS:
1070 width = TERM_OFFSET_width 1141 width = TERM_OFFSET_width
1071 height = TERM_OFFSET_height 1142 height = TERM_OFFSET_height
1072 fwidth = TERM_OFFSET_fwidth 1143 fwidth = TERM_OFFSET_fwidth
1073 fheight = TERM_OFFSET_fheight 1144 fheight = TERM_OFFSET_fheight
1074 fbase = TERM_OFFSET_fbase 1145 fbase = TERM_OFFSET_fbase
1075 nrow = TERM_OFFSET_nrow 1146 nrow = TERM_OFFSET_nrow
1076 ncol = TERM_OFFSET_ncol 1147 ncol = TERM_OFFSET_ncol
1077 focus = TERM_OFFSET_focus 1148 focus = TERM_OFFSET_focus
1078 mapped = TERM_OFFSET_mapped 1149 mapped = TERM_OFFSET_mapped
1079 int_bwidth = TERM_OFFSET_int_bwidth 1150 int_bwidth = TERM_OFFSET_int_bwidth
1080 ext_bwidth = TERM_OFFSET_ext_bwidth 1151 ext_bwidth = TERM_OFFSET_ext_bwidth
1081 lineSpace = TERM_OFFSET_lineSpace 1152 lineSpace = TERM_OFFSET_lineSpace
1153 letterSpace = TERM_OFFSET_letterSpace
1082 saveLines = TERM_OFFSET_saveLines 1154 saveLines = TERM_OFFSET_saveLines
1083 total_rows = TERM_OFFSET_total_rows 1155 total_rows = TERM_OFFSET_total_rows
1084 top_row = TERM_OFFSET_top_row 1156 top_row = TERM_OFFSET_top_row
1085 CODE: 1157 CODE:
1086 RETVAL = *(int *)((char *)THIS + ix); 1158 RETVAL = *(int *)((char *)THIS + ix);
1087 OUTPUT: 1159 OUTPUT:
1088 RETVAL 1160 RETVAL
1089 1161
… …
1100 { 1172 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1173 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1174 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1175 case 2: RETVAL = THIS->ModNumLockMask; break;
1104 case 3: RETVAL = THIS->current_screen; break; 1176 case 3: RETVAL = THIS->current_screen; break;
1177#ifdef CURSOR_BLINK
1105 case 4: RETVAL = THIS->hidden_cursor; break; 1178 case 4: RETVAL = THIS->hidden_cursor; break;
1179#endif
1106 } 1180 }
1107 OUTPUT: 1181 OUTPUT:
1108 RETVAL 1182 RETVAL
1109 1183
1110char * 1184char *
… …
1153 RETVAL 1227 RETVAL
1154 1228
1155Window 1229Window
1156rxvt_term::parent () 1230rxvt_term::parent ()
1157 CODE: 1231 CODE:
1158 RETVAL = THIS->parent [0]; 1232 RETVAL = THIS->parent;
1159 OUTPUT: 1233 OUTPUT:
1160 RETVAL 1234 RETVAL
1161 1235
1162Window 1236Window
1163rxvt_term::vt () 1237rxvt_term::vt ()
… …
1432# include "rsinc.h" 1506# include "rsinc.h"
1433# undef def 1507# undef def
1434# undef reserve 1508# undef reserve
1435 }; 1509 };
1436 1510
1437 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1511 rs = rslist + ecb_array_length (rslist);
1438 1512
1513 if (*name)
1439 do { 1514 {
1515 do {
1440 if (rs-- == rslist) 1516 if (rs-- == rslist)
1441 croak ("no such resource '%s', requested", name); 1517 croak ("no such resource '%s', requested", name);
1442 } while (strcmp (name, rs->name)); 1518 } while (strcmp (name, rs->name));
1443 1519
1444 index += rs->value; 1520 index += rs->value;
1521 }
1522 else
1523 {
1524 --rs;
1525 name = "";
1526 }
1445 1527
1446 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1528 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1447 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1529 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1448 1530
1449 if (GIMME_V != G_VOID) 1531 if (GIMME_V != G_VOID)
… …
1529 EXTEND (SP, 2); 1611 EXTEND (SP, 2);
1530 PUSHs (sv_2mortal (newSViv (rc.row))); 1612 PUSHs (sv_2mortal (newSViv (rc.row)));
1531 PUSHs (sv_2mortal (newSViv (rc.col))); 1613 PUSHs (sv_2mortal (newSViv (rc.col)));
1532 } 1614 }
1533 1615
1534 if (items == 3) 1616 if (items >= 3)
1535 { 1617 {
1536 rc.row = SvIV (ST (1)); 1618 rc.row = SvIV (ST (1));
1537 rc.col = SvIV (ST (2)); 1619 rc.col = SvIV (ST (2));
1538 1620
1539 if (ix == 2) 1621 if (ix == 2)
… …
1555 clamp_it (rc.col, 0, THIS->ncol); 1637 clamp_it (rc.col, 0, THIS->ncol);
1556 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1638 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1557 1639
1558 if (ix) 1640 if (ix)
1559 { 1641 {
1642 THIS->selection.screen = THIS->current_screen;
1643
1560 THIS->want_refresh = 1; 1644 THIS->want_refresh = 1;
1561 THIS->refresh_check (); 1645 THIS->refresh_check ();
1562 } 1646 }
1563 } 1647 }
1564} 1648}
1565 1649
1566char 1650int
1567rxvt_term::cur_charset () 1651rxvt_term::selection_screen (int screen = -1)
1568 CODE: 1652 CODE:
1569 RETVAL = THIS->charsets [THIS->screen.charset]; 1653 RETVAL = THIS->selection.screen;
1570 OUTPUT: 1654 if (screen >= 0)
1655 THIS->selection.screen = screen;
1656 OUTPUT:
1571 RETVAL 1657 RETVAL
1572 1658
1573void 1659void
1574rxvt_term::selection_clear () 1660rxvt_term::selection_clear (bool clipboard = false)
1575 1661
1576void 1662void
1577rxvt_term::selection_make (Time eventtime, bool rect = false) 1663rxvt_term::selection_make (Time eventtime, bool rect = false)
1578 CODE: 1664 CODE:
1579 THIS->selection.op = SELECTION_CONT; 1665 THIS->selection.op = SELECTION_CONT;
1580 THIS->selection.rect = rect; 1666 THIS->selection.rect = rect;
1581 THIS->selection_make (eventtime); 1667 THIS->selection_make (eventtime);
1582 1668
1583int 1669int
1584rxvt_term::selection_grab (Time eventtime) 1670rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1585 1671
1586void 1672void
1587rxvt_term::selection (SV *newtext = 0) 1673rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1588 PPCODE: 1674 PPCODE:
1589{ 1675{
1676 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1677 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1678
1590 if (GIMME_V != G_VOID) 1679 if (GIMME_V != G_VOID)
1591 XPUSHs (THIS->selection.text 1680 XPUSHs (text
1592 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1681 ? sv_2mortal (wcs2sv (text, len))
1593 : &PL_sv_undef); 1682 : &PL_sv_undef);
1594 1683
1595 if (newtext) 1684 if (newtext)
1596 { 1685 {
1597 free (THIS->selection.text); 1686 free (text);
1598 1687
1599 THIS->selection.text = sv2wcs (newtext); 1688 text = sv2wcs (newtext);
1600 THIS->selection.len = wcslen (THIS->selection.text); 1689 len = wcslen (text);
1601 } 1690 }
1602} 1691}
1692
1693char
1694rxvt_term::cur_charset ()
1695 CODE:
1696 RETVAL = THIS->charsets [THIS->screen.charset];
1697 OUTPUT:
1698 RETVAL
1603 1699
1604void 1700void
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) 1701rxvt_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 1702
1607void 1703void
… …
1629 char *str = SvPVbyte (octets, len); 1725 char *str = SvPVbyte (octets, len);
1630 C_ARGS: 1726 C_ARGS:
1631 str, len 1727 str, len
1632 1728
1633void 1729void
1730rxvt_term::tt_paste (SV *octets)
1731 INIT:
1732 STRLEN len;
1733 char *str = SvPVbyte (octets, len);
1734 C_ARGS:
1735 str, len
1736
1737void
1634rxvt_term::cmd_parse (SV *octets) 1738rxvt_term::cmd_parse (SV *octets)
1635 CODE: 1739 CODE:
1636{ 1740{
1637 STRLEN len; 1741 STRLEN len;
1638 char *str = SvPVbyte (octets, len); 1742 char *str = SvPVbyte (octets, len);
… …
1707 XFree (prop); 1811 XFree (prop);
1708 } 1812 }
1709} 1813}
1710 1814
1711void 1815void
1712rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1816rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1713 CODE: 1817 CODE:
1714{ 1818{
1715 STRLEN len; 1819 STRLEN len;
1716 char *data_ = SvPVbyte (data, len); 1820 char *data_ = SvPVbyte (data, len);
1717 1821

Diff Legend

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