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.36 by root, Tue Dec 4 14:50:44 2007 UTC vs.
Revision 1.37 by root, Fri Dec 14 04:26:23 2007 UTC

… …
101 101
102struct im_watcher; 102struct im_watcher;
103struct xevent_watcher; 103struct xevent_watcher;
104 104
105template<class watcher> 105template<class watcher>
106struct event_vec : vector<watcher *> { 106struct event_vec : vector<watcher *>
107{
107 void erase_unordered (unsigned int pos) 108 void erase_unordered (unsigned int pos)
108 { 109 {
109 watcher *w = (*this)[this->size () - 1]; 110 watcher *w = (*this)[this->size () - 1];
110 this->pop_back (); 111 this->pop_back ();
111 112
… …
113 if (((*this)[pos] = w)) // '=' is correct! 114 if (((*this)[pos] = w)) // '=' is correct!
114 w->active = pos + 1; 115 w->active = pos + 1;
115 } 116 }
116}; 117};
117 118
118struct rxvt_watcher { 119struct rxvt_watcher
120{
119 int active; /* 0 == inactive, else index into respective vector */ 121 int active; /* 0 == inactive, else index into respective vector */
120 122
121 bool is_active () { return active; } 123 bool is_active () { return active; }
122 124
123 rxvt_watcher () : active (0) { } 125 rxvt_watcher () : active (0) { }
124}; 126};
125 127
126struct refcounted { 128struct refcounted
129{
127 int referenced; 130 int referenced;
128 char *id; 131 char *id;
129 132
130 refcounted (const char *id); 133 refcounted (const char *id);
131 bool ref_init () { return false; } 134 bool ref_init () { return false; }
132 void ref_next () { } 135 void ref_next () { }
133 ~refcounted (); 136 ~refcounted ();
134}; 137};
135 138
136template<class T> 139template<class T>
137struct refcache : vector<T *> { 140struct refcache : vector<T *>
141{
138 T *get (const char *id); 142 T *get (const char *id);
139 void put (T *obj); 143 void put (T *obj);
140 void clear (); 144 void clear ();
141 145
142 ~refcache () 146 ~refcache ()
… …
147 151
148///////////////////////////////////////////////////////////////////////////// 152/////////////////////////////////////////////////////////////////////////////
149 153
150struct rxvt_screen; 154struct rxvt_screen;
151 155
152struct rxvt_drawable { 156struct rxvt_drawable
157{
153 rxvt_screen *screen; 158 rxvt_screen *screen;
154 Drawable drawable; 159 Drawable drawable;
155 operator Drawable() { return drawable; } 160 operator Drawable() { return drawable; }
156 161
157#if XFT 162#if XFT
… …
173}; 178};
174 179
175///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
176 181
177#ifdef USE_XIM 182#ifdef USE_XIM
178struct rxvt_xim : refcounted { 183struct rxvt_xim : refcounted
184{
179 void destroy (); 185 void destroy ();
180 rxvt_display *display; 186 rxvt_display *display;
181 187
182//public 188//public
183 XIM xim; 189 XIM xim;
… …
186 bool ref_init (); 192 bool ref_init ();
187 ~rxvt_xim (); 193 ~rxvt_xim ();
188}; 194};
189#endif 195#endif
190 196
191struct rxvt_screen { 197struct rxvt_screen
198{
192 rxvt_display *display; 199 rxvt_display *display;
193 Display *dpy; 200 Display *dpy;
194 int depth; 201 int depth;
195 Visual *visual; 202 Visual *visual;
196 Colormap cmap; 203 Colormap cmap;
… …
208 void set (rxvt_display *disp); 215 void set (rxvt_display *disp);
209 void select_visual (int bitdepth); 216 void select_visual (int bitdepth);
210 void clear (); 217 void clear ();
211}; 218};
212 219
213struct rxvt_display : refcounted { 220struct rxvt_display : refcounted
221{
214 event_vec<xevent_watcher> xw; 222 event_vec<xevent_watcher> xw;
215 223
216 ev::io x_ev; void x_cb (ev::io &w, int revents); 224 ev::io x_ev; void x_cb (ev::io &w, int revents);
217 225
218#ifdef USE_XIM 226#ifdef USE_XIM
… …
268 display->unreg (this); 276 display->unreg (this);
269 } 277 }
270}; 278};
271#endif 279#endif
272 280
273struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> { 281struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)>
282{
274 Window window; 283 Window window;
275 284
276 void start (rxvt_display *display, Window window) 285 void start (rxvt_display *display, Window window)
277 { 286 {
278 this->window = window; 287 this->window = window;
… …
289 298
290///////////////////////////////////////////////////////////////////////////// 299/////////////////////////////////////////////////////////////////////////////
291 300
292typedef unsigned long Pixel; 301typedef unsigned long Pixel;
293 302
294struct rgba { 303struct rgba
304{
295 unsigned short r, g, b, a; 305 unsigned short r, g, b, a;
296 306
297 enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; 307 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
298 308
299 rgba () 309 rgba ()
… …
302 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC) 312 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
303 : r(r), g(g), b(b), a(a) 313 : r(r), g(g), b(b), a(a)
304 { } 314 { }
305}; 315};
306 316
307struct rxvt_color { 317struct rxvt_color
318{
308#if XFT 319#if XFT
309 XftColor c; 320 XftColor c;
310#else 321#else
311 XColor c; 322 XColor c;
312#endif 323#endif

Diff Legend

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