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

Diff Legend

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