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.39 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.67 by root, Tue Aug 3 22:19:51 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;
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 393 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 394 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 395 numPixColors = TOTAL_COLORS;
388 396
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 397#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 398 colorfgbg = DEFAULT_RSTYLE;
397#endif 399#endif
398 400
399 refresh_limit = 1; 401 refresh_limit = 1;
… …
500 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
501 503
502 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
503 } 505 }
504 506
505 /* clear all resources */
506 for (i = 0; i < NUM_RESOURCES;)
507 rs[i++] = NULL;
508
509 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
510 508
511 /* 509 /*
512 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
513 */ 511 */
… …
528 } 526 }
529#endif 527#endif
530 528
531 if (!display 529 if (!display
532 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
533 {
534 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
535 exit (EXIT_FAILURE);
536 }
537 532
538 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
539 534
540 /* 535 /*
541 * set any defaults not already set 536 * set any defaults not already set
… …
622#endif 617#endif
623 if (rs[Rs_answerbackstring]) 618 if (rs[Rs_answerbackstring])
624 { 619 {
625 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
626 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
627 }
628
629 if (rs[Rs_selectstyle])
630 {
631 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
632 selection_style = OLD_WORD_SELECT;
633#ifndef NO_OLD_SELECTION
634
635 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
636 selection_style = OLD_SELECT;
637#endif
638
639 } 622 }
640 623
641#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
642 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
643 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
… …
669 color_aliases (Color_bg); 652 color_aliases (Color_bg);
670#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
671 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
672 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
673#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
674 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
675 color_aliases (Color_border); 659 color_aliases (Color_border);
676#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
677 color_aliases (Color_BD); 661 color_aliases (Color_BD);
678 color_aliases (Color_UL); 662 color_aliases (Color_UL);
679 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
773void 757void
774rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
775{ 759{
776#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
777 free (this->locale); 761 free (this->locale);
778 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);
779 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
780 mbstate.reset (); 773 mbstate.reset ();
781#endif 774#endif
775#if 0
782#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
783 free (codeset); 777 free (codeset);
784 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
785 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
786 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
787#else 781#else
788 enc_utf8 = 1; 782 enc_utf8 = 1;
789#endif 783#endif
784#endif
790} 785}
791 786
792void 787void
793rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
794{ 789{
795#ifdef USE_XIM 790#ifdef USE_XIM
796 if (!locale) 791 if (!locale)
797 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
798 else 793 else
799 { 794 {
800 Atom wmlocale; 795 Atom wmlocale;
801 796
802 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
804 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
805 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
806 801
807 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
808 { 803 {
809 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");
810 return; 805 return;
811 } 806 }
812 807
813 im_ev.start (display); 808 im_ev.start (display);
814 809
… …
844 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
845#endif 840#endif
846 841
847 get_ourmods (); 842 get_ourmods ();
848 843
849 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
850 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
851 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
852 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
853 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
854 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
855 850
856#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
857 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
858 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
874 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
875 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
876#endif 871#endif
877 872
878 if ((cmd_fd = run_command (argv)) < 0) 873 if ((cmd_fd = run_command (argv)) < 0)
879 { 874 rxvt_fatal ("failure while running command, aborting");
880 rxvt_print_error ("aborting");
881 exit (EXIT_FAILURE);
882 }
883} 875}
884 876
885/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
886void 878void
887rxvt_term::Get_Colours () 879rxvt_term::Get_Colours ()
888{ 880{
889 int i; 881 int i;
890 882
883#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused;
885#endif
886
891 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 887 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
892 { 888 {
893 rxvt_color xcol; 889 rxvt_color xcol;
894 890
895 if (!rs[Rs_color + i]) 891 if (!rs[Rs_color + i])
896 continue; 892 continue;
… …
912 switch (i) 908 switch (i)
913 { 909 {
914 case Color_fg: 910 case Color_fg:
915 case Color_bg: 911 case Color_bg:
916 /* fatal: need bg/fg color */ 912 /* fatal: need bg/fg color */
917 rxvt_print_error ("aborting"); 913 rxvt_fatal ("unable to get foreground/background colour, aborting");
918 exit (EXIT_FAILURE);
919 /* NOTREACHED */ 914 /* NOTREACHED */
920 break; 915 break;
921#ifndef NO_CURSORCOLOR 916#ifndef NO_CURSORCOLOR
922 case Color_cursor2: 917 case Color_cursor2:
923 xcol = PixColors[Color_fg]; 918 xcol = PixColors[Color_fg];
924 break; 919 break;
925#endif /* ! NO_CURSORCOLOR */ 920#endif /* ! NO_CURSORCOLOR */
926 case Color_pointer: 921 case Color_pointer_fg:
927 xcol = PixColors[Color_fg]; 922 xcol = PixColors[Color_fg];
928 break; 923 break;
929 default: 924 default:
930 xcol = PixColors[Color_bg]; /* None */ 925 xcol = PixColors[Color_bg]; /* None */
931 break; 926 break;
932 } 927 }
933 } 928 }
934 } 929 }
935 930
936 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
937 SET_PIXCOLOR (i); 936 SET_PIXCOLOR (i);
938 } 937 }
939 938
940 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 939 if (display->depth <= 2)
941 PixColors[Color_pointer] = PixColors[Color_fg]; 940 {
942 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
943 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 }
944 945
945 /* 946 /*
946 * get scrollBar/menuBar shadow colors 947 * get scrollBar/menuBar shadow colors
947 * 948 *
948 * The calculations of topShadow/bottomShadow values are adapted 949 * The calculations of topShadow/bottomShadow values are adapted
949 * from the fvwm window manager. 950 * from the fvwm window manager.
950 */ 951 */
951#ifdef KEEP_SCROLLCOLOR 952#ifdef KEEP_SCROLLCOLOR
952 953
953 if (XDEPTH <= 2) 954 if (display->depth <= 2)
954 { /* Monochrome */ 955 { /* Monochrome */
955 PixColors[Color_scroll] = PixColors[Color_fg]; 956 PixColors[Color_scroll] = PixColors[Color_fg];
956 PixColors[Color_topShadow] = PixColors[Color_bg]; 957 PixColors[Color_topShadow] = PixColors[Color_bg];
957 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 958 PixColors[Color_bottomShadow] = PixColors[Color_bg];
958 } 959 }
959 else 960 else
960 { 961 {
961 rxvt_color xcol[3]; 962 rxvt_color xcol[2];
962 /* xcol[0] == white 963 /* xcol[0] == white
963 * xcol[1] == top shadow 964 * xcol[1] == top shadow
964 * xcol[2] == bot shadow */ 965 * xcol[2] == bot shadow */
965 966
966 xcol[1] = PixColors[Color_scroll]; 967 xcol[1] = PixColors[Color_scroll];
967# ifdef PREFER_24BIT
968 xcol[0].set (display, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
969 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
970# else
971 xcol[0].set (display, WhitePixel (display->display, display->screen));
972# endif
973 969
974 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
975 971
976 xcol[0].get (display, pr0, pg0, pb0); 972 xcol[0].get (display, pr0, pg0, pb0);
977 xcol[1].get (display, pr1, pg1, pb1); 973 xcol[1].get (display, pr1, pg1, pb1);
978 974
979 /* bottomShadowColor */
980 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
981 xcol[2] = PixColors[Color_Black];
982
983 PixColors[Color_bottomShadow] = xcol[2]; 975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
984 976
985 /* topShadowColor */ 977 /* topShadowColor */
986 if (!xcol[1].set (display, 978 if (!xcol[1].set (display,
987 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 979 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
988 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 980 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1092/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
1093/* rxvt_Create_Windows () - Open and map the window */ 1085/* rxvt_Create_Windows () - Open and map the window */
1094void 1086void
1095rxvt_term::create_windows (int argc, const char *const *argv) 1087rxvt_term::create_windows (int argc, const char *const *argv)
1096{ 1088{
1097 XClassHint classHint; 1089 XClassHint classHint;
1098 XWMHints wmHint; 1090 XWMHints wmHint;
1091#ifndef NO_FRILLS
1092 Atom prop = None;
1093 MWMHints mwmhints;
1094#endif
1099 XGCValues gcvalue; 1095 XGCValues gcvalue;
1100 long vt_emask; 1096 long vt_emask;
1101 1097 XSetWindowAttributes attributes;
1102 XWindowAttributes gattr; 1098 XWindowAttributes gattr;
1103 1099
1104 if (Options & Opt_transparent) 1100 if (Options & Opt_transparent)
1105 { 1101 {
1106 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1102 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1107 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1103 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1108 } 1104 }
1105
1106#ifndef NO_FRILLS
1107 if (Options & Opt_borderLess)
1108 {
1109 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1110 if (prop == None)
1111 {
1112 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1113#ifdef PREFER_24BIT
1114 attributes.override_redirect = TRUE;
1115#endif
1116 mwmhints.flags = 0;
1117 }
1118 else
1119 {
1120 mwmhints.flags = MWM_HINTS_DECORATIONS;
1121 mwmhints.decorations = 0;
1122 }
1123 }
1124 else
1125 {
1126 mwmhints.flags = 0;
1127 }
1128#endif
1109 1129
1110 /* grab colors before netscape does */ 1130 /* grab colors before netscape does */
1111 Get_Colours (); 1131 Get_Colours ();
1112 1132
1113 if (!change_font (rs[Rs_font])) 1133 if (!change_font (rs[Rs_font]))
… …
1119 1139
1120 window_calc (0, 0); 1140 window_calc (0, 0);
1121 old_width = szHint.width; 1141 old_width = szHint.width;
1122 old_height = szHint.height; 1142 old_height = szHint.height;
1123 1143
1124 /* parent window - reverse video so we can see placement errors
1125 * sub-window placement & size in rxvt_resize_subwindows () 1144 /* sub-window placement & size in rxvt_resize_subwindows () */
1126 */
1127 1145
1128#ifdef PREFER_24BIT 1146#ifdef PREFER_24BIT
1129 XSetWindowAttributes attributes;
1130
1131 attributes.background_pixel = PixColors[Color_fg]; 1147 attributes.background_pixel = PixColors[Color_bg];
1132 attributes.border_pixel = PixColors[Color_border]; 1148 attributes.border_pixel = PixColors[Color_border];
1133 attributes.colormap = display->cmap; 1149 attributes.colormap = display->cmap;
1134 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1150 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1135 szHint.x, szHint.y, 1151 szHint.x, szHint.y,
1136 szHint.width, szHint.height, 1152 szHint.width, szHint.height,
1137 TermWin.ext_bwidth, 1153 TermWin.ext_bwidth,
1138 display->depth, InputOutput, 1154 display->depth, InputOutput,
1139 display->visual, 1155 display->visual,
1140 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1156 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1141#else 1157#else
1142 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1158 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1143 szHint.x, szHint.y, 1159 szHint.x, szHint.y,
1144 szHint.width, 1160 szHint.width, szHint.height,
1145 szHint.height,
1146 TermWin.ext_bwidth, 1161 TermWin.ext_bwidth,
1147 PixColors[Color_border], 1162 PixColors[Color_border],
1148 PixColors[Color_fg]); 1163 PixColors[Color_bg]);
1149#endif 1164#endif
1150 1165
1151 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1166 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1152 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1167 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1153 1168
1154 classHint.res_name = (char *)rs[Rs_name]; 1169 classHint.res_name = (char *)rs[Rs_name];
1155 classHint.res_class = (char *)RESCLASS; 1170 classHint.res_class = (char *)RESCLASS;
1156 1171
1157 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1172 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1158 wmHint.input = True; 1173 wmHint.input = True;
1159 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1174 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1160 : NormalState);
1161 wmHint.window_group = TermWin.parent[0]; 1175 wmHint.window_group = TermWin.parent[0];
1162 1176
1163 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1177 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1164 (char **)argv, argc, &szHint, &wmHint, &classHint); 1178 (char **)argv, argc, &szHint, &wmHint, &classHint);
1179
1180#ifndef NO_FRILLS
1181 long pid = getpid ();
1182 XChangeProperty (display->display, TermWin.parent[0],
1183 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1184 PropModeReplace, (unsigned char *)&pid, 1);
1185#endif
1165 1186
1166 XSelectInput (display->display, TermWin.parent[0], 1187 XSelectInput (display->display, TermWin.parent[0],
1167 KeyPressMask 1188 KeyPressMask
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169 | KeyReleaseMask 1190 | KeyReleaseMask
1170#endif 1191#endif
1171 | FocusChangeMask | VisibilityChangeMask 1192 | FocusChangeMask | VisibilityChangeMask
1193 | ExposureMask
1172 | StructureNotifyMask); 1194 | StructureNotifyMask);
1173 termwin_ev.start (display, TermWin.parent[0]); 1195 termwin_ev.start (display, TermWin.parent[0]);
1196
1197#ifndef NO_FRILLS
1198 if (mwmhints.flags)
1199 {
1200 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1201 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1202 }
1203#endif
1174 1204
1175 /* vt cursor: Black-on-White is standard, but this is more popular */ 1205 /* vt cursor: Black-on-White is standard, but this is more popular */
1176 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1177 1207
1178#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1193 } 1223 }
1194#endif 1224#endif
1195 1225
1196 /* the vt window */ 1226 /* the vt window */
1197 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1198 window_vt_x, window_vt_y, 1228 window_vt_x,
1229 window_vt_y,
1199 TermWin_TotalWidth (), 1230 TermWin_TotalWidth (),
1200 TermWin_TotalHeight (), 1231 TermWin_TotalHeight (),
1201 0, 1232 0,
1202 PixColors[Color_fg], 1233 PixColors[Color_fg],
1203 PixColors[Color_bg]); 1234 PixColors[Color_bg]);
1204
1205#ifdef DEBUG_X 1235#ifdef DEBUG_X
1206 XStoreName (display->display, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1207#endif 1237#endif
1208 1238
1239 attributes.bit_gravity = NorthWestGravity;
1240 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1241
1209 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1242 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1210 | PropertyChangeMask); 1243
1244 pointer_unblank ();
1211 1245
1212#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1213 pointer_unblank ();
1214
1215 if ((Options & Opt_pointerBlank)) 1247 if (Options & Opt_pointerBlank)
1216 vt_emask |= PointerMotionMask; 1248 vt_emask |= PointerMotionMask;
1217 else 1249 else
1218#endif 1250#endif
1219 vt_emask |= (Button1MotionMask | Button3MotionMask); 1251 vt_emask |= Button1MotionMask | Button3MotionMask;
1220 1252
1221 XSelectInput (display->display, TermWin.vt, vt_emask); 1253 XSelectInput (display->display, TermWin.vt, vt_emask);
1222 vt_ev.start (display, TermWin.vt); 1254 vt_ev.start (display, TermWin.vt);
1223 1255
1224#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1256#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1250 1282
1251#ifdef XPM_BACKGROUND 1283#ifdef XPM_BACKGROUND
1252 if (rs[Rs_backgroundPixmap] != NULL 1284 if (rs[Rs_backgroundPixmap] != NULL
1253 && ! (Options & Opt_transparent)) 1285 && ! (Options & Opt_transparent))
1254 { 1286 {
1255 const char *p = rs[Rs_backgroundPixmap]; 1287 const char *p = rs[Rs_backgroundPixmap];
1256 1288
1257 if ((p = STRCHR (p, ';')) != NULL) 1289 if ((p = STRCHR (p, ';')) != NULL)
1258 { 1290 {
1259 p++; 1291 p++;
1260 scale_pixmap (p); 1292 scale_pixmap (p);
… …
1267 /* graphics context for the vt window */ 1299 /* graphics context for the vt window */
1268 gcvalue.foreground = PixColors[Color_fg]; 1300 gcvalue.foreground = PixColors[Color_fg];
1269 gcvalue.background = PixColors[Color_bg]; 1301 gcvalue.background = PixColors[Color_bg];
1270 gcvalue.graphics_exposures = 1; 1302 gcvalue.graphics_exposures = 1;
1271 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1303 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1272 GCForeground | GCBackground 1304 GCForeground | GCBackground | GCGraphicsExposures,
1273 | GCGraphicsExposures, &gcvalue); 1305 &gcvalue);
1274 1306
1275 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1307 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1276 1308
1277#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1309#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1278 gcvalue.foreground = PixColors[Color_topShadow]; 1310 gcvalue.foreground = PixColors[Color_topShadow];
1279 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1311 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1280 gcvalue.foreground = PixColors[Color_bottomShadow]; 1312 gcvalue.foreground = PixColors[Color_bottomShadow];
1281 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1313 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1282 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1314 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1283 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1315 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1316#endif
1317
1318#ifdef OFF_FOCUS_FADING
1319 // initially we are in unfocused state
1320 if (rs[Rs_fade])
1321 PixColors = PixColorsUnFocused;
1284#endif 1322#endif
1285} 1323}
1286 1324
1287/*----------------------------------------------------------------------*/ 1325/*----------------------------------------------------------------------*/
1288/* 1326/*
… …
1295{ 1333{
1296 int cfd, er; 1334 int cfd, er;
1297 1335
1298 /* get master (pty) */ 1336 /* get master (pty) */
1299 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1337 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1300 {
1301 rxvt_print_error ("can't open pseudo-tty"); 1338 rxvt_fatal ("can't open pseudo-tty");
1302 return -1;
1303 }
1304 1339
1305 fcntl (cfd, F_SETFL, O_NONBLOCK); 1340 fcntl (cfd, F_SETFL, O_NONBLOCK);
1306 1341
1307 /* get slave (tty) */ 1342 /* get slave (tty) */
1308 if (tty_fd < 0) 1343 if (tty_fd < 0)
… …
1312#endif 1347#endif
1313 1348
1314 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1349 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1315 { 1350 {
1316 close (cfd); 1351 close (cfd);
1317 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1318 return -1;
1319 } 1353 }
1320 } 1354 }
1321#ifndef NO_BACKSPACE_KEY 1355#ifndef NO_BACKSPACE_KEY
1322 if (key_backspace[0] && !key_backspace[1]) 1356 if (key_backspace[0] && !key_backspace[1])
1323 er = key_backspace[0]; 1357 er = key_backspace[0];
… …
1333#ifndef __QNX__ 1367#ifndef __QNX__
1334 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1335 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1336 { 1370 {
1337 case -1: 1371 case -1:
1338 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1339 return -1;
1340 case 0: 1373 case 0:
1341 close (cfd); /* only keep tty_fd and STDERR open */ 1374 close (cfd); /* only keep tty_fd and STDERR open */
1342 1375
1343 init_env (); 1376 init_env ();
1344 1377
1345 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1378 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1346 rxvt_print_error ("could not obtain control of tty"); 1379 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1347 else 1380 else
1348 { 1381 {
1349 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1382 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1350 dup2 (tty_fd, STDIN_FILENO); 1383 dup2 (tty_fd, STDIN_FILENO);
1351 dup2 (tty_fd, STDOUT_FILENO); 1384 dup2 (tty_fd, STDOUT_FILENO);
… …
1353 1386
1354 if (tty_fd > 2) 1387 if (tty_fd > 2)
1355 close (tty_fd); 1388 close (tty_fd);
1356 1389
1357 run_child (argv); 1390 run_child (argv);
1391 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1358 } 1392 }
1393
1359 exit (EXIT_FAILURE); 1394 _exit (EXIT_FAILURE);
1360 /* NOTREACHED */ 1395
1361 default: 1396 default:
1362 { 1397 {
1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1364 int fdstdin; 1399 int fdstdin;
1365 1400
… …
1374#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1409#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1375 1410
1376 dup2 (fdstdin, STDIN_FILENO); 1411 dup2 (fdstdin, STDIN_FILENO);
1377 close (fdstdin); 1412 close (fdstdin);
1378#endif 1413#endif
1379
1380 } 1414 }
1415
1381 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1416 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1382 break; 1417 break;
1383 } 1418 }
1384#else /* __QNX__ uses qnxspawn () */ 1419#else /* __QNX__ uses qnxspawn () */
1385 fchmod (tty_fd, 0622); 1420 fchmod (tty_fd, 0622);

Diff Legend

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