--- rxvt-unicode/src/rxvtperl.xs 2012/06/05 13:39:26 1.167 +++ rxvt-unicode/src/rxvtperl.xs 2012/06/07 16:30:58 1.182 @@ -384,7 +384,7 @@ rxvt_pop_locale (); } - if (perl) + if (perl && !term->perl.self) { // runs outside of perls ENV term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); @@ -393,6 +393,55 @@ } } +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) { @@ -433,8 +482,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; @@ -654,6 +702,7 @@ dSP; XPUSHs (sv_2mortal (newSVpvn (data, len))); + PUTBACK; call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL); if (SvTRUE (ERRSV)) @@ -837,6 +886,11 @@ } void +log (const char *msg) + CODE: + rxvt_log ("%s", msg); + +void warn (const char *msg) CODE: rxvt_warn ("%s", msg); @@ -1012,6 +1066,11 @@ } } +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) CODE: @@ -1975,29 +2034,31 @@ # TODO: ugly void -rxvt_term::get_geometry () +rxvt_term::background_geometry (bool border = false) PPCODE: EXTEND (SP, 4); - PUSHs (sv_2mortal (newSViv (THIS->parent_x))); - PUSHs (sv_2mortal (newSViv (THIS->parent_y))); - PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); - PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); + 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 +#if 0 + rxvt_img * rxvt_term::new_img (SV *format, int width, int height) CODE: XRenderPictFormat *f = SvOK (format) - ? XRenderFindVisualFormat (THIS->dpy, THIS->visual) - : XRenderFindStandardFormat (THIS->dpy, SvIV (format)); + ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) + : XRenderFindVisualFormat (THIS->dpy, THIS->visual); RETVAL = new rxvt_img (THIS, f, width, height); OUTPUT: RETVAL -#if ENABLE_TRANSPARENCY +#endif -#if 0 +#if ENABLE_TRANSPARENCY rxvt_img * rxvt_term::new_img_from_root () @@ -2008,8 +2069,6 @@ #endif -#endif - #if HAVE_PIXBUF rxvt_img * @@ -2031,17 +2090,23 @@ #if HAVE_BG_PIXMAP void -rxvt_term::set_background (rxvt_img *img) +rxvt_term::set_background (rxvt_img *img, bool border = false) CODE: THIS->bg_destroy (); THIS->bg_pixmap = None; - THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH; + THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); if (img) // TODO: cannot be false { - img->unshare (); - THIS->bg_pixmap = img->steal (); - THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; + img = img->reify (); + rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]); + delete img; + THIS->bg_pixmap = img2->steal (); + THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; + + if (!border) + THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; + THIS->bg_valid_since = ev::now (); // TODO: extra bloat } @@ -2104,13 +2169,6 @@ OUTPUT: RETVAL -bool -rxvt_img::shared () - CODE: - RETVAL = THIS->shared; - OUTPUT: - RETVAL - Pixmap rxvt_img::pm () CODE: @@ -2131,38 +2189,47 @@ delete THIS; void -rxvt_img::blur (int rh, int rv) +rxvt_img::unshare () void -rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) +rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal) void -rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) +rxvt_img::move (int dx, int dy) void -rxvt_img::unshare () +rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) + +void +rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) rxvt_img * rxvt_img::clone () rxvt_img * -rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal) +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::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, render_repeat_mode repeat = RepeatNormal) +rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33) INIT: double matrix[9] = { p11, p12, p13, p21, p22, p23, p31, p32, p33 }; - C_ARGS: new_width, new_height, matrix, repeat + C_ARGS: new_width, new_height, matrix rxvt_img * rxvt_img::scale (int new_width, int new_height) rxvt_img * -rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) +rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) #endif