| … | |
… | |
| 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; |
