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.12 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.30 by sasha, Fri Jun 8 20:04:12 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
… …
28 XA_VT_SELECTION, 47 XA_VT_SELECTION,
29 XA_INCR, 48 XA_INCR,
30 XA_WM_PROTOCOLS, 49 XA_WM_PROTOCOLS,
31 XA_WM_DELETE_WINDOW, 50 XA_WM_DELETE_WINDOW,
32 XA_CLIPBOARD, 51 XA_CLIPBOARD,
52 XA_AVERAGE_WIDTH,
53 XA_WEIGHT_NAME,
54 XA_SLANT,
55 XA_CHARSET_REGISTRY,
56 XA_CHARSET_ENCODING,
33#if ENABLE_FRILLS 57#if ENABLE_FRILLS
34 XA_MOTIF_WM_HINTS, 58 XA_MOTIF_WM_HINTS,
35#endif 59#endif
36#if ENABLE_EWMH 60#if ENABLE_EWMH
37 XA_NET_WM_PID, 61 XA_NET_WM_PID,
… …
49#endif 73#endif
50#if ENABLE_XEMBED 74#if ENABLE_XEMBED
51 XA_XEMBED, 75 XA_XEMBED,
52 XA_XEMBED_INFO, 76 XA_XEMBED_INFO,
53#endif 77#endif
78#if !ENABLE_MINIMAL
79 // these are usually allocated by other subsystens, but we do it
80 // here to avoid a server roundtrip.
81 XA_SCREEN_RESOURCES,
82 XA_XDCCC_LINEAR_RGB_CORRECTION,
83 XA_XDCCC_LINEAR_RGB_MATRICES,
84 XA_WM_COLORMAP_WINDOWS,
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
95#endif
54 NUM_XA 96 NUM_XA
55}; 97};
56 98
57struct rxvt_term; 99struct rxvt_term;
58struct rxvt_display; 100struct rxvt_display;
… …
82 } 124 }
83}; 125};
84 126
85///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
86 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
87#ifdef USE_XIM 156#ifdef USE_XIM
88struct rxvt_xim : refcounted { 157struct rxvt_xim : refcounted {
89 void destroy (); 158 void destroy ();
90 rxvt_display *display; 159 rxvt_display *display;
91 160
… …
98}; 167};
99#endif 168#endif
100 169
101struct rxvt_screen { 170struct rxvt_screen {
102 rxvt_display *display; 171 rxvt_display *display;
103 Display *xdisp; 172 Display *dpy;
104 int depth; 173 int depth;
105 Visual *visual; 174 Visual *visual;
106 Colormap cmap; 175 Colormap cmap;
107 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
108 void set (rxvt_display *disp); 187 void set (rxvt_display *disp);
109 void set (rxvt_display *disp, int depth); 188 void select_visual (int bitdepth);
110 void clear (); 189 void clear ();
111}; 190};
191
192#ifdef HAVE_AFTERIMAGE
193struct ASVisual;
194#endif
112 195
113struct rxvt_display : refcounted { 196struct rxvt_display : refcounted {
114 io_manager_vec<xevent_watcher> xw; 197 io_manager_vec<xevent_watcher> xw;
115 198
116 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);
… …
122 void im_change_cb (); 205 void im_change_cb ();
123 void im_change_check (); 206 void im_change_check ();
124#endif 207#endif
125 208
126//public 209//public
127 Display *display; 210 Display *dpy;
128 int screen; 211 int screen;
129 Window root; 212 Window root;
213#ifdef HAVE_AFTERIMAGE
214 struct ASVisual *asv;
215#endif
130 rxvt_term *selection_owner; 216 rxvt_term *selection_owner;
131 Atom xa[NUM_XA]; 217 Atom xa[NUM_XA];
132#ifndef NO_SLOW_LINK_SUPPORT
133 bool is_local; 218 bool is_local;
134#endif
135#ifdef POINTER_BLANK 219#ifdef POINTER_BLANK
136 Cursor blank_cursor; 220 Cursor blank_cursor;
137#endif 221#endif
138 222
139 rxvt_display (const char *id); 223 rxvt_display (const char *id);
140 XrmDatabase get_resources (); 224 XrmDatabase get_resources (bool refresh);
141 bool ref_init (); 225 bool ref_init ();
142 void ref_next (); 226 void ref_next ();
143 ~rxvt_display (); 227 ~rxvt_display ();
144 228
145 void flush (); 229 void flush ();
… …
157 void put_xim (rxvt_xim *xim); 241 void put_xim (rxvt_xim *xim);
158#endif 242#endif
159}; 243};
160 244
161#ifdef USE_XIM 245#ifdef USE_XIM
162struct im_watcher : watcher, callback0<void> { 246struct im_watcher : watcher, callback<void (void)> {
163 template<class O1, class O2> 247 template<class O, class M>
164 im_watcher (O1 *object, void (O2::*method) ()) 248 im_watcher (O object, M method)
165 : callback0<void> (object,method) 249 : callback<void (void)> (object, method)
166 { } 250 { }
167 251
168 void start (rxvt_display *display) 252 void start (rxvt_display *display)
169 { 253 {
170 display->reg (this); 254 display->reg (this);
… …
174 display->unreg (this); 258 display->unreg (this);
175 } 259 }
176}; 260};
177#endif 261#endif
178 262
179struct xevent_watcher : watcher, callback1<void, XEvent &> { 263struct xevent_watcher : watcher, callback<void (XEvent &)> {
180 Window window; 264 Window window;
181 265
182 template<class O1, class O2> 266 template<class O, class M>
183 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 267 xevent_watcher (O object, M method)
184 : callback1<void, XEvent &> (object,method) 268 : callback<void (XEvent &)> (object, method)
185 { } 269 { }
186 270
187 void start (rxvt_display *display, Window window) 271 void start (rxvt_display *display, Window window)
188 { 272 {
189 this->window = window; 273 this->window = window;
… …
199 283
200///////////////////////////////////////////////////////////////////////////// 284/////////////////////////////////////////////////////////////////////////////
201 285
202typedef unsigned long Pixel; 286typedef unsigned long Pixel;
203 287
288struct rgba {
289 unsigned short r, g, b, a;
290
291 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
292
293 rgba ()
294 { }
295
296 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
297 : r(r), g(g), b(b), a(a)
298 { }
299};
300
204struct rxvt_color { 301struct rxvt_color {
205#if XFT 302#if XFT
206 XftColor c; 303 XftColor c;
304#else
305 XColor c;
306#endif
307
207 operator Pixel () const { return c.pixel; } 308 operator Pixel () const { return c.pixel; }
208#else
209 Pixel p;
210 operator Pixel () const { return p; }
211#endif
212 309
213 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); }
214 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); }
215 312
216 void get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb); 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);
217 318
218 bool set (rxvt_screen *screen, Pixel p);
219 bool set (rxvt_screen *screen, const char *name); 319 bool set (rxvt_screen *screen, const char *name);
220 bool set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb); 320 bool set (rxvt_screen *screen, const rgba &color);
221 321
222 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));
223 rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
224
225 void free (rxvt_screen *screen);
226}; 323};
227 324
228#endif 325#endif
229 326

Diff Legend

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