--- rxvt-unicode/src/init.C 2004/01/31 02:14:58 1.21 +++ rxvt-unicode/src/init.C 2004/02/11 08:13:44 1.25 @@ -1,7 +1,6 @@ /*--------------------------------*-C-*---------------------------------* * File: init.c *----------------------------------------------------------------------* - * $Id: init.C,v 1.21 2004/01/31 02:14:58 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -329,6 +328,7 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ + }; const char *const xa_names[NUM_XA] = @@ -374,7 +374,7 @@ Options = DEFAULT_OPTIONS; want_refresh = 1; cmd_pid = -1; - cmd_fd = tty_fd = Xfd = -1; + cmd_fd = tty_fd = -1; PrivateModes = SavedModes = PrivMode_Default; TermWin.focus = 0; TermWin.ncol = 80; @@ -447,6 +447,7 @@ } else #endif /* TTY_GID_SUPPORT */ + { ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; ttygid = getgid (); @@ -536,19 +537,19 @@ val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); STRCPY (val, "unix"); STRCAT (val, rs[Rs_display_name]); - Xdisplay = XOpenDisplay (val); + display = displays.get (val); free (val); } #endif - if (Xdisplay == NULL - && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) + if (!display + && !(display = displays.get (rs[Rs_display_name]))) { rxvt_print_error ("can't open display %s", rs[Rs_display_name]); exit (EXIT_FAILURE); } - extract_resources (Xdisplay, rs[Rs_name]); + extract_resources (display->display, rs[Rs_name]); /* * set any defaults not already set @@ -660,11 +661,12 @@ else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) selection_style = OLD_SELECT; #endif + } #ifdef HAVE_SCROLLBARS setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], - rs[Rs_scrollBar_thickness]); + rs[Rs_scrollBar_thickness]); #endif TermWin.fontset = new rxvt_fontset (this); @@ -736,7 +738,7 @@ if (val == NULL) #endif /* DISPLAY_IS_IP */ - val = XDisplayString(Xdisplay); + val = XDisplayString(display->display); if (rs[Rs_display_name] == NULL) rs[Rs_display_name] = val; /* use broken `:0' value */ @@ -770,7 +772,7 @@ putenv ("TERMINFO=" RXVT_TERMINFO); #endif - if (Xdepth <= 2) + if (display->depth <= 2) putenv ("COLORTERM=" COLORTERMENV "-mono"); else putenv ("COLORTERM=" COLORTERMENVFULL); @@ -808,7 +810,7 @@ free (codeset); codeset = strdup (nl_langinfo (CODESET)); enc_utf8 = !STRCASECMP (codeset, "UTF-8") - || !STRCASECMP (codeset, "UTF8"); + || !STRCASECMP (codeset, "UTF8"); #else enc_utf8 = 1; #endif @@ -824,8 +826,8 @@ { Atom wmlocale; - wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); - XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, + wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); + XChangeProperty (display->display, TermWin.parent[0], wmlocale, XA_STRING, 8, PropModeReplace, (unsigned char *)locale, STRLEN(locale)); @@ -835,13 +837,10 @@ return; } - /* see if we can connect yet */ - rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); + im_ev.start (display); - /* To avoid Segmentation Fault in C locale: Solaris only? */ - if (STRCMP (locale, "C")) - XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, - rxvt_IMInstantiateCallback, NULL); + /* see if we can connect already */ + im_cb (); } #endif } @@ -857,15 +856,15 @@ int i; for (i = 0; i < NUM_XA; i++) - xa[i] = XInternAtom(Xdisplay, xa_names[i], False); + xa[i] = XInternAtom(display->display, xa_names[i], False); /* Enable delete window protocol */ - XSetWMProtocols (Xdisplay, TermWin.parent[0], + XSetWMProtocols (display->display, TermWin.parent[0], &(xa[XA_WMDELETEWINDOW]), 1); #ifdef USING_W11LIB /* enable W11 callbacks */ - W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); + W11AddEventHandler (display->display, rxvt_W11_process_x_event); #endif #ifdef META8_OPTION @@ -902,10 +901,7 @@ greek_init(); #endif - Xfd = XConnectionNumber (Xdisplay); - #ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) (void)gettimeofday (&lastcursorchange, NULL); #endif @@ -934,9 +930,7 @@ { #ifndef XTERM_REVERSE_VIDEO if (i < 2 && (Options & Opt_reverseVideo)) - { - rs[Rs_color + i] = def_colorName[!i]; - } + rs[Rs_color + i] = def_colorName[!i]; else #endif rs[Rs_color + i] = def_colorName[i]; @@ -948,24 +942,24 @@ { switch (i) { - case Color_fg: - case Color_bg: - /* fatal: need bg/fg color */ - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); - /* NOTREACHED */ - break; + case Color_fg: + case Color_bg: + /* fatal: need bg/fg color */ + rxvt_print_error ("aborting"); + exit (EXIT_FAILURE); + /* NOTREACHED */ + break; #ifndef NO_CURSORCOLOR - case Color_cursor2: - xcol = PixColors[Color_fg]; - break; + case Color_cursor2: + xcol = PixColors[Color_fg]; + break; #endif /* ! NO_CURSORCOLOR */ - case Color_pointer: - xcol = PixColors[Color_fg]; - break; - default: - xcol = PixColors[Color_bg]; /* None */ - break; + case Color_pointer: + xcol = PixColors[Color_fg]; + break; + default: + xcol = PixColors[Color_bg]; /* None */ + break; } } } @@ -1002,25 +996,25 @@ xcol[1] = PixColors[Color_scroll]; # ifdef PREFER_24BIT - xcol[0].set (this, 65535, 65535, 65535); - /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ + xcol[0].set (display, 65535, 65535, 65535); + /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ # else - xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); + xcol[0].set (display, WhitePixel (display->display, display->screen)); # endif unsigned short pr1, pg1, pb1, pr0, pg0, pb0; - xcol[0].get (this, pr0, pg0, pb0); - xcol[1].get (this, pr1, pg1, pb1); + xcol[0].get (display, pr0, pg0, pb0); + xcol[1].get (display, pr1, pg1, pb1); /* bottomShadowColor */ - if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) + if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) xcol[2] = PixColors[Color_Black]; PixColors[Color_bottomShadow] = xcol[2]; /* topShadowColor */ - if (!xcol[1].set (this, + if (!xcol[1].set (display, min (pr0, max (pr0 / 5, pr1) * 7 / 5), min (pg0, max (pg0 / 5, pg1) * 7 / 5), min (pb0, max (pb0 / 5, pb1) * 7 / 5))) @@ -1047,6 +1041,7 @@ rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; return; #endif + } if (i >= 0 && i <= 7) /* normal colors */ @@ -1078,7 +1073,7 @@ && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) requestedmeta = rsmod[3] - '0'; - map = XGetModifierMapping(Xdisplay); + map = XGetModifierMapping(display->display); kc = map->modifiermap; for (i = 1; i < 6; i++) { @@ -1087,31 +1082,31 @@ { if (kc[k] == 0) break; - switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) + switch (XKeycodeToKeysym(display->display, kc[k], 0)) { - case XK_Num_Lock: - ModNumLockMask = modmasks[i - 1]; - /* FALLTHROUGH */ - default: - continue; /* for(;;) */ - case XK_Meta_L: - case XK_Meta_R: - cm = "meta"; - realmeta = i; - break; - case XK_Alt_L: - case XK_Alt_R: - cm = "alt"; - realalt = i; - break; - case XK_Super_L: - case XK_Super_R: - cm = "super"; - break; - case XK_Hyper_L: - case XK_Hyper_R: - cm = "hyper"; - break; + case XK_Num_Lock: + ModNumLockMask = modmasks[i - 1]; + /* FALLTHROUGH */ + default: + continue; /* for(;;) */ + case XK_Meta_L: + case XK_Meta_R: + cm = "meta"; + realmeta = i; + break; + case XK_Alt_L: + case XK_Alt_R: + cm = "alt"; + realalt = i; + break; + case XK_Super_L: + case XK_Super_R: + cm = "super"; + break; + case XK_Hyper_L: + case XK_Hyper_R: + cm = "hyper"; + break; } if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) requestedmeta = i; @@ -1137,36 +1132,10 @@ XWindowAttributes gattr; - Xcmap = DefaultColormap (Xdisplay, Xscreen); - Xvisual = DefaultVisual (Xdisplay, Xscreen); - Xscreen = DefaultScreen (Xdisplay); - if (Options & Opt_transparent) { - XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); - Xdepth = gattr.depth; - } - else - { - Xdepth = DefaultDepth(Xdisplay, Xscreen); -#ifdef PREFER_24BIT - /* - * If depth is not 24, look for a 24bit visual. - */ - if (Xdepth != 24) - { - XVisualInfo vinfo; - - if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo)) - { - Xdepth = 24; - Xvisual = vinfo.visual; - Xcmap = XCreateColormap(Xdisplay, - RootWindow(Xdisplay, Xscreen), - Xvisual, AllocNone); - } - } -#endif + XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); + display->depth = gattr.depth; // doh //TODO, per-term not per-display? } /* grab colors before netscape does */ @@ -1186,23 +1155,22 @@ attributes.background_pixel = PixColors[Color_fg]; attributes.border_pixel = PixColors[Color_border]; - attributes.colormap = Xcmap; - TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), - szHint.x, szHint.y, - szHint.width, szHint.height, - TermWin.ext_bwidth, - Xdepth, InputOutput, - Xvisual, - CWBackPixel | CWBorderPixel - | CWColormap, &attributes); + attributes.colormap = display->cmap; + TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), + szHint.x, szHint.y, + szHint.width, szHint.height, + TermWin.ext_bwidth, + display->depth, InputOutput, + display->visual, + CWBackPixel | CWBorderPixel | CWColormap, &attributes); #else - TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), - szHint.x, szHint.y, - szHint.width, - szHint.height, - TermWin.ext_bwidth, - PixColors[Color_border], - PixColors[Color_fg]); + TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), + szHint.x, szHint.y, + szHint.width, + szHint.height, + TermWin.ext_bwidth, + PixColors[Color_border], + PixColors[Color_fg]); #endif xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); @@ -1217,48 +1185,50 @@ : NormalState); wmHint.window_group = TermWin.parent[0]; - XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, + XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, (char **)argv, argc, &szHint, &wmHint, &classHint); - XSelectInput(Xdisplay, TermWin.parent[0], - (KeyPressMask + + XSelectInput(display->display, TermWin.parent[0], + KeyPressMask #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - | KeyReleaseMask + | KeyReleaseMask #endif - | FocusChangeMask | VisibilityChangeMask - | StructureNotifyMask)); + | FocusChangeMask | VisibilityChangeMask + | StructureNotifyMask); + termwin_ev.start (display, TermWin.parent[0]); /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); + TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) /* cursor (menuBar/scrollBar): Black-on-White */ - leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); + leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); #endif #ifdef POINTER_BLANK - { XColor blackcolour; blackcolour.red = 0; blackcolour.green = 0; blackcolour.blue = 0; - Font f = XLoadFont (Xdisplay, "fixed"); - blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', - &blackcolour, &blackcolour); - XUnloadFont (Xdisplay, f); + Font f = XLoadFont (display->display, "fixed"); + blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ', + &blackcolour, &blackcolour); + XUnloadFont (display->display, f); } #endif /* the vt window */ - TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], - window_vt_x, window_vt_y, - TermWin_TotalWidth(), - TermWin_TotalHeight(), - 0, - PixColors[Color_fg], - PixColors[Color_bg]); + TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], + window_vt_x, window_vt_y, + TermWin_TotalWidth(), + TermWin_TotalHeight(), + 0, + PixColors[Color_fg], + PixColors[Color_bg]); + #ifdef DEBUG_X - XStoreName(Xdisplay, TermWin.vt, "vt window"); + XStoreName(display->display, TermWin.vt, "vt window"); #endif vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask @@ -1273,30 +1243,32 @@ #endif vt_emask |= (Button1MotionMask | Button3MotionMask); - XSelectInput(Xdisplay, TermWin.vt, vt_emask); + XSelectInput(display->display, TermWin.vt, vt_emask); + vt_ev.start (display, TermWin.vt); #if defined(MENUBAR) && (MENUBAR_MAX > 1) - if (menuBar_height()) { - menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], - window_vt_x, 0, - TermWin_TotalWidth(), - menuBar_TotalHeight(), - 0, - PixColors[Color_fg], - PixColors[Color_scroll]); + menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], + window_vt_x, 0, + TermWin_TotalWidth(), + menuBar_TotalHeight(), + 0, + PixColors[Color_fg], + PixColors[Color_scroll]); #ifdef DEBUG_X - - XStoreName(Xdisplay, menuBar.win, "menubar"); + XStoreName(display->display, menuBar.win, "menubar"); #endif - XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); - XSelectInput(Xdisplay, menuBar.win, + XDefineCursor(display->display, menuBar.win, pointer_leftptr); + + XSelectInput(display->display, menuBar.win, (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); + menubar_ev.start (display, menuBar.win); } #endif + #ifdef XPM_BACKGROUND if (rs[Rs_backgroundPixmap] != NULL && !(Options & Opt_transparent)) @@ -1317,22 +1289,21 @@ gcvalue.foreground = PixColors[Color_fg]; gcvalue.background = PixColors[Color_bg]; gcvalue.graphics_exposures = 1; - TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, - GCForeground | GCBackground - | GCGraphicsExposures, &gcvalue); + TermWin.gc = XCreateGC(display->display, TermWin.vt, + GCForeground | GCBackground + | GCGraphicsExposures, &gcvalue); #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) - gcvalue.foreground = PixColors[Color_topShadow]; - topShadowGC = XCreateGC(Xdisplay, TermWin.vt, - GCForeground, &gcvalue); + topShadowGC = XCreateGC(display->display, TermWin.vt, + GCForeground, &gcvalue); gcvalue.foreground = PixColors[Color_bottomShadow]; - botShadowGC = XCreateGC(Xdisplay, TermWin.vt, - GCForeground, &gcvalue); + botShadowGC = XCreateGC(display->display, TermWin.vt, + GCForeground, &gcvalue); gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg - : Color_scroll)]; - scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, - GCForeground, &gcvalue); + : Color_scroll)]; + scrollbarGC = XCreateGC(display->display, TermWin.vt, + GCForeground, &gcvalue); #endif } @@ -1354,15 +1325,6 @@ return -1; } -#ifdef FD_SETSIZE - if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE) - { - rxvt_print_error("fd too high: %d max", FD_SETSIZE); - rxvt_clean_exit(); - exit(EXIT_FAILURE); - } -#endif - fcntl (cfd, F_SETFL, O_NONBLOCK); /* get slave (tty) */ @@ -1395,50 +1357,50 @@ /* spin off the command interpreter */ switch (cmd_pid = fork ()) { - case -1: - rxvt_print_error("can't fork"); - return -1; - case 0: - close (cfd); /* only keep tty_fd and STDERR open */ - close (Xfd); - if (rxvt_control_tty (tty_fd, ttydev) < 0) - rxvt_print_error ("could not obtain control of tty"); - else + case -1: + rxvt_print_error("can't fork"); + return -1; + case 0: + close (cfd); /* only keep tty_fd and STDERR open */ + + if (rxvt_control_tty (tty_fd, ttydev) < 0) + rxvt_print_error ("could not obtain control of tty"); + else + { + /* Reopen stdin, stdout and stderr over the tty file descriptor */ + dup2 (tty_fd, STDIN_FILENO); + dup2 (tty_fd, STDOUT_FILENO); + dup2 (tty_fd, STDERR_FILENO); + + if (tty_fd > 2) + close (tty_fd); + + run_child (argv); + } + exit (EXIT_FAILURE); + /* NOTREACHED */ + default: { - /* Reopen stdin, stdout and stderr over the tty file descriptor */ - dup2 (tty_fd, STDIN_FILENO); - dup2 (tty_fd, STDOUT_FILENO); - dup2 (tty_fd, STDERR_FILENO); - - if (tty_fd > 2) - close (tty_fd); - - run_child (argv); - } - exit (EXIT_FAILURE); - /* NOTREACHED */ - default: - { #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - int fdstdin; + int fdstdin; - fdstdin = dup (STDIN_FILENO); - dup2 (tty_fd, STDIN_FILENO); + fdstdin = dup (STDIN_FILENO); + dup2 (tty_fd, STDIN_FILENO); #endif #ifdef UTMP_SUPPORT - privileged_utmp (SAVE); + privileged_utmp (SAVE); #endif #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - dup2 (fdstdin, STDIN_FILENO); - close (fdstdin); + dup2 (fdstdin, STDIN_FILENO); + close (fdstdin); #endif - } - close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ - break; + } + close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ + break; } #else /* __QNX__ uses qnxspawn() */ fchmod (tty_fd, 0622); @@ -1482,6 +1444,7 @@ close (fd); } #endif /* SRIOCSREDIR */ + } /* reset signals and spin off the command interpreter */ @@ -1586,8 +1549,8 @@ } iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; cmd_pid = qnx_spawn(0, 0, 0, -1, -1, - _SPAWN_SETSID | _SPAWN_TCSETPGRP, - command, arg_v, environ, iov_a, 0); + _SPAWN_SETSID | _SPAWN_TCSETPGRP, + command, arg_v, environ, iov_a, 0); if (login) free(login);