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.252 by root, Sun Jun 15 13:54:15 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 {
… …
543{ 539{
544 this->envv = envv; 540 this->envv = envv;
545 541
546 SET_R (this); 542 SET_R (this);
547 set_locale (""); 543 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 544 set_environ (envv); // a few things in X do not call setlocale :(
549 545
550 init_vars (); 546 init_vars ();
551 547
552 init_secondary (); 548 init_secondary ();
553 549
… …
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 556 if (const char *path = rs[Rs_chdir])
557 if (*path) // ignored if empty
558 {
559 if (*path != '/')
560 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
561
562 if (chdir (path))
563 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
564 }
565
561 if (option (Opt_scrollBar)) 566 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 567 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563#endif
564 568
565 pty = ptytty::create (); 569 pty = ptytty::create ();
566 570
567 create_windows (argc, argv); 571 create_windows (argc, argv);
568 572
… …
572 576
573#if 0 577#if 0
574 XSynchronize (dpy, True); 578 XSynchronize (dpy, True);
575#endif 579#endif
576 580
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 581 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 582 scrollBar.resize (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP 583#ifdef HAVE_BG_PIXMAP
582 { 584 {
583 bgPixmap.set_target (this); 585 bgPixmap.set_target (this);
584 bgPixmap.invalidate (); 586 bgPixmap.invalidate ();
585 587
… …
840 run_command (argv); 842 run_command (argv);
841} 843}
842 844
843/*----------------------------------------------------------------------*/ 845/*----------------------------------------------------------------------*/
844void 846void
845rxvt_term::Get_Colours () 847rxvt_term::get_colours ()
846{ 848{
847 int i; 849 int i;
848 850
849#ifdef OFF_FOCUS_FADING 851#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 852 pix_colors = pix_colors_focused;
… …
1067 Window top, parent; 1069 Window top, parent;
1068 1070
1069 dLocal (Display *, dpy); 1071 dLocal (Display *, dpy);
1070 1072
1071 /* grab colors before netscape does */ 1073 /* grab colors before netscape does */
1072 Get_Colours (); 1074 get_colours ();
1073 1075
1074 if (!set_fonts ()) 1076 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1077 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1078
1077 parent = display->root; 1079 parent = display->root;
… …
1532 signal (SIGTSTP, SIG_IGN); 1534 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1535 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1536 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1537#endif /* SIGTSTP */
1536 1538
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 */ 1539 /* command interpreter path */
1543 if (argv) 1540 if (argv)
1544 { 1541 {
1545# ifdef DEBUG_CMD 1542# ifdef DEBUG_CMD
1546 int i; 1543 int i;

Diff Legend

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