ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/iom.h
(Generate patch)

Comparing rxvt-unicode/src/iom.h (file contents):
Revision 1.27 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.28 by root, Wed May 31 00:32:56 2006 UTC

… …
123}; 123};
124 124
125#if IOM_IO 125#if IOM_IO
126enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 }; 126enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
127 127
128struct io_watcher : watcher, callback2<void, io_watcher &, short> { 128struct io_watcher : watcher, callback<void (io_watcher &, short)> {
129 int fd; 129 int fd;
130 short events; 130 short events;
131 131
132 void set (int fd_, short events_) { fd = fd_; events = events_; } 132 void set (int fd_, short events_) { fd = fd_; events = events_; }
133 133
… …
136 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 136 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
137 void stop () { io_manager::unreg (*this); } 137 void stop () { io_manager::unreg (*this); }
138 138
139 template<class O1, class O2> 139 template<class O1, class O2>
140 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 140 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
141 : callback2<void, io_watcher &, short> (object, method) 141 : callback<void (io_watcher &, short)> (object, method)
142 { } 142 { }
143 ~io_watcher () { stop (); } 143 ~io_watcher () { stop (); }
144}; 144};
145#endif 145#endif
146 146
147#if IOM_TIME 147#if IOM_TIME
148struct time_watcher : watcher, callback1<void, time_watcher &> { 148struct time_watcher : watcher, callback<void (time_watcher &)> {
149 tstamp at; 149 tstamp at;
150 150
151 void trigger (); 151 void trigger ();
152 152
153 void set (tstamp when) { at = when; } 153 void set (tstamp when) { at = when; }
… …
156 void start (tstamp when) { set (when); io_manager::reg (*this); } 156 void start (tstamp when) { set (when); io_manager::reg (*this); }
157 void stop () { io_manager::unreg (*this); } 157 void stop () { io_manager::unreg (*this); }
158 158
159 template<class O1, class O2> 159 template<class O1, class O2>
160 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 160 time_watcher (O1 *object, void (O2::*method) (time_watcher &))
161 : callback1<void, time_watcher &> (object, method), at (0) 161 : callback<void (time_watcher &)> (object, method), at (0)
162 { } 162 { }
163 ~time_watcher () { stop (); } 163 ~time_watcher () { stop (); }
164}; 164};
165#endif 165#endif
166 166
167#if IOM_CHECK 167#if IOM_CHECK
168// run before checking for new events 168// run before checking for new events
169struct check_watcher : watcher, callback1<void, check_watcher &> { 169struct check_watcher : watcher, callback<void (check_watcher &)> {
170 void start () { io_manager::reg (*this); } 170 void start () { io_manager::reg (*this); }
171 void stop () { io_manager::unreg (*this); } 171 void stop () { io_manager::unreg (*this); }
172 172
173 template<class O1, class O2> 173 template<class O1, class O2>
174 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 174 check_watcher (O1 *object, void (O2::*method) (check_watcher &))
175 : callback1<void, check_watcher &> (object, method) 175 : callback<void (check_watcher &)> (object, method)
176 { } 176 { }
177 ~check_watcher () { stop (); } 177 ~check_watcher () { stop (); }
178}; 178};
179#endif 179#endif
180 180
181#if IOM_IDLE 181#if IOM_IDLE
182// run after checking for any i/o, but before waiting 182// run after checking for any i/o, but before waiting
183struct idle_watcher : watcher, callback1<void, idle_watcher &> { 183struct idle_watcher : watcher, callback<void (idle_watcher &)> {
184 void start () { io_manager::reg (*this); } 184 void start () { io_manager::reg (*this); }
185 void stop () { io_manager::unreg (*this); } 185 void stop () { io_manager::unreg (*this); }
186 186
187 template<class O1, class O2> 187 template<class O1, class O2>
188 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 188 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
189 : callback1<void, idle_watcher &> (object, method) 189 : callback<void (idle_watcher &)> (object, method)
190 { } 190 { }
191 ~idle_watcher () { stop (); } 191 ~idle_watcher () { stop (); }
192}; 192};
193#endif 193#endif
194 194
195#if IOM_SIG 195#if IOM_SIG
196struct sig_watcher : watcher, callback1<void, sig_watcher &> { 196struct sig_watcher : watcher, callback<void (sig_watcher &)> {
197 int signum; 197 int signum;
198 198
199 void start (int signum); 199 void start (int signum);
200 void stop () { io_manager::unreg (*this); } 200 void stop () { io_manager::unreg (*this); }
201 201
202 template<class O1, class O2> 202 template<class O1, class O2>
203 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 203 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
204 : callback1<void, sig_watcher &> (object, method), signum (0) 204 : callback<void(sig_watcher &)> (object, method), signum (0)
205 { } 205 { }
206 ~sig_watcher () { stop (); } 206 ~sig_watcher () { stop (); }
207}; 207};
208#endif 208#endif
209 209
210#if IOM_CHILD 210#if IOM_CHILD
211struct child_watcher : watcher, callback2<void, child_watcher &, int> { 211struct child_watcher : watcher, callback<void (child_watcher &, int)> {
212 int /*pid_t*/ pid; 212 int /*pid_t*/ pid;
213 213
214 void start (int pid) { this->pid = pid; io_manager::reg (*this); } 214 void start (int pid) { this->pid = pid; io_manager::reg (*this); }
215 void stop () { io_manager::unreg (*this); } 215 void stop () { io_manager::unreg (*this); }
216 216
217 template<class O1, class O2> 217 template<class O1, class O2>
218 child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status)) 218 child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status))
219 : callback2<void, child_watcher &, int> (object, method), pid (0) 219 : callback<void (child_watcher &, int)> (object, method), pid (0)
220 { } 220 { }
221 ~child_watcher () { stop (); } 221 ~child_watcher () { stop (); }
222}; 222};
223#endif 223#endif
224 224

Diff Legend

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