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.8 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.13 by root, Sun Jan 29 20:51:28 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#if ENABLE_FRILLS
34 XA_MOTIF_WM_HINTS,
35#endif
36#if ENABLE_EWMH
37 XA_NET_WM_PID,
38 XA_NET_WM_NAME,
39 XA_NET_WM_ICON_NAME,
40 XA_NET_WM_PING,
41#endif
42#if USE_XIM
43 XA_WM_LOCALE_NAME,
44 XA_XIM_SERVERS,
45#endif
46#if TRANSPARENT
47 XA_XROOTPMAP_ID,
48 XA_ESETROOT_PMAP_ID,
49#endif
50#if ENABLE_XEMBED
51 XA_XEMBED,
52 XA_XEMBED_INFO,
53#endif
54 NUM_XA
55};
56
20struct rxvt_term; 57struct rxvt_term;
21struct rxvt_display; 58struct rxvt_display;
22 59
23struct im_watcher; 60struct im_watcher;
24struct xevent_watcher; 61struct xevent_watcher;
… …
26struct refcounted { 63struct refcounted {
27 int referenced; 64 int referenced;
28 char *id; 65 char *id;
29 66
30 refcounted (const char *id); 67 refcounted (const char *id);
31 bool init () { return false; } 68 bool ref_init () { return false; }
69 void ref_next () { }
32 ~refcounted (); 70 ~refcounted ();
33}; 71};
34 72
35template<class T> 73template<class T>
36struct refcache : vector<T *> { 74struct refcache : vector<T *> {
… …
53 91
54//public 92//public
55 XIM xim; 93 XIM xim;
56 94
57 rxvt_xim (const char *id) : refcounted (id) { } 95 rxvt_xim (const char *id) : refcounted (id) { }
58 bool init (); 96 bool ref_init ();
59 ~rxvt_xim (); 97 ~rxvt_xim ();
60}; 98};
61#endif 99#endif
62 100
101struct rxvt_screen {
102 rxvt_display *display;
103 Display *xdisp;
104 int depth;
105 Visual *visual;
106 Colormap cmap;
107
108 void set (rxvt_display *disp);
109 void set (rxvt_display *disp, int bitdepth);
110 void clear ();
111};
112
63struct rxvt_display : refcounted { 113struct rxvt_display : refcounted {
64 Atom xa_xim_servers;
65
66 io_manager_vec<xevent_watcher> xw; 114 io_manager_vec<xevent_watcher> xw;
67 115
68 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 116 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
69 117
70#ifdef USE_XIM 118#ifdef USE_XIM
… …
75 void im_change_check (); 123 void im_change_check ();
76#endif 124#endif
77 125
78//public 126//public
79 Display *display; 127 Display *display;
80 int depth;
81 int screen; 128 int screen;
82 Visual *visual;
83 Colormap cmap;
84 Window root; 129 Window root;
85 rxvt_term *selection_owner; 130 rxvt_term *selection_owner;
131 Atom xa[NUM_XA];
86#ifndef NO_SLOW_LINK_SUPPORT 132#ifndef NO_SLOW_LINK_SUPPORT
87 bool is_local; 133 bool is_local;
88#endif 134#endif
89#ifdef POINTER_BLANK 135#ifdef POINTER_BLANK
90 Cursor blank_cursor; 136 Cursor blank_cursor;
91#endif 137#endif
92 138
93 rxvt_display (const char *id); 139 rxvt_display (const char *id);
140 XrmDatabase get_resources ();
94 bool init (); 141 bool ref_init ();
142 void ref_next ();
95 ~rxvt_display (); 143 ~rxvt_display ();
96
97 operator Display *() const { return display; }
98 144
99 void flush (); 145 void flush ();
100 Atom atom (const char *name); 146 Atom atom (const char *name);
101 void set_selection_owner (rxvt_term *owner); 147 void set_selection_owner (rxvt_term *owner);
102 148
… …
152extern refcache<rxvt_display> displays; 198extern refcache<rxvt_display> displays;
153 199
154///////////////////////////////////////////////////////////////////////////// 200/////////////////////////////////////////////////////////////////////////////
155 201
156typedef unsigned long Pixel; 202typedef unsigned long Pixel;
203
204struct rxvt_rgba {
205 unsigned short r, g, b, a;
206
207 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
208
209 rxvt_rgba ()
210 { }
211
212 rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
213 : r(r), g(g), b(b), a(a)
214 { }
215};
157 216
158struct rxvt_color { 217struct rxvt_color {
159#if XFT 218#if XFT
160 XftColor c; 219 XftColor c;
161 operator Pixel () const { return c.pixel; } 220 operator Pixel () const { return c.pixel; }
… …
165#endif 224#endif
166 225
167 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 226 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); } 227 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
169 228
170 void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); 229 void get (rxvt_screen *screen, rxvt_rgba &rgba);
171 230
172 bool set (rxvt_display *display, Pixel p);
173 bool set (rxvt_display *display, const char *name); 231 bool set (rxvt_screen *screen, const char *name);
174 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 232 bool set (rxvt_screen *screen, rxvt_rgba rgba);
175 233
176 rxvt_color fade (rxvt_display *, int percent); // fades to black 234 rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
177 rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto); 235 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
178 236
179 void free (rxvt_display *display); 237 void free (rxvt_screen *screen);
180}; 238};
181 239
182#endif 240#endif
183 241

Diff Legend

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