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.137 by root, Mon Feb 21 07:41:03 2011 UTC vs.
Revision 1.158 by root, Sun Jun 3 18:04:44 2012 UTC

… …
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)
… …
341 " unshift @INC, '" LIBDIR "';" 359 " unshift @INC, '" LIBDIR "';"
342 "}" 360 "}"
343 "" 361 ""
344 "use urxvt;" 362 "use urxvt;"
345 }; 363 };
346 int argc = ARRAY_LENGTH(args); 364 int argc = ecb_array_length (args);
347 char **argv = args; 365 char **argv = args;
348 366
349 PERL_SYS_INIT3 (&argc, &argv, &environ); 367 PERL_SYS_INIT3 (&argc, &argv, &environ);
350 perl = perl_alloc (); 368 perl = perl_alloc ();
351 perl_construct (perl); 369 perl_construct (perl);
… …
367 if (perl) 385 if (perl)
368 { 386 {
369 // runs outside of perls ENV 387 // runs outside of perls ENV
370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 388 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
371 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);
372 } 391 }
373} 392}
374 393
375static void 394static void
376ungrab (rxvt_term *THIS) 395ungrab (rxvt_term *THIS)
… …
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));
424
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 }
402 431
403 bool event_consumed; 432 bool event_consumed;
404 433
405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 434 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
406 || term->perl.should_invoke [htype]) 435 || term->perl.should_invoke [htype])
… …
413 ENTER; 442 ENTER;
414 SAVETMPS; 443 SAVETMPS;
415 444
416 PUSHMARK (SP); 445 PUSHMARK (SP);
417 446
447 EXTEND (SP, 2);
418 XPUSHs (sv_2mortal (newSVterm (term))); 448 PUSHs (sv_2mortal (newSVterm (term)));
419 XPUSHs (sv_2mortal (newSViv (htype))); 449 PUSHs (sv_2mortal (newSViv (htype)));
420 450
421 for (;;) { 451 for (;;) {
422 data_type dt = (data_type)va_arg (ap, int); 452 data_type dt = (data_type)va_arg (ap, int);
423 453
424 switch (dt) 454 switch (dt)
… …
581 FREETMPS; 611 FREETMPS;
582 LEAVE; 612 LEAVE;
583 613
584 if (SvTRUE (ERRSV)) 614 if (SvTRUE (ERRSV))
585 { 615 {
586 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));
587 ungrab (term); // better lose the grab than the session 617 ungrab (term); // better lose the grab than the session
588 } 618 }
589 619
590 event_consumed = !!count; 620 event_consumed = !!count;
591 } 621 }
… …
608 // don't allow further calls 638 // don't allow further calls
609 term->perl.self = 0; 639 term->perl.self = 0;
610 } 640 }
611 641
612 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;
613} 662}
614 663
615///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
616 665
617MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
751 const_iv (XIMSecondary), 800 const_iv (XIMSecondary),
752 const_iv (XIMTertiary), 801 const_iv (XIMTertiary),
753 const_iv (XIMVisibleToForward), 802 const_iv (XIMVisibleToForward),
754 const_iv (XIMVisibleToBackword), 803 const_iv (XIMVisibleToBackword),
755 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#endif
756# if 0 812# if 0
757 const_iv (XIMForwardChar), 813 const_iv (XIMForwardChar),
758 const_iv (XIMBackwardChar), 814 const_iv (XIMBackwardChar),
759 const_iv (XIMForwardWord), 815 const_iv (XIMForwardWord),
760 const_iv (XIMBackwardWord), 816 const_iv (XIMBackwardWord),
… …
768 const_iv (XIMDontChange), 824 const_iv (XIMDontChange),
769# endif 825# endif
770# endif 826# endif
771 }; 827 };
772 828
773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; ) 829 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 830 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
775} 831}
776 832
777void 833void
778warn (const char *msg) 834warn (const char *msg)
779 CODE: 835 CODE:
… …
851 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 907 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
852 if ((*t)->perl.self) 908 if ((*t)->perl.self)
853 PUSHs (sv_2mortal (newSVterm (*t))); 909 PUSHs (sv_2mortal (newSVterm (*t)));
854} 910}
855 911
912IV
913_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
914 CODE:
915 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
916 req->cb_sv = newSVsv (cb);
917 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
918 av_push (av, newSViv ((IV)req));
919 RETVAL = (IV)req;
920 OUTPUT:
921 RETVAL
922
923void
924_delete_selection_request (IV req_)
925 CODE:
926 rxvt_selection *req = (rxvt_selection *)req_;
927 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
928 int i;
929
930 for (i = AvFILL (av); i >= 0; i--)
931 if (SvIV (*av_fetch (av, i, 1)) == req_)
932 break;
933
934 for (; i < AvFILL (av); i++)
935 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
936
937 av_pop (av);
938
939 delete req;
940
856MODULE = urxvt PACKAGE = urxvt::term 941MODULE = urxvt PACKAGE = urxvt::term
857 942
858SV * 943SV *
859_new (AV *env, AV *arg) 944_new (AV *env, AV *arg)
860 CODE: 945 CODE:
861{ 946{
862 rxvt_term *term = new rxvt_term; 947 rxvt_term *term = new rxvt_term;
863 948
864 stringvec *argv = new stringvec; 949 stringvec *argv = new stringvec;
865 stringvec *envv = new stringvec;
866
867 for (int i = 0; i <= AvFILL (arg); i++) 950 for (int i = 0; i <= AvFILL (arg); i++)
868 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 951 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
869 952
953 stringvec *envv = new stringvec;
870 for (int i = AvFILL (env) + 1; i--; ) 954 for (int i = AvFILL (env) + 1; i--; )
871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 955 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
872
873 envv->push_back (0);
874 956
875 try 957 try
876 { 958 {
877 term->init (argv, envv); 959 term->init (argv, envv);
878 } 960 }
… …
918 1000
919void 1001void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1002rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE: 1003 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1004 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
928 1005
929bool 1006bool
930rxvt_term::grab (Time eventtime, int sync = 0) 1007rxvt_term::grab (Time eventtime, int sync = 0)
931 CODE: 1008 CODE:
932{ 1009{
… …
1044 rxvt_pop_locale (); 1121 rxvt_pop_locale ();
1045 1122
1046 RETVAL = wcs2sv (wstr); 1123 RETVAL = wcs2sv (wstr);
1047 free (wstr); 1124 free (wstr);
1048} 1125}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1056 OUTPUT: 1126 OUTPUT:
1057 RETVAL 1127 RETVAL
1058 1128
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1129#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1130
… …
1167 RETVAL 1237 RETVAL
1168 1238
1169Window 1239Window
1170rxvt_term::parent () 1240rxvt_term::parent ()
1171 CODE: 1241 CODE:
1172 RETVAL = THIS->parent [0]; 1242 RETVAL = THIS->parent;
1173 OUTPUT: 1243 OUTPUT:
1174 RETVAL 1244 RETVAL
1175 1245
1176Window 1246Window
1177rxvt_term::vt () 1247rxvt_term::vt ()
… …
1204 if (newval <= 0) 1274 if (newval <= 0)
1205 THIS->scr_changeview (max (newval, THIS->top_row)); 1275 THIS->scr_changeview (max (newval, THIS->top_row));
1206} 1276}
1207 OUTPUT: 1277 OUTPUT:
1208 RETVAL 1278 RETVAL
1279
1280void
1281rxvt_term::set_urgency (bool enable)
1209 1282
1210void 1283void
1211rxvt_term::focus_in () 1284rxvt_term::focus_in ()
1212 1285
1213void 1286void
… …
1446# include "rsinc.h" 1519# include "rsinc.h"
1447# undef def 1520# undef def
1448# undef reserve 1521# undef reserve
1449 }; 1522 };
1450 1523
1451 rs = rslist + ARRAY_LENGTH(rslist); 1524 rs = rslist + ecb_array_length (rslist);
1452 1525
1453 if (*name) 1526 if (*name)
1454 { 1527 {
1455 do { 1528 do {
1456 if (rs-- == rslist) 1529 if (rs-- == rslist)
… …
1495 1568
1496 if (set >= 0) 1569 if (set >= 0)
1497 { 1570 {
1498 THIS->set_option (optval, set); 1571 THIS->set_option (optval, set);
1499 1572
1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1573 if (THIS->init_done) // avoid doing this before START
1501 switch (optval) 1574 switch (optval)
1502 { 1575 {
1503 case Opt_skipBuiltinGlyphs: 1576 case Opt_skipBuiltinGlyphs:
1504 THIS->set_fonts (); 1577 THIS->set_fonts ();
1505 THIS->scr_remap_chars (); 1578 THIS->scr_remap_chars ();
1506 THIS->scr_touch (true); 1579 THIS->scr_touch (true);
1507 THIS->want_refresh = 1; 1580 THIS->want_refresh = 1;
1508 THIS->refresh_check (); 1581 THIS->refresh_check ();
1509 break; 1582 break;
1583#ifdef CURSOR_BLINK
1584 case Opt_cursorBlink:
1585 THIS->cursor_blink_reset ();
1586 break;
1587#endif
1510 1588
1511 case Opt_cursorUnderline: 1589 case Opt_cursorUnderline:
1512 THIS->want_refresh = 1; 1590 THIS->want_refresh = 1;
1513 THIS->refresh_check (); 1591 THIS->refresh_check ();
1514 break; 1592 break;
… …
1528 CODE: 1606 CODE:
1529 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1607 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1530 THIS->keyboard->register_done (); 1608 THIS->keyboard->register_done ();
1531 OUTPUT: 1609 OUTPUT:
1532 RETVAL 1610 RETVAL
1611
1612void
1613rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1614 CODE:
1615 wchar_t *wstr = sv2wcs (str);
1616 THIS->keyboard->register_user_translation (keysym, state, wstr);
1617 free (wstr);
1533 1618
1534void 1619void
1535rxvt_term::screen_cur (...) 1620rxvt_term::screen_cur (...)
1536 PROTOTYPE: $;$$ 1621 PROTOTYPE: $;$$
1537 ALIAS: 1622 ALIAS:
… …
1840 PUSHs (newSVuv (child)); 1925 PUSHs (newSVuv (child));
1841 } 1926 }
1842} 1927}
1843 1928
1844############################################################################# 1929#############################################################################
1930# fancy bg bloatstuff (TODO: should be moved up somewhere)
1931
1932#ifdef ENABLE_TRANSPARENCY
1933
1934# rxvt_img *
1935# rxvt_term::new_root_img ()
1936# CODE:
1937# RETVAL = rxvt_img::new_from_root (THIS);
1938# OUTPUT:
1939# RETVAL
1940
1941#endif
1942
1943#if HAVE_PIXBUF
1944
1945#endif
1946
1947#############################################################################
1845# urxvt::overlay 1948# urxvt::overlay
1846############################################################################# 1949#############################################################################
1847 1950
1848MODULE = urxvt PACKAGE = urxvt::overlay 1951MODULE = urxvt PACKAGE = urxvt::overlay
1849 1952
… …
1859void 1962void
1860overlay::DESTROY () 1963overlay::DESTROY ()
1861 1964
1862INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1965INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863 1966
1967MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1968
1969#if HAVE_PIXBUF
1970
1971urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1972 C_ARGS: filename, 0
1973
1974void
1975DESTROY (urxvt::pixbuf self)
1976 CODE:
1977 gdk_pixbuf_unref (self);
1978
1979#endif
1980
1981MODULE = urxvt PACKAGE = urxvt::img
1982
1983#if HAVE_IMG
1984
1985# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
1986# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1987
1988void
1989rxvt_img::fill (SV *c)
1990 INIT:
1991 rxvt_color rc;
1992 parse_color (THIS->s, rc, c);
1993 C_ARGS: rc
1994
1995void
1996rxvt_img::blur (int rh, int rv)
1997
1998void
1999rxvt_img::brightness (double r, double g, double b, double a = 1.)
2000
2001void
2002rxvt_img::contrast (double r, double g, double b, double a = 1.)
2003
2004rxvt_img *
2005rxvt_img::copy ()
2006
2007rxvt_img *
2008rxvt_img::scale (int new_width, int new_height)
2009
2010# rxvt_img *
2011# rxvt_img::transform (int new_width, int new_height, double matrix[16]);
2012
2013#endif
2014

Diff Legend

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