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.241 by root, Sat Jan 19 14:23:33 2008 UTC vs.
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#if !USE_256_COLORS
179 // 88 xterm colours 180 // 88 xterm colours
180 "rgb:00/00/00", 181 "rgb:00/00/00",
181 "rgb:00/00/8b", 182 "rgb:00/00/8b",
182 "rgb:00/00/cd", 183 "rgb:00/00/cd",
183 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
252 496
253#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 510#if ENABLE_FRILLS
267 NULL, // Color_underline 511 NULL, // Color_underline
268#endif 512#endif
269#ifdef OPTION_HC 513#ifdef OPTION_HC
270 NULL, 514 NULL,
515 NULL,
271#endif 516#endif
272#ifdef KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 520#endif
276#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
277 NULL, 522 NULL,
278#endif 523#endif
279#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 525 "rgb:00/00/00",
… …
293 ncol = 80; 538 ncol = 80;
294 nrow = 24; 539 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 544 saveLines = SAVELINES;
299 545
300 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
301 547
302 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered);
313} 561}
314 562
315static void 563static void
316init_secondary () 564init_secondary ()
317{ 565{
318 int i; 566 int i;
319 567
320 /*
321 * Close all unused file descriptors
322 * We don't want them, we don't need them.
323 */
324 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
325 { 569 {
326 /* TODO: BOO HISS */
327 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
328 } 571 }
329 else if (i != STDIN_FILENO) 572 else if (i != STDIN_FILENO)
330 { 573 {
331 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
… …
396#if XFT 639#if XFT
397 if (rs[Rs_depth]) 640 if (rs[Rs_depth])
398 select_visual (strtol (rs[Rs_depth], 0, 0)); 641 select_visual (strtol (rs[Rs_depth], 0, 0));
399#endif 642#endif
400 643
401#ifdef HAVE_AFTERIMAGE
402 set_application_name ((char*)rs[Rs_name]);
403 set_output_threshold (OUTPUT_LEVEL_WARNING);
404 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
405#endif
406 free (r_argv); 644 free (r_argv);
407 645
408 for (int i = NUM_RESOURCES; i--; ) 646 for (int i = NUM_RESOURCES; i--; )
409 if (rs [i] == resval_undef) 647 if (rs [i] == resval_undef)
410 rs [i] = 0; 648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
411 654
412#if ENABLE_PERL 655#if ENABLE_PERL
413 if (!rs[Rs_perl_ext_1]) 656 if (!rs[Rs_perl_ext_1])
414 rs[Rs_perl_ext_1] = "default"; 657 rs[Rs_perl_ext_1] = "default";
415 658
… …
427 */ 670 */
428 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
429 { 672 {
430 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
431 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
432 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
433 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
434 } 678 }
435 else 679 else
436 { 680 {
437 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
438 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
439 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
440 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
441 } 686 }
442 687
443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
450 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
452 697
453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
454 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
455#endif 703#endif
456 704
457#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
458 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
459 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
462#endif 710#endif
463 711
464 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
465 if (!saveLines) 713 if (!saveLines)
466 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
467
468#ifdef PRINTPIPE
469 if (!rs[Rs_print_pipe])
470 rs[Rs_print_pipe] = PRINTPIPE;
471#endif
472 715
473 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
474 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
475 718
476#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
… …
489# else 732# else
490 rs[Rs_delete_key] = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
491# endif 734# endif
492#endif 735#endif
493 736
494#ifdef HAVE_SCROLLBARS 737 scrollBar.setup (this);
495 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
496#endif
497 738
498#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
499 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
500 if (option (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
501 { 742 {
… …
545{ 786{
546 this->envv = envv; 787 this->envv = envv;
547 788
548 SET_R (this); 789 SET_R (this);
549 set_locale (""); 790 set_locale ("");
550 set_environ (envv); // few things in X do not call setlocale :( 791 set_environ (envv); // a few things in X do not call setlocale :(
551 792
552 init_vars (); 793 init_vars ();
553 794
554 init_secondary (); 795 init_secondary ();
555 796
… …
557 798
558#ifdef KEYSYM_RESOURCE 799#ifdef KEYSYM_RESOURCE
559 keyboard->register_done (); 800 keyboard->register_done ();
560#endif 801#endif
561 802
562#ifdef HAVE_SCROLLBARS 803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
563 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
564 scrollBar.setIdle (); /* set existence for size calculations */ 814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
565#endif
566 815
567 pty = ptytty::create (); 816 pty = ptytty::create ();
568 817
569 create_windows (argc, argv); 818 create_windows (argc, argv);
570 819
571 init_xlocale (); 820 init_xlocale ();
572 821
573 scr_reset (); // initialize screen 822 scr_poweron (); // initialize screen
574 823
575#if 0 824#if 0
576 XSynchronize (dpy, True); 825 XSynchronize (dpy, True);
577#endif 826#endif
578 827
579#ifdef HAVE_SCROLLBARS
580 if (option (Opt_scrollBar)) 828 if (option (Opt_scrollBar))
581 resize_scrollbar (); /* create and map scrollbar */ 829 scrollBar.resize (); /* create and map scrollbar */
582#endif
583#ifdef HAVE_BG_PIXMAP 830#ifdef HAVE_BG_PIXMAP
584 { 831 {
585 bgPixmap.set_target (this); 832 bgPixmap.set_target (this);
586 bgPixmap.invalidate (); 833 bgPixmap.invalidate ();
587 834
… …
842 run_command (argv); 1089 run_command (argv);
843} 1090}
844 1091
845/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
846void 1093void
847rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
848{ 1095{
849 int i; 1096 int i;
850 1097
851#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
852 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
… …
912 * get scrollBar shadow colors 1159 * get scrollBar shadow colors
913 * 1160 *
914 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
915 * from the fvwm window manager. 1162 * from the fvwm window manager.
916 */ 1163 */
917#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
918 if (depth <= 2) 1165 if (depth <= 2)
919 { 1166 {
920 /* Monochrome */ 1167 /* Monochrome */
921 alias_color (Color_scroll, Color_fg); 1168 alias_color (Color_scroll, Color_fg);
922 alias_color (Color_topShadow, Color_bg); 1169 alias_color (Color_topShadow, Color_bg);
… …
937 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
938 cscroll.a) 1185 cscroll.a)
939 )) 1186 ))
940 alias_color (Color_topShadow, Color_White); 1187 alias_color (Color_topShadow, Color_White);
941 } 1188 }
942#endif /* KEEP_SCROLLCOLOR */ 1189#endif
943 1190
944#ifdef OFF_FOCUS_FADING 1191#ifdef OFF_FOCUS_FADING
945 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
946 update_fade_color (i); 1193 update_fade_color (i);
947#endif 1194#endif
… …
1069 Window top, parent; 1316 Window top, parent;
1070 1317
1071 dLocal (Display *, dpy); 1318 dLocal (Display *, dpy);
1072 1319
1073 /* grab colors before netscape does */ 1320 /* grab colors before netscape does */
1074 Get_Colours (); 1321 get_colours ();
1075 1322
1076 if (!set_fonts ()) 1323 if (!set_fonts ())
1077 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1078 1325
1079 parent = display->root; 1326 parent = display->root;
… …
1127 this->parent[0] = top; 1374 this->parent[0] = top;
1128 1375
1129 old_width = szHint.width; 1376 old_width = szHint.width;
1130 old_height = szHint.height; 1377 old_height = szHint.height;
1131 1378
1132 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
1133 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
1134 1381
1135 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
1136 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
1137 1384
1138 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1140 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1141 wmHint.window_group = top; 1388 wmHint.window_group = top;
1142 1389
1143 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1144 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
1145 1442
1146#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
1147 if (mwmhints.flags) 1444 if (mwmhints.flags)
1148 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1149 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1236rxvt_get_ttymode (struct termios *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1237{ 1534{
1238 /* 1535 /*
1239 * standard System V termios interface 1536 * standard System V termios interface
1240 */ 1537 */
1538 // does not work as stdin is not a tty
1241 if (tcgetattr (STDIN_FILENO, tio) < 0) 1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1242 { 1541 {
1243 // return error - use system defaults, 1542 // return error - use system defaults,
1244 // where possible, and zero elsewhere 1543 // where possible, and zero elsewhere
1245 memset (tio, 0, sizeof (struct termios)); 1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1246 1548
1247 tio->c_cc[VINTR] = CINTR; 1549 tio->c_cc[VINTR] = CINTR;
1248 tio->c_cc[VQUIT] = CQUIT; 1550 tio->c_cc[VQUIT] = CQUIT;
1249 tio->c_cc[VERASE] = CERASE; 1551 tio->c_cc[VERASE] = CERASE;
1250#ifdef VERASE2 1552#ifdef VERASE2
… …
1270 tio->c_cc[VLNEXT] = CLNEXT; 1572 tio->c_cc[VLNEXT] = CLNEXT;
1271# endif 1573# endif
1272 } 1574 }
1273 1575
1274 tio->c_cc[VEOF] = CEOF; 1576 tio->c_cc[VEOF] = CEOF;
1275 tio->c_cc[VEOL] = VDISABLE;
1276# ifdef VEOL2
1277 tio->c_cc[VEOL2] = VDISABLE;
1278# endif
1279# ifdef VSWTC
1280 tio->c_cc[VSWTC] = VDISABLE;
1281# endif
1282# ifdef VSWTCH
1283 tio->c_cc[VSWTCH] = VDISABLE;
1284# endif
1285# if VMIN != VEOF 1577# if VMIN != VEOF
1286 tio->c_cc[VMIN] = 1; 1578 tio->c_cc[VMIN] = 1;
1287# endif 1579# endif
1288# if VTIME != VEOL 1580# if VTIME != VEOL
1289 tio->c_cc[VTIME] = 0; 1581 tio->c_cc[VTIME] = 0;
… …
1534 signal (SIGTSTP, SIG_IGN); 1826 signal (SIGTSTP, SIG_IGN);
1535 signal (SIGTTIN, SIG_IGN); 1827 signal (SIGTTIN, SIG_IGN);
1536 signal (SIGTTOU, SIG_IGN); 1828 signal (SIGTTOU, SIG_IGN);
1537#endif /* SIGTSTP */ 1829#endif /* SIGTSTP */
1538 1830
1539 // unblock signals (signals are blocked by iom.C
1540 sigset_t ss;
1541 sigemptyset (&ss);
1542 sigprocmask (SIG_SETMASK, &ss, 0);
1543
1544 /* command interpreter path */ 1831 /* command interpreter path */
1545 if (argv) 1832 if (argv)
1546 { 1833 {
1547# ifdef DEBUG_CMD 1834# ifdef DEBUG_CMD
1548 int i; 1835 int i;
… …
1559 const char *argv0, *shell; 1846 const char *argv0, *shell;
1560 1847
1561 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1848 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1562 shell = "/bin/sh"; 1849 shell = "/bin/sh";
1563 1850
1564 argv0 = (const char *)rxvt_basename (shell); 1851 argv0 = rxvt_basename (shell);
1565 1852
1566 if (option (Opt_loginShell)) 1853 if (option (Opt_loginShell))
1567 { 1854 {
1568 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1855 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1569 1856

Diff Legend

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