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.243 by root, Fri Jan 25 16:04:57 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 KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 275#endif
276#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
277 NULL, 277 NULL,
278#endif 278#endif
279#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 280 "rgb:00/00/00",
… …
308 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered);
313} 314}
314 315
315static void 316static void
316init_secondary () 317init_secondary ()
317{ 318{
… …
484# else 485# else
485 rs[Rs_delete_key] = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
486# endif 487# endif
487#endif 488#endif
488 489
489#ifdef HAVE_SCROLLBARS 490 scrollBar.setup (this);
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
491#endif
492 491
493#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
494 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
495 if (option (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
496 { 495 {
… …
552 551
553#ifdef KEYSYM_RESOURCE 552#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 553 keyboard->register_done ();
555#endif 554#endif
556 555
557#ifdef HAVE_SCROLLBARS
558 if (option (Opt_scrollBar)) 556 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */ 557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
560#endif
561 558
562 pty = ptytty::create (); 559 pty = ptytty::create ();
563 560
564 create_windows (argc, argv); 561 create_windows (argc, argv);
565 562
… …
569 566
570#if 0 567#if 0
571 XSynchronize (dpy, True); 568 XSynchronize (dpy, True);
572#endif 569#endif
573 570
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar)) 571 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */ 572 scrollBar.resize (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP 573#ifdef HAVE_BG_PIXMAP
579 { 574 {
580 bgPixmap.set_target (this); 575 bgPixmap.set_target (this);
581 bgPixmap.invalidate (); 576 bgPixmap.invalidate ();
582 577
… …
837 run_command (argv); 832 run_command (argv);
838} 833}
839 834
840/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
841void 836void
842rxvt_term::Get_Colours () 837rxvt_term::get_colours ()
843{ 838{
844 int i; 839 int i;
845 840
846#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
847 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
… …
907 * get scrollBar shadow colors 902 * get scrollBar shadow colors
908 * 903 *
909 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
910 * from the fvwm window manager. 905 * from the fvwm window manager.
911 */ 906 */
912#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
913 if (depth <= 2) 908 if (depth <= 2)
914 { 909 {
915 /* Monochrome */ 910 /* Monochrome */
916 alias_color (Color_scroll, Color_fg); 911 alias_color (Color_scroll, Color_fg);
917 alias_color (Color_topShadow, Color_bg); 912 alias_color (Color_topShadow, Color_bg);
… …
932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
933 cscroll.a) 928 cscroll.a)
934 )) 929 ))
935 alias_color (Color_topShadow, Color_White); 930 alias_color (Color_topShadow, Color_White);
936 } 931 }
937#endif /* KEEP_SCROLLCOLOR */ 932#endif
938 933
939#ifdef OFF_FOCUS_FADING 934#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 935 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i); 936 update_fade_color (i);
942#endif 937#endif
… …
1064 Window top, parent; 1059 Window top, parent;
1065 1060
1066 dLocal (Display *, dpy); 1061 dLocal (Display *, dpy);
1067 1062
1068 /* grab colors before netscape does */ 1063 /* grab colors before netscape does */
1069 Get_Colours (); 1064 get_colours ();
1070 1065
1071 if (!set_fonts ()) 1066 if (!set_fonts ())
1072 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");
1073 1068
1074 parent = display->root; 1069 parent = display->root;
… …
1529 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1530 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1531 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1532#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1533 1528
1534 // unblock signals (signals are blocked by iom.C
1535 sigset_t ss;
1536 sigemptyset (&ss);
1537 sigprocmask (SIG_SETMASK, &ss, 0);
1538
1539 /* command interpreter path */ 1529 /* command interpreter path */
1540 if (argv) 1530 if (argv)
1541 { 1531 {
1542# ifdef DEBUG_CMD 1532# ifdef DEBUG_CMD
1543 int i; 1533 int i;

Diff Legend

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