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.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.129 by root, Mon Jan 2 22:23:26 2006 UTC

… …
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
169 COLOR_SCROLLTROUGH, 171 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 172#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 173#if TINTING
172 NULL, 174 NULL,
173#endif 175#endif
176#if OFF_FOCUS_FADING
177 "black",
178#endif
174 }; 179 };
175 180
176const char *const xa_names[] = 181const char *const xa_names[] =
177 { 182 {
178 "TEXT", 183 "TEXT",
… …
181 "MULTIPLE", 186 "MULTIPLE",
182 "TARGETS", 187 "TARGETS",
183 "TIMESTAMP", 188 "TIMESTAMP",
184 "VT_SELECTION", 189 "VT_SELECTION",
185 "INCR", 190 "INCR",
191 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 192 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 193 "CLIPBOARD",
188#if ENABLE_FRILLS 194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
189 "_NET_WM_PID", 198 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 199 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
193#endif 202#endif
194#if USE_XIM 203#if USE_XIM
195 "WM_LOCALE_NAME", 204 "WM_LOCALE_NAME",
196#endif 205#endif
197#ifdef TRANSPARENT 206#ifdef TRANSPARENT
… …
200#endif 209#endif
201#ifdef OFFIX_DND 210#ifdef OFFIX_DND
202 "DndProtocol", 211 "DndProtocol",
203 "DndSelection", 212 "DndSelection",
204#endif 213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif
205 }; 218 };
206 219
207bool 220bool
208rxvt_term::init_vars () 221rxvt_term::init_vars ()
209{ 222{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 226#endif
217 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
218 228
219 if (pix_colors == NULL) 229 if (pix_colors == NULL)
220 return false; 230 return false;
221 231
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 233 pixmap = None;
224#endif 234#endif
225 235
226 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 239 want_refresh = 1;
230 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
231 TermWin.focus = 0; 241 focus = 0;
232 TermWin.ncol = 80; 242 ncol = 80;
233 TermWin.nrow = 24; 243 nrow = 24;
234 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
236 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
237 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
238 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
239 249
240 refresh_limit = 1; 250 refresh_limit = 1;
241 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
242 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
338 348
339 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
340 350
341#ifdef LOCAL_X_IS_UNIX
342 if (rs[Rs_display_name][0] == ':')
343 {
344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345 strcpy (val, "unix");
346 strcat (val, rs[Rs_display_name]);
347 display = displays.get (val);
348 free (val);
349 }
350#endif
351
352 if (!display
353 && ! (display = displays.get (rs[Rs_display_name]))) 351 if (!(display = displays.get (rs[Rs_display_name])))
354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355 353
356 extract_resources (); 354 extract_resources ();
357 free (r_argv); 355 free (r_argv);
358 356
… …
373 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
375 } 373 }
376 374
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
379 377
380#if ENABLE_FRILLS 378#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387#endif 387#endif
388 388
389#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391 pointerBlankDelay = i; 391 pointerBlankDelay = i;
392 else 392 else
393 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
394#endif 394#endif
395 395
396 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
397 if (!TermWin.saveLines) 397 if (!saveLines)
398 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
399 399
400#ifdef PRINTPIPE 400#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 403#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 447#endif
448 448
449#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
452 { 452 {
453 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
461 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
463 463
464#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
467 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 468#endif
469 469
470 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 471 color_aliases (Color_fg);
472 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 523
524 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
525 525
526 /* avoiding the math library: 526 /* avoiding the math library:
527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ; 529 ;
530 MAX_IT (i, 1); 530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532 532
533 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
535 535
536 /* add entries to the environment: 536 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
648 * Initialize the command connection. 648 * Initialize the command connection.
649 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
650 */ 650 */
651 651
652#ifdef META8_OPTION 652#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 654#endif
655 655
656 get_ourmods (); 656 get_ourmods ();
657 657
658 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
664 664
665#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
679 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
681 } 681 }
682 682
683#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink) 684 if (OPTION (Opt_cursorBlink))
685 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif 686#endif
687 687
688 run_command (argv); 688 run_command (argv);
689} 689}
… …
706 continue; 706 continue;
707 707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 709 {
710#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 711 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
713 else 713 else
714#endif 714#endif
715 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
716 716
… …
741 } 741 }
742 } 742 }
743 } 743 }
744 744
745 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
746#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 753#endif
750 SET_PIXCOLOR (i);
751 }
752 754
753 if (display->depth <= 2) 755 if (display->depth <= 2)
754 { 756 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
764 * from the fvwm window manager. 766 * from the fvwm window manager.
765 */ 767 */
766#ifdef KEEP_SCROLLCOLOR 768#ifdef KEEP_SCROLLCOLOR
767 769
768 if (display->depth <= 2) 770 if (display->depth <= 2)
771 {
769 { /* Monochrome */ 772 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 773 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 776 }
774 else 777 else
… …
925#endif 928#endif
926 XGCValues gcvalue; 929 XGCValues gcvalue;
927 long vt_emask; 930 long vt_emask;
928 XSetWindowAttributes attributes; 931 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 932 XWindowAttributes gattr;
930 Window top; 933 Window top, parent;
931 dDisp; 934 dDisp;
932 935
933#ifdef USING_W11LIB 936#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 937 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
936#endif 939#endif
937 940
938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
940 943
941 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
942 { 945 {
943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
944 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
945 } 948 }
946 949
947#if ENABLE_FRILLS 950#if ENABLE_FRILLS
948 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
949 { 952 {
950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
951 954
952 if (prop == None) 955 if (prop == None)
953 { 956 {
… …
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
964 } 967 }
965 } 968 }
966 else 969 else
967 {
968 mwmhints.flags = 0; 970 mwmhints.flags = 0;
969 }
970#endif 971#endif
971 972
972 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
973 Get_Colours (); 974 Get_Colours ();
974 975
975 if (!set_fonts ()) 976 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 978
978#if ENABLE_FRILLS 979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
980 { 983 {
981 top = strtol (rs[Rs_embed], 0, 0);
982
983 XWindowAttributes wattr; 984 XWindowAttributes wattr;
985
986 parent = strtol (rs[Rs_embed], 0, 0);
987
984 XGetWindowAttributes (disp, top, &wattr); 988 if (!XGetWindowAttributes (disp, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985 990
986 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
992 }
993#endif
987 994
988#if 0 995 window_calc (0, 0);
989 if (wattr.map_state == IsViewable) 996
990 { 997 /* sub-window placement & size in rxvt_resize_subwindows () */
991 TermWin.mapped = 1; 998#ifdef PREFER_24BIT
992 refresh_type = FAST_REFRESH; 999 attributes.background_pixel = pix_colors_focused[Color_border];
993 XClearWindow (disp, top); 1000 attributes.border_pixel = pix_colors_focused[Color_border];
994 // TODO: make XMapNotify-event-code a function and call it 1001 attributes.colormap = display->cmap;
995 // TODO: how can I detetc visibility without unmpa/map? 1002 top = XCreateWindow (disp, parent,
996 // TODO: focusin etc. 1003 szHint.x, szHint.y,
997 } 1004 szHint.width, szHint.height,
1005 ext_bwidth,
1006 display->depth, InputOutput,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
998#else 1009#else
999 // it'S easiets just to unmap/map to get all state correctly set-up 1010 top = XCreateSimpleWindow (disp, parent,
1000 XUnmapWindow (disp, top);
1001#endif
1002 }
1003 else
1004#endif
1005 {
1006 window_calc (0, 0);
1007
1008 /* sub-window placement & size in rxvt_resize_subwindows () */
1009#ifdef PREFER_24BIT
1010 attributes.background_pixel = pix_colors_focused[Color_border];
1011 attributes.border_pixel = pix_colors_focused[Color_border];
1012 attributes.colormap = display->cmap;
1013 top = XCreateWindow (disp, DefaultRootWindow (disp),
1014 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1015 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1016 TermWin.ext_bwidth, 1013 ext_bwidth,
1017 display->depth, InputOutput,
1018 display->visual,
1019 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1020#else
1021 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022 szHint.x, szHint.y,
1023 szHint.width, szHint.height,
1024 TermWin.ext_bwidth,
1025 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1026 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1027#endif 1016#endif
1028 }
1029 1017
1030 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1031 1019
1032 old_width = szHint.width; 1020 old_width = szHint.width;
1033 old_height = szHint.height; 1021 old_height = szHint.height;
1034 1022
1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1038 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1039 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1040 1028
1041 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1042 wmHint.input = True; 1030 wmHint.input = True;
1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1044 wmHint.window_group = top; 1032 wmHint.window_group = top;
1045 1033
1046 XSetWMProperties (disp, top, NULL, NULL, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1047 (char **)argv, argc, &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1048 1036
1049 /* Enable delete window protocol */ 1037 Atom protocols[] = {
1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1038 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING],
1041#endif
1042 };
1051 1043
1052#if ENABLE_FRILLS 1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045
1046#if ENABLE_EWMH
1053 long pid = getpid (); 1047 long pid = getpid ();
1054 1048
1055 XChangeProperty (disp, top, 1049 XChangeProperty (disp, top,
1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1057 PropModeReplace, (unsigned char *)&pid, 1); 1051 PropModeReplace, (unsigned char *)&pid, 1);
1052
1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1054#endif
1059 1055
1060 XSelectInput (disp, top, 1056 XSelectInput (disp, top,
1061 KeyPressMask 1057 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1059 | KeyReleaseMask
1064#endif 1060#endif
1065 | FocusChangeMask | VisibilityChangeMask 1061 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask
1067 | StructureNotifyMask); 1062 | ExposureMask | StructureNotifyMask);
1063
1068 termwin_ev.start (display, top); 1064 termwin_ev.start (display, top);
1069 1065
1070#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
1071 if (mwmhints.flags) 1067 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1080 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1082#endif 1078#endif
1083 1079
1084 /* the vt window */ 1080 /* the vt window */
1085 TermWin.vt = XCreateSimpleWindow (disp, top, 1081 vt = XCreateSimpleWindow (disp, top,
1086 window_vt_x, 1082 window_vt_x,
1087 window_vt_y, 1083 window_vt_y,
1088 TermWin_TotalWidth (), 1084 TermWin_TotalWidth (),
1089 TermWin_TotalHeight (), 1085 TermWin_TotalHeight (),
1090 0, 1086 0,
1091 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X 1089#ifdef DEBUG_X
1094 XStoreName (disp, TermWin.vt, "vt window"); 1090 XStoreName (disp, vt, "vt window");
1095#endif 1091#endif
1096 1092
1097 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1099 1095
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1097
1102 pointer_unblank ();
1103
1104#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1105 if (options & Opt_pointerBlank) 1099 if (OPTION (Opt_pointerBlank))
1106 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1107 else 1101 else
1108#endif 1102#endif
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1104
1111 XSelectInput (disp, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1112 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1113 1107
1114#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115 if (menuBar_height ()) 1109 if (menuBar_height ())
1116 { 1110 {
1117 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1137 } 1131 }
1138#endif 1132#endif
1139 1133
1140#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1141 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1142 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1143 { 1137 {
1144 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1145 1139
1146 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1147 { 1141 {
… …
1156 1150
1157 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1161 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1157 &gcvalue);
1164 1158
1165 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1166 1160
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1168 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174#endif 1168#endif
1175 1169
1176#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1171 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1173 pix_colors = pix_colors_unfocused;
1180#endif 1174#endif
1181 1175
1176 pointer_unblank ();
1182 scr_recolour (); 1177 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1187#endif
1183} 1188}
1184 1189
1185/* ------------------------------------------------------------------------- * 1190/* ------------------------------------------------------------------------- *
1186 * GET TTY CURRENT STATE * 1191 * GET TTY CURRENT STATE *
1187 * ------------------------------------------------------------------------- */ 1192 * ------------------------------------------------------------------------- */
… …
1192 /* 1197 /*
1193 * standard System V termios interface 1198 * standard System V termios interface
1194 */ 1199 */
1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1196 { 1201 {
1197 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1198 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1199 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1200 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1201 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1202 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1203 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1204 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1205# ifdef VDSUSP 1216# ifdef VDSUSP
1206
1207 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1208# endif 1218# endif
1209# ifdef VREPRINT 1219# ifdef VREPRINT
1210
1211 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1212# endif 1221# endif
1213# ifdef VDISCRD 1222# ifdef VDISCRD
1214
1215 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1216# endif 1224# endif
1217# ifdef VWERSE 1225# ifdef VWERSE
1218
1219 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1220# endif 1227# endif
1221# ifdef VLNEXT 1228# ifdef VLNEXT
1222
1223 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1224# endif 1230# endif
1225
1226 } 1231 }
1232
1227 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1228 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1229# ifdef VEOL2 1235# ifdef VEOL2
1230
1231 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1232# endif 1237# endif
1233# ifdef VSWTC 1238# ifdef VSWTC
1234
1235 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1236# endif 1240# endif
1237# ifdef VSWTCH 1241# ifdef VSWTCH
1238
1239 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1240# endif 1243# endif
1241# if VMIN != VEOF 1244# if VMIN != VEOF
1242
1243 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1244# endif 1246# endif
1245# if VTIME != VEOL 1247# if VTIME != VEOL
1246
1247 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1248# endif 1249# endif
1249 1250
1250 if (erase != -1) 1251 if (erase != -1)
1251 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1279 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1280 { 1281 {
1281 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1282 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1283 } 1284 }
1285
1284 if (erase != -1) 1286 if (erase != -1)
1285 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1286 1288
1287 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1288 1290
… …
1294 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1295 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1296 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1297 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1298 } 1300 }
1301
1299 /* get local special chars */ 1302 /* get local special chars */
1300 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1301 { 1304 {
1302 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1303 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1307 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1308 } 1311 }
1309 /* get line discipline */ 1312 /* get line discipline */
1310 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1311# ifdef NTTYDISC 1314# ifdef NTTYDISC
1312
1313 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1314# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1315 1317
1316 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1317#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1340 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1341 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1342 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1343 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1344# ifdef IUCLC 1346# ifdef IUCLC
1345
1346 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1347# endif 1348# endif
1348# ifdef IXANY 1349# ifdef IXANY
1349
1350 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1351# endif 1351# endif
1352# ifdef IMAXBEL 1352# ifdef IMAXBEL
1353
1354 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1355# endif 1354# endif
1356 1355
1357 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1358 1357
… …
1365 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1366 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1367 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1368 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1369# ifdef VEOL2 1368# ifdef VEOL2
1370
1371 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1372# endif 1370# endif
1373# ifdef VSWTC 1371# ifdef VSWTC
1374
1375 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1376# endif 1373# endif
1377# ifdef VSWTCH 1374# ifdef VSWTCH
1378
1379 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1380# endif 1376# endif
1381
1382 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1383 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1384 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1385# ifdef VDSUSP 1380# ifdef VDSUSP
1386
1387 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1388# endif 1382# endif
1389# ifdef VREPRINT 1383# ifdef VREPRINT
1390
1391 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1392# endif 1385# endif
1393# ifdef VDISCRD 1386# ifdef VDISCRD
1394
1395 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1396# endif 1388# endif
1397# ifdef VWERSE 1389# ifdef VWERSE
1398
1399 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1400# endif 1391# endif
1401# ifdef VLNEXT 1392# ifdef VLNEXT
1402
1403 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1404# endif 1394# endif
1405 1395
1406 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1407# undef FOO 1397# undef FOO
… …
1420{ 1410{
1421#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1422 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1423 { 1413 {
1424 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1425 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1421 }
1427 else 1422 else
1428#endif 1423#endif
1429 if (!pty.get ()) 1424 if (!pty.get ())
1430 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1449 1444
1450#if ENABLE_FRILLS 1445#if ENABLE_FRILLS
1451 if (rs[Rs_pty_fd]) 1446 if (rs[Rs_pty_fd])
1452 return; 1447 return;
1453#endif 1448#endif
1454
1455 sw_chld.start (SIGCHLD);
1456 1449
1457#ifndef __QNX__ 1450#ifndef __QNX__
1458 /* spin off the command interpreter */ 1451 /* spin off the command interpreter */
1459 switch (cmd_pid = fork ()) 1452 switch (cmd_pid = fork ())
1460 { 1453 {
… …
1533{ 1526{
1534 char *login; 1527 char *login;
1535 1528
1536 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1537 1530
1538 if (options & Opt_console) 1531 if (OPTION (Opt_console))
1539 { /* be virtual console, fail silently */ 1532 { /* be virtual console, fail silently */
1540#ifdef TIOCCONS 1533#ifdef TIOCCONS
1541 unsigned int on = 1; 1534 unsigned int on = 1;
1542 1535
1543 ioctl (STDIN_FILENO, TIOCCONS, &on); 1536 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1593 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1594 shell = "/bin/sh"; 1587 shell = "/bin/sh";
1595 1588
1596 argv0 = (const char *)rxvt_r_basename (shell); 1589 argv0 = (const char *)rxvt_r_basename (shell);
1597 1590
1598 if (options & Opt_loginShell) 1591 if (OPTION (Opt_loginShell))
1599 { 1592 {
1600 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1601 1594
1602 login[0] = '-'; 1595 login[0] = '-';
1603 strcpy (&login[1], argv0); 1596 strcpy (&login[1], argv0);
… …
1638 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1639 command = "/bin/sh"; 1632 command = "/bin/sh";
1640 1633
1641 arg_a[0] = my_basename (command); 1634 arg_a[0] = my_basename (command);
1642 1635
1643 if (options & Opt_loginShell) 1636 if (OPTION (Opt_loginShell))
1644 { 1637 {
1645 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646 1639
1647 login[0] = '-'; 1640 login[0] = '-';
1648 strcpy (&login[1], arg_a[0]); 1641 strcpy (&login[1], arg_a[0]);

Diff Legend

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