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.117 by root, Thu Jul 7 19:37:47 2005 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
213 }; 216 };
214 217
215bool 218bool
216rxvt_term::init_vars () 219rxvt_term::init_vars ()
217{ 220{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 224#endif
225 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
226 226
227 if (pix_colors == NULL) 227 if (pix_colors == NULL)
228 return false; 228 return false;
229 229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 231 pixmap = None;
232#endif 232#endif
233 233
234 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 237 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0; 239 focus = 0;
240 TermWin.ncol = 80; 240 ncol = 80;
241 TermWin.nrow = 24; 241 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
247 247
248 refresh_limit = 1; 248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
369 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
371 } 371 }
372 372
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
375 375
376#if ENABLE_FRILLS 376#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
383#endif 385#endif
384 386
385#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 389 pointerBlankDelay = i;
388 else 390 else
389 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
390#endif 392#endif
391 393
392 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 395 if (!saveLines)
394 options &= ~Opt_scrollBar; 396 options &= ~Opt_scrollBar;
395 397
396#ifdef PRINTPIPE 398#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
… …
458 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
459 461
460#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 466#endif
465 467
466 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 469 color_aliases (Color_fg);
468 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 521
520 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
521 523
522 /* avoiding the math library: 524 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 527 ;
526 MAX_IT (i, 1); 528 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 530
529 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
531 533
532 /* add entries to the environment: 534 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
737 } 739 }
738 } 740 }
739 } 741 }
740 742
741 pix_colors[i] = xcol; 743 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i);
745 }
746
742#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 751#endif
746 SET_PIXCOLOR (i);
747 }
748 752
749 if (display->depth <= 2) 753 if (display->depth <= 2)
750 { 754 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 755 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]; 756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
760 * from the fvwm window manager. 764 * from the fvwm window manager.
761 */ 765 */
762#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
763 767
764 if (display->depth <= 2) 768 if (display->depth <= 2)
769 {
765 { /* Monochrome */ 770 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 774 }
770 else 775 else
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 986 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 988
984 window_calc (wattr.width, wattr.height); 989 window_calc (wattr.width, wattr.height);
985 } 990 }
986
987#endif 991#endif
992
988 window_calc (0, 0); 993 window_calc (0, 0);
989 994
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 995 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT 996#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 997 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 998 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 999 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 1000 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 1001 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1002 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1003 ext_bwidth,
999 display->depth, InputOutput, 1004 display->depth, InputOutput,
1000 display->visual, 1005 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1002#else 1007#else
1003 top = XCreateSimpleWindow (disp, parent, 1008 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
1005 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
1006 TermWin.ext_bwidth, 1011 ext_bwidth,
1007 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1009#endif 1014#endif
1010 1015
1011 TermWin.parent[0] = top; 1016 this->parent[0] = top;
1012 1017
1013 old_width = szHint.width; 1018 old_width = szHint.width;
1014 old_height = szHint.height; 1019 old_height = szHint.height;
1015 1020
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1076#endif
1072 1077
1073 /* the vt window */ 1078 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1079 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1080 window_vt_x,
1076 window_vt_y, 1081 window_vt_y,
1077 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1078 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1079 0, 1084 0,
1080 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1087#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1084#endif 1089#endif
1085 1090
1086 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1093
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1095
1091#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1092 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1093 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1094 else 1099 else
1095#endif 1100#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1102
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1099 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1100 1105
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ()) 1107 if (menuBar_height ())
1103 { 1108 {
1104 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1143 1148
1144 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1155 &gcvalue);
1151 1156
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1153 1158
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1166#endif
1162 1167
1163#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1169 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
… …
1199 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1208# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1210# endif
1207# ifdef VREPRINT 1211# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1213# endif
1211# ifdef VDISCRD 1214# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1216# endif
1215# ifdef VWERSE 1217# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1219# endif
1219# ifdef VLNEXT 1220# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1222# endif
1223
1224 } 1223 }
1224
1225 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1227# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1229# endif
1231# ifdef VSWTC 1230# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1232# endif
1235# ifdef VSWTCH 1233# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1235# endif
1239# if VMIN != VEOF 1236# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1242# endif 1238# endif
1243# if VTIME != VEOL 1239# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1246# endif 1241# endif
1247 1242
1248 if (erase != -1) 1243 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1273 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1276 }
1277
1282 if (erase != -1) 1278 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1284 1280
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1282
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1296 } 1292 }
1293
1297 /* get local special chars */ 1294 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1296 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1303 }
1307 /* get line discipline */ 1304 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1306# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1313 1309
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1338# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1345# endif 1340# endif
1346# ifdef IXANY 1341# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1349# endif 1343# endif
1350# ifdef IMAXBEL 1344# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1346# endif
1354 1347
1355 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1356 1349
… …
1363 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1360# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1370# endif 1362# endif
1371# ifdef VSWTC 1363# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1374# endif 1365# endif
1375# ifdef VSWTCH 1366# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1378# endif 1368# endif
1379
1380 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1372# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1386# endif 1374# endif
1387# ifdef VREPRINT 1375# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1390# endif 1377# endif
1391# ifdef VDISCRD 1378# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1394# endif 1380# endif
1395# ifdef VWERSE 1381# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1398# endif 1383# endif
1399# ifdef VLNEXT 1384# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1402# endif 1386# endif
1403 1387
1404 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1405# undef FOO 1389# undef FOO
… …
1447 1431
1448#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1433 if (rs[Rs_pty_fd])
1450 return; 1434 return;
1451#endif 1435#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1436
1455#ifndef __QNX__ 1437#ifndef __QNX__
1456 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1458 { 1440 {

Diff Legend

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