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.24 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.33 by ayin, Wed Oct 31 09:55:24 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
… …
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,
… …
164 183
165 rxvt_screen (); 184 rxvt_screen ();
166#endif 185#endif
167 186
168 void set (rxvt_display *disp); 187 void set (rxvt_display *disp);
169 void set (rxvt_display *disp, int bitdepth); 188 void select_visual (int bitdepth);
170 void clear (); 189 void clear ();
171}; 190};
172 191
173struct rxvt_display : refcounted { 192struct rxvt_display : refcounted {
174 io_manager_vec<xevent_watcher> xw; 193 io_manager_vec<xevent_watcher> xw;
… …
187 Display *dpy; 206 Display *dpy;
188 int screen; 207 int screen;
189 Window root; 208 Window root;
190 rxvt_term *selection_owner; 209 rxvt_term *selection_owner;
191 Atom xa[NUM_XA]; 210 Atom xa[NUM_XA];
192#ifndef NO_SLOW_LINK_SUPPORT
193 bool is_local; 211 bool is_local;
194#endif
195#ifdef POINTER_BLANK 212#ifdef POINTER_BLANK
196 Cursor blank_cursor; 213 Cursor blank_cursor;
197#endif 214#endif
198 215
199 rxvt_display (const char *id); 216 rxvt_display (const char *id);
… …
217 void put_xim (rxvt_xim *xim); 234 void put_xim (rxvt_xim *xim);
218#endif 235#endif
219}; 236};
220 237
221#ifdef USE_XIM 238#ifdef USE_XIM
222struct im_watcher : watcher, callback0<void> { 239struct im_watcher : watcher, callback<void (void)> {
223 template<class O1, class O2> 240 template<class O, class M>
224 im_watcher (O1 *object, void (O2::*method) ()) 241 im_watcher (O object, M method)
225 : callback0<void> (object,method) 242 : callback<void (void)> (object, method)
226 { } 243 { }
227 244
228 void start (rxvt_display *display) 245 void start (rxvt_display *display)
229 { 246 {
230 display->reg (this); 247 display->reg (this);
… …
234 display->unreg (this); 251 display->unreg (this);
235 } 252 }
236}; 253};
237#endif 254#endif
238 255
239struct xevent_watcher : watcher, callback1<void, XEvent &> { 256struct xevent_watcher : watcher, callback<void (XEvent &)> {
240 Window window; 257 Window window;
241 258
242 template<class O1, class O2> 259 template<class O, class M>
243 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 260 xevent_watcher (O object, M method)
244 : callback1<void, XEvent &> (object,method) 261 : callback<void (XEvent &)> (object, method)
245 { } 262 { }
246 263
247 void start (rxvt_display *display, Window window) 264 void start (rxvt_display *display, Window window)
248 { 265 {
249 this->window = window; 266 this->window = window;
… …
289 bool alloc (rxvt_screen *screen, const rgba &color); 306 bool alloc (rxvt_screen *screen, const rgba &color);
290 void free (rxvt_screen *screen); 307 void free (rxvt_screen *screen);
291 308
292 void get (rgba &color); 309 void get (rgba &color);
293 void get (XColor &color); 310 void get (XColor &color);
294 311
295 bool set (rxvt_screen *screen, const char *name); 312 bool set (rxvt_screen *screen, const char *name);
296 bool set (rxvt_screen *screen, const rgba &color); 313 bool set (rxvt_screen *screen, const rgba &color);
297 314
298 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); 315 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
299}; 316};

Diff Legend

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