| 1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
| 2 | * File: rxvttoolkit.h - provide toolkit-functionality for rxvt. |
2 | * File: rxvttoolkit.h - provide toolkit-functionality for rxvt. |
| 3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
| 4 | * |
4 | * |
| 5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
| 6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
| … | |
… | |
| 65 | #endif |
65 | #endif |
| 66 | #if USE_XIM |
66 | #if USE_XIM |
| 67 | XA_WM_LOCALE_NAME, |
67 | XA_WM_LOCALE_NAME, |
| 68 | XA_XIM_SERVERS, |
68 | XA_XIM_SERVERS, |
| 69 | #endif |
69 | #endif |
| 70 | #if TRANSPARENT |
70 | #if ENABLE_TRANSPARENCY |
| 71 | XA_XROOTPMAP_ID, |
71 | XA_XROOTPMAP_ID, |
| 72 | XA_ESETROOT_PMAP_ID, |
72 | XA_ESETROOT_PMAP_ID, |
| 73 | #endif |
73 | #endif |
| 74 | #if ENABLE_XEMBED |
74 | #if ENABLE_XEMBED |
| 75 | XA_XEMBED, |
75 | XA_XEMBED, |
| … | |
… | |
| 183 | |
183 | |
| 184 | rxvt_screen (); |
184 | rxvt_screen (); |
| 185 | #endif |
185 | #endif |
| 186 | |
186 | |
| 187 | void set (rxvt_display *disp); |
187 | void set (rxvt_display *disp); |
| 188 | void set (rxvt_display *disp, int bitdepth); |
188 | void select_visual (int bitdepth); |
| 189 | void clear (); |
189 | void clear (); |
| 190 | }; |
190 | }; |
| 191 | |
191 | |
| 192 | struct rxvt_display : refcounted { |
192 | struct rxvt_display : refcounted { |
| 193 | io_manager_vec<xevent_watcher> xw; |
193 | io_manager_vec<xevent_watcher> xw; |
| … | |
… | |
| 234 | void put_xim (rxvt_xim *xim); |
234 | void put_xim (rxvt_xim *xim); |
| 235 | #endif |
235 | #endif |
| 236 | }; |
236 | }; |
| 237 | |
237 | |
| 238 | #ifdef USE_XIM |
238 | #ifdef USE_XIM |
| 239 | struct im_watcher : watcher, callback0<void> { |
239 | struct im_watcher : watcher, callback<void (void)> { |
| 240 | template<class O1, class O2> |
240 | template<class O, class M> |
| 241 | im_watcher (O1 *object, void (O2::*method) ()) |
241 | im_watcher (O object, M method) |
| 242 | : callback0<void> (object,method) |
242 | : callback<void (void)> (object, method) |
| 243 | { } |
243 | { } |
| 244 | |
244 | |
| 245 | void start (rxvt_display *display) |
245 | void start (rxvt_display *display) |
| 246 | { |
246 | { |
| 247 | display->reg (this); |
247 | display->reg (this); |
| … | |
… | |
| 251 | display->unreg (this); |
251 | display->unreg (this); |
| 252 | } |
252 | } |
| 253 | }; |
253 | }; |
| 254 | #endif |
254 | #endif |
| 255 | |
255 | |
| 256 | struct xevent_watcher : watcher, callback1<void, XEvent &> { |
256 | struct xevent_watcher : watcher, callback<void (XEvent &)> { |
| 257 | Window window; |
257 | Window window; |
| 258 | |
258 | |
| 259 | template<class O1, class O2> |
259 | template<class O, class M> |
| 260 | xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) |
260 | xevent_watcher (O object, M method) |
| 261 | : callback1<void, XEvent &> (object,method) |
261 | : callback<void (XEvent &)> (object, method) |
| 262 | { } |
262 | { } |
| 263 | |
263 | |
| 264 | void start (rxvt_display *display, Window window) |
264 | void start (rxvt_display *display, Window window) |
| 265 | { |
265 | { |
| 266 | this->window = window; |
266 | this->window = window; |
