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.157 by root, Sun Jun 3 15:54:15 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
… …
768 const_iv (XIMDontChange), 817 const_iv (XIMDontChange),
769# endif 818# endif
770# endif 819# endif
771 }; 820 };
772 821
773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; ) 822 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 823 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
775} 824}
776 825
777void 826void
778warn (const char *msg) 827warn (const char *msg)
779 CODE: 828 CODE:
… …
851 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 900 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
852 if ((*t)->perl.self) 901 if ((*t)->perl.self)
853 PUSHs (sv_2mortal (newSVterm (*t))); 902 PUSHs (sv_2mortal (newSVterm (*t)));
854} 903}
855 904
905IV
906_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
907 CODE:
908 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
909 req->cb_sv = newSVsv (cb);
910 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
911 av_push (av, newSViv ((IV)req));
912 RETVAL = (IV)req;
913 OUTPUT:
914 RETVAL
915
916void
917_delete_selection_request (IV req_)
918 CODE:
919 rxvt_selection *req = (rxvt_selection *)req_;
920 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
921 int i;
922
923 for (i = AvFILL (av); i >= 0; i--)
924 if (SvIV (*av_fetch (av, i, 1)) == req_)
925 break;
926
927 for (; i < AvFILL (av); i++)
928 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
929
930 av_pop (av);
931
932 delete req;
933
856MODULE = urxvt PACKAGE = urxvt::term 934MODULE = urxvt PACKAGE = urxvt::term
857 935
858SV * 936SV *
859_new (AV *env, AV *arg) 937_new (AV *env, AV *arg)
860 CODE: 938 CODE:
861{ 939{
862 rxvt_term *term = new rxvt_term; 940 rxvt_term *term = new rxvt_term;
863 941
864 stringvec *argv = new stringvec; 942 stringvec *argv = new stringvec;
865 stringvec *envv = new stringvec;
866
867 for (int i = 0; i <= AvFILL (arg); i++) 943 for (int i = 0; i <= AvFILL (arg); i++)
868 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 944 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
869 945
946 stringvec *envv = new stringvec;
870 for (int i = AvFILL (env) + 1; i--; ) 947 for (int i = AvFILL (env) + 1; i--; )
871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 948 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
872
873 envv->push_back (0);
874 949
875 try 950 try
876 { 951 {
877 term->init (argv, envv); 952 term->init (argv, envv);
878 } 953 }
… …
918 993
919void 994void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 995rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE: 996 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window); 997 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
928 998
929bool 999bool
930rxvt_term::grab (Time eventtime, int sync = 0) 1000rxvt_term::grab (Time eventtime, int sync = 0)
931 CODE: 1001 CODE:
932{ 1002{
… …
1044 rxvt_pop_locale (); 1114 rxvt_pop_locale ();
1045 1115
1046 RETVAL = wcs2sv (wstr); 1116 RETVAL = wcs2sv (wstr);
1047 free (wstr); 1117 free (wstr);
1048} 1118}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1056 OUTPUT: 1119 OUTPUT:
1057 RETVAL 1120 RETVAL
1058 1121
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1122#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1123
… …
1167 RETVAL 1230 RETVAL
1168 1231
1169Window 1232Window
1170rxvt_term::parent () 1233rxvt_term::parent ()
1171 CODE: 1234 CODE:
1172 RETVAL = THIS->parent [0]; 1235 RETVAL = THIS->parent;
1173 OUTPUT: 1236 OUTPUT:
1174 RETVAL 1237 RETVAL
1175 1238
1176Window 1239Window
1177rxvt_term::vt () 1240rxvt_term::vt ()
… …
1204 if (newval <= 0) 1267 if (newval <= 0)
1205 THIS->scr_changeview (max (newval, THIS->top_row)); 1268 THIS->scr_changeview (max (newval, THIS->top_row));
1206} 1269}
1207 OUTPUT: 1270 OUTPUT:
1208 RETVAL 1271 RETVAL
1272
1273void
1274rxvt_term::set_urgency (bool enable)
1209 1275
1210void 1276void
1211rxvt_term::focus_in () 1277rxvt_term::focus_in ()
1212 1278
1213void 1279void
… …
1446# include "rsinc.h" 1512# include "rsinc.h"
1447# undef def 1513# undef def
1448# undef reserve 1514# undef reserve
1449 }; 1515 };
1450 1516
1451 rs = rslist + ARRAY_LENGTH(rslist); 1517 rs = rslist + ecb_array_length (rslist);
1452 1518
1453 if (*name) 1519 if (*name)
1454 { 1520 {
1455 do { 1521 do {
1456 if (rs-- == rslist) 1522 if (rs-- == rslist)
… …
1495 1561
1496 if (set >= 0) 1562 if (set >= 0)
1497 { 1563 {
1498 THIS->set_option (optval, set); 1564 THIS->set_option (optval, set);
1499 1565
1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1566 if (THIS->init_done) // avoid doing this before START
1501 switch (optval) 1567 switch (optval)
1502 { 1568 {
1503 case Opt_skipBuiltinGlyphs: 1569 case Opt_skipBuiltinGlyphs:
1504 THIS->set_fonts (); 1570 THIS->set_fonts ();
1505 THIS->scr_remap_chars (); 1571 THIS->scr_remap_chars ();
1506 THIS->scr_touch (true); 1572 THIS->scr_touch (true);
1507 THIS->want_refresh = 1; 1573 THIS->want_refresh = 1;
1508 THIS->refresh_check (); 1574 THIS->refresh_check ();
1509 break; 1575 break;
1576#ifdef CURSOR_BLINK
1577 case Opt_cursorBlink:
1578 THIS->cursor_blink_reset ();
1579 break;
1580#endif
1510 1581
1511 case Opt_cursorUnderline: 1582 case Opt_cursorUnderline:
1512 THIS->want_refresh = 1; 1583 THIS->want_refresh = 1;
1513 THIS->refresh_check (); 1584 THIS->refresh_check ();
1514 break; 1585 break;
… …
1528 CODE: 1599 CODE:
1529 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1600 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1530 THIS->keyboard->register_done (); 1601 THIS->keyboard->register_done ();
1531 OUTPUT: 1602 OUTPUT:
1532 RETVAL 1603 RETVAL
1604
1605void
1606rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1607 CODE:
1608 wchar_t *wstr = sv2wcs (str);
1609 THIS->keyboard->register_user_translation (keysym, state, wstr);
1610 free (wstr);
1533 1611
1534void 1612void
1535rxvt_term::screen_cur (...) 1613rxvt_term::screen_cur (...)
1536 PROTOTYPE: $;$$ 1614 PROTOTYPE: $;$$
1537 ALIAS: 1615 ALIAS:
… …
1859void 1937void
1860overlay::DESTROY () 1938overlay::DESTROY ()
1861 1939
1862INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1940INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863 1941
1942MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1943
1944#if HAVE_PIXBUF
1945
1946urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1947 C_ARGS: filename, 0
1948
1949void
1950DESTROY (urxvt::pixbuf self)
1951 CODE:
1952 gdk_pixbuf_unref (self);
1953
1954#endif
1955
1956MODULE = urxvt PACKAGE = urxvt::img
1957
1958#if HAVE_IMG
1959
1960# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height);
1961# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1962
1963void fill (urxvt::img self, SV *c)
1964 CODE:
1965 rxvt_color rc;
1966 parse_color (self->s, rc, c);
1967 self->fill (rc);
1968
1969void blur (urxvt::img self, int rh, int rv)
1970 CODE:
1971 self->blur (rh, rv);
1972
1973void brightness (urxvt::img self, double r, double g, double b, double a = 1.)
1974 CODE:
1975 self->brightness (r, g, b, a);
1976
1977void contrast (urxvt::img self, double r, double g, double b, double a = 1.)
1978 CODE:
1979 self->contrast (r, g, b, a);
1980
1981urxvt::img copy (urxvt::img self)
1982 CODE:
1983 RETVAL = self->copy ();
1984 OUTPUT:
1985 RETVAL
1986
1987urxvt::img scale (urxvt::img self, int new_width, int new_height)
1988 CODE:
1989 RETVAL = self->scale (new_width, new_height);
1990 OUTPUT:
1991 RETVAL
1992
1993# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);
1994
1995#endif
1996

Diff Legend

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