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.123 by root, Sun Jun 15 14:54:44 2008 UTC vs.
Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 2012 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.
… …
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "ev_cpp.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
… …
107 108
108///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
109 110
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 111#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 112
112class overlay { 113class overlay : overlay_base
114{
113 rxvt_term *THIS; 115 rxvt_term *THIS;
114 AV *overlay_av; 116 AV *overlay_av;
115 int x, y, w, h;
116 int border; 117 int border;
117 text_t **text;
118 rend_t **rend;
119 118
120public: 119public:
121 HV *self; 120 HV *self;
122 121
123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 122 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
130 129
131 void set (int x, int y, SV *str, SV *rend); 130 void set (int x, int y, SV *str, SV *rend);
132}; 131};
133 132
134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 133overlay::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) 134: THIS(THIS), border(border == 2), overlay_av (0)
136{ 135{
136 x = x_;
137 y = y_;
138 w = w_;
139 h = h_;
140
137 if (w < 0) w = 0; 141 if (w < 0) w = 0;
138 if (h < 0) h = 0; 142 if (h < 0) h = 0;
139 143
140 if (border == 2) 144 if (border == 2)
141 { 145 {
… …
245 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 249 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
246 250
247 int ov_w = min (w, THIS->ncol - ov_x); 251 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 252 int ov_h = min (h, THIS->nrow - ov_y);
249 253
254 // hide cursor if it is within the overlay area
255 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
256 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
257 THIS->screen.flags &= ~Screen_VisibleCursor;
258
250 for (int y = ov_h; y--; ) 259 for (int y = ov_h; y--; )
251 { 260 {
252 text_t *t1 = text [y]; 261 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 262 rend_t *r1 = rend [y];
254 263
… …
294 THIS->refresh_check (); 303 THIS->refresh_check ();
295} 304}
296 305
297///////////////////////////////////////////////////////////////////////////// 306/////////////////////////////////////////////////////////////////////////////
298 307
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h" 308#include "iom_perl.h"
302 309
303///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
304 311
305struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
… …
310{ 317{
311 if (perl) 318 if (perl)
312 { 319 {
313 perl_destruct (perl); 320 perl_destruct (perl);
314 perl_free (perl); 321 perl_free (perl);
322 PERL_SYS_TERM ();
315 } 323 }
316} 324}
317 325
318void 326void
319rxvt_perl_interp::init (rxvt_term *term) 327rxvt_perl_interp::init (rxvt_term *term)
320{ 328{
321 if (!perl) 329 if (!perl)
322 { 330 {
323 rxvt_push_locale (""); // perl init destroys current locale 331 rxvt_push_locale (""); // perl init destroys current locale
324 332
333 {
325 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 335 localise_env set_environ (perl_environ);
327 336
328 char *argv[] = { 337 char *args[] = {
329 "", 338 "",
330 "-e" 339 "-e"
331 "BEGIN {" 340 "BEGIN {"
332 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
334 "}" 343 "}"
335 "" 344 ""
336 "use urxvt;" 345 "use urxvt;"
337 }; 346 };
347 int argc = ecb_array_length (args);
348 char **argv = args;
338 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 351 perl = perl_alloc ();
340 perl_construct (perl); 352 perl_construct (perl);
341 353
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 355 || perl_run (perl))
344 { 356 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 358
347 perl_destruct (perl); 359 perl_destruct (perl);
348 perl_free (perl); 360 perl_free (perl);
349 perl = 0; 361 perl = 0;
350 } 362 }
351 363 }
352 swap (perl_environ, environ);
353 364
354 rxvt_pop_locale (); 365 rxvt_pop_locale ();
355 } 366 }
356 367
357 if (perl) 368 if (perl)
358 { 369 {
359 // runs outside of perls ENV 370 // runs outside of perls ENV
360 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 371 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
361 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
362 } 374 }
363} 375}
364 376
365static void 377static void
366ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
… …
377rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
378{ 390{
379 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
380 return false; 392 return false;
381 393
394 localise_env set_environ (perl_environ);
395
382 // pre-handling of some events 396 // pre-handling of some events
383 if (htype == HOOK_REFRESH_END) 397 if (htype == HOOK_REFRESH_END)
384 { 398 {
385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
386 400
387 for (int i = 0; i <= AvFILL (av); i++) 401 for (int i = 0; i <= AvFILL (av); i++)
388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
389 } 403 }
404 else if (htype == HOOK_DESTROY)
405 {
406 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
390 407
391 swap (perl_environ, environ); 408 for (int i = AvFILL (av); i >= 0; i--)
409 {
410 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
411 delete req;
412 }
413 }
392 414
393 bool event_consumed; 415 bool event_consumed;
394 416
395 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 417 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
396 || term->perl.should_invoke [htype]) 418 || term->perl.should_invoke [htype])
397 try
398 { 419 {
399 dSP; 420 dSP;
400 va_list ap; 421 va_list ap;
401 422
402 va_start (ap, htype); 423 va_start (ap, htype);
403 424
404 ENTER; 425 ENTER;
405 SAVETMPS; 426 SAVETMPS;
406 427
407 PUSHMARK (SP); 428 PUSHMARK (SP);
408 429
430 EXTEND (SP, 2);
409 XPUSHs (sv_2mortal (newSVterm (term))); 431 PUSHs (sv_2mortal (newSVterm (term)));
410 XPUSHs (sv_2mortal (newSViv (htype))); 432 PUSHs (sv_2mortal (newSViv (htype)));
411 433
412 for (;;) { 434 for (;;) {
413 data_type dt = (data_type)va_arg (ap, int); 435 data_type dt = (data_type)va_arg (ap, int);
414 436
415 switch (dt) 437 switch (dt)
416 { 438 {
417 case DT_INT: 439 case DT_INT:
418 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 440 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
419 break; 441 break;
420 442
421 case DT_LONG: 443 case DT_LONG:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 444 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
423 break; 445 break;
424 446
425 case DT_STR: 447 case DT_STR:
426 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 448 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
427 break; 449 break;
428 450
429 case DT_STR_LEN: 451 case DT_STR_LEN:
430 { 452 {
431 char *str = va_arg (ap, char *); 453 char *str = va_arg (ap, char *);
432 int len = va_arg (ap, int); 454 int len = va_arg (ap, int);
433 455
434 XPUSHs (sv_2mortal (newSVpvn (str, len))); 456 XPUSHs (sv_2mortal (newSVpvn (str, len)));
435 } 457 }
436 break; 458 break;
437 459
438 case DT_WCS_LEN: 460 case DT_WCS_LEN:
439 { 461 {
440 wchar_t *wstr = va_arg (ap, wchar_t *); 462 wchar_t *wstr = va_arg (ap, wchar_t *);
441 int wlen = va_arg (ap, int); 463 int wlen = va_arg (ap, int);
442 464
443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 465 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 } 466 }
445 break; 467 break;
446 468
447 case DT_LCS_LEN: 469 case DT_LCS_LEN:
448 { 470 {
449 long *lstr = va_arg (ap, long *); 471 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int); 472 int llen = va_arg (ap, int);
451 473
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 474 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
453 } 475 }
454 break; 476 break;
455 477
456 case DT_XEVENT: 478 case DT_XEVENT:
457 { 479 {
458 XEvent *xe = va_arg (ap, XEvent *); 480 XEvent *xe = va_arg (ap, XEvent *);
459 HV *hv = newHV (); 481 HV *hv = newHV ();
460 482
461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 483# 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) 484# 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) 485# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
464# undef set 486# undef set
465 487
466 setiv (type, xe->type); 488 setiv (type, xe->type);
467 setiv (send_event, xe->xany.send_event); 489 setiv (send_event, xe->xany.send_event);
468 setiv (serial, xe->xany.serial); 490 setiv (serial, xe->xany.serial);
469 491
470 switch (xe->type) 492 switch (xe->type)
471 { 493 {
472 case KeyPress: 494 case KeyPress:
473 case KeyRelease: 495 case KeyRelease:
474 case ButtonPress: 496 case ButtonPress:
475 case ButtonRelease: 497 case ButtonRelease:
476 case MotionNotify: 498 case MotionNotify:
477 setuv (window, xe->xmotion.window); 499 setuv (window, xe->xmotion.window);
478 setuv (root, xe->xmotion.root); 500 setuv (root, xe->xmotion.root);
479 setuv (subwindow, xe->xmotion.subwindow); 501 setuv (subwindow, xe->xmotion.subwindow);
480 setuv (time, xe->xmotion.time); 502 setuv (time, xe->xmotion.time);
481 setiv (x, xe->xmotion.x); 503 setiv (x, xe->xmotion.x);
482 setiv (y, xe->xmotion.y); 504 setiv (y, xe->xmotion.y);
483 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 505 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
484 setiv (col, xe->xmotion.x / term->fwidth); 506 setiv (col, xe->xmotion.x / term->fwidth);
485 setiv (x_root, xe->xmotion.x_root); 507 setiv (x_root, xe->xmotion.x_root);
486 setiv (y_root, xe->xmotion.y_root); 508 setiv (y_root, xe->xmotion.y_root);
487 setuv (state, xe->xmotion.state); 509 setuv (state, xe->xmotion.state);
488 510
489 switch (xe->type) 511 switch (xe->type)
490 { 512 {
491 case KeyPress: 513 case KeyPress:
492 case KeyRelease: 514 case KeyRelease:
493 setuv (keycode, xe->xkey.keycode); 515 setuv (keycode, xe->xkey.keycode);
494 break; 516 break;
495 517
496 case ButtonPress: 518 case ButtonPress:
497 case ButtonRelease: 519 case ButtonRelease:
498 setuv (button, xe->xbutton.button); 520 setuv (button, xe->xbutton.button);
499 break; 521 break;
500 522
501 case MotionNotify: 523 case MotionNotify:
502 setiv (is_hint, xe->xmotion.is_hint); 524 setiv (is_hint, xe->xmotion.is_hint);
503 break; 525 break;
504 } 526 }
505 527
506 break; 528 break;
507 529
508 case MapNotify: 530 case MapNotify:
509 case UnmapNotify: 531 case UnmapNotify:
510 case ConfigureNotify: 532 case ConfigureNotify:
511 setuv (event, xe->xconfigure.event); 533 setuv (event, xe->xconfigure.event);
512 setuv (window, xe->xconfigure.window); 534 setuv (window, xe->xconfigure.window);
513 535
514 switch (xe->type) 536 switch (xe->type)
515 { 537 {
516 case ConfigureNotify: 538 case ConfigureNotify:
517 setiv (x, xe->xconfigure.x); 539 setiv (x, xe->xconfigure.x);
518 setiv (y, xe->xconfigure.y); 540 setiv (y, xe->xconfigure.y);
519 setiv (width, xe->xconfigure.width); 541 setiv (width, xe->xconfigure.width);
520 setiv (height, xe->xconfigure.height); 542 setiv (height, xe->xconfigure.height);
521 setuv (above, xe->xconfigure.above); 543 setuv (above, xe->xconfigure.above);
522 break; 544 break;
523 } 545 }
524 546
525 break; 547 break;
526 548
527 case PropertyNotify: 549 case PropertyNotify:
528 setuv (window, xe->xproperty.window); 550 setuv (window, xe->xproperty.window);
529 setuv (atom, xe->xproperty.atom); 551 setuv (atom, xe->xproperty.atom);
530 setuv (time, xe->xproperty.time); 552 setuv (time, xe->xproperty.time);
531 setiv (state, xe->xproperty.state); 553 setiv (state, xe->xproperty.state);
532 break; 554 break;
533 555
534 case ClientMessage: 556 case ClientMessage:
535 setuv (window, xe->xclient.window); 557 setuv (window, xe->xclient.window);
536 setuv (message_type, xe->xclient.message_type); 558 setuv (message_type, xe->xclient.message_type);
537 setuv (format, xe->xclient.format); 559 setuv (format, xe->xclient.format);
538 setuv (l0, xe->xclient.data.l[0]); 560 setuv (l0, xe->xclient.data.l[0]);
539 setuv (l1, xe->xclient.data.l[1]); 561 setuv (l1, xe->xclient.data.l[1]);
540 setuv (l2, xe->xclient.data.l[2]); 562 setuv (l2, xe->xclient.data.l[2]);
541 setuv (l3, xe->xclient.data.l[3]); 563 setuv (l3, xe->xclient.data.l[3]);
542 setuv (l4, xe->xclient.data.l[4]); 564 setuv (l4, xe->xclient.data.l[4]);
543 break; 565 break;
544 } 566 }
545 567
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 568 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
547 } 569 }
548 break; 570 break;
549 571
550 case DT_END: 572 case DT_END:
551 goto call; 573 goto call;
552 574
553 default: 575 default:
554 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
555 } 577 }
578 }
579
580 call:
581 va_end (ap);
582
583 PUTBACK;
584 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
585 SPAGAIN;
586
587 if (count)
588 {
589 SV *status = POPs;
590 count = SvTRUE (status);
556 } 591 }
557 592
558 call:
559 va_end (ap);
560
561 PUTBACK; 593 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; 594 FREETMPS;
573 LEAVE; 595 LEAVE;
574 596
575 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
576 { 598 {
577 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
578 ungrab (term); // better lose the grab than the session 600 ungrab (term); // better lose the grab than the session
579 } 601 }
580 602
581 event_consumed = !!count; 603 event_consumed = !!count;
582 } 604 }
583 catch (...)
584 {
585 swap (perl_environ, environ);
586 throw;
587 }
588 else 605 else
589 event_consumed = false; 606 event_consumed = false;
590 607
591 // post-handling of some events 608 // post-handling of some events
592 if (htype == HOOK_REFRESH_BEGIN) 609 if (htype == HOOK_REFRESH_BEGIN)
… …
603 620
604 // don't allow further calls 621 // don't allow further calls
605 term->perl.self = 0; 622 term->perl.self = 0;
606 } 623 }
607 624
608 swap (perl_environ, environ);
609
610 return event_consumed; 625 return event_consumed;
626}
627
628void
629rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
630{
631 localise_env set_environ (perl_environ);
632
633 ENTER;
634 SAVETMPS;
635
636 dSP;
637 XPUSHs (sv_2mortal (newSVpvn (data, len)));
638 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
639
640 if (SvTRUE (ERRSV))
641 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642
643 FREETMPS;
644 LEAVE;
611} 645}
612 646
613///////////////////////////////////////////////////////////////////////////// 647/////////////////////////////////////////////////////////////////////////////
614 648
615MODULE = urxvt PACKAGE = urxvt 649MODULE = urxvt PACKAGE = urxvt
… …
627# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 661# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
628# include "hookinc.h" 662# include "hookinc.h"
629# undef def 663# undef def
630 664
631 HV *option = get_hv ("urxvt::OPTION", 1); 665 HV *option = get_hv ("urxvt::OPTION", 1);
632# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 666# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
633# define nodef(name) 667# define nodef(name)
634# include "optinc.h" 668# include "optinc.h"
635# undef nodef 669# undef nodef
636# undef def 670# undef def
637 671
… …
642 } *civ, const_iv[] = { 676 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 677# define const_iv(name) { # name, (IV)name }
644 const_iv (NUM_RESOURCES), 678 const_iv (NUM_RESOURCES),
645 const_iv (DEFAULT_RSTYLE), 679 const_iv (DEFAULT_RSTYLE),
646 const_iv (OVERLAY_RSTYLE), 680 const_iv (OVERLAY_RSTYLE),
681 const_iv (Color_Bits),
682 const_iv (RS_bgShift), const_iv (RS_bgMask),
683 const_iv (RS_fgShift), const_iv (RS_fgMask),
684 const_iv (RS_Careful),
685 const_iv (RS_fontCount),
686 const_iv (RS_fontShift),
687 const_iv (RS_fontMask),
688 const_iv (RS_baseattrMask),
689 const_iv (RS_attrMask),
690 const_iv (RS_redraw),
691 const_iv (RS_Sel),
647 const_iv (RS_Bold), 692 const_iv (RS_Bold),
648 const_iv (RS_Italic), 693 const_iv (RS_Italic),
649 const_iv (RS_Blink), 694 const_iv (RS_Blink),
650 const_iv (RS_RVid), 695 const_iv (RS_RVid),
651 const_iv (RS_Uline), 696 const_iv (RS_Uline),
… …
755 const_iv (XIMDontChange), 800 const_iv (XIMDontChange),
756# endif 801# endif
757# endif 802# endif
758 }; 803 };
759 804
760 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 805 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 806 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
762} 807}
763 808
764void 809void
765warn (const char *msg) 810warn (const char *msg)
766 CODE: 811 CODE:
… …
838 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 883 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
839 if ((*t)->perl.self) 884 if ((*t)->perl.self)
840 PUSHs (sv_2mortal (newSVterm (*t))); 885 PUSHs (sv_2mortal (newSVterm (*t)));
841} 886}
842 887
888IV
889_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
890 CODE:
891 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
892 req->cb_sv = newSVsv (cb);
893 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
894 av_push (av, newSViv ((IV)req));
895 RETVAL = (IV)req;
896 OUTPUT:
897 RETVAL
898
899void
900_delete_selection_request (IV req_)
901 CODE:
902 rxvt_selection *req = (rxvt_selection *)req_;
903 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
904 int i;
905
906 for (i = AvFILL (av); i >= 0; i--)
907 if (SvIV (*av_fetch (av, i, 1)) == req_)
908 break;
909
910 for (; i < AvFILL (av); i++)
911 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
912
913 av_pop (av);
914
915 delete req;
916
843MODULE = urxvt PACKAGE = urxvt::term 917MODULE = urxvt PACKAGE = urxvt::term
844 918
845SV * 919SV *
846_new (AV *env, AV *arg) 920_new (AV *env, AV *arg)
847 CODE: 921 CODE:
848{ 922{
849 rxvt_term *term = new rxvt_term; 923 rxvt_term *term = new rxvt_term;
850 924
851 stringvec *argv = new stringvec; 925 stringvec *argv = new stringvec;
852 stringvec *envv = new stringvec;
853
854 for (int i = 0; i <= AvFILL (arg); i++) 926 for (int i = 0; i <= AvFILL (arg); i++)
855 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 927 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
856 928
929 stringvec *envv = new stringvec;
857 for (int i = AvFILL (env) + 1; i--; ) 930 for (int i = AvFILL (env) + 1; i--; )
858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 931 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
859
860 envv->push_back (0);
861 932
862 try 933 try
863 { 934 {
864 term->init (argv, envv); 935 term->init (argv, envv);
865 } 936 }
… …
905 976
906void 977void
907rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 978rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
908 CODE: 979 CODE:
909 XUngrabKey (THIS->dpy, keycode, modifiers, window); 980 XUngrabKey (THIS->dpy, keycode, modifiers, window);
910
911void
912rxvt_term::XUngrabKeyboard (Time eventtime)
913 CODE:
914 XUngrabKeyboard (THIS->dpy, eventtime);
915 981
916bool 982bool
917rxvt_term::grab (Time eventtime, int sync = 0) 983rxvt_term::grab (Time eventtime, int sync = 0)
918 CODE: 984 CODE:
919{ 985{
… …
1034 free (wstr); 1100 free (wstr);
1035} 1101}
1036 OUTPUT: 1102 OUTPUT:
1037 RETVAL 1103 RETVAL
1038 1104
1039char *
1040rxvt_term::locale ()
1041 CODE:
1042 RETVAL = THIS->locale;
1043 OUTPUT:
1044 RETVAL
1045
1046#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1105#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1047 1106
1048#define TERM_OFFSET_width TERM_OFFSET(width) 1107#define TERM_OFFSET_width TERM_OFFSET(width)
1049#define TERM_OFFSET_height TERM_OFFSET(height) 1108#define TERM_OFFSET_height TERM_OFFSET(height)
1050#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1109#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1051#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1110#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1052#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1111#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1053#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1112#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1054#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1113#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1055#define TERM_OFFSET_focus TERM_OFFSET(focus) 1114#define TERM_OFFSET_focus TERM_OFFSET(focus)
1056#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1115#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1057#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1116#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1058#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1117#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1059#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1118#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1119#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1060#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1120#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1061#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1121#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1062#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1122#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1063 1123
1064int 1124int
1065rxvt_term::width () 1125rxvt_term::width ()
1066 ALIAS: 1126 ALIAS:
1067 width = TERM_OFFSET_width 1127 width = TERM_OFFSET_width
1068 height = TERM_OFFSET_height 1128 height = TERM_OFFSET_height
1069 fwidth = TERM_OFFSET_fwidth 1129 fwidth = TERM_OFFSET_fwidth
1070 fheight = TERM_OFFSET_fheight 1130 fheight = TERM_OFFSET_fheight
1071 fbase = TERM_OFFSET_fbase 1131 fbase = TERM_OFFSET_fbase
1072 nrow = TERM_OFFSET_nrow 1132 nrow = TERM_OFFSET_nrow
1073 ncol = TERM_OFFSET_ncol 1133 ncol = TERM_OFFSET_ncol
1074 focus = TERM_OFFSET_focus 1134 focus = TERM_OFFSET_focus
1075 mapped = TERM_OFFSET_mapped 1135 mapped = TERM_OFFSET_mapped
1076 int_bwidth = TERM_OFFSET_int_bwidth 1136 int_bwidth = TERM_OFFSET_int_bwidth
1077 ext_bwidth = TERM_OFFSET_ext_bwidth 1137 ext_bwidth = TERM_OFFSET_ext_bwidth
1078 lineSpace = TERM_OFFSET_lineSpace 1138 lineSpace = TERM_OFFSET_lineSpace
1139 letterSpace = TERM_OFFSET_letterSpace
1079 saveLines = TERM_OFFSET_saveLines 1140 saveLines = TERM_OFFSET_saveLines
1080 total_rows = TERM_OFFSET_total_rows 1141 total_rows = TERM_OFFSET_total_rows
1081 top_row = TERM_OFFSET_top_row 1142 top_row = TERM_OFFSET_top_row
1082 CODE: 1143 CODE:
1083 RETVAL = *(int *)((char *)THIS + ix); 1144 RETVAL = *(int *)((char *)THIS + ix);
1084 OUTPUT: 1145 OUTPUT:
1085 RETVAL 1146 RETVAL
1086 1147
… …
1097 { 1158 {
1098 case 0: RETVAL = THIS->ModLevel3Mask; break; 1159 case 0: RETVAL = THIS->ModLevel3Mask; break;
1099 case 1: RETVAL = THIS->ModMetaMask; break; 1160 case 1: RETVAL = THIS->ModMetaMask; break;
1100 case 2: RETVAL = THIS->ModNumLockMask; break; 1161 case 2: RETVAL = THIS->ModNumLockMask; break;
1101 case 3: RETVAL = THIS->current_screen; break; 1162 case 3: RETVAL = THIS->current_screen; break;
1163#ifdef CURSOR_BLINK
1102 case 4: RETVAL = THIS->hidden_cursor; break; 1164 case 4: RETVAL = THIS->hidden_cursor; break;
1165#endif
1103 } 1166 }
1104 OUTPUT: 1167 OUTPUT:
1105 RETVAL 1168 RETVAL
1106 1169
1107char * 1170char *
… …
1150 RETVAL 1213 RETVAL
1151 1214
1152Window 1215Window
1153rxvt_term::parent () 1216rxvt_term::parent ()
1154 CODE: 1217 CODE:
1155 RETVAL = THIS->parent [0]; 1218 RETVAL = THIS->parent;
1156 OUTPUT: 1219 OUTPUT:
1157 RETVAL 1220 RETVAL
1158 1221
1159Window 1222Window
1160rxvt_term::vt () 1223rxvt_term::vt ()
… …
1187 if (newval <= 0) 1250 if (newval <= 0)
1188 THIS->scr_changeview (max (newval, THIS->top_row)); 1251 THIS->scr_changeview (max (newval, THIS->top_row));
1189} 1252}
1190 OUTPUT: 1253 OUTPUT:
1191 RETVAL 1254 RETVAL
1255
1256void
1257rxvt_term::set_urgency (bool enable)
1192 1258
1193void 1259void
1194rxvt_term::focus_in () 1260rxvt_term::focus_in ()
1195 1261
1196void 1262void
… …
1429# include "rsinc.h" 1495# include "rsinc.h"
1430# undef def 1496# undef def
1431# undef reserve 1497# undef reserve
1432 }; 1498 };
1433 1499
1434 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1500 rs = rslist + ecb_array_length (rslist);
1435 1501
1436 if (*name) 1502 if (*name)
1437 { 1503 {
1438 do { 1504 do {
1439 if (rs-- == rslist) 1505 if (rs-- == rslist)
… …
1478 1544
1479 if (set >= 0) 1545 if (set >= 0)
1480 { 1546 {
1481 THIS->set_option (optval, set); 1547 THIS->set_option (optval, set);
1482 1548
1483 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1549 if (THIS->init_done) // avoid doing this before START
1484 switch (optval) 1550 switch (optval)
1485 { 1551 {
1486 case Opt_skipBuiltinGlyphs: 1552 case Opt_skipBuiltinGlyphs:
1487 THIS->set_fonts (); 1553 THIS->set_fonts ();
1488 THIS->scr_remap_chars (); 1554 THIS->scr_remap_chars ();
1489 THIS->scr_touch (true); 1555 THIS->scr_touch (true);
1490 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1491 THIS->refresh_check (); 1557 THIS->refresh_check ();
1492 break; 1558 break;
1493 1559
1560#ifdef CURSOR_BLINK
1561 case Opt_cursorBlink:
1562 THIS->cursor_blink_reset ();
1563 break;
1564#endif
1565
1494 case Opt_cursorUnderline: 1566 case Opt_cursorUnderline:
1495 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1496 THIS->refresh_check (); 1568 THIS->refresh_check ();
1497 break; 1569 break;
1498 1570
… …
1511 CODE: 1583 CODE:
1512 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1584 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1513 THIS->keyboard->register_done (); 1585 THIS->keyboard->register_done ();
1514 OUTPUT: 1586 OUTPUT:
1515 RETVAL 1587 RETVAL
1588
1589void
1590rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1591 CODE:
1592 wchar_t *wstr = sv2wcs (str);
1593 THIS->keyboard->register_user_translation (keysym, state, wstr);
1594 free (wstr);
1516 1595
1517void 1596void
1518rxvt_term::screen_cur (...) 1597rxvt_term::screen_cur (...)
1519 PROTOTYPE: $;$$ 1598 PROTOTYPE: $;$$
1520 ALIAS: 1599 ALIAS:
… …
1534 EXTEND (SP, 2); 1613 EXTEND (SP, 2);
1535 PUSHs (sv_2mortal (newSViv (rc.row))); 1614 PUSHs (sv_2mortal (newSViv (rc.row)));
1536 PUSHs (sv_2mortal (newSViv (rc.col))); 1615 PUSHs (sv_2mortal (newSViv (rc.col)));
1537 } 1616 }
1538 1617
1539 if (items == 3) 1618 if (items >= 3)
1540 { 1619 {
1541 rc.row = SvIV (ST (1)); 1620 rc.row = SvIV (ST (1));
1542 rc.col = SvIV (ST (2)); 1621 rc.col = SvIV (ST (2));
1543 1622
1544 if (ix == 2) 1623 if (ix == 2)
… …
1560 clamp_it (rc.col, 0, THIS->ncol); 1639 clamp_it (rc.col, 0, THIS->ncol);
1561 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1640 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1562 1641
1563 if (ix) 1642 if (ix)
1564 { 1643 {
1644 THIS->selection.screen = THIS->current_screen;
1645
1565 THIS->want_refresh = 1; 1646 THIS->want_refresh = 1;
1566 THIS->refresh_check (); 1647 THIS->refresh_check ();
1567 } 1648 }
1568 } 1649 }
1569} 1650}
1570 1651
1571char 1652int
1572rxvt_term::cur_charset () 1653rxvt_term::selection_screen (int screen = -1)
1573 CODE: 1654 CODE:
1574 RETVAL = THIS->charsets [THIS->screen.charset]; 1655 RETVAL = THIS->selection.screen;
1575 OUTPUT: 1656 if (screen >= 0)
1657 THIS->selection.screen = screen;
1658 OUTPUT:
1576 RETVAL 1659 RETVAL
1577 1660
1578void 1661void
1579rxvt_term::selection_clear () 1662rxvt_term::selection_clear (bool clipboard = false)
1580 1663
1581void 1664void
1582rxvt_term::selection_make (Time eventtime, bool rect = false) 1665rxvt_term::selection_make (Time eventtime, bool rect = false)
1583 CODE: 1666 CODE:
1584 THIS->selection.op = SELECTION_CONT; 1667 THIS->selection.op = SELECTION_CONT;
1585 THIS->selection.rect = rect; 1668 THIS->selection.rect = rect;
1586 THIS->selection_make (eventtime); 1669 THIS->selection_make (eventtime);
1587 1670
1588int 1671int
1589rxvt_term::selection_grab (Time eventtime) 1672rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1590 1673
1591void 1674void
1592rxvt_term::selection (SV *newtext = 0) 1675rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1593 PPCODE: 1676 PPCODE:
1594{ 1677{
1678 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1679 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1680
1595 if (GIMME_V != G_VOID) 1681 if (GIMME_V != G_VOID)
1596 XPUSHs (THIS->selection.text 1682 XPUSHs (text
1597 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1683 ? sv_2mortal (wcs2sv (text, len))
1598 : &PL_sv_undef); 1684 : &PL_sv_undef);
1599 1685
1600 if (newtext) 1686 if (newtext)
1601 { 1687 {
1602 free (THIS->selection.text); 1688 free (text);
1603 1689
1604 THIS->selection.text = sv2wcs (newtext); 1690 text = sv2wcs (newtext);
1605 THIS->selection.len = wcslen (THIS->selection.text); 1691 len = wcslen (text);
1606 } 1692 }
1607} 1693}
1694
1695char
1696rxvt_term::cur_charset ()
1697 CODE:
1698 RETVAL = THIS->charsets [THIS->screen.charset];
1699 OUTPUT:
1700 RETVAL
1608 1701
1609void 1702void
1610rxvt_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) 1703rxvt_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)
1611 1704
1612void 1705void
… …
1634 char *str = SvPVbyte (octets, len); 1727 char *str = SvPVbyte (octets, len);
1635 C_ARGS: 1728 C_ARGS:
1636 str, len 1729 str, len
1637 1730
1638void 1731void
1732rxvt_term::tt_paste (SV *octets)
1733 INIT:
1734 STRLEN len;
1735 char *str = SvPVbyte (octets, len);
1736 C_ARGS:
1737 str, len
1738
1739void
1639rxvt_term::cmd_parse (SV *octets) 1740rxvt_term::cmd_parse (SV *octets)
1640 CODE: 1741 CODE:
1641{ 1742{
1642 STRLEN len; 1743 STRLEN len;
1643 char *str = SvPVbyte (octets, len); 1744 char *str = SvPVbyte (octets, len);

Diff Legend

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