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.125 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.149 by root, Thu Jan 19 09:47:15 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
49#ifndef NO_BRIGHTCOLOR
50 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
51 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
52 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
53 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
54 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */
68 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
69 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
71 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
258 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
259#endif 257#endif
260 258
261 last_bot = last_state = -1; 259 last_bot = last_state = -1;
262 260
263#ifdef MENUBAR
264 menu_readonly = 1;
265# if ! (MENUBAR_MAX > 1)
266 CurrentBar = &BarList;
267# endif /* (MENUBAR_MAX > 1) */
268#endif
269
270 return true; 261 return true;
271} 262}
272 263
273void 264void
274rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 333
343 /* 334 /*
344 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
345 */ 336 */
337
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
348 340
349 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
350 342
351 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 345
354 extract_resources (); 346 extract_resources ();
347
355 free (r_argv); 348 free (r_argv);
356 349
357 /* 350 /*
358 * set any defaults not already set 351 * set any defaults not already set
359 */ 352 */
… …
371 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
372 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
373 } 366 }
374 367
375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
376 saveLines = min (i, std::numeric_limits<int16_t>::max ()); 369 saveLines = min (i, MAX_SAVELINES);
377 370
378#if ENABLE_FRILLS 371#if ENABLE_FRILLS
379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 372 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381 374
… …
393 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
394#endif 387#endif
395 388
396 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 390 if (!saveLines)
398 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
399 392
400#ifdef PRINTPIPE 393#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 396#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 440#endif
448 441
449#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
452 { 445 {
453 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
461 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
463 456
464#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 461#endif
469 462
470 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 464 color_aliases (Color_fg);
… …
578 * This should support all European type languages. 571 * This should support all European type languages.
579 */ 572 */
580void 573void
581rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
582{ 575{
576 set_environ (envv);
577
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 579 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
586 581
587 if (!this->locale) 582 if (!this->locale)
588 { 583 {
589 if (*locale) 584 if (*locale)
590 { 585 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
593 } 588 }
594 else 589 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 591
597 this->locale = ""; 592 this->locale = "C";
598 } 593 }
599 594
600 595
601 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
617} 612}
618 613
619void 614void
620rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
621{ 616{
617 set_environ (envv);
618
622#ifdef USE_XIM 619#ifdef USE_XIM
623 if (!locale) 620 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 622 else
626 { 623 {
… …
648 * Initialize the command connection. 645 * Initialize the command connection.
649 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
650 */ 647 */
651 648
652#ifdef META8_OPTION 649#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 651#endif
655 652
656 get_ourmods (); 653 get_ourmods ();
657 654
658 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
664 661
665#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
668#endif 665#endif
669 666
670 /* add value for scrollBar */ 667 /* add value for scrollBar */
671 if (scrollbar_visible ()) 668 if (scrollBar.state)
672 { 669 {
673 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
675 } 672 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 673
688 run_command (argv); 674 run_command (argv);
689} 675}
690 676
691/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
706 continue; 692 continue;
707 693
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 695 {
710#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
713 else 699 else
714#endif 700#endif
715 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
716 702
… …
758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
759 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
760 } 746 }
761 747
762 /* 748 /*
763 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
764 * 750 *
765 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
766 * from the fvwm window manager. 752 * from the fvwm window manager.
767 */ 753 */
768#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
813 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
814 800
815 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
816 { /* bright colors */ 802 { /* bright colors */
817 i -= 8; 803 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 805 return;
821#endif
822 } 806 }
823 807
824 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 810 }
… …
925#if ENABLE_FRILLS 909#if ENABLE_FRILLS
926 Atom prop = None; 910 Atom prop = None;
927 MWMHints mwmhints; 911 MWMHints mwmhints;
928#endif 912#endif
929 XGCValues gcvalue; 913 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
932 XWindowAttributes gattr; 915 XWindowAttributes gattr;
933 Window top, parent; 916 Window top, parent;
934 dDisp; 917 dDisp;
935 918
… …
939#endif 922#endif
940 923
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
943 926
944 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
945 { 928 {
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
948 } 931 }
949 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
950#if ENABLE_FRILLS 943#if ENABLE_FRILLS
951 if (options & Opt_borderLess) 944 if (OPTION (Opt_borderLess))
952 { 945 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
954 947
955 if (prop == None) 948 if (prop == None)
956 { 949 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
960#endif
961 mwmhints.flags = 0; 952 mwmhints.flags = 0;
962 } 953 }
963 else 954 else
964 { 955 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 959 }
969 else 960 else
970 mwmhints.flags = 0; 961 mwmhints.flags = 0;
971#endif 962#endif
972 963
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED 964#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
983 { 966 {
984 XWindowAttributes wattr; 967 XWindowAttributes wattr;
985 968
… …
993#endif 976#endif
994 977
995 window_calc (0, 0); 978 window_calc (0, 0);
996 979
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
1001 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
1002 top = XCreateWindow (disp, parent, 984 top = XCreateWindow (disp, parent,
1003 szHint.x, szHint.y, 985 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 986 szHint.width, szHint.height,
1005 ext_bwidth, 987 ext_bwidth,
1006 display->depth, InputOutput, 988 display->depth, InputOutput,
1007 display->visual, 989 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 991 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 992
1018 this->parent[0] = top; 993 this->parent[0] = top;
1019 994
1020 old_width = szHint.width; 995 old_width = szHint.width;
1021 old_height = szHint.height; 996 old_height = szHint.height;
… …
1026 classHint.res_name = (char *)rs[Rs_name]; 1001 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1002 classHint.res_class = (char *)RESCLASS;
1028 1003
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1004 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 1005 wmHint.input = True;
1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1007 wmHint.window_group = top;
1033 1008
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1010 &szHint, &wmHint, &classHint);
1036 1011
… …
1041#endif 1016#endif
1042 }; 1017 };
1043 1018
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1020
1021#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif
1025
1046#if ENABLE_EWMH 1026#if ENABLE_EWMH
1047 long pid = getpid (); 1027 long pid = getpid ();
1048 1028
1049 XChangeProperty (disp, top, 1029 XChangeProperty (disp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1070#endif 1050#endif
1071 1051
1072 /* vt cursor: Black-on-White is standard, but this is more popular */ 1052 /* vt cursor: Black-on-White is standard, but this is more popular */
1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1074 1054
1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1076 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1078#endif 1058#endif
1079 1059
1080 /* the vt window */ 1060 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1061 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 1062 window_vt_x,
1083 window_vt_y, 1063 window_vt_y,
1084 TermWin_TotalWidth (), 1064 width,
1085 TermWin_TotalHeight (), 1065 height,
1086 0, 1066 0,
1087 pix_colors_focused[Color_fg], 1067 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1068 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X 1069#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window"); 1070 XStoreName (disp, vt, "vt window");
… …
1093 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095 1075
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1077
1098#ifdef POINTER_BLANK 1078 if (OPTION (Opt_pointerBlank))
1099 if (options & Opt_pointerBlank)
1100 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1101 else 1080 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1082
1105 XSelectInput (disp, vt, vt_emask); 1083 vt_select_input ();
1084
1106 vt_ev.start (display, vt); 1085 vt_ev.start (display, vt);
1107
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 TermWin_TotalWidth (),
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133 1086
1134#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! (options & Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1137 { 1090 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1091 const char *p = rs[Rs_backgroundPixmap];
1139 1092
1140 if ((p = strchr (p, ';')) != NULL) 1093 if ((p = strchr (p, ';')) != NULL)
1141 { 1094 {
… …
1156 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1110 &gcvalue);
1158 1111
1159 drawable = new rxvt_drawable (display, vt); 1112 drawable = new rxvt_drawable (display, vt);
1160 1113
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1197 /* 1150 /*
1198 * standard System V termios interface 1151 * standard System V termios interface
1199 */ 1152 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1154 {
1202 /* return error - use system defaults */ 1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1203 tio->c_cc[VINTR] = CINTR; 1159 tio->c_cc[VINTR] = CINTR;
1204 tio->c_cc[VQUIT] = CQUIT; 1160 tio->c_cc[VQUIT] = CQUIT;
1205 tio->c_cc[VERASE] = CERASE; 1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1206 tio->c_cc[VKILL] = CKILL; 1165 tio->c_cc[VKILL] = CKILL;
1207 tio->c_cc[VSTART] = CSTART; 1166 tio->c_cc[VSTART] = CSTART;
1208 tio->c_cc[VSTOP] = CSTOP; 1167 tio->c_cc[VSTOP] = CSTOP;
1209 tio->c_cc[VSUSP] = CSUSP; 1168 tio->c_cc[VSUSP] = CSUSP;
1210# ifdef VDSUSP 1169# ifdef VDSUSP
… …
1403rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1404{ 1363{
1405#if ENABLE_FRILLS 1364#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd]) 1365 if (rs[Rs_pty_fd])
1407 { 1366 {
1408 pty.pty = atoi (rs[Rs_pty_fd]); 1367 pty->pty = atoi (rs[Rs_pty_fd]);
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1368
1369 if (pty->pty >= 0)
1370 {
1371 if (getfd_hook)
1372 pty->pty = (*getfd_hook) (pty->pty);
1373
1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1376 }
1410 } 1377 }
1411 else 1378 else
1412#endif 1379#endif
1413 if (!pty.get ()) 1380 if (!pty->get ())
1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1415 1382
1416 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1417 1384
1418 /* set initial window size */ 1385 /* set initial window size */
1419 tt_winch (); 1386 tt_winch ();
1420 1387
1421 int er; 1388 int er;
… …
1434#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
1435 if (rs[Rs_pty_fd]) 1402 if (rs[Rs_pty_fd])
1436 return; 1403 return;
1437#endif 1404#endif
1438 1405
1439#ifndef __QNX__
1440 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1441 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1442 { 1408 {
1443 case -1: 1409 case -1:
1444 { 1410 {
… …
1446 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1447 } 1413 }
1448 case 0: 1414 case 0:
1449 init_env (); 1415 init_env ();
1450 1416
1451 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1452 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1453 else 1419 else
1454 { 1420 {
1455 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1456 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1457 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1458 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1459 1425
1460 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1461 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1462 { 1428 {
1463 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1464 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1465 } 1431 }
1466 1432
1467 run_child (argv); 1433 run_child (argv);
1468 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1469 } 1435 }
1470 1436
1471 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1472 1438
1473 default: 1439 default:
1474 {
1475#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1476 int fdstdin;
1477
1478 fdstdin = dup (STDIN_FILENO);
1479 dup2 (pty.tty, STDIN_FILENO);
1480#endif
1481
1482#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1483 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1484#endif 1443#endif
1485 1444
1486#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1487 1446
1488 dup2 (fdstdin, STDIN_FILENO); 1447 child_ev.start (cmd_pid);
1489 close (fdstdin);
1490#endif
1491 }
1492 1448
1493 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1449 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1494 break; 1450 break;
1495 } 1451 }
1496#else /* __QNX__ uses qnxspawn () */
1497 fchmod (pty.tty, 0622);
1498 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1499 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1500
1501 if (run_child (argv) == -1)
1502 exit (EXIT_FAILURE);
1503#endif
1504} 1452}
1505 1453
1506/* ------------------------------------------------------------------------- * 1454/* ------------------------------------------------------------------------- *
1507 * CHILD PROCESS OPERATIONS * 1455 * CHILD PROCESS OPERATIONS *
1508 * ------------------------------------------------------------------------- */ 1456 * ------------------------------------------------------------------------- */
… …
1515{ 1463{
1516 char *login; 1464 char *login;
1517 1465
1518 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1466 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1519 1467
1520 if (options & Opt_console) 1468 if (OPTION (Opt_console))
1521 { /* be virtual console, fail silently */ 1469 { /* be virtual console, fail silently */
1522#ifdef TIOCCONS 1470#ifdef TIOCCONS
1523 unsigned int on = 1; 1471 unsigned int on = 1;
1524 1472
1525 ioctl (STDIN_FILENO, TIOCCONS, &on); 1473 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1552 // unblock signals (signals are blocked by iom.C 1500 // unblock signals (signals are blocked by iom.C
1553 sigset_t ss; 1501 sigset_t ss;
1554 sigemptyset (&ss); 1502 sigemptyset (&ss);
1555 sigprocmask (SIG_SETMASK, &ss, 0); 1503 sigprocmask (SIG_SETMASK, &ss, 0);
1556 1504
1557#ifndef __QNX__
1558 /* command interpreter path */ 1505 /* command interpreter path */
1559 if (argv != NULL) 1506 if (argv != NULL)
1560 { 1507 {
1561# ifdef DEBUG_CMD 1508# ifdef DEBUG_CMD
1562 int i; 1509 int i;
… …
1568 execvp (argv[0], (char *const *)argv); 1515 execvp (argv[0], (char *const *)argv);
1569 /* no error message: STDERR is closed! */ 1516 /* no error message: STDERR is closed! */
1570 } 1517 }
1571 else 1518 else
1572 { 1519 {
1573 const char *argv0, *shell; 1520 const char *argv0, *shell;
1574 1521
1575 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1522 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1576 shell = "/bin/sh"; 1523 shell = "/bin/sh";
1577 1524
1578 argv0 = (const char *)rxvt_r_basename (shell); 1525 argv0 = (const char *)rxvt_r_basename (shell);
1579 1526
1580 if (options & Opt_loginShell) 1527 if (OPTION (Opt_loginShell))
1581 { 1528 {
1582 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1529 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1583 1530
1584 login[0] = '-'; 1531 login[0] = '-';
1585 strcpy (&login[1], argv0); 1532 strcpy (&login[1], argv0);
1586 argv0 = login; 1533 argv0 = login;
1587 } 1534 }
1535
1588 execlp (shell, argv0, NULL); 1536 execlp (shell, argv0, NULL);
1589 /* no error message: STDERR is closed! */ 1537 /* no error message: STDERR is closed! */
1590 } 1538 }
1591 1539
1592#else /* __QNX__ uses qnxspawn () */
1593
1594 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1595 char *command = NULL, fullcommand[_MAX_PATH];
1596 char **arg_v, *arg_a[2] = { NULL, NULL };
1597
1598 if (argv != NULL)
1599 {
1600 if (access (argv[0], X_OK) == -1)
1601 {
1602 if (strchr (argv[0], '/') == NULL)
1603 {
1604 searchenv (argv[0], "PATH", fullcommand);
1605
1606 if (fullcommand[0] != '\0')
1607 command = fullcommand;
1608 }
1609
1610 if (access (command, X_OK) == -1)
1611 return -1;
1612 }
1613 else
1614 command = argv[0];
1615
1616 arg_v = argv;
1617 }
1618 else
1619 {
1620 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1621 command = "/bin/sh";
1622
1623 arg_a[0] = my_basename (command);
1624
1625 if (options & Opt_loginShell)
1626 {
1627 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1628
1629 login[0] = '-';
1630 strcpy (&login[1], arg_a[0]);
1631 arg_a[0] = login;
1632 }
1633
1634 arg_v = arg_a;
1635 }
1636
1637 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1638 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1639 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1640 command, arg_v, environ, iov_a, 0);
1641 if (login)
1642 free (login);
1643
1644 pty.close_tty ();
1645 return pty.pty;
1646#endif
1647
1648 return -1; 1540 return -1;
1649} 1541}
1650 1542
1651/*----------------------- end-of-file (C source) -----------------------*/ 1543/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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