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.130 by root, Wed Jan 4 04:42:45 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;
… …
673 if (menubar_visible ()) 677 if (menubar_visible ())
674 { 678 {
675 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
677 } 681 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 682
684 run_command (argv); 683 run_command (argv);
685} 684}
686 685
687/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
702 continue; 701 continue;
703 702
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 704 {
706#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
709 else 708 else
710#endif 709#endif
711 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
712 711
… …
737 } 736 }
738 } 737 }
739 } 738 }
740 739
741 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
742#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 748#endif
746 SET_PIXCOLOR (i);
747 }
748 749
749 if (display->depth <= 2) 750 if (display->depth <= 2)
750 { 751 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 752 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]; 753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
760 * from the fvwm window manager. 761 * from the fvwm window manager.
761 */ 762 */
762#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
763 764
764 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
765 { /* Monochrome */ 767 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 771 }
770 else 772 else
… …
932#endif 934#endif
933 935
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 938
937 if (options & Opt_transparent) 939 if (OPTION (Opt_transparent))
938 { 940 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 943 }
942 944
943#if ENABLE_FRILLS 945#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 946 if (OPTION (Opt_borderLess))
945 { 947 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
947 949
948 if (prop == None) 950 if (prop == None)
949 { 951 {
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 983 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 985
984 window_calc (wattr.width, wattr.height); 986 window_calc (wattr.width, wattr.height);
985 } 987 }
986
987#endif 988#endif
989
988 window_calc (0, 0); 990 window_calc (0, 0);
989 991
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 992 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT 993#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 994 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 995 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 996 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 997 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 998 szHint.x, szHint.y,
997 szHint.width, szHint.height, 999 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1000 ext_bwidth,
999 display->depth, InputOutput, 1001 display->depth, InputOutput,
1000 display->visual, 1002 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1002#else 1004#else
1003 top = XCreateSimpleWindow (disp, parent, 1005 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y, 1006 szHint.x, szHint.y,
1005 szHint.width, szHint.height, 1007 szHint.width, szHint.height,
1006 TermWin.ext_bwidth, 1008 ext_bwidth,
1007 pix_colors_focused[Color_border], 1009 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]); 1010 pix_colors_focused[Color_border]);
1009#endif 1011#endif
1010 1012
1011 TermWin.parent[0] = top; 1013 this->parent[0] = top;
1012 1014
1013 old_width = szHint.width; 1015 old_width = szHint.width;
1014 old_height = szHint.height; 1016 old_height = szHint.height;
1015 1017
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1021 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1022 classHint.res_class = (char *)RESCLASS;
1021 1023
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1024 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1025 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1027 wmHint.window_group = top;
1026 1028
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1030 &szHint, &wmHint, &classHint);
1029 1031
… …
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1071 /* cursor (menuBar/scrollBar): Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1073#endif
1072 1074
1073 /* the vt window */ 1075 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1076 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1077 window_vt_x,
1076 window_vt_y, 1078 window_vt_y,
1077 TermWin_TotalWidth (), 1079 width,
1078 TermWin_TotalHeight (), 1080 height,
1079 0, 1081 0,
1080 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1084#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1085 XStoreName (disp, vt, "vt window");
1084#endif 1086#endif
1085 1087
1086 attributes.bit_gravity = NorthWestGravity; 1088 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1090
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1092
1091#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1092 if (options & Opt_pointerBlank) 1094 if (OPTION (Opt_pointerBlank))
1093 vt_emask |= PointerMotionMask; 1095 vt_emask |= PointerMotionMask;
1094 else 1096 else
1095#endif 1097#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1099
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1100 XSelectInput (disp, vt, vt_emask);
1099 vt_ev.start (display, TermWin.vt); 1101 vt_ev.start (display, vt);
1100 1102
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ()) 1104 if (menuBar_height ())
1103 { 1105 {
1104 menuBar.win = XCreateSimpleWindow (disp, top, 1106 menuBar.win = XCreateSimpleWindow (disp, top,
1105 window_vt_x, 0, 1107 window_vt_x, 0,
1106 TermWin_TotalWidth (), 1108 width,
1107 menuBar_TotalHeight (), 1109 menuBar_TotalHeight (),
1108 0, 1110 0,
1109 pix_colors_focused[Color_fg], 1111 pix_colors_focused[Color_fg],
1110 pix_colors_focused[Color_scroll]); 1112 pix_colors_focused[Color_scroll]);
1111 1113
… …
1124 } 1126 }
1125#endif 1127#endif
1126 1128
1127#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1130 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1131 && ! OPTION (Opt_transparent))
1130 { 1132 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1133 const char *p = rs[Rs_backgroundPixmap];
1132 1134
1133 if ((p = strchr (p, ';')) != NULL) 1135 if ((p = strchr (p, ';')) != NULL)
1134 { 1136 {
… …
1143 1145
1144 /* graphics context for the vt window */ 1146 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1147 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1148 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1149 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1150 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1151 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1152 &gcvalue);
1151 1153
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1154 drawable = new rxvt_drawable (display, vt);
1153 1155
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1157 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1159 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1163#endif
1162 1164
1163#ifdef OFF_FOCUS_FADING 1165#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1166 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1167 if (rs[Rs_fade])
… …
1190 /* 1192 /*
1191 * standard System V termios interface 1193 * standard System V termios interface
1192 */ 1194 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1196 {
1195 /* return error - use system defaults */ 1197 // return error - use system defaults,
1198 // where possible, and zero elsewhere
1199 memset (tio, 0, sizeof (ttymode_t));
1200
1196 tio->c_cc[VINTR] = CINTR; 1201 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1202 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1203 tio->c_cc[VERASE] = CERASE;
1204#ifdef VERASE2
1205 tio->c_cc[VERASE2] = CERASE2;
1206#endif
1199 tio->c_cc[VKILL] = CKILL; 1207 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1208 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1209 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1210 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1211# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1212 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1213# endif
1207# ifdef VREPRINT 1214# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1215 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1216# endif
1211# ifdef VDISCRD 1217# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1218 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1219# endif
1215# ifdef VWERSE 1220# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1221 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1222# endif
1219# ifdef VLNEXT 1223# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1224 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1225# endif
1223
1224 } 1226 }
1227
1225 tio->c_cc[VEOF] = CEOF; 1228 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1229 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1230# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1231 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1232# endif
1231# ifdef VSWTC 1233# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1234 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1235# endif
1235# ifdef VSWTCH 1236# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1237 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1238# endif
1239# if VMIN != VEOF 1239# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1240 tio->c_cc[VMIN] = 1;
1242# endif 1241# endif
1243# if VTIME != VEOL 1242# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1243 tio->c_cc[VTIME] = 0;
1246# endif 1244# endif
1247 1245
1248 if (erase != -1) 1246 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1247 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1276 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1277 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1278 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1279 }
1280
1282 if (erase != -1) 1281 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1282 tio->sg.sg_erase = (char)erase;
1284 1283
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1285
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1291 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1292 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1293 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1294 tio->tc.t_brkc = -1;
1296 } 1295 }
1296
1297 /* get local special chars */ 1297 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1299 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1306 }
1307 /* get line discipline */ 1307 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1309# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1310 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1311# endif /* NTTYDISC */
1313 1312
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1314#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1337 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1338 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1339 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1340 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1341# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1342 FOO (IUCLC, "IUCLC");
1345# endif 1343# endif
1346# ifdef IXANY 1344# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1345 FOO (IXANY, "IXANY");
1349# endif 1346# endif
1350# ifdef IMAXBEL 1347# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1348 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1349# endif
1354 1350
1355 fprintf (stderr, "\n"); 1351 fprintf (stderr, "\n");
1356 1352
… …
1363 FOO (VERASE, "VERASE"); 1359 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1360 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1361 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1362 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1363# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1364 FOO (VEOL2, "VEOL2");
1370# endif 1365# endif
1371# ifdef VSWTC 1366# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1367 FOO (VSWTC, "VSWTC");
1374# endif 1368# endif
1375# ifdef VSWTCH 1369# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1370 FOO (VSWTCH, "VSWTCH");
1378# endif 1371# endif
1379
1380 FOO (VSTART, "VSTART"); 1372 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1373 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1374 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1375# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1376 FOO (VDSUSP, "VDSUSP");
1386# endif 1377# endif
1387# ifdef VREPRINT 1378# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1379 FOO (VREPRINT, "VREPRINT");
1390# endif 1380# endif
1391# ifdef VDISCRD 1381# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1382 FOO (VDISCRD, "VDISCRD");
1394# endif 1383# endif
1395# ifdef VWERSE 1384# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1385 FOO (VWERSE, "VWERSE");
1398# endif 1386# endif
1399# ifdef VLNEXT 1387# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1388 FOO (VLNEXT, "VLNEXT");
1402# endif 1389# endif
1403 1390
1404 fprintf (stderr, "\n"); 1391 fprintf (stderr, "\n");
1405# undef FOO 1392# undef FOO
… …
1418{ 1405{
1419#if ENABLE_FRILLS 1406#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1407 if (rs[Rs_pty_fd])
1421 { 1408 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1409 pty.pty = atoi (rs[Rs_pty_fd]);
1410
1411 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty);
1413
1423 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1424 } 1416 }
1425 else 1417 else
1426#endif 1418#endif
1427 if (!pty.get ()) 1419 if (!pty.get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1447 1439
1448#if ENABLE_FRILLS 1440#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1441 if (rs[Rs_pty_fd])
1450 return; 1442 return;
1451#endif 1443#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1444
1455#ifndef __QNX__ 1445#ifndef __QNX__
1456 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1458 { 1448 {
… …
1531{ 1521{
1532 char *login; 1522 char *login;
1533 1523
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1525
1536 if (options & Opt_console) 1526 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1527 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1528#ifdef TIOCCONS
1539 unsigned int on = 1; 1529 unsigned int on = 1;
1540 1530
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1531 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1582 shell = "/bin/sh";
1593 1583
1594 argv0 = (const char *)rxvt_r_basename (shell); 1584 argv0 = (const char *)rxvt_r_basename (shell);
1595 1585
1596 if (options & Opt_loginShell) 1586 if (OPTION (Opt_loginShell))
1597 { 1587 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1589
1600 login[0] = '-'; 1590 login[0] = '-';
1601 strcpy (&login[1], argv0); 1591 strcpy (&login[1], argv0);
… …
1636 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1637 command = "/bin/sh"; 1627 command = "/bin/sh";
1638 1628
1639 arg_a[0] = my_basename (command); 1629 arg_a[0] = my_basename (command);
1640 1630
1641 if (options & Opt_loginShell) 1631 if (OPTION (Opt_loginShell))
1642 { 1632 {
1643 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1644 1634
1645 login[0] = '-'; 1635 login[0] = '-';
1646 strcpy (&login[1], arg_a[0]); 1636 strcpy (&login[1], arg_a[0]);

Diff Legend

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