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.277 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43# include <termios.h> 43#include <termios.h>
44 44
45#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 46# define X_LOCALE
47# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
48#else 48#else
… …
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);
… …
285#endif 284#endif
286 285
287#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy (); 287 bgPixmap.destroy ();
289#endif 288#endif
289 display->flush (); /* ideally .put should do this */
290 displays.put (display); 290 displays.put (display);
291 291
292 scr_release (); 292 scr_release ();
293 293
294 /* clear all resources */ 294 /* clear all resources */
… …
327} 327}
328 328
329void 329void
330rxvt_term::destroy () 330rxvt_term::destroy ()
331{ 331{
332 if (ev_is_active (&destroy_ev)) 332 if (destroy_ev.is_active ())
333 return; 333 return;
334 334
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 336
337#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
352 incr_ev.stop (); 352 incr_ev.stop ();
353 termwin_ev.stop (display); 353 termwin_ev.stop (display);
354 vt_ev.stop (display); 354 vt_ev.stop (display);
355 } 355 }
356 356
357 prepare_ev.stop (); 357 flush_ev.stop ();
358 pty_ev.stop (); 358 pty_ev.stop ();
359#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
361#endif 361#endif
362#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
473 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
475} 475}
476 476
477/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
478bool 478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{ 480{
481 this->envv = envv; 481 this->envv = envv;
482 482
483 SET_R (this); 483 SET_R (this);
484 set_locale (""); 484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
486 486
487 if (!init_vars ()) 487 init_vars ();
488 return false;
489 488
490 init_secondary (); 489 init_secondary ();
491 490
492 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
493 492
… …
571 free (cmd_argv); 570 free (cmd_argv);
572 571
573 if (pty->pty >= 0) 572 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
575 574
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 576
580#if ENABLE_XEMBED 577#if ENABLE_XEMBED
581 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
582 { 579 {
… …
587 } 584 }
588#endif 585#endif
589 586
590 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
592
593 return true;
594} 589}
595 590
596static struct sig_handlers 591static struct sig_handlers
597{ 592{
598 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
1764 bgPixmap.render (); 1759 bgPixmap.render ();
1765 else 1760 else
1766 { 1761 {
1767 update_background_ev.stop (); 1762 update_background_ev.stop ();
1768 1763
1769 if (!bgPixmap.need_client_side_rendering()) 1764 if (!bgPixmap.need_client_side_rendering ())
1770 update_background_ev.start (.05); 1765 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */ 1767 update_background_ev.start (.20); /* very slow !!! */
1773 else 1768 else
1774 update_background_ev.start (.07); 1769 update_background_ev.start (.07);
… …
1778} 1773}
1779 1774
1780void 1775void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1777{
1778 make_current ();
1783 bgPixmap.render (); 1779 bgPixmap.render ();
1780 refresh_check ();
1784} 1781}
1785 1782
1786#endif /* HAVE_BG_PIXMAP */ 1783#endif /* HAVE_BG_PIXMAP */
1787 1784
1788/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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