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.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.131 by root, Wed Jan 4 20:43:38 2006 UTC

… …
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 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
216 }; 216 };
217 217
218bool 218bool
219rxvt_term::init_vars () 219rxvt_term::init_vars ()
220{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 224#endif
228 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
229 226
230 if (pix_colors == NULL) 227 if (pix_colors == NULL)
231 return false; 228 return false;
232 229
233#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
234 TermWin.pixmap = None; 231 pixmap = None;
235#endif 232#endif
236 233
237 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
238 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
239 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
240 want_refresh = 1; 237 want_refresh = 1;
241 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
242 TermWin.focus = 0; 239 focus = 0;
243 TermWin.ncol = 80; 240 ncol = 80;
244 TermWin.nrow = 24; 241 nrow = 24;
245 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
247 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
248 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
249 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
250 247
251 refresh_limit = 1; 248 refresh_limit = 1;
252 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
253 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
372 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
374 } 371 }
375 372
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_SAVELINES);
378 375
379#if ENABLE_FRILLS 376#if ENABLE_FRILLS
380 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)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379
382 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)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386#endif 385#endif
387 386
388#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 389 pointerBlankDelay = i;
391 else 390 else
392 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
393#endif 392#endif
394 393
395 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 395 if (!saveLines)
397 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
398 397
399#ifdef PRINTPIPE 398#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
402#endif 401#endif
… …
445 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446#endif 445#endif
447 446
448#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
449 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
450 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
451 { 450 {
452 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
453 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
455 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
460 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
461 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
462 461
463#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
466 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]);
467#endif 466#endif
468 467
469 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 469 color_aliases (Color_fg);
471 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 521
523 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
524 523
525 /* avoiding the math library: 524 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 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++)
528 ; 527 ;
529 MAX_IT (i, 1); 528 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 530
532 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
534 533
535 /* add entries to the environment: 534 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
647 * Initialize the command connection. 646 * Initialize the command connection.
648 * This should be called after the X server connection is established. 647 * This should be called after the X server connection is established.
649 */ 648 */
650 649
651#ifdef META8_OPTION 650#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 652#endif
654 653
655 get_ourmods (); 654 get_ourmods ();
656 655
657 if (!(options & Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 657 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 658 if (OPTION (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 659 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 660 if (!OPTION (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 661 priv_modes |= PrivMode_smoothScroll;
663 662
664#ifndef NO_BACKSPACE_KEY 663#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 664 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 665 priv_modes |= PrivMode_HaveBackSpace;
… …
676 if (menubar_visible ()) 675 if (menubar_visible ())
677 { 676 {
678 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
679 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
680 } 679 }
681
682#ifdef CURSOR_BLINK
683 if (options & Opt_cursorBlink)
684 (void)gettimeofday (&lastcursorchange, NULL);
685#endif
686 680
687 run_command (argv); 681 run_command (argv);
688} 682}
689 683
690/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
… …
705 continue; 699 continue;
706 700
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 702 {
709#ifndef XTERM_REVERSE_VIDEO 703#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && (options & Opt_reverseVideo)) 704 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 705 rs[Rs_color + i] = def_colorName[!i];
712 else 706 else
713#endif 707#endif
714 rs[Rs_color + i] = def_colorName[i]; 708 rs[Rs_color + i] = def_colorName[i];
715 709
… …
812 int i = atoi (rs[Rs_color + idx]); 806 int i = atoi (rs[Rs_color + idx]);
813 807
814 if (i >= 8 && i <= 15) 808 if (i >= 8 && i <= 15)
815 { /* bright colors */ 809 { /* bright colors */
816 i -= 8; 810 i -= 8;
817#ifndef NO_BRIGHTCOLOR
818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819 return; 812 return;
820#endif
821 } 813 }
822 814
823 if (i >= 0 && i <= 7) /* normal colors */ 815 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 817 }
… …
938#endif 930#endif
939 931
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
942 934
943 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
944 { 936 {
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
947 } 939 }
948 940
949#if ENABLE_FRILLS 941#if ENABLE_FRILLS
950 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
951 { 943 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953 945
954 if (prop == None) 946 if (prop == None)
955 { 947 {
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 979 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 980 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 981
990 window_calc (wattr.width, wattr.height); 982 window_calc (wattr.width, wattr.height);
991 } 983 }
992
993#endif 984#endif
985
994 window_calc (0, 0); 986 window_calc (0, 0);
995 987
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 988 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT 989#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent, 993 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 994 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 995 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 996 ext_bwidth,
1005 display->depth, InputOutput, 997 display->depth, InputOutput,
1006 display->visual, 998 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else 1000#else
1009 top = XCreateSimpleWindow (disp, parent, 1001 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
1011 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
1012 TermWin.ext_bwidth, 1004 ext_bwidth,
1013 pix_colors_focused[Color_border], 1005 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]); 1006 pix_colors_focused[Color_border]);
1015#endif 1007#endif
1016 1008
1017 TermWin.parent[0] = top; 1009 this->parent[0] = top;
1018 1010
1019 old_width = szHint.width; 1011 old_width = szHint.width;
1020 old_height = szHint.height; 1012 old_height = szHint.height;
1021 1013
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1014 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1025 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1027 1019
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1021 wmHint.input = True;
1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1023 wmHint.window_group = top;
1032 1024
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1035 1027
… …
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1067 /* cursor (menuBar/scrollBar): Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1068 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1069#endif
1078 1070
1079 /* the vt window */ 1071 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1072 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x, 1073 window_vt_x,
1082 window_vt_y, 1074 window_vt_y,
1083 TermWin_TotalWidth (), 1075 width,
1084 TermWin_TotalHeight (), 1076 height,
1085 0, 1077 0,
1086 pix_colors_focused[Color_fg], 1078 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1079 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X 1080#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window"); 1081 XStoreName (disp, vt, "vt window");
1090#endif 1082#endif
1091 1083
1092 attributes.bit_gravity = NorthWestGravity; 1084 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1085 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1086
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1087 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1088
1097#ifdef POINTER_BLANK 1089#ifdef POINTER_BLANK
1098 if (options & Opt_pointerBlank) 1090 if (OPTION (Opt_pointerBlank))
1099 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1100 else 1092 else
1101#endif 1093#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1094 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1095
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1096 XSelectInput (disp, vt, vt_emask);
1105 vt_ev.start (display, TermWin.vt); 1097 vt_ev.start (display, vt);
1106 1098
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1099#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ()) 1100 if (menuBar_height ())
1109 { 1101 {
1110 menuBar.win = XCreateSimpleWindow (disp, top, 1102 menuBar.win = XCreateSimpleWindow (disp, top,
1111 window_vt_x, 0, 1103 window_vt_x, 0,
1112 TermWin_TotalWidth (), 1104 width,
1113 menuBar_TotalHeight (), 1105 menuBar_TotalHeight (),
1114 0, 1106 0,
1115 pix_colors_focused[Color_fg], 1107 pix_colors_focused[Color_fg],
1116 pix_colors_focused[Color_scroll]); 1108 pix_colors_focused[Color_scroll]);
1117 1109
… …
1130 } 1122 }
1131#endif 1123#endif
1132 1124
1133#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1134 if (rs[Rs_backgroundPixmap] != NULL 1126 if (rs[Rs_backgroundPixmap] != NULL
1135 && ! (options & Opt_transparent)) 1127 && ! OPTION (Opt_transparent))
1136 { 1128 {
1137 const char *p = rs[Rs_backgroundPixmap]; 1129 const char *p = rs[Rs_backgroundPixmap];
1138 1130
1139 if ((p = strchr (p, ';')) != NULL) 1131 if ((p = strchr (p, ';')) != NULL)
1140 { 1132 {
… …
1149 1141
1150 /* graphics context for the vt window */ 1142 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1143 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1144 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1145 gcvalue.graphics_exposures = 1;
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1146 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1147 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1148 &gcvalue);
1157 1149
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1150 drawable = new rxvt_drawable (display, vt);
1159 1151
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1152#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1153 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1154 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1155 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1156 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1157 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1158 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1159#endif
1168 1160
1169#ifdef OFF_FOCUS_FADING 1161#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1162 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1163 if (rs[Rs_fade])
… …
1196 /* 1188 /*
1197 * standard System V termios interface 1189 * standard System V termios interface
1198 */ 1190 */
1199 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1191 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200 { 1192 {
1201 /* return error - use system defaults */ 1193 // return error - use system defaults,
1194 // where possible, and zero elsewhere
1195 memset (tio, 0, sizeof (ttymode_t));
1196
1202 tio->c_cc[VINTR] = CINTR; 1197 tio->c_cc[VINTR] = CINTR;
1203 tio->c_cc[VQUIT] = CQUIT; 1198 tio->c_cc[VQUIT] = CQUIT;
1204 tio->c_cc[VERASE] = CERASE; 1199 tio->c_cc[VERASE] = CERASE;
1200#ifdef VERASE2
1201 tio->c_cc[VERASE2] = CERASE2;
1202#endif
1205 tio->c_cc[VKILL] = CKILL; 1203 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1204 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1205 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1206 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1207# ifdef VDSUSP
… …
1403{ 1401{
1404#if ENABLE_FRILLS 1402#if ENABLE_FRILLS
1405 if (rs[Rs_pty_fd]) 1403 if (rs[Rs_pty_fd])
1406 { 1404 {
1407 pty.pty = atoi (rs[Rs_pty_fd]); 1405 pty.pty = atoi (rs[Rs_pty_fd]);
1406
1407 if (getfd_hook)
1408 pty.pty = (*getfd_hook) (pty.pty);
1409
1408 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1410 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1411 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1409 } 1412 }
1410 else 1413 else
1411#endif 1414#endif
1412 if (!pty.get ()) 1415 if (!pty.get ())
1413 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1416 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1432 1435
1433#if ENABLE_FRILLS 1436#if ENABLE_FRILLS
1434 if (rs[Rs_pty_fd]) 1437 if (rs[Rs_pty_fd])
1435 return; 1438 return;
1436#endif 1439#endif
1437
1438 sw_chld.start (SIGCHLD);
1439 1440
1440#ifndef __QNX__ 1441#ifndef __QNX__
1441 /* spin off the command interpreter */ 1442 /* spin off the command interpreter */
1442 switch (cmd_pid = fork ()) 1443 switch (cmd_pid = fork ())
1443 { 1444 {
… …
1516{ 1517{
1517 char *login; 1518 char *login;
1518 1519
1519 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1520 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1520 1521
1521 if (options & Opt_console) 1522 if (OPTION (Opt_console))
1522 { /* be virtual console, fail silently */ 1523 { /* be virtual console, fail silently */
1523#ifdef TIOCCONS 1524#ifdef TIOCCONS
1524 unsigned int on = 1; 1525 unsigned int on = 1;
1525 1526
1526 ioctl (STDIN_FILENO, TIOCCONS, &on); 1527 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1576 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1577 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1577 shell = "/bin/sh"; 1578 shell = "/bin/sh";
1578 1579
1579 argv0 = (const char *)rxvt_r_basename (shell); 1580 argv0 = (const char *)rxvt_r_basename (shell);
1580 1581
1581 if (options & Opt_loginShell) 1582 if (OPTION (Opt_loginShell))
1582 { 1583 {
1583 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1584 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1584 1585
1585 login[0] = '-'; 1586 login[0] = '-';
1586 strcpy (&login[1], argv0); 1587 strcpy (&login[1], argv0);
… …
1621 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1622 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1622 command = "/bin/sh"; 1623 command = "/bin/sh";
1623 1624
1624 arg_a[0] = my_basename (command); 1625 arg_a[0] = my_basename (command);
1625 1626
1626 if (options & Opt_loginShell) 1627 if (OPTION (Opt_loginShell))
1627 { 1628 {
1628 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1629 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1629 1630
1630 login[0] = '-'; 1631 login[0] = '-';
1631 strcpy (&login[1], arg_a[0]); 1632 strcpy (&login[1], arg_a[0]);

Diff Legend

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