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.261 by sf-exg, Sat Jan 30 20:52:36 2010 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,
… …
295 ncol = 80; 293 ncol = 80;
296 nrow = 24; 294 nrow = 24;
297 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
298 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
299 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
300 saveLines = SAVELINES; 299 saveLines = SAVELINES;
301 300
302 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
303 302
304 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
… …
309 set_option (Opt_skipScroll); 308 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
313 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 314 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 315 set_option (Opt_buffered);
316} 316}
317 317
318static void 318static void
… …
394#if XFT 394#if XFT
395 if (rs[Rs_depth]) 395 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0)); 396 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif 397#endif
398 398
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
404 free (r_argv); 399 free (r_argv);
405 400
406 for (int i = NUM_RESOURCES; i--; ) 401 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef) 402 if (rs [i] == resval_undef)
408 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
409 409
410#if ENABLE_PERL 410#if ENABLE_PERL
411 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
412 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
413 413
… …
425 */ 425 */
426 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
427 { 427 {
428 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
429 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
430
430 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
431 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
432 } 433 }
433 else 434 else
434 { 435 {
435 if (!rs[Rs_title]) 436 if (!rs[Rs_title])
436 rs[Rs_title] = rs[Rs_name]; 437 rs[Rs_title] = rs[Rs_name];
438
437 if (!rs[Rs_iconName]) 439 if (!rs[Rs_iconName])
438 rs[Rs_iconName] = rs[Rs_name]; 440 rs[Rs_iconName] = rs[Rs_name];
439 } 441 }
440 442
441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
448 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)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 452
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 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]);
453#endif 458#endif
454 459
455#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 462 pointerBlankDelay = i;
… …
460#endif 465#endif
461 466
462 /* no point having a scrollbar without having any scrollback! */ 467 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 468 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 469 set_option (Opt_scrollBar, 0);
465
466#ifdef PRINTPIPE
467 if (!rs[Rs_print_pipe])
468 rs[Rs_print_pipe] = PRINTPIPE;
469#endif
470 470
471 if (!rs[Rs_cutchars]) 471 if (!rs[Rs_cutchars])
472 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
473 473
474#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
… …
487# else 487# else
488 rs[Rs_delete_key] = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
489# endif 489# endif
490#endif 490#endif
491 491
492#ifdef HAVE_SCROLLBARS 492 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 493
496#ifdef XTERM_REVERSE_VIDEO 494#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 495 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 496 if (option (Opt_reverseVideo))
499 { 497 {
… …
543{ 541{
544 this->envv = envv; 542 this->envv = envv;
545 543
546 SET_R (this); 544 SET_R (this);
547 set_locale (""); 545 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 546 set_environ (envv); // a few things in X do not call setlocale :(
549 547
550 init_vars (); 548 init_vars ();
551 549
552 init_secondary (); 550 init_secondary ();
553 551
… …
555 553
556#ifdef KEYSYM_RESOURCE 554#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 555 keyboard->register_done ();
558#endif 556#endif
559 557
560#ifdef HAVE_SCROLLBARS 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
561 if (option (Opt_scrollBar)) 568 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563#endif
564 570
565 pty = ptytty::create (); 571 pty = ptytty::create ();
566 572
567 create_windows (argc, argv); 573 create_windows (argc, argv);
568 574
569 init_xlocale (); 575 init_xlocale ();
570 576
571 scr_reset (); // initialize screen 577 scr_poweron (); // initialize screen
572 578
573#if 0 579#if 0
574 XSynchronize (dpy, True); 580 XSynchronize (dpy, True);
575#endif 581#endif
576 582
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 583 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 584 scrollBar.resize (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP 585#ifdef HAVE_BG_PIXMAP
582 { 586 {
583 bgPixmap.set_target (this); 587 bgPixmap.set_target (this);
584 bgPixmap.invalidate (); 588 bgPixmap.invalidate ();
585 589
… …
840 run_command (argv); 844 run_command (argv);
841} 845}
842 846
843/*----------------------------------------------------------------------*/ 847/*----------------------------------------------------------------------*/
844void 848void
845rxvt_term::Get_Colours () 849rxvt_term::get_colours ()
846{ 850{
847 int i; 851 int i;
848 852
849#ifdef OFF_FOCUS_FADING 853#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 854 pix_colors = pix_colors_focused;
… …
1067 Window top, parent; 1071 Window top, parent;
1068 1072
1069 dLocal (Display *, dpy); 1073 dLocal (Display *, dpy);
1070 1074
1071 /* grab colors before netscape does */ 1075 /* grab colors before netscape does */
1072 Get_Colours (); 1076 get_colours ();
1073 1077
1074 if (!set_fonts ()) 1078 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1080
1077 parent = display->root; 1081 parent = display->root;
… …
1125 this->parent[0] = top; 1129 this->parent[0] = top;
1126 1130
1127 old_width = szHint.width; 1131 old_width = szHint.width;
1128 old_height = szHint.height; 1132 old_height = szHint.height;
1129 1133
1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 set_title (rs [Rs_title]);
1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 set_icon_name (rs [Rs_iconName]);
1132 1136
1133 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
1134 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
1135 1139
1136 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1139 wmHint.window_group = top; 1143 wmHint.window_group = top;
1140 1144
1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1142 &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
1143 1197
1144#if ENABLE_FRILLS 1198#if ENABLE_FRILLS
1145 if (mwmhints.flags) 1199 if (mwmhints.flags)
1146 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,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1201 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1532 signal (SIGTSTP, SIG_IGN); 1586 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1587 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1588 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1589#endif /* SIGTSTP */
1536 1590
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 */ 1591 /* command interpreter path */
1543 if (argv) 1592 if (argv)
1544 { 1593 {
1545# ifdef DEBUG_CMD 1594# ifdef DEBUG_CMD
1546 int i; 1595 int i;
… …
1557 const char *argv0, *shell; 1606 const char *argv0, *shell;
1558 1607
1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1608 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1560 shell = "/bin/sh"; 1609 shell = "/bin/sh";
1561 1610
1562 argv0 = (const char *)rxvt_basename (shell); 1611 argv0 = rxvt_basename (shell);
1563 1612
1564 if (option (Opt_loginShell)) 1613 if (option (Opt_loginShell))
1565 { 1614 {
1566 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1615 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1567 1616

Diff Legend

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