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.159 by root, Mon Jun 4 15:15:49 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 const_iv (RepeatNone),
812 const_iv (RepeatNormal),
813 const_iv (RepeatPad),
814 const_iv (RepeatReflect),
815#endif
756# if 0 816# if 0
757 const_iv (XIMForwardChar), 817 const_iv (XIMForwardChar),
758 const_iv (XIMBackwardChar), 818 const_iv (XIMBackwardChar),
759 const_iv (XIMForwardWord), 819 const_iv (XIMForwardWord),
760 const_iv (XIMBackwardWord), 820 const_iv (XIMBackwardWord),
… …
768 const_iv (XIMDontChange), 828 const_iv (XIMDontChange),
769# endif 829# endif
770# endif 830# endif
771 }; 831 };
772 832
773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; ) 833 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
775} 835}
776 836
777void 837void
778warn (const char *msg) 838warn (const char *msg)
779 CODE: 839 CODE:
… …
851 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++)
852 if ((*t)->perl.self) 912 if ((*t)->perl.self)
853 PUSHs (sv_2mortal (newSVterm (*t))); 913 PUSHs (sv_2mortal (newSVterm (*t)));
854} 914}
855 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
856MODULE = urxvt PACKAGE = urxvt::term 945MODULE = urxvt PACKAGE = urxvt::term
857 946
858SV * 947SV *
859_new (AV *env, AV *arg) 948_new (AV *env, AV *arg)
860 CODE: 949 CODE:
861{ 950{
862 rxvt_term *term = new rxvt_term; 951 rxvt_term *term = new rxvt_term;
863 952
864 stringvec *argv = new stringvec; 953 stringvec *argv = new stringvec;
865 stringvec *envv = new stringvec;
866
867 for (int i = 0; i <= AvFILL (arg); i++) 954 for (int i = 0; i <= AvFILL (arg); i++)
868 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 955 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
869 956
957 stringvec *envv = new stringvec;
870 for (int i = AvFILL (env) + 1; i--; ) 958 for (int i = AvFILL (env) + 1; i--; )
871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 959 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
872
873 envv->push_back (0);
874 960
875 try 961 try
876 { 962 {
877 term->init (argv, envv); 963 term->init (argv, envv);
878 } 964 }
… …
918 1004
919void 1005void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1006rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE: 1007 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1008 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
928 1009
929bool 1010bool
930rxvt_term::grab (Time eventtime, int sync = 0) 1011rxvt_term::grab (Time eventtime, int sync = 0)
931 CODE: 1012 CODE:
932{ 1013{
… …
1044 rxvt_pop_locale (); 1125 rxvt_pop_locale ();
1045 1126
1046 RETVAL = wcs2sv (wstr); 1127 RETVAL = wcs2sv (wstr);
1047 free (wstr); 1128 free (wstr);
1048} 1129}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1056 OUTPUT: 1130 OUTPUT:
1057 RETVAL 1131 RETVAL
1058 1132
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1133#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1134
… …
1167 RETVAL 1241 RETVAL
1168 1242
1169Window 1243Window
1170rxvt_term::parent () 1244rxvt_term::parent ()
1171 CODE: 1245 CODE:
1172 RETVAL = THIS->parent [0]; 1246 RETVAL = THIS->parent;
1173 OUTPUT: 1247 OUTPUT:
1174 RETVAL 1248 RETVAL
1175 1249
1176Window 1250Window
1177rxvt_term::vt () 1251rxvt_term::vt ()
… …
1204 if (newval <= 0) 1278 if (newval <= 0)
1205 THIS->scr_changeview (max (newval, THIS->top_row)); 1279 THIS->scr_changeview (max (newval, THIS->top_row));
1206} 1280}
1207 OUTPUT: 1281 OUTPUT:
1208 RETVAL 1282 RETVAL
1283
1284void
1285rxvt_term::set_urgency (bool enable)
1209 1286
1210void 1287void
1211rxvt_term::focus_in () 1288rxvt_term::focus_in ()
1212 1289
1213void 1290void
… …
1446# include "rsinc.h" 1523# include "rsinc.h"
1447# undef def 1524# undef def
1448# undef reserve 1525# undef reserve
1449 }; 1526 };
1450 1527
1451 rs = rslist + ARRAY_LENGTH(rslist); 1528 rs = rslist + ecb_array_length (rslist);
1452 1529
1453 if (*name) 1530 if (*name)
1454 { 1531 {
1455 do { 1532 do {
1456 if (rs-- == rslist) 1533 if (rs-- == rslist)
… …
1495 1572
1496 if (set >= 0) 1573 if (set >= 0)
1497 { 1574 {
1498 THIS->set_option (optval, set); 1575 THIS->set_option (optval, set);
1499 1576
1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1577 if (THIS->init_done) // avoid doing this before START
1501 switch (optval) 1578 switch (optval)
1502 { 1579 {
1503 case Opt_skipBuiltinGlyphs: 1580 case Opt_skipBuiltinGlyphs:
1504 THIS->set_fonts (); 1581 THIS->set_fonts ();
1505 THIS->scr_remap_chars (); 1582 THIS->scr_remap_chars ();
1506 THIS->scr_touch (true); 1583 THIS->scr_touch (true);
1507 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1508 THIS->refresh_check (); 1585 THIS->refresh_check ();
1509 break; 1586 break;
1587#ifdef CURSOR_BLINK
1588 case Opt_cursorBlink:
1589 THIS->cursor_blink_reset ();
1590 break;
1591#endif
1510 1592
1511 case Opt_cursorUnderline: 1593 case Opt_cursorUnderline:
1512 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1513 THIS->refresh_check (); 1595 THIS->refresh_check ();
1514 break; 1596 break;
… …
1528 CODE: 1610 CODE:
1529 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1611 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1530 THIS->keyboard->register_done (); 1612 THIS->keyboard->register_done ();
1531 OUTPUT: 1613 OUTPUT:
1532 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);
1533 1622
1534void 1623void
1535rxvt_term::screen_cur (...) 1624rxvt_term::screen_cur (...)
1536 PROTOTYPE: $;$$ 1625 PROTOTYPE: $;$$
1537 ALIAS: 1626 ALIAS:
… …
1767 type, format, PropModeReplace, 1856 type, format, PropModeReplace,
1768 (unsigned char *)data_, len / elemsize); 1857 (unsigned char *)data_, len / elemsize);
1769} 1858}
1770 1859
1771Atom 1860Atom
1772XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1861XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1773 C_ARGS: term->dpy, atom_name, only_if_exists 1862 C_ARGS: term->dpy, atom_name, only_if_exists
1774 1863
1775char * 1864char *
1776XGetAtomName (rxvt_term *term, Atom atom) 1865XGetAtomName (rxvt_term *term, Atom atom)
1777 C_ARGS: term->dpy, atom 1866 C_ARGS: term->dpy, atom
1778 CLEANUP: 1867 CLEANUP:
1779 XFree (RETVAL); 1868 XFree (RETVAL);
1780 1869
1781void 1870void
1782XDeleteProperty (rxvt_term *term, Window window, Atom property) 1871XDeleteProperty (rxvt_term *term, Window window, Atom property)
1783 C_ARGS: term->dpy, window, property 1872 C_ARGS: term->dpy, window, property
1784 1873
1785Window 1874Window
1786rxvt_term::DefaultRootWindow () 1875rxvt_term::DefaultRootWindow ()
1787 CODE: 1876 CODE:
1788 RETVAL = THIS->display->root; 1877 RETVAL = THIS->display->root;
… …
1840 PUSHs (newSVuv (child)); 1929 PUSHs (newSVuv (child));
1841 } 1930 }
1842} 1931}
1843 1932
1844############################################################################# 1933#############################################################################
1934# fancy bg bloatstuff (TODO: should be moved up somewhere)
1935
1936#ifdef ENABLE_TRANSPARENCY
1937
1938#if 0
1939
1940rxvt_img *
1941rxvt_term::new_img_from_root ()
1942 CODE:
1943 RETVAL = rxvt_img::new_from_root (THIS);
1944 OUTPUT:
1945 RETVAL
1946
1947#endif
1948
1949#endif
1950
1951#if HAVE_PIXBUF
1952
1953rxvt_img *
1954rxvt_term::new_img_from_file (octet_string filename)
1955 CODE:
1956 try
1957 {
1958 RETVAL = rxvt_img::new_from_file (THIS, filename);
1959 }
1960 catch (const class rxvt_failure_exception &e)
1961 {
1962 croak ("new_img_from_file failed");
1963 }
1964 OUTPUT:
1965 RETVAL
1966
1967#endif
1968
1969#############################################################################
1845# urxvt::overlay 1970# urxvt::overlay
1846############################################################################# 1971#############################################################################
1847 1972
1848MODULE = urxvt PACKAGE = urxvt::overlay 1973MODULE = urxvt PACKAGE = urxvt::overlay
1849 1974
… …
1859void 1984void
1860overlay::DESTROY () 1985overlay::DESTROY ()
1861 1986
1862INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1987INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863 1988
1989MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1990
1991#if HAVE_PIXBUF
1992
1993urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1994 C_ARGS: filename, 0
1995
1996void
1997DESTROY (urxvt::pixbuf self)
1998 CODE:
1999 gdk_pixbuf_unref (self);
2000
2001#endif
2002
2003MODULE = urxvt PACKAGE = urxvt::img
2004
2005#if HAVE_IMG
2006
2007# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2008# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2009
2010void
2011rxvt_img::fill (SV *c)
2012 INIT:
2013 rxvt_color rc;
2014 parse_color (THIS->s, rc, c);
2015 C_ARGS: rc
2016
2017void
2018rxvt_img::DESTROY ()
2019 CODE:
2020 delete THIS;
2021
2022void
2023rxvt_img::blur (int rh, int rv)
2024
2025void
2026rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2027
2028void
2029rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2030
2031void
2032rxvt_img::unshare ()
2033
2034rxvt_img *
2035rxvt_img::clone ()
2036
2037rxvt_img *
2038rxvt_img::scale (int new_width, int new_height)
2039
2040rxvt_img *
2041rxvt_img::transform (int new_width, int new_height, int repeat,
2042 NV p11, NV p12, NV p13,
2043 NV p21, NV p22, NV p23,
2044 NV p31, NV p32, NV p23)
2045 INIT:
2046 double matrix[9] = {
2047 p11, p12, p13,
2048 p21, p22, p23,
2049 p31, p32, p33
2050 };
2051 C_ARGS: new_width, new_height, repeat, matrix
2052
2053
2054#endif
2055

Diff Legend

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