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.170 by root, Sat Feb 18 15:24:39 2006 UTC vs.
Revision 1.204 by sasha, Thu Aug 9 22:08:21 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>
… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 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; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 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;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 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);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
258 int i, r_argc; 269 int i, r_argc;
259 char *val; 270 char *val;
260 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
261 272
262 /* 273 /*
263 * 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
264 */ 275 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
267 break; 278 break;
268 279
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 281
271 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
300 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]);
301 312
302 // using a local pointer decreases code size a lot 313 // using a local pointer decreases code size a lot
303 xa = display->xa; 314 xa = display->xa;
304 315
316 set (display);
317 extract_resources ();
318
305#if XFT 319#if XFT
306 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 322#endif
310 set (display);
311 323
312 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
313 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
314 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
315 330
316 for (int i = NUM_RESOURCES; i--; ) 331 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 332 if (rs [i] == resval_undef)
318 rs [i] = 0; 333 rs [i] = 0;
319 334
… …
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 438#endif
424 439
425#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
428 { 443 {
429 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 446
432 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
440 455
441#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 460#endif
446 461
447 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
622 * Initialize the command connection. 637 * Initialize the command connection.
623 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
624 */ 639 */
625 640
626#ifdef META8_OPTION 641#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 643#endif
629 644
630 get_ourmods (); 645 get_ourmods ();
631 646
632 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
638 653
639#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
… …
671 rxvt_color xcol; 686 rxvt_color xcol;
672 687
673 if (!set_color (xcol, name)) 688 if (!set_color (xcol, name))
674 { 689 {
675#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 692 name = def_colorName [1 - i];
678 else 693 else
679#endif 694#endif
680 name = def_colorName [i]; 695 name = def_colorName [i];
681 696
… …
749 alias_color (Color_topShadow, Color_White); 764 alias_color (Color_topShadow, Color_White);
750 } 765 }
751#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
752 767
753#ifdef OFF_FOCUS_FADING 768#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 770 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 771#endif
762} 772}
763 773
764/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 775/* color aliases, fg/bg bright-bold */
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
878{ 888{
879 XClassHint classHint; 889 XClassHint classHint;
880 XWMHints wmHint; 890 XWMHints wmHint;
881#if ENABLE_FRILLS 891#if ENABLE_FRILLS
882 MWMHints mwmhints; 892 MWMHints mwmhints = { };
883#endif 893#endif
884 XGCValues gcvalue; 894 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
886 Window top, parent; 896 Window top, parent;
887 897
… …
893 if (!set_fonts ()) 903 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 905
896 parent = display->root; 906 parent = display->root;
897 907
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 908 attributes.override_redirect = !!option (Opt_override_redirect);
899 909
900#if ENABLE_FRILLS 910#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
902 { 912 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 914 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
906 attributes.override_redirect = true; 916 attributes.override_redirect = true;
… …
956 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
958 968
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 970 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 972 wmHint.window_group = top;
963 973
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
966 976
… …
1023 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1035
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1037
1028 if (OPTION (Opt_pointerBlank)) 1038 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1030 else 1040 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1042
1033 vt_select_input (); 1043 vt_select_input ();
1034 1044
1035 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1036 1046
1037#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1039 && !OPTION (Opt_transparent))
1040 { 1049 {
1041 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1042 1051
1043 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1044 { 1053 {
1045 p++; 1054 p++;
1046 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1047 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1048 1059
1049 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true); 1061 scr_touch (true);
1051 } 1062 }
1052#endif 1063#endif
… …
1085 * GET TTY CURRENT STATE * 1096 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1097 * ------------------------------------------------------------------------- */
1087void 1098void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1100{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1101 /*
1092 * standard System V termios interface 1102 * standard System V termios interface
1093 */ 1103 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1105 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1173# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1174 | ECHOCTL | ECHOKE
1165# endif 1175# endif
1166 | ECHOE | ECHOK); 1176 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1177
1215 /* 1178 /*
1216 * Debugging 1179 * Debugging
1217 */ 1180 */
1218#ifdef DEBUG_TTYMODE 1181#ifdef DEBUG_TTYMODE
… …
1319 else 1282 else
1320#endif 1283#endif
1321 if (!pty->get ()) 1284 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1286
1324 pty->set_utf8_mode (enc_utf8);
1325
1326 /* set initial window size */
1327 tt_winch ();
1328
1329 int er; 1287 int er;
1330 1288
1331#ifndef NO_BACKSPACE_KEY 1289#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1]) 1290 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0]; 1291 er = key_backspace[0];
… …
1336 else 1294 else
1337#endif 1295#endif
1338 er = -1; 1296 er = -1;
1339 1297
1340 rxvt_get_ttymode (&tio, er); 1298 rxvt_get_ttymode (&tio, er);
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1300 pty->set_utf8_mode (enc_utf8);
1301
1302 /* set initial window size */
1303 tt_winch ();
1341 1304
1342#if ENABLE_FRILLS 1305#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1306 if (rs[Rs_pty_fd])
1344 return; 1307 return;
1345#endif 1308#endif
… …
1376 } 1339 }
1377 1340
1378 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1379 1342
1380 default: 1343 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1344 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1346
1384 pty->close_tty (); 1347 pty->close_tty ();
1385 1348
1386 child_ev.start (cmd_pid); 1349 child_ev.start (cmd_pid);
1387 1350
… …
1400int 1363int
1401rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1402{ 1365{
1403 char *login; 1366 char *login;
1404 1367
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1408 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1370#ifdef TIOCCONS
1410 unsigned int on = 1; 1371 unsigned int on = 1;
1411 1372
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1463 1424
1464 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1465 1426
1466 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1467 { 1428 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1469 1430
1470 login[0] = '-'; 1431 login[0] = '-';
1471 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);

Diff Legend

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