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.205 by root, Mon Jul 2 03:57:53 2012 UTC vs.
Revision 1.218 by root, Sat Apr 26 20:51:12 2014 UTC

… …
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
… …
105 106
106 return c; 107 return c;
107} 108}
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
110 112
111static wchar_t * 113static wchar_t *
112sv2wcs (SV *sv) 114sv2wcs (SV *sv)
113{ 115{
114 STRLEN len; 116 STRLEN len;
… …
791 static const struct { 793 static const struct {
792 const char *name; 794 const char *name;
793 IV iv; 795 IV iv;
794 } *civ, const_iv[] = { 796 } *civ, const_iv[] = {
795# define const_iv(name) { # name, (IV)name } 797# define const_iv(name) { # name, (IV)name }
798 const_iv (HOOK_INIT),
799 const_iv (HOOK_DESTROY),
800 const_iv (HOOK_KEYBOARD_DISPATCH),
801
796 const_iv (NUM_RESOURCES), 802 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 803 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 804 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 805 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 806 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
810 const_iv (RS_Bold), 816 const_iv (RS_Bold),
811 const_iv (RS_Italic), 817 const_iv (RS_Italic),
812 const_iv (RS_Blink), 818 const_iv (RS_Blink),
813 const_iv (RS_RVid), 819 const_iv (RS_RVid),
814 const_iv (RS_Uline), 820 const_iv (RS_Uline),
821
822 // TODO: should support all colour constants, create colorinc.h &c
823 const_iv (Color_fg),
824 const_iv (Color_bg),
825#if OFF_FOCUS_FADING
826 const_iv (Color_fade),
827#endif
828 const_iv (Color_pointer_fg),
829 const_iv (Color_pointer_bg),
830 const_iv (Color_border),
831 const_iv (NRS_COLORS),
832 const_iv (TOTAL_COLORS),
815 833
816 const_iv (CurrentTime), 834 const_iv (CurrentTime),
817 const_iv (ShiftMask), 835 const_iv (ShiftMask),
818 const_iv (LockMask), 836 const_iv (LockMask),
819 const_iv (ControlMask), 837 const_iv (ControlMask),
… …
1877 1895
1878 if (ix) 1896 if (ix)
1879 { 1897 {
1880 THIS->selection.screen = THIS->current_screen; 1898 THIS->selection.screen = THIS->current_screen;
1881 1899
1882 THIS->want_refresh = 1; 1900 THIS->selection_changed ();
1883 THIS->refresh_check (); 1901 THIS->refresh_check ();
1884 } 1902 }
1885 } 1903 }
1886} 1904}
1887 1905
… …
1891 RETVAL = THIS->selection.screen; 1909 RETVAL = THIS->selection.screen;
1892 if (screen >= 0) 1910 if (screen >= 0)
1893 THIS->selection.screen = screen; 1911 THIS->selection.screen = screen;
1894 OUTPUT: 1912 OUTPUT:
1895 RETVAL 1913 RETVAL
1914
1915void
1916rxvt_term::selection_request (Time tm, int selnum)
1896 1917
1897void 1918void
1898rxvt_term::selection_clear (bool clipboard = false) 1919rxvt_term::selection_clear (bool clipboard = false)
1899 1920
1900void 1921void
… …
2201 OUTPUT: 2222 OUTPUT:
2202 RETVAL 2223 RETVAL
2203 2224
2204#endif 2225#endif
2205 2226
2206#if HAVE_BG_PIXMAP
2207
2208void 2227void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2228rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2229 CODE:
2211 THIS->bg_destroy (); 2230 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2231 THIS->bg_img = 0;
2232 THIS->bg_flags = 0;
2213 2233
2214 if (img) // TODO: cannot be false 2234 if (img) // TODO: cannot be false
2215 { 2235 {
2216 img = img->clone (); // own the img 2236 img = img->clone (); // own the img
2217 2237
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2238 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2239 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width, 2240 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height) 2241 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img); 2242 ->replace (img);
2223 2243
2224 // just in case, should usually be a nop 2244 // just in case, should usually be a nop
2225 img->reify () 2245 img->reify ()
2226 ->replace (img); 2246 ->replace (img);
2227 2247
… …
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2252 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2253
2234 if (!border) 2254 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2255 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2256 }
2237
2238#endif
2239 2257
2240#endif 2258#endif
2241 2259
2242############################################################################# 2260#############################################################################
2243# urxvt::overlay 2261# urxvt::overlay
… …
2388 INIT: 2406 INIT:
2389 rgba cc = parse_rgba (c, THIS->s); 2407 rgba cc = parse_rgba (c, THIS->s);
2390 C_ARGS: cc 2408 C_ARGS: cc
2391 2409
2392rxvt_img * 2410rxvt_img *
2411rxvt_img::shade (rxvt_img::nv factor)
2412
2413rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2414rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE: 2415 CODE:
2395 rxvt_img::nv *vparams = 0; 2416 rxvt_img::nv *vparams = 0;
2396 int nparams = 0; 2417 int nparams = 0;
2397 2418
2398 if (SvOK (params)) 2419 if (SvOK (params))
2399 { 2420 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2421 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2422 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405 2423
2406 nparams = av_len ((AV *)SvRV (params)) + 1; 2424 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2425 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2408 2426
2409 for (int i = 0; i < nparams; ++i) 2427 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2428 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 } 2429 }
2412 2430
2413 RETVAL = THIS->filter (name, nparams, vparams); 2431 RETVAL = THIS->filter (name, nparams, vparams);
2432 free (vparams);
2414 OUTPUT: 2433 OUTPUT:
2415 RETVAL 2434 RETVAL
2416 2435
2417#endif 2436#endif
2418 2437

Diff Legend

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