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.14 by root, Mon Jan 30 02:21:21 2006 UTC vs.
Revision 1.31 by root, Tue Jun 26 00:40:19 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,
… …
62 XA_SCREEN_RESOURCES, 81 XA_SCREEN_RESOURCES,
63 XA_XDCCC_LINEAR_RGB_CORRECTION, 82 XA_XDCCC_LINEAR_RGB_CORRECTION,
64 XA_XDCCC_LINEAR_RGB_MATRICES, 83 XA_XDCCC_LINEAR_RGB_MATRICES,
65 XA_WM_COLORMAP_WINDOWS, 84 XA_WM_COLORMAP_WINDOWS,
66 XA_WM_STATE, 85 XA_WM_STATE,
86 XA_cursor,
87# if USE_XIM
88 // various selection targets used by XIM
89 XA_TRANSPORT,
90 XA_LOCALES,
91 XA__XIM_PROTOCOL,
92 XA__XIM_XCONNECT,
93 XA__XIM_MOREDATA,
94# endif
67#endif 95#endif
68 NUM_XA 96 NUM_XA
69}; 97};
70 98
71struct rxvt_term; 99struct rxvt_term;
… …
96 } 124 }
97}; 125};
98 126
99///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
100 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
101#ifdef USE_XIM 156#ifdef USE_XIM
102struct rxvt_xim : refcounted { 157struct rxvt_xim : refcounted {
103 void destroy (); 158 void destroy ();
104 rxvt_display *display; 159 rxvt_display *display;
105 160
… …
112}; 167};
113#endif 168#endif
114 169
115struct rxvt_screen { 170struct rxvt_screen {
116 rxvt_display *display; 171 rxvt_display *display;
117 Display *xdisp; 172 Display *dpy;
118 int depth; 173 int depth;
119 Visual *visual; 174 Visual *visual;
120 Colormap cmap; 175 Colormap cmap;
121 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
122 void set (rxvt_display *disp); 187 void set (rxvt_display *disp);
123 void set (rxvt_display *disp, int bitdepth); 188 void select_visual (int bitdepth);
124 void clear (); 189 void clear ();
125}; 190};
191
192#ifdef HAVE_AFTERIMAGE
193struct ASVisual;
194#endif
126 195
127struct rxvt_display : refcounted { 196struct rxvt_display : refcounted {
128 io_manager_vec<xevent_watcher> xw; 197 io_manager_vec<xevent_watcher> xw;
129 198
130 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 199 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
… …
136 void im_change_cb (); 205 void im_change_cb ();
137 void im_change_check (); 206 void im_change_check ();
138#endif 207#endif
139 208
140//public 209//public
141 Display *display; 210 Display *dpy;
142 int screen; 211 int screen;
143 Window root; 212 Window root;
213#ifdef HAVE_AFTERIMAGE
214 struct ASVisual *asv;
215#endif
144 rxvt_term *selection_owner; 216 rxvt_term *selection_owner;
145 Atom xa[NUM_XA]; 217 Atom xa[NUM_XA];
146#ifndef NO_SLOW_LINK_SUPPORT
147 bool is_local; 218 bool is_local;
148#endif
149#ifdef POINTER_BLANK 219#ifdef POINTER_BLANK
150 Cursor blank_cursor; 220 Cursor blank_cursor;
151#endif 221#endif
152 222
153 rxvt_display (const char *id); 223 rxvt_display (const char *id);
154 XrmDatabase get_resources (); 224 XrmDatabase get_resources (bool refresh);
155 bool ref_init (); 225 bool ref_init ();
156 void ref_next (); 226 void ref_next ();
157 ~rxvt_display (); 227 ~rxvt_display ();
158 228
159 void flush (); 229 void flush ();
… …
171 void put_xim (rxvt_xim *xim); 241 void put_xim (rxvt_xim *xim);
172#endif 242#endif
173}; 243};
174 244
175#ifdef USE_XIM 245#ifdef USE_XIM
176struct im_watcher : watcher, callback0<void> { 246struct im_watcher : watcher, callback<void (void)> {
177 template<class O1, class O2> 247 template<class O, class M>
178 im_watcher (O1 *object, void (O2::*method) ()) 248 im_watcher (O object, M method)
179 : callback0<void> (object,method) 249 : callback<void (void)> (object, method)
180 { } 250 { }
181 251
182 void start (rxvt_display *display) 252 void start (rxvt_display *display)
183 { 253 {
184 display->reg (this); 254 display->reg (this);
… …
188 display->unreg (this); 258 display->unreg (this);
189 } 259 }
190}; 260};
191#endif 261#endif
192 262
193struct xevent_watcher : watcher, callback1<void, XEvent &> { 263struct xevent_watcher : watcher, callback<void (XEvent &)> {
194 Window window; 264 Window window;
195 265
196 template<class O1, class O2> 266 template<class O, class M>
197 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 267 xevent_watcher (O object, M method)
198 : callback1<void, XEvent &> (object,method) 268 : callback<void (XEvent &)> (object, method)
199 { } 269 { }
200 270
201 void start (rxvt_display *display, Window window) 271 void start (rxvt_display *display, Window window)
202 { 272 {
203 this->window = window; 273 this->window = window;
… …
213 283
214///////////////////////////////////////////////////////////////////////////// 284/////////////////////////////////////////////////////////////////////////////
215 285
216typedef unsigned long Pixel; 286typedef unsigned long Pixel;
217 287
218struct rxvt_rgba { 288struct rgba {
219 unsigned short r, g, b, a; 289 unsigned short r, g, b, a;
220 290
221 enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; 291 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
222 292
223 rxvt_rgba () 293 rgba ()
224 { } 294 { }
225 295
226 rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC) 296 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
227 : r(r), g(g), b(b), a(a) 297 : r(r), g(g), b(b), a(a)
228 { } 298 { }
229}; 299};
230 300
231struct rxvt_color { 301struct rxvt_color {
232#if XFT 302#if XFT
233 XftColor c; 303 XftColor c;
304#else
305 XColor c;
306#endif
307
234 operator Pixel () const { return c.pixel; } 308 operator Pixel () const { return c.pixel; }
235#else
236 Pixel p;
237 operator Pixel () const { return p; }
238#endif
239 309
240 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 310 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
241 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 311 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
242 312
243 void get (rxvt_screen *screen, rxvt_rgba &rgba); 313 bool alloc (rxvt_screen *screen, const rgba &color);
314 void free (rxvt_screen *screen);
315
316 void get (rgba &color);
317 void get (XColor &color);
244 318
245 bool set (rxvt_screen *screen, const char *name); 319 bool set (rxvt_screen *screen, const char *name);
246 bool set (rxvt_screen *screen, rxvt_rgba rgba); 320 bool set (rxvt_screen *screen, const rgba &color);
247 321
248 rxvt_color fade (rxvt_screen *screen, int percent); // fades to black 322 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
249 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
250
251 void free (rxvt_screen *screen);
252}; 323};
253 324
254#endif 325#endif
255 326

Diff Legend

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