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.155 by root, Sun Jun 3 10:38:22 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;
50 59
51///////////////////////////////////////////////////////////////////////////// 60/////////////////////////////////////////////////////////////////////////////
52 61
53static wchar_t * 62static wchar_t *
54sv2wcs (SV *sv) 63sv2wcs (SV *sv)
… …
341 " unshift @INC, '" LIBDIR "';" 350 " unshift @INC, '" LIBDIR "';"
342 "}" 351 "}"
343 "" 352 ""
344 "use urxvt;" 353 "use urxvt;"
345 }; 354 };
346 int argc = ARRAY_LENGTH(args); 355 int argc = ecb_array_length (args);
347 char **argv = args; 356 char **argv = args;
348 357
349 PERL_SYS_INIT3 (&argc, &argv, &environ); 358 PERL_SYS_INIT3 (&argc, &argv, &environ);
350 perl = perl_alloc (); 359 perl = perl_alloc ();
351 perl_construct (perl); 360 perl_construct (perl);
… …
367 if (perl) 376 if (perl)
368 { 377 {
369 // runs outside of perls ENV 378 // runs outside of perls ENV
370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 379 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); 380 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
381 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
372 } 382 }
373} 383}
374 384
375static void 385static void
376ungrab (rxvt_term *THIS) 386ungrab (rxvt_term *THIS)
… …
397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 407 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
398 408
399 for (int i = 0; i <= AvFILL (av); i++) 409 for (int i = 0; i <= AvFILL (av); i++)
400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 410 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
401 } 411 }
412 else if (htype == HOOK_DESTROY)
413 {
414 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
415
416 for (int i = AvFILL (av); i >= 0; i--)
417 {
418 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
419 delete req;
420 }
421 }
402 422
403 bool event_consumed; 423 bool event_consumed;
404 424
405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 425 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
406 || term->perl.should_invoke [htype]) 426 || term->perl.should_invoke [htype])
… …
413 ENTER; 433 ENTER;
414 SAVETMPS; 434 SAVETMPS;
415 435
416 PUSHMARK (SP); 436 PUSHMARK (SP);
417 437
438 EXTEND (SP, 2);
418 XPUSHs (sv_2mortal (newSVterm (term))); 439 PUSHs (sv_2mortal (newSVterm (term)));
419 XPUSHs (sv_2mortal (newSViv (htype))); 440 PUSHs (sv_2mortal (newSViv (htype)));
420 441
421 for (;;) { 442 for (;;) {
422 data_type dt = (data_type)va_arg (ap, int); 443 data_type dt = (data_type)va_arg (ap, int);
423 444
424 switch (dt) 445 switch (dt)
… …
581 FREETMPS; 602 FREETMPS;
582 LEAVE; 603 LEAVE;
583 604
584 if (SvTRUE (ERRSV)) 605 if (SvTRUE (ERRSV))
585 { 606 {
586 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 607 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
587 ungrab (term); // better lose the grab than the session 608 ungrab (term); // better lose the grab than the session
588 } 609 }
589 610
590 event_consumed = !!count; 611 event_consumed = !!count;
591 } 612 }
… …
608 // don't allow further calls 629 // don't allow further calls
609 term->perl.self = 0; 630 term->perl.self = 0;
610 } 631 }
611 632
612 return event_consumed; 633 return event_consumed;
634}
635
636void
637rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
638{
639 localise_env set_environ (perl_environ);
640
641 ENTER;
642 SAVETMPS;
643
644 dSP;
645 XPUSHs (sv_2mortal (newSVpvn (data, len)));
646 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
647
648 if (SvTRUE (ERRSV))
649 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
650
651 FREETMPS;
652 LEAVE;
613} 653}
614 654
615///////////////////////////////////////////////////////////////////////////// 655/////////////////////////////////////////////////////////////////////////////
616 656
617MODULE = urxvt PACKAGE = urxvt 657MODULE = urxvt PACKAGE = urxvt
… …
768 const_iv (XIMDontChange), 808 const_iv (XIMDontChange),
769# endif 809# endif
770# endif 810# endif
771 }; 811 };
772 812
773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; ) 813 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 814 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
775} 815}
776 816
777void 817void
778warn (const char *msg) 818warn (const char *msg)
779 CODE: 819 CODE:
… …
851 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 891 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
852 if ((*t)->perl.self) 892 if ((*t)->perl.self)
853 PUSHs (sv_2mortal (newSVterm (*t))); 893 PUSHs (sv_2mortal (newSVterm (*t)));
854} 894}
855 895
896IV
897_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
898 CODE:
899 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
900 req->cb_sv = newSVsv (cb);
901 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
902 av_push (av, newSViv ((IV)req));
903 RETVAL = (IV)req;
904 OUTPUT:
905 RETVAL
906
907void
908_delete_selection_request (IV req_)
909 CODE:
910 rxvt_selection *req = (rxvt_selection *)req_;
911 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
912 int i;
913
914 for (i = AvFILL (av); i >= 0; i--)
915 if (SvIV (*av_fetch (av, i, 1)) == req_)
916 break;
917
918 for (; i < AvFILL (av); i++)
919 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
920
921 av_pop (av);
922
923 delete req;
924
856MODULE = urxvt PACKAGE = urxvt::term 925MODULE = urxvt PACKAGE = urxvt::term
857 926
858SV * 927SV *
859_new (AV *env, AV *arg) 928_new (AV *env, AV *arg)
860 CODE: 929 CODE:
861{ 930{
862 rxvt_term *term = new rxvt_term; 931 rxvt_term *term = new rxvt_term;
863 932
864 stringvec *argv = new stringvec; 933 stringvec *argv = new stringvec;
865 stringvec *envv = new stringvec;
866
867 for (int i = 0; i <= AvFILL (arg); i++) 934 for (int i = 0; i <= AvFILL (arg); i++)
868 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 935 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
869 936
937 stringvec *envv = new stringvec;
870 for (int i = AvFILL (env) + 1; i--; ) 938 for (int i = AvFILL (env) + 1; i--; )
871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 939 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
872
873 envv->push_back (0);
874 940
875 try 941 try
876 { 942 {
877 term->init (argv, envv); 943 term->init (argv, envv);
878 } 944 }
… …
918 984
919void 985void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 986rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE: 987 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window); 988 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
928 989
929bool 990bool
930rxvt_term::grab (Time eventtime, int sync = 0) 991rxvt_term::grab (Time eventtime, int sync = 0)
931 CODE: 992 CODE:
932{ 993{
… …
1044 rxvt_pop_locale (); 1105 rxvt_pop_locale ();
1045 1106
1046 RETVAL = wcs2sv (wstr); 1107 RETVAL = wcs2sv (wstr);
1047 free (wstr); 1108 free (wstr);
1048} 1109}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1056 OUTPUT: 1110 OUTPUT:
1057 RETVAL 1111 RETVAL
1058 1112
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1113#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1114
… …
1167 RETVAL 1221 RETVAL
1168 1222
1169Window 1223Window
1170rxvt_term::parent () 1224rxvt_term::parent ()
1171 CODE: 1225 CODE:
1172 RETVAL = THIS->parent [0]; 1226 RETVAL = THIS->parent;
1173 OUTPUT: 1227 OUTPUT:
1174 RETVAL 1228 RETVAL
1175 1229
1176Window 1230Window
1177rxvt_term::vt () 1231rxvt_term::vt ()
… …
1204 if (newval <= 0) 1258 if (newval <= 0)
1205 THIS->scr_changeview (max (newval, THIS->top_row)); 1259 THIS->scr_changeview (max (newval, THIS->top_row));
1206} 1260}
1207 OUTPUT: 1261 OUTPUT:
1208 RETVAL 1262 RETVAL
1263
1264void
1265rxvt_term::set_urgency (bool enable)
1209 1266
1210void 1267void
1211rxvt_term::focus_in () 1268rxvt_term::focus_in ()
1212 1269
1213void 1270void
… …
1446# include "rsinc.h" 1503# include "rsinc.h"
1447# undef def 1504# undef def
1448# undef reserve 1505# undef reserve
1449 }; 1506 };
1450 1507
1451 rs = rslist + ARRAY_LENGTH(rslist); 1508 rs = rslist + ecb_array_length (rslist);
1452 1509
1453 if (*name) 1510 if (*name)
1454 { 1511 {
1455 do { 1512 do {
1456 if (rs-- == rslist) 1513 if (rs-- == rslist)
… …
1495 1552
1496 if (set >= 0) 1553 if (set >= 0)
1497 { 1554 {
1498 THIS->set_option (optval, set); 1555 THIS->set_option (optval, set);
1499 1556
1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1557 if (THIS->init_done) // avoid doing this before START
1501 switch (optval) 1558 switch (optval)
1502 { 1559 {
1503 case Opt_skipBuiltinGlyphs: 1560 case Opt_skipBuiltinGlyphs:
1504 THIS->set_fonts (); 1561 THIS->set_fonts ();
1505 THIS->scr_remap_chars (); 1562 THIS->scr_remap_chars ();
1506 THIS->scr_touch (true); 1563 THIS->scr_touch (true);
1507 THIS->want_refresh = 1; 1564 THIS->want_refresh = 1;
1508 THIS->refresh_check (); 1565 THIS->refresh_check ();
1509 break; 1566 break;
1567#ifdef CURSOR_BLINK
1568 case Opt_cursorBlink:
1569 THIS->cursor_blink_reset ();
1570 break;
1571#endif
1510 1572
1511 case Opt_cursorUnderline: 1573 case Opt_cursorUnderline:
1512 THIS->want_refresh = 1; 1574 THIS->want_refresh = 1;
1513 THIS->refresh_check (); 1575 THIS->refresh_check ();
1514 break; 1576 break;
… …
1528 CODE: 1590 CODE:
1529 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1591 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1530 THIS->keyboard->register_done (); 1592 THIS->keyboard->register_done ();
1531 OUTPUT: 1593 OUTPUT:
1532 RETVAL 1594 RETVAL
1595
1596void
1597rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1598 CODE:
1599 wchar_t *wstr = sv2wcs (str);
1600 THIS->keyboard->register_user_translation (keysym, state, wstr);
1601 free (wstr);
1533 1602
1534void 1603void
1535rxvt_term::screen_cur (...) 1604rxvt_term::screen_cur (...)
1536 PROTOTYPE: $;$$ 1605 PROTOTYPE: $;$$
1537 ALIAS: 1606 ALIAS:
… …
1859void 1928void
1860overlay::DESTROY () 1929overlay::DESTROY ()
1861 1930
1862INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1931INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1863 1932
1933MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1934
1935urxvt::pixbuf gdk_pixbuf_new_from_file (octet_string filename, GError **error = 0)
1936
1937void
1938DESTROY (urxvt::pixbuf self)
1939 CODE:
1940 gdk_pixbuf_unref (self);
1941

Diff Legend

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