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.273 by ayin, Tue Dec 11 11:39:06 2007 UTC vs.
Revision 1.280 by ayin, Wed Dec 12 11:35:56 2007 UTC

… …
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
… …
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;
… …
827 ws.ws_xpixel = width; 824 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 825 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 827
831#if 0 828#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 829 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 830 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 831 kill (-cmd_pid, SIGWINCH);
835#endif 832#endif
836} 833}
837 834

Diff Legend

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