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.118 by root, Wed Aug 10 15:10:06 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",
… …
213 }; 218 };
214 219
215bool 220bool
216rxvt_term::init_vars () 221rxvt_term::init_vars ()
217{ 222{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 224#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 226#endif
225 pix_colors = pix_colors_focused; 227 pix_colors = pix_colors_focused;
226 228
227 if (pix_colors == NULL) 229 if (pix_colors == NULL)
228 return false; 230 return false;
229 231
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 233 pixmap = None;
232#endif 234#endif
233 235
234 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 239 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0; 241 focus = 0;
240 TermWin.ncol = 80; 242 ncol = 80;
241 TermWin.nrow = 24; 243 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
247 249
248 refresh_limit = 1; 250 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
369 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
371 } 373 }
372 374
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
375 377
376#if ENABLE_FRILLS 378#if ENABLE_FRILLS
377 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)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
379 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)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 387#endif
384 388
385#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 391 pointerBlankDelay = i;
388 else 392 else
389 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
390#endif 394#endif
391 395
392 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 397 if (!saveLines)
394 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
395 399
396#ifdef PRINTPIPE 400#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 403#endif
… …
442 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]);
443#endif 447#endif
444 448
445#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
448 { 452 {
449 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
459 463
460#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
463 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]);
464#endif 468#endif
465 469
466 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 471 color_aliases (Color_fg);
468 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 523
520 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
521 525
522 /* avoiding the math library: 526 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 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++)
525 ; 529 ;
526 MAX_IT (i, 1); 530 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 532
529 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
531 535
532 /* add entries to the environment: 536 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
644 * Initialize the command connection. 648 * Initialize the command connection.
645 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
646 */ 650 */
647 651
648#ifdef META8_OPTION 652#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 654#endif
651 655
652 get_ourmods (); 656 get_ourmods ();
653 657
654 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
660 664
661#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
675 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
677 } 681 }
678 682
679#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink) 684 if (OPTION (Opt_cursorBlink))
681 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
682#endif 686#endif
683 687
684 run_command (argv); 688 run_command (argv);
685} 689}
… …
702 continue; 706 continue;
703 707
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 709 {
706#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 711 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
709 else 713 else
710#endif 714#endif
711 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
712 716
… …
737 } 741 }
738 } 742 }
739 } 743 }
740 744
741 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
742#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 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]);
745#endif 753#endif
746 SET_PIXCOLOR (i);
747 }
748 754
749 if (display->depth <= 2) 755 if (display->depth <= 2)
750 { 756 {
751 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];
752 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];
… …
933#endif 939#endif
934 940
935 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
936 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
937 943
938 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
939 { 945 {
940 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
941 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
942 } 948 }
943 949
944#if ENABLE_FRILLS 950#if ENABLE_FRILLS
945 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
946 { 952 {
947 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
948 954
949 if (prop == None) 955 if (prop == None)
950 { 956 {
… …
982 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984 990
985 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
986 } 992 }
987
988#endif 993#endif
994
989 window_calc (0, 0); 995 window_calc (0, 0);
990 996
991 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
992#ifdef PREFER_24BIT 998#ifdef PREFER_24BIT
993 attributes.background_pixel = pix_colors_focused[Color_border]; 999 attributes.background_pixel = pix_colors_focused[Color_border];
994 attributes.border_pixel = pix_colors_focused[Color_border]; 1000 attributes.border_pixel = pix_colors_focused[Color_border];
995 attributes.colormap = display->cmap; 1001 attributes.colormap = display->cmap;
996 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (disp, parent,
997 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
998 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 1005 ext_bwidth,
1000 display->depth, InputOutput, 1006 display->depth, InputOutput,
1001 display->visual, 1007 display->visual,
1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1003#else 1009#else
1004 top = XCreateSimpleWindow (disp, parent, 1010 top = XCreateSimpleWindow (disp, parent,
1005 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1006 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1007 TermWin.ext_bwidth, 1013 ext_bwidth,
1008 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1009 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1010#endif 1016#endif
1011 1017
1012 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1013 1019
1014 old_width = szHint.width; 1020 old_width = szHint.width;
1015 old_height = szHint.height; 1021 old_height = szHint.height;
1016 1022
1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1020 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1021 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1022 1028
1023 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1024 wmHint.input = True; 1030 wmHint.input = True;
1025 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1026 wmHint.window_group = top; 1032 wmHint.window_group = top;
1027 1033
1028 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1029 &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1030 1036
… …
1070 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1072#endif 1078#endif
1073 1079
1074 /* the vt window */ 1080 /* the vt window */
1075 TermWin.vt = XCreateSimpleWindow (disp, top, 1081 vt = XCreateSimpleWindow (disp, top,
1076 window_vt_x, 1082 window_vt_x,
1077 window_vt_y, 1083 window_vt_y,
1078 TermWin_TotalWidth (), 1084 TermWin_TotalWidth (),
1079 TermWin_TotalHeight (), 1085 TermWin_TotalHeight (),
1080 0, 1086 0,
1081 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1083#ifdef DEBUG_X 1089#ifdef DEBUG_X
1084 XStoreName (disp, TermWin.vt, "vt window"); 1090 XStoreName (disp, vt, "vt window");
1085#endif 1091#endif
1086 1092
1087 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1089 1095
1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1091 1097
1092#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1093 if (options & Opt_pointerBlank) 1099 if (OPTION (Opt_pointerBlank))
1094 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1095 else 1101 else
1096#endif 1102#endif
1097 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1098 1104
1099 XSelectInput (disp, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1100 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1101 1107
1102#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1103 if (menuBar_height ()) 1109 if (menuBar_height ())
1104 { 1110 {
1105 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1125 } 1131 }
1126#endif 1132#endif
1127 1133
1128#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1129 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1130 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1131 { 1137 {
1132 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1133 1139
1134 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1135 { 1141 {
… …
1144 1150
1145 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1146 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1147 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1148 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1149 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1150 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1151 &gcvalue); 1157 &gcvalue);
1152 1158
1153 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1154 1160
1155#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1156 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1157 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1158 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1159 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1161 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162#endif 1168#endif
1163 1169
1164#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1165 // initially we are in unfocused state 1171 // initially we are in unfocused state
1166 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1191 /* 1197 /*
1192 * standard System V termios interface 1198 * standard System V termios interface
1193 */ 1199 */
1194 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1195 { 1201 {
1196 /* 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
1197 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1198 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1199 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1200 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1201 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1202 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1203 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1204# ifdef VDSUSP 1216# ifdef VDSUSP
1205
1206 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1207# endif 1218# endif
1208# ifdef VREPRINT 1219# ifdef VREPRINT
1209
1210 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1211# endif 1221# endif
1212# ifdef VDISCRD 1222# ifdef VDISCRD
1213
1214 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1215# endif 1224# endif
1216# ifdef VWERSE 1225# ifdef VWERSE
1217
1218 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1219# endif 1227# endif
1220# ifdef VLNEXT 1228# ifdef VLNEXT
1221
1222 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1223# endif 1230# endif
1224
1225 } 1231 }
1232
1226 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1227 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1228# ifdef VEOL2 1235# ifdef VEOL2
1229
1230 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1231# endif 1237# endif
1232# ifdef VSWTC 1238# ifdef VSWTC
1233
1234 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1235# endif 1240# endif
1236# ifdef VSWTCH 1241# ifdef VSWTCH
1237
1238 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1239# endif 1243# endif
1240# if VMIN != VEOF 1244# if VMIN != VEOF
1241
1242 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1243# endif 1246# endif
1244# if VTIME != VEOL 1247# if VTIME != VEOL
1245
1246 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1247# endif 1249# endif
1248 1250
1249 if (erase != -1) 1251 if (erase != -1)
1250 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279 { 1281 {
1280 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1281 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1282 } 1284 }
1285
1283 if (erase != -1) 1286 if (erase != -1)
1284 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1285 1288
1286 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1287 1290
… …
1293 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1294 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1295 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1296 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1297 } 1300 }
1301
1298 /* get local special chars */ 1302 /* get local special chars */
1299 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300 { 1304 {
1301 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1302 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1306 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1307 } 1311 }
1308 /* get line discipline */ 1312 /* get line discipline */
1309 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310# ifdef NTTYDISC 1314# ifdef NTTYDISC
1311
1312 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1313# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1314 1317
1315 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1316#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1339 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1340 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1341 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1342 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1343# ifdef IUCLC 1346# ifdef IUCLC
1344
1345 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1346# endif 1348# endif
1347# ifdef IXANY 1349# ifdef IXANY
1348
1349 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1350# endif 1351# endif
1351# ifdef IMAXBEL 1352# ifdef IMAXBEL
1352
1353 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1354# endif 1354# endif
1355 1355
1356 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1357 1357
… …
1364 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1365 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1366 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1367 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1368# ifdef VEOL2 1368# ifdef VEOL2
1369
1370 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1371# endif 1370# endif
1372# ifdef VSWTC 1371# ifdef VSWTC
1373
1374 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1375# endif 1373# endif
1376# ifdef VSWTCH 1374# ifdef VSWTCH
1377
1378 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1379# endif 1376# endif
1380
1381 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP 1380# ifdef VDSUSP
1385
1386 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1387# endif 1382# endif
1388# ifdef VREPRINT 1383# ifdef VREPRINT
1389
1390 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1391# endif 1385# endif
1392# ifdef VDISCRD 1386# ifdef VDISCRD
1393
1394 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1395# endif 1388# endif
1396# ifdef VWERSE 1389# ifdef VWERSE
1397
1398 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1399# endif 1391# endif
1400# ifdef VLNEXT 1392# ifdef VLNEXT
1401
1402 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1403# endif 1394# endif
1404 1395
1405 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1406# undef FOO 1397# undef FOO
… …
1419{ 1410{
1420#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1422 { 1413 {
1423 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
1424 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");
1425 } 1421 }
1426 else 1422 else
1427#endif 1423#endif
1428 if (!pty.get ()) 1424 if (!pty.get ())
1429 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1448 1444
1449#if ENABLE_FRILLS 1445#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd]) 1446 if (rs[Rs_pty_fd])
1451 return; 1447 return;
1452#endif 1448#endif
1453
1454 sw_chld.start (SIGCHLD);
1455 1449
1456#ifndef __QNX__ 1450#ifndef __QNX__
1457 /* spin off the command interpreter */ 1451 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1452 switch (cmd_pid = fork ())
1459 { 1453 {
… …
1532{ 1526{
1533 char *login; 1527 char *login;
1534 1528
1535 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1536 1530
1537 if (options & Opt_console) 1531 if (OPTION (Opt_console))
1538 { /* be virtual console, fail silently */ 1532 { /* be virtual console, fail silently */
1539#ifdef TIOCCONS 1533#ifdef TIOCCONS
1540 unsigned int on = 1; 1534 unsigned int on = 1;
1541 1535
1542 ioctl (STDIN_FILENO, TIOCCONS, &on); 1536 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1592 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1593 shell = "/bin/sh"; 1587 shell = "/bin/sh";
1594 1588
1595 argv0 = (const char *)rxvt_r_basename (shell); 1589 argv0 = (const char *)rxvt_r_basename (shell);
1596 1590
1597 if (options & Opt_loginShell) 1591 if (OPTION (Opt_loginShell))
1598 { 1592 {
1599 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1600 1594
1601 login[0] = '-'; 1595 login[0] = '-';
1602 strcpy (&login[1], argv0); 1596 strcpy (&login[1], argv0);
… …
1637 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1638 command = "/bin/sh"; 1632 command = "/bin/sh";
1639 1633
1640 arg_a[0] = my_basename (command); 1634 arg_a[0] = my_basename (command);
1641 1635
1642 if (options & Opt_loginShell) 1636 if (OPTION (Opt_loginShell))
1643 { 1637 {
1644 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1645 1639
1646 login[0] = '-'; 1640 login[0] = '-';
1647 strcpy (&login[1], arg_a[0]); 1641 strcpy (&login[1], arg_a[0]);

Diff Legend

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