ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.481 by sf-exg, Sun May 20 16:23:42 2012 UTC vs.
Revision 1.484 by sf-exg, Fri May 25 08:27:47 2012 UTC

… …
230 defaultAlign = centerAlign, 230 defaultAlign = centerAlign,
231}; 231};
232 232
233struct rxvt_image 233struct rxvt_image
234{ 234{
235 int id;
236 unsigned short alpha;
235 uint8_t flags; 237 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */ 238 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size: 239 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */ 240 0 - left align, 50 - center, 100 - right */
239 241
240# ifdef HAVE_PIXBUF 242# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf; 243 auto_ptr<GdkPixbuf> pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248 244
249 int width () 245 int width ()
250 { 246 {
251 return gdk_pixbuf_get_width (pixbuf); 247 return gdk_pixbuf_get_width (pixbuf);
252 } 248 }
… …
254 { 250 {
255 return gdk_pixbuf_get_height (pixbuf); 251 return gdk_pixbuf_get_height (pixbuf);
256 } 252 }
257# endif 253# endif
258 254
255 rxvt_image ();
256 bool set_file_geometry (const char *file);
259 bool set_file (const char *file); 257 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false); 258 bool set_geometry (const char *geom, bool update = false);
261}; 259};
262# endif 260# endif
263#endif 261#endif
… …
1153 }; 1151 };
1154 1152
1155 uint8_t bg_flags; 1153 uint8_t bg_flags;
1156 1154
1157# ifdef BG_IMAGE_FROM_FILE 1155# ifdef BG_IMAGE_FROM_FILE
1156 vector<rxvt_image> image_vec;
1158 rxvt_image bg_image; 1157 rxvt_image *new_image ()
1158 {
1159 image_vec.resize (image_vec.size () + 1);
1160 return &image_vec.back ();
1161 }
1159 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1162 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1160 bool render_image (rxvt_image &image); 1163 bool render_image (rxvt_image &image);
1164 void parse_image (int id, const char *type, const char *arg);
1161# endif 1165# endif
1162 1166
1163# ifdef ENABLE_TRANSPARENCY 1167# ifdef ENABLE_TRANSPARENCY
1164 Pixmap root_pixmap; /* current root pixmap set */ 1168 Pixmap root_pixmap; /* current root pixmap set */
1165 rxvt_color tint; 1169 rxvt_color tint;
… …
1199 } 1203 }
1200#endif 1204#endif
1201#ifdef HAVE_PIXBUF 1205#ifdef HAVE_PIXBUF
1202 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1206 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1203 int src_x, int src_y, int dst_x, int dst_y, 1207 int src_x, int src_y, int dst_x, int dst_y,
1204 unsigned int width, unsigned int height); 1208 unsigned int width, unsigned int height, bool argb);
1205#endif 1209#endif
1206 1210
1207#if ENABLE_OVERLAY 1211#if ENABLE_OVERLAY
1208 overlay_base ov; 1212 overlay_base ov;
1209 1213
… …
1569 const char **get_options (int argc, const char *const *argv); 1573 const char **get_options (int argc, const char *const *argv);
1570 int parse_keysym (const char *str, const char *arg); 1574 int parse_keysym (const char *str, const char *arg);
1571 const char *x_resource (const char *name); 1575 const char *x_resource (const char *name);
1572 void extract_resources (); 1576 void extract_resources ();
1573 void extract_keysym_resources (); 1577 void extract_keysym_resources ();
1578 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1579 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1580 bool parse_bool_resource (const char *str)
1581 {
1582 return (!strcasecmp (str, "TRUE")
1583 || !strcasecmp (str, "YES")
1584 || !strcasecmp (str, "ON")
1585 || !strcasecmp (str, "1"));
1586 }
1574}; 1587};
1575 1588
1576#endif /* _RXVT_H_ */ 1589#endif /* _RXVT_H_ */
1577 1590

Diff Legend

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