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.30 by pcg, Sat Feb 21 22:14:00 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
403
404#ifdef GREEK_SUPPORT
405 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
406#endif 395#endif
407 396
408 refresh_limit = 1; 397 refresh_limit = 1;
409 refresh_type = SLOW_REFRESH; 398 refresh_type = SLOW_REFRESH;
410 prev_nrow = prev_ncol = 0; 399 prev_nrow = prev_ncol = 0;
411#ifdef MULTICHAR_SET
412# ifdef MULTICHAR_ENCODING
413 encoding_method = MULTICHAR_ENCODING;
414# endif
415 multichar_decode = rxvt_euc2jis;
416#endif
417 400
418 oldcursor.row = oldcursor.col = -1; 401 oldcursor.row = oldcursor.col = -1;
419#ifdef XPM_BACKGROUND 402#ifdef XPM_BACKGROUND
420 /* bgPixmap.w = bgPixmap.h = 0; */ 403 /* bgPixmap.w = bgPixmap.h = 0; */
421 bgPixmap.x = bgPixmap.y = 50; 404 bgPixmap.x = bgPixmap.y = 50;
… …
515 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
516 499
517 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
518 } 501 }
519 502
520 /* clear all resources */
521 for (i = 0; i < NUM_RESOURCES;)
522 rs[i++] = NULL;
523
524 rs[Rs_name] = rxvt_r_basename (argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
525 504
526 /* 505 /*
527 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
528 */ 507 */
… …
543 } 522 }
544#endif 523#endif
545 524
546 if (!display 525 if (!display
547 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
548 {
549 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
550 exit (EXIT_FAILURE);
551 }
552 528
553 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
554 530
555 /* 531 /*
556 * set any defaults not already set 532 * set any defaults not already set
… …
601 rs[Rs_print_pipe] = PRINTPIPE; 577 rs[Rs_print_pipe] = PRINTPIPE;
602#endif 578#endif
603 579
604 if (!rs[Rs_cutchars]) 580 if (!rs[Rs_cutchars])
605 rs[Rs_cutchars] = CUTCHARS; 581 rs[Rs_cutchars] = CUTCHARS;
606
607#ifdef ACS_ASCII
608 if (!rs[Rs_acs_chars])
609 rs[Rs_acs_chars] = ACS_CHARS;
610 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
611 {
612 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
613 for (; i < 0x20; )
614 val[i] = ' ';
615 rs[Rs_acs_chars] = val;
616 }
617#endif
618 582
619#ifndef NO_BACKSPACE_KEY 583#ifndef NO_BACKSPACE_KEY
620 if (!rs[Rs_backspace_key]) 584 if (!rs[Rs_backspace_key])
621# ifdef DEFAULT_BACKSPACE 585# ifdef DEFAULT_BACKSPACE
622 key_backspace = DEFAULT_BACKSPACE; 586 key_backspace = DEFAULT_BACKSPACE;
… …
651 { 615 {
652 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
653 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
654 } 618 }
655 619
656 if (rs[Rs_selectstyle])
657 {
658 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
659 selection_style = OLD_WORD_SELECT;
660#ifndef NO_OLD_SELECTION
661
662 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
663 selection_style = OLD_SELECT;
664#endif
665
666 }
667
668#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
669 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
670 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
671#endif 623#endif
672
673 TermWin.fontset = new rxvt_fontset (this);
674 TermWin.fontset->populate (rs[Rs_font]);
675 TermWin.fwidth = TermWin.fontset->base_font ()->width;
676 TermWin.fheight = TermWin.fontset->base_font ()->height;
677 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
678 624
679#ifdef XTERM_REVERSE_VIDEO 625#ifdef XTERM_REVERSE_VIDEO
680 /* this is how xterm implements reverseVideo */ 626 /* this is how xterm implements reverseVideo */
681 if (Options & Opt_reverseVideo) 627 if (Options & Opt_reverseVideo)
682 { 628 {
… …
702 color_aliases (Color_bg); 648 color_aliases (Color_bg);
703#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
704 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
705 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
706#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
707 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
708 color_aliases (Color_border); 655 color_aliases (Color_border);
709#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
710 color_aliases (Color_BD); 657 color_aliases (Color_BD);
711 color_aliases (Color_UL); 658 color_aliases (Color_UL);
712 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
806void 753void
807rxvt_term::set_locale (const char *locale) 754rxvt_term::set_locale (const char *locale)
808{ 755{
809#if HAVE_XSETLOCALE || HAVE_SETLOCALE 756#if HAVE_XSETLOCALE || HAVE_SETLOCALE
810 free (this->locale); 757 free (this->locale);
811 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
812 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
813 mbstate.reset (); 760 mbstate.reset ();
814#endif 761#endif
762#if 0
815#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
816 free (codeset); 764 free (codeset);
817 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
818 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
819 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
820#else 768#else
821 enc_utf8 = 1; 769 enc_utf8 = 1;
822#endif 770#endif
771#endif
823} 772}
824 773
825void 774void
826rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
827{ 776{
828#ifdef USE_XIM 777#ifdef USE_XIM
829 if (!locale) 778 if (!locale)
830 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
831 else 780 else
832 { 781 {
833 Atom wmlocale; 782 Atom wmlocale;
834 783
835 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
837 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
838 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
839 788
840 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
841 { 790 {
842 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");
843 return; 792 return;
844 } 793 }
845 794
846 im_ev.start (display); 795 im_ev.start (display);
847 796
… …
901 { 850 {
902 PrivateModes |= PrivMode_menuBar; 851 PrivateModes |= PrivMode_menuBar;
903 SavedModes |= PrivMode_menuBar; 852 SavedModes |= PrivMode_menuBar;
904 } 853 }
905 854
906#ifdef GREEK_SUPPORT
907 greek_init ();
908#endif
909
910#ifdef CURSOR_BLINK 855#ifdef CURSOR_BLINK
911 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
912 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 858#endif
914 859
915 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
916 { 861 rxvt_fatal ("failure while running command, aborting");
917 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE);
919 }
920} 862}
921 863
922/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
923void 865void
924rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
949 switch (i) 891 switch (i)
950 { 892 {
951 case Color_fg: 893 case Color_fg:
952 case Color_bg: 894 case Color_bg:
953 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
955 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 897 /* NOTREACHED */
957 break; 898 break;
958#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 900 case Color_cursor2:
960 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
961 break; 902 break;
962#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 904 case Color_pointer_fg:
964 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
965 break; 906 break;
966 default: 907 default:
967 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
968 break; 909 break;
… …
972 913
973 PixColors[i] = xcol; 914 PixColors[i] = xcol;
974 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
975 } 916 }
976 917
977 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
978 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
979 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
980 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 }
981 924
982 /* 925 /*
983 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
984 * 927 *
985 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1129/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
1130/* rxvt_Create_Windows () - Open and map the window */ 1073/* rxvt_Create_Windows () - Open and map the window */
1131void 1074void
1132rxvt_term::create_windows (int argc, const char *const *argv) 1075rxvt_term::create_windows (int argc, const char *const *argv)
1133{ 1076{
1134 XClassHint classHint; 1077 XClassHint classHint;
1135 XWMHints wmHint; 1078 XWMHints wmHint;
1136 XGCValues gcvalue; 1079 XGCValues gcvalue;
1137 long vt_emask; 1080 long vt_emask;
1138 1081 XSetWindowAttributes attributes;
1139 XWindowAttributes gattr; 1082 XWindowAttributes gattr;
1140 1083
1141 if (Options & Opt_transparent) 1084 if (Options & Opt_transparent)
1142 { 1085 {
1143 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1145 } 1088 }
1146 1089
1147 /* grab colors before netscape does */ 1090 /* grab colors before netscape does */
1148 Get_Colours (); 1091 Get_Colours ();
1149 1092
1150 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
1151 window_calc (0, 0); 1100 window_calc (0, 0);
1152 old_width = szHint.width; 1101 old_width = szHint.width;
1153 old_height = szHint.height; 1102 old_height = szHint.height;
1154 1103
1155 /* parent window - reverse video so we can see placement errors
1156 * sub-window placement & size in rxvt_resize_subwindows () 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1157 */
1158 1105
1159#ifdef PREFER_24BIT 1106#ifdef PREFER_24BIT
1160 XSetWindowAttributes attributes;
1161
1162 attributes.background_pixel = PixColors[Color_fg]; 1107 attributes.background_pixel = PixColors[Color_bg];
1163 attributes.border_pixel = PixColors[Color_border]; 1108 attributes.border_pixel = PixColors[Color_border];
1164 attributes.colormap = display->cmap; 1109 attributes.colormap = display->cmap;
1165 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1166 szHint.x, szHint.y, 1111 szHint.x, szHint.y,
1167 szHint.width, szHint.height, 1112 szHint.width, szHint.height,
1168 TermWin.ext_bwidth, 1113 TermWin.ext_bwidth,
1169 display->depth, InputOutput, 1114 display->depth, InputOutput,
1170 display->visual, 1115 display->visual,
1171 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1116 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1172#else 1117#else
1173 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1174 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1175 szHint.width, 1120 szHint.width, szHint.height,
1176 szHint.height,
1177 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1178 PixColors[Color_border], 1122 PixColors[Color_border],
1179 PixColors[Color_fg]); 1123 PixColors[Color_bg]);
1180#endif 1124#endif
1181 1125
1182 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1183 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1184 1128
1185 classHint.res_name = (char *)rs[Rs_name]; 1129 classHint.res_name = (char *)rs[Rs_name];
1186 classHint.res_class = (char *)APL_CLASS; 1130 classHint.res_class = (char *)RESCLASS;
1187 1131
1188 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1132 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1189 wmHint.input = True; 1133 wmHint.input = True;
1190 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1191 : NormalState);
1192 wmHint.window_group = TermWin.parent[0]; 1135 wmHint.window_group = TermWin.parent[0];
1193 1136
1194 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1195 (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
1196 1146
1197 XSelectInput (display->display, TermWin.parent[0], 1147 XSelectInput (display->display, TermWin.parent[0],
1198 KeyPressMask 1148 KeyPressMask
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 | KeyReleaseMask 1150 | KeyReleaseMask
… …
1235 1185
1236#ifdef DEBUG_X 1186#ifdef DEBUG_X
1237 XStoreName (display->display, TermWin.vt, "vt window"); 1187 XStoreName (display->display, TermWin.vt, "vt window");
1238#endif 1188#endif
1239 1189
1190 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192
1240 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1241 | PropertyChangeMask);
1242 1194
1243#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1244 pointer_unblank (); 1196 pointer_unblank ();
1245 1197
1246 if ((Options & Opt_pointerBlank)) 1198 if (Options & Opt_pointerBlank)
1247 vt_emask |= PointerMotionMask; 1199 vt_emask |= PointerMotionMask;
1248 else 1200 else
1249#endif 1201#endif
1250 vt_emask |= (Button1MotionMask | Button3MotionMask); 1202 vt_emask |= Button1MotionMask | Button3MotionMask;
1251 1203
1252 XSelectInput (display->display, TermWin.vt, vt_emask); 1204 XSelectInput (display->display, TermWin.vt, vt_emask);
1253 vt_ev.start (display, TermWin.vt); 1205 vt_ev.start (display, TermWin.vt);
1254 1206
1255#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1207#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1256 if (menuBar_height ()) 1208 if (menuBar_height ())
1257 { 1209 {
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1210 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1211 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1212 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1213 menuBar_TotalHeight (),
1262 0, 1214 0,
1263 PixColors[Color_fg], 1215 PixColors[Color_fg],
1264 PixColors[Color_scroll]); 1216 PixColors[Color_scroll]);
1217
1265#ifdef DEBUG_X 1218#ifdef DEBUG_X
1266 XStoreName (display->display, menuBar.win, "menubar"); 1219 XStoreName (display->display, menuBar.win, "menubar");
1267#endif 1220#endif
1268 1221
1222 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1223
1269 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1224 XDefineCursor (display->display, menuBar.win,
1225 XCreateFontCursor (display->display, XC_left_ptr));
1270 1226
1271 XSelectInput (display->display, menuBar.win, 1227 XSelectInput (display->display, menuBar.win,
1272 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1228 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1273 | Button1MotionMask)); 1229 | Button1MotionMask));
1274 menubar_ev.start (display, menuBar.win); 1230 menubar_ev.start (display, menuBar.win);
… …
1294 /* graphics context for the vt window */ 1250 /* graphics context for the vt window */
1295 gcvalue.foreground = PixColors[Color_fg]; 1251 gcvalue.foreground = PixColors[Color_fg];
1296 gcvalue.background = PixColors[Color_bg]; 1252 gcvalue.background = PixColors[Color_bg];
1297 gcvalue.graphics_exposures = 1; 1253 gcvalue.graphics_exposures = 1;
1298 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1254 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1299 GCForeground | GCBackground 1255 GCForeground | GCBackground | GCGraphicsExposures,
1300 | GCGraphicsExposures, &gcvalue); 1256 &gcvalue);
1257
1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1301 1259
1302#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1303 gcvalue.foreground = PixColors[Color_topShadow]; 1261 gcvalue.foreground = PixColors[Color_topShadow];
1304 topShadowGC = XCreateGC (display->display, TermWin.vt, 1262 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue);
1306 gcvalue.foreground = PixColors[Color_bottomShadow]; 1263 gcvalue.foreground = PixColors[Color_bottomShadow];
1307 botShadowGC = XCreateGC (display->display, TermWin.vt, 1264 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1308 GCForeground, &gcvalue);
1309 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1265 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1310 : Color_scroll)];
1311 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1266 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1312 GCForeground, &gcvalue);
1313#endif 1267#endif
1314} 1268}
1315 1269
1316/*----------------------------------------------------------------------*/ 1270/*----------------------------------------------------------------------*/
1317/* 1271/*
… …
1324{ 1278{
1325 int cfd, er; 1279 int cfd, er;
1326 1280
1327 /* get master (pty) */ 1281 /* get master (pty) */
1328 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1329 {
1330 rxvt_print_error ("can't open pseudo-tty"); 1283 rxvt_fatal ("can't open pseudo-tty");
1331 return -1;
1332 }
1333 1284
1334 fcntl (cfd, F_SETFL, O_NONBLOCK); 1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1335 1286
1336 /* get slave (tty) */ 1287 /* get slave (tty) */
1337 if (tty_fd < 0) 1288 if (tty_fd < 0)
… …
1341#endif 1292#endif
1342 1293
1343 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1344 { 1295 {
1345 close (cfd); 1296 close (cfd);
1346 rxvt_print_error ("can't open slave tty %s", ttydev); 1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1347 return -1;
1348 } 1298 }
1349 } 1299 }
1350#ifndef NO_BACKSPACE_KEY 1300#ifndef NO_BACKSPACE_KEY
1351 if (key_backspace[0] && !key_backspace[1]) 1301 if (key_backspace[0] && !key_backspace[1])
1352 er = key_backspace[0]; 1302 er = key_backspace[0];
… …
1362#ifndef __QNX__ 1312#ifndef __QNX__
1363 /* spin off the command interpreter */ 1313 /* spin off the command interpreter */
1364 switch (cmd_pid = fork ()) 1314 switch (cmd_pid = fork ())
1365 { 1315 {
1366 case -1: 1316 case -1:
1367 rxvt_print_error ("can't fork"); 1317 rxvt_fatal ("can't fork");
1368 return -1;
1369 case 0: 1318 case 0:
1370 close (cfd); /* only keep tty_fd and STDERR open */ 1319 close (cfd); /* only keep tty_fd and STDERR open */
1371 1320
1372 init_env (); 1321 init_env ();
1373 1322
1374 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1375 rxvt_print_error ("could not obtain control of tty"); 1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1376 else 1325 else
1377 { 1326 {
1378 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1379 dup2 (tty_fd, STDIN_FILENO); 1328 dup2 (tty_fd, STDIN_FILENO);
1380 dup2 (tty_fd, STDOUT_FILENO); 1329 dup2 (tty_fd, STDOUT_FILENO);
… …
1382 1331
1383 if (tty_fd > 2) 1332 if (tty_fd > 2)
1384 close (tty_fd); 1333 close (tty_fd);
1385 1334
1386 run_child (argv); 1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1387 } 1337 }
1338
1388 exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1389 /* NOTREACHED */ 1340
1390 default: 1341 default:
1391 { 1342 {
1392#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1393 int fdstdin; 1344 int fdstdin;
1394 1345
… …
1403#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1404 1355
1405 dup2 (fdstdin, STDIN_FILENO); 1356 dup2 (fdstdin, STDIN_FILENO);
1406 close (fdstdin); 1357 close (fdstdin);
1407#endif 1358#endif
1408
1409 } 1359 }
1360
1410 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1411 break; 1362 break;
1412 } 1363 }
1413#else /* __QNX__ uses qnxspawn () */ 1364#else /* __QNX__ uses qnxspawn () */
1414 fchmod (tty_fd, 0622); 1365 fchmod (tty_fd, 0622);

Diff Legend

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