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.279 by ayin, Wed Dec 12 09:33:48 2007 UTC vs.
Revision 1.284 by root, Fri Dec 14 06:29:28 2007 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
185#endif 185#endif
186#ifndef NO_BELL 186#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 188#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
327} 326}
328 327
329void 328void
330rxvt_term::destroy () 329rxvt_term::destroy ()
331{ 330{
332 if (ev_is_active (&destroy_ev)) 331 if (destroy_ev.is_active ())
333 return; 332 return;
334 333
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 335
337#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
… …
352 incr_ev.stop (); 351 incr_ev.stop ();
353 termwin_ev.stop (display); 352 termwin_ev.stop (display);
354 vt_ev.stop (display); 353 vt_ev.stop (display);
355 } 354 }
356 355
357 prepare_ev.stop (); 356 flush_ev.stop ();
358 pty_ev.stop (); 357 pty_ev.stop ();
359#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
361#endif 360#endif
362#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
473 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
475} 474}
476 475
477/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
478bool 477void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{ 479{
481 this->envv = envv; 480 this->envv = envv;
482 481
483 SET_R (this); 482 SET_R (this);
… …
570 free (cmd_argv); 569 free (cmd_argv);
571 570
572 if (pty->pty >= 0) 571 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 572 pty_ev.start (pty->pty, ev::READ);
574 573
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 575
579#if ENABLE_XEMBED 576#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
581 { 578 {
… …
586 } 583 }
587#endif 584#endif
588 585
589 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
591
592 return true;
593} 588}
594 589
595static struct sig_handlers 590static struct sig_handlers
596{ 591{
597 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
… …
1777} 1772}
1778 1773
1779void 1774void
1780rxvt_term::update_background_cb (ev::timer &w, int revents) 1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1781{ 1776{
1777 make_current ();
1782 bgPixmap.render (); 1778 bgPixmap.render ();
1779 refresh_check ();
1783} 1780}
1784 1781
1785#endif /* HAVE_BG_PIXMAP */ 1782#endif /* HAVE_BG_PIXMAP */
1786 1783
1787/*----------------------- end-of-file (C source) -----------------------*/ 1784/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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