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.26 by root, Thu Jan 19 11:56:00 2006 UTC vs.
Revision 1.28 by root, Wed May 31 00:32:56 2006 UTC

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

Diff Legend

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