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.25 by root, Sat Feb 18 15:48:23 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;
… …
45 } 105 }
46}; 106};
47 107
48///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
49 109
110struct rxvt_screen;
111
112struct rxvt_drawable {
113 rxvt_screen *screen;
114 Drawable drawable;
115 operator Drawable() { return drawable; }
116
117#if XFT
118 XftDraw *xftdrawable;
119 operator XftDraw *();
120#endif
121
122 rxvt_drawable (rxvt_screen *screen, Drawable drawable)
123 : screen(screen),
124#if XFT
125 xftdrawable(0),
126#endif
127 drawable(drawable)
128 { }
129
130#if XFT
131 ~rxvt_drawable ();
132#endif
133};
134
135/////////////////////////////////////////////////////////////////////////////
136
50#ifdef USE_XIM 137#ifdef USE_XIM
51struct rxvt_xim : refcounted { 138struct rxvt_xim : refcounted {
52 void destroy (); 139 void destroy ();
53 rxvt_display *display; 140 rxvt_display *display;
54 141
… …
59 bool ref_init (); 146 bool ref_init ();
60 ~rxvt_xim (); 147 ~rxvt_xim ();
61}; 148};
62#endif 149#endif
63 150
151struct rxvt_screen {
152 rxvt_display *display;
153 Display *dpy;
154 int depth;
155 Visual *visual;
156 Colormap cmap;
157
158#if XFT
159 // scratch pixmap
160 rxvt_drawable *scratch_area;
161 int scratch_w, scratch_h;
162
163 rxvt_drawable &scratch_drawable (int w, int h);
164
165 rxvt_screen ();
166#endif
167
168 void set (rxvt_display *disp);
169 void set (rxvt_display *disp, int bitdepth);
170 void clear ();
171};
172
64struct rxvt_display : refcounted { 173struct rxvt_display : refcounted {
65 Atom xa_xim_servers;
66
67 io_manager_vec<xevent_watcher> xw; 174 io_manager_vec<xevent_watcher> xw;
68 175
69 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 176 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
70 177
71#ifdef USE_XIM 178#ifdef USE_XIM
… …
75 void im_change_cb (); 182 void im_change_cb ();
76 void im_change_check (); 183 void im_change_check ();
77#endif 184#endif
78 185
79//public 186//public
80 Display *display; 187 Display *dpy;
81 int depth;
82 int screen; 188 int screen;
83 Visual *visual;
84 Colormap cmap;
85 Window root; 189 Window root;
86 rxvt_term *selection_owner; 190 rxvt_term *selection_owner;
87#ifndef NO_SLOW_LINK_SUPPORT 191 Atom xa[NUM_XA];
88 bool is_local; 192 bool is_local;
89#endif
90#ifdef POINTER_BLANK 193#ifdef POINTER_BLANK
91 Cursor blank_cursor; 194 Cursor blank_cursor;
92#endif 195#endif
93 196
94 rxvt_display (const char *id); 197 rxvt_display (const char *id);
95 XrmDatabase get_resources (); 198 XrmDatabase get_resources (bool refresh);
96 bool ref_init (); 199 bool ref_init ();
97 void ref_next (); 200 void ref_next ();
98 ~rxvt_display (); 201 ~rxvt_display ();
99 202
100 void flush (); 203 void flush ();
… …
154 257
155///////////////////////////////////////////////////////////////////////////// 258/////////////////////////////////////////////////////////////////////////////
156 259
157typedef unsigned long Pixel; 260typedef unsigned long Pixel;
158 261
262struct rgba {
263 unsigned short r, g, b, a;
264
265 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
266
267 rgba ()
268 { }
269
270 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
271 : r(r), g(g), b(b), a(a)
272 { }
273};
274
159struct rxvt_color { 275struct rxvt_color {
160#if XFT 276#if XFT
161 XftColor c; 277 XftColor c;
278#else
279 XColor c;
280#endif
281
162 operator Pixel () const { return c.pixel; } 282 operator Pixel () const { return c.pixel; }
163#else
164 Pixel p;
165 operator Pixel () const { return p; }
166#endif
167 283
168 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 284 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); } 285 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
170 286
171 void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); 287 bool alloc (rxvt_screen *screen, const rgba &color);
288 void free (rxvt_screen *screen);
289
290 void get (rgba &color);
291 void get (XColor &color);
172 292
173 bool set (rxvt_display *display, Pixel p);
174 bool set (rxvt_display *display, const char *name); 293 bool set (rxvt_screen *screen, const char *name);
175 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 294 bool set (rxvt_screen *screen, const rgba &color);
176 295
177 rxvt_color fade (rxvt_display *, int percent); // fades to black 296 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
178 rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
179
180 void free (rxvt_display *display);
181}; 297};
182 298
183#endif 299#endif
184 300

Diff Legend

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