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.11 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.32 by sasha, Thu Jul 12 22:33:16 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,
… …
41#endif 65#endif
42#if USE_XIM 66#if USE_XIM
43 XA_WM_LOCALE_NAME, 67 XA_WM_LOCALE_NAME,
44 XA_XIM_SERVERS, 68 XA_XIM_SERVERS,
45#endif 69#endif
46#if TRANSPARENT 70#if ENABLE_TRANSPARENCY
47 XA_XROOTPMAP_ID, 71 XA_XROOTPMAP_ID,
48 XA_ESETROOT_PMAP_ID, 72 XA_ESETROOT_PMAP_ID,
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,
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
53#endif 95#endif
54 NUM_XA 96 NUM_XA
55}; 97};
56 98
57struct rxvt_term; 99struct rxvt_term;
… …
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
… …
96 bool ref_init (); 165 bool ref_init ();
97 ~rxvt_xim (); 166 ~rxvt_xim ();
98}; 167};
99#endif 168#endif
100 169
170struct rxvt_screen {
171 rxvt_display *display;
172 Display *dpy;
173 int depth;
174 Visual *visual;
175 Colormap cmap;
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
187 void set (rxvt_display *disp);
188 void select_visual (int bitdepth);
189 void clear ();
190};
191
101struct rxvt_display : refcounted { 192struct rxvt_display : refcounted {
102 io_manager_vec<xevent_watcher> xw; 193 io_manager_vec<xevent_watcher> xw;
103 194
104 io_watcher x_ev; void x_cb (io_watcher &w, short revents); 195 io_watcher x_ev; void x_cb (io_watcher &w, short revents);
105 196
… …
110 void im_change_cb (); 201 void im_change_cb ();
111 void im_change_check (); 202 void im_change_check ();
112#endif 203#endif
113 204
114//public 205//public
115 Display *display; 206 Display *dpy;
116 int depth;
117 int screen; 207 int screen;
118 Visual *visual;
119 Colormap cmap;
120 Window root; 208 Window root;
121 rxvt_term *selection_owner; 209 rxvt_term *selection_owner;
122 Atom xa[NUM_XA]; 210 Atom xa[NUM_XA];
123#ifndef NO_SLOW_LINK_SUPPORT
124 bool is_local; 211 bool is_local;
125#endif
126#ifdef POINTER_BLANK 212#ifdef POINTER_BLANK
127 Cursor blank_cursor; 213 Cursor blank_cursor;
128#endif 214#endif
129 215
130 rxvt_display (const char *id); 216 rxvt_display (const char *id);
131 XrmDatabase get_resources (); 217 XrmDatabase get_resources (bool refresh);
132 bool ref_init (); 218 bool ref_init ();
133 void ref_next (); 219 void ref_next ();
134 ~rxvt_display (); 220 ~rxvt_display ();
135 221
136 void flush (); 222 void flush ();
… …
148 void put_xim (rxvt_xim *xim); 234 void put_xim (rxvt_xim *xim);
149#endif 235#endif
150}; 236};
151 237
152#ifdef USE_XIM 238#ifdef USE_XIM
153struct im_watcher : watcher, callback0<void> { 239struct im_watcher : watcher, callback<void (void)> {
154 template<class O1, class O2> 240 template<class O, class M>
155 im_watcher (O1 *object, void (O2::*method) ()) 241 im_watcher (O object, M method)
156 : callback0<void> (object,method) 242 : callback<void (void)> (object, method)
157 { } 243 { }
158 244
159 void start (rxvt_display *display) 245 void start (rxvt_display *display)
160 { 246 {
161 display->reg (this); 247 display->reg (this);
… …
165 display->unreg (this); 251 display->unreg (this);
166 } 252 }
167}; 253};
168#endif 254#endif
169 255
170struct xevent_watcher : watcher, callback1<void, XEvent &> { 256struct xevent_watcher : watcher, callback<void (XEvent &)> {
171 Window window; 257 Window window;
172 258
173 template<class O1, class O2> 259 template<class O, class M>
174 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 260 xevent_watcher (O object, M method)
175 : callback1<void, XEvent &> (object,method) 261 : callback<void (XEvent &)> (object, method)
176 { } 262 { }
177 263
178 void start (rxvt_display *display, Window window) 264 void start (rxvt_display *display, Window window)
179 { 265 {
180 this->window = window; 266 this->window = window;
… …
190 276
191///////////////////////////////////////////////////////////////////////////// 277/////////////////////////////////////////////////////////////////////////////
192 278
193typedef unsigned long Pixel; 279typedef unsigned long Pixel;
194 280
281struct rgba {
282 unsigned short r, g, b, a;
283
284 enum { MIN_CC = 0x0000, MAX_CC = 0xffff };
285
286 rgba ()
287 { }
288
289 rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
290 : r(r), g(g), b(b), a(a)
291 { }
292};
293
195struct rxvt_color { 294struct rxvt_color {
196#if XFT 295#if XFT
197 XftColor c; 296 XftColor c;
297#else
298 XColor c;
299#endif
300
198 operator Pixel () const { return c.pixel; } 301 operator Pixel () const { return c.pixel; }
199#else
200 Pixel p;
201 operator Pixel () const { return p; }
202#endif
203 302
204 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } 303 bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
205 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 304 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
206 305
207 void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); 306 bool alloc (rxvt_screen *screen, const rgba &color);
307 void free (rxvt_screen *screen);
308
309 void get (rgba &color);
310 void get (XColor &color);
208 311
209 bool set (rxvt_display *display, Pixel p);
210 bool set (rxvt_display *display, const char *name); 312 bool set (rxvt_screen *screen, const char *name);
211 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 313 bool set (rxvt_screen *screen, const rgba &color);
212 314
213 rxvt_color fade (rxvt_display *, int percent); // fades to black 315 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
214 rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
215
216 void free (rxvt_display *display);
217}; 316};
218 317
219#endif 318#endif
220 319

Diff Legend

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