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.37 by root, Fri Dec 14 04:26:23 2007 UTC vs.
Revision 1.43 by root, Wed Jan 23 09:14:58 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
… …
74#if ENABLE_XEMBED 73#if ENABLE_XEMBED
75 XA_XEMBED, 74 XA_XEMBED,
76 XA_XEMBED_INFO, 75 XA_XEMBED_INFO,
77#endif 76#endif
78#if !ENABLE_MINIMAL 77#if !ENABLE_MINIMAL
79 // these are usually allocated by other subsystens, but we do it 78 // these are usually allocated by other subsystems, but we do it
80 // here to avoid a server roundtrip. 79 // here to avoid a server roundtrip.
81 XA_SCREEN_RESOURCES, 80 XA_SCREEN_RESOURCES,
82 XA_XDCCC_LINEAR_RGB_CORRECTION, 81 XA_XDCCC_LINEAR_RGB_CORRECTION,
83 XA_XDCCC_LINEAR_RGB_MATRICES, 82 XA_XDCCC_LINEAR_RGB_MATRICES,
84 XA_WM_COLORMAP_WINDOWS, 83 XA_WM_COLORMAP_WINDOWS,
… …
219 218
220struct rxvt_display : refcounted 219struct rxvt_display : refcounted
221{ 220{
222 event_vec<xevent_watcher> xw; 221 event_vec<xevent_watcher> xw;
223 222
223 ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
224 ev::io x_ev; void x_cb (ev::io &w, int revents); 224 ev::io x_ev ; void x_cb (ev::io &w, int revents);
225 225
226#ifdef USE_XIM 226#ifdef USE_XIM
227 refcache<rxvt_xim> xims; 227 refcache<rxvt_xim> xims;
228 vector<im_watcher *> imw; 228 vector<im_watcher *> imw;
229 229
… …
246 XrmDatabase get_resources (bool refresh); 246 XrmDatabase get_resources (bool refresh);
247 bool ref_init (); 247 bool ref_init ();
248 void ref_next (); 248 void ref_next ();
249 ~rxvt_display (); 249 ~rxvt_display ();
250 250
251 void flush (); 251 void flush ()
252 {
253 flush_ev.start ();
254 }
255
252 Atom atom (const char *name); 256 Atom atom (const char *name);
253 void set_selection_owner (rxvt_term *owner); 257 void set_selection_owner (rxvt_term *owner);
254 258
255 void reg (xevent_watcher *w); 259 void reg (xevent_watcher *w);
256 void unreg (xevent_watcher *w); 260 void unreg (xevent_watcher *w);
… …
325 operator Pixel () const { return c.pixel; } 329 operator Pixel () const { return c.pixel; }
326 330
327 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 331 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
328 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); }
329 333
334 bool is_opaque () const
335 {
336#if XFT
337 return c.color.alpha == rgba::MAX_CC;
338#else
339 return 1;
340#endif
341 }
342
330 bool alloc (rxvt_screen *screen, const rgba &color); 343 bool alloc (rxvt_screen *screen, const rgba &color);
331 void free (rxvt_screen *screen); 344 void free (rxvt_screen *screen);
332 345
333 void get (rgba &color); 346 void get (rgba &color);
334 void get (XColor &color); 347 void get (XColor &color);

Diff Legend

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