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.77 by root, Tue Aug 10 20:39:19 2004 UTC vs.
Revision 1.80 by root, Fri Aug 13 19:31:23 2004 UTC

… …
140 free (p); 140 free (p);
141} 141}
142 142
143rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
144 : 144 :
145#if TRANSPARENT
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
146 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
176 flush_ev (this, &rxvt_term::flush_cb), 178 flush_ev (this, &rxvt_term::flush_cb),
177 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
178 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
179 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
… …
282 if (destroy_ev.active) 284 if (destroy_ev.active)
283 return; 285 return;
284 286
285 if (display) 287 if (display)
286 { 288 {
287#ifdef USE_XIM 289#if USE_XIM
288 im_ev.stop (display); 290 im_ev.stop (display);
289#endif 291#endif
290#ifdef HAVE_SCROLLBARS 292#if HAVE_SCROLLBARS
291 scrollbar_ev.stop (display); 293 scrollbar_ev.stop (display);
292#endif 294#endif
293#ifdef MENUBAR 295#if MENUBAR
294 menubar_ev.stop (display); 296 menubar_ev.stop (display);
295#endif 297#endif
298#if TRANSPARENT
296 rootwin_ev.stop (display); 299 rootwin_ev.stop (display);
300#endif
301 incr_ev.stop ();
297 termwin_ev.stop (display); 302 termwin_ev.stop (display);
298 vt_ev.stop (display); 303 vt_ev.stop (display);
299 } 304 }
300 305
301 check_ev.stop (); 306 check_ev.stop ();
… …
382#ifdef TRANSPARENT 387#ifdef TRANSPARENT
383 if (Options & Opt_transparent) 388 if (Options & Opt_transparent)
384 { 389 {
385 XSelectInput (display->display, display->root, PropertyChangeMask); 390 XSelectInput (display->display, display->root, PropertyChangeMask);
386 check_our_parents (); 391 check_our_parents ();
387 }
388#endif
389
390 rootwin_ev.start (display, display->root); 392 rootwin_ev.start (display, display->root);
393 }
394#endif
391 395
392 XMapWindow (display->display, TermWin.vt); 396 XMapWindow (display->display, TermWin.vt);
393 XMapWindow (display->display, TermWin.parent[0]); 397 XMapWindow (display->display, TermWin.parent[0]);
394 398
395 init_command (cmd_argv); 399 init_command (cmd_argv);
… …
1236 if (width == 0) 1240 if (width == 0)
1237 width = wattr.width - szHint.base_width; 1241 width = wattr.width - szHint.base_width;
1238 if (height == 0) 1242 if (height == 0)
1239 height = wattr.height - szHint.base_height; 1243 height = wattr.height - szHint.base_height;
1240 } 1244 }
1245
1241 if (width != TermWin.width || height != TermWin.height) 1246 if (width != TermWin.width || height != TermWin.height)
1242 { 1247 {
1243 width += szHint.base_width; 1248 width += szHint.base_width;
1244 height += szHint.base_height; 1249 height += szHint.base_height;
1245 resize_all_windows (width, height, 0); 1250 resize_all_windows (width, height, 0);

Diff Legend

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