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.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 2007 UTC

… …
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 = 0; 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
… …
254/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
255const char ** 266const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
257{ 268{
258 int i, r_argc; 269 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
261 271
262 /* 272 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 274 */
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 294
285 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
286 } 296 }
287 297
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
289 299
290 /* 300 /*
291 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
292 */ 302 */
293 303
… …
308#if XFT 318#if XFT
309 if (rs[Rs_depth]) 319 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 320 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 321#endif
312 322
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
313 free (r_argv); 326 free (r_argv);
314 327
315 for (int i = NUM_RESOURCES; i--; ) 328 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 329 if (rs [i] == resval_undef)
317 rs [i] = 0; 330 rs [i] = 0;
… …
333 * set any defaults not already set 346 * set any defaults not already set
334 */ 347 */
335 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
336 { 349 {
337 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
341 } 354 }
342 else 355 else
343 { 356 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
382 395
383#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 400# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 402# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 403#endif
398 404
399#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 409# else
404 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 411# endif
414 if (rs[Rs_answerbackstring]) 412#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 413
420#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 416#endif
423 417
424#ifdef XTERM_REVERSE_VIDEO 418#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 419 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 420 if (option (Opt_reverseVideo))
427 { 421 {
428 if (!rs[Rs_color + Color_fg]) 422 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 423 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 424
431 if (!rs[Rs_color + Color_bg]) 425 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 431 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 432 rs[Rs_color + i] = def_colorName[i];
439 433
440#ifndef XTERM_REVERSE_VIDEO 434#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 435 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 436 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 437 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 438#endif
445 439
446 /* convenient aliases for setting fg/bg to colors */ 440 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 441 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
469void 463void
470rxvt_term::init_env () 464rxvt_term::init_env ()
471{ 465{
472 int i; 466 int i;
473 unsigned int u;
474 char *val; 467 char *val;
475 468
476#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 470 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 471 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 486
494 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
496 489
497 i = strlen (val); 490 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
499 492
500 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
501 494
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 496
… …
524 else 517 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
526 519
527 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
528 { 521 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 522 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 524 putenv (env_term);
532 } 525 }
533 else 526 else
534 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 614 * Initialize the command connection.
622 * This should be called after the X server connection is established. 615 * This should be called after the X server connection is established.
623 */ 616 */
624 617
625#ifdef META8_OPTION 618#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 619 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 620#endif
628 621
629 get_ourmods (); 622 get_ourmods ();
630 623
631 if (!OPTION (Opt_scrollTtyOutput)) 624 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 625 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 626 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
637 630
638#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
641#endif 634#endif
642 635
643 /* add value for scrollBar */ 636 /* add value for scrollBar */
644 if (scrollBar.state) 637 if (scrollBar.state)
… …
670 rxvt_color xcol; 663 rxvt_color xcol;
671 664
672 if (!set_color (xcol, name)) 665 if (!set_color (xcol, name))
673 { 666 {
674#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 669 name = def_colorName [1 - i];
677 else 670 else
678#endif 671#endif
679 name = def_colorName [i]; 672 name = def_colorName [i];
680 673
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 864rxvt_term::create_windows (int argc, const char *const *argv)
872{ 865{
873 XClassHint classHint; 866 XClassHint classHint;
874 XWMHints wmHint; 867 XWMHints wmHint;
875#if ENABLE_FRILLS 868#if ENABLE_FRILLS
876 MWMHints mwmhints; 869 MWMHints mwmhints = { };
877#endif 870#endif
878 XGCValues gcvalue; 871 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 872 XSetWindowAttributes attributes;
880 Window top, parent; 873 Window top, parent;
881 874
… …
887 if (!set_fonts ()) 880 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 882
890 parent = display->root; 883 parent = display->root;
891 884
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 885 attributes.override_redirect = !!option (Opt_override_redirect);
893 886
894#if ENABLE_FRILLS 887#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 888 if (option (Opt_borderLess))
896 { 889 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 891 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 892 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 893 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 894 }
903 else 895 else
904 { 896 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 898 }
908 } 899 }
909 else
910 mwmhints.flags = 0;
911#endif 900#endif
912 901
913#if ENABLE_XEMBED 902#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
915 { 904 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 939 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 940 classHint.res_class = (char *)RESCLASS;
952 941
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 942 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 943 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 944 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 945 wmHint.window_group = top;
957 946
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 947 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 948 &szHint, &wmHint, &classHint);
960 949
… …
1017 attributes.bit_gravity = NorthWestGravity; 1006 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1007 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1008
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1009 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1010
1022 if (OPTION (Opt_pointerBlank)) 1011 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1012 vt_emask |= PointerMotionMask;
1024 else 1013 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1015
1027 vt_select_input (); 1016 vt_select_input ();
1028 1017
1029 vt_ev.start (display, vt); 1018 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1019
1048 /* graphics context for the vt window */ 1020 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1023 gcvalue.graphics_exposures = 0;
… …
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1241
1270 int er; 1242 int er;
1271 1243
1272#ifndef NO_BACKSPACE_KEY 1244#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1246 er = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1248 er = '\177'; /* the initial state anyway */
1277 else 1249 else
1278#endif 1250#endif
1279 er = -1; 1251 er = -1;
1280 1252
… …
1322 } 1294 }
1323 1295
1324 _exit (EXIT_FAILURE); 1296 _exit (EXIT_FAILURE);
1325 1297
1326 default: 1298 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1299 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1300 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1301
1330 pty->close_tty (); 1302 pty->close_tty ();
1331 1303
1332 child_ev.start (cmd_pid); 1304 child_ev.start (cmd_pid);
1333 1305
… …
1346int 1318int
1347rxvt_term::run_child (const char *const *argv) 1319rxvt_term::run_child (const char *const *argv)
1348{ 1320{
1349 char *login; 1321 char *login;
1350 1322
1351 if (OPTION (Opt_console)) 1323 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1324 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1325#ifdef TIOCCONS
1354 unsigned int on = 1; 1326 unsigned int on = 1;
1355 1327
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1328 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1403 const char *argv0, *shell; 1375 const char *argv0, *shell;
1404 1376
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1407 1379
1408 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1409 1381
1410 if (OPTION (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1411 { 1383 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1385
1414 login[0] = '-'; 1386 login[0] = '-';
1415 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1416 argv0 = login; 1388 argv0 = login;
1417 } 1389 }

Diff Legend

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