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.20 by root, Tue Jan 31 19:53:31 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,
… …
105 } 124 }
106}; 125};
107 126
108///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
109 128
129struct rxvt_screen;
130
131struct rxvt_drawable {
132 rxvt_screen *screen;
133 Drawable drawable;
134 operator Drawable() { return drawable; }
135
136#if XFT
137 XftDraw *xftdrawable;
138 operator XftDraw *();
139#endif
140
141 rxvt_drawable (rxvt_screen *screen, Drawable drawable)
142 : screen(screen),
143#if XFT
144 xftdrawable(0),
145#endif
146 drawable(drawable)
147 { }
148
149#if XFT
150 ~rxvt_drawable ();
151#endif
152};
153
154/////////////////////////////////////////////////////////////////////////////
155
110#ifdef USE_XIM 156#ifdef USE_XIM
111struct rxvt_xim : refcounted { 157struct rxvt_xim : refcounted {
112 void destroy (); 158 void destroy ();
113 rxvt_display *display; 159 rxvt_display *display;
114 160
… …
121}; 167};
122#endif 168#endif
123 169
124struct rxvt_screen { 170struct rxvt_screen {
125 rxvt_display *display; 171 rxvt_display *display;
126 Display *xdisp; 172 Display *dpy;
127 int depth; 173 int depth;
128 Visual *visual; 174 Visual *visual;
129 Colormap cmap; 175 Colormap cmap;
130 176
177#if XFT
178 // scratch pixmap
179 rxvt_drawable *scratch_area;
180 int scratch_w, scratch_h;
181
182 rxvt_drawable &scratch_drawable (int w, int h);
183
184 rxvt_screen ();
185#endif
186
131 void set (rxvt_display *disp); 187 void set (rxvt_display *disp);
132 void set (rxvt_display *disp, int bitdepth); 188 void select_visual (int bitdepth);
133 void clear (); 189 void clear ();
134}; 190};
135 191
136struct rxvt_display : refcounted { 192struct rxvt_display : refcounted {
137 io_manager_vec<xevent_watcher> xw; 193 io_manager_vec<xevent_watcher> xw;
… …
145 void im_change_cb (); 201 void im_change_cb ();
146 void im_change_check (); 202 void im_change_check ();
147#endif 203#endif
148 204
149//public 205//public
150 Display *display; 206 Display *dpy;
151 int screen; 207 int screen;
152 Window root; 208 Window root;
153 rxvt_term *selection_owner; 209 rxvt_term *selection_owner;
154 Atom xa[NUM_XA]; 210 Atom xa[NUM_XA];
155#ifndef NO_SLOW_LINK_SUPPORT
156 bool is_local; 211 bool is_local;
157#endif
158#ifdef POINTER_BLANK 212#ifdef POINTER_BLANK
159 Cursor blank_cursor; 213 Cursor blank_cursor;
160#endif 214#endif
161 215
162 rxvt_display (const char *id); 216 rxvt_display (const char *id);
163 XrmDatabase get_resources (); 217 XrmDatabase get_resources (bool refresh);
164 bool ref_init (); 218 bool ref_init ();
165 void ref_next (); 219 void ref_next ();
166 ~rxvt_display (); 220 ~rxvt_display ();
167 221
168 void flush (); 222 void flush ();
… …
180 void put_xim (rxvt_xim *xim); 234 void put_xim (rxvt_xim *xim);
181#endif 235#endif
182}; 236};
183 237
184#ifdef USE_XIM 238#ifdef USE_XIM
185struct im_watcher : watcher, callback0<void> { 239struct im_watcher : watcher, callback<void (void)> {
186 template<class O1, class O2> 240 template<class O, class M>
187 im_watcher (O1 *object, void (O2::*method) ()) 241 im_watcher (O object, M method)
188 : callback0<void> (object,method) 242 : callback<void (void)> (object, method)
189 { } 243 { }
190 244
191 void start (rxvt_display *display) 245 void start (rxvt_display *display)
192 { 246 {
193 display->reg (this); 247 display->reg (this);
… …
197 display->unreg (this); 251 display->unreg (this);
198 } 252 }
199}; 253};
200#endif 254#endif
201 255
202struct xevent_watcher : watcher, callback1<void, XEvent &> { 256struct xevent_watcher : watcher, callback<void (XEvent &)> {
203 Window window; 257 Window window;
204 258
205 template<class O1, class O2> 259 template<class O, class M>
206 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 260 xevent_watcher (O object, M method)
207 : callback1<void, XEvent &> (object,method) 261 : callback<void (XEvent &)> (object, method)
208 { } 262 { }
209 263
210 void start (rxvt_display *display, Window window) 264 void start (rxvt_display *display, Window window)
211 { 265 {
212 this->window = window; 266 this->window = window;
… …
251 305
252 bool alloc (rxvt_screen *screen, const rgba &color); 306 bool alloc (rxvt_screen *screen, const rgba &color);
253 void free (rxvt_screen *screen); 307 void free (rxvt_screen *screen);
254 308
255 void get (rgba &color); 309 void get (rgba &color);
256 310 void get (XColor &color);
311
257 bool set (rxvt_screen *screen, const char *name); 312 bool set (rxvt_screen *screen, const char *name);
258 bool set (rxvt_screen *screen, const rgba &color); 313 bool set (rxvt_screen *screen, const rgba &color);
259 314
260 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));
261}; 316};

Diff Legend

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