… | |
… | |
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 | want_refresh = 1; |
191 | want_refresh = 1; |
195 | priv_modes = SavedModes = PrivMode_Default; |
192 | priv_modes = SavedModes = PrivMode_Default; |
… | |
… | |
199 | ext_bwidth = EXTERNALBORDERWIDTH; |
196 | ext_bwidth = EXTERNALBORDERWIDTH; |
200 | lineSpace = LINESPACE; |
197 | lineSpace = LINESPACE; |
201 | saveLines = SAVELINES; |
198 | saveLines = SAVELINES; |
202 | numpix_colors = TOTAL_COLORS; |
199 | numpix_colors = TOTAL_COLORS; |
203 | |
200 | |
204 | refresh_limit = 1; |
|
|
205 | refresh_type = SLOW_REFRESH; |
201 | refresh_type = SLOW_REFRESH; |
206 | |
202 | |
207 | 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; */ |
208 | #ifdef XPM_BACKGROUND |
209 | #ifdef XPM_BACKGROUND |
209 | /* bgPixmap.w = bgPixmap.h = 0; */ |
|
|
210 | 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; |
211 | bgPixmap.pixmap = None; |
214 | bgPixmap.pixmap = None; |
212 | #endif |
215 | #endif |
213 | |
|
|
214 | last_bot = last_state = -1; |
216 | last_bot = last_state = -1; |
215 | |
217 | |
216 | set_option (Opt_scrollBar, 1); |
218 | set_option (Opt_scrollBar); |
217 | set_option (Opt_scrollTtyOutput, 1); |
219 | set_option (Opt_scrollTtyOutput); |
218 | set_option (Opt_jumpScroll, 1); |
220 | set_option (Opt_jumpScroll); |
|
|
221 | set_option (Opt_skipScroll); |
219 | set_option (Opt_secondaryScreen, 1); |
222 | set_option (Opt_secondaryScreen); |
220 | set_option (Opt_secondaryScroll, 1); |
223 | set_option (Opt_secondaryScroll); |
221 | set_option (Opt_pastableTabs, 1); |
224 | set_option (Opt_pastableTabs); |
222 | set_option (Opt_intensityStyles, 1); |
225 | set_option (Opt_intensityStyles); |
|
|
226 | set_option (Opt_iso14755_52); |
223 | |
227 | |
224 | return true; |
228 | return true; |
225 | } |
229 | } |
226 | |
230 | |
227 | void |
231 | void |
… | |
… | |
315 | #if XFT |
319 | #if XFT |
316 | if (rs[Rs_depth]) |
320 | if (rs[Rs_depth]) |
317 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
321 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
318 | #endif |
322 | #endif |
319 | |
323 | |
|
|
324 | #ifdef HAVE_AFTERIMAGE |
|
|
325 | asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); |
|
|
326 | #endif |
320 | free (r_argv); |
327 | free (r_argv); |
321 | |
328 | |
322 | for (int i = NUM_RESOURCES; i--; ) |
329 | for (int i = NUM_RESOURCES; i--; ) |
323 | if (rs [i] == resval_undef) |
330 | if (rs [i] == resval_undef) |
324 | rs [i] = 0; |
331 | rs [i] = 0; |
… | |
… | |
395 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
402 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
396 | # endif |
403 | # endif |
397 | else |
404 | else |
398 | { |
405 | { |
399 | val = strdup (rs[Rs_backspace_key]); |
406 | val = strdup (rs[Rs_backspace_key]); |
400 | rxvt_Str_trim (val); |
|
|
401 | rxvt_Str_escaped (val); |
|
|
402 | key_backspace = val; |
407 | key_backspace = val; |
403 | } |
408 | } |
404 | #endif |
409 | #endif |
405 | |
410 | |
406 | #ifndef NO_DELETE_KEY |
411 | #ifndef NO_DELETE_KEY |
… | |
… | |
411 | key_delete = "\033[3~"; |
416 | key_delete = "\033[3~"; |
412 | # endif |
417 | # endif |
413 | else |
418 | else |
414 | { |
419 | { |
415 | val = strdup (rs[Rs_delete_key]); |
420 | val = strdup (rs[Rs_delete_key]); |
416 | rxvt_Str_trim (val); |
|
|
417 | rxvt_Str_escaped (val); |
|
|
418 | key_delete = val; |
421 | key_delete = val; |
419 | } |
422 | } |
420 | #endif |
423 | #endif |
421 | if (rs[Rs_answerbackstring]) |
|
|
422 | { |
|
|
423 | rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); |
|
|
424 | rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); |
|
|
425 | } |
|
|
426 | |
424 | |
427 | #ifdef HAVE_SCROLLBARS |
425 | #ifdef HAVE_SCROLLBARS |
428 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
426 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
429 | #endif |
427 | #endif |
430 | |
428 | |
431 | #ifdef XTERM_REVERSE_VIDEO |
429 | #ifdef XTERM_REVERSE_VIDEO |
432 | /* this is how xterm implements reverseVideo */ |
430 | /* this is how xterm implements reverseVideo */ |
433 | if (OPTION (Opt_reverseVideo)) |
431 | if (option (Opt_reverseVideo)) |
434 | { |
432 | { |
435 | if (!rs[Rs_color + Color_fg]) |
433 | if (!rs[Rs_color + Color_fg]) |
436 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
434 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
437 | |
435 | |
438 | if (!rs[Rs_color + Color_bg]) |
436 | if (!rs[Rs_color + Color_bg]) |
… | |
… | |
444 | if (!rs[Rs_color + i]) |
442 | if (!rs[Rs_color + i]) |
445 | rs[Rs_color + i] = def_colorName[i]; |
443 | rs[Rs_color + i] = def_colorName[i]; |
446 | |
444 | |
447 | #ifndef XTERM_REVERSE_VIDEO |
445 | #ifndef XTERM_REVERSE_VIDEO |
448 | /* this is how we implement reverseVideo */ |
446 | /* this is how we implement reverseVideo */ |
449 | if (OPTION (Opt_reverseVideo)) |
447 | if (option (Opt_reverseVideo)) |
450 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
448 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
451 | #endif |
449 | #endif |
452 | |
450 | |
453 | /* convenient aliases for setting fg/bg to colors */ |
451 | /* convenient aliases for setting fg/bg to colors */ |
454 | color_aliases (Color_fg); |
452 | color_aliases (Color_fg); |
… | |
… | |
475 | /*----------------------------------------------------------------------*/ |
473 | /*----------------------------------------------------------------------*/ |
476 | void |
474 | void |
477 | rxvt_term::init_env () |
475 | rxvt_term::init_env () |
478 | { |
476 | { |
479 | int i; |
477 | int i; |
480 | unsigned int u; |
|
|
481 | char *val; |
478 | char *val; |
482 | |
479 | |
483 | #ifdef DISPLAY_IS_IP |
480 | #ifdef DISPLAY_IS_IP |
484 | /* Fixup display_name for export over pty to any interested terminal |
481 | /* Fixup display_name for export over pty to any interested terminal |
485 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
482 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
… | |
… | |
500 | |
497 | |
501 | if (rs[Rs_display_name] == NULL) |
498 | if (rs[Rs_display_name] == NULL) |
502 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
499 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
503 | |
500 | |
504 | i = strlen (val); |
501 | i = strlen (val); |
505 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
502 | env_display = (char *)rxvt_malloc (i + 9); |
506 | |
503 | |
507 | sprintf (env_display, "DISPLAY=%s", val); |
504 | sprintf (env_display, "DISPLAY=%s", val); |
508 | |
505 | |
509 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
506 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
510 | |
507 | |
… | |
… | |
531 | else |
528 | else |
532 | putenv ("COLORTERM=" COLORTERMENVFULL); |
529 | putenv ("COLORTERM=" COLORTERMENVFULL); |
533 | |
530 | |
534 | if (rs[Rs_term_name] != NULL) |
531 | if (rs[Rs_term_name] != NULL) |
535 | { |
532 | { |
536 | env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); |
533 | env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); |
537 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
534 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
538 | putenv (env_term); |
535 | putenv (env_term); |
539 | } |
536 | } |
540 | else |
537 | else |
541 | putenv ("TERM=" TERMENV); |
538 | putenv ("TERM=" TERMENV); |
… | |
… | |
628 | * Initialize the command connection. |
625 | * Initialize the command connection. |
629 | * This should be called after the X server connection is established. |
626 | * This should be called after the X server connection is established. |
630 | */ |
627 | */ |
631 | |
628 | |
632 | #ifdef META8_OPTION |
629 | #ifdef META8_OPTION |
633 | meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; |
630 | meta_char = option (Opt_meta8) ? 0x80 : C0_ESC; |
634 | #endif |
631 | #endif |
635 | |
632 | |
636 | get_ourmods (); |
633 | get_ourmods (); |
637 | |
634 | |
638 | if (!OPTION (Opt_scrollTtyOutput)) |
635 | if (!option (Opt_scrollTtyOutput)) |
639 | priv_modes |= PrivMode_TtyOutputInh; |
636 | priv_modes |= PrivMode_TtyOutputInh; |
640 | if (OPTION (Opt_scrollTtyKeypress)) |
637 | if (option (Opt_scrollTtyKeypress)) |
641 | priv_modes |= PrivMode_Keypress; |
638 | priv_modes |= PrivMode_Keypress; |
642 | if (!OPTION (Opt_jumpScroll)) |
639 | if (!option (Opt_jumpScroll)) |
643 | priv_modes |= PrivMode_smoothScroll; |
640 | priv_modes |= PrivMode_smoothScroll; |
644 | |
641 | |
645 | #ifndef NO_BACKSPACE_KEY |
642 | #ifndef NO_BACKSPACE_KEY |
646 | if (strcmp (key_backspace, "DEC") == 0) |
643 | if (strcmp (key_backspace, "DEC") == 0) |
647 | priv_modes |= PrivMode_HaveBackSpace; |
644 | priv_modes |= PrivMode_HaveBackSpace; |
… | |
… | |
677 | rxvt_color xcol; |
674 | rxvt_color xcol; |
678 | |
675 | |
679 | if (!set_color (xcol, name)) |
676 | if (!set_color (xcol, name)) |
680 | { |
677 | { |
681 | #ifndef XTERM_REVERSE_VIDEO |
678 | #ifndef XTERM_REVERSE_VIDEO |
682 | if (i < 2 && OPTION (Opt_reverseVideo)) |
679 | if (i < 2 && option (Opt_reverseVideo)) |
683 | name = def_colorName [1 - i]; |
680 | name = def_colorName [1 - i]; |
684 | else |
681 | else |
685 | #endif |
682 | #endif |
686 | name = def_colorName [i]; |
683 | name = def_colorName [i]; |
687 | |
684 | |
… | |
… | |
878 | rxvt_term::create_windows (int argc, const char *const *argv) |
875 | rxvt_term::create_windows (int argc, const char *const *argv) |
879 | { |
876 | { |
880 | XClassHint classHint; |
877 | XClassHint classHint; |
881 | XWMHints wmHint; |
878 | XWMHints wmHint; |
882 | #if ENABLE_FRILLS |
879 | #if ENABLE_FRILLS |
883 | MWMHints mwmhints; |
880 | MWMHints mwmhints = { }; |
884 | #endif |
881 | #endif |
885 | XGCValues gcvalue; |
882 | XGCValues gcvalue; |
886 | XSetWindowAttributes attributes; |
883 | XSetWindowAttributes attributes; |
887 | Window top, parent; |
884 | Window top, parent; |
888 | |
885 | |
… | |
… | |
894 | if (!set_fonts ()) |
891 | if (!set_fonts ()) |
895 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
892 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
896 | |
893 | |
897 | parent = display->root; |
894 | parent = display->root; |
898 | |
895 | |
899 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
896 | attributes.override_redirect = !!option (Opt_override_redirect); |
900 | |
897 | |
901 | #if ENABLE_FRILLS |
898 | #if ENABLE_FRILLS |
902 | if (OPTION (Opt_borderLess)) |
899 | if (option (Opt_borderLess)) |
903 | { |
900 | { |
904 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
901 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
905 | { |
902 | { |
906 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
903 | // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n"); |
907 | attributes.override_redirect = true; |
904 | attributes.override_redirect = true; |
908 | mwmhints.flags = 0; |
|
|
909 | } |
905 | } |
910 | else |
906 | else |
911 | { |
907 | { |
912 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
908 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
913 | mwmhints.decorations = 0; |
|
|
914 | } |
909 | } |
915 | } |
910 | } |
916 | else |
|
|
917 | mwmhints.flags = 0; |
|
|
918 | #endif |
911 | #endif |
919 | |
912 | |
920 | #if ENABLE_XEMBED |
913 | #if ENABLE_XEMBED |
921 | if (rs[Rs_embed]) |
914 | if (rs[Rs_embed]) |
922 | { |
915 | { |
… | |
… | |
957 | classHint.res_name = (char *)rs[Rs_name]; |
950 | classHint.res_name = (char *)rs[Rs_name]; |
958 | classHint.res_class = (char *)RESCLASS; |
951 | classHint.res_class = (char *)RESCLASS; |
959 | |
952 | |
960 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
953 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
961 | wmHint.input = True; |
954 | wmHint.input = True; |
962 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
955 | wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; |
963 | wmHint.window_group = top; |
956 | wmHint.window_group = top; |
964 | |
957 | |
965 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
958 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
966 | &szHint, &wmHint, &classHint); |
959 | &szHint, &wmHint, &classHint); |
967 | |
960 | |
… | |
… | |
1024 | attributes.bit_gravity = NorthWestGravity; |
1017 | attributes.bit_gravity = NorthWestGravity; |
1025 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1018 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1026 | |
1019 | |
1027 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1020 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1028 | |
1021 | |
1029 | if (OPTION (Opt_pointerBlank)) |
1022 | if (option (Opt_pointerBlank)) |
1030 | vt_emask |= PointerMotionMask; |
1023 | vt_emask |= PointerMotionMask; |
1031 | else |
1024 | else |
1032 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1025 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1033 | |
1026 | |
1034 | vt_select_input (); |
1027 | vt_select_input (); |
1035 | |
1028 | |
1036 | vt_ev.start (display, vt); |
1029 | vt_ev.start (display, vt); |
1037 | |
|
|
1038 | #ifdef XPM_BACKGROUND |
|
|
1039 | if (rs[Rs_backgroundPixmap] != NULL |
|
|
1040 | && !OPTION (Opt_transparent)) |
|
|
1041 | { |
|
|
1042 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
1043 | |
|
|
1044 | if ((p = strchr (p, ';')) != NULL) |
|
|
1045 | { |
|
|
1046 | p++; |
|
|
1047 | scale_pixmap (p); |
|
|
1048 | } |
|
|
1049 | |
|
|
1050 | set_bgPixmap (rs[Rs_backgroundPixmap]); |
|
|
1051 | scr_touch (true); |
|
|
1052 | } |
|
|
1053 | #endif |
|
|
1054 | |
1030 | |
1055 | /* graphics context for the vt window */ |
1031 | /* graphics context for the vt window */ |
1056 | gcvalue.foreground = pix_colors[Color_fg]; |
1032 | gcvalue.foreground = pix_colors[Color_fg]; |
1057 | gcvalue.background = pix_colors[Color_bg]; |
1033 | gcvalue.background = pix_colors[Color_bg]; |
1058 | gcvalue.graphics_exposures = 0; |
1034 | gcvalue.graphics_exposures = 0; |
… | |
… | |
1329 | } |
1305 | } |
1330 | |
1306 | |
1331 | _exit (EXIT_FAILURE); |
1307 | _exit (EXIT_FAILURE); |
1332 | |
1308 | |
1333 | default: |
1309 | default: |
1334 | if (!OPTION (Opt_utmpInhibit)) |
1310 | if (!option (Opt_utmpInhibit)) |
1335 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1311 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1336 | |
1312 | |
1337 | pty->close_tty (); |
1313 | pty->close_tty (); |
1338 | |
1314 | |
1339 | child_ev.start (cmd_pid); |
1315 | child_ev.start (cmd_pid); |
1340 | |
1316 | |
… | |
… | |
1353 | int |
1329 | int |
1354 | rxvt_term::run_child (const char *const *argv) |
1330 | rxvt_term::run_child (const char *const *argv) |
1355 | { |
1331 | { |
1356 | char *login; |
1332 | char *login; |
1357 | |
1333 | |
1358 | if (OPTION (Opt_console)) |
1334 | if (option (Opt_console)) |
1359 | { /* be virtual console, fail silently */ |
1335 | { /* be virtual console, fail silently */ |
1360 | #ifdef TIOCCONS |
1336 | #ifdef TIOCCONS |
1361 | unsigned int on = 1; |
1337 | unsigned int on = 1; |
1362 | |
1338 | |
1363 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1339 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
… | |
… | |
1412 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1388 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1413 | shell = "/bin/sh"; |
1389 | shell = "/bin/sh"; |
1414 | |
1390 | |
1415 | argv0 = (const char *)rxvt_r_basename (shell); |
1391 | argv0 = (const char *)rxvt_r_basename (shell); |
1416 | |
1392 | |
1417 | if (OPTION (Opt_loginShell)) |
1393 | if (option (Opt_loginShell)) |
1418 | { |
1394 | { |
1419 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1395 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1420 | |
1396 | |
1421 | login[0] = '-'; |
1397 | login[0] = '-'; |
1422 | strcpy (&login[1], argv0); |
1398 | strcpy (&login[1], argv0); |
1423 | argv0 = login; |
1399 | argv0 = login; |
1424 | } |
1400 | } |