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.133 by root, Tue Dec 7 17:51:27 2010 UTC vs.
Revision 1.161 by root, Mon Jun 4 15:43:22 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"
… …
45 46
46#undef LINENO 47#undef LINENO
47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
48#undef ROW 49#undef ROW
49#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
51
52/////////////////////////////////////////////////////////////////////////////
53
54typedef char * octet_string;
55typedef char * utf8_string;
56
57typedef GdkPixbuf * urxvt__pixbuf;
58typedef rxvt_img * urxvt__img;
59
60/////////////////////////////////////////////////////////////////////////////
61
62static void
63parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
64{
65 //TODO: support component stuff
66 c.set (s, SvPVbyte_nolen (sv));
67}
50 68
51///////////////////////////////////////////////////////////////////////////// 69/////////////////////////////////////////////////////////////////////////////
52 70
53static wchar_t * 71static wchar_t *
54sv2wcs (SV *sv) 72sv2wcs (SV *sv)
… …
302 THIS->refresh_check (); 320 THIS->refresh_check ();
303} 321}
304 322
305///////////////////////////////////////////////////////////////////////////// 323/////////////////////////////////////////////////////////////////////////////
306 324
307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
309#include "iom_perl.h" 325#include "iom_perl.h"
310 326
311///////////////////////////////////////////////////////////////////////////// 327/////////////////////////////////////////////////////////////////////////////
312 328
313struct rxvt_perl_interp rxvt_perl; 329struct rxvt_perl_interp rxvt_perl;
… …
329{ 345{
330 if (!perl) 346 if (!perl)
331 { 347 {
332 rxvt_push_locale (""); // perl init destroys current locale 348 rxvt_push_locale (""); // perl init destroys current locale
333 349
350 {
334 perl_environ = rxvt_environ; 351 perl_environ = rxvt_environ;
335 swap (perl_environ, environ); 352 localise_env set_environ (perl_environ);
336 353
337 char *args[] = { 354 char *args[] = {
338 "", 355 "",
339 "-e" 356 "-e"
340 "BEGIN {" 357 "BEGIN {"
341 " urxvt->bootstrap;" 358 " urxvt->bootstrap;"
342 " unshift @INC, '" LIBDIR "';" 359 " unshift @INC, '" LIBDIR "';"
343 "}" 360 "}"
344 "" 361 ""
345 "use urxvt;" 362 "use urxvt;"
346 }; 363 };
347 int argc = sizeof (args) / sizeof (args[0]); 364 int argc = ecb_array_length (args);
348 char **argv = args; 365 char **argv = args;
349 366
350 PERL_SYS_INIT3 (&argc, &argv, &environ); 367 PERL_SYS_INIT3 (&argc, &argv, &environ);
351 perl = perl_alloc (); 368 perl = perl_alloc ();
352 perl_construct (perl); 369 perl_construct (perl);
353 370
354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL) 371 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
355 || perl_run (perl)) 372 || perl_run (perl))
356 { 373 {
357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 374 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
358 375
359 perl_destruct (perl); 376 perl_destruct (perl);
360 perl_free (perl); 377 perl_free (perl);
361 perl = 0; 378 perl = 0;
362 } 379 }
363 380 }
364 swap (perl_environ, environ);
365 381
366 rxvt_pop_locale (); 382 rxvt_pop_locale ();
367 } 383 }
368 384
369 if (perl) 385 if (perl)
370 { 386 {
371 // runs outside of perls ENV 387 // runs outside of perls ENV
372 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 388 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 389 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
390 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
374 } 391 }
375} 392}
376 393
377static void 394static void
378ungrab (rxvt_term *THIS) 395ungrab (rxvt_term *THIS)
… …
389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 406rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
390{ 407{
391 if (!perl || !term->perl.self) 408 if (!perl || !term->perl.self)
392 return false; 409 return false;
393 410
411 localise_env set_environ (perl_environ);
412
394 // pre-handling of some events 413 // pre-handling of some events
395 if (htype == HOOK_REFRESH_END) 414 if (htype == HOOK_REFRESH_END)
396 { 415 {
397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 416 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
398 417
399 for (int i = 0; i <= AvFILL (av); i++) 418 for (int i = 0; i <= AvFILL (av); i++)
400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 419 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
401 } 420 }
421 else if (htype == HOOK_DESTROY)
422 {
423 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
402 424
403 swap (perl_environ, environ); 425 for (int i = AvFILL (av); i >= 0; i--)
426 {
427 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
428 delete req;
429 }
430 }
404 431
405 bool event_consumed; 432 bool event_consumed;
406 433
407 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 434 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
408 || term->perl.should_invoke [htype]) 435 || term->perl.should_invoke [htype])
409 try
410 { 436 {
411 dSP; 437 dSP;
412 va_list ap; 438 va_list ap;
413 439
414 va_start (ap, htype); 440 va_start (ap, htype);
415 441
416 ENTER; 442 ENTER;
417 SAVETMPS; 443 SAVETMPS;
418 444
419 PUSHMARK (SP); 445 PUSHMARK (SP);
420 446
447 EXTEND (SP, 2);
421 XPUSHs (sv_2mortal (newSVterm (term))); 448 PUSHs (sv_2mortal (newSVterm (term)));
422 XPUSHs (sv_2mortal (newSViv (htype))); 449 PUSHs (sv_2mortal (newSViv (htype)));
423 450
424 for (;;) { 451 for (;;) {
425 data_type dt = (data_type)va_arg (ap, int); 452 data_type dt = (data_type)va_arg (ap, int);
426 453
427 switch (dt) 454 switch (dt)
428 { 455 {
429 case DT_INT: 456 case DT_INT:
430 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 457 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
431 break; 458 break;
432 459
433 case DT_LONG: 460 case DT_LONG:
434 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 461 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
435 break; 462 break;
436 463
437 case DT_STR: 464 case DT_STR:
438 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 465 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
439 break; 466 break;
440 467
441 case DT_STR_LEN: 468 case DT_STR_LEN:
442 { 469 {
443 char *str = va_arg (ap, char *); 470 char *str = va_arg (ap, char *);
444 int len = va_arg (ap, int); 471 int len = va_arg (ap, int);
445 472
446 XPUSHs (sv_2mortal (newSVpvn (str, len))); 473 XPUSHs (sv_2mortal (newSVpvn (str, len)));
447 } 474 }
448 break; 475 break;
449 476
450 case DT_WCS_LEN: 477 case DT_WCS_LEN:
451 { 478 {
452 wchar_t *wstr = va_arg (ap, wchar_t *); 479 wchar_t *wstr = va_arg (ap, wchar_t *);
453 int wlen = va_arg (ap, int); 480 int wlen = va_arg (ap, int);
454 481
455 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 482 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
456 } 483 }
457 break; 484 break;
458 485
459 case DT_LCS_LEN: 486 case DT_LCS_LEN:
460 { 487 {
461 long *lstr = va_arg (ap, long *); 488 long *lstr = va_arg (ap, long *);
462 int llen = va_arg (ap, int); 489 int llen = va_arg (ap, int);
463 490
464 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 491 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
465 } 492 }
466 break; 493 break;
467 494
468 case DT_XEVENT: 495 case DT_XEVENT:
469 { 496 {
470 XEvent *xe = va_arg (ap, XEvent *); 497 XEvent *xe = va_arg (ap, XEvent *);
471 HV *hv = newHV (); 498 HV *hv = newHV ();
472 499
473# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 500# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
474# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 501# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
475# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 502# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
476# undef set 503# undef set
477 504
478 setiv (type, xe->type); 505 setiv (type, xe->type);
479 setiv (send_event, xe->xany.send_event); 506 setiv (send_event, xe->xany.send_event);
480 setiv (serial, xe->xany.serial); 507 setiv (serial, xe->xany.serial);
481 508
482 switch (xe->type) 509 switch (xe->type)
483 { 510 {
484 case KeyPress: 511 case KeyPress:
485 case KeyRelease: 512 case KeyRelease:
486 case ButtonPress: 513 case ButtonPress:
487 case ButtonRelease: 514 case ButtonRelease:
488 case MotionNotify: 515 case MotionNotify:
489 setuv (window, xe->xmotion.window); 516 setuv (window, xe->xmotion.window);
490 setuv (root, xe->xmotion.root); 517 setuv (root, xe->xmotion.root);
491 setuv (subwindow, xe->xmotion.subwindow); 518 setuv (subwindow, xe->xmotion.subwindow);
492 setuv (time, xe->xmotion.time); 519 setuv (time, xe->xmotion.time);
493 setiv (x, xe->xmotion.x); 520 setiv (x, xe->xmotion.x);
494 setiv (y, xe->xmotion.y); 521 setiv (y, xe->xmotion.y);
495 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 522 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
496 setiv (col, xe->xmotion.x / term->fwidth); 523 setiv (col, xe->xmotion.x / term->fwidth);
497 setiv (x_root, xe->xmotion.x_root); 524 setiv (x_root, xe->xmotion.x_root);
498 setiv (y_root, xe->xmotion.y_root); 525 setiv (y_root, xe->xmotion.y_root);
499 setuv (state, xe->xmotion.state); 526 setuv (state, xe->xmotion.state);
500 527
501 switch (xe->type) 528 switch (xe->type)
502 { 529 {
503 case KeyPress: 530 case KeyPress:
504 case KeyRelease: 531 case KeyRelease:
505 setuv (keycode, xe->xkey.keycode); 532 setuv (keycode, xe->xkey.keycode);
506 break; 533 break;
507 534
508 case ButtonPress: 535 case ButtonPress:
509 case ButtonRelease: 536 case ButtonRelease:
510 setuv (button, xe->xbutton.button); 537 setuv (button, xe->xbutton.button);
511 break; 538 break;
512 539
513 case MotionNotify: 540 case MotionNotify:
514 setiv (is_hint, xe->xmotion.is_hint); 541 setiv (is_hint, xe->xmotion.is_hint);
515 break; 542 break;
516 } 543 }
517 544
518 break; 545 break;
519 546
520 case MapNotify: 547 case MapNotify:
521 case UnmapNotify: 548 case UnmapNotify:
522 case ConfigureNotify: 549 case ConfigureNotify:
523 setuv (event, xe->xconfigure.event); 550 setuv (event, xe->xconfigure.event);
524 setuv (window, xe->xconfigure.window); 551 setuv (window, xe->xconfigure.window);
525 552
526 switch (xe->type) 553 switch (xe->type)
527 { 554 {
528 case ConfigureNotify: 555 case ConfigureNotify:
529 setiv (x, xe->xconfigure.x); 556 setiv (x, xe->xconfigure.x);
530 setiv (y, xe->xconfigure.y); 557 setiv (y, xe->xconfigure.y);
531 setiv (width, xe->xconfigure.width); 558 setiv (width, xe->xconfigure.width);
532 setiv (height, xe->xconfigure.height); 559 setiv (height, xe->xconfigure.height);
533 setuv (above, xe->xconfigure.above); 560 setuv (above, xe->xconfigure.above);
534 break; 561 break;
535 } 562 }
536 563
537 break; 564 break;
538 565
539 case PropertyNotify: 566 case PropertyNotify:
540 setuv (window, xe->xproperty.window); 567 setuv (window, xe->xproperty.window);
541 setuv (atom, xe->xproperty.atom); 568 setuv (atom, xe->xproperty.atom);
542 setuv (time, xe->xproperty.time); 569 setuv (time, xe->xproperty.time);
543 setiv (state, xe->xproperty.state); 570 setiv (state, xe->xproperty.state);
544 break; 571 break;
545 572
546 case ClientMessage: 573 case ClientMessage:
547 setuv (window, xe->xclient.window); 574 setuv (window, xe->xclient.window);
548 setuv (message_type, xe->xclient.message_type); 575 setuv (message_type, xe->xclient.message_type);
549 setuv (format, xe->xclient.format); 576 setuv (format, xe->xclient.format);
550 setuv (l0, xe->xclient.data.l[0]); 577 setuv (l0, xe->xclient.data.l[0]);
551 setuv (l1, xe->xclient.data.l[1]); 578 setuv (l1, xe->xclient.data.l[1]);
552 setuv (l2, xe->xclient.data.l[2]); 579 setuv (l2, xe->xclient.data.l[2]);
553 setuv (l3, xe->xclient.data.l[3]); 580 setuv (l3, xe->xclient.data.l[3]);
554 setuv (l4, xe->xclient.data.l[4]); 581 setuv (l4, xe->xclient.data.l[4]);
555 break; 582 break;
556 } 583 }
557 584
558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 585 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
559 } 586 }
560 break; 587 break;
561 588
562 case DT_END: 589 case DT_END:
563 goto call; 590 goto call;
564 591
565 default: 592 default:
566 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 593 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
567 } 594 }
595 }
596
597 call:
598 va_end (ap);
599
600 PUTBACK;
601 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
602 SPAGAIN;
603
604 if (count)
605 {
606 SV *status = POPs;
607 count = SvTRUE (status);
568 } 608 }
569 609
570 call:
571 va_end (ap);
572
573 PUTBACK; 610 PUTBACK;
574 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
575 SPAGAIN;
576
577 if (count)
578 {
579 SV *status = POPs;
580 count = SvTRUE (status);
581 }
582
583 PUTBACK;
584 FREETMPS; 611 FREETMPS;
585 LEAVE; 612 LEAVE;
586 613
587 if (SvTRUE (ERRSV)) 614 if (SvTRUE (ERRSV))
588 { 615 {
589 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 616 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
590 ungrab (term); // better lose the grab than the session 617 ungrab (term); // better lose the grab than the session
591 } 618 }
592 619
593 event_consumed = !!count; 620 event_consumed = !!count;
594 } 621 }
595 catch (...)
596 {
597 swap (perl_environ, environ);
598 throw;
599 }
600 else 622 else
601 event_consumed = false; 623 event_consumed = false;
602 624
603 // post-handling of some events 625 // post-handling of some events
604 if (htype == HOOK_REFRESH_BEGIN) 626 if (htype == HOOK_REFRESH_BEGIN)
… …
615 637
616 // don't allow further calls 638 // don't allow further calls
617 term->perl.self = 0; 639 term->perl.self = 0;
618 } 640 }
619 641
620 swap (perl_environ, environ);
621
622 return event_consumed; 642 return event_consumed;
643}
644
645void
646rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
647{
648 localise_env set_environ (perl_environ);
649
650 ENTER;
651 SAVETMPS;
652
653 dSP;
654 XPUSHs (sv_2mortal (newSVpvn (data, len)));
655 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
656
657 if (SvTRUE (ERRSV))
658 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659
660 FREETMPS;
661 LEAVE;
623} 662}
624 663
625///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
626 665
627MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
761 const_iv (XIMSecondary), 800 const_iv (XIMSecondary),
762 const_iv (XIMTertiary), 801 const_iv (XIMTertiary),
763 const_iv (XIMVisibleToForward), 802 const_iv (XIMVisibleToForward),
764 const_iv (XIMVisibleToBackword), 803 const_iv (XIMVisibleToBackword),
765 const_iv (XIMVisibleToCenter), 804 const_iv (XIMVisibleToCenter),
805#if HAVE_XRENDER
806 const_iv (PictStandardARGB32),
807 const_iv (PictStandardRGB24),
808 const_iv (PictStandardA8),
809 const_iv (PictStandardA4),
810 const_iv (PictStandardA1),
811 const_iv (RepeatNone),
812 const_iv (RepeatNormal),
813 const_iv (RepeatPad),
814 const_iv (RepeatReflect),
815#endif
766# if 0 816# if 0
767 const_iv (XIMForwardChar), 817 const_iv (XIMForwardChar),
768 const_iv (XIMBackwardChar), 818 const_iv (XIMBackwardChar),
769 const_iv (XIMForwardWord), 819 const_iv (XIMForwardWord),
770 const_iv (XIMBackwardWord), 820 const_iv (XIMBackwardWord),
… …
778 const_iv (XIMDontChange), 828 const_iv (XIMDontChange),
779# endif 829# endif
780# endif 830# endif
781 }; 831 };
782 832
783 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 833 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
784 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
785} 835}
786 836
787void 837void
788warn (const char *msg) 838warn (const char *msg)
789 CODE: 839 CODE:
… …
861 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 911 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
862 if ((*t)->perl.self) 912 if ((*t)->perl.self)
863 PUSHs (sv_2mortal (newSVterm (*t))); 913 PUSHs (sv_2mortal (newSVterm (*t)));
864} 914}
865 915
916IV
917_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
918 CODE:
919 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
920 req->cb_sv = newSVsv (cb);
921 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
922 av_push (av, newSViv ((IV)req));
923 RETVAL = (IV)req;
924 OUTPUT:
925 RETVAL
926
927void
928_delete_selection_request (IV req_)
929 CODE:
930 rxvt_selection *req = (rxvt_selection *)req_;
931 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
932 int i;
933
934 for (i = AvFILL (av); i >= 0; i--)
935 if (SvIV (*av_fetch (av, i, 1)) == req_)
936 break;
937
938 for (; i < AvFILL (av); i++)
939 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
940
941 av_pop (av);
942
943 delete req;
944
866MODULE = urxvt PACKAGE = urxvt::term 945MODULE = urxvt PACKAGE = urxvt::term
867 946
868SV * 947SV *
869_new (AV *env, AV *arg) 948_new (AV *env, AV *arg)
870 CODE: 949 CODE:
871{ 950{
872 rxvt_term *term = new rxvt_term; 951 rxvt_term *term = new rxvt_term;
873 952
874 stringvec *argv = new stringvec; 953 stringvec *argv = new stringvec;
875 stringvec *envv = new stringvec;
876
877 for (int i = 0; i <= AvFILL (arg); i++) 954 for (int i = 0; i <= AvFILL (arg); i++)
878 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 955 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
879 956
957 stringvec *envv = new stringvec;
880 for (int i = AvFILL (env) + 1; i--; ) 958 for (int i = AvFILL (env) + 1; i--; )
881 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 959 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
882
883 envv->push_back (0);
884 960
885 try 961 try
886 { 962 {
887 term->init (argv, envv); 963 term->init (argv, envv);
888 } 964 }
… …
928 1004
929void 1005void
930rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1006rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
931 CODE: 1007 CODE:
932 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1008 XUngrabKey (THIS->dpy, keycode, modifiers, window);
933
934void
935rxvt_term::XUngrabKeyboard (Time eventtime)
936 CODE:
937 XUngrabKeyboard (THIS->dpy, eventtime);
938 1009
939bool 1010bool
940rxvt_term::grab (Time eventtime, int sync = 0) 1011rxvt_term::grab (Time eventtime, int sync = 0)
941 CODE: 1012 CODE:
942{ 1013{
… …
1054 rxvt_pop_locale (); 1125 rxvt_pop_locale ();
1055 1126
1056 RETVAL = wcs2sv (wstr); 1127 RETVAL = wcs2sv (wstr);
1057 free (wstr); 1128 free (wstr);
1058} 1129}
1059 OUTPUT:
1060 RETVAL
1061
1062char *
1063rxvt_term::locale ()
1064 CODE:
1065 RETVAL = THIS->locale;
1066 OUTPUT: 1130 OUTPUT:
1067 RETVAL 1131 RETVAL
1068 1132
1069#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1133#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1070 1134
… …
1177 RETVAL 1241 RETVAL
1178 1242
1179Window 1243Window
1180rxvt_term::parent () 1244rxvt_term::parent ()
1181 CODE: 1245 CODE:
1182 RETVAL = THIS->parent [0]; 1246 RETVAL = THIS->parent;
1183 OUTPUT: 1247 OUTPUT:
1184 RETVAL 1248 RETVAL
1185 1249
1186Window 1250Window
1187rxvt_term::vt () 1251rxvt_term::vt ()
… …
1214 if (newval <= 0) 1278 if (newval <= 0)
1215 THIS->scr_changeview (max (newval, THIS->top_row)); 1279 THIS->scr_changeview (max (newval, THIS->top_row));
1216} 1280}
1217 OUTPUT: 1281 OUTPUT:
1218 RETVAL 1282 RETVAL
1283
1284void
1285rxvt_term::set_urgency (bool enable)
1219 1286
1220void 1287void
1221rxvt_term::focus_in () 1288rxvt_term::focus_in ()
1222 1289
1223void 1290void
… …
1456# include "rsinc.h" 1523# include "rsinc.h"
1457# undef def 1524# undef def
1458# undef reserve 1525# undef reserve
1459 }; 1526 };
1460 1527
1461 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1528 rs = rslist + ecb_array_length (rslist);
1462 1529
1463 if (*name) 1530 if (*name)
1464 { 1531 {
1465 do { 1532 do {
1466 if (rs-- == rslist) 1533 if (rs-- == rslist)
… …
1505 1572
1506 if (set >= 0) 1573 if (set >= 0)
1507 { 1574 {
1508 THIS->set_option (optval, set); 1575 THIS->set_option (optval, set);
1509 1576
1510 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1577 if (THIS->init_done) // avoid doing this before START
1511 switch (optval) 1578 switch (optval)
1512 { 1579 {
1513 case Opt_skipBuiltinGlyphs: 1580 case Opt_skipBuiltinGlyphs:
1514 THIS->set_fonts (); 1581 THIS->set_fonts ();
1515 THIS->scr_remap_chars (); 1582 THIS->scr_remap_chars ();
1516 THIS->scr_touch (true); 1583 THIS->scr_touch (true);
1517 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1518 THIS->refresh_check (); 1585 THIS->refresh_check ();
1519 break; 1586 break;
1587#ifdef CURSOR_BLINK
1588 case Opt_cursorBlink:
1589 THIS->cursor_blink_reset ();
1590 break;
1591#endif
1520 1592
1521 case Opt_cursorUnderline: 1593 case Opt_cursorUnderline:
1522 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1523 THIS->refresh_check (); 1595 THIS->refresh_check ();
1524 break; 1596 break;
… …
1538 CODE: 1610 CODE:
1539 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1611 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1540 THIS->keyboard->register_done (); 1612 THIS->keyboard->register_done ();
1541 OUTPUT: 1613 OUTPUT:
1542 RETVAL 1614 RETVAL
1615
1616void
1617rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1618 CODE:
1619 wchar_t *wstr = sv2wcs (str);
1620 THIS->keyboard->register_user_translation (keysym, state, wstr);
1621 free (wstr);
1543 1622
1544void 1623void
1545rxvt_term::screen_cur (...) 1624rxvt_term::screen_cur (...)
1546 PROTOTYPE: $;$$ 1625 PROTOTYPE: $;$$
1547 ALIAS: 1626 ALIAS:
… …
1655 1734
1656void 1735void
1657rxvt_term::scr_bell () 1736rxvt_term::scr_bell ()
1658 1737
1659void 1738void
1739rxvt_term::scr_recolour (bool refresh = true);
1740
1741void
1660rxvt_term::scr_change_screen (int screen) 1742rxvt_term::scr_change_screen (int screen)
1661 1743
1662void 1744void
1663rxvt_term::scr_add_lines (SV *string) 1745rxvt_term::scr_add_lines (SV *string)
1664 CODE: 1746 CODE:
… …
1777 type, format, PropModeReplace, 1859 type, format, PropModeReplace,
1778 (unsigned char *)data_, len / elemsize); 1860 (unsigned char *)data_, len / elemsize);
1779} 1861}
1780 1862
1781Atom 1863Atom
1782XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1864XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1783 C_ARGS: term->dpy, atom_name, only_if_exists 1865 C_ARGS: term->dpy, atom_name, only_if_exists
1784 1866
1785char * 1867char *
1786XGetAtomName (rxvt_term *term, Atom atom) 1868XGetAtomName (rxvt_term *term, Atom atom)
1787 C_ARGS: term->dpy, atom 1869 C_ARGS: term->dpy, atom
1788 CLEANUP: 1870 CLEANUP:
1789 XFree (RETVAL); 1871 XFree (RETVAL);
1790 1872
1791void 1873void
1792XDeleteProperty (rxvt_term *term, Window window, Atom property) 1874XDeleteProperty (rxvt_term *term, Window window, Atom property)
1793 C_ARGS: term->dpy, window, property 1875 C_ARGS: term->dpy, window, property
1794 1876
1795Window 1877Window
1796rxvt_term::DefaultRootWindow () 1878rxvt_term::DefaultRootWindow ()
1797 CODE: 1879 CODE:
1798 RETVAL = THIS->display->root; 1880 RETVAL = THIS->display->root;
… …
1850 PUSHs (newSVuv (child)); 1932 PUSHs (newSVuv (child));
1851 } 1933 }
1852} 1934}
1853 1935
1854############################################################################# 1936#############################################################################
1937# fancy bg bloatstuff (TODO: should be moved up somewhere)
1938
1939#if ENABLE_TRANSPARENCY
1940
1941#if 0
1942
1943rxvt_img *
1944rxvt_term::new_img_from_root ()
1945 CODE:
1946 RETVAL = rxvt_img::new_from_root (THIS);
1947 OUTPUT:
1948 RETVAL
1949
1950#endif
1951
1952#endif
1953
1954#if HAVE_PIXBUF
1955
1956rxvt_img *
1957rxvt_term::new_img_from_file (octet_string filename)
1958 CODE:
1959 try
1960 {
1961 RETVAL = rxvt_img::new_from_file (THIS, filename);
1962 }
1963 catch (const class rxvt_failure_exception &e)
1964 {
1965 croak ("new_img_from_file failed");
1966 }
1967 OUTPUT:
1968 RETVAL
1969
1970#endif
1971
1972#if HAVE_BG_PIXMAP
1973
1974void
1975rxvt_term::set_background (rxvt_img *img)
1976 CODE:
1977 THIS->bg_destroy ();
1978 THIS->bg_pixmap = None;
1979 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
1980
1981 if (img) // TODO: cannot be false
1982 {
1983 img->unshare ();
1984 THIS->bg_pixmap = img->steal ();
1985 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
1986 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
1987 }
1988
1989#endif
1990
1991#############################################################################
1855# urxvt::overlay 1992# urxvt::overlay
1856############################################################################# 1993#############################################################################
1857 1994
1858MODULE = urxvt PACKAGE = urxvt::overlay 1995MODULE = urxvt PACKAGE = urxvt::overlay
1859 1996
… …
1869void 2006void
1870overlay::DESTROY () 2007overlay::DESTROY ()
1871 2008
1872INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 2009INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1873 2010
2011MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
2012
2013#if HAVE_PIXBUF
2014
2015urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
2016 C_ARGS: filename, 0
2017
2018void
2019DESTROY (urxvt::pixbuf self)
2020 CODE:
2021 gdk_pixbuf_unref (self);
2022
2023#endif
2024
2025MODULE = urxvt PACKAGE = urxvt::img
2026
2027#if HAVE_IMG
2028
2029# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2030# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2031
2032void
2033rxvt_img::fill (SV *c)
2034 INIT:
2035 rxvt_color rc;
2036 parse_color (THIS->s, rc, c);
2037 C_ARGS: rc
2038
2039void
2040rxvt_img::DESTROY ()
2041 CODE:
2042 delete THIS;
2043
2044void
2045rxvt_img::blur (int rh, int rv)
2046
2047void
2048rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2049
2050void
2051rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2052
2053void
2054rxvt_img::unshare ()
2055
2056rxvt_img *
2057rxvt_img::clone ()
2058
2059rxvt_img *
2060rxvt_img::scale (int new_width, int new_height)
2061
2062rxvt_img *
2063rxvt_img::transform (int new_width, int new_height, int repeat, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2064 INIT:
2065 double matrix[9] = {
2066 p11, p12, p13,
2067 p21, p22, p23,
2068 p31, p32, p33
2069 };
2070 C_ARGS: new_width, new_height, repeat, matrix
2071
2072#endif
2073

Diff Legend

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