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.480 by sf-exg, Sat May 19 13:07:25 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>
… …
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 74
77#ifdef HAVE_AFTERIMAGE
78# include <afterimage.h>
79# undef min
80# undef max
81#endif
82
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
87#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
88# define HAVE_BG_PIXMAP 1 80# define HAVE_BG_PIXMAP 1
89#endif 81#endif
90 82
83#include <ecb.h>
91#include "encoding.h" 84#include "encoding.h"
92#include "rxvtutil.h" 85#include "rxvtutil.h"
93#include "rxvtfont.h" 86#include "rxvtfont.h"
94#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
95#include "scrollbar.h" 88#include "scrollbar.h"
… …
215 ~localise_env () 208 ~localise_env ()
216 { 209 {
217 environ = orig_env; 210 environ = orig_env;
218 } 211 }
219}; 212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248
249 int width ()
250 {
251 return gdk_pixbuf_get_width (pixbuf);
252 }
253 int height ()
254 {
255 return gdk_pixbuf_get_height (pixbuf);
256 }
257# endif
258
259 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false);
261 void set_default_geometry ()
262 {
263 h_scale = v_scale = defaultScale;
264 h_align = v_align = defaultAlign;
265 flags |= IM_IS_SIZE_SENSITIVE;
266 }
267};
268# endif
269#endif
220 270
221/* 271/*
222 ***************************************************************************** 272 *****************************************************************************
223 * STRUCTURES AND TYPEDEFS 273 * STRUCTURES AND TYPEDEFS
224 ***************************************************************************** 274 *****************************************************************************
… …
777// that are not representable in unicode, as well as characters 827// that are not representable in unicode, as well as characters
778// not fitting in the BMP. 828// not fitting in the BMP.
779struct compose_char 829struct compose_char
780{ 830{
781 unicode_t c1, c2; // any chars != NOCHAR are valid 831 unicode_t c1, c2; // any chars != NOCHAR are valid
832 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
833 compose_char () = default;
834 #endif
782 compose_char (unicode_t c1, unicode_t c2) 835 compose_char (unicode_t c1, unicode_t c2)
783 : c1(c1), c2(c2) 836 : c1(c1), c2(c2)
784 { } 837 { }
785}; 838};
786 839
… …
1090#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1091 void bg_init (); 1144 void bg_init ();
1092 void bg_destroy (); 1145 void bg_destroy ();
1093 1146
1094 enum { 1147 enum {
1095 //subset returned by make_transparency_pixmap
1096 BG_IS_VALID = 1 << 0, 1148 BG_IS_VALID = 1 << 0,
1097 BG_NEEDS_TINT = 1 << 1,
1098 BG_NEEDS_BLUR = 1 << 2,
1099 1149
1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1101
1102 BG_KEEP_ASPECT = 1 << 3,
1103 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14,
1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1106
1107 BG_TINT_SET = 1 << 5,
1108 BG_TINT_BITAND = 1 << 6,
1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1110
1111 BG_HAS_RENDER = 1 << 7,
1112 BG_HAS_RENDER_CONV = 1 << 8,
1113 BG_CLIENT_RENDER = 1 << 9,
1114
1115 BG_IS_TRANSPARENT = 1 << 10, 1150 BG_IS_TRANSPARENT = 1 << 1,
1116 BG_NEEDS_REFRESH = 1 << 11, 1151 BG_NEEDS_REFRESH = 1 << 2,
1117 BG_IS_SIZE_SENSITIVE = 1 << 12, 1152
1118 BG_IS_FROM_FILE = 1 << 13, 1153 BG_HAS_RENDER = 1 << 3,
1154 BG_HAS_RENDER_CONV = 1 << 4,
1155 BG_CLIENT_RENDER = 1 << 5,
1156
1157 BG_TINT_SET = 1 << 6,
1158 BG_TINT_BITAND = 1 << 7,
1119 }; 1159 };
1120 1160
1121 unsigned int bg_flags; 1161 uint8_t bg_flags;
1122 1162
1123# ifdef BG_IMAGE_FROM_FILE 1163# ifdef BG_IMAGE_FROM_FILE
1164 rxvt_image bg_image;
1124 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1165 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1125 bool render_image (unsigned long tr_flags); 1166 bool render_image (rxvt_image &image);
1126
1127 enum {
1128 noScale = 0,
1129 windowScale = 100,
1130 defaultScale = windowScale,
1131 centerAlign = 50,
1132 defaultAlign = centerAlign,
1133 };
1134
1135 unsigned int h_scale, v_scale; /* percents of the window size */
1136 int h_align, v_align; /* percents of the window size:
1137 0 - left align, 50 - center, 100 - right */
1138
1139 bool bg_set_geometry (const char *geom, bool update = false);
1140 void bg_set_default_geometry ()
1141 {
1142 h_scale = v_scale = defaultScale;
1143 h_align = v_align = defaultAlign;
1144 }
1145
1146 bool bg_set_file (const char *file);
1147# endif 1167# endif
1148 1168
1149# ifdef ENABLE_TRANSPARENCY 1169# ifdef ENABLE_TRANSPARENCY
1150 Pixmap root_pixmap; /* current root pixmap set */ 1170 Pixmap root_pixmap; /* current root pixmap set */
1151 rxvt_color tint; 1171 rxvt_color tint;
1152 int shade; 1172 int shade;
1153 int h_blurRadius, v_blurRadius; 1173 int h_blurRadius, v_blurRadius;
1154 1174
1155 bool bg_set_transparent (); 1175 void bg_set_transparent ()
1176 {
1177 bg_flags |= BG_IS_TRANSPARENT;
1178 }
1156 void bg_set_root_pixmap (); 1179 void bg_set_root_pixmap ();
1157 void set_tint_shade_flags ();
1158 bool bg_set_tint (rxvt_color &new_tint); 1180 bool bg_set_tint (rxvt_color &new_tint);
1159 bool bg_set_shade (const char *shade_str); 1181 bool bg_set_shade (const char *shade_str);
1160 bool bg_set_blur (const char *geom); 1182 bool bg_set_blur (const char *geom);
1161 1183
1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth); 1184 bool blur_pixmap (Pixmap pixmap, int width, int height);
1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1185 bool tint_pixmap (Pixmap pixmap, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage); 1186 void tint_ximage (XImage *ximage);
1165 unsigned long make_transparency_pixmap (); 1187 bool make_transparency_pixmap ();
1166# endif 1188# endif
1167 1189
1168 ev_tstamp bg_valid_since; 1190 ev_tstamp bg_valid_since;
1169 1191
1170 Pixmap bg_pixmap; 1192 Pixmap bg_pixmap;
… …
1180 void bg_invalidate () 1202 void bg_invalidate ()
1181 { 1203 {
1182 bg_flags &= ~BG_IS_VALID; 1204 bg_flags &= ~BG_IS_VALID;
1183 } 1205 }
1184#endif 1206#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 }
1195#endif
1196#ifdef HAVE_PIXBUF 1207#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1208 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y, 1209 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height); 1210 unsigned int width, unsigned int height);
1201#endif 1211#endif
1202 1212
… …
1281 void cmdbuf_append (const char *str, size_t count); 1291 void cmdbuf_append (const char *str, size_t count);
1282 bool pty_fill (); 1292 bool pty_fill ();
1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1293 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1284 1294
1285#ifdef CURSOR_BLINK 1295#ifdef CURSOR_BLINK
1296 void cursor_blink_reset ();
1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1297 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1287#endif 1298#endif
1288#ifdef TEXT_BLINK 1299#ifdef TEXT_BLINK
1289 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1300 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1290#endif 1301#endif

Diff Legend

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