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.25 by root, Sat Feb 18 15:48:23 2006 UTC vs.
Revision 1.34 by root, Sun Nov 11 04:08:00 2007 UTC

1/* 1/*----------------------------------------------------------------------*
2 * rxvttoolkit.h - provide toolkit-functionality for rxvt. 2 * File: rxvttoolkit.h - provide toolkit-functionality for rxvt.
3 *----------------------------------------------------------------------*
3 */ 4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
4#ifndef RXVT_TOOLKIT_H 23#ifndef RXVT_TOOLKIT_H
5#define RXVT_TOOLKIT_H 24#define RXVT_TOOLKIT_H
6 25
7#include <X11/Xlib.h> 26#include <X11/Xlib.h>
8 27
9#if XFT 28#if XFT
10# include <X11/Xft/Xft.h> 29# include <X11/Xft/Xft.h>
11#endif 30#endif
12 31
13#include "iom.h" 32#include "ev_cpp.h"
14 33
15#include "rxvtlib.h" 34#include "rxvtlib.h"
16#include "rxvtutil.h" 35#include "rxvtutil.h"
17 36
18#include "callback.h" 37#include "callback.h"
… …
46#endif 65#endif
47#if USE_XIM 66#if USE_XIM
48 XA_WM_LOCALE_NAME, 67 XA_WM_LOCALE_NAME,
49 XA_XIM_SERVERS, 68 XA_XIM_SERVERS,
50#endif 69#endif
51#if TRANSPARENT 70#if ENABLE_TRANSPARENCY
52 XA_XROOTPMAP_ID, 71 XA_XROOTPMAP_ID,
53 XA_ESETROOT_PMAP_ID, 72 XA_ESETROOT_PMAP_ID,
54#endif 73#endif
55#if ENABLE_XEMBED 74#if ENABLE_XEMBED
56 XA_XEMBED, 75 XA_XEMBED,
… …
81struct rxvt_display; 100struct rxvt_display;
82 101
83struct im_watcher; 102struct im_watcher;
84struct xevent_watcher; 103struct xevent_watcher;
85 104
105template<class watcher>
106struct event_vec : vector<watcher *> {
107 void erase_unordered (unsigned int pos)
108 {
109 watcher *w = (*this)[this->size () - 1];
110 this->pop_back ();
111
112 if (!this->empty ())
113 if (((*this)[pos] = w)) // '=' is correct!
114 w->active = pos + 1;
115 }
116};
117
118struct rxvt_watcher {
119 int active; /* 0 == inactive, else index into respective vector */
120
121 bool is_active () { return active; }
122
123 rxvt_watcher () : active (0) { }
124};
125
86struct refcounted { 126struct refcounted {
87 int referenced; 127 int referenced;
88 char *id; 128 char *id;
89 129
90 refcounted (const char *id); 130 refcounted (const char *id);
… …
164 204
165 rxvt_screen (); 205 rxvt_screen ();
166#endif 206#endif
167 207
168 void set (rxvt_display *disp); 208 void set (rxvt_display *disp);
169 void set (rxvt_display *disp, int bitdepth); 209 void select_visual (int bitdepth);
170 void clear (); 210 void clear ();
171}; 211};
172 212
173struct rxvt_display : refcounted { 213struct rxvt_display : refcounted {
174 io_manager_vec<xevent_watcher> xw; 214 event_vec<xevent_watcher> xw;
175 215
176 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 216 ev::io x_ev; void x_cb (ev::io &w, int revents);
177 217
178#ifdef USE_XIM 218#ifdef USE_XIM
179 refcache<rxvt_xim> xims; 219 refcache<rxvt_xim> xims;
180 vector<im_watcher *> imw; 220 vector<im_watcher *> imw;
181 221
… …
215 void put_xim (rxvt_xim *xim); 255 void put_xim (rxvt_xim *xim);
216#endif 256#endif
217}; 257};
218 258
219#ifdef USE_XIM 259#ifdef USE_XIM
220struct im_watcher : watcher, callback0<void> { 260struct im_watcher : rxvt_watcher, callback<void (void)> {
221 template<class O1, class O2> 261 template<class O, class M>
222 im_watcher (O1 *object, void (O2::*method) ()) 262 im_watcher (O object, M method)
223 : callback0<void> (object,method) 263 : callback<void (void)> (object, method)
224 { } 264 { }
225 265
226 void start (rxvt_display *display) 266 void start (rxvt_display *display)
227 { 267 {
228 display->reg (this); 268 display->reg (this);
229 } 269 }
270
230 void stop (rxvt_display *display) 271 void stop (rxvt_display *display)
231 { 272 {
232 display->unreg (this); 273 display->unreg (this);
233 } 274 }
234}; 275};
235#endif 276#endif
236 277
237struct xevent_watcher : watcher, callback1<void, XEvent &> { 278struct xevent_watcher : rxvt_watcher, callback<void (XEvent &)> {
238 Window window; 279 Window window;
239 280
240 template<class O1, class O2> 281 template<class O, class M>
241 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 282 xevent_watcher (O object, M method)
242 : callback1<void, XEvent &> (object,method) 283 : callback<void (XEvent &)> (object, method)
243 { } 284 { }
244 285
245 void start (rxvt_display *display, Window window) 286 void start (rxvt_display *display, Window window)
246 { 287 {
247 this->window = window; 288 this->window = window;
248 display->reg (this); 289 display->reg (this);
249 } 290 }
291
250 void stop (rxvt_display *display) 292 void stop (rxvt_display *display)
251 { 293 {
252 display->unreg (this); 294 display->unreg (this);
253 } 295 }
254}; 296};
… …
287 bool alloc (rxvt_screen *screen, const rgba &color); 329 bool alloc (rxvt_screen *screen, const rgba &color);
288 void free (rxvt_screen *screen); 330 void free (rxvt_screen *screen);
289 331
290 void get (rgba &color); 332 void get (rgba &color);
291 void get (XColor &color); 333 void get (XColor &color);
292 334
293 bool set (rxvt_screen *screen, const char *name); 335 bool set (rxvt_screen *screen, const char *name);
294 bool set (rxvt_screen *screen, const rgba &color); 336 bool set (rxvt_screen *screen, const rgba &color);
295 337
296 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); 338 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
297}; 339};

Diff Legend

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