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.59 by sf-exg, Sun Jun 3 15:50:22 2012 UTC vs.
Revision 1.64 by root, Thu Jun 7 16:04:31 2012 UTC

… …
178#endif 178#endif
179}; 179};
180 180
181///////////////////////////////////////////////////////////////////////////// 181/////////////////////////////////////////////////////////////////////////////
182 182
183#ifdef USE_XIM 183#if USE_XIM
184struct rxvt_xim : refcounted 184struct rxvt_xim : refcounted
185{ 185{
186 void destroy (); 186 void destroy ();
187 rxvt_display *display; 187 rxvt_display *display;
188 188
… …
212 212
213 rxvt_screen (); 213 rxvt_screen ();
214#endif 214#endif
215 215
216 void set (rxvt_display *disp); 216 void set (rxvt_display *disp);
217 void select_visual (int bitdepth); 217 void select_visual (int id);
218 void select_depth (int bitdepth); // select visual by depth
218 void clear (); 219 void clear ();
219}; 220};
220 221
221enum { 222enum {
222 DISPLAY_HAS_RENDER = 1 << 0, 223 DISPLAY_HAS_RENDER = 1 << 0,
224 DISPLAY_HAS_RENDER_10 = 1 << 1,
223 DISPLAY_HAS_RENDER_MUL = 1 << 1, 225 DISPLAY_HAS_RENDER_MUL = 1 << 2,
224 DISPLAY_HAS_RENDER_CONV = 1 << 2, 226 DISPLAY_HAS_RENDER_CONV = 1 << 3,
225}; 227};
226 228
227struct rxvt_display : refcounted 229struct rxvt_display : refcounted
228{ 230{
229 event_vec<xevent_watcher> xw; 231 event_vec<xevent_watcher> xw;
230 232
231 ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents); 233 ev::prepare flush_ev; void flush_cb (ev::prepare &w, int revents);
232 ev::io x_ev ; void x_cb (ev::io &w, int revents); 234 ev::io x_ev ; void x_cb (ev::io &w, int revents);
233 235
234#ifdef USE_XIM 236#if USE_XIM
235 refcache<rxvt_xim> xims; 237 refcache<rxvt_xim> xims;
236 vector<im_watcher *> imw; 238 vector<im_watcher *> imw;
237 239
238 void im_change_cb (); 240 void im_change_cb ();
239 void im_change_check (); 241 void im_change_check ();
… …
262 { 264 {
263 flush_ev.start (); 265 flush_ev.start ();
264 } 266 }
265 267
266 Atom atom (const char *name); 268 Atom atom (const char *name);
269 Pixmap get_pixmap_property (Atom property);
267 void set_selection_owner (rxvt_term *owner, bool clipboard); 270 void set_selection_owner (rxvt_term *owner, bool clipboard);
268 271
269 void reg (xevent_watcher *w); 272 void reg (xevent_watcher *w);
270 void unreg (xevent_watcher *w); 273 void unreg (xevent_watcher *w);
271 274
272#ifdef USE_XIM 275#if USE_XIM
273 void reg (im_watcher *w); 276 void reg (im_watcher *w);
274 void unreg (im_watcher *w); 277 void unreg (im_watcher *w);
275 278
276 rxvt_xim *get_xim (const char *locale, const char *modifiers); 279 rxvt_xim *get_xim (const char *locale, const char *modifiers);
277 void put_xim (rxvt_xim *xim); 280 void put_xim (rxvt_xim *xim);
278#endif 281#endif
279}; 282};
280 283
281#ifdef USE_XIM 284#if USE_XIM
282struct im_watcher : rxvt_watcher, callback<void (void)> 285struct im_watcher : rxvt_watcher, callback<void (void)>
283{ 286{
284 void start (rxvt_display *display) 287 void start (rxvt_display *display)
285 { 288 {
286 display->reg (this); 289 display->reg (this);
… …
352 } 355 }
353 356
354 bool alloc (rxvt_screen *screen, const rgba &color); 357 bool alloc (rxvt_screen *screen, const rgba &color);
355 void free (rxvt_screen *screen); 358 void free (rxvt_screen *screen);
356 359
357 void get (rgba &color); 360 void get (rgba &color) const;
358 void get (XColor &color); 361 void get (XColor &color) const;
359 362
360 bool set (rxvt_screen *screen, const char *name); 363 bool set (rxvt_screen *screen, const char *name);
361 bool set (rxvt_screen *screen, const rgba &color); 364 bool set (rxvt_screen *screen, const rgba &color);
362 365
363 void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); 366 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