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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.270 by root, Tue Dec 4 16:24:00 2007 UTC

… …
152 152
153} 153}
154#endif 154#endif
155 155
156rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
157 : 157{
158#if HAVE_BG_PIXMAP 158#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 160#endif
161#ifdef CURSOR_BLINK 161#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
163#endif 163#endif
164#ifdef TEXT_BLINK 164#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
166#endif 166#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 169#endif
170#ifdef SELECTION_SCROLLING 170#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 171 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 172#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 184#endif
176#ifdef POINTER_BLANK 185#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 187#endif
179#ifndef NO_BELL 188#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 190#endif
182 child_ev (this, &rxvt_term::child_cb), 191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188{ 197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL 198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 199
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 201
203 termlist.push_back (this); 202 termlist.push_back (this);
204 203
… …
610 w.stop (); 609 w.stop ();
611 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
612 } 611 }
613 612
614 sig_handlers () 613 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term)
617 { 614 {
615 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
616 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
618 } 617 }
619} sig_handlers; 618} sig_handlers;
620 619
621char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
622 621

Diff Legend

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