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.40 by pcg, Sun Mar 14 23:14:39 2004 UTC vs.
Revision 1.65 by root, Fri Jul 30 16:13:46 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
327#endif 328#endif
328#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
332 333#if TINTING
334 NULL,
335#endif
333 }; 336 };
334 337
335const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
336 { 339 {
337 "TEXT", 340 "TEXT",
… …
354 }; 357 };
355 358
356bool 359bool
357rxvt_term::init_vars () 360rxvt_term::init_vars ()
358{ 361{
359 PixColors = new rxvt_color [TOTAL_COLORS]; 362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused;
367
360 if (PixColors == NULL) 368 if (PixColors == NULL)
361 return false; 369 return false;
362 370
363#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
364 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
494 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
495 503
496 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
497 } 505 }
498 506
499 /* clear all resources */
500 for (i = 0; i < NUM_RESOURCES;)
501 rs[i++] = NULL;
502
503 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
504 508
505 /* 509 /*
506 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
507 */ 511 */
… …
522 } 526 }
523#endif 527#endif
524 528
525 if (!display 529 if (!display
526 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
527 {
528 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
529 exit (EXIT_FAILURE);
530 }
531 532
532 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
533 534
534 /* 535 /*
535 * set any defaults not already set 536 * set any defaults not already set
… …
651 color_aliases (Color_bg); 652 color_aliases (Color_bg);
652#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
653 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
654 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
655#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
656 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
657 color_aliases (Color_border); 659 color_aliases (Color_border);
658#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
659 color_aliases (Color_BD); 661 color_aliases (Color_BD);
660 color_aliases (Color_UL); 662 color_aliases (Color_UL);
661 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
755void 757void
756rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
757{ 759{
758#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
759 free (this->locale); 761 free (this->locale);
760 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 762 this->locale = setlocale (LC_CTYPE, locale);
763
764 if (!this->locale)
765 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, "");
768 this->locale = "";
769 }
770
771 this->locale = rxvt_strdup (this->locale);
761 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
762 mbstate.reset (); 773 mbstate.reset ();
763#endif 774#endif
775#if 0
764#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
765 free (codeset); 777 free (codeset);
766 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
767 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
768 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
769#else 781#else
770 enc_utf8 = 1; 782 enc_utf8 = 1;
771#endif 783#endif
784#endif
772} 785}
773 786
774void 787void
775rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
776{ 789{
777#ifdef USE_XIM 790#ifdef USE_XIM
778 if (!locale) 791 if (!locale)
779 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
780 else 793 else
781 { 794 {
782 Atom wmlocale; 795 Atom wmlocale;
783 796
784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
786 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
787 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
788 801
789 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
790 { 803 {
791 rxvt_print_error ("The locale is not supported by Xlib"); 804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
792 return; 805 return;
793 } 806 }
794 807
795 im_ev.start (display); 808 im_ev.start (display);
796 809
… …
826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
827#endif 840#endif
828 841
829 get_ourmods (); 842 get_ourmods ();
830 843
831 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
832 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
833 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
834 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
835 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
836 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
837 850
838#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
839 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
840 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
856 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
857 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
858#endif 871#endif
859 872
860 if ((cmd_fd = run_command (argv)) < 0) 873 if ((cmd_fd = run_command (argv)) < 0)
861 { 874 rxvt_fatal ("failure while running command, aborting");
862 rxvt_print_error ("aborting");
863 exit (EXIT_FAILURE);
864 }
865} 875}
866 876
867/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
868void 878void
869rxvt_term::Get_Colours () 879rxvt_term::Get_Colours ()
870{ 880{
871 int i; 881 int i;
872 882
883#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused;
885#endif
886
873 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 887 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
874 { 888 {
875 rxvt_color xcol; 889 rxvt_color xcol;
876 890
877 if (!rs[Rs_color + i]) 891 if (!rs[Rs_color + i])
… …
894 switch (i) 908 switch (i)
895 { 909 {
896 case Color_fg: 910 case Color_fg:
897 case Color_bg: 911 case Color_bg:
898 /* fatal: need bg/fg color */ 912 /* fatal: need bg/fg color */
899 rxvt_print_error ("aborting"); 913 rxvt_fatal ("unable to get foreground/background colour, aborting");
900 exit (EXIT_FAILURE);
901 /* NOTREACHED */ 914 /* NOTREACHED */
902 break; 915 break;
903#ifndef NO_CURSORCOLOR 916#ifndef NO_CURSORCOLOR
904 case Color_cursor2: 917 case Color_cursor2:
905 xcol = PixColors[Color_fg]; 918 xcol = PixColors[Color_fg];
906 break; 919 break;
907#endif /* ! NO_CURSORCOLOR */ 920#endif /* ! NO_CURSORCOLOR */
908 case Color_pointer: 921 case Color_pointer_fg:
909 xcol = PixColors[Color_fg]; 922 xcol = PixColors[Color_fg];
910 break; 923 break;
911 default: 924 default:
912 xcol = PixColors[Color_bg]; /* None */ 925 xcol = PixColors[Color_bg]; /* None */
913 break; 926 break;
914 } 927 }
915 } 928 }
916 } 929 }
917 930
918 PixColors[i] = xcol; 931 PixColors[i] = xcol;
932#ifdef OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
935#endif
919 SET_PIXCOLOR (i); 936 SET_PIXCOLOR (i);
920 } 937 }
921 938
922 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 939 if (XDEPTH <= 2)
923 PixColors[Color_pointer] = PixColors[Color_fg]; 940 {
924 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
925 PixColors[Color_border] = PixColors[Color_fg]; 942 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
943 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
944 }
926 945
927 /* 946 /*
928 * get scrollBar/menuBar shadow colors 947 * get scrollBar/menuBar shadow colors
929 * 948 *
930 * The calculations of topShadow/bottomShadow values are adapted 949 * The calculations of topShadow/bottomShadow values are adapted
… …
932 */ 951 */
933#ifdef KEEP_SCROLLCOLOR 952#ifdef KEEP_SCROLLCOLOR
934 953
935 if (XDEPTH <= 2) 954 if (XDEPTH <= 2)
936 { /* Monochrome */ 955 { /* Monochrome */
937 PixColors[Color_scroll] = PixColors[Color_fg]; 956 PixColors[Color_scroll] = PixColors[Color_fg];
938 PixColors[Color_topShadow] = PixColors[Color_bg]; 957 PixColors[Color_topShadow] = PixColors[Color_bg];
939 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 958 PixColors[Color_bottomShadow] = PixColors[Color_bg];
940 } 959 }
941 else 960 else
942 { 961 {
943 rxvt_color xcol[3]; 962 rxvt_color xcol[2];
944 /* xcol[0] == white 963 /* xcol[0] == white
945 * xcol[1] == top shadow 964 * xcol[1] == top shadow
946 * xcol[2] == bot shadow */ 965 * xcol[2] == bot shadow */
947 966
948 xcol[1] = PixColors[Color_scroll]; 967 xcol[1] = PixColors[Color_scroll];
949# ifdef PREFER_24BIT
950 xcol[0].set (display, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
951 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
952# else
953 xcol[0].set (display, WhitePixel (display->display, display->screen));
954# endif
955 969
956 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
957 971
958 xcol[0].get (display, pr0, pg0, pb0); 972 xcol[0].get (display, pr0, pg0, pb0);
959 xcol[1].get (display, pr1, pg1, pb1); 973 xcol[1].get (display, pr1, pg1, pb1);
960 974
961 /* bottomShadowColor */
962 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
963 xcol[2] = PixColors[Color_Black];
964
965 PixColors[Color_bottomShadow] = xcol[2]; 975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
966 976
967 /* topShadowColor */ 977 /* topShadowColor */
968 if (!xcol[1].set (display, 978 if (!xcol[1].set (display,
969 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 979 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
970 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 980 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1074/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
1075/* rxvt_Create_Windows () - Open and map the window */ 1085/* rxvt_Create_Windows () - Open and map the window */
1076void 1086void
1077rxvt_term::create_windows (int argc, const char *const *argv) 1087rxvt_term::create_windows (int argc, const char *const *argv)
1078{ 1088{
1079 XClassHint classHint; 1089 XClassHint classHint;
1080 XWMHints wmHint; 1090 XWMHints wmHint;
1081 XGCValues gcvalue; 1091 XGCValues gcvalue;
1082 long vt_emask; 1092 long vt_emask;
1083 1093 XSetWindowAttributes attributes;
1084 XWindowAttributes gattr; 1094 XWindowAttributes gattr;
1085 1095
1086 if (Options & Opt_transparent) 1096 if (Options & Opt_transparent)
1087 { 1097 {
1088 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1098 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1101 1111
1102 window_calc (0, 0); 1112 window_calc (0, 0);
1103 old_width = szHint.width; 1113 old_width = szHint.width;
1104 old_height = szHint.height; 1114 old_height = szHint.height;
1105 1115
1106 /* parent window - reverse video so we can see placement errors
1107 * sub-window placement & size in rxvt_resize_subwindows () 1116 /* sub-window placement & size in rxvt_resize_subwindows () */
1108 */
1109 1117
1110#ifdef PREFER_24BIT 1118#ifdef PREFER_24BIT
1111 XSetWindowAttributes attributes;
1112
1113 attributes.background_pixel = PixColors[Color_fg]; 1119 attributes.background_pixel = PixColors[Color_bg];
1114 attributes.border_pixel = PixColors[Color_border]; 1120 attributes.border_pixel = PixColors[Color_border];
1115 attributes.colormap = display->cmap; 1121 attributes.colormap = display->cmap;
1116 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1122 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1117 szHint.x, szHint.y, 1123 szHint.x, szHint.y,
1118 szHint.width, szHint.height, 1124 szHint.width, szHint.height,
1119 TermWin.ext_bwidth, 1125 TermWin.ext_bwidth,
1120 display->depth, InputOutput, 1126 display->depth, InputOutput,
1121 display->visual, 1127 display->visual,
1122 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1128 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1123#else 1129#else
1124 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1130 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1125 szHint.x, szHint.y, 1131 szHint.x, szHint.y,
1126 szHint.width, 1132 szHint.width, szHint.height,
1127 szHint.height,
1128 TermWin.ext_bwidth, 1133 TermWin.ext_bwidth,
1129 PixColors[Color_border], 1134 PixColors[Color_border],
1130 PixColors[Color_fg]); 1135 PixColors[Color_bg]);
1131#endif 1136#endif
1132 1137
1133 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1138 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1134 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1139 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1135 1140
1136 classHint.res_name = (char *)rs[Rs_name]; 1141 classHint.res_name = (char *)rs[Rs_name];
1137 classHint.res_class = (char *)RESCLASS; 1142 classHint.res_class = (char *)RESCLASS;
1138 1143
1139 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1144 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1140 wmHint.input = True; 1145 wmHint.input = True;
1141 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1146 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1142 : NormalState);
1143 wmHint.window_group = TermWin.parent[0]; 1147 wmHint.window_group = TermWin.parent[0];
1144 1148
1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1149 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1146 (char **)argv, argc, &szHint, &wmHint, &classHint); 1150 (char **)argv, argc, &szHint, &wmHint, &classHint);
1151
1152#ifndef NO_FRILLS
1153 long pid = getpid ();
1154 XChangeProperty (display->display, TermWin.parent[0],
1155 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1156 PropModeReplace, (unsigned char *)&pid, 1);
1157#endif
1147 1158
1148 XSelectInput (display->display, TermWin.parent[0], 1159 XSelectInput (display->display, TermWin.parent[0],
1149 KeyPressMask 1160 KeyPressMask
1150#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1161#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1151 | KeyReleaseMask 1162 | KeyReleaseMask
1152#endif 1163#endif
1153 | FocusChangeMask | VisibilityChangeMask 1164 | FocusChangeMask | VisibilityChangeMask
1154 | StructureNotifyMask); 1165 | StructureNotifyMask);
1155 termwin_ev.start (display, TermWin.parent[0]); 1166 termwin_ev.start (display, TermWin.parent[0]);
1156 1167
1157 /* vt cursor: Black-on-White is standard, but this is more popular */ 1168 /* vt cursor: Black-on-White is standard, but this is more popular */
1158 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1169 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1159 1170
… …
1175 } 1186 }
1176#endif 1187#endif
1177 1188
1178 /* the vt window */ 1189 /* the vt window */
1179 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1190 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1180 window_vt_x, window_vt_y, 1191 window_vt_x,
1192 window_vt_y,
1181 TermWin_TotalWidth (), 1193 TermWin_TotalWidth (),
1182 TermWin_TotalHeight (), 1194 TermWin_TotalHeight (),
1183 0, 1195 0,
1184 PixColors[Color_fg], 1196 PixColors[Color_fg],
1185 PixColors[Color_bg]); 1197 PixColors[Color_bg]);
1186
1187#ifdef DEBUG_X 1198#ifdef DEBUG_X
1188 XStoreName (display->display, TermWin.vt, "vt window"); 1199 XStoreName (display->display, TermWin.vt, "vt window");
1189#endif 1200#endif
1190 1201
1202 attributes.bit_gravity = NorthWestGravity;
1203 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1204
1191 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1205 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1192 | PropertyChangeMask); 1206
1207 pointer_unblank ();
1193 1208
1194#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1195 pointer_unblank ();
1196
1197 if ((Options & Opt_pointerBlank)) 1210 if (Options & Opt_pointerBlank)
1198 vt_emask |= PointerMotionMask; 1211 vt_emask |= PointerMotionMask;
1199 else 1212 else
1200#endif 1213#endif
1201 vt_emask |= (Button1MotionMask | Button3MotionMask); 1214 vt_emask |= Button1MotionMask | Button3MotionMask;
1202 1215
1203 XSelectInput (display->display, TermWin.vt, vt_emask); 1216 XSelectInput (display->display, TermWin.vt, vt_emask);
1204 vt_ev.start (display, TermWin.vt); 1217 vt_ev.start (display, TermWin.vt);
1205 1218
1206#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1219#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1232 1245
1233#ifdef XPM_BACKGROUND 1246#ifdef XPM_BACKGROUND
1234 if (rs[Rs_backgroundPixmap] != NULL 1247 if (rs[Rs_backgroundPixmap] != NULL
1235 && ! (Options & Opt_transparent)) 1248 && ! (Options & Opt_transparent))
1236 { 1249 {
1237 const char *p = rs[Rs_backgroundPixmap]; 1250 const char *p = rs[Rs_backgroundPixmap];
1238 1251
1239 if ((p = STRCHR (p, ';')) != NULL) 1252 if ((p = STRCHR (p, ';')) != NULL)
1240 { 1253 {
1241 p++; 1254 p++;
1242 scale_pixmap (p); 1255 scale_pixmap (p);
… …
1249 /* graphics context for the vt window */ 1262 /* graphics context for the vt window */
1250 gcvalue.foreground = PixColors[Color_fg]; 1263 gcvalue.foreground = PixColors[Color_fg];
1251 gcvalue.background = PixColors[Color_bg]; 1264 gcvalue.background = PixColors[Color_bg];
1252 gcvalue.graphics_exposures = 1; 1265 gcvalue.graphics_exposures = 1;
1253 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1266 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1254 GCForeground | GCBackground 1267 GCForeground | GCBackground | GCGraphicsExposures,
1255 | GCGraphicsExposures, &gcvalue); 1268 &gcvalue);
1256 1269
1257 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1270 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1258 1271
1259#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1272#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1260 gcvalue.foreground = PixColors[Color_topShadow]; 1273 gcvalue.foreground = PixColors[Color_topShadow];
1261 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1274 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1262 gcvalue.foreground = PixColors[Color_bottomShadow]; 1275 gcvalue.foreground = PixColors[Color_bottomShadow];
1263 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1276 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1264 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1277 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1265 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1278 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1279#endif
1280
1281#ifdef OFF_FOCUS_FADING
1282 // initially we are in unfocused state
1283 if (rs[Rs_fade])
1284 PixColors = PixColorsUnFocused;
1266#endif 1285#endif
1267} 1286}
1268 1287
1269/*----------------------------------------------------------------------*/ 1288/*----------------------------------------------------------------------*/
1270/* 1289/*
… …
1277{ 1296{
1278 int cfd, er; 1297 int cfd, er;
1279 1298
1280 /* get master (pty) */ 1299 /* get master (pty) */
1281 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1300 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1282 {
1283 rxvt_print_error ("can't open pseudo-tty"); 1301 rxvt_fatal ("can't open pseudo-tty");
1284 return -1;
1285 }
1286 1302
1287 fcntl (cfd, F_SETFL, O_NONBLOCK); 1303 fcntl (cfd, F_SETFL, O_NONBLOCK);
1288 1304
1289 /* get slave (tty) */ 1305 /* get slave (tty) */
1290 if (tty_fd < 0) 1306 if (tty_fd < 0)
… …
1294#endif 1310#endif
1295 1311
1296 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1312 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1297 { 1313 {
1298 close (cfd); 1314 close (cfd);
1299 rxvt_print_error ("can't open slave tty %s", ttydev); 1315 rxvt_fatal ("can't open slave tty %s", ttydev);
1300 return -1;
1301 } 1316 }
1302 } 1317 }
1303#ifndef NO_BACKSPACE_KEY 1318#ifndef NO_BACKSPACE_KEY
1304 if (key_backspace[0] && !key_backspace[1]) 1319 if (key_backspace[0] && !key_backspace[1])
1305 er = key_backspace[0]; 1320 er = key_backspace[0];
… …
1315#ifndef __QNX__ 1330#ifndef __QNX__
1316 /* spin off the command interpreter */ 1331 /* spin off the command interpreter */
1317 switch (cmd_pid = fork ()) 1332 switch (cmd_pid = fork ())
1318 { 1333 {
1319 case -1: 1334 case -1:
1320 rxvt_print_error ("can't fork"); 1335 rxvt_fatal ("can't fork");
1321 return -1;
1322 case 0: 1336 case 0:
1323 close (cfd); /* only keep tty_fd and STDERR open */ 1337 close (cfd); /* only keep tty_fd and STDERR open */
1324 1338
1325 init_env (); 1339 init_env ();
1326 1340
1327 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1341 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1328 rxvt_print_error ("could not obtain control of tty"); 1342 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1329 else 1343 else
1330 { 1344 {
1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1345 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1332 dup2 (tty_fd, STDIN_FILENO); 1346 dup2 (tty_fd, STDIN_FILENO);
1333 dup2 (tty_fd, STDOUT_FILENO); 1347 dup2 (tty_fd, STDOUT_FILENO);
… …
1335 1349
1336 if (tty_fd > 2) 1350 if (tty_fd > 2)
1337 close (tty_fd); 1351 close (tty_fd);
1338 1352
1339 run_child (argv); 1353 run_child (argv);
1354 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1340 } 1355 }
1356
1341 exit (EXIT_FAILURE); 1357 _exit (EXIT_FAILURE);
1342 /* NOTREACHED */ 1358
1343 default: 1359 default:
1344 { 1360 {
1345#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1361#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1346 int fdstdin; 1362 int fdstdin;
1347 1363
… …
1356#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1372#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1357 1373
1358 dup2 (fdstdin, STDIN_FILENO); 1374 dup2 (fdstdin, STDIN_FILENO);
1359 close (fdstdin); 1375 close (fdstdin);
1360#endif 1376#endif
1361
1362 } 1377 }
1378
1363 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1379 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1364 break; 1380 break;
1365 } 1381 }
1366#else /* __QNX__ uses qnxspawn () */ 1382#else /* __QNX__ uses qnxspawn () */
1367 fchmod (tty_fd, 0622); 1383 fchmod (tty_fd, 0622);

Diff Legend

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