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.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];
… …
982 if (!XGetWindowAttributes (disp, parent, &wattr)) 986 if (!XGetWindowAttributes (disp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984 988
985 window_calc (wattr.width, wattr.height); 989 window_calc (wattr.width, wattr.height);
986 } 990 }
987
988#endif 991#endif
992
989 window_calc (0, 0); 993 window_calc (0, 0);
990 994
991 /* sub-window placement & size in rxvt_resize_subwindows () */ 995 /* sub-window placement & size in rxvt_resize_subwindows () */
992#ifdef PREFER_24BIT 996#ifdef PREFER_24BIT
993 attributes.background_pixel = pix_colors_focused[Color_border]; 997 attributes.background_pixel = pix_colors_focused[Color_border];
994 attributes.border_pixel = pix_colors_focused[Color_border]; 998 attributes.border_pixel = pix_colors_focused[Color_border];
995 attributes.colormap = display->cmap; 999 attributes.colormap = display->cmap;
996 top = XCreateWindow (disp, parent, 1000 top = XCreateWindow (disp, parent,
997 szHint.x, szHint.y, 1001 szHint.x, szHint.y,
998 szHint.width, szHint.height, 1002 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 1003 ext_bwidth,
1000 display->depth, InputOutput, 1004 display->depth, InputOutput,
1001 display->visual, 1005 display->visual,
1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1003#else 1007#else
1004 top = XCreateSimpleWindow (disp, parent, 1008 top = XCreateSimpleWindow (disp, parent,
1005 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
1006 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
1007 TermWin.ext_bwidth, 1011 ext_bwidth,
1008 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
1009 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1010#endif 1014#endif
1011 1015
1012 TermWin.parent[0] = top; 1016 this->parent[0] = top;
1013 1017
1014 old_width = szHint.width; 1018 old_width = szHint.width;
1015 old_height = szHint.height; 1019 old_height = szHint.height;
1016 1020
1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1070 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1072#endif 1076#endif
1073 1077
1074 /* the vt window */ 1078 /* the vt window */
1075 TermWin.vt = XCreateSimpleWindow (disp, top, 1079 vt = XCreateSimpleWindow (disp, top,
1076 window_vt_x, 1080 window_vt_x,
1077 window_vt_y, 1081 window_vt_y,
1078 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1079 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1080 0, 1084 0,
1081 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1083#ifdef DEBUG_X 1087#ifdef DEBUG_X
1084 XStoreName (disp, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1085#endif 1089#endif
1086 1090
1087 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1089 1093
1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1091 1095
1092#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1093 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1094 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1095 else 1099 else
1096#endif 1100#endif
1097 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1098 1102
1099 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1100 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1101 1105
1102#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1103 if (menuBar_height ()) 1107 if (menuBar_height ())
1104 { 1108 {
1105 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1144 1148
1145 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1146 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1147 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1148 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1149 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1150 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1151 &gcvalue); 1155 &gcvalue);
1152 1156
1153 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1154 1158
1155#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1156 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1157 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1158 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1159 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1161 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162#endif 1166#endif
1163 1167
1164#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1165 // initially we are in unfocused state 1169 // initially we are in unfocused state
1166 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
… …
1200 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1201 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1202 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1203 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1204# ifdef VDSUSP 1208# ifdef VDSUSP
1205
1206 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1207# endif 1210# endif
1208# ifdef VREPRINT 1211# ifdef VREPRINT
1209
1210 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1211# endif 1213# endif
1212# ifdef VDISCRD 1214# ifdef VDISCRD
1213
1214 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1215# endif 1216# endif
1216# ifdef VWERSE 1217# ifdef VWERSE
1217
1218 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1219# endif 1219# endif
1220# ifdef VLNEXT 1220# ifdef VLNEXT
1221
1222 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1223# endif 1222# endif
1224
1225 } 1223 }
1224
1226 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1227 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1228# ifdef VEOL2 1227# ifdef VEOL2
1229
1230 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1231# endif 1229# endif
1232# ifdef VSWTC 1230# ifdef VSWTC
1233
1234 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1235# endif 1232# endif
1236# ifdef VSWTCH 1233# ifdef VSWTCH
1237
1238 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1239# endif 1235# endif
1240# if VMIN != VEOF 1236# if VMIN != VEOF
1241
1242 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1243# endif 1238# endif
1244# if VTIME != VEOL 1239# if VTIME != VEOL
1245
1246 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1247# endif 1241# endif
1248 1242
1249 if (erase != -1) 1243 if (erase != -1)
1250 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279 { 1273 {
1280 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1281 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1282 } 1276 }
1277
1283 if (erase != -1) 1278 if (erase != -1)
1284 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1285 1280
1286 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1287 1282
… …
1293 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1294 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1295 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1296 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1297 } 1292 }
1293
1298 /* get local special chars */ 1294 /* get local special chars */
1299 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300 { 1296 {
1301 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1302 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1306 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1307 } 1303 }
1308 /* get line discipline */ 1304 /* get line discipline */
1309 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310# ifdef NTTYDISC 1306# ifdef NTTYDISC
1311
1312 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1313# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1314 1309
1315 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1316#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1339 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1340 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1341 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1342 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1343# ifdef IUCLC 1338# ifdef IUCLC
1344
1345 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1346# endif 1340# endif
1347# ifdef IXANY 1341# ifdef IXANY
1348
1349 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1350# endif 1343# endif
1351# ifdef IMAXBEL 1344# ifdef IMAXBEL
1352
1353 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1354# endif 1346# endif
1355 1347
1356 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1357 1349
… …
1364 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1365 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1366 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1367 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1368# ifdef VEOL2 1360# ifdef VEOL2
1369
1370 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1371# endif 1362# endif
1372# ifdef VSWTC 1363# ifdef VSWTC
1373
1374 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1375# endif 1365# endif
1376# ifdef VSWTCH 1366# ifdef VSWTCH
1377
1378 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1379# endif 1368# endif
1380
1381 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP 1372# ifdef VDSUSP
1385
1386 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1387# endif 1374# endif
1388# ifdef VREPRINT 1375# ifdef VREPRINT
1389
1390 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1391# endif 1377# endif
1392# ifdef VDISCRD 1378# ifdef VDISCRD
1393
1394 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1395# endif 1380# endif
1396# ifdef VWERSE 1381# ifdef VWERSE
1397
1398 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1399# endif 1383# endif
1400# ifdef VLNEXT 1384# ifdef VLNEXT
1401
1402 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1403# endif 1386# endif
1404 1387
1405 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1406# undef FOO 1389# undef FOO
… …
1448 1431
1449#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd]) 1433 if (rs[Rs_pty_fd])
1451 return; 1434 return;
1452#endif 1435#endif
1453
1454 sw_chld.start (SIGCHLD);
1455 1436
1456#ifndef __QNX__ 1437#ifndef __QNX__
1457 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1459 { 1440 {

Diff Legend

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