--- rxvt-unicode/src/rxvtperl.xs 2012/06/03 18:04:44 1.158 +++ rxvt-unicode/src/rxvtperl.xs 2013/03/01 09:33:51 1.214 @@ -54,19 +54,61 @@ typedef char * octet_string; typedef char * utf8_string; +typedef int render_repeat_mode; + +#if HAVE_PIXBUF typedef GdkPixbuf * urxvt__pixbuf; +#endif +#if HAVE_IMG typedef rxvt_img * urxvt__img; +typedef rxvt_img::nv rxvt_img__nv; ///////////////////////////////////////////////////////////////////////////// -static void -parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) +static rgba +parse_rgba (SV *sv, rxvt_screen *s = 0) { - //TODO: support component stuff - c.set (s, SvPVbyte_nolen (sv)); + rgba c; + + if (SvROK (sv)) + { + AV *av = (AV *)SvRV (sv); + + if (SvTYPE ((SV *)av) != SVt_PVAV) + croak ("colour must be either a colour string, or an array,"); + + int len = av_len (av) + 1; + + if (len != 1 && len != 3 && len != 4) + croak ("component colour array must have 1, 3 or 4 components,"); + + c.a = rgba::MAX_CC; + + c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0))); + + if (len >= 3) + { + c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); + c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); + + if (len >= 4) + c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); + } + } + else if (s) + { + rxvt_color rc; + rc.set (s, SvPVbyte_nolen (sv)); + rc.get (c); + } + else + croak ("unable to parse colour,"); + + return c; } ///////////////////////////////////////////////////////////////////////////// +#endif static wchar_t * sv2wcs (SV *sv) @@ -341,7 +383,7 @@ } void -rxvt_perl_interp::init (rxvt_term *term) +rxvt_perl_interp::init () { if (!perl) { @@ -381,8 +423,14 @@ rxvt_pop_locale (); } +} - if (perl) +void +rxvt_perl_interp::init (rxvt_term *term) +{ + init (); + + if (perl && !term->perl.self) { // runs outside of perls ENV term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); @@ -391,6 +439,61 @@ } } +void +rxvt_perl_interp::eval (const char *str) +{ + eval_pv (str, 1); +} + +void +rxvt_perl_interp::usage (rxvt_term *term, int type) +{ + localise_env set_environ (perl_environ); + + ENTER; + SAVETMPS; + + dSP; + PUSHMARK (SP); + EXTEND (SP, 2); + PUSHs (sv_2mortal (newSVterm (term))); + PUSHs (sv_2mortal (newSViv (type))); + PUTBACK; + call_pv ("urxvt::usage", G_VOID | G_DISCARD); + + FREETMPS; + LEAVE; +} + +uint8_t +rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) +{ + localise_env set_environ (perl_environ); + + ENTER; + SAVETMPS; + + dSP; + PUSHMARK (SP); + EXTEND (SP, 6); + PUSHs (sv_2mortal (newSVterm (term))); + PUSHs (sv_2mortal (newSVpv (name, 0))); + PUSHs (arg ? &PL_sv_yes : &PL_sv_no); + PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); + PUSHs (flag ? &PL_sv_yes : &PL_sv_no); + PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); + PUTBACK; + call_pv ("urxvt::parse_resource", G_SCALAR); + SPAGAIN; + + uint8_t ret = POPi; + + FREETMPS; + LEAVE; + + return ret; +} + static void ungrab (rxvt_term *THIS) { @@ -431,8 +534,7 @@ bool event_consumed; - if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always - || term->perl.should_invoke [htype]) + if (term->perl.should_invoke [htype]) { dSP; va_list ap; @@ -652,6 +754,7 @@ dSP; XPUSHs (sv_2mortal (newSVpvn (data, len))); + PUTBACK; call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL); if (SvTRUE (ERRSV)) @@ -802,12 +905,72 @@ const_iv (XIMVisibleToForward), const_iv (XIMVisibleToBackword), const_iv (XIMVisibleToCenter), -#if HAVE_XRENDER +#if XRENDER const_iv (PictStandardARGB32), const_iv (PictStandardRGB24), const_iv (PictStandardA8), const_iv (PictStandardA4), const_iv (PictStandardA1), + const_iv (RepeatNone), + const_iv (RepeatNormal), + const_iv (RepeatPad), + const_iv (RepeatReflect), + // all versions + const_iv (PictOpClear), + const_iv (PictOpSrc), + const_iv (PictOpDst), + const_iv (PictOpOver), + const_iv (PictOpOverReverse), + const_iv (PictOpIn), + const_iv (PictOpInReverse), + const_iv (PictOpOut), + const_iv (PictOpOutReverse), + const_iv (PictOpAtop), + const_iv (PictOpAtopReverse), + const_iv (PictOpXor), + const_iv (PictOpAdd), + const_iv (PictOpSaturate), + // 0.2+ + const_iv (PictOpDisjointClear), + const_iv (PictOpDisjointSrc), + const_iv (PictOpDisjointDst), + const_iv (PictOpDisjointOver), + const_iv (PictOpDisjointOverReverse), + const_iv (PictOpDisjointIn), + const_iv (PictOpDisjointInReverse), + const_iv (PictOpDisjointOut), + const_iv (PictOpDisjointOutReverse), + const_iv (PictOpDisjointAtop), + const_iv (PictOpDisjointAtopReverse), + const_iv (PictOpDisjointXor), + const_iv (PictOpConjointClear), + const_iv (PictOpConjointSrc), + const_iv (PictOpConjointDst), + const_iv (PictOpConjointOver), + const_iv (PictOpConjointOverReverse), + const_iv (PictOpConjointIn), + const_iv (PictOpConjointInReverse), + const_iv (PictOpConjointOut), + const_iv (PictOpConjointOutReverse), + const_iv (PictOpConjointAtop), + const_iv (PictOpConjointAtopReverse), + const_iv (PictOpConjointXor), + // 0.11+ + const_iv (PictOpMultiply), + const_iv (PictOpScreen), + const_iv (PictOpOverlay), + const_iv (PictOpDarken), + const_iv (PictOpLighten), + const_iv (PictOpColorDodge), + const_iv (PictOpColorBurn), + const_iv (PictOpHardLight), + const_iv (PictOpSoftLight), + const_iv (PictOpDifference), + const_iv (PictOpExclusion), + const_iv (PictOpHSLHue), + const_iv (PictOpHSLSaturation), + const_iv (PictOpHSLColor), + const_iv (PictOpHSLLuminosity), #endif # if 0 const_iv (XIMForwardChar), @@ -831,6 +994,11 @@ } void +log (const char *msg) + CODE: + rxvt_log ("%s", msg); + +void warn (const char *msg) CODE: rxvt_warn ("%s", msg); @@ -843,6 +1011,22 @@ void _exit (int status) +void +catch_fatal (SV *block) + PROTOTYPE: & + CODE: + try + { + PUSHMARK (SP); + PUTBACK; + call_sv (block, G_VOID | G_DISCARD); + SPAGAIN; + } + catch (const rxvt_failure_exception &e) + { + croak ("rxvt_fatal exception caught, trying to continue."); + } + NV NOW () CODE: @@ -976,7 +1160,24 @@ void rxvt_term::set_should_invoke (int htype, int inc) CODE: - THIS->perl.should_invoke [htype] += inc; + uint8_t &count = THIS->perl.should_invoke [htype]; + uint8_t prev = count; + count += inc; + if (!prev != !count) + { + // hook status changed, react + switch (htype) + { + case HOOK_POSITION_CHANGE: + if (count) + THIS->get_window_origin (THIS->parent_x, THIS->parent_y); + } + } + +void +rxvt_term::put_option_db (octet_string specifier, octet_string value) + CODE: + XrmPutStringResource (&THIS->option_db, specifier, value); int rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) @@ -1243,6 +1444,20 @@ OUTPUT: RETVAL +int +rxvt_term::parent_x () + CODE: + RETVAL = THIS->parent_x; + OUTPUT: + RETVAL + +int +rxvt_term::parent_y () + CODE: + RETVAL = THIS->parent_y; + OUTPUT: + RETVAL + Window rxvt_term::vt () CODE: @@ -1666,7 +1881,7 @@ { THIS->selection.screen = THIS->current_screen; - THIS->want_refresh = 1; + THIS->selection_changed (); THIS->refresh_check (); } } @@ -1732,6 +1947,9 @@ rxvt_term::scr_bell () void +rxvt_term::scr_recolour (bool refresh = true); + +void rxvt_term::scr_change_screen (int screen) void @@ -1854,7 +2072,7 @@ } Atom -XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) +XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE) C_ARGS: term->dpy, atom_name, only_if_exists char * @@ -1865,7 +2083,7 @@ void XDeleteProperty (rxvt_term *term, Window window, Atom property) - C_ARGS: term->dpy, window, property + C_ARGS: term->dpy, window, property Window rxvt_term::DefaultRootWindow () @@ -1929,19 +2147,95 @@ ############################################################################# # fancy bg bloatstuff (TODO: should be moved up somewhere) -#ifdef ENABLE_TRANSPARENCY +bool +rxvt_term::has_render () + CODE: + RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER; + OUTPUT: + RETVAL -# rxvt_img * -# rxvt_term::new_root_img () -# CODE: -# RETVAL = rxvt_img::new_from_root (THIS); -# OUTPUT: -# RETVAL +void +rxvt_term::background_geometry (bool border = false) + PPCODE: + EXTEND (SP, 4); + PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); + PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0)))); + PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); + PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); + +#if HAVE_IMG + +rxvt_img * +rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1) + CODE: + XRenderPictFormat *f = SvOK (format) + ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) + : XRenderFindVisualFormat (THIS->dpy, THIS->visual); + RETVAL = new rxvt_img (THIS, f, x, y, width, height); + RETVAL->alloc (); + OUTPUT: + RETVAL + +#if ENABLE_TRANSPARENCY + +rxvt_img * +rxvt_term::new_img_from_root () + CODE: + RETVAL = rxvt_img::new_from_root (THIS); + OUTPUT: + RETVAL #endif #if HAVE_PIXBUF +rxvt_img * +rxvt_term::new_img_from_file (octet_string filename) + CODE: + try + { + RETVAL = rxvt_img::new_from_file (THIS, filename); + } + catch (const class rxvt_failure_exception &e) + { + croak ("new_img_from_file failed"); + } + OUTPUT: + RETVAL + +#endif + +void +rxvt_term::set_background (rxvt_img *img, bool border = false) + CODE: + delete THIS->bg_img; + THIS->bg_img = 0; + THIS->bg_flags = 0; + + if (img) // TODO: cannot be false + { + img = img->clone (); // own the img + + if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap + img->sub_rect (0, 0, + border ? THIS->vt_width : THIS->szHint.width, + border ? THIS->vt_height : THIS->szHint.height) + ->replace (img); + + // just in case, should usually be a nop + img->reify () + ->replace (img); + + img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) + ->replace (img); + + THIS->bg_img = img; + THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; + + if (!border) + THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; + } + #endif ############################################################################# @@ -1974,7 +2268,7 @@ void DESTROY (urxvt::pixbuf self) CODE: - gdk_pixbuf_unref (self); + g_object_unref (self); #endif @@ -1986,29 +2280,139 @@ # rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); void -rxvt_img::fill (SV *c) +rxvt_img::geometry () + PPCODE: + EXTEND (SP, 4); + PUSHs (sv_2mortal (newSViv (THIS->x))); + PUSHs (sv_2mortal (newSViv (THIS->y))); + PUSHs (sv_2mortal (newSViv (THIS->w))); + PUSHs (sv_2mortal (newSViv (THIS->h))); + +int +rxvt_img::x () + ALIAS: + x = 0 + y = 1 + w = 2 + h = 3 + CODE: + switch (ix) + { + case 0: RETVAL = THIS->x; break; + case 1: RETVAL = THIS->y; break; + case 2: RETVAL = THIS->w; break; + case 3: RETVAL = THIS->h; break; + } + OUTPUT: + RETVAL + +Pixmap +rxvt_img::pm () + CODE: + RETVAL = THIS->pm; + OUTPUT: + RETVAL + +void +rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) + PROTOTYPE: $;$$$$ INIT: - rxvt_color rc; - parse_color (THIS->s, rc, c); - C_ARGS: rc + rgba cc = parse_rgba (c, THIS->s); + C_ARGS: cc, x, y, w, h void -rxvt_img::blur (int rh, int rv) +rxvt_img::DESTROY () + CODE: + delete THIS; + +void +rxvt_img::add_alpha () + +void +rxvt_img::unshare () + +void +rxvt_img::repeat_mode (render_repeat_mode repeat = 0) + PPCODE: + if (items >= 2) + THIS->repeat_mode (repeat); + if (GIMME_V != G_VOID) + XPUSHs (sv_2mortal (newSViv (THIS->repeat))); + +void +rxvt_img::move (int dx, int dy) + +void +rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) void -rxvt_img::brightness (double r, double g, double b, double a = 1.) +rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) void -rxvt_img::contrast (double r, double g, double b, double a = 1.) +rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.); rxvt_img * -rxvt_img::copy () +rxvt_img::clone () + +rxvt_img * +rxvt_img::reify () + +rxvt_img * +rxvt_img::sub_rect (int x, int y, int width, int height) + +rxvt_img * +rxvt_img::blur (int rh, int rv) + +rxvt_img * +rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add) + +rxvt_img * +rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33) + INIT: + rxvt_img::nv matrix[3][3] = { + { p11, p12, p13 }, + { p21, p22, p23 }, + { p31, p32, p33 } + }; + C_ARGS: matrix rxvt_img * rxvt_img::scale (int new_width, int new_height) -# rxvt_img * -# rxvt_img::transform (int new_width, int new_height, double matrix[16]); +rxvt_img * +rxvt_img::rotate (int x, int y, rxvt_img::nv phi) + +rxvt_img * +rxvt_img::tint (SV *c) + INIT: + rgba cc = parse_rgba (c, THIS->s); + C_ARGS: cc + +rxvt_img * +rxvt_img::shade (rxvt_img::nv factor) + +rxvt_img * +rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) + CODE: + rxvt_img::nv *vparams = 0; + int nparams = 0; + + if (SvOK (params)) + { + if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) + croak ("rxvt_img::filter: params must be an array reference with parameter values"); + + nparams = av_len ((AV *)SvRV (params)) + 1; + vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv)); + + for (int i = 0; i < nparams; ++i) + vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); + } + + RETVAL = THIS->filter (name, nparams, vparams); + free (vparams); + OUTPUT: + RETVAL #endif