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.19 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.25 by root, Sat Feb 18 15:48:23 2006 UTC

… …
105 } 105 }
106}; 106};
107 107
108///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
109 109
110struct rxvt_screen;
111
112struct rxvt_drawable {
113 rxvt_screen *screen;
114 Drawable drawable;
115 operator Drawable() { return drawable; }
116
117#if XFT
118 XftDraw *xftdrawable;
119 operator XftDraw *();
120#endif
121
122 rxvt_drawable (rxvt_screen *screen, Drawable drawable)
123 : screen(screen),
124#if XFT
125 xftdrawable(0),
126#endif
127 drawable(drawable)
128 { }
129
130#if XFT
131 ~rxvt_drawable ();
132#endif
133};
134
135/////////////////////////////////////////////////////////////////////////////
136
110#ifdef USE_XIM 137#ifdef USE_XIM
111struct rxvt_xim : refcounted { 138struct rxvt_xim : refcounted {
112 void destroy (); 139 void destroy ();
113 rxvt_display *display; 140 rxvt_display *display;
114 141
… …
121}; 148};
122#endif 149#endif
123 150
124struct rxvt_screen { 151struct rxvt_screen {
125 rxvt_display *display; 152 rxvt_display *display;
126 Display *xdisp; 153 Display *dpy;
127 int depth; 154 int depth;
128 Visual *visual; 155 Visual *visual;
129 Colormap cmap; 156 Colormap cmap;
130 157
158#if XFT
159 // scratch pixmap
160 rxvt_drawable *scratch_area;
161 int scratch_w, scratch_h;
162
163 rxvt_drawable &scratch_drawable (int w, int h);
164
165 rxvt_screen ();
166#endif
167
131 void set (rxvt_display *disp); 168 void set (rxvt_display *disp);
132 void set (rxvt_display *disp, int bitdepth); 169 void set (rxvt_display *disp, int bitdepth);
133 void clear (); 170 void clear ();
134}; 171};
135 172
… …
145 void im_change_cb (); 182 void im_change_cb ();
146 void im_change_check (); 183 void im_change_check ();
147#endif 184#endif
148 185
149//public 186//public
150 Display *display; 187 Display *dpy;
151 int screen; 188 int screen;
152 Window root; 189 Window root;
153 rxvt_term *selection_owner; 190 rxvt_term *selection_owner;
154 Atom xa[NUM_XA]; 191 Atom xa[NUM_XA];
155#ifndef NO_SLOW_LINK_SUPPORT
156 bool is_local; 192 bool is_local;
157#endif
158#ifdef POINTER_BLANK 193#ifdef POINTER_BLANK
159 Cursor blank_cursor; 194 Cursor blank_cursor;
160#endif 195#endif
161 196
162 rxvt_display (const char *id); 197 rxvt_display (const char *id);
163 XrmDatabase get_resources (); 198 XrmDatabase get_resources (bool refresh);
164 bool ref_init (); 199 bool ref_init ();
165 void ref_next (); 200 void ref_next ();
166 ~rxvt_display (); 201 ~rxvt_display ();
167 202
168 void flush (); 203 void flush ();
… …
250 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } 285 bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
251 286
252 bool alloc (rxvt_screen *screen, const rgba &color); 287 bool alloc (rxvt_screen *screen, const rgba &color);
253 void free (rxvt_screen *screen); 288 void free (rxvt_screen *screen);
254 289
255 void get (rxvt_screen *screen, rgba &color); 290 void get (rgba &color);
291 void get (XColor &color);
256 292
257 bool set (rxvt_screen *screen, const char *name); 293 bool set (rxvt_screen *screen, const char *name);
258 bool set (rxvt_screen *screen, const rgba &color); 294 bool set (rxvt_screen *screen, const rgba &color);
259 295
260 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); 296 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));

Diff Legend

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