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.261 by sf-exg, Sat Jan 30 20:52:36 2010 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;
… …
307 set_option (Opt_skipScroll); 308 set_option (Opt_skipScroll);
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);
313 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 314 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 315 set_option (Opt_buffered);
314} 316}
315 317
316static void 318static void
… …
392#if XFT 394#if XFT
393 if (rs[Rs_depth]) 395 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 396 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 397#endif
396 398
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); 399 free (r_argv);
403 400
404 for (int i = NUM_RESOURCES; i--; ) 401 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 402 if (rs [i] == resval_undef)
406 rs [i] = 0; 403 rs [i] = 0;
404
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
407 409
408#if ENABLE_PERL 410#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
411 413
… …
423 */ 425 */
424 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
425 { 427 {
426 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
430
428 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
430 } 433 }
431 else 434 else
432 { 435 {
433 if (!rs[Rs_title]) 436 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 437 rs[Rs_title] = rs[Rs_name];
438
435 if (!rs[Rs_iconName]) 439 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 440 rs[Rs_iconName] = rs[Rs_name];
437 } 441 }
438 442
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 450 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 452
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 454 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
455
456 if (rs[Rs_letterSpace])
457 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 458#endif
452 459
453#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 462 pointerBlankDelay = i;
… …
458#endif 465#endif
459 466
460 /* no point having a scrollbar without having any scrollback! */ 467 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 468 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 469 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 470
469 if (!rs[Rs_cutchars]) 471 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
471 473
472#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
… …
539{ 541{
540 this->envv = envv; 542 this->envv = envv;
541 543
542 SET_R (this); 544 SET_R (this);
543 set_locale (""); 545 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :( 546 set_environ (envv); // a few things in X do not call setlocale :(
545 547
546 init_vars (); 548 init_vars ();
547 549
548 init_secondary (); 550 init_secondary ();
549 551
… …
551 553
552#ifdef KEYSYM_RESOURCE 554#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 555 keyboard->register_done ();
554#endif 556#endif
555 557
558 if (const char *path = rs[Rs_chdir])
559 if (*path) // ignored if empty
560 {
561 if (*path != '/')
562 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
563
564 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 }
567
556 if (option (Opt_scrollBar)) 568 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558 570
559 pty = ptytty::create (); 571 pty = ptytty::create ();
560 572
561 create_windows (argc, argv); 573 create_windows (argc, argv);
562 574
563 init_xlocale (); 575 init_xlocale ();
564 576
565 scr_reset (); // initialize screen 577 scr_poweron (); // initialize screen
566 578
567#if 0 579#if 0
568 XSynchronize (dpy, True); 580 XSynchronize (dpy, True);
569#endif 581#endif
570 582
… …
1117 this->parent[0] = top; 1129 this->parent[0] = top;
1118 1130
1119 old_width = szHint.width; 1131 old_width = szHint.width;
1120 old_height = szHint.height; 1132 old_height = szHint.height;
1121 1133
1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 set_title (rs [Rs_title]);
1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 set_icon_name (rs [Rs_iconName]);
1124 1136
1125 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
1126 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
1127 1139
1128 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1131 wmHint.window_group = top; 1143 wmHint.window_group = top;
1132 1144
1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1134 &szHint, &wmHint, &classHint); 1146 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /*
1150 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1152 */
1153
1154 if (rs [Rs_iconfile])
1155 {
1156 init_asv ();
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 }
1195# endif
1196#endif
1135 1197
1136#if ENABLE_FRILLS 1198#if ENABLE_FRILLS
1137 if (mwmhints.flags) 1199 if (mwmhints.flags)
1138 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1139 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1201 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1544 const char *argv0, *shell; 1606 const char *argv0, *shell;
1545 1607
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1608 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1609 shell = "/bin/sh";
1548 1610
1549 argv0 = (const char *)rxvt_basename (shell); 1611 argv0 = rxvt_basename (shell);
1550 1612
1551 if (option (Opt_loginShell)) 1613 if (option (Opt_loginShell))
1552 { 1614 {
1553 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1615 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1554 1616

Diff Legend

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