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.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;
… …
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 CLR_OPTION (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;
411#endif 403#endif
… …
454 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]);
455#endif 447#endif
456 448
457#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
458 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
459 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
460 { 452 {
461 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
462 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
463 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
464 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
469 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
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 (OPTION (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
… …
656 * Initialize the command connection. 648 * Initialize the command connection.
657 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
658 */ 650 */
659 651
660#ifdef META8_OPTION 652#ifdef META8_OPTION
661 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
662#endif 654#endif
663 655
664 get_ourmods (); 656 get_ourmods ();
665 657
666 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
667 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
668 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
669 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
670 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
671 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
672 664
673#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
674 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
675 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
685 if (menubar_visible ()) 677 if (menubar_visible ())
686 { 678 {
687 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
688 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
689 } 681 }
690
691#ifdef CURSOR_BLINK
692 if (options & Opt_cursorBlink)
693 (void)gettimeofday (&lastcursorchange, NULL);
694#endif
695 682
696 run_command (argv); 683 run_command (argv);
697} 684}
698 685
699/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
714 continue; 701 continue;
715 702
716 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
717 { 704 {
718#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
719 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
720 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
721 else 708 else
722#endif 709#endif
723 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
724 711
… …
749 } 736 }
750 } 737 }
751 } 738 }
752 739
753 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
754#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
755 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
756 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]);
757#endif 748#endif
758 SET_PIXCOLOR (i);
759 }
760 749
761 if (display->depth <= 2) 750 if (display->depth <= 2)
762 { 751 {
763 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];
764 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];
… …
772 * from the fvwm window manager. 761 * from the fvwm window manager.
773 */ 762 */
774#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
775 764
776 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
777 { /* Monochrome */ 767 /* Monochrome */
778 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
779 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
780 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
781 } 771 }
782 else 772 else
… …
944#endif 934#endif
945 935
946 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
947 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
948 938
949 if (options & Opt_transparent) 939 if (OPTION (Opt_transparent))
950 { 940 {
951 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
952 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
953 } 943 }
954 944
955#if ENABLE_FRILLS 945#if ENABLE_FRILLS
956 if (options & Opt_borderLess) 946 if (OPTION (Opt_borderLess))
957 { 947 {
958 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
959 949
960 if (prop == None) 950 if (prop == None)
961 { 951 {
… …
993 if (!XGetWindowAttributes (disp, parent, &wattr)) 983 if (!XGetWindowAttributes (disp, parent, &wattr))
994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
995 985
996 window_calc (wattr.width, wattr.height); 986 window_calc (wattr.width, wattr.height);
997 } 987 }
998
999#endif 988#endif
989
1000 window_calc (0, 0); 990 window_calc (0, 0);
1001 991
1002 /* sub-window placement & size in rxvt_resize_subwindows () */ 992 /* sub-window placement & size in rxvt_resize_subwindows () */
1003#ifdef PREFER_24BIT 993#ifdef PREFER_24BIT
1004 attributes.background_pixel = pix_colors_focused[Color_border]; 994 attributes.background_pixel = pix_colors_focused[Color_border];
1005 attributes.border_pixel = pix_colors_focused[Color_border]; 995 attributes.border_pixel = pix_colors_focused[Color_border];
1006 attributes.colormap = display->cmap; 996 attributes.colormap = display->cmap;
1007 top = XCreateWindow (disp, parent, 997 top = XCreateWindow (disp, parent,
1008 szHint.x, szHint.y, 998 szHint.x, szHint.y,
1009 szHint.width, szHint.height, 999 szHint.width, szHint.height,
1010 TermWin.ext_bwidth, 1000 ext_bwidth,
1011 display->depth, InputOutput, 1001 display->depth, InputOutput,
1012 display->visual, 1002 display->visual,
1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1014#else 1004#else
1015 top = XCreateSimpleWindow (disp, parent, 1005 top = XCreateSimpleWindow (disp, parent,
1016 szHint.x, szHint.y, 1006 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1007 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1008 ext_bwidth,
1019 pix_colors_focused[Color_border], 1009 pix_colors_focused[Color_border],
1020 pix_colors_focused[Color_border]); 1010 pix_colors_focused[Color_border]);
1021#endif 1011#endif
1022 1012
1023 TermWin.parent[0] = top; 1013 this->parent[0] = top;
1024 1014
1025 old_width = szHint.width; 1015 old_width = szHint.width;
1026 old_height = szHint.height; 1016 old_height = szHint.height;
1027 1017
1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1031 classHint.res_name = (char *)rs[Rs_name]; 1021 classHint.res_name = (char *)rs[Rs_name];
1032 classHint.res_class = (char *)RESCLASS; 1022 classHint.res_class = (char *)RESCLASS;
1033 1023
1034 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1024 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1035 wmHint.input = True; 1025 wmHint.input = True;
1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1037 wmHint.window_group = top; 1027 wmHint.window_group = top;
1038 1028
1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1040 &szHint, &wmHint, &classHint); 1030 &szHint, &wmHint, &classHint);
1041 1031
… …
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1071 /* cursor (menuBar/scrollBar): Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif 1073#endif
1084 1074
1085 /* the vt window */ 1075 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1076 vt = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 1077 window_vt_x,
1088 window_vt_y, 1078 window_vt_y,
1089 TermWin_TotalWidth (), 1079 width,
1090 TermWin_TotalHeight (), 1080 height,
1091 0, 1081 0,
1092 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X 1084#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window"); 1085 XStoreName (disp, vt, "vt window");
1096#endif 1086#endif
1097 1087
1098 attributes.bit_gravity = NorthWestGravity; 1088 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1100 1090
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1092
1103#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1104 if (options & Opt_pointerBlank) 1094 if (OPTION (Opt_pointerBlank))
1105 vt_emask |= PointerMotionMask; 1095 vt_emask |= PointerMotionMask;
1106 else 1096 else
1107#endif 1097#endif
1108 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1109 1099
1110 XSelectInput (disp, TermWin.vt, vt_emask); 1100 XSelectInput (disp, vt, vt_emask);
1111 vt_ev.start (display, TermWin.vt); 1101 vt_ev.start (display, vt);
1112 1102
1113#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1114 if (menuBar_height ()) 1104 if (menuBar_height ())
1115 { 1105 {
1116 menuBar.win = XCreateSimpleWindow (disp, top, 1106 menuBar.win = XCreateSimpleWindow (disp, top,
1117 window_vt_x, 0, 1107 window_vt_x, 0,
1118 TermWin_TotalWidth (), 1108 width,
1119 menuBar_TotalHeight (), 1109 menuBar_TotalHeight (),
1120 0, 1110 0,
1121 pix_colors_focused[Color_fg], 1111 pix_colors_focused[Color_fg],
1122 pix_colors_focused[Color_scroll]); 1112 pix_colors_focused[Color_scroll]);
1123 1113
… …
1136 } 1126 }
1137#endif 1127#endif
1138 1128
1139#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
1140 if (rs[Rs_backgroundPixmap] != NULL 1130 if (rs[Rs_backgroundPixmap] != NULL
1141 && ! (options & Opt_transparent)) 1131 && ! OPTION (Opt_transparent))
1142 { 1132 {
1143 const char *p = rs[Rs_backgroundPixmap]; 1133 const char *p = rs[Rs_backgroundPixmap];
1144 1134
1145 if ((p = strchr (p, ';')) != NULL) 1135 if ((p = strchr (p, ';')) != NULL)
1146 { 1136 {
… …
1155 1145
1156 /* graphics context for the vt window */ 1146 /* graphics context for the vt window */
1157 gcvalue.foreground = pix_colors[Color_fg]; 1147 gcvalue.foreground = pix_colors[Color_fg];
1158 gcvalue.background = pix_colors[Color_bg]; 1148 gcvalue.background = pix_colors[Color_bg];
1159 gcvalue.graphics_exposures = 1; 1149 gcvalue.graphics_exposures = 1;
1160 TermWin.gc = XCreateGC (disp, TermWin.vt, 1150 gc = XCreateGC (disp, vt,
1161 GCForeground | GCBackground | GCGraphicsExposures, 1151 GCForeground | GCBackground | GCGraphicsExposures,
1162 &gcvalue); 1152 &gcvalue);
1163 1153
1164 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1154 drawable = new rxvt_drawable (display, vt);
1165 1155
1166#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1167 gcvalue.foreground = pix_colors[Color_topShadow]; 1157 gcvalue.foreground = pix_colors[Color_topShadow];
1168 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1159 gcvalue.foreground = pix_colors[Color_bottomShadow];
1170 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1172 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173#endif 1163#endif
1174 1164
1175#ifdef OFF_FOCUS_FADING 1165#ifdef OFF_FOCUS_FADING
1176 // initially we are in unfocused state 1166 // initially we are in unfocused state
1177 if (rs[Rs_fade]) 1167 if (rs[Rs_fade])
… …
1202 /* 1192 /*
1203 * standard System V termios interface 1193 * standard System V termios interface
1204 */ 1194 */
1205 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206 { 1196 {
1207 /* 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
1208 tio->c_cc[VINTR] = CINTR; 1201 tio->c_cc[VINTR] = CINTR;
1209 tio->c_cc[VQUIT] = CQUIT; 1202 tio->c_cc[VQUIT] = CQUIT;
1210 tio->c_cc[VERASE] = CERASE; 1203 tio->c_cc[VERASE] = CERASE;
1204#ifdef VERASE2
1205 tio->c_cc[VERASE2] = CERASE2;
1206#endif
1211 tio->c_cc[VKILL] = CKILL; 1207 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1208 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1209 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1210 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1211# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1212 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1213# endif
1219# ifdef VREPRINT 1214# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1215 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1216# endif
1223# ifdef VDISCRD 1217# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1218 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1219# endif
1227# ifdef VWERSE 1220# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1221 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1222# endif
1231# ifdef VLNEXT 1223# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1224 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1225# endif
1235
1236 } 1226 }
1227
1237 tio->c_cc[VEOF] = CEOF; 1228 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1229 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1230# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1231 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1232# endif
1243# ifdef VSWTC 1233# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1234 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1235# endif
1247# ifdef VSWTCH 1236# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1237 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1238# endif
1251# if VMIN != VEOF 1239# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1240 tio->c_cc[VMIN] = 1;
1254# endif 1241# endif
1255# if VTIME != VEOL 1242# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1243 tio->c_cc[VTIME] = 0;
1258# endif 1244# endif
1259 1245
1260 if (erase != -1) 1246 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1247 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1276 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1277 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1278 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1279 }
1280
1294 if (erase != -1) 1281 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1282 tio->sg.sg_erase = (char)erase;
1296 1283
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1285
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1291 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1292 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1293 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1294 tio->tc.t_brkc = -1;
1308 } 1295 }
1296
1309 /* get local special chars */ 1297 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1299 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1306 }
1319 /* get line discipline */ 1307 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1309# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1310 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1311# endif /* NTTYDISC */
1325 1312
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1314#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1337 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1338 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1339 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1340 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1341# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1342 FOO (IUCLC, "IUCLC");
1357# endif 1343# endif
1358# ifdef IXANY 1344# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1345 FOO (IXANY, "IXANY");
1361# endif 1346# endif
1362# ifdef IMAXBEL 1347# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1348 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1349# endif
1366 1350
1367 fprintf (stderr, "\n"); 1351 fprintf (stderr, "\n");
1368 1352
… …
1375 FOO (VERASE, "VERASE"); 1359 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1360 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1361 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1362 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1363# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1364 FOO (VEOL2, "VEOL2");
1382# endif 1365# endif
1383# ifdef VSWTC 1366# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1367 FOO (VSWTC, "VSWTC");
1386# endif 1368# endif
1387# ifdef VSWTCH 1369# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1370 FOO (VSWTCH, "VSWTCH");
1390# endif 1371# endif
1391
1392 FOO (VSTART, "VSTART"); 1372 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1373 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1374 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1375# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1376 FOO (VDSUSP, "VDSUSP");
1398# endif 1377# endif
1399# ifdef VREPRINT 1378# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1379 FOO (VREPRINT, "VREPRINT");
1402# endif 1380# endif
1403# ifdef VDISCRD 1381# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1382 FOO (VDISCRD, "VDISCRD");
1406# endif 1383# endif
1407# ifdef VWERSE 1384# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1385 FOO (VWERSE, "VWERSE");
1410# endif 1386# endif
1411# ifdef VLNEXT 1387# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1388 FOO (VLNEXT, "VLNEXT");
1414# endif 1389# endif
1415 1390
1416 fprintf (stderr, "\n"); 1391 fprintf (stderr, "\n");
1417# undef FOO 1392# undef FOO
… …
1430{ 1405{
1431#if ENABLE_FRILLS 1406#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd]) 1407 if (rs[Rs_pty_fd])
1433 { 1408 {
1434 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
1435 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");
1436 } 1416 }
1437 else 1417 else
1438#endif 1418#endif
1439 if (!pty.get ()) 1419 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1459 1439
1460#if ENABLE_FRILLS 1440#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd]) 1441 if (rs[Rs_pty_fd])
1462 return; 1442 return;
1463#endif 1443#endif
1464
1465 sw_chld.start (SIGCHLD);
1466 1444
1467#ifndef __QNX__ 1445#ifndef __QNX__
1468 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1469 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1470 { 1448 {
… …
1543{ 1521{
1544 char *login; 1522 char *login;
1545 1523
1546 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547 1525
1548 if (options & Opt_console) 1526 if (OPTION (Opt_console))
1549 { /* be virtual console, fail silently */ 1527 { /* be virtual console, fail silently */
1550#ifdef TIOCCONS 1528#ifdef TIOCCONS
1551 unsigned int on = 1; 1529 unsigned int on = 1;
1552 1530
1553 ioctl (STDIN_FILENO, TIOCCONS, &on); 1531 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1582 shell = "/bin/sh";
1605 1583
1606 argv0 = (const char *)rxvt_r_basename (shell); 1584 argv0 = (const char *)rxvt_r_basename (shell);
1607 1585
1608 if (options & Opt_loginShell) 1586 if (OPTION (Opt_loginShell))
1609 { 1587 {
1610 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1611 1589
1612 login[0] = '-'; 1590 login[0] = '-';
1613 strcpy (&login[1], argv0); 1591 strcpy (&login[1], argv0);
… …
1648 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1649 command = "/bin/sh"; 1627 command = "/bin/sh";
1650 1628
1651 arg_a[0] = my_basename (command); 1629 arg_a[0] = my_basename (command);
1652 1630
1653 if (options & Opt_loginShell) 1631 if (OPTION (Opt_loginShell))
1654 { 1632 {
1655 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656 1634
1657 login[0] = '-'; 1635 login[0] = '-';
1658 strcpy (&login[1], arg_a[0]); 1636 strcpy (&login[1], arg_a[0]);

Diff Legend

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