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.506 by sf-exg, Sun Jun 10 16:00:26 2012 UTC vs.
Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 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 bool set_file_geometry (rxvt_screen *s, const char *file); 296 void set_file_geometry (rxvt_screen *s, const char *file);
287 bool set_file (rxvt_screen *s, const char *file); 297 void set_file (rxvt_screen *s, const char *file);
288 bool set_geometry (const char *geom, bool update = false); 298 bool set_geometry (const char *geom, bool update = false);
289}; 299};
290# endif 300# endif
291#endif 301#endif
292 302
… …
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
… …
1191 rxvt_image fimage; 1201 rxvt_image fimage;
1192 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1202 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1193 bool render_image (rxvt_image &image); 1203 bool render_image (rxvt_image &image);
1194# endif 1204# endif
1195 1205
1196# if ENABLE_TRANSPARENCY 1206# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img; 1207 rxvt_img *root_img;
1198 image_effects root_effects; 1208 image_effects root_effects;
1199 1209
1200 void bg_set_transparent () 1210 void bg_set_transparent ()
1201 { 1211 {
… …
1280 void vt_select_input () const NOTHROW 1290 void vt_select_input () const NOTHROW
1281 { 1291 {
1282 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1292 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1283 } 1293 }
1284 1294
1285#if ENABLE_TRANSPARENCY || ENABLE_PERL 1295#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1286 void rootwin_cb (XEvent &xev); 1296 void rootwin_cb (XEvent &xev);
1287 xevent_watcher rootwin_ev; 1297 xevent_watcher rootwin_ev;
1288#endif 1298#endif
1289#ifdef HAVE_BG_PIXMAP 1299#ifdef HAVE_BG_PIXMAP
1290 void update_background (); 1300 void update_background ();
… …
1442 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1452 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1443 void get_window_origin (int &x, int &y); 1453 void get_window_origin (int &x, int &y);
1444 1454
1445 // screen.C 1455 // screen.C
1446 1456
1457 bool option (uint8_t opt) const NOTHROW
1458 {
1459 return options[opt >> 3] & (1 << (opt & 7));
1460 }
1461
1462 void set_option (uint8_t opt, bool set = true) NOTHROW;
1463
1447 int fgcolor_of (rend_t r) const NOTHROW 1464 int fgcolor_of (rend_t r) const NOTHROW
1448 { 1465 {
1449 int base = GET_BASEFG (r); 1466 int base = GET_BASEFG (r);
1450#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1451 if (r & RS_Bold 1468 if (r & RS_Bold
… …
1469 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR)) 1486 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1470 base += minBrightCOLOR - minCOLOR; 1487 base += minBrightCOLOR - minCOLOR;
1471#endif 1488#endif
1472 return base; 1489 return base;
1473 } 1490 }
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 1491
1482 // modifies first argument(!) 1492 // modifies first argument(!)
1483 void tt_paste (char *data, unsigned int len) NOTHROW; 1493 void tt_paste (char *data, unsigned int len) NOTHROW;
1484 void paste (char *data, unsigned int len) NOTHROW; 1494 void paste (char *data, unsigned int len) NOTHROW;
1485 void scr_alloc () NOTHROW; 1495 void scr_alloc () NOTHROW;
… …
1563 const char **get_options (int argc, const char *const *argv); 1573 const char **get_options (int argc, const char *const *argv);
1564 int parse_keysym (const char *str, const char *arg); 1574 int parse_keysym (const char *str, const char *arg);
1565 const char *x_resource (const char *name); 1575 const char *x_resource (const char *name);
1566 void extract_resources (); 1576 void extract_resources ();
1567 void extract_keysym_resources (); 1577 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}; 1578};
1578 1579
1579#endif /* _RXVT_H_ */ 1580#endif /* _RXVT_H_ */
1580 1581

Diff Legend

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