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.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.259 by root, Sat May 30 08:51:23 2009 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) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
154 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 162# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 164# endif
164 /* high-intensity colors */ 165 /* high-intensity colors */
165# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
250 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
251 252
252#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 259 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 266#if ENABLE_FRILLS
266 NULL, // Color_underline 267 NULL, // Color_underline
267#endif 268#endif
268#ifdef OPTION_HC 269#ifdef OPTION_HC
269 NULL, 270 NULL,
270#endif 271#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 275#endif
275#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
276 NULL, 277 NULL,
277#endif 278#endif
278#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 280 "rgb:00/00/00",
280#endif 281#endif
281 }; 282 };
282 283
283bool 284void
284rxvt_term::init_vars () 285rxvt_term::init_vars ()
285{ 286{
286 pix_colors = // 287 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 288
293 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
295 want_refresh = 1; 291 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 293 ncol = 80;
298 nrow = 24; 294 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 299 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 300
305 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
306 302
307 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 304
310 set_option (Opt_scrollBar); 305 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 306 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 307 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 308 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52); 313 set_option (Opt_iso14755_52);
319 314 set_option (Opt_buffered);
320 return true;
321} 315}
322 316
323void 317static void
324rxvt_term::init_secondary () 318init_secondary ()
325{ 319{
326 int i; 320 int i;
327 321
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0) 322 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 { 323 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO); 324 dup2 (STDERR_FILENO, STDIN_FILENO);
336 } 325 }
337 else if (i != STDIN_FILENO) 326 else if (i != STDIN_FILENO)
338 { 327 {
339 dup2 (i, STDIN_FILENO); 328 dup2 (i, STDIN_FILENO);
340 close (i); 329 close (i);
341 } 330 }
342 331
343 dup2 (STDERR_FILENO, STDOUT_FILENO); 332 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 333}
356 334
357/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
358const char ** 336const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 337rxvt_term::init_resources (int argc, const char *const *argv)
415#if XFT 393#if XFT
416 if (rs[Rs_depth]) 394 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 395 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 396#endif
419 397
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv); 398 free (r_argv);
424 399
425 for (int i = NUM_RESOURCES; i--; ) 400 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 401 if (rs [i] == resval_undef)
427 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
428 408
429#if ENABLE_PERL 409#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1]) 410 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default"; 411 rs[Rs_perl_ext_1] = "default";
432 412
444 */ 424 */
445 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
446 { 426 {
447 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
449 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
451 } 432 }
452 else 433 else
453 { 434 {
454 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
456 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
458 } 440 }
459 441
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
467 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)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 451
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 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]);
472#endif 457#endif
473 458
474#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 461 pointerBlankDelay = i;
479#endif 464#endif
480 465
481 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 467 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 469
490 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
492 472
493#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
506# else 486# else
507 rs[Rs_delete_key] = "\033[3~"; 487 rs[Rs_delete_key] = "\033[3~";
508# endif 488# endif
509#endif 489#endif
510 490
511#ifdef HAVE_SCROLLBARS 491 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 492
515#ifdef XTERM_REVERSE_VIDEO 493#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 494 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 495 if (option (Opt_reverseVideo))
518 { 496 {
538 color_aliases (Color_fg); 516 color_aliases (Color_fg);
539 color_aliases (Color_bg); 517 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 518#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 519 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 520 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 521#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 522 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 523 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 524 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 525#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 526 color_aliases (Color_BD);
549 color_aliases (Color_UL); 527 color_aliases (Color_UL);
550 color_aliases (Color_RV); 528 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 529#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 530
553 if (!rs[Rs_color + Color_border]) 531 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 532 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 533
556 return cmd_argv; 534 return cmd_argv;
535}
536
537/*----------------------------------------------------------------------*/
538void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
540{
541 this->envv = envv;
542
543 SET_R (this);
544 set_locale ("");
545 set_environ (envv); // a few things in X do not call setlocale :(
546
547 init_vars ();
548
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv);
552
553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done ();
555#endif
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
567 if (option (Opt_scrollBar))
568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
569
570 pty = ptytty::create ();
571
572 create_windows (argc, argv);
573
574 init_xlocale ();
575
576 scr_poweron (); // initialize screen
577
578#if 0
579 XSynchronize (dpy, True);
580#endif
581
582 if (option (Opt_scrollBar))
583 scrollBar.resize (); /* create and map scrollbar */
584#ifdef HAVE_BG_PIXMAP
585 {
586 bgPixmap.set_target (this);
587 bgPixmap.invalidate ();
588
589#ifdef ENABLE_TRANSPARENCY
590 if (option (Opt_transparent))
591 {
592 bgPixmap.set_transparent ();
593
594#ifdef HAVE_AFTERIMAGE
595 if (rs [Rs_blurradius])
596 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
597#endif
598 if (ISSET_PIXCOLOR (Color_tint))
599 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
600
601 if (rs [Rs_shade])
602 bgPixmap.set_shade (rs [Rs_shade]);
603
604 bgPixmap.set_root_pixmap ();
605 XSelectInput (dpy, display->root, PropertyChangeMask);
606 rootwin_ev.start (display, display->root);
607 }
608#endif
609
610#ifdef BG_IMAGE_FROM_FILE
611 if (rs[Rs_backgroundPixmap])
612 {
613 const char *p = rs[Rs_backgroundPixmap];
614
615 if ((p = strchr (p, ';')) != 0)
616 {
617 p++;
618 bgPixmap.set_geometry (p);
619 }
620 else
621 bgPixmap.set_defaultGeometry ();
622
623 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
624 if (!bgPixmap.window_position_sensitive ())
625 update_background ();
626 }
627#endif
628 }
629#endif
630
631#if ENABLE_PERL
632 rootwin_ev.start (display, display->root);
633#endif
634
635 set_colorfgbg ();
636
637 init_command (cmd_argv);
638
639 free (cmd_argv);
640
641 if (pty->pty >= 0)
642 pty_ev.start (pty->pty, ev::READ);
643
644 HOOK_INVOKE ((this, HOOK_START, DT_END));
645
646#if ENABLE_XEMBED
647 if (rs[Rs_embed])
648 {
649 long info[2] = { 0, XEMBED_MAPPED };
650
651 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
652 32, PropModeReplace, (unsigned char *)&info, 2);
653 }
654#endif
655
656 XMapWindow (dpy, vt);
657 XMapWindow (dpy, parent[0]);
658
659 refresh_check ();
557} 660}
558 661
559/*----------------------------------------------------------------------*/ 662/*----------------------------------------------------------------------*/
560void 663void
561rxvt_term::init_env () 664rxvt_term::init_env ()
576 */ 679 */
577 val = rxvt_network_display (rs[Rs_display_name]); 680 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 681 rs[Rs_display_name] = (const char *)val;
579 682
580 if (val == NULL) 683 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 684#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 685 val = XDisplayString (dpy);
583 686
584 if (rs[Rs_display_name] == NULL) 687 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 688 rs[Rs_display_name] = val; /* use broken `:0' value */
586 689
626#ifdef HAVE_UNSETENV 729#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 730 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 731 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 732 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 733 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 734#endif /* HAVE_UNSETENV */
632} 735}
633 736
634/*----------------------------------------------------------------------*/ 737/*----------------------------------------------------------------------*/
635/* 738/*
636 * This is more or less stolen straight from XFree86 xterm. 739 * This is more or less stolen straight from XFree86 xterm.
657 760
658 this->locale = "C"; 761 this->locale = "C";
659 } 762 }
660 763
661 764
662 this->locale = rxvt_strdup (this->locale); 765 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 766 SET_LOCALE (this->locale);
664 mbstate.reset (); 767 mbstate.reset ();
665#endif 768#endif
666 769
667#if HAVE_NL_LANGINFO 770#if HAVE_NL_LANGINFO
740 run_command (argv); 843 run_command (argv);
741} 844}
742 845
743/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
744void 847void
745rxvt_term::Get_Colours () 848rxvt_term::get_colours ()
746{ 849{
747 int i; 850 int i;
748 851
749#ifdef OFF_FOCUS_FADING 852#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 853 pix_colors = pix_colors_focused;
751#endif 854#endif
752 855
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 856 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 { 857 {
755 const char *name = rs[Rs_color + i]; 858 const char *name = rs[Rs_color + i];
756 859
757 if (!name) 860 if (!name)
810 * get scrollBar shadow colors 913 * get scrollBar shadow colors
811 * 914 *
812 * The calculations of topShadow/bottomShadow values are adapted 915 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 916 * from the fvwm window manager.
814 */ 917 */
815#ifdef KEEP_SCROLLCOLOR 918#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 919 if (depth <= 2)
817 { 920 {
818 /* Monochrome */ 921 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 922 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 923 alias_color (Color_topShadow, Color_bg);
835 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),
836 cscroll.a) 939 cscroll.a)
837 )) 940 ))
838 alias_color (Color_topShadow, Color_White); 941 alias_color (Color_topShadow, Color_White);
839 } 942 }
840#endif /* KEEP_SCROLLCOLOR */ 943#endif
841 944
842#ifdef OFF_FOCUS_FADING 945#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 946 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 947 update_fade_color (i);
845#endif 948#endif
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 956 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 957 {
855 int i = atoi (rs[Rs_color + idx]); 958 int i = atoi (rs[Rs_color + idx]);
856 959
857 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
858 { /* bright colors */ 961 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 962 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 963 else if (i >= 0 && i <= 7)
862 } 964 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 965 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 966 }
867} 967}
868 968
869/*----------------------------------------------------------------------*/ 969/*----------------------------------------------------------------------*/
970 Window top, parent; 1070 Window top, parent;
971 1071
972 dLocal (Display *, dpy); 1072 dLocal (Display *, dpy);
973 1073
974 /* grab colors before netscape does */ 1074 /* grab colors before netscape does */
975 Get_Colours (); 1075 get_colours ();
976 1076
977 if (!set_fonts ()) 1077 if (!set_fonts ())
978 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");
979 1079
980 parent = display->root; 1080 parent = display->root;
1028 this->parent[0] = top; 1128 this->parent[0] = top;
1029 1129
1030 old_width = szHint.width; 1130 old_width = szHint.width;
1031 old_height = szHint.height; 1131 old_height = szHint.height;
1032 1132
1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
1035 1135
1036 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1037 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
1038 1138
1039 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1042 wmHint.window_group = top; 1142 wmHint.window_group = top;
1043 1143
1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045 &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
1046 1196
1047#if ENABLE_FRILLS 1197#if ENABLE_FRILLS
1048 if (mwmhints.flags) 1198 if (mwmhints.flags)
1049 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,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1084 1234
1085 termwin_ev.start (display, top); 1235 termwin_ev.start (display, top);
1086 1236
1087 /* vt cursor: Black-on-White is standard, but this is more popular */ 1237 /* vt cursor: Black-on-White is standard, but this is more popular */
1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1238 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089
1090#ifdef HAVE_SCROLLBARS
1091 /* cursor scrollBar: Black-on-White */
1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093#endif
1094 1239
1095 /* the vt window */ 1240 /* the vt window */
1096 vt = XCreateSimpleWindow (dpy, top, 1241 vt = XCreateSimpleWindow (dpy, top,
1097 window_vt_x, window_vt_y, 1242 window_vt_x, window_vt_y,
1098 width, height, 1243 width, height,
1123 GCForeground | GCBackground | GCGraphicsExposures, 1268 GCForeground | GCBackground | GCGraphicsExposures,
1124 &gcvalue); 1269 &gcvalue);
1125 1270
1126 drawable = new rxvt_drawable (this, vt); 1271 drawable = new rxvt_drawable (this, vt);
1127 1272
1128#ifdef RXVT_SCROLLBAR
1129 gcvalue.foreground = pix_colors[Color_topShadow];
1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135#endif
1136
1137#ifdef OFF_FOCUS_FADING 1273#ifdef OFF_FOCUS_FADING
1138 // initially we are in unfocused state 1274 // initially we are in unfocused state
1139 if (rs[Rs_fade]) 1275 if (rs[Rs_fade])
1140 pix_colors = pix_colors_unfocused; 1276 pix_colors = pix_colors_unfocused;
1141#endif 1277#endif
1146 1282
1147/* ------------------------------------------------------------------------- * 1283/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1284 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1285 * ------------------------------------------------------------------------- */
1150void 1286void
1151rxvt_get_ttymode (ttymode_t *tio, int erase) 1287rxvt_get_ttymode (struct termios *tio, int erase)
1152{ 1288{
1153 /* 1289 /*
1154 * standard System V termios interface 1290 * standard System V termios interface
1155 */ 1291 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1292 if (tcgetattr (STDIN_FILENO, tio) < 0)
1157 { 1293 {
1158 // return error - use system defaults, 1294 // return error - use system defaults,
1159 // where possible, and zero elsewhere 1295 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t)); 1296 memset (tio, 0, sizeof (struct termios));
1161 1297
1162 tio->c_cc[VINTR] = CINTR; 1298 tio->c_cc[VINTR] = CINTR;
1163 tio->c_cc[VQUIT] = CQUIT; 1299 tio->c_cc[VQUIT] = CQUIT;
1164 tio->c_cc[VERASE] = CERASE; 1300 tio->c_cc[VERASE] = CERASE;
1165#ifdef VERASE2 1301#ifdef VERASE2
1229 1365
1230 /* 1366 /*
1231 * Debugging 1367 * Debugging
1232 */ 1368 */
1233#ifdef DEBUG_TTYMODE 1369#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1370 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1371 fprintf (stderr, "Input flags\n");
1237 1372
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1373 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1374# define FOO(flag,name) \
1302 FOO (VLNEXT, "VLNEXT"); 1437 FOO (VLNEXT, "VLNEXT");
1303# endif 1438# endif
1304 1439
1305 fprintf (stderr, "\n"); 1440 fprintf (stderr, "\n");
1306# undef FOO 1441# undef FOO
1307# endif /* HAVE_TERMIOS_H */ 1442#endif /* DEBUG_TTYMODE */
1308#endif /* DEBUG_TTYMODE */
1309} 1443}
1310 1444
1311/*----------------------------------------------------------------------*/ 1445/*----------------------------------------------------------------------*/
1312/* 1446/*
1313 * Run the command in a subprocess and return a file descriptor for the 1447 * Run the command in a subprocess and return a file descriptor for the
1346 else 1480 else
1347#endif 1481#endif
1348 er = -1; 1482 er = -1;
1349 1483
1350 rxvt_get_ttymode (&tio, er); 1484 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1485 /* init terminal attributes */
1486 cfsetospeed (&tio, BAUDRATE);
1487 cfsetispeed (&tio, BAUDRATE);
1488 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1489 pty->set_utf8_mode (enc_utf8);
1353 1490
1354 /* set initial window size */ 1491 /* set initial window size */
1355 tt_winch (); 1492 tt_winch ();
1356 1493
1416rxvt_term::run_child (const char *const *argv) 1553rxvt_term::run_child (const char *const *argv)
1417{ 1554{
1418 char *login; 1555 char *login;
1419 1556
1420 if (option (Opt_console)) 1557 if (option (Opt_console))
1558 {
1421 { /* be virtual console, fail silently */ 1559 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1560#ifdef TIOCCONS
1423 unsigned int on = 1; 1561 unsigned int on = 1;
1424 1562
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1563 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1564#elif defined (SRIOCSREDIR)
1428 1566
1429 fd = open (CONSOLE, O_WRONLY, 0); 1567 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1568 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1569 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1570 close (fd);
1433#endif /* SRIOCSREDIR */ 1571#endif /* SRIOCSREDIR */
1434 } 1572 }
1435 1573
1436 /* reset signals and spin off the command interpreter */ 1574 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1575 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1576 signal (SIGQUIT, SIG_DFL);
1445 */ 1583 */
1446#ifdef SIGTSTP 1584#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1585 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1586 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1587 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1588#endif /* SIGTSTP */
1451
1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss;
1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1589
1457 /* command interpreter path */ 1590 /* command interpreter path */
1458 if (argv) 1591 if (argv)
1459 { 1592 {
1460# ifdef DEBUG_CMD 1593# ifdef DEBUG_CMD
1472 const char *argv0, *shell; 1605 const char *argv0, *shell;
1473 1606
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1476 1609
1477 argv0 = (const char *)rxvt_basename (shell); 1610 argv0 = rxvt_basename (shell);
1478 1611
1479 if (option (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1480 { 1613 {
1481 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1615

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines