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

Diff Legend

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