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.33 by pcg, Sun Feb 22 10:37:54 2004 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 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",
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 387 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 388 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 389 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 390 numPixColors = TOTAL_COLORS;
388 391
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 392#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 393 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif 394#endif
403 395
404 refresh_limit = 1; 396 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 397 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 398 prev_nrow = prev_ncol = 0;
407#ifdef MULTICHAR_SET
408# ifdef MULTICHAR_ENCODING
409 encoding_method = MULTICHAR_ENCODING;
410# endif
411 multichar_decode = rxvt_euc2jis;
412#endif
413 399
414 oldcursor.row = oldcursor.col = -1; 400 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 401#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 402 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 403 bgPixmap.x = bgPixmap.y = 50;
… …
511 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 497 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
512 498
513 cmd_argv[i] = NULL; 499 cmd_argv[i] = NULL;
514 } 500 }
515 501
516 /* clear all resources */
517 for (i = 0; i < NUM_RESOURCES;)
518 rs[i++] = NULL;
519
520 rs[Rs_name] = rxvt_r_basename (argv[0]); 502 rs[Rs_name] = rxvt_r_basename (argv[0]);
521 503
522 /* 504 /*
523 * Open display, get options/resources and create the window 505 * Open display, get options/resources and create the window
524 */ 506 */
… …
539 } 521 }
540#endif 522#endif
541 523
542 if (!display 524 if (!display
543 && ! (display = displays.get (rs[Rs_display_name]))) 525 && ! (display = displays.get (rs[Rs_display_name])))
544 {
545 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 526 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
546 exit (EXIT_FAILURE);
547 }
548 527
549 extract_resources (display->display, rs[Rs_name]); 528 extract_resources (display->display, rs[Rs_name]);
550 529
551 /* 530 /*
552 * set any defaults not already set 531 * set any defaults not already set
… …
597 rs[Rs_print_pipe] = PRINTPIPE; 576 rs[Rs_print_pipe] = PRINTPIPE;
598#endif 577#endif
599 578
600 if (!rs[Rs_cutchars]) 579 if (!rs[Rs_cutchars])
601 rs[Rs_cutchars] = CUTCHARS; 580 rs[Rs_cutchars] = CUTCHARS;
602
603#ifdef ACS_ASCII
604 if (!rs[Rs_acs_chars])
605 rs[Rs_acs_chars] = ACS_CHARS;
606 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
607 {
608 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
609 for (; i < 0x20; )
610 val[i] = ' ';
611 rs[Rs_acs_chars] = val;
612 }
613#endif
614 581
615#ifndef NO_BACKSPACE_KEY 582#ifndef NO_BACKSPACE_KEY
616 if (!rs[Rs_backspace_key]) 583 if (!rs[Rs_backspace_key])
617# ifdef DEFAULT_BACKSPACE 584# ifdef DEFAULT_BACKSPACE
618 key_backspace = DEFAULT_BACKSPACE; 585 key_backspace = DEFAULT_BACKSPACE;
… …
645#endif 612#endif
646 if (rs[Rs_answerbackstring]) 613 if (rs[Rs_answerbackstring])
647 { 614 {
648 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 615 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
649 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
650 }
651
652 if (rs[Rs_selectstyle])
653 {
654 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
655 selection_style = OLD_WORD_SELECT;
656#ifndef NO_OLD_SELECTION
657
658 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
659 selection_style = OLD_SELECT;
660#endif
661
662 } 617 }
663 618
664#ifdef HAVE_SCROLLBARS 619#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 620 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 621 rs[Rs_scrollBar_thickness]);
… …
692 color_aliases (Color_bg); 647 color_aliases (Color_bg);
693#ifndef NO_CURSORCOLOR 648#ifndef NO_CURSORCOLOR
694 color_aliases (Color_cursor); 649 color_aliases (Color_cursor);
695 color_aliases (Color_cursor2); 650 color_aliases (Color_cursor2);
696#endif /* NO_CURSORCOLOR */ 651#endif /* NO_CURSORCOLOR */
697 color_aliases (Color_pointer); 652 color_aliases (Color_pointer_fg);
653 color_aliases (Color_pointer_bg);
698 color_aliases (Color_border); 654 color_aliases (Color_border);
699#ifndef NO_BOLD_UNDERLINE_REVERSE 655#ifndef NO_BOLD_UNDERLINE_REVERSE
700 color_aliases (Color_BD); 656 color_aliases (Color_BD);
701 color_aliases (Color_UL); 657 color_aliases (Color_UL);
702 color_aliases (Color_RV); 658 color_aliases (Color_RV);
… …
796void 752void
797rxvt_term::set_locale (const char *locale) 753rxvt_term::set_locale (const char *locale)
798{ 754{
799#if HAVE_XSETLOCALE || HAVE_SETLOCALE 755#if HAVE_XSETLOCALE || HAVE_SETLOCALE
800 free (this->locale); 756 free (this->locale);
801 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 757 this->locale = setlocale (LC_CTYPE, locale);
758
759 if (!this->locale)
760 {
761 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
762 setlocale (LC_CTYPE, "");
763 this->locale = "";
764 }
765
766 this->locale = rxvt_strdup (this->locale);
802 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
803 mbstate.reset (); 768 mbstate.reset ();
804#endif 769#endif
770#if 0
805#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
806 free (codeset); 772 free (codeset);
807 codeset = strdup (nl_langinfo (CODESET)); 773 codeset = strdup (nl_langinfo (CODESET));
808 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 774 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
809 || !STRCASECMP (codeset, "UTF8"); 775 || !STRCASECMP (codeset, "UTF8");
810#else 776#else
811 enc_utf8 = 1; 777 enc_utf8 = 1;
812#endif 778#endif
779#endif
813} 780}
814 781
815void 782void
816rxvt_term::init_xlocale () 783rxvt_term::init_xlocale ()
817{ 784{
818#ifdef USE_XIM 785#ifdef USE_XIM
819 if (!locale) 786 if (!locale)
820 rxvt_print_error ("Setting locale failed."); 787 rxvt_warn ("setting locale failed, working without locale support.\n");
821 else 788 else
822 { 789 {
823 Atom wmlocale; 790 Atom wmlocale;
824 791
825 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 792 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
827 XA_STRING, 8, PropModeReplace, 794 XA_STRING, 8, PropModeReplace,
828 (unsigned char *)locale, STRLEN (locale)); 795 (unsigned char *)locale, STRLEN (locale));
829 796
830 if (!XSupportsLocale ()) 797 if (!XSupportsLocale ())
831 { 798 {
832 rxvt_print_error ("The locale is not supported by Xlib"); 799 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
833 return; 800 return;
834 } 801 }
835 802
836 im_ev.start (display); 803 im_ev.start (display);
837 804
… …
867 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 834 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
868#endif 835#endif
869 836
870 get_ourmods (); 837 get_ourmods ();
871 838
872 if (! (Options & Opt_scrollTtyOutput)) 839 if (!(Options & Opt_scrollTtyOutput))
873 PrivateModes |= PrivMode_TtyOutputInh; 840 PrivateModes |= PrivMode_TtyOutputInh;
874 if (Options & Opt_scrollTtyKeypress) 841 if (Options & Opt_scrollTtyKeypress)
875 PrivateModes |= PrivMode_Keypress; 842 PrivateModes |= PrivMode_Keypress;
876 if (! (Options & Opt_jumpScroll)) 843 if (!(Options & Opt_jumpScroll))
877 PrivateModes |= PrivMode_smoothScroll; 844 PrivateModes |= PrivMode_smoothScroll;
878 845
879#ifndef NO_BACKSPACE_KEY 846#ifndef NO_BACKSPACE_KEY
880 if (STRCMP (key_backspace, "DEC") == 0) 847 if (STRCMP (key_backspace, "DEC") == 0)
881 PrivateModes |= PrivMode_HaveBackSpace; 848 PrivateModes |= PrivMode_HaveBackSpace;
… …
897 if (Options & Opt_cursorBlink) 864 if (Options & Opt_cursorBlink)
898 (void)gettimeofday (&lastcursorchange, NULL); 865 (void)gettimeofday (&lastcursorchange, NULL);
899#endif 866#endif
900 867
901 if ((cmd_fd = run_command (argv)) < 0) 868 if ((cmd_fd = run_command (argv)) < 0)
902 { 869 rxvt_fatal ("failure while running command, aborting");
903 rxvt_print_error ("aborting");
904 exit (EXIT_FAILURE);
905 }
906} 870}
907 871
908/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
909void 873void
910rxvt_term::Get_Colours () 874rxvt_term::Get_Colours ()
… …
935 switch (i) 899 switch (i)
936 { 900 {
937 case Color_fg: 901 case Color_fg:
938 case Color_bg: 902 case Color_bg:
939 /* fatal: need bg/fg color */ 903 /* fatal: need bg/fg color */
940 rxvt_print_error ("aborting"); 904 rxvt_fatal ("unable to get foreground/background colour, aborting");
941 exit (EXIT_FAILURE);
942 /* NOTREACHED */ 905 /* NOTREACHED */
943 break; 906 break;
944#ifndef NO_CURSORCOLOR 907#ifndef NO_CURSORCOLOR
945 case Color_cursor2: 908 case Color_cursor2:
946 xcol = PixColors[Color_fg]; 909 xcol = PixColors[Color_fg];
947 break; 910 break;
948#endif /* ! NO_CURSORCOLOR */ 911#endif /* ! NO_CURSORCOLOR */
949 case Color_pointer: 912 case Color_pointer_fg:
950 xcol = PixColors[Color_fg]; 913 xcol = PixColors[Color_fg];
951 break; 914 break;
952 default: 915 default:
953 xcol = PixColors[Color_bg]; /* None */ 916 xcol = PixColors[Color_bg]; /* None */
954 break; 917 break;
… …
958 921
959 PixColors[i] = xcol; 922 PixColors[i] = xcol;
960 SET_PIXCOLOR (i); 923 SET_PIXCOLOR (i);
961 } 924 }
962 925
963 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 926 if (XDEPTH <= 2)
964 PixColors[Color_pointer] = PixColors[Color_fg]; 927 {
965 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 928 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
966 PixColors[Color_border] = PixColors[Color_fg]; 929 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
930 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
931 }
967 932
968 /* 933 /*
969 * get scrollBar/menuBar shadow colors 934 * get scrollBar/menuBar shadow colors
970 * 935 *
971 * The calculations of topShadow/bottomShadow values are adapted 936 * The calculations of topShadow/bottomShadow values are adapted
… …
973 */ 938 */
974#ifdef KEEP_SCROLLCOLOR 939#ifdef KEEP_SCROLLCOLOR
975 940
976 if (XDEPTH <= 2) 941 if (XDEPTH <= 2)
977 { /* Monochrome */ 942 { /* Monochrome */
978 PixColors[Color_scroll] = PixColors[Color_fg]; 943 PixColors[Color_scroll] = PixColors[Color_fg];
979 PixColors[Color_topShadow] = PixColors[Color_bg]; 944 PixColors[Color_topShadow] = PixColors[Color_bg];
980 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 945 PixColors[Color_bottomShadow] = PixColors[Color_bg];
981 } 946 }
982 else 947 else
983 { 948 {
984 rxvt_color xcol[3]; 949 rxvt_color xcol[3];
985 /* xcol[0] == white 950 /* xcol[0] == white
986 * xcol[1] == top shadow 951 * xcol[1] == top shadow
987 * xcol[2] == bot shadow */ 952 * xcol[2] == bot shadow */
988 953
989 xcol[1] = PixColors[Color_scroll]; 954 xcol[1] = PixColors[Color_scroll];
… …
1115/*----------------------------------------------------------------------*/ 1080/*----------------------------------------------------------------------*/
1116/* rxvt_Create_Windows () - Open and map the window */ 1081/* rxvt_Create_Windows () - Open and map the window */
1117void 1082void
1118rxvt_term::create_windows (int argc, const char *const *argv) 1083rxvt_term::create_windows (int argc, const char *const *argv)
1119{ 1084{
1120 XClassHint classHint; 1085 XClassHint classHint;
1121 XWMHints wmHint; 1086 XWMHints wmHint;
1122 XGCValues gcvalue; 1087 XGCValues gcvalue;
1123 long vt_emask; 1088 long vt_emask;
1124 1089 XSetWindowAttributes attributes;
1125 XWindowAttributes gattr; 1090 XWindowAttributes gattr;
1126 1091
1127 if (Options & Opt_transparent) 1092 if (Options & Opt_transparent)
1128 { 1093 {
1129 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1094 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1142 1107
1143 window_calc (0, 0); 1108 window_calc (0, 0);
1144 old_width = szHint.width; 1109 old_width = szHint.width;
1145 old_height = szHint.height; 1110 old_height = szHint.height;
1146 1111
1147 /* parent window - reverse video so we can see placement errors
1148 * sub-window placement & size in rxvt_resize_subwindows () 1112 /* sub-window placement & size in rxvt_resize_subwindows () */
1149 */
1150 1113
1151#ifdef PREFER_24BIT 1114#ifdef PREFER_24BIT
1152 XSetWindowAttributes attributes;
1153
1154 attributes.background_pixel = PixColors[Color_fg]; 1115 attributes.background_pixel = PixColors[Color_bg];
1155 attributes.border_pixel = PixColors[Color_border]; 1116 attributes.border_pixel = PixColors[Color_border];
1156 attributes.colormap = display->cmap; 1117 attributes.colormap = display->cmap;
1157 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 1120 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1161 display->depth, InputOutput, 1122 display->depth, InputOutput,
1162 display->visual, 1123 display->visual,
1163 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1124 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1164#else 1125#else
1165 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1126 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1166 szHint.x, szHint.y, 1127 szHint.x, szHint.y,
1167 szHint.width, 1128 szHint.width, szHint.height,
1168 szHint.height,
1169 TermWin.ext_bwidth, 1129 TermWin.ext_bwidth,
1170 PixColors[Color_border], 1130 PixColors[Color_border],
1171 PixColors[Color_fg]); 1131 PixColors[Color_bg]);
1172#endif 1132#endif
1173 1133
1174 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1175 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1176 1136
1177 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
1178 classHint.res_class = (char *)APL_CLASS; 1138 classHint.res_class = (char *)RESCLASS;
1179 1139
1180 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1181 wmHint.input = True; 1141 wmHint.input = True;
1182 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1142 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1183 : NormalState);
1184 wmHint.window_group = TermWin.parent[0]; 1143 wmHint.window_group = TermWin.parent[0];
1185 1144
1186 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1187 (char **)argv, argc, &szHint, &wmHint, &classHint); 1146 (char **)argv, argc, &szHint, &wmHint, &classHint);
1147
1148#ifndef NO_FRILLS
1149 long pid = getpid ();
1150 XChangeProperty (display->display, TermWin.parent[0],
1151 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1152 PropModeReplace, (unsigned char *)&pid, 1);
1153#endif
1188 1154
1189 XSelectInput (display->display, TermWin.parent[0], 1155 XSelectInput (display->display, TermWin.parent[0],
1190 KeyPressMask 1156 KeyPressMask
1191#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1192 | KeyReleaseMask 1158 | KeyReleaseMask
… …
1216 } 1182 }
1217#endif 1183#endif
1218 1184
1219 /* the vt window */ 1185 /* the vt window */
1220 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1186 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1221 window_vt_x, window_vt_y, 1187 window_vt_x,
1188 window_vt_y,
1222 TermWin_TotalWidth (), 1189 TermWin_TotalWidth (),
1223 TermWin_TotalHeight (), 1190 TermWin_TotalHeight (),
1224 0, 1191 0,
1225 PixColors[Color_fg], 1192 PixColors[Color_fg],
1226 PixColors[Color_bg]); 1193 PixColors[Color_bg]);
1227 1194
1228#ifdef DEBUG_X 1195#ifdef DEBUG_X
1229 XStoreName (display->display, TermWin.vt, "vt window"); 1196 XStoreName (display->display, TermWin.vt, "vt window");
1230#endif 1197#endif
1231 1198
1199 attributes.bit_gravity = NorthWestGravity;
1200 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1201
1232 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1202 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1233 | PropertyChangeMask);
1234 1203
1235#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
1236 pointer_unblank (); 1205 pointer_unblank ();
1237 1206
1238 if ((Options & Opt_pointerBlank)) 1207 if (Options & Opt_pointerBlank)
1239 vt_emask |= PointerMotionMask; 1208 vt_emask |= PointerMotionMask;
1240 else 1209 else
1241#endif 1210#endif
1242 vt_emask |= (Button1MotionMask | Button3MotionMask); 1211 vt_emask |= Button1MotionMask | Button3MotionMask;
1243 1212
1244 XSelectInput (display->display, TermWin.vt, vt_emask); 1213 XSelectInput (display->display, TermWin.vt, vt_emask);
1245 vt_ev.start (display, TermWin.vt); 1214 vt_ev.start (display, TermWin.vt);
1246 1215
1247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1216#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1248 if (menuBar_height ()) 1217 if (menuBar_height ())
1249 { 1218 {
1250 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1219 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1251 window_vt_x, 0, 1220 window_vt_x, 0,
1252 TermWin_TotalWidth (), 1221 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1222 menuBar_TotalHeight (),
1254 0, 1223 0,
1255 PixColors[Color_fg], 1224 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1225 PixColors[Color_scroll]);
1226
1257#ifdef DEBUG_X 1227#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1228 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1229#endif
1260 1230
1231 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1232
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1233 XDefineCursor (display->display, menuBar.win,
1234 XCreateFontCursor (display->display, XC_left_ptr));
1262 1235
1263 XSelectInput (display->display, menuBar.win, 1236 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1238 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1239 menubar_ev.start (display, menuBar.win);
… …
1286 /* graphics context for the vt window */ 1259 /* graphics context for the vt window */
1287 gcvalue.foreground = PixColors[Color_fg]; 1260 gcvalue.foreground = PixColors[Color_fg];
1288 gcvalue.background = PixColors[Color_bg]; 1261 gcvalue.background = PixColors[Color_bg];
1289 gcvalue.graphics_exposures = 1; 1262 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1263 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1264 GCForeground | GCBackground | GCGraphicsExposures,
1292 | GCGraphicsExposures, &gcvalue); 1265 &gcvalue);
1266
1267 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1268
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1269#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1270 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1271 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1272 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1273 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue);
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1274 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1275 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305#endif 1276#endif
1306} 1277}
1307 1278
1308/*----------------------------------------------------------------------*/ 1279/*----------------------------------------------------------------------*/
1309/* 1280/*
… …
1316{ 1287{
1317 int cfd, er; 1288 int cfd, er;
1318 1289
1319 /* get master (pty) */ 1290 /* get master (pty) */
1320 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1291 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1321 {
1322 rxvt_print_error ("can't open pseudo-tty"); 1292 rxvt_fatal ("can't open pseudo-tty");
1323 return -1;
1324 }
1325 1293
1326 fcntl (cfd, F_SETFL, O_NONBLOCK); 1294 fcntl (cfd, F_SETFL, O_NONBLOCK);
1327 1295
1328 /* get slave (tty) */ 1296 /* get slave (tty) */
1329 if (tty_fd < 0) 1297 if (tty_fd < 0)
… …
1333#endif 1301#endif
1334 1302
1335 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1303 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1336 { 1304 {
1337 close (cfd); 1305 close (cfd);
1338 rxvt_print_error ("can't open slave tty %s", ttydev); 1306 rxvt_fatal ("can't open slave tty %s", ttydev);
1339 return -1;
1340 } 1307 }
1341 } 1308 }
1342#ifndef NO_BACKSPACE_KEY 1309#ifndef NO_BACKSPACE_KEY
1343 if (key_backspace[0] && !key_backspace[1]) 1310 if (key_backspace[0] && !key_backspace[1])
1344 er = key_backspace[0]; 1311 er = key_backspace[0];
… …
1354#ifndef __QNX__ 1321#ifndef __QNX__
1355 /* spin off the command interpreter */ 1322 /* spin off the command interpreter */
1356 switch (cmd_pid = fork ()) 1323 switch (cmd_pid = fork ())
1357 { 1324 {
1358 case -1: 1325 case -1:
1359 rxvt_print_error ("can't fork"); 1326 rxvt_fatal ("can't fork");
1360 return -1;
1361 case 0: 1327 case 0:
1362 close (cfd); /* only keep tty_fd and STDERR open */ 1328 close (cfd); /* only keep tty_fd and STDERR open */
1363 1329
1364 init_env (); 1330 init_env ();
1365 1331
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1332 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1333 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1334 else
1369 { 1335 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1336 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1337 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1338 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1340
1375 if (tty_fd > 2) 1341 if (tty_fd > 2)
1376 close (tty_fd); 1342 close (tty_fd);
1377 1343
1378 run_child (argv); 1344 run_child (argv);
1345 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1346 }
1347
1380 exit (EXIT_FAILURE); 1348 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1349
1382 default: 1350 default:
1383 { 1351 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1352#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1353 int fdstdin;
1386 1354
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1364
1397 dup2 (fdstdin, STDIN_FILENO); 1365 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1366 close (fdstdin);
1399#endif 1367#endif
1400
1401 } 1368 }
1369
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1370 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1371 break;
1404 } 1372 }
1405#else /* __QNX__ uses qnxspawn () */ 1373#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1374 fchmod (tty_fd, 0622);

Diff Legend

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