ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 2008 UTC

… …
267 NULL, // Color_underline 267 NULL, // Color_underline
268#endif 268#endif
269#ifdef OPTION_HC 269#ifdef OPTION_HC
270 NULL, 270 NULL,
271#endif 271#endif
272#ifdef HAVE_SCROLLBARS
273 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR 273#ifdef RXVT_SCROLLBAR
276 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
277#endif 275#endif
278#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
279 NULL, 277 NULL,
… …
487# else 485# else
488 rs[Rs_delete_key] = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
489# endif 487# endif
490#endif 488#endif
491 489
492#ifdef HAVE_SCROLLBARS 490 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 491
496#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
499 { 495 {
… …
555 551
556#ifdef KEYSYM_RESOURCE 552#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 553 keyboard->register_done ();
558#endif 554#endif
559 555
560#ifdef HAVE_SCROLLBARS
561 if (option (Opt_scrollBar)) 556 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563#endif
564 558
565 pty = ptytty::create (); 559 pty = ptytty::create ();
566 560
567 create_windows (argc, argv); 561 create_windows (argc, argv);
568 562
… …
572 566
573#if 0 567#if 0
574 XSynchronize (dpy, True); 568 XSynchronize (dpy, True);
575#endif 569#endif
576 570
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 571 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 572 scrollBar.resize (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP 573#ifdef HAVE_BG_PIXMAP
582 { 574 {
583 bgPixmap.set_target (this); 575 bgPixmap.set_target (this);
584 bgPixmap.invalidate (); 576 bgPixmap.invalidate ();
585 577
… …
840 run_command (argv); 832 run_command (argv);
841} 833}
842 834
843/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
844void 836void
845rxvt_term::Get_Colours () 837rxvt_term::get_colours ()
846{ 838{
847 int i; 839 int i;
848 840
849#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
… …
1067 Window top, parent; 1059 Window top, parent;
1068 1060
1069 dLocal (Display *, dpy); 1061 dLocal (Display *, dpy);
1070 1062
1071 /* grab colors before netscape does */ 1063 /* grab colors before netscape does */
1072 Get_Colours (); 1064 get_colours ();
1073 1065
1074 if (!set_fonts ()) 1066 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1068
1077 parent = display->root; 1069 parent = display->root;
… …
1532 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1536 1528
1537 // unblock signals (signals are blocked by iom.C
1538 sigset_t ss;
1539 sigemptyset (&ss);
1540 sigprocmask (SIG_SETMASK, &ss, 0);
1541
1542 /* command interpreter path */ 1529 /* command interpreter path */
1543 if (argv) 1530 if (argv)
1544 { 1531 {
1545# ifdef DEBUG_CMD 1532# ifdef DEBUG_CMD
1546 int i; 1533 int i;

Diff Legend

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