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.10 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.14 by root, Mon Jan 30 02:21:21 2006 UTC

… …
15#include "rxvtlib.h" 15#include "rxvtlib.h"
16#include "rxvtutil.h" 16#include "rxvtutil.h"
17 17
18#include "callback.h" 18#include "callback.h"
19 19
20// see rxvttoolkit.C:xa_names, which must be kept in sync
21enum {
22 XA_TEXT,
23 XA_COMPOUND_TEXT,
24 XA_UTF8_STRING,
25 XA_MULTIPLE,
26 XA_TARGETS,
27 XA_TIMESTAMP,
28 XA_VT_SELECTION,
29 XA_INCR,
30 XA_WM_PROTOCOLS,
31 XA_WM_DELETE_WINDOW,
32 XA_CLIPBOARD,
33 XA_AVERAGE_WIDTH,
34 XA_WEIGHT_NAME,
35 XA_SLANT,
36 XA_CHARSET_REGISTRY,
37 XA_CHARSET_ENCODING,
38#if ENABLE_FRILLS
39 XA_MOTIF_WM_HINTS,
40#endif
41#if ENABLE_EWMH
42 XA_NET_WM_PID,
43 XA_NET_WM_NAME,
44 XA_NET_WM_ICON_NAME,
45 XA_NET_WM_PING,
46#endif
47#if USE_XIM
48 XA_WM_LOCALE_NAME,
49 XA_XIM_SERVERS,
50#endif
51#if TRANSPARENT
52 XA_XROOTPMAP_ID,
53 XA_ESETROOT_PMAP_ID,
54#endif
55#if ENABLE_XEMBED
56 XA_XEMBED,
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#endif
68 NUM_XA
69};
70
20struct rxvt_term; 71struct rxvt_term;
21struct rxvt_display; 72struct rxvt_display;
22 73
23struct im_watcher; 74struct im_watcher;
24struct xevent_watcher; 75struct xevent_watcher;
… …
59 bool ref_init (); 110 bool ref_init ();
60 ~rxvt_xim (); 111 ~rxvt_xim ();
61}; 112};
62#endif 113#endif
63 114
115struct rxvt_screen {
116 rxvt_display *display;
117 Display *xdisp;
118 int depth;
119 Visual *visual;
120 Colormap cmap;
121
122 void set (rxvt_display *disp);
123 void set (rxvt_display *disp, int bitdepth);
124 void clear ();
125};
126
64struct rxvt_display : refcounted { 127struct rxvt_display : refcounted {
65 Atom xa_xim_servers;
66
67 io_manager_vec<xevent_watcher> xw; 128 io_manager_vec<xevent_watcher> xw;
68 129
69 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 130 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
70 131
71#ifdef USE_XIM 132#ifdef USE_XIM
… …
76 void im_change_check (); 137 void im_change_check ();
77#endif 138#endif
78 139
79//public 140//public
80 Display *display; 141 Display *display;
81 int depth;
82 int screen; 142 int screen;
83 Visual *visual;
84 Colormap cmap;
85 Window root; 143 Window root;
86 rxvt_term *selection_owner; 144 rxvt_term *selection_owner;
145 Atom xa[NUM_XA];
87#ifndef NO_SLOW_LINK_SUPPORT 146#ifndef NO_SLOW_LINK_SUPPORT
88 bool is_local; 147 bool is_local;
89#endif 148#endif
90#ifdef POINTER_BLANK 149#ifdef POINTER_BLANK
91 Cursor blank_cursor; 150 Cursor blank_cursor;
… …
153extern refcache<rxvt_display> displays; 212extern refcache<rxvt_display> displays;
154 213
155///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
156 215
157typedef unsigned long Pixel; 216typedef unsigned long Pixel;
217
218struct rxvt_rgba {
219 unsigned short r, g, b, a;
220
221 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
222
223 rxvt_rgba ()
224 { }
225
226 rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
227 : r(r), g(g), b(b), a(a)
228 { }
229};
158 230
159struct rxvt_color { 231struct rxvt_color {
160#if XFT 232#if XFT
161 XftColor c; 233 XftColor c;
162 operator Pixel () const { return c.pixel; } 234 operator Pixel () const { return c.pixel; }
… …
166#endif 238#endif
167 239
168 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 240 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
169 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 241 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
170 242
171 void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); 243 void get (rxvt_screen *screen, rxvt_rgba &rgba);
172 244
173 bool set (rxvt_display *display, Pixel p);
174 bool set (rxvt_display *display, const char *name); 245 bool set (rxvt_screen *screen, const char *name);
175 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 246 bool set (rxvt_screen *screen, rxvt_rgba rgba);
176 247
177 rxvt_color fade (rxvt_display *, int percent); // fades to black 248 rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
178 rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto); 249 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
179 250
180 void free (rxvt_display *display); 251 void free (rxvt_screen *screen);
181}; 252};
182 253
183#endif 254#endif
184 255

Diff Legend

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