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.31 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.51 by pcg, Sun May 9 18:19:49 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 */
324#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
325#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL,
328#endif
329#if TINTING
326 NULL, 330 NULL,
327#endif 331#endif
328#ifdef KEEP_SCROLLCOLOR 332#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 333 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 334 COLOR_SCROLLTROUGH,
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 388 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 389 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 390 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 391 numPixColors = TOTAL_COLORS;
388 392
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 393#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 394 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 395#endif
403 396
404 refresh_limit = 1; 397 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 398 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 399 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 400
414 oldcursor.row = oldcursor.col = -1; 401 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 402#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 403 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 404 bgPixmap.x = bgPixmap.y = 50;
… …
511 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
512 499
513 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
514 } 501 }
515 502
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]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
521 504
522 /* 505 /*
523 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
524 */ 507 */
… …
539 } 522 }
540#endif 523#endif
541 524
542 if (!display 525 if (!display
543 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
544 {
545 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
546 exit (EXIT_FAILURE);
547 }
548 528
549 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
550 530
551 /* 531 /*
552 * set any defaults not already set 532 * set any defaults not already set
… …
597 rs[Rs_print_pipe] = PRINTPIPE; 577 rs[Rs_print_pipe] = PRINTPIPE;
598#endif 578#endif
599 579
600 if (!rs[Rs_cutchars]) 580 if (!rs[Rs_cutchars])
601 rs[Rs_cutchars] = CUTCHARS; 581 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 582
615#ifndef NO_BACKSPACE_KEY 583#ifndef NO_BACKSPACE_KEY
616 if (!rs[Rs_backspace_key]) 584 if (!rs[Rs_backspace_key])
617# ifdef DEFAULT_BACKSPACE 585# ifdef DEFAULT_BACKSPACE
618 key_backspace = DEFAULT_BACKSPACE; 586 key_backspace = DEFAULT_BACKSPACE;
… …
647 { 615 {
648 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
649 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
650 } 618 }
651 619
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 }
663
664#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
667#endif 623#endif
668
669 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width;
672 TermWin.fheight = TermWin.fontset->base_font ()->height;
673 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
674 624
675#ifdef XTERM_REVERSE_VIDEO 625#ifdef XTERM_REVERSE_VIDEO
676 /* this is how xterm implements reverseVideo */ 626 /* this is how xterm implements reverseVideo */
677 if (Options & Opt_reverseVideo) 627 if (Options & Opt_reverseVideo)
678 { 628 {
… …
698 color_aliases (Color_bg); 648 color_aliases (Color_bg);
699#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
700 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
701 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
702#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
703 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
704 color_aliases (Color_border); 655 color_aliases (Color_border);
705#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
706 color_aliases (Color_BD); 657 color_aliases (Color_BD);
707 color_aliases (Color_UL); 658 color_aliases (Color_UL);
708 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
802void 753void
803rxvt_term::set_locale (const char *locale) 754rxvt_term::set_locale (const char *locale)
804{ 755{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 756#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 757 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
808 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
809 mbstate.reset (); 760 mbstate.reset ();
810#endif 761#endif
762#if 0
811#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
812 free (codeset); 764 free (codeset);
813 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
814 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
815 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
816#else 768#else
817 enc_utf8 = 1; 769 enc_utf8 = 1;
818#endif 770#endif
771#endif
819} 772}
820 773
821void 774void
822rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
823{ 776{
824#ifdef USE_XIM 777#ifdef USE_XIM
825 if (!locale) 778 if (!locale)
826 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
827 else 780 else
828 { 781 {
829 Atom wmlocale; 782 Atom wmlocale;
830 783
831 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
833 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
834 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
835 788
836 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
837 { 790 {
838 rxvt_print_error ("The locale is not supported by Xlib"); 791 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
839 return; 792 return;
840 } 793 }
841 794
842 im_ev.start (display); 795 im_ev.start (display);
843 796
… …
903 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
904 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
905#endif 858#endif
906 859
907 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
908 { 861 rxvt_fatal ("failure while running command, aborting");
909 rxvt_print_error ("aborting");
910 exit (EXIT_FAILURE);
911 }
912} 862}
913 863
914/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
915void 865void
916rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
941 switch (i) 891 switch (i)
942 { 892 {
943 case Color_fg: 893 case Color_fg:
944 case Color_bg: 894 case Color_bg:
945 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
946 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
947 exit (EXIT_FAILURE);
948 /* NOTREACHED */ 897 /* NOTREACHED */
949 break; 898 break;
950#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
951 case Color_cursor2: 900 case Color_cursor2:
952 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
953 break; 902 break;
954#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
955 case Color_pointer: 904 case Color_pointer_fg:
956 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
957 break; 906 break;
958 default: 907 default:
959 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
960 break; 909 break;
… …
964 913
965 PixColors[i] = xcol; 914 PixColors[i] = xcol;
966 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
967 } 916 }
968 917
969 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
970 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
971 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
972 PixColors[Color_border] = PixColors[Color_fg]; 921 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
922 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
923 }
973 924
974 /* 925 /*
975 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
976 * 927 *
977 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1121/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
1122/* rxvt_Create_Windows () - Open and map the window */ 1073/* rxvt_Create_Windows () - Open and map the window */
1123void 1074void
1124rxvt_term::create_windows (int argc, const char *const *argv) 1075rxvt_term::create_windows (int argc, const char *const *argv)
1125{ 1076{
1126 XClassHint classHint; 1077 XClassHint classHint;
1127 XWMHints wmHint; 1078 XWMHints wmHint;
1128 XGCValues gcvalue; 1079 XGCValues gcvalue;
1129 long vt_emask; 1080 long vt_emask;
1130 1081 XSetWindowAttributes attributes;
1131 XWindowAttributes gattr; 1082 XWindowAttributes gattr;
1132 1083
1133 if (Options & Opt_transparent) 1084 if (Options & Opt_transparent)
1134 { 1085 {
1135 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1137 } 1088 }
1138 1089
1139 /* grab colors before netscape does */ 1090 /* grab colors before netscape does */
1140 Get_Colours (); 1091 Get_Colours ();
1141 1092
1142 change_font (1, NULL); 1093 if (!change_font (rs[Rs_font]))
1094 {
1095 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1096 destroy ();
1097 return;
1098 }
1099
1143 window_calc (0, 0); 1100 window_calc (0, 0);
1144 old_width = szHint.width; 1101 old_width = szHint.width;
1145 old_height = szHint.height; 1102 old_height = szHint.height;
1146 1103
1147 /* parent window - reverse video so we can see placement errors
1148 * sub-window placement & size in rxvt_resize_subwindows () 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1149 */
1150 1105
1151#ifdef PREFER_24BIT 1106#ifdef PREFER_24BIT
1152 XSetWindowAttributes attributes;
1153
1154 attributes.background_pixel = PixColors[Color_fg]; 1107 attributes.background_pixel = PixColors[Color_bg];
1155 attributes.border_pixel = PixColors[Color_border]; 1108 attributes.border_pixel = PixColors[Color_border];
1156 attributes.colormap = display->cmap; 1109 attributes.colormap = display->cmap;
1157 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 1111 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 1112 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 1113 TermWin.ext_bwidth,
1161 display->depth, InputOutput, 1114 display->depth, InputOutput,
1162 display->visual, 1115 display->visual,
1163 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1116 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1164#else 1117#else
1165 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1166 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1167 szHint.width, 1120 szHint.width, szHint.height,
1168 szHint.height,
1169 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1170 PixColors[Color_border], 1122 PixColors[Color_border],
1171 PixColors[Color_fg]); 1123 PixColors[Color_bg]);
1172#endif 1124#endif
1173 1125
1174 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1175 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1176 1128
1177 classHint.res_name = (char *)rs[Rs_name]; 1129 classHint.res_name = (char *)rs[Rs_name];
1178 classHint.res_class = (char *)APL_CLASS; 1130 classHint.res_class = (char *)RESCLASS;
1179 1131
1180 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1132 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1181 wmHint.input = True; 1133 wmHint.input = True;
1182 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1183 : NormalState);
1184 wmHint.window_group = TermWin.parent[0]; 1135 wmHint.window_group = TermWin.parent[0];
1185 1136
1186 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1187 (char **)argv, argc, &szHint, &wmHint, &classHint); 1138 (char **)argv, argc, &szHint, &wmHint, &classHint);
1139
1140#ifndef NO_FRILLS
1141 long pid = getpid ();
1142 XChangeProperty (display->display, TermWin.parent[0],
1143 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1144 PropModeReplace, (unsigned char *)&pid, 1);
1145#endif
1188 1146
1189 XSelectInput (display->display, TermWin.parent[0], 1147 XSelectInput (display->display, TermWin.parent[0],
1190 KeyPressMask 1148 KeyPressMask
1191#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1192 | KeyReleaseMask 1150 | KeyReleaseMask
… …
1227 1185
1228#ifdef DEBUG_X 1186#ifdef DEBUG_X
1229 XStoreName (display->display, TermWin.vt, "vt window"); 1187 XStoreName (display->display, TermWin.vt, "vt window");
1230#endif 1188#endif
1231 1189
1190 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192
1232 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1233 | PropertyChangeMask);
1234 1194
1235#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1236 pointer_unblank (); 1196 pointer_unblank ();
1237 1197
1238 if ((Options & Opt_pointerBlank)) 1198 if (Options & Opt_pointerBlank)
1239 vt_emask |= PointerMotionMask; 1199 vt_emask |= PointerMotionMask;
1240 else 1200 else
1241#endif 1201#endif
1242 vt_emask |= (Button1MotionMask | Button3MotionMask); 1202 vt_emask |= Button1MotionMask | Button3MotionMask;
1243 1203
1244 XSelectInput (display->display, TermWin.vt, vt_emask); 1204 XSelectInput (display->display, TermWin.vt, vt_emask);
1245 vt_ev.start (display, TermWin.vt); 1205 vt_ev.start (display, TermWin.vt);
1246 1206
1247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1207#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1248 if (menuBar_height ()) 1208 if (menuBar_height ())
1249 { 1209 {
1250 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1210 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1251 window_vt_x, 0, 1211 window_vt_x, 0,
1252 TermWin_TotalWidth (), 1212 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1213 menuBar_TotalHeight (),
1254 0, 1214 0,
1255 PixColors[Color_fg], 1215 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1216 PixColors[Color_scroll]);
1217
1257#ifdef DEBUG_X 1218#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1219 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1220#endif
1260 1221
1222 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1223
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1224 XDefineCursor (display->display, menuBar.win,
1225 XCreateFontCursor (display->display, XC_left_ptr));
1262 1226
1263 XSelectInput (display->display, menuBar.win, 1227 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1228 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1229 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1230 menubar_ev.start (display, menuBar.win);
… …
1286 /* graphics context for the vt window */ 1250 /* graphics context for the vt window */
1287 gcvalue.foreground = PixColors[Color_fg]; 1251 gcvalue.foreground = PixColors[Color_fg];
1288 gcvalue.background = PixColors[Color_bg]; 1252 gcvalue.background = PixColors[Color_bg];
1289 gcvalue.graphics_exposures = 1; 1253 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1254 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1255 GCForeground | GCBackground | GCGraphicsExposures,
1292 | GCGraphicsExposures, &gcvalue); 1256 &gcvalue);
1257
1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1259
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1261 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1262 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1263 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1264 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue);
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1265 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1266 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305#endif 1267#endif
1306} 1268}
1307 1269
1308/*----------------------------------------------------------------------*/ 1270/*----------------------------------------------------------------------*/
1309/* 1271/*
… …
1316{ 1278{
1317 int cfd, er; 1279 int cfd, er;
1318 1280
1319 /* get master (pty) */ 1281 /* get master (pty) */
1320 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1321 {
1322 rxvt_print_error ("can't open pseudo-tty"); 1283 rxvt_fatal ("can't open pseudo-tty");
1323 return -1;
1324 }
1325 1284
1326 fcntl (cfd, F_SETFL, O_NONBLOCK); 1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1327 1286
1328 /* get slave (tty) */ 1287 /* get slave (tty) */
1329 if (tty_fd < 0) 1288 if (tty_fd < 0)
… …
1333#endif 1292#endif
1334 1293
1335 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1336 { 1295 {
1337 close (cfd); 1296 close (cfd);
1338 rxvt_print_error ("can't open slave tty %s", ttydev); 1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1339 return -1;
1340 } 1298 }
1341 } 1299 }
1342#ifndef NO_BACKSPACE_KEY 1300#ifndef NO_BACKSPACE_KEY
1343 if (key_backspace[0] && !key_backspace[1]) 1301 if (key_backspace[0] && !key_backspace[1])
1344 er = key_backspace[0]; 1302 er = key_backspace[0];
… …
1354#ifndef __QNX__ 1312#ifndef __QNX__
1355 /* spin off the command interpreter */ 1313 /* spin off the command interpreter */
1356 switch (cmd_pid = fork ()) 1314 switch (cmd_pid = fork ())
1357 { 1315 {
1358 case -1: 1316 case -1:
1359 rxvt_print_error ("can't fork"); 1317 rxvt_fatal ("can't fork");
1360 return -1;
1361 case 0: 1318 case 0:
1362 close (cfd); /* only keep tty_fd and STDERR open */ 1319 close (cfd); /* only keep tty_fd and STDERR open */
1363 1320
1364 init_env (); 1321 init_env ();
1365 1322
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1325 else
1369 { 1326 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1328 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1329 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1331
1375 if (tty_fd > 2) 1332 if (tty_fd > 2)
1376 close (tty_fd); 1333 close (tty_fd);
1377 1334
1378 run_child (argv); 1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1337 }
1338
1380 exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1340
1382 default: 1341 default:
1383 { 1342 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1344 int fdstdin;
1386 1345
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1355
1397 dup2 (fdstdin, STDIN_FILENO); 1356 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1357 close (fdstdin);
1399#endif 1358#endif
1400
1401 } 1359 }
1360
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1362 break;
1404 } 1363 }
1405#else /* __QNX__ uses qnxspawn () */ 1364#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1365 fchmod (tty_fd, 0622);

Diff Legend

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