ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.h
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.31 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.46 by root, Tue Nov 4 11:03:29 2008 UTC

… …
27 27
28#if XFT 28#if XFT
29# include <X11/Xft/Xft.h> 29# include <X11/Xft/Xft.h>
30#endif 30#endif
31 31
32#include "iom.h" 32#include "ev_cpp.h"
33 33
34#include "rxvtlib.h"
35#include "rxvtutil.h" 34#include "rxvtutil.h"
36 35
37#include "callback.h" 36#include "callback.h"
38 37
39// see rxvttoolkit.C:xa_names, which must be kept in sync 38// see rxvttoolkit.C:xa_names, which must be kept in sync
… …
60#if ENABLE_EWMH 59#if ENABLE_EWMH
61 XA_NET_WM_PID, 60 XA_NET_WM_PID,
62 XA_NET_WM_NAME, 61 XA_NET_WM_NAME,
63 XA_NET_WM_ICON_NAME, 62 XA_NET_WM_ICON_NAME,
64 XA_NET_WM_PING, 63 XA_NET_WM_PING,
64 XA_NET_WM_ICON,
65#endif 65#endif
66#if USE_XIM 66#if USE_XIM
67 XA_WM_LOCALE_NAME, 67 XA_WM_LOCALE_NAME,
68 XA_XIM_SERVERS, 68 XA_XIM_SERVERS,
69#endif 69#endif
… …
74#if ENABLE_XEMBED 74#if ENABLE_XEMBED
75 XA_XEMBED, 75 XA_XEMBED,
76 XA_XEMBED_INFO, 76 XA_XEMBED_INFO,
77#endif 77#endif
78#if !ENABLE_MINIMAL 78#if !ENABLE_MINIMAL
79 // these are usually allocated by other subsystens, but we do it 79 // these are usually allocated by other subsystems, but we do it
80 // here to avoid a server roundtrip. 80 // here to avoid a server roundtrip.
81 XA_SCREEN_RESOURCES, 81 XA_SCREEN_RESOURCES,
82 XA_XDCCC_LINEAR_RGB_CORRECTION, 82 XA_XDCCC_LINEAR_RGB_CORRECTION,
83 XA_XDCCC_LINEAR_RGB_MATRICES, 83 XA_XDCCC_LINEAR_RGB_MATRICES,
84 XA_WM_COLORMAP_WINDOWS, 84 XA_WM_COLORMAP_WINDOWS,
… …
100struct rxvt_display; 100struct rxvt_display;
101 101
102struct im_watcher; 102struct im_watcher;
103struct xevent_watcher; 103struct xevent_watcher;
104 104
105template<class watcher>
106struct event_vec : vector<watcher *>
107{
108 void erase_unordered (unsigned int pos)
109 {
110 watcher *w = (*this)[this->size () - 1];
111 this->pop_back ();
112
113 if (!this->empty ())
114 if (((*this)[pos] = w)) // '=' is correct!
115 w->active = pos + 1;
116 }
117};
118
119struct rxvt_watcher
120{
121 int active; /* 0 == inactive, else index into respective vector */
122
123 bool is_active () { return active; }
124
125 rxvt_watcher () : active (0) { }
126};
127
105struct refcounted { 128struct refcounted
129{
106 int referenced; 130 int referenced;
107 char *id; 131 char *id;
108 132
109 refcounted (const char *id); 133 refcounted (const char *id);
110 bool ref_init () { return false; } 134 bool ref_init () { return false; }
111 void ref_next () { } 135 void ref_next () { }
112 ~refcounted (); 136 ~refcounted ();
113}; 137};
114 138
115template<class T> 139template<class T>
116struct refcache : vector<T *> { 140struct refcache : vector<T *>
141{
117 T *get (const char *id); 142 T *get (const char *id);
118 void put (T *obj); 143 void put (T *obj);
119 void clear (); 144 void clear ();
120 145
121 ~refcache () 146 ~refcache ()
… …
126 151
127///////////////////////////////////////////////////////////////////////////// 152/////////////////////////////////////////////////////////////////////////////
128 153
129struct rxvt_screen; 154struct rxvt_screen;
130 155
131struct rxvt_drawable { 156struct rxvt_drawable
157{
132 rxvt_screen *screen; 158 rxvt_screen *screen;
133 Drawable drawable; 159 Drawable drawable;
134 operator Drawable() { return drawable; } 160 operator Drawable() { return drawable; }
135 161
136#if XFT 162#if XFT
… …
152}; 178};
153 179
154///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
155 181
156#ifdef USE_XIM 182#ifdef USE_XIM
157struct rxvt_xim : refcounted { 183struct rxvt_xim : refcounted
184{
158 void destroy (); 185 void destroy ();
159 rxvt_display *display; 186 rxvt_display *display;
160 187
161//public 188//public
162 XIM xim; 189 XIM xim;
… …
165 bool ref_init (); 192 bool ref_init ();
166 ~rxvt_xim (); 193 ~rxvt_xim ();
167}; 194};
168#endif 195#endif
169 196
170struct rxvt_screen { 197struct rxvt_screen
198{
171 rxvt_display *display; 199 rxvt_display *display;
172 Display *dpy; 200 Display *dpy;
173 int depth; 201 int depth;
174 Visual *visual; 202 Visual *visual;
175 Colormap cmap; 203 Colormap cmap;
… …
187 void set (rxvt_display *disp); 215 void set (rxvt_display *disp);
188 void select_visual (int bitdepth); 216 void select_visual (int bitdepth);
189 void clear (); 217 void clear ();
190}; 218};
191 219
192#ifdef HAVE_AFTERIMAGE
193struct ASVisual;
194#endif
195
196struct rxvt_display : refcounted { 220struct rxvt_display : refcounted
221{
197 io_manager_vec<xevent_watcher> xw; 222 event_vec<xevent_watcher> xw;
198 223
199 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 224 ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
225 ev::io x_ev ; void x_cb (ev::io &w, int revents);
200 226
201#ifdef USE_XIM 227#ifdef USE_XIM
202 refcache<rxvt_xim> xims; 228 refcache<rxvt_xim> xims;
203 vector<im_watcher *> imw; 229 vector<im_watcher *> imw;
204 230
… …
208 234
209//public 235//public
210 Display *dpy; 236 Display *dpy;
211 int screen; 237 int screen;
212 Window root; 238 Window root;
213#ifdef HAVE_AFTERIMAGE
214 struct ASVisual *asv;
215#endif
216 rxvt_term *selection_owner; 239 rxvt_term *selection_owner;
217 Atom xa[NUM_XA]; 240 Atom xa[NUM_XA];
218 bool is_local; 241 bool is_local;
219#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
220 Cursor blank_cursor; 243 Cursor blank_cursor;
… …
224 XrmDatabase get_resources (bool refresh); 247 XrmDatabase get_resources (bool refresh);
225 bool ref_init (); 248 bool ref_init ();
226 void ref_next (); 249 void ref_next ();
227 ~rxvt_display (); 250 ~rxvt_display ();
228 251
229 void flush (); 252 void flush ()
253 {
254 flush_ev.start ();
255 }
256
230 Atom atom (const char *name); 257 Atom atom (const char *name);
231 void set_selection_owner (rxvt_term *owner); 258 void set_selection_owner (rxvt_term *owner);
232 259
233 void reg (xevent_watcher *w); 260 void reg (xevent_watcher *w);
234 void unreg (xevent_watcher *w); 261 void unreg (xevent_watcher *w);
… …
241 void put_xim (rxvt_xim *xim); 268 void put_xim (rxvt_xim *xim);
242#endif 269#endif
243}; 270};
244 271
245#ifdef USE_XIM 272#ifdef USE_XIM
246struct im_watcher : watcher, callback<void (void)> { 273struct im_watcher : rxvt_watcher, callback<void (void)> {
247 template<class O, class M>
248 im_watcher (O object, M method)
249 : callback<void (void)> (object, method)
250 { }
251
252 void start (rxvt_display *display) 274 void start (rxvt_display *display)
253 { 275 {
254 display->reg (this); 276 display->reg (this);
255 } 277 }
278
256 void stop (rxvt_display *display) 279 void stop (rxvt_display *display)
257 { 280 {
258 display->unreg (this); 281 display->unreg (this);
259 } 282 }
260}; 283};
261#endif 284#endif
262 285
263struct xevent_watcher : watcher, callback<void (XEvent &)> { 286struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)>
287{
264 Window window; 288 Window window;
265
266 template<class O, class M>
267 xevent_watcher (O object, M method)
268 : callback<void (XEvent &)> (object, method)
269 { }
270 289
271 void start (rxvt_display *display, Window window) 290 void start (rxvt_display *display, Window window)
272 { 291 {
273 this->window = window; 292 this->window = window;
274 display->reg (this); 293 display->reg (this);
275 } 294 }
295
276 void stop (rxvt_display *display) 296 void stop (rxvt_display *display)
277 { 297 {
278 display->unreg (this); 298 display->unreg (this);
279 } 299 }
280}; 300};
… …
283 303
284///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
285 305
286typedef unsigned long Pixel; 306typedef unsigned long Pixel;
287 307
288struct rgba { 308struct rgba
309{
289 unsigned short r, g, b, a; 310 unsigned short r, g, b, a;
290 311
291 enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; 312 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
292 313
293 rgba () 314 rgba ()
… …
296 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC) 317 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
297 : r(r), g(g), b(b), a(a) 318 : r(r), g(g), b(b), a(a)
298 { } 319 { }
299}; 320};
300 321
301struct rxvt_color { 322struct rxvt_color
323{
302#if XFT 324#if XFT
303 XftColor c; 325 XftColor c;
304#else 326#else
305 XColor c; 327 XColor c;
306#endif 328#endif
… …
308 operator Pixel () const { return c.pixel; } 330 operator Pixel () const { return c.pixel; }
309 331
310 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 332 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
311 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 333 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
312 334
335 bool is_opaque () const
336 {
337#if XFT
338 return c.color.alpha == rgba::MAX_CC;
339#else
340 return 1;
341#endif
342 }
343
313 bool alloc (rxvt_screen *screen, const rgba &color); 344 bool alloc (rxvt_screen *screen, const rgba &color);
314 void free (rxvt_screen *screen); 345 void free (rxvt_screen *screen);
315 346
316 void get (rgba &color); 347 void get (rgba &color);
317 void get (XColor &color); 348 void get (XColor &color);
318 349
319 bool set (rxvt_screen *screen, const char *name); 350 bool set (rxvt_screen *screen, const char *name);
320 bool set (rxvt_screen *screen, const rgba &color); 351 bool set (rxvt_screen *screen, const rgba &color);
321 352
322 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); 353 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
323}; 354};
324 355
325#endif 356#if TRACE_PIXMAPS
357Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d);
358void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p);
326 359
360# define XCreatePixmap(dpy,r,w,h,d) trace_XCreatePixmap (__FILE__,__LINE__,dpy,r,w,h,d)
361# define XFreePixmap(dpy,p) trace_XFreePixmap (__FILE__,__LINE__,dpy,p)
362#endif
363
364#endif
365

Diff Legend

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