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.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.127 by root, Fri Dec 23 14:46:34 2005 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;
… …
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 347 rs[Rs_display_name] = ":0";
346 348
347 get_options (r_argc, r_argv); 349 get_options (r_argc, r_argv);
348 350
349#ifdef LOCAL_X_IS_UNIX
350 if (rs[Rs_display_name][0] == ':')
351 {
352 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
353 strcpy (val, "unix");
354 strcat (val, rs[Rs_display_name]);
355 display = displays.get (val);
356 free (val);
357 }
358#endif
359
360 if (!display
361 && ! (display = displays.get (rs[Rs_display_name]))) 351 if (!(display = displays.get (rs[Rs_display_name])))
362 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]);
363 353
364 extract_resources (); 354 extract_resources ();
365 free (r_argv); 355 free (r_argv);
366 356
… …
381 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
382 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
383 } 373 }
384 374
385 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
386 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
387 377
388#if ENABLE_FRILLS 378#if ENABLE_FRILLS
389 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)
390 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
391 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)
392 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
393 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
394 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
395#endif 387#endif
396 388
397#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
398 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
399 pointerBlankDelay = i; 391 pointerBlankDelay = i;
400 else 392 else
401 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
402#endif 394#endif
403 395
404 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
405 if (!TermWin.saveLines) 397 if (!saveLines)
406 options &= ~Opt_scrollBar; 398 options &= ~Opt_scrollBar;
407 399
408#ifdef PRINTPIPE 400#ifdef PRINTPIPE
409 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
410 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
… …
470 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
471 463
472#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
473 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
474 if (options & Opt_reverseVideo) 466 if (options & Opt_reverseVideo)
475 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]);
476#endif 468#endif
477 469
478 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
479 color_aliases (Color_fg); 471 color_aliases (Color_fg);
480 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
530 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
531 523
532 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
533 525
534 /* avoiding the math library: 526 /* avoiding the math library:
535 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
536 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++)
537 ; 529 ;
538 MAX_IT (i, 1); 530 max_it (i, 1);
539 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
540 532
541 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
542 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
543 535
544 /* add entries to the environment: 536 /* add entries to the environment:
545 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
546 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
547 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
749 } 741 }
750 } 742 }
751 } 743 }
752 744
753 pix_colors[i] = xcol; 745 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i);
747 }
748
754#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
755 if (rs[Rs_fade]) 750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
756 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]);
757#endif 753#endif
758 SET_PIXCOLOR (i);
759 }
760 754
761 if (display->depth <= 2) 755 if (display->depth <= 2)
762 { 756 {
763 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];
764 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];
… …
772 * from the fvwm window manager. 766 * from the fvwm window manager.
773 */ 767 */
774#ifdef KEEP_SCROLLCOLOR 768#ifdef KEEP_SCROLLCOLOR
775 769
776 if (display->depth <= 2) 770 if (display->depth <= 2)
771 {
777 { /* Monochrome */ 772 /* Monochrome */
778 pix_colors[Color_scroll] = pix_colors[Color_fg]; 773 pix_colors[Color_scroll] = pix_colors[Color_fg];
779 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_topShadow] = pix_colors[Color_bg];
780 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
781 } 776 }
782 else 777 else
… …
993 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
995 990
996 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
997 } 992 }
998
999#endif 993#endif
994
1000 window_calc (0, 0); 995 window_calc (0, 0);
1001 996
1002 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
1003#ifdef PREFER_24BIT 998#ifdef PREFER_24BIT
1004 attributes.background_pixel = pix_colors_focused[Color_border]; 999 attributes.background_pixel = pix_colors_focused[Color_border];
1005 attributes.border_pixel = pix_colors_focused[Color_border]; 1000 attributes.border_pixel = pix_colors_focused[Color_border];
1006 attributes.colormap = display->cmap; 1001 attributes.colormap = display->cmap;
1007 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (disp, parent,
1008 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
1009 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
1010 TermWin.ext_bwidth, 1005 ext_bwidth,
1011 display->depth, InputOutput, 1006 display->depth, InputOutput,
1012 display->visual, 1007 display->visual,
1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1014#else 1009#else
1015 top = XCreateSimpleWindow (disp, parent, 1010 top = XCreateSimpleWindow (disp, parent,
1016 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1013 ext_bwidth,
1019 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1020 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1021#endif 1016#endif
1022 1017
1023 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1024 1019
1025 old_width = szHint.width; 1020 old_width = szHint.width;
1026 old_height = szHint.height; 1021 old_height = szHint.height;
1027 1022
1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
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#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1104 if (options & Opt_pointerBlank) 1099 if (options & Opt_pointerBlank)
1105 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1106 else 1101 else
1107#endif 1102#endif
1108 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1109 1104
1110 XSelectInput (disp, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1111 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1112 1107
1113#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1114 if (menuBar_height ()) 1109 if (menuBar_height ())
1115 { 1110 {
1116 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1155 1150
1156 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1157 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1158 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1159 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1160 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1161 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1162 &gcvalue); 1157 &gcvalue);
1163 1158
1164 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1165 1160
1166#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1167 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1168 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1170 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1172 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173#endif 1168#endif
1174 1169
1175#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1176 // initially we are in unfocused state 1171 // initially we are in unfocused state
1177 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1202 /* 1197 /*
1203 * standard System V termios interface 1198 * standard System V termios interface
1204 */ 1199 */
1205 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206 { 1201 {
1207 /* 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
1208 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1209 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1210 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1211 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1216# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1218# endif
1219# ifdef VREPRINT 1219# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1221# endif
1223# ifdef VDISCRD 1222# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1224# endif
1227# ifdef VWERSE 1225# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1227# endif
1231# ifdef VLNEXT 1228# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1230# endif
1235
1236 } 1231 }
1232
1237 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1235# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1237# endif
1243# ifdef VSWTC 1238# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1240# endif
1247# ifdef VSWTCH 1241# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1243# endif
1251# if VMIN != VEOF 1244# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1254# endif 1246# endif
1255# if VTIME != VEOL 1247# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1258# endif 1249# endif
1259 1250
1260 if (erase != -1) 1251 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1281 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1284 }
1285
1294 if (erase != -1) 1286 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1296 1288
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1290
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1308 } 1300 }
1301
1309 /* get local special chars */ 1302 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1304 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1311 }
1319 /* get line discipline */ 1312 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1314# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1325 1317
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1346# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1357# endif 1348# endif
1358# ifdef IXANY 1349# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1361# endif 1351# endif
1362# ifdef IMAXBEL 1352# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1354# endif
1366 1355
1367 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1368 1357
… …
1375 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1368# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1382# endif 1370# endif
1383# ifdef VSWTC 1371# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1386# endif 1373# endif
1387# ifdef VSWTCH 1374# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1390# endif 1376# endif
1391
1392 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1380# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1398# endif 1382# endif
1399# ifdef VREPRINT 1383# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1402# endif 1385# endif
1403# ifdef VDISCRD 1386# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1406# endif 1388# endif
1407# ifdef VWERSE 1389# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1410# endif 1391# endif
1411# ifdef VLNEXT 1392# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1414# endif 1394# endif
1415 1395
1416 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1417# undef FOO 1397# undef FOO
… …
1430{ 1410{
1431#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1433 { 1413 {
1434 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
1435 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");
1436 } 1421 }
1437 else 1422 else
1438#endif 1423#endif
1439 if (!pty.get ()) 1424 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1459 1444
1460#if ENABLE_FRILLS 1445#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd]) 1446 if (rs[Rs_pty_fd])
1462 return; 1447 return;
1463#endif 1448#endif
1464
1465 sw_chld.start (SIGCHLD);
1466 1449
1467#ifndef __QNX__ 1450#ifndef __QNX__
1468 /* spin off the command interpreter */ 1451 /* spin off the command interpreter */
1469 switch (cmd_pid = fork ()) 1452 switch (cmd_pid = fork ())
1470 { 1453 {

Diff Legend

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