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.251 by ayin, Tue Feb 19 18:15:26 2008 UTC vs.
Revision 1.259 by root, Sat May 30 08:51:23 2009 UTC

… …
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;
… …
392#if XFT 393#if XFT
393 if (rs[Rs_depth]) 394 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 395 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 396#endif
396 397
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv); 398 free (r_argv);
403 399
404 for (int i = NUM_RESOURCES; i--; ) 400 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 401 if (rs [i] == resval_undef)
406 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
407 408
408#if ENABLE_PERL 409#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 410 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 411 rs[Rs_perl_ext_1] = "default";
411 412
… …
423 */ 424 */
424 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
425 { 426 {
426 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
428 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
430 } 432 }
431 else 433 else
432 { 434 {
433 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
435 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
437 } 440 }
438 441
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 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)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 451
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 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]);
451#endif 457#endif
452 458
453#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 461 pointerBlankDelay = i;
… …
458#endif 464#endif
459 465
460 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 467 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 469
469 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
471 472
472#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
… …
539{ 540{
540 this->envv = envv; 541 this->envv = envv;
541 542
542 SET_R (this); 543 SET_R (this);
543 set_locale (""); 544 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :( 545 set_environ (envv); // a few things in X do not call setlocale :(
545 546
546 init_vars (); 547 init_vars ();
547 548
548 init_secondary (); 549 init_secondary ();
549 550
… …
551 552
552#ifdef KEYSYM_RESOURCE 553#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 554 keyboard->register_done ();
554#endif 555#endif
555 556
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
556 if (option (Opt_scrollBar)) 567 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558 569
559 pty = ptytty::create (); 570 pty = ptytty::create ();
560 571
561 create_windows (argc, argv); 572 create_windows (argc, argv);
562 573
563 init_xlocale (); 574 init_xlocale ();
564 575
565 scr_reset (); // initialize screen 576 scr_poweron (); // initialize screen
566 577
567#if 0 578#if 0
568 XSynchronize (dpy, True); 579 XSynchronize (dpy, True);
569#endif 580#endif
570 581
… …
1117 this->parent[0] = top; 1128 this->parent[0] = top;
1118 1129
1119 old_width = szHint.width; 1130 old_width = szHint.width;
1120 old_height = szHint.height; 1131 old_height = szHint.height;
1121 1132
1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
1124 1135
1125 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1126 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
1127 1138
1128 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1131 wmHint.window_group = top; 1142 wmHint.window_group = top;
1132 1143
1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1134 &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
1135 1196
1136#if ENABLE_FRILLS 1197#if ENABLE_FRILLS
1137 if (mwmhints.flags) 1198 if (mwmhints.flags)
1138 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,
1139 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1544 const char *argv0, *shell; 1605 const char *argv0, *shell;
1545 1606
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1548 1609
1549 argv0 = (const char *)rxvt_basename (shell); 1610 argv0 = rxvt_basename (shell);
1550 1611
1551 if (option (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1552 { 1613 {
1553 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1554 1615

Diff Legend

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