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.35 by sasha, Wed Nov 14 22:25:42 2007 UTC vs.
Revision 1.47 by root, Wed Nov 5 14:43:54 2008 UTC

… …
29# include <X11/Xft/Xft.h> 29# include <X11/Xft/Xft.h>
30#endif 30#endif
31 31
32#include "ev_cpp.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,
… …
101 101
102struct im_watcher; 102struct im_watcher;
103struct xevent_watcher; 103struct xevent_watcher;
104 104
105template<class watcher> 105template<class watcher>
106struct event_vec : vector<watcher *> { 106struct event_vec : vector<watcher *>
107{
107 void erase_unordered (unsigned int pos) 108 void erase_unordered (unsigned int pos)
108 { 109 {
109 watcher *w = (*this)[this->size () - 1]; 110 watcher *w = (*this)[this->size () - 1];
110 this->pop_back (); 111 this->pop_back ();
111 112
… …
113 if (((*this)[pos] = w)) // '=' is correct! 114 if (((*this)[pos] = w)) // '=' is correct!
114 w->active = pos + 1; 115 w->active = pos + 1;
115 } 116 }
116}; 117};
117 118
118struct rxvt_watcher { 119struct rxvt_watcher
120{
119 int active; /* 0 == inactive, else index into respective vector */ 121 int active; /* 0 == inactive, else index into respective vector */
120 122
121 bool is_active () { return active; } 123 bool is_active () { return active; }
122 124
123 rxvt_watcher () : active (0) { } 125 rxvt_watcher () : active (0) { }
124}; 126};
125 127
126struct refcounted { 128struct refcounted
129{
127 int referenced; 130 int referenced;
128 char *id; 131 char *id;
129 132
130 refcounted (const char *id); 133 refcounted (const char *id);
131 bool ref_init () { return false; } 134 bool ref_init () { return false; }
132 void ref_next () { } 135 void ref_next () { }
133 ~refcounted (); 136 ~refcounted ();
134}; 137};
135 138
136template<class T> 139template<class T>
137struct refcache : vector<T *> { 140struct refcache : vector<T *>
141{
138 T *get (const char *id); 142 T *get (const char *id);
139 void put (T *obj); 143 void put (T *obj);
140 void clear (); 144 void clear ();
141 145
142 ~refcache () 146 ~refcache ()
… …
147 151
148///////////////////////////////////////////////////////////////////////////// 152/////////////////////////////////////////////////////////////////////////////
149 153
150struct rxvt_screen; 154struct rxvt_screen;
151 155
152struct rxvt_drawable { 156struct rxvt_drawable
157{
153 rxvt_screen *screen; 158 rxvt_screen *screen;
154 Drawable drawable; 159 Drawable drawable;
155 operator Drawable() { return drawable; } 160 operator Drawable() { return drawable; }
156 161
157#if XFT 162#if XFT
… …
173}; 178};
174 179
175///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
176 181
177#ifdef USE_XIM 182#ifdef USE_XIM
178struct rxvt_xim : refcounted { 183struct rxvt_xim : refcounted
184{
179 void destroy (); 185 void destroy ();
180 rxvt_display *display; 186 rxvt_display *display;
181 187
182//public 188//public
183 XIM xim; 189 XIM xim;
… …
186 bool ref_init (); 192 bool ref_init ();
187 ~rxvt_xim (); 193 ~rxvt_xim ();
188}; 194};
189#endif 195#endif
190 196
191struct rxvt_screen { 197struct rxvt_screen
198{
192 rxvt_display *display; 199 rxvt_display *display;
193 Display *dpy; 200 Display *dpy;
194 int depth; 201 int depth;
195 Visual *visual; 202 Visual *visual;
196 Colormap cmap; 203 Colormap cmap;
… …
208 void set (rxvt_display *disp); 215 void set (rxvt_display *disp);
209 void select_visual (int bitdepth); 216 void select_visual (int bitdepth);
210 void clear (); 217 void clear ();
211}; 218};
212 219
213struct rxvt_display : refcounted { 220struct rxvt_display : refcounted
221{
214 event_vec<xevent_watcher> xw; 222 event_vec<xevent_watcher> xw;
215 223
224 ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
216 ev::io x_ev; void x_cb (ev::io &w, int revents); 225 ev::io x_ev ; void x_cb (ev::io &w, int revents);
217 226
218#ifdef USE_XIM 227#ifdef USE_XIM
219 refcache<rxvt_xim> xims; 228 refcache<rxvt_xim> xims;
220 vector<im_watcher *> imw; 229 vector<im_watcher *> imw;
221 230
… …
238 XrmDatabase get_resources (bool refresh); 247 XrmDatabase get_resources (bool refresh);
239 bool ref_init (); 248 bool ref_init ();
240 void ref_next (); 249 void ref_next ();
241 ~rxvt_display (); 250 ~rxvt_display ();
242 251
243 void flush (); 252 void flush ()
253 {
254 flush_ev.start ();
255 }
256
244 Atom atom (const char *name); 257 Atom atom (const char *name);
245 void set_selection_owner (rxvt_term *owner); 258 void set_selection_owner (rxvt_term *owner);
246 259
247 void reg (xevent_watcher *w); 260 void reg (xevent_watcher *w);
248 void unreg (xevent_watcher *w); 261 void unreg (xevent_watcher *w);
… …
255 void put_xim (rxvt_xim *xim); 268 void put_xim (rxvt_xim *xim);
256#endif 269#endif
257}; 270};
258 271
259#ifdef USE_XIM 272#ifdef USE_XIM
260struct im_watcher : rxvt_watcher, callback<void (void)> { 273struct im_watcher : rxvt_watcher, callback<void (void)>
261 template<class O, class M> 274{
262 im_watcher (O object, M method)
263 : callback<void (void)> (object, method)
264 { }
265
266 void start (rxvt_display *display) 275 void start (rxvt_display *display)
267 { 276 {
268 display->reg (this); 277 display->reg (this);
269 } 278 }
270 279
… …
273 display->unreg (this); 282 display->unreg (this);
274 } 283 }
275}; 284};
276#endif 285#endif
277 286
278struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> { 287struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)>
288{
279 Window window; 289 Window window;
280
281 template<class O, class M>
282 xevent_watcher (O object, M method)
283 : callback<void (XEvent &)> (object, method)
284 { }
285 290
286 void start (rxvt_display *display, Window window) 291 void start (rxvt_display *display, Window window)
287 { 292 {
288 this->window = window; 293 this->window = window;
289 display->reg (this); 294 display->reg (this);
… …
299 304
300///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
301 306
302typedef unsigned long Pixel; 307typedef unsigned long Pixel;
303 308
304struct rgba { 309struct rgba
310{
305 unsigned short r, g, b, a; 311 unsigned short r, g, b, a;
306 312
307 enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; 313 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
308 314
309 rgba () 315 rgba ()
… …
312 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC) 318 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
313 : r(r), g(g), b(b), a(a) 319 : r(r), g(g), b(b), a(a)
314 { } 320 { }
315}; 321};
316 322
317struct rxvt_color { 323struct rxvt_color
324{
318#if XFT 325#if XFT
319 XftColor c; 326 XftColor c;
320#else 327#else
321 XColor c; 328 XColor c;
322#endif 329#endif
… …
324 operator Pixel () const { return c.pixel; } 331 operator Pixel () const { return c.pixel; }
325 332
326 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); }
327 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 334 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
328 335
336 bool is_opaque () const
337 {
338#if XFT
339 return c.color.alpha == rgba::MAX_CC;
340#else
341 return 1;
342#endif
343 }
344
329 bool alloc (rxvt_screen *screen, const rgba &color); 345 bool alloc (rxvt_screen *screen, const rgba &color);
330 void free (rxvt_screen *screen); 346 void free (rxvt_screen *screen);
331 347
332 void get (rgba &color); 348 void get (rgba &color);
333 void get (XColor &color); 349 void get (XColor &color);

Diff Legend

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