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.274 by ayin, Tue Dec 11 11:53:48 2007 UTC vs.
Revision 1.282 by root, Fri Dec 14 02:22:24 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
… …
155{ 155{
156#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif 167#endif
168#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
… …
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
… …
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
… …
587 } 586 }
588#endif 587#endif
589 588
590 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
592
593 return true;
594} 591}
595 592
596static struct sig_handlers 593static struct sig_handlers
597{ 594{
598 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;

Diff Legend

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