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.259 by root, Sat May 30 08:51:23 2009 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",
… …
293 ncol = 80; 293 ncol = 80;
294 nrow = 24; 294 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 299 saveLines = SAVELINES;
299 300
300 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
301 302
302 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
… …
308 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52); 313 set_option (Opt_iso14755_52);
314 set_option (Opt_buffered);
313} 315}
314 316
315static void 317static void
316init_secondary () 318init_secondary ()
317{ 319{
… …
391#if XFT 393#if XFT
392 if (rs[Rs_depth]) 394 if (rs[Rs_depth])
393 select_visual (strtol (rs[Rs_depth], 0, 0)); 395 select_visual (strtol (rs[Rs_depth], 0, 0));
394#endif 396#endif
395 397
396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
400#endif
401 free (r_argv); 398 free (r_argv);
402 399
403 for (int i = NUM_RESOURCES; i--; ) 400 for (int i = NUM_RESOURCES; i--; )
404 if (rs [i] == resval_undef) 401 if (rs [i] == resval_undef)
405 rs [i] = 0; 402 rs [i] = 0;
403
404#ifdef HAVE_AFTERIMAGE
405 set_application_name ((char *)rs[Rs_name]);
406 set_output_threshold (OUTPUT_LEVEL_WARNING);
407#endif
406 408
407#if ENABLE_PERL 409#if ENABLE_PERL
408 if (!rs[Rs_perl_ext_1]) 410 if (!rs[Rs_perl_ext_1])
409 rs[Rs_perl_ext_1] = "default"; 411 rs[Rs_perl_ext_1] = "default";
410 412
… …
422 */ 424 */
423 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
424 { 426 {
425 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
426 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
427 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
428 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
429 } 432 }
430 else 433 else
431 { 434 {
432 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
433 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
434 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
435 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
436 } 440 }
437 441
438 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
445 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
446 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
447 451
448 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
449 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 453 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
454
455 if (rs[Rs_letterSpace])
456 letterSpace = atoi (rs[Rs_letterSpace]);
450#endif 457#endif
451 458
452#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
453 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
454 pointerBlankDelay = i; 461 pointerBlankDelay = i;
… …
457#endif 464#endif
458 465
459 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
460 if (!saveLines) 467 if (!saveLines)
461 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
462
463#ifdef PRINTPIPE
464 if (!rs[Rs_print_pipe])
465 rs[Rs_print_pipe] = PRINTPIPE;
466#endif
467 469
468 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
469 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
470 472
471#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
… …
484# else 486# else
485 rs[Rs_delete_key] = "\033[3~"; 487 rs[Rs_delete_key] = "\033[3~";
486# endif 488# endif
487#endif 489#endif
488 490
489#ifdef HAVE_SCROLLBARS 491 scrollBar.setup (this);
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
491#endif
492 492
493#ifdef XTERM_REVERSE_VIDEO 493#ifdef XTERM_REVERSE_VIDEO
494 /* this is how xterm implements reverseVideo */ 494 /* this is how xterm implements reverseVideo */
495 if (option (Opt_reverseVideo)) 495 if (option (Opt_reverseVideo))
496 { 496 {
… …
540{ 540{
541 this->envv = envv; 541 this->envv = envv;
542 542
543 SET_R (this); 543 SET_R (this);
544 set_locale (""); 544 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :( 545 set_environ (envv); // a few things in X do not call setlocale :(
546 546
547 init_vars (); 547 init_vars ();
548 548
549 init_secondary (); 549 init_secondary ();
550 550
… …
552 552
553#ifdef KEYSYM_RESOURCE 553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 554 keyboard->register_done ();
555#endif 555#endif
556 556
557#ifdef HAVE_SCROLLBARS 557 if (const char *path = rs[Rs_chdir])
558 if (*path) // ignored if empty
559 {
560 if (*path != '/')
561 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
562
563 if (chdir (path))
564 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
565 }
566
558 if (option (Opt_scrollBar)) 567 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */ 568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
560#endif
561 569
562 pty = ptytty::create (); 570 pty = ptytty::create ();
563 571
564 create_windows (argc, argv); 572 create_windows (argc, argv);
565 573
566 init_xlocale (); 574 init_xlocale ();
567 575
568 scr_reset (); // initialize screen 576 scr_poweron (); // initialize screen
569 577
570#if 0 578#if 0
571 XSynchronize (dpy, True); 579 XSynchronize (dpy, True);
572#endif 580#endif
573 581
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar)) 582 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */ 583 scrollBar.resize (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP 584#ifdef HAVE_BG_PIXMAP
579 { 585 {
580 bgPixmap.set_target (this); 586 bgPixmap.set_target (this);
581 bgPixmap.invalidate (); 587 bgPixmap.invalidate ();
582 588
… …
837 run_command (argv); 843 run_command (argv);
838} 844}
839 845
840/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
841void 847void
842rxvt_term::Get_Colours () 848rxvt_term::get_colours ()
843{ 849{
844 int i; 850 int i;
845 851
846#ifdef OFF_FOCUS_FADING 852#ifdef OFF_FOCUS_FADING
847 pix_colors = pix_colors_focused; 853 pix_colors = pix_colors_focused;
… …
907 * get scrollBar shadow colors 913 * get scrollBar shadow colors
908 * 914 *
909 * The calculations of topShadow/bottomShadow values are adapted 915 * The calculations of topShadow/bottomShadow values are adapted
910 * from the fvwm window manager. 916 * from the fvwm window manager.
911 */ 917 */
912#ifdef KEEP_SCROLLCOLOR 918#ifdef RXVT_SCROLLBAR
913 if (depth <= 2) 919 if (depth <= 2)
914 { 920 {
915 /* Monochrome */ 921 /* Monochrome */
916 alias_color (Color_scroll, Color_fg); 922 alias_color (Color_scroll, Color_fg);
917 alias_color (Color_topShadow, Color_bg); 923 alias_color (Color_topShadow, Color_bg);
… …
932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 938 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
933 cscroll.a) 939 cscroll.a)
934 )) 940 ))
935 alias_color (Color_topShadow, Color_White); 941 alias_color (Color_topShadow, Color_White);
936 } 942 }
937#endif /* KEEP_SCROLLCOLOR */ 943#endif
938 944
939#ifdef OFF_FOCUS_FADING 945#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 946 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i); 947 update_fade_color (i);
942#endif 948#endif
… …
1064 Window top, parent; 1070 Window top, parent;
1065 1071
1066 dLocal (Display *, dpy); 1072 dLocal (Display *, dpy);
1067 1073
1068 /* grab colors before netscape does */ 1074 /* grab colors before netscape does */
1069 Get_Colours (); 1075 get_colours ();
1070 1076
1071 if (!set_fonts ()) 1077 if (!set_fonts ())
1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1078 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1073 1079
1074 parent = display->root; 1080 parent = display->root;
… …
1122 this->parent[0] = top; 1128 this->parent[0] = top;
1123 1129
1124 old_width = szHint.width; 1130 old_width = szHint.width;
1125 old_height = szHint.height; 1131 old_height = szHint.height;
1126 1132
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
1129 1135
1130 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
1132 1138
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1142 wmHint.window_group = top;
1137 1143
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1145 &szHint, &wmHint, &classHint);
1146#if ENABLE_EWMH
1147# ifdef HAVE_AFTERIMAGE
1148 /*
1149 * set up icon hint
1150 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1151 */
1152
1153 if (rs [Rs_iconfile])
1154 {
1155 init_asv ();
1156
1157 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1158 if (asv && im)
1159 {
1160 int w = im->width;
1161 int h = im->height;
1162 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1163 ASImage *result = scale_asimage (asv, im,
1164 w, h, ASA_ARGB32,
1165 100, ASIMAGE_QUALITY_DEFAULT);
1166 destroy_asimage (&im);
1167
1168 if (buffer && result)
1169 {
1170 ARGB32 *asbuf = result->alt.argb32;
1171 buffer [0] = w;
1172 buffer [1] = h;
1173
1174 for (unsigned int i = 0; i < w * h; ++i)
1175 buffer [i + 2] = asbuf [i];
1176
1177 destroy_asimage (&result);
1178 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1179 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1180 free (buffer);
1181 }
1182 else
1183 {
1184 if (!buffer)
1185 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1186
1187 if (!result)
1188 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1189 }
1190 }
1191 else
1192 rxvt_warn ("Loading image icon failed, continuing without.\n");
1193 }
1194# endif
1195#endif
1140 1196
1141#if ENABLE_FRILLS 1197#if ENABLE_FRILLS
1142 if (mwmhints.flags) 1198 if (mwmhints.flags)
1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1199 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1529 signal (SIGTSTP, SIG_IGN); 1585 signal (SIGTSTP, SIG_IGN);
1530 signal (SIGTTIN, SIG_IGN); 1586 signal (SIGTTIN, SIG_IGN);
1531 signal (SIGTTOU, SIG_IGN); 1587 signal (SIGTTOU, SIG_IGN);
1532#endif /* SIGTSTP */ 1588#endif /* SIGTSTP */
1533 1589
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 */ 1590 /* command interpreter path */
1540 if (argv) 1591 if (argv)
1541 { 1592 {
1542# ifdef DEBUG_CMD 1593# ifdef DEBUG_CMD
1543 int i; 1594 int i;
… …
1554 const char *argv0, *shell; 1605 const char *argv0, *shell;
1555 1606
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1558 1609
1559 argv0 = (const char *)rxvt_basename (shell); 1610 argv0 = rxvt_basename (shell);
1560 1611
1561 if (option (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1562 { 1613 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1615

Diff Legend

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