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.10 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.28 by root, Wed May 31 00:35:56 2006 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
… …
14 33
15#include "rxvtlib.h" 34#include "rxvtlib.h"
16#include "rxvtutil.h" 35#include "rxvtutil.h"
17 36
18#include "callback.h" 37#include "callback.h"
38
39// see rxvttoolkit.C:xa_names, which must be kept in sync
40enum {
41 XA_TEXT,
42 XA_COMPOUND_TEXT,
43 XA_UTF8_STRING,
44 XA_MULTIPLE,
45 XA_TARGETS,
46 XA_TIMESTAMP,
47 XA_VT_SELECTION,
48 XA_INCR,
49 XA_WM_PROTOCOLS,
50 XA_WM_DELETE_WINDOW,
51 XA_CLIPBOARD,
52 XA_AVERAGE_WIDTH,
53 XA_WEIGHT_NAME,
54 XA_SLANT,
55 XA_CHARSET_REGISTRY,
56 XA_CHARSET_ENCODING,
57#if ENABLE_FRILLS
58 XA_MOTIF_WM_HINTS,
59#endif
60#if ENABLE_EWMH
61 XA_NET_WM_PID,
62 XA_NET_WM_NAME,
63 XA_NET_WM_ICON_NAME,
64 XA_NET_WM_PING,
65#endif
66#if USE_XIM
67 XA_WM_LOCALE_NAME,
68 XA_XIM_SERVERS,
69#endif
70#if TRANSPARENT
71 XA_XROOTPMAP_ID,
72 XA_ESETROOT_PMAP_ID,
73#endif
74#if ENABLE_XEMBED
75 XA_XEMBED,
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
95#endif
96 NUM_XA
97};
19 98
20struct rxvt_term; 99struct rxvt_term;
21struct rxvt_display; 100struct rxvt_display;
22 101
23struct im_watcher; 102struct im_watcher;
… …
45 } 124 }
46}; 125};
47 126
48///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
49 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
50#ifdef USE_XIM 156#ifdef USE_XIM
51struct rxvt_xim : refcounted { 157struct rxvt_xim : refcounted {
52 void destroy (); 158 void destroy ();
53 rxvt_display *display; 159 rxvt_display *display;
54 160
… …
59 bool ref_init (); 165 bool ref_init ();
60 ~rxvt_xim (); 166 ~rxvt_xim ();
61}; 167};
62#endif 168#endif
63 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 set (rxvt_display *disp, int bitdepth);
189 void clear ();
190};
191
64struct rxvt_display : refcounted { 192struct rxvt_display : refcounted {
65 Atom xa_xim_servers;
66
67 io_manager_vec<xevent_watcher> xw; 193 io_manager_vec<xevent_watcher> xw;
68 194
69 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);
70 196
71#ifdef USE_XIM 197#ifdef USE_XIM
… …
75 void im_change_cb (); 201 void im_change_cb ();
76 void im_change_check (); 202 void im_change_check ();
77#endif 203#endif
78 204
79//public 205//public
80 Display *display; 206 Display *dpy;
81 int depth;
82 int screen; 207 int screen;
83 Visual *visual;
84 Colormap cmap;
85 Window root; 208 Window root;
86 rxvt_term *selection_owner; 209 rxvt_term *selection_owner;
87#ifndef NO_SLOW_LINK_SUPPORT 210 Atom xa[NUM_XA];
88 bool is_local; 211 bool is_local;
89#endif
90#ifdef POINTER_BLANK 212#ifdef POINTER_BLANK
91 Cursor blank_cursor; 213 Cursor blank_cursor;
92#endif 214#endif
93 215
94 rxvt_display (const char *id); 216 rxvt_display (const char *id);
95 XrmDatabase get_resources (); 217 XrmDatabase get_resources (bool refresh);
96 bool ref_init (); 218 bool ref_init ();
97 void ref_next (); 219 void ref_next ();
98 ~rxvt_display (); 220 ~rxvt_display ();
99 221
100 void flush (); 222 void flush ();
… …
112 void put_xim (rxvt_xim *xim); 234 void put_xim (rxvt_xim *xim);
113#endif 235#endif
114}; 236};
115 237
116#ifdef USE_XIM 238#ifdef USE_XIM
117struct im_watcher : watcher, callback0<void> { 239struct im_watcher : watcher, callback<void (void)> {
118 template<class O1, class O2> 240 template<class O, class M>
119 im_watcher (O1 *object, void (O2::*method) ()) 241 im_watcher (O object, M method)
120 : callback0<void> (object,method) 242 : callback<void (void)> (object, method)
121 { } 243 { }
122 244
123 void start (rxvt_display *display) 245 void start (rxvt_display *display)
124 { 246 {
125 display->reg (this); 247 display->reg (this);
… …
129 display->unreg (this); 251 display->unreg (this);
130 } 252 }
131}; 253};
132#endif 254#endif
133 255
134struct xevent_watcher : watcher, callback1<void, XEvent &> { 256struct xevent_watcher : watcher, callback<void (XEvent &)> {
135 Window window; 257 Window window;
136 258
137 template<class O1, class O2> 259 template<class O, class M>
138 xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) 260 xevent_watcher (O object, M method)
139 : callback1<void, XEvent &> (object,method) 261 : callback<void (XEvent &)> (object, method)
140 { } 262 { }
141 263
142 void start (rxvt_display *display, Window window) 264 void start (rxvt_display *display, Window window)
143 { 265 {
144 this->window = window; 266 this->window = window;
… …
154 276
155///////////////////////////////////////////////////////////////////////////// 277/////////////////////////////////////////////////////////////////////////////
156 278
157typedef unsigned long Pixel; 279typedef unsigned long Pixel;
158 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
159struct rxvt_color { 294struct rxvt_color {
160#if XFT 295#if XFT
161 XftColor c; 296 XftColor c;
297#else
298 XColor c;
299#endif
300
162 operator Pixel () const { return c.pixel; } 301 operator Pixel () const { return c.pixel; }
163#else
164 Pixel p;
165 operator Pixel () const { return p; }
166#endif
167 302
168 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); }
169 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); }
170 305
171 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);
172 311
173 bool set (rxvt_display *display, Pixel p);
174 bool set (rxvt_display *display, const char *name); 312 bool set (rxvt_screen *screen, const char *name);
175 bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); 313 bool set (rxvt_screen *screen, const rgba &color);
176 314
177 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));
178 rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
179
180 void free (rxvt_display *display);
181}; 316};
182 317
183#endif 318#endif
184 319

Diff Legend

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