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.149 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.205 by sasha, Fri Aug 10 22:10:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226 187
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 188
234 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 191 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 193 ncol = 80;
241 nrow = 24; 194 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 198 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
247 200
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 202
252 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
256 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
257#endif 215#endif
258
259 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
260 227
261 return true; 228 return true;
262} 229}
263 230
264void 231void
… …
302 int i, r_argc; 269 int i, r_argc;
303 char *val; 270 char *val;
304 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
305 272
306 /* 273 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 275 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
311 break; 278 break;
312 279
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 281
315 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
341 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
342 309
343 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
346 extract_resources (); 317 extract_resources ();
347 318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
348 free (r_argv); 327 free (r_argv);
328
329 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
332
333#if ENABLE_PERL
334 if (!rs[Rs_perl_ext_1])
335 rs[Rs_perl_ext_1] = "default";
336
337 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
338 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
339 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
340 {
341 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 }
344#endif
349 345
350 /* 346 /*
351 * set any defaults not already set 347 * set any defaults not already set
352 */ 348 */
353 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 436#endif
441 437
442#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
445 { 441 {
446 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
444
448 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 447 }
451#endif 448#endif
452 449
… …
454 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
456 453
457#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 458#endif
462 459
463 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 501 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 502 rs[Rs_display_name] = (const char *)val;
506 503
507 if (val == NULL) 504 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 505#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 506 val = XDisplayString (dpy);
510 507
511 if (rs[Rs_display_name] == NULL) 508 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 509 rs[Rs_display_name] = val; /* use broken `:0' value */
513 510
514 i = strlen (val); 511 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 513
517 sprintf (env_display, "DISPLAY=%s", val); 514 sprintf (env_display, "DISPLAY=%s", val);
518 515
519 /* avoiding the math library: 516 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 517
529 /* add entries to the environment: 518 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 519 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 520 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 521 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 523 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 524 * @ COLORFGBG: fg;bg color codes
536 */ 525 */
537 putenv (env_display); 526 putenv (env_display);
538 putenv (env_windowid); 527 putenv (env_windowid);
528
539 if (env_colorfgbg) 529 if (env_colorfgbg)
540 putenv (env_colorfgbg); 530 putenv (env_colorfgbg);
541 531
542#ifdef RXVT_TERMINFO 532#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 533 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 534#endif
545 535
546 if (display->depth <= 2) 536 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 537 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 538 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 539 putenv ("COLORTERM=" COLORTERMENVFULL);
550 540
551 if (rs[Rs_term_name] != NULL) 541 if (rs[Rs_term_name] != NULL)
… …
645 * Initialize the command connection. 635 * Initialize the command connection.
646 * This should be called after the X server connection is established. 636 * This should be called after the X server connection is established.
647 */ 637 */
648 638
649#ifdef META8_OPTION 639#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 640 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 641#endif
652 642
653 get_ourmods (); 643 get_ourmods ();
654 644
655 if (!OPTION (Opt_scrollTtyOutput)) 645 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 646 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 647 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 648 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 649 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 650 priv_modes |= PrivMode_smoothScroll;
661 651
662#ifndef NO_BACKSPACE_KEY 652#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 653 if (strcmp (key_backspace, "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 654 priv_modes |= PrivMode_HaveBackSpace;
… …
682 672
683#ifdef OFF_FOCUS_FADING 673#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 674 pix_colors = pix_colors_focused;
685#endif 675#endif
686 676
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 677 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 678 {
679 const char *name = rs[Rs_color + i];
680
681 if (!name)
682 continue;
683
689 rxvt_color xcol; 684 rxvt_color xcol;
690 685
691 if (!rs[Rs_color + i]) 686 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 687 {
696#ifndef XTERM_REVERSE_VIDEO 688#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 689 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 690 name = def_colorName [1 - i];
699 else 691 else
700#endif 692#endif
701 rs[Rs_color + i] = def_colorName[i]; 693 name = def_colorName [i];
702 694
703 if (!rs[Rs_color + i]) 695 if (!name)
704 continue; 696 continue;
705 697
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 698 if (!set_color (xcol, name))
707 { 699 {
708 switch (i) 700 switch (i)
709 { 701 {
710 case Color_fg: 702 case Color_fg:
711 case Color_bg: 703 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 704 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 705 name = "";
715 break; 706 break;
716#ifndef NO_CURSORCOLOR 707#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 708 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 709#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 710 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 711 name = rs[Rs_color + Color_fg];
712 xcol.set (this, name);
723 break; 713 break;
724 default: 714 default:
725 xcol = pix_colors[Color_bg]; /* None */ 715 name = rs[Rs_color + Color_bg];
716 xcol.set (this, name);
726 break; 717 break;
727 } 718 }
728 } 719 }
729 } 720 }
730 721
731 pix_colors[i] = xcol; 722 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 723 rs[Rs_color + i] = name;
733 }
734
735#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif
740
741 if (display->depth <= 2)
742 { 724 }
725
726 if (depth <= 2)
727 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 728 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 729 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 730 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 731 }
747 732
748 /* 733 /*
749 * get scrollBar shadow colors 734 * get scrollBar shadow colors
750 * 735 *
751 * The calculations of topShadow/bottomShadow values are adapted 736 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 737 * from the fvwm window manager.
753 */ 738 */
754#ifdef KEEP_SCROLLCOLOR 739#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 740 if (depth <= 2)
757 { 741 {
758 /* Monochrome */ 742 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 743 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 744 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 745 alias_color (Color_bottomShadow, Color_bg);
762 } 746 }
763 else 747 else
764 { 748 {
765 rxvt_color xcol[2]; 749 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
766 /* xcol[0] == white
767 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */
769 750
770 xcol[1] = pix_colors[Color_scroll]; 751 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 752 pix_colors [Color_scroll].get (cscroll);
772
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774
775 xcol[0].get (display, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1);
777
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
779 753
780 /* topShadowColor */ 754 /* topShadowColor */
781 if (!xcol[1].set (display, 755 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 756 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 757 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 758 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 759 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 760 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 761 ))
762 alias_color (Color_topShadow, Color_White);
788 } 763 }
789#endif /* KEEP_SCROLLCOLOR */ 764#endif /* KEEP_SCROLLCOLOR */
765
766#ifdef OFF_FOCUS_FADING
767 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
768 update_fade_color (i);
769#endif
790} 770}
791 771
792/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 773/* color aliases, fg/bg bright-bold */
794void 774void
… …
833 813
834 if (rsmod 814 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
837 817
838 map = XGetModifierMapping (display->display); 818 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 819 kc = map->modifiermap;
840 820
841 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
842 { 822 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
846 { 826 {
847 if (kc[k] == 0) 827 if (kc[k] == 0)
848 break; 828 break;
849 829
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 830 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 831 {
852 case XK_Num_Lock: 832 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
854 continue; 834 continue;
855 835
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
906{ 886{
907 XClassHint classHint; 887 XClassHint classHint;
908 XWMHints wmHint; 888 XWMHints wmHint;
909#if ENABLE_FRILLS 889#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 890 MWMHints mwmhints = { };
912#endif 891#endif
913 XGCValues gcvalue; 892 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 894 Window top, parent;
917 dDisp;
918 895
919#ifdef USING_W11LIB 896 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 897
933 /* grab colors before netscape does */ 898 /* grab colors before netscape does */
934 Get_Colours (); 899 Get_Colours ();
935 900
936 if (!set_fonts ()) 901 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 903
939 parent = DefaultRootWindow (disp); 904 parent = display->root;
940 905
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!option (Opt_override_redirect);
942 907
943#if ENABLE_FRILLS 908#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 909 if (option (Opt_borderLess))
945 { 910 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 912 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951 attributes.override_redirect = TRUE; 914 attributes.override_redirect = true;
952 mwmhints.flags = 0; 915 mwmhints.flags = 0;
953 } 916 }
954 else 917 else
955 { 918 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 919 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
966 { 929 {
967 XWindowAttributes wattr; 930 XWindowAttributes wattr;
968 931
969 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
970 933
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 934 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 936
974 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
975 } 938 }
976#endif 939#endif
977 940
978 window_calc (0, 0); 941 window_calc (0, 0);
979 942
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 946 attributes.colormap = cmap;
947
984 top = XCreateWindow (disp, parent, 948 top = XCreateWindow (dpy, parent,
985 szHint.x, szHint.y, 949 szHint.x, szHint.y,
986 szHint.width, szHint.height, 950 szHint.width, szHint.height,
987 ext_bwidth, 951 ext_bwidth,
988 display->depth, InputOutput, 952 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 954 &attributes);
992 955
993 this->parent[0] = top; 956 this->parent[0] = top;
994 957
995 old_width = szHint.width; 958 old_width = szHint.width;
996 old_height = szHint.height; 959 old_height = szHint.height;
997 960
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 961 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 962 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 963
1001 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
1003 966
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 968 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 970 wmHint.window_group = top;
1008 971
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
974
975#if ENABLE_FRILLS
976 if (mwmhints.flags)
977 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979#endif
1011 980
1012 Atom protocols[] = { 981 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 983#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
1016#endif 985#endif
1017 }; 986 };
1018 987
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 989
1021#if ENABLE_FRILLS 990#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 991 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 992 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 993#endif
1025 994
1026#if ENABLE_EWMH 995#if ENABLE_EWMH
1027 long pid = getpid (); 996 long pid = getpid ();
1028 997
1029 XChangeProperty (disp, top, 998 XChangeProperty (dpy, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
1032 1001
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1003#endif
1035 1004
1036 XSelectInput (disp, top, 1005 XSelectInput (dpy, top,
1037 KeyPressMask 1006 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1008 | KeyReleaseMask
1040#endif 1009#endif
1041 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1043 1012
1044 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1045 1014
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1015 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1054 1017
1055#ifdef HAVE_SCROLLBARS 1018#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1058#endif 1021#endif
1059 1022
1060 /* the vt window */ 1023 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1024 vt = XCreateSimpleWindow (dpy, top,
1062 window_vt_x,
1063 window_vt_y, 1025 window_vt_x, window_vt_y,
1064 width,
1065 height, 1026 width, height,
1066 0, 1027 0,
1067 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1030
1073 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1075 1033
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1035
1078 if (OPTION (Opt_pointerBlank)) 1036 if (option (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
1080 else 1038 else
1081 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1082 1040
1083 vt_select_input (); 1041 vt_select_input ();
1084 1042
1085 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1086 1044
1087#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent))
1090 {
1091 const char *p = rs[Rs_backgroundPixmap];
1092
1093 if ((p = strchr (p, ';')) != NULL)
1094 {
1095 p++;
1096 scale_pixmap (p);
1097 }
1098
1099 set_bgPixmap (rs[Rs_backgroundPixmap]);
1100 scr_touch (true);
1101 }
1102#endif
1103
1104 /* graphics context for the vt window */ 1045 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1046 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1047 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1048 gcvalue.graphics_exposures = 0;
1049
1108 gc = XCreateGC (disp, vt, 1050 gc = XCreateGC (dpy, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1051 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1052 &gcvalue);
1111 1053
1112 drawable = new rxvt_drawable (display, vt); 1054 drawable = new rxvt_drawable (this, vt);
1113 1055
1114#ifdef RXVT_SCROLLBAR 1056#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1057 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1058 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1059 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1060 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1061 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1062 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121#endif 1063#endif
1122 1064
1123#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1066 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1067 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1068 pix_colors = pix_colors_unfocused;
1127#endif 1069#endif
1128 1070
1129 pointer_unblank (); 1071 pointer_unblank ();
1130 scr_recolour (); 1072 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1073}
1142 1074
1143/* ------------------------------------------------------------------------- * 1075/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1076 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1077 * ------------------------------------------------------------------------- */
1146void 1078void
1147rxvt_get_ttymode (ttymode_t *tio, int erase) 1079rxvt_get_ttymode (ttymode_t *tio, int erase)
1148{ 1080{
1149#ifdef HAVE_TERMIOS_H
1150 /* 1081 /*
1151 * standard System V termios interface 1082 * standard System V termios interface
1152 */ 1083 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1084 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 { 1085 {
… …
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1152 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE) 1153# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE 1154 | ECHOCTL | ECHOKE
1224# endif 1155# endif
1225 | ECHOE | ECHOK); 1156 | ECHOE | ECHOK);
1226# else /* HAVE_TERMIOS_H */
1227
1228 /*
1229 * sgtty interface
1230 */
1231
1232 /* get parameters -- gtty */
1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1234 {
1235 tio->sg.sg_erase = CERASE; /* ^H */
1236 tio->sg.sg_kill = CKILL; /* ^U */
1237 }
1238
1239 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase;
1241
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243
1244 /* get special characters */
1245 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1246 {
1247 tio->tc.t_intrc = CINTR; /* ^C */
1248 tio->tc.t_quitc = CQUIT; /* ^\ */
1249 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1;
1253 }
1254
1255 /* get local special chars */
1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1257 {
1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1260 tio->lc.t_rprntc = CRPRNT; /* ^R */
1261 tio->lc.t_flushc = CFLUSH; /* ^O */
1262 tio->lc.t_werasc = CWERASE; /* ^W */
1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1264 }
1265 /* get line discipline */
1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1267# ifdef NTTYDISC
1268 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */
1270
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */
1273 1157
1274 /* 1158 /*
1275 * Debugging 1159 * Debugging
1276 */ 1160 */
1277#ifdef DEBUG_TTYMODE 1161#ifdef DEBUG_TTYMODE
… …
1378 else 1262 else
1379#endif 1263#endif
1380 if (!pty->get ()) 1264 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1265 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1266
1383 pty->set_utf8_mode (enc_utf8);
1384
1385 /* set initial window size */
1386 tt_winch ();
1387
1388 int er; 1267 int er;
1389 1268
1390#ifndef NO_BACKSPACE_KEY 1269#ifndef NO_BACKSPACE_KEY
1391 if (key_backspace[0] && !key_backspace[1]) 1270 if (key_backspace[0] && !key_backspace[1])
1392 er = key_backspace[0]; 1271 er = key_backspace[0];
… …
1395 else 1274 else
1396#endif 1275#endif
1397 er = -1; 1276 er = -1;
1398 1277
1399 rxvt_get_ttymode (&tio, er); 1278 rxvt_get_ttymode (&tio, er);
1279 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1280 pty->set_utf8_mode (enc_utf8);
1281
1282 /* set initial window size */
1283 tt_winch ();
1400 1284
1401#if ENABLE_FRILLS 1285#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1286 if (rs[Rs_pty_fd])
1403 return; 1287 return;
1404#endif 1288#endif
… …
1435 } 1319 }
1436 1320
1437 _exit (EXIT_FAILURE); 1321 _exit (EXIT_FAILURE);
1438 1322
1439 default: 1323 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1324 if (!option (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1325 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1326
1445 pty->close_tty (); 1327 pty->close_tty ();
1446 1328
1447 child_ev.start (cmd_pid); 1329 child_ev.start (cmd_pid);
1448 1330
… …
1461int 1343int
1462rxvt_term::run_child (const char *const *argv) 1344rxvt_term::run_child (const char *const *argv)
1463{ 1345{
1464 char *login; 1346 char *login;
1465 1347
1466 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1467
1468 if (OPTION (Opt_console)) 1348 if (option (Opt_console))
1469 { /* be virtual console, fail silently */ 1349 { /* be virtual console, fail silently */
1470#ifdef TIOCCONS 1350#ifdef TIOCCONS
1471 unsigned int on = 1; 1351 unsigned int on = 1;
1472 1352
1473 ioctl (STDIN_FILENO, TIOCCONS, &on); 1353 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1522 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1402 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1523 shell = "/bin/sh"; 1403 shell = "/bin/sh";
1524 1404
1525 argv0 = (const char *)rxvt_r_basename (shell); 1405 argv0 = (const char *)rxvt_r_basename (shell);
1526 1406
1527 if (OPTION (Opt_loginShell)) 1407 if (option (Opt_loginShell))
1528 { 1408 {
1529 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1409 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1530 1410
1531 login[0] = '-'; 1411 login[0] = '-';
1532 strcpy (&login[1], argv0); 1412 strcpy (&login[1], argv0);

Diff Legend

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