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.48 by sf-exg, Sun Jan 24 21:53:13 2010 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,
… …
219 219
220struct rxvt_display : refcounted 220struct rxvt_display : refcounted
221{ 221{
222 event_vec<xevent_watcher> xw; 222 event_vec<xevent_watcher> xw;
223 223
224 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); 225 ev::io x_ev ; void x_cb (ev::io &w, int revents);
225 226
226#ifdef USE_XIM 227#ifdef USE_XIM
227 refcache<rxvt_xim> xims; 228 refcache<rxvt_xim> xims;
228 vector<im_watcher *> imw; 229 vector<im_watcher *> imw;
229 230
… …
234//public 235//public
235 Display *dpy; 236 Display *dpy;
236 int screen; 237 int screen;
237 Window root; 238 Window root;
238 rxvt_term *selection_owner; 239 rxvt_term *selection_owner;
240 rxvt_term *clipboard_owner;
239 Atom xa[NUM_XA]; 241 Atom xa[NUM_XA];
240 bool is_local; 242 bool is_local;
241#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
242 Cursor blank_cursor; 244 Cursor blank_cursor;
243#endif 245#endif
… …
246 XrmDatabase get_resources (bool refresh); 248 XrmDatabase get_resources (bool refresh);
247 bool ref_init (); 249 bool ref_init ();
248 void ref_next (); 250 void ref_next ();
249 ~rxvt_display (); 251 ~rxvt_display ();
250 252
251 void flush (); 253 void flush ()
254 {
255 flush_ev.start ();
256 }
257
252 Atom atom (const char *name); 258 Atom atom (const char *name);
253 void set_selection_owner (rxvt_term *owner); 259 void set_selection_owner (rxvt_term *owner, bool clipboard);
254 260
255 void reg (xevent_watcher *w); 261 void reg (xevent_watcher *w);
256 void unreg (xevent_watcher *w); 262 void unreg (xevent_watcher *w);
257 263
258#ifdef USE_XIM 264#ifdef USE_XIM
… …
263 void put_xim (rxvt_xim *xim); 269 void put_xim (rxvt_xim *xim);
264#endif 270#endif
265}; 271};
266 272
267#ifdef USE_XIM 273#ifdef USE_XIM
268struct im_watcher : rxvt_watcher, callback<void (void)> { 274struct im_watcher : rxvt_watcher, callback<void (void)>
275{
269 void start (rxvt_display *display) 276 void start (rxvt_display *display)
270 { 277 {
271 display->reg (this); 278 display->reg (this);
272 } 279 }
273 280
… …
325 operator Pixel () const { return c.pixel; } 332 operator Pixel () const { return c.pixel; }
326 333
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 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 335 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
329 336
337 bool is_opaque () const
338 {
339#if XFT
340 return c.color.alpha == rgba::MAX_CC;
341#else
342 return 1;
343#endif
344 }
345
330 bool alloc (rxvt_screen *screen, const rgba &color); 346 bool alloc (rxvt_screen *screen, const rgba &color);
331 void free (rxvt_screen *screen); 347 void free (rxvt_screen *screen);
332 348
333 void get (rgba &color); 349 void get (rgba &color);
334 void get (XColor &color); 350 void get (XColor &color);

Diff Legend

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