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.507 by sf-exg, Mon Jun 11 14:45:53 2012 UTC vs.
Revision 1.512 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

… …
75 75
76#if HAVE_PIXBUF 76#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif 78#endif
79 79
80#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
82#endif
83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
82#endif 91#endif
83 92
84#include <ecb.h> 93#include <ecb.h>
85#include "encoding.h" 94#include "encoding.h"
86#include "rxvtutil.h" 95#include "rxvtutil.h"
… …
278 rxvt_img *img; 287 rxvt_img *img;
279 288
280 void destroy () 289 void destroy ()
281 { 290 {
282 delete img; 291 delete img;
292 img = 0;
283 } 293 }
284 294
285 rxvt_image (); 295 rxvt_image ();
286 void set_file_geometry (rxvt_screen *s, const char *file); 296 void set_file_geometry (rxvt_screen *s, const char *file);
287 void set_file (rxvt_screen *s, const char *file); 297 void set_file (rxvt_screen *s, const char *file);
… …
579#endif 589#endif
580 Color_scroll, 590 Color_scroll,
581#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
582 Color_trough, 592 Color_trough,
583#endif 593#endif
584#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
585 Color_tint, 595 Color_tint,
586#endif 596#endif
587#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
588 Color_fade, 598 Color_fade,
589#endif 599#endif
… …
1171/* ---------- */ 1181/* ---------- */
1172 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1173 XComposeStatus compose; 1183 XComposeStatus compose;
1174 static struct termios def_tio; 1184 static struct termios def_tio;
1175 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1176#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1177 void bg_init (); 1188 void bg_init ();
1178 void bg_destroy (); 1189 void bg_destroy ();
1179
1180 enum {
1181 BG_IS_VALID = 1 << 0,
1182
1183 BG_IS_TRANSPARENT = 1 << 1,
1184 BG_NEEDS_REFRESH = 1 << 2,
1185 BG_INHIBIT_RENDER = 1 << 3,
1186 };
1187
1188 uint8_t bg_flags;
1189 1190
1190# if BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1191 rxvt_image fimage; 1192 rxvt_image fimage;
1192 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1193 bool render_image (rxvt_image &image); 1194 bool render_image (rxvt_image &image);
1194# endif 1195# endif
1195 1196
1196# if ENABLE_TRANSPARENCY 1197# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img; 1198 rxvt_img *root_img;
1198 image_effects root_effects; 1199 image_effects root_effects;
1199 1200
1200 void bg_set_transparent () 1201 void bg_set_transparent ()
1201 { 1202 {
… …
1207 1208
1208 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade); 1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1209 1210
1210 ev_tstamp bg_valid_since; 1211 ev_tstamp bg_valid_since;
1211 1212
1212 rxvt_img *bg_img;
1213
1214 bool bg_window_size_sensitive (); 1213 bool bg_window_size_sensitive ();
1215 bool bg_window_position_sensitive (); 1214 bool bg_window_position_sensitive ();
1216 1215
1217 void bg_render (); 1216 void bg_render ();
1218 void bg_invalidate () 1217 void bg_invalidate ()
1219 { 1218 {
1220 bg_flags &= ~BG_IS_VALID; 1219 bg_flags &= ~BG_IS_VALID;
1221 } 1220 }
1221#endif
1222
1223#ifdef HAVE_IMG
1224 enum {
1225 BG_IS_VALID = 1 << 0,
1226
1227 BG_IS_TRANSPARENT = 1 << 1,
1228 BG_NEEDS_REFRESH = 1 << 2,
1229 BG_INHIBIT_RENDER = 1 << 3,
1230 };
1231
1232 uint8_t bg_flags;
1233
1234 rxvt_img *bg_img;
1222#endif 1235#endif
1223 1236
1224#if ENABLE_OVERLAY 1237#if ENABLE_OVERLAY
1225 overlay_base ov; 1238 overlay_base ov;
1226 1239
… …
1280 void vt_select_input () const NOTHROW 1293 void vt_select_input () const NOTHROW
1281 { 1294 {
1282 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1295 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1283 } 1296 }
1284 1297
1285#if ENABLE_TRANSPARENCY || ENABLE_PERL 1298#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1286 void rootwin_cb (XEvent &xev); 1299 void rootwin_cb (XEvent &xev);
1287 xevent_watcher rootwin_ev; 1300 xevent_watcher rootwin_ev;
1288#endif 1301#endif
1289#ifdef HAVE_BG_PIXMAP 1302#ifdef HAVE_BG_PIXMAP
1290 void update_background (); 1303 void update_background ();
… …
1442 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1455 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1443 void get_window_origin (int &x, int &y); 1456 void get_window_origin (int &x, int &y);
1444 1457
1445 // screen.C 1458 // screen.C
1446 1459
1460 bool option (uint8_t opt) const NOTHROW
1461 {
1462 return options[opt >> 3] & (1 << (opt & 7));
1463 }
1464
1465 void set_option (uint8_t opt, bool set = true) NOTHROW;
1466
1447 int fgcolor_of (rend_t r) const NOTHROW 1467 int fgcolor_of (rend_t r) const NOTHROW
1448 { 1468 {
1449 int base = GET_BASEFG (r); 1469 int base = GET_BASEFG (r);
1450#ifndef NO_BRIGHTCOLOR 1470#ifndef NO_BRIGHTCOLOR
1451 if (r & RS_Bold 1471 if (r & RS_Bold
… …
1469 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR)) 1489 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1470 base += minBrightCOLOR - minCOLOR; 1490 base += minBrightCOLOR - minCOLOR;
1471#endif 1491#endif
1472 return base; 1492 return base;
1473 } 1493 }
1474
1475 bool option (uint8_t opt) const NOTHROW
1476 {
1477 return options[opt >> 3] & (1 << (opt & 7));
1478 }
1479
1480 void set_option (uint8_t opt, bool set = true) NOTHROW;
1481 1494
1482 // modifies first argument(!) 1495 // modifies first argument(!)
1483 void tt_paste (char *data, unsigned int len) NOTHROW; 1496 void tt_paste (char *data, unsigned int len) NOTHROW;
1484 void paste (char *data, unsigned int len) NOTHROW; 1497 void paste (char *data, unsigned int len) NOTHROW;
1485 void scr_alloc () NOTHROW; 1498 void scr_alloc () NOTHROW;
… …
1563 const char **get_options (int argc, const char *const *argv); 1576 const char **get_options (int argc, const char *const *argv);
1564 int parse_keysym (const char *str, const char *arg); 1577 int parse_keysym (const char *str, const char *arg);
1565 const char *x_resource (const char *name); 1578 const char *x_resource (const char *name);
1566 void extract_resources (); 1579 void extract_resources ();
1567 void extract_keysym_resources (); 1580 void extract_keysym_resources ();
1568 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1569 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1570 bool parse_bool_resource (const char *str)
1571 {
1572 return (!strcasecmp (str, "TRUE")
1573 || !strcasecmp (str, "YES")
1574 || !strcasecmp (str, "ON")
1575 || !strcasecmp (str, "1"));
1576 }
1577}; 1581};
1578 1582
1579#endif /* _RXVT_H_ */ 1583#endif /* _RXVT_H_ */
1580 1584

Diff Legend

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