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.172 by root, Tue Jun 5 22:46:50 2012 UTC vs.
Revision 1.181 by root, Thu Jun 7 13:12:08 2012 UTC

… …
400 400
401 ENTER; 401 ENTER;
402 SAVETMPS; 402 SAVETMPS;
403 403
404 dSP; 404 dSP;
405 PUSHMARK (SP);
405 EXTEND (SP, 2); 406 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 407 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 408 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 409 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL); 410 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
410 411
411 FREETMPS; 412 FREETMPS;
412 LEAVE; 413 LEAVE;
413} 414}
414 415
415uint8_t 416uint8_t
416rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) 417rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
417{ 418{
418 localise_env set_environ (perl_environ); 419 localise_env set_environ (perl_environ);
419 420
420 ENTER; 421 ENTER;
421 SAVETMPS; 422 SAVETMPS;
422 423
423 dSP; 424 dSP;
425 PUSHMARK (SP);
424 EXTEND (SP, 6); 426 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 427 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 428 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 429 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 430 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429 PUSHs (flag ? &PL_sv_yes : &PL_sv_no); 431 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); 432 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431 PUTBACK; 433 PUTBACK;
432 call_pv ("urxvt::resource", G_SCALAR | G_EVAL); 434 call_pv ("urxvt::parse_resource", G_SCALAR);
435 SPAGAIN;
433 436
434 uint8_t ret = POPi; 437 uint8_t ret = POPi;
435 438
436 FREETMPS; 439 FREETMPS;
437 LEAVE; 440 LEAVE;
… …
1061 if (count) 1064 if (count)
1062 THIS->get_window_origin (THIS->parent_x, THIS->parent_y); 1065 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063 } 1066 }
1064 } 1067 }
1065 1068
1069void
1070rxvt_term::put_option_db (octet_string specifier, octet_string value)
1071 CODE:
1072 XrmPutStringResource (&THIS->option_db, specifier, value);
1073
1066int 1074int
1067rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1075rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1068 CODE: 1076 CODE:
1069 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1077 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1070 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1078 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
2024############################################################################# 2032#############################################################################
2025# fancy bg bloatstuff (TODO: should be moved up somewhere) 2033# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026 2034
2027# TODO: ugly 2035# TODO: ugly
2028void 2036void
2029rxvt_term::get_geometry () 2037rxvt_term::background_geometry (bool border = false)
2030 PPCODE: 2038 PPCODE:
2031 EXTEND (SP, 4); 2039 EXTEND (SP, 4);
2032 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2033 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2041 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2034 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2035 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2036 2044
2037#if HAVE_IMG 2045#if HAVE_IMG
2046
2047#if 0
2038 2048
2039rxvt_img * 2049rxvt_img *
2040rxvt_term::new_img (SV *format, int width, int height) 2050rxvt_term::new_img (SV *format, int width, int height)
2041 CODE: 2051 CODE:
2042 XRenderPictFormat *f = SvOK (format) 2052 XRenderPictFormat *f = SvOK (format)
… …
2044 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045 RETVAL = new rxvt_img (THIS, f, width, height); 2055 RETVAL = new rxvt_img (THIS, f, width, height);
2046 OUTPUT: 2056 OUTPUT:
2047 RETVAL 2057 RETVAL
2048 2058
2059#endif
2060
2049#if ENABLE_TRANSPARENCY 2061#if ENABLE_TRANSPARENCY
2050 2062
2051rxvt_img * 2063rxvt_img *
2052rxvt_term::new_img_from_root () 2064rxvt_term::new_img_from_root ()
2053 CODE: 2065 CODE:
… …
2076#endif 2088#endif
2077 2089
2078#if HAVE_BG_PIXMAP 2090#if HAVE_BG_PIXMAP
2079 2091
2080void 2092void
2081rxvt_term::set_background (rxvt_img *img) 2093rxvt_term::set_background (rxvt_img *img, bool border = false)
2082 CODE: 2094 CODE:
2083 THIS->bg_destroy (); 2095 THIS->bg_destroy ();
2084 THIS->bg_pixmap = None; 2096 THIS->bg_pixmap = None;
2085 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH; 2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2086 2098
2087 if (img) // TODO: cannot be false 2099 if (img) // TODO: cannot be false
2088 { 2100 {
2089 img->unshare (); 2101 img = img->reify ();
2090 //TODO: convetr to visual, possibly precompose with colour 2102 rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
2103 delete img;
2091 THIS->bg_pixmap = img->steal (); 2104 THIS->bg_pixmap = img2->steal ();
2105 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2106
2107 if (!border)
2092 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2108 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2109
2093 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2110 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2094 } 2111 }
2095 2112
2096#endif 2113#endif
2097 2114
… …
2147 2164
2148int 2165int
2149rxvt_img::h () 2166rxvt_img::h ()
2150 CODE: 2167 CODE:
2151 RETVAL = THIS->h; 2168 RETVAL = THIS->h;
2152 OUTPUT:
2153 RETVAL
2154
2155bool
2156rxvt_img::shared ()
2157 CODE:
2158 RETVAL = THIS->shared;
2159 OUTPUT: 2169 OUTPUT:
2160 RETVAL 2170 RETVAL
2161 2171
2162Pixmap 2172Pixmap
2163rxvt_img::pm () 2173rxvt_img::pm ()
… …
2176void 2186void
2177rxvt_img::DESTROY () 2187rxvt_img::DESTROY ()
2178 CODE: 2188 CODE:
2179 delete THIS; 2189 delete THIS;
2180 2190
2191void
2192rxvt_img::unshare ()
2193
2194void
2195rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal)
2196
2197void
2198rxvt_img::move (int dx, int dy)
2199
2200void
2201rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2202
2203void
2204rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2205
2206rxvt_img *
2207rxvt_img::clone ()
2208
2209rxvt_img *
2210rxvt_img::reify ()
2211
2212rxvt_img *
2213rxvt_img::sub_rect (int x, int y, int width, int height)
2214
2181rxvt_img * 2215rxvt_img *
2182rxvt_img::blur (int rh, int rv) 2216rxvt_img::blur (int rh, int rv)
2183 2217
2184void
2185rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2186
2187void
2188rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2189
2190void
2191rxvt_img::unshare ()
2192
2193rxvt_img * 2218rxvt_img *
2194rxvt_img::clone ()
2195
2196rxvt_img *
2197rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2198
2199rxvt_img *
2200rxvt_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) 2219rxvt_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)
2201 INIT: 2220 INIT:
2202 double matrix[9] = { 2221 double matrix[9] = {
2203 p11, p12, p13, 2222 p11, p12, p13,
2204 p21, p22, p23, 2223 p21, p22, p23,
2205 p31, p32, p33 2224 p31, p32, p33
2206 }; 2225 };
2207 C_ARGS: new_width, new_height, matrix, repeat 2226 C_ARGS: new_width, new_height, matrix
2208 2227
2209rxvt_img * 2228rxvt_img *
2210rxvt_img::scale (int new_width, int new_height) 2229rxvt_img::scale (int new_width, int new_height)
2211 2230
2212rxvt_img * 2231rxvt_img *
2213rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2232rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2214 2233
2215#endif 2234#endif
2216 2235

Diff Legend

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