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.509 by sf-exg, Fri Jun 15 14:34:34 2012 UTC vs.
Revision 1.513 by sf-exg, Sat Dec 29 18:12:53 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"
… …
580#endif 589#endif
581 Color_scroll, 590 Color_scroll,
582#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
583 Color_trough, 592 Color_trough,
584#endif 593#endif
585#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
586 Color_tint, 595 Color_tint,
587#endif 596#endif
588#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
589 Color_fade, 598 Color_fade,
590#endif 599#endif
… …
1172/* ---------- */ 1181/* ---------- */
1173 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1174 XComposeStatus compose; 1183 XComposeStatus compose;
1175 static struct termios def_tio; 1184 static struct termios def_tio;
1176 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1177#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1178 void bg_init (); 1188 void bg_init ();
1179 void bg_destroy (); 1189 void bg_destroy ();
1180
1181 enum {
1182 BG_IS_VALID = 1 << 0,
1183
1184 BG_IS_TRANSPARENT = 1 << 1,
1185 BG_NEEDS_REFRESH = 1 << 2,
1186 BG_INHIBIT_RENDER = 1 << 3,
1187 };
1188
1189 uint8_t bg_flags;
1190 1190
1191# if BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage; 1192 rxvt_image fimage;
1193 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);
1194 bool render_image (rxvt_image &image); 1194 bool render_image (rxvt_image &image);
1195# endif 1195# endif
1196 1196
1197# if ENABLE_TRANSPARENCY 1197# if BG_IMAGE_FROM_ROOT
1198 rxvt_img *root_img; 1198 rxvt_img *root_img;
1199 image_effects root_effects; 1199 image_effects root_effects;
1200 1200
1201 void bg_set_transparent ()
1202 {
1203 bg_flags |= BG_IS_TRANSPARENT;
1204 }
1205 void bg_set_root_pixmap (); 1201 void bg_set_root_pixmap ();
1206 bool render_root_image (); 1202 bool render_root_image ();
1207# endif 1203# endif
1208 1204
1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade); 1205 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1210 1206
1211 ev_tstamp bg_valid_since; 1207 ev_tstamp bg_valid_since;
1212 1208
1213 rxvt_img *bg_img;
1214
1215 bool bg_window_size_sensitive (); 1209 bool bg_window_size_sensitive ();
1216 bool bg_window_position_sensitive (); 1210 bool bg_window_position_sensitive ();
1217 1211
1218 void bg_render (); 1212 void bg_render ();
1219 void bg_invalidate () 1213 void bg_invalidate ()
1220 { 1214 {
1221 bg_flags &= ~BG_IS_VALID; 1215 bg_flags &= ~(BG_IS_VALID | BG_IS_TRANSPARENT);
1222 } 1216 }
1217#endif
1218
1219#ifdef HAVE_IMG
1220 enum {
1221 BG_IS_VALID = 1 << 0,
1222
1223 BG_IS_TRANSPARENT = 1 << 1,
1224 BG_NEEDS_REFRESH = 1 << 2,
1225 BG_INHIBIT_RENDER = 1 << 3,
1226 };
1227
1228 uint8_t bg_flags;
1229
1230 rxvt_img *bg_img;
1223#endif 1231#endif
1224 1232
1225#if ENABLE_OVERLAY 1233#if ENABLE_OVERLAY
1226 overlay_base ov; 1234 overlay_base ov;
1227 1235
… …
1281 void vt_select_input () const NOTHROW 1289 void vt_select_input () const NOTHROW
1282 { 1290 {
1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1291 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1284 } 1292 }
1285 1293
1286#if ENABLE_TRANSPARENCY || ENABLE_PERL 1294#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1287 void rootwin_cb (XEvent &xev); 1295 void rootwin_cb (XEvent &xev);
1288 xevent_watcher rootwin_ev; 1296 xevent_watcher rootwin_ev;
1289#endif 1297#endif
1290#ifdef HAVE_BG_PIXMAP 1298#ifdef HAVE_BG_PIXMAP
1291 void update_background (); 1299 void update_background ();
… …
1443 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1451 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1444 void get_window_origin (int &x, int &y); 1452 void get_window_origin (int &x, int &y);
1445 1453
1446 // screen.C 1454 // screen.C
1447 1455
1456 bool option (uint8_t opt) const NOTHROW
1457 {
1458 return options[opt >> 3] & (1 << (opt & 7));
1459 }
1460
1461 void set_option (uint8_t opt, bool set = true) NOTHROW;
1462
1448 int fgcolor_of (rend_t r) const NOTHROW 1463 int fgcolor_of (rend_t r) const NOTHROW
1449 { 1464 {
1450 int base = GET_BASEFG (r); 1465 int base = GET_BASEFG (r);
1451#ifndef NO_BRIGHTCOLOR 1466#ifndef NO_BRIGHTCOLOR
1452 if (r & RS_Bold 1467 if (r & RS_Bold
… …
1470 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR)) 1485 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1471 base += minBrightCOLOR - minCOLOR; 1486 base += minBrightCOLOR - minCOLOR;
1472#endif 1487#endif
1473 return base; 1488 return base;
1474 } 1489 }
1475
1476 bool option (uint8_t opt) const NOTHROW
1477 {
1478 return options[opt >> 3] & (1 << (opt & 7));
1479 }
1480
1481 void set_option (uint8_t opt, bool set = true) NOTHROW;
1482 1490
1483 // modifies first argument(!) 1491 // modifies first argument(!)
1484 void tt_paste (char *data, unsigned int len) NOTHROW; 1492 void tt_paste (char *data, unsigned int len) NOTHROW;
1485 void paste (char *data, unsigned int len) NOTHROW; 1493 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW; 1494 void scr_alloc () NOTHROW;

Diff Legend

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