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.12 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.20 by root, Tue Jan 31 19:53:31 2006 UTC

… …
28 XA_VT_SELECTION, 28 XA_VT_SELECTION,
29 XA_INCR, 29 XA_INCR,
30 XA_WM_PROTOCOLS, 30 XA_WM_PROTOCOLS,
31 XA_WM_DELETE_WINDOW, 31 XA_WM_DELETE_WINDOW,
32 XA_CLIPBOARD, 32 XA_CLIPBOARD,
33 XA_AVERAGE_WIDTH,
34 XA_WEIGHT_NAME,
35 XA_SLANT,
36 XA_CHARSET_REGISTRY,
37 XA_CHARSET_ENCODING,
33#if ENABLE_FRILLS 38#if ENABLE_FRILLS
34 XA_MOTIF_WM_HINTS, 39 XA_MOTIF_WM_HINTS,
35#endif 40#endif
36#if ENABLE_EWMH 41#if ENABLE_EWMH
37 XA_NET_WM_PID, 42 XA_NET_WM_PID,
… …
48 XA_ESETROOT_PMAP_ID, 53 XA_ESETROOT_PMAP_ID,
49#endif 54#endif
50#if ENABLE_XEMBED 55#if ENABLE_XEMBED
51 XA_XEMBED, 56 XA_XEMBED,
52 XA_XEMBED_INFO, 57 XA_XEMBED_INFO,
58#endif
59#if !ENABLE_MINIMAL
60 // these are usually allocated by other subsystens, but we do it
61 // here to avoid a server roundtrip.
62 XA_SCREEN_RESOURCES,
63 XA_XDCCC_LINEAR_RGB_CORRECTION,
64 XA_XDCCC_LINEAR_RGB_MATRICES,
65 XA_WM_COLORMAP_WINDOWS,
66 XA_WM_STATE,
67 XA_cursor,
68# if USE_XIM
69 // various selection targets used by XIM
70 XA_TRANSPORT,
71 XA_LOCALES,
72 XA__XIM_PROTOCOL,
73 XA__XIM_XCONNECT,
74 XA__XIM_MOREDATA,
75# endif
53#endif 76#endif
54 NUM_XA 77 NUM_XA
55}; 78};
56 79
57struct rxvt_term; 80struct rxvt_term;
… …
104 int depth; 127 int depth;
105 Visual *visual; 128 Visual *visual;
106 Colormap cmap; 129 Colormap cmap;
107 130
108 void set (rxvt_display *disp); 131 void set (rxvt_display *disp);
109 void set (rxvt_display *disp, int depth); 132 void set (rxvt_display *disp, int bitdepth);
110 void clear (); 133 void clear ();
111}; 134};
112 135
113struct rxvt_display : refcounted { 136struct rxvt_display : refcounted {
114 io_manager_vec<xevent_watcher> xw; 137 io_manager_vec<xevent_watcher> xw;
… …
199 222
200///////////////////////////////////////////////////////////////////////////// 223/////////////////////////////////////////////////////////////////////////////
201 224
202typedef unsigned long Pixel; 225typedef unsigned long Pixel;
203 226
227struct rgba {
228 unsigned short r, g, b, a;
229
230 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
231
232 rgba ()
233 { }
234
235 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
236 : r(r), g(g), b(b), a(a)
237 { }
238};
239
204struct rxvt_color { 240struct rxvt_color {
205#if XFT 241#if XFT
206 XftColor c; 242 XftColor c;
243#else
244 XColor c;
245#endif
246
207 operator Pixel () const { return c.pixel; } 247 operator Pixel () const { return c.pixel; }
208#else
209 Pixel p;
210 operator Pixel () const { return p; }
211#endif
212 248
213 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 249 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
214 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 250 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
215 251
216 void get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb); 252 bool alloc (rxvt_screen *screen, const rgba &color);
253 void free (rxvt_screen *screen);
254
255 void get (rgba &color);
217 256
218 bool set (rxvt_screen *screen, Pixel p);
219 bool set (rxvt_screen *screen, const char *name); 257 bool set (rxvt_screen *screen, const char *name);
220 bool set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb); 258 bool set (rxvt_screen *screen, const rgba &color);
221 259
222 rxvt_color fade (rxvt_screen *screen, int percent); // fades to black 260 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
223 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
224
225 void free (rxvt_screen *screen);
226}; 261};
227 262
228#endif 263#endif
229 264

Diff Legend

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