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.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.473 by sf-exg, Sun May 13 15:50:18 2012 UTC

… …
23#if HAVE_WCHAR_H 23#if HAVE_WCHAR_H
24# include <wchar.h> 24# include <wchar.h>
25#else 25#else
26// stdlib.h might provide it 26// stdlib.h might provide it
27#endif 27#endif
28
29using namespace std;
30 28
31// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
71 69
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76
77#ifdef HAVE_AFTERIMAGE
78# include <afterimage.h>
79# undef min
80# undef max
81#endif
82 74
83#ifdef HAVE_PIXBUF 75#ifdef HAVE_PIXBUF
84# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
85#endif 77#endif
86 78
… …
1090#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1091 void bg_init (); 1083 void bg_init ();
1092 void bg_destroy (); 1084 void bg_destroy ();
1093 1085
1094 enum { 1086 enum {
1095 //subset returned by make_transparency_pixmap
1096 BG_IS_VALID = 1 << 0, 1087 BG_IS_VALID = 1 << 0,
1097 BG_NEEDS_TINT = 1 << 1,
1098 BG_NEEDS_BLUR = 1 << 2,
1099
1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1101 1088
1102 BG_KEEP_ASPECT = 1 << 3, 1089 BG_KEEP_ASPECT = 1 << 3,
1103 BG_ROOT_ALIGN = 1 << 4, 1090 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14, 1091 BG_TILE = 1 << 14,
1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE, 1092 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1106 1093
1107 BG_TINT_SET = 1 << 5, 1094 BG_TINT_SET = 1 << 5,
1108 BG_TINT_BITAND = 1 << 6, 1095 BG_TINT_BITAND = 1 << 6,
1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1110 1096
1111 BG_HAS_RENDER = 1 << 7, 1097 BG_HAS_RENDER = 1 << 7,
1112 BG_HAS_RENDER_CONV = 1 << 8, 1098 BG_HAS_RENDER_CONV = 1 << 8,
1113 BG_CLIENT_RENDER = 1 << 9, 1099 BG_CLIENT_RENDER = 1 << 9,
1114 1100
… …
1120 1106
1121 unsigned int bg_flags; 1107 unsigned int bg_flags;
1122 1108
1123# ifdef BG_IMAGE_FROM_FILE 1109# ifdef BG_IMAGE_FROM_FILE
1124 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1110 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1125 bool render_image (unsigned long tr_flags); 1111 bool render_image (bool transparent);
1126 1112
1127 enum { 1113 enum {
1128 noScale = 0, 1114 noScale = 0,
1129 windowScale = 100, 1115 windowScale = 100,
1130 defaultScale = windowScale, 1116 defaultScale = windowScale,
… …
1150 Pixmap root_pixmap; /* current root pixmap set */ 1136 Pixmap root_pixmap; /* current root pixmap set */
1151 rxvt_color tint; 1137 rxvt_color tint;
1152 int shade; 1138 int shade;
1153 int h_blurRadius, v_blurRadius; 1139 int h_blurRadius, v_blurRadius;
1154 1140
1155 bool bg_set_transparent (); 1141 void bg_set_transparent ()
1142 {
1143 bg_flags |= BG_IS_TRANSPARENT;
1144 }
1156 void bg_set_root_pixmap (); 1145 void bg_set_root_pixmap ();
1157 void set_tint_shade_flags ();
1158 bool bg_set_tint (rxvt_color &new_tint); 1146 bool bg_set_tint (rxvt_color &new_tint);
1159 bool bg_set_shade (const char *shade_str); 1147 bool bg_set_shade (const char *shade_str);
1160 bool bg_set_blur (const char *geom); 1148 bool bg_set_blur (const char *geom);
1161 1149
1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth); 1150 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1151 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage); 1152 void tint_ximage (Visual *visual, XImage *ximage);
1165 unsigned long make_transparency_pixmap (); 1153 bool make_transparency_pixmap ();
1166# endif 1154# endif
1167 1155
1168 ev_tstamp bg_valid_since; 1156 ev_tstamp bg_valid_since;
1169 1157
1170 Pixmap bg_pixmap; 1158 Pixmap bg_pixmap;
… …
1178 1166
1179 bool bg_render (); 1167 bool bg_render ();
1180 void bg_invalidate () 1168 void bg_invalidate ()
1181 { 1169 {
1182 bg_flags &= ~BG_IS_VALID; 1170 bg_flags &= ~BG_IS_VALID;
1183 }
1184#endif
1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1187 ASVisual *asv;
1188 ASImageManager *asimman;
1189
1190 void init_asv ()
1191 {
1192 if (!asv)
1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1194 } 1171 }
1195#endif 1172#endif
1196#ifdef HAVE_PIXBUF 1173#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf; 1174 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1175 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
… …
1281 void cmdbuf_append (const char *str, size_t count); 1258 void cmdbuf_append (const char *str, size_t count);
1282 bool pty_fill (); 1259 bool pty_fill ();
1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1260 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1284 1261
1285#ifdef CURSOR_BLINK 1262#ifdef CURSOR_BLINK
1263 void cursor_blink_reset ();
1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1264 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1287#endif 1265#endif
1288#ifdef TEXT_BLINK 1266#ifdef TEXT_BLINK
1289 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1267 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1290#endif 1268#endif

Diff Legend

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