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.7 by root, Mon Jan 17 00:59:24 2005 UTC vs.
Revision 1.15 by root, Mon Jan 30 19:46:13 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 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
76#endif
77 NUM_XA
78};
79
20struct rxvt_term; 80struct rxvt_term;
21struct rxvt_display; 81struct rxvt_display;
22 82
23struct im_watcher; 83struct im_watcher;
24struct xevent_watcher; 84struct xevent_watcher;
… …
26struct refcounted { 86struct refcounted {
27 int referenced; 87 int referenced;
28 char *id; 88 char *id;
29 89
30 refcounted (const char *id); 90 refcounted (const char *id);
31 bool init () { return false; } 91 bool ref_init () { return false; }
92 void ref_next () { }
32 ~refcounted (); 93 ~refcounted ();
33}; 94};
34 95
35template<class T> 96template<class T>
36struct refcache : vector<T *> { 97struct refcache : vector<T *> {
… …
53 114
54//public 115//public
55 XIM xim; 116 XIM xim;
56 117
57 rxvt_xim (const char *id) : refcounted (id) { } 118 rxvt_xim (const char *id) : refcounted (id) { }
58 bool init (); 119 bool ref_init ();
59 ~rxvt_xim (); 120 ~rxvt_xim ();
60}; 121};
61#endif 122#endif
62 123
124struct rxvt_screen {
125 rxvt_display *display;
126 Display *xdisp;
127 int depth;
128 Visual *visual;
129 Colormap cmap;
130
131 void set (rxvt_display *disp);
132 void set (rxvt_display *disp, int bitdepth);
133 void clear ();
134};
135
63struct rxvt_display : refcounted { 136struct rxvt_display : refcounted {
64 Atom xa_xim_servers;
65
66 io_manager_vec<xevent_watcher> xw; 137 io_manager_vec<xevent_watcher> xw;
67 138
68 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 139 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
69 140
70#ifdef USE_XIM 141#ifdef USE_XIM
… …
75 void im_change_check (); 146 void im_change_check ();
76#endif 147#endif
77 148
78//public 149//public
79 Display *display; 150 Display *display;
80 int depth;
81 int screen; 151 int screen;
82 Visual *visual;
83 Colormap cmap;
84 Window root; 152 Window root;
85 rxvt_term *selection_owner; 153 rxvt_term *selection_owner;
154 Atom xa[NUM_XA];
86#ifndef NO_SLOW_LINK_SUPPORT 155#ifndef NO_SLOW_LINK_SUPPORT
87 bool is_local; 156 bool is_local;
88#endif 157#endif
89#ifdef POINTER_BLANK 158#ifdef POINTER_BLANK
90 Cursor blank_cursor; 159 Cursor blank_cursor;
91#endif 160#endif
92 161
93 rxvt_display (const char *id); 162 rxvt_display (const char *id);
163 XrmDatabase get_resources ();
94 bool init (); 164 bool ref_init ();
165 void ref_next ();
95 ~rxvt_display (); 166 ~rxvt_display ();
96
97 operator Display *() const { return display; }
98 167
99 void flush (); 168 void flush ();
100 Atom atom (const char *name); 169 Atom atom (const char *name);
101 void set_selection_owner (rxvt_term *owner); 170 void set_selection_owner (rxvt_term *owner);
102 171
… …
152extern refcache<rxvt_display> displays; 221extern refcache<rxvt_display> displays;
153 222
154///////////////////////////////////////////////////////////////////////////// 223/////////////////////////////////////////////////////////////////////////////
155 224
156typedef unsigned long Pixel; 225typedef unsigned long Pixel;
226
227struct rxvt_rgba {
228 unsigned short r, g, b, a;
229
230 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
231
232 rxvt_rgba ()
233 { }
234
235 rxvt_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};
157 239
158struct rxvt_color { 240struct rxvt_color {
159#if XFT 241#if XFT
160 XftColor c; 242 XftColor c;
161 operator Pixel () const { return c.pixel; } 243 operator Pixel () const { return c.pixel; }
… …
165#endif 247#endif
166 248
167 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); }
168 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); }
169 251
170 void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); 252 void get (rxvt_screen *screen, rxvt_rgba &rgba);
171 253
172 bool set (rxvt_display *display, Pixel p); 254 bool alloc (rxvt_screen *screen, rxvt_rgba rgba);
255
173 bool set (rxvt_display *display, const char *name); 256 bool set (rxvt_screen *screen, const char *name);
174 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 257 bool set (rxvt_screen *screen, rxvt_rgba rgba);
175 258
176 rxvt_color fade (rxvt_display *, int percent); 259 rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
260 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
177 261
178 void free (rxvt_display *display); 262 void free (rxvt_screen *screen);
179}; 263};
180 264
181#endif 265#endif
182 266

Diff Legend

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