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.139 by root, Thu Mar 24 17:34:29 2011 UTC vs.
Revision 1.165 by root, Mon Jun 4 21:33:47 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)
… …
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 ();
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 }
401 } 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
… …
771 const_iv (XIMSecondary), 800 const_iv (XIMSecondary),
772 const_iv (XIMTertiary), 801 const_iv (XIMTertiary),
773 const_iv (XIMVisibleToForward), 802 const_iv (XIMVisibleToForward),
774 const_iv (XIMVisibleToBackword), 803 const_iv (XIMVisibleToBackword),
775 const_iv (XIMVisibleToCenter), 804 const_iv (XIMVisibleToCenter),
805#if 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
776# if 0 816# if 0
777 const_iv (XIMForwardChar), 817 const_iv (XIMForwardChar),
778 const_iv (XIMBackwardChar), 818 const_iv (XIMBackwardChar),
779 const_iv (XIMForwardWord), 819 const_iv (XIMForwardWord),
780 const_iv (XIMBackwardWord), 820 const_iv (XIMBackwardWord),
… …
788 const_iv (XIMDontChange), 828 const_iv (XIMDontChange),
789# endif 829# endif
790# endif 830# endif
791 }; 831 };
792 832
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795} 835}
796 836
797void 837void
798warn (const char *msg) 838warn (const char *msg)
799 CODE: 839 CODE:
… …
876IV 916IV
877_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb) 917_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
878 CODE: 918 CODE:
879 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term); 919 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
880 req->cb_sv = newSVsv (cb); 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));
881 RETVAL = (IV)req; 923 RETVAL = (IV)req;
882 OUTPUT: 924 OUTPUT:
883 RETVAL 925 RETVAL
884 926
885void 927void
886_delete_selection_request (IV req_) 928_delete_selection_request (IV req_)
887 CODE: 929 CODE:
888 rxvt_selection *req = (rxvt_selection *)req_; 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
889 delete req; 943 delete req;
890 944
891MODULE = urxvt PACKAGE = urxvt::term 945MODULE = urxvt PACKAGE = urxvt::term
892 946
893SV * 947SV *
… …
895 CODE: 949 CODE:
896{ 950{
897 rxvt_term *term = new rxvt_term; 951 rxvt_term *term = new rxvt_term;
898 952
899 stringvec *argv = new stringvec; 953 stringvec *argv = new stringvec;
900 stringvec *envv = new stringvec;
901
902 for (int i = 0; i <= AvFILL (arg); i++) 954 for (int i = 0; i <= AvFILL (arg); i++)
903 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 955 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
904 956
957 stringvec *envv = new stringvec;
905 for (int i = AvFILL (env) + 1; i--; ) 958 for (int i = AvFILL (env) + 1; i--; )
906 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 959 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
907
908 envv->push_back (0);
909 960
910 try 961 try
911 { 962 {
912 term->init (argv, envv); 963 term->init (argv, envv);
913 } 964 }
… …
953 1004
954void 1005void
955rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1006rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
956 CODE: 1007 CODE:
957 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1008 XUngrabKey (THIS->dpy, keycode, modifiers, window);
958
959void
960rxvt_term::XUngrabKeyboard (Time eventtime)
961 CODE:
962 XUngrabKeyboard (THIS->dpy, eventtime);
963 1009
964bool 1010bool
965rxvt_term::grab (Time eventtime, int sync = 0) 1011rxvt_term::grab (Time eventtime, int sync = 0)
966 CODE: 1012 CODE:
967{ 1013{
… …
1079 rxvt_pop_locale (); 1125 rxvt_pop_locale ();
1080 1126
1081 RETVAL = wcs2sv (wstr); 1127 RETVAL = wcs2sv (wstr);
1082 free (wstr); 1128 free (wstr);
1083} 1129}
1084 OUTPUT:
1085 RETVAL
1086
1087char *
1088rxvt_term::locale ()
1089 CODE:
1090 RETVAL = THIS->locale;
1091 OUTPUT: 1130 OUTPUT:
1092 RETVAL 1131 RETVAL
1093 1132
1094#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1133#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1095 1134
… …
1202 RETVAL 1241 RETVAL
1203 1242
1204Window 1243Window
1205rxvt_term::parent () 1244rxvt_term::parent ()
1206 CODE: 1245 CODE:
1207 RETVAL = THIS->parent [0]; 1246 RETVAL = THIS->parent;
1208 OUTPUT: 1247 OUTPUT:
1209 RETVAL 1248 RETVAL
1210 1249
1211Window 1250Window
1212rxvt_term::vt () 1251rxvt_term::vt ()
… …
1239 if (newval <= 0) 1278 if (newval <= 0)
1240 THIS->scr_changeview (max (newval, THIS->top_row)); 1279 THIS->scr_changeview (max (newval, THIS->top_row));
1241} 1280}
1242 OUTPUT: 1281 OUTPUT:
1243 RETVAL 1282 RETVAL
1283
1284void
1285rxvt_term::set_urgency (bool enable)
1244 1286
1245void 1287void
1246rxvt_term::focus_in () 1288rxvt_term::focus_in ()
1247 1289
1248void 1290void
… …
1481# include "rsinc.h" 1523# include "rsinc.h"
1482# undef def 1524# undef def
1483# undef reserve 1525# undef reserve
1484 }; 1526 };
1485 1527
1486 rs = rslist + ARRAY_LENGTH(rslist); 1528 rs = rslist + ecb_array_length (rslist);
1487 1529
1488 if (*name) 1530 if (*name)
1489 { 1531 {
1490 do { 1532 do {
1491 if (rs-- == rslist) 1533 if (rs-- == rslist)
… …
1530 1572
1531 if (set >= 0) 1573 if (set >= 0)
1532 { 1574 {
1533 THIS->set_option (optval, set); 1575 THIS->set_option (optval, set);
1534 1576
1535 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1577 if (THIS->init_done) // avoid doing this before START
1536 switch (optval) 1578 switch (optval)
1537 { 1579 {
1538 case Opt_skipBuiltinGlyphs: 1580 case Opt_skipBuiltinGlyphs:
1539 THIS->set_fonts (); 1581 THIS->set_fonts ();
1540 THIS->scr_remap_chars (); 1582 THIS->scr_remap_chars ();
1541 THIS->scr_touch (true); 1583 THIS->scr_touch (true);
1542 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1543 THIS->refresh_check (); 1585 THIS->refresh_check ();
1544 break; 1586 break;
1587#ifdef CURSOR_BLINK
1588 case Opt_cursorBlink:
1589 THIS->cursor_blink_reset ();
1590 break;
1591#endif
1545 1592
1546 case Opt_cursorUnderline: 1593 case Opt_cursorUnderline:
1547 THIS->want_refresh = 1; 1594 THIS->want_refresh = 1;
1548 THIS->refresh_check (); 1595 THIS->refresh_check ();
1549 break; 1596 break;
… …
1563 CODE: 1610 CODE:
1564 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1611 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1565 THIS->keyboard->register_done (); 1612 THIS->keyboard->register_done ();
1566 OUTPUT: 1613 OUTPUT:
1567 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);
1568 1622
1569void 1623void
1570rxvt_term::screen_cur (...) 1624rxvt_term::screen_cur (...)
1571 PROTOTYPE: $;$$ 1625 PROTOTYPE: $;$$
1572 ALIAS: 1626 ALIAS:
… …
1680 1734
1681void 1735void
1682rxvt_term::scr_bell () 1736rxvt_term::scr_bell ()
1683 1737
1684void 1738void
1739rxvt_term::scr_recolour (bool refresh = true);
1740
1741void
1685rxvt_term::scr_change_screen (int screen) 1742rxvt_term::scr_change_screen (int screen)
1686 1743
1687void 1744void
1688rxvt_term::scr_add_lines (SV *string) 1745rxvt_term::scr_add_lines (SV *string)
1689 CODE: 1746 CODE:
… …
1802 type, format, PropModeReplace, 1859 type, format, PropModeReplace,
1803 (unsigned char *)data_, len / elemsize); 1860 (unsigned char *)data_, len / elemsize);
1804} 1861}
1805 1862
1806Atom 1863Atom
1807XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1864XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1808 C_ARGS: term->dpy, atom_name, only_if_exists 1865 C_ARGS: term->dpy, atom_name, only_if_exists
1809 1866
1810char * 1867char *
1811XGetAtomName (rxvt_term *term, Atom atom) 1868XGetAtomName (rxvt_term *term, Atom atom)
1812 C_ARGS: term->dpy, atom 1869 C_ARGS: term->dpy, atom
1813 CLEANUP: 1870 CLEANUP:
1814 XFree (RETVAL); 1871 XFree (RETVAL);
1815 1872
1816void 1873void
1817XDeleteProperty (rxvt_term *term, Window window, Atom property) 1874XDeleteProperty (rxvt_term *term, Window window, Atom property)
1818 C_ARGS: term->dpy, window, property 1875 C_ARGS: term->dpy, window, property
1819 1876
1820Window 1877Window
1821rxvt_term::DefaultRootWindow () 1878rxvt_term::DefaultRootWindow ()
1822 CODE: 1879 CODE:
1823 RETVAL = THIS->display->root; 1880 RETVAL = THIS->display->root;
… …
1875 PUSHs (newSVuv (child)); 1932 PUSHs (newSVuv (child));
1876 } 1933 }
1877} 1934}
1878 1935
1879############################################################################# 1936#############################################################################
1937# fancy bg bloatstuff (TODO: should be moved up somewhere)
1938
1939# TODO: ugly
1940void
1941rxvt_term::get_geometry ()
1942 PPCODE:
1943 Window wdummy;
1944 int x, y;
1945 XWindowAttributes wattr;
1946 XGetWindowAttributes (THIS->dpy, THIS->parent, &wattr);
1947 XTranslateCoordinates (THIS->dpy, THIS->parent, wattr.root,
1948 -wattr.border_width, -wattr.border_width,
1949 &x, &y, &wdummy);
1950 EXTEND (SP, 4);
1951 PUSHs (sv_2mortal (newSViv (x)));
1952 PUSHs (sv_2mortal (newSViv (y)));
1953 PUSHs (sv_2mortal (newSViv (wattr.width)));
1954 PUSHs (sv_2mortal (newSViv (wattr.height)));
1955
1956#if HAVE_IMG
1957
1958rxvt_img *
1959rxvt_term::new_img (SV *format, int width, int height)
1960 CODE:
1961 XRenderPictFormat *f = SvOK (format)
1962 ? XRenderFindVisualFormat (THIS->dpy, THIS->visual)
1963 : XRenderFindStandardFormat (THIS->dpy, SvIV (format));
1964 RETVAL = new rxvt_img (THIS, f, width, height);
1965 OUTPUT:
1966 RETVAL
1967
1968#if ENABLE_TRANSPARENCY
1969
1970#if 0
1971
1972rxvt_img *
1973rxvt_term::new_img_from_root ()
1974 CODE:
1975 RETVAL = rxvt_img::new_from_root (THIS);
1976 OUTPUT:
1977 RETVAL
1978
1979#endif
1980
1981#endif
1982
1983#if HAVE_PIXBUF
1984
1985rxvt_img *
1986rxvt_term::new_img_from_file (octet_string filename)
1987 CODE:
1988 try
1989 {
1990 RETVAL = rxvt_img::new_from_file (THIS, filename);
1991 }
1992 catch (const class rxvt_failure_exception &e)
1993 {
1994 croak ("new_img_from_file failed");
1995 }
1996 OUTPUT:
1997 RETVAL
1998
1999#endif
2000
2001#if HAVE_BG_PIXMAP
2002
2003void
2004rxvt_term::set_background (rxvt_img *img)
2005 CODE:
2006 THIS->bg_destroy ();
2007 THIS->bg_pixmap = None;
2008 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2009
2010 if (img) // TODO: cannot be false
2011 {
2012 img->unshare ();
2013 THIS->bg_pixmap = img->steal ();
2014 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2015 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2016 }
2017
2018#endif
2019
2020#endif
2021
2022#############################################################################
1880# urxvt::overlay 2023# urxvt::overlay
1881############################################################################# 2024#############################################################################
1882 2025
1883MODULE = urxvt PACKAGE = urxvt::overlay 2026MODULE = urxvt PACKAGE = urxvt::overlay
1884 2027
… …
1894void 2037void
1895overlay::DESTROY () 2038overlay::DESTROY ()
1896 2039
1897INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 2040INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1898 2041
2042MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
2043
2044#if HAVE_PIXBUF
2045
2046urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
2047 C_ARGS: filename, 0
2048
2049void
2050DESTROY (urxvt::pixbuf self)
2051 CODE:
2052 gdk_pixbuf_unref (self);
2053
2054#endif
2055
2056MODULE = urxvt PACKAGE = urxvt::img
2057
2058#if HAVE_IMG
2059
2060# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2061# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2062
2063int
2064rxvt_img::w ()
2065 CODE:
2066 RETVAL = THIS->w;
2067 OUTPUT:
2068 RETVAL
2069
2070int
2071rxvt_img::h ()
2072 CODE:
2073 RETVAL = THIS->h;
2074 OUTPUT:
2075 RETVAL
2076
2077bool
2078rxvt_img::shared ()
2079 CODE:
2080 RETVAL = THIS->shared;
2081 OUTPUT:
2082 RETVAL
2083
2084Pixmap
2085rxvt_img::pm ()
2086 CODE:
2087 RETVAL = THIS->pm;
2088 OUTPUT:
2089 RETVAL
2090
2091void
2092rxvt_img::fill (SV *c)
2093 INIT:
2094 rxvt_color rc;
2095 parse_color (THIS->s, rc, c);
2096 C_ARGS: rc
2097
2098void
2099rxvt_img::DESTROY ()
2100 CODE:
2101 delete THIS;
2102
2103void
2104rxvt_img::blur (int rh, int rv)
2105
2106void
2107rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2108
2109void
2110rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2111
2112void
2113rxvt_img::unshare ()
2114
2115rxvt_img *
2116rxvt_img::clone ()
2117
2118rxvt_img *
2119rxvt_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)
2120 INIT:
2121 double matrix[9] = {
2122 p11, p12, p13,
2123 p21, p22, p23,
2124 p31, p32, p33
2125 };
2126 C_ARGS: new_width, new_height, repeat, matrix
2127
2128rxvt_img *
2129rxvt_img::scale (int new_width, int new_height)
2130
2131rxvt_img *
2132rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)
2133
2134#endif
2135

Diff Legend

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