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.171 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.191 by root, Sun Jun 10 15:01:14 2012 UTC

… …
54typedef char * octet_string; 54typedef char * octet_string;
55typedef char * utf8_string; 55typedef char * utf8_string;
56 56
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF
59typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif
60typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
61 63
62///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
63 65
64static void 66static void
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
66{ 68{
67 //TODO: support component stuff 69 //TODO: support component stuff, 0..1
68 c.set (s, SvPVbyte_nolen (sv)); 70 c.set (s, SvPVbyte_nolen (sv));
69} 71}
70 72
71///////////////////////////////////////////////////////////////////////////// 73/////////////////////////////////////////////////////////////////////////////
72 74
… …
382 } 384 }
383 385
384 rxvt_pop_locale (); 386 rxvt_pop_locale ();
385 } 387 }
386 388
387 if (perl) 389 if (perl && !term->perl.self)
388 { 390 {
389 // runs outside of perls ENV 391 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 392 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 393 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 394 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
… …
400 402
401 ENTER; 403 ENTER;
402 SAVETMPS; 404 SAVETMPS;
403 405
404 dSP; 406 dSP;
407 PUSHMARK (SP);
405 EXTEND (SP, 2); 408 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 409 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 410 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 411 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL); 412 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
410 413
411 FREETMPS; 414 FREETMPS;
412 LEAVE; 415 LEAVE;
413} 416}
414 417
415uint8_t 418uint8_t
416rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) 419rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
417{ 420{
418 localise_env set_environ (perl_environ); 421 localise_env set_environ (perl_environ);
419 422
420 ENTER; 423 ENTER;
421 SAVETMPS; 424 SAVETMPS;
422 425
423 dSP; 426 dSP;
427 PUSHMARK (SP);
424 EXTEND (SP, 6); 428 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 429 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 430 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 431 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 432 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429 PUSHs (flag ? &PL_sv_yes : &PL_sv_no); 433 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); 434 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431 PUTBACK; 435 PUTBACK;
432 call_pv ("urxvt::resource", G_SCALAR | G_EVAL); 436 call_pv ("urxvt::parse_resource", G_SCALAR);
437 SPAGAIN;
433 438
434 uint8_t ret = POPi; 439 uint8_t ret = POPi;
435 440
436 FREETMPS; 441 FREETMPS;
437 LEAVE; 442 LEAVE;
… …
1061 if (count) 1066 if (count)
1062 THIS->get_window_origin (THIS->parent_x, THIS->parent_y); 1067 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063 } 1068 }
1064 } 1069 }
1065 1070
1071void
1072rxvt_term::put_option_db (octet_string specifier, octet_string value)
1073 CODE:
1074 XrmPutStringResource (&THIS->option_db, specifier, value);
1075
1066int 1076int
1067rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1077rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1068 CODE: 1078 CODE:
1069 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1079 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1070 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1080 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
2022} 2032}
2023 2033
2024############################################################################# 2034#############################################################################
2025# fancy bg bloatstuff (TODO: should be moved up somewhere) 2035# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026 2036
2037bool
2038rxvt_term::has_render ()
2039 CODE:
2040 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2041 OUTPUT:
2042 RETVAL
2043
2027# TODO: ugly 2044# TODO: ugly
2028void 2045void
2029rxvt_term::get_geometry () 2046rxvt_term::background_geometry (bool border = false)
2030 PPCODE: 2047 PPCODE:
2031 EXTEND (SP, 4); 2048 EXTEND (SP, 4);
2032 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2049 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2033 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2050 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2034 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2051 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2035 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2052 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2036 2053
2037#if HAVE_IMG 2054#if HAVE_IMG
2038 2055
2039rxvt_img * 2056rxvt_img *
2040rxvt_term::new_img (SV *format, int width, int height) 2057rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2041 CODE: 2058 CODE:
2042 XRenderPictFormat *f = SvOK (format) 2059 XRenderPictFormat *f = SvOK (format)
2043 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2060 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2044 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2061 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045 RETVAL = new rxvt_img (THIS, f, width, height); 2062 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
2063 RETVAL->alloc ();
2046 OUTPUT: 2064 OUTPUT:
2047 RETVAL 2065 RETVAL
2048 2066
2049#if ENABLE_TRANSPARENCY 2067#if ENABLE_TRANSPARENCY
2050
2051#if 0
2052 2068
2053rxvt_img * 2069rxvt_img *
2054rxvt_term::new_img_from_root () 2070rxvt_term::new_img_from_root ()
2055 CODE: 2071 CODE:
2056 RETVAL = rxvt_img::new_from_root (THIS); 2072 RETVAL = rxvt_img::new_from_root (THIS);
2057 OUTPUT: 2073 OUTPUT:
2058 RETVAL 2074 RETVAL
2059 2075
2060#endif 2076#endif
2061 2077
2062#endif
2063
2064#if HAVE_PIXBUF 2078#if HAVE_PIXBUF
2065 2079
2066rxvt_img * 2080rxvt_img *
2067rxvt_term::new_img_from_file (octet_string filename) 2081rxvt_term::new_img_from_file (octet_string filename)
2068 CODE: 2082 CODE:
… …
2080#endif 2094#endif
2081 2095
2082#if HAVE_BG_PIXMAP 2096#if HAVE_BG_PIXMAP
2083 2097
2084void 2098void
2085rxvt_term::set_background (rxvt_img *img) 2099rxvt_term::set_background (rxvt_img *img, bool border = false)
2086 CODE: 2100 CODE:
2087 THIS->bg_destroy (); 2101 THIS->bg_destroy ();
2088 THIS->bg_pixmap = None; 2102 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2089 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2090 2103
2091 if (img) // TODO: cannot be false 2104 if (img) // TODO: cannot be false
2092 { 2105 {
2106 img = img->clone (); // own the img
2107
2108 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2109 img->sub_rect (0, 0,
2110 border ? THIS->vt_width : THIS->szHint.width,
2111 border ? THIS->vt_height : THIS->szHint.height)
2112 ->replace (img);
2113
2114 // just in case, should usually be a nop
2093 img->unshare (); 2115 img->reify ()
2094 THIS->bg_pixmap = img->steal (); 2116 ->replace (img);
2117
2118 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2119 ->replace (img);
2120
2121 THIS->bg_img = img;
2122 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2123
2124 if (!border)
2095 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2125 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2096 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2097 } 2126 }
2098 2127
2099#endif 2128#endif
2100 2129
2101#endif 2130#endif
… …
2150 2179
2151int 2180int
2152rxvt_img::h () 2181rxvt_img::h ()
2153 CODE: 2182 CODE:
2154 RETVAL = THIS->h; 2183 RETVAL = THIS->h;
2155 OUTPUT:
2156 RETVAL
2157
2158bool
2159rxvt_img::shared ()
2160 CODE:
2161 RETVAL = THIS->shared;
2162 OUTPUT: 2184 OUTPUT:
2163 RETVAL 2185 RETVAL
2164 2186
2165Pixmap 2187Pixmap
2166rxvt_img::pm () 2188rxvt_img::pm ()
… …
2179void 2201void
2180rxvt_img::DESTROY () 2202rxvt_img::DESTROY ()
2181 CODE: 2203 CODE:
2182 delete THIS; 2204 delete THIS;
2183 2205
2206void
2207rxvt_img::unshare ()
2208
2209int
2210rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2211 CODE:
2212 if (items >= 2)
2213 THIS->repeat_mode (repeat);
2214 if (GIMME_V != G_VOID)
2215 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2216
2217void
2218rxvt_img::move (int dx, int dy)
2219
2220void
2221rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2222
2223void
2224rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2225
2226rxvt_img *
2227rxvt_img::clone ()
2228
2229rxvt_img *
2230rxvt_img::reify ()
2231
2232rxvt_img *
2233rxvt_img::sub_rect (int x, int y, int width, int height)
2234
2184rxvt_img * 2235rxvt_img *
2185rxvt_img::blur (int rh, int rv) 2236rxvt_img::blur (int rh, int rv)
2186 2237
2187void
2188rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2189
2190void
2191rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2192
2193void
2194rxvt_img::unshare ()
2195
2196rxvt_img * 2238rxvt_img *
2197rxvt_img::clone ()
2198
2199rxvt_img *
2200rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2201
2202rxvt_img *
2203rxvt_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) 2239rxvt_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)
2204 INIT: 2240 INIT:
2205 double matrix[9] = { 2241 double matrix[9] = {
2206 p11, p12, p13, 2242 p11, p12, p13,
2207 p21, p22, p23, 2243 p21, p22, p23,
2208 p31, p32, p33 2244 p31, p32, p33
2209 }; 2245 };
2210 C_ARGS: new_width, new_height, matrix, repeat 2246 C_ARGS: new_width, new_height, matrix
2211 2247
2212rxvt_img * 2248rxvt_img *
2213rxvt_img::scale (int new_width, int new_height) 2249rxvt_img::scale (int new_width, int new_height)
2214 2250
2215rxvt_img * 2251rxvt_img *
2216rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2252rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2217 2253
2218#endif 2254#endif
2219 2255

Diff Legend

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