--- rxvt-unicode/src/init.C 2004/01/31 03:27:45 1.22 +++ rxvt-unicode/src/init.C 2004/02/21 21:43:37 1.29 @@ -328,6 +328,7 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ + }; const char *const xa_names[NUM_XA] = @@ -373,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; @@ -424,8 +425,8 @@ #ifdef MENUBAR menu_readonly = 1; -# if !(MENUBAR_MAX > 1) - CurrentBar = &(BarList); +# if ! (MENUBAR_MAX > 1) + CurrentBar = & (BarList); # endif /* (MENUBAR_MAX > 1) */ #endif @@ -446,6 +447,7 @@ } else #endif /* TTY_GID_SUPPORT */ + { ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; ttygid = getgid (); @@ -475,7 +477,7 @@ if (i == 4 || i == 7) continue; #endif - close(i); + close (i); } #endif } @@ -492,10 +494,10 @@ * Look for -exec option. Find => split and make cmd_argv[] of command args */ for (r_argc = 0; r_argc < argc; r_argc++) - if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) + if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) break; - r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); + r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); for (i = 0; i < r_argc; i++) r_argv[i] = (const char *)argv[i]; @@ -506,7 +508,7 @@ cmd_argv = NULL; else { - cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); + cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); for (i = 0; i < argc - r_argc - 1; i++) cmd_argv[i] = (const char *)argv[i + r_argc + 1]; @@ -518,7 +520,7 @@ for (i = 0; i < NUM_RESOURCES;) rs[i++] = NULL; - rs[Rs_name] = rxvt_r_basename(argv[0]); + rs[Rs_name] = rxvt_r_basename (argv[0]); /* * Open display, get options/resources and create the window @@ -535,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 @@ -555,7 +557,7 @@ if (cmd_argv && cmd_argv[0]) { if (!rs[Rs_title]) - rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); + rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_title]; } @@ -567,23 +569,23 @@ rs[Rs_iconName] = rs[Rs_name]; } - if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) - TermWin.saveLines = BOUND_POSITIVE_INT16(i); + if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) + TermWin.saveLines = BOUND_POSITIVE_INT16 (i); #ifndef NO_FRILLS - if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) - TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ - if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) - TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ + if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) + TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ + if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) + TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ #endif #ifndef NO_LINESPACE - if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) - TermWin.lineSpace = min(i, 100); /* arbitrary limit */ + if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) + TermWin.lineSpace = min (i, 100); /* arbitrary limit */ #endif #ifdef POINTER_BLANK - if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) + if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) pointerBlankDelay = i; else pointerBlankDelay = 2; @@ -604,9 +606,9 @@ #ifdef ACS_ASCII if (!rs[Rs_acs_chars]) rs[Rs_acs_chars] = ACS_CHARS; - if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) + if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20) { - val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); + val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20); for (; i < 0x20; ) val[i] = ' '; rs[Rs_acs_chars] = val; @@ -622,9 +624,9 @@ # endif else { - val = STRDUP(rs[Rs_backspace_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); + val = STRDUP (rs[Rs_backspace_key]); + rxvt_Str_trim (val); + rxvt_Str_escaped (val); key_backspace = val; } #endif @@ -638,32 +640,33 @@ # endif else { - val = STRDUP(rs[Rs_delete_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); + val = STRDUP (rs[Rs_delete_key]); + rxvt_Str_trim (val); + rxvt_Str_escaped (val); key_delete = val; } #endif if (rs[Rs_answerbackstring]) { - rxvt_Str_trim((char *)rs[Rs_answerbackstring]); - rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); + rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); + rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); } if (rs[Rs_selectstyle]) { - if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) + if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0) selection_style = OLD_WORD_SELECT; #ifndef NO_OLD_SELECTION - else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) + 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); @@ -690,7 +693,7 @@ #ifndef XTERM_REVERSE_VIDEO /* this is how we implement reverseVideo */ if (Options & Opt_reverseVideo) - SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); + SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); #endif /* convenient aliases for setting fg/bg to colors */ @@ -723,7 +726,7 @@ /* Fixup display_name for export over pty to any interested terminal * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number * (for the first non-loopback interface) that we get from - * rxvt_network_display(). This is more "name-resolution-portable", if you + * rxvt_network_display (). This is more "name-resolution-portable", if you * will, and probably allows for faster x-client startup if your name * server is beyond a slow link or overloaded at client startup. Of * course that only helps the shell's child processes, not us. @@ -735,22 +738,22 @@ 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 */ i = STRLEN (val); - env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); + env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); sprintf (env_display, "DISPLAY=%s", val); /* avoiding the math library: - * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ + * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) ; - MAX_IT(i, 1); - env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); + MAX_IT (i, 1); + env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); sprintf (env_windowid, "WINDOWID=%u", (unsigned int)TermWin.parent[0]); @@ -761,22 +764,25 @@ * @ COLORTERM: terminal sub-name and also indicates its color * @ TERM: terminal name * @ TERMINFO: path to terminfo directory + * @ COLORFGBG: fg;bg color codes */ putenv (env_display); putenv (env_windowid); + if (env_colorfgbg) + putenv (env_colorfgbg); #ifdef RXVT_TERMINFO putenv ("TERMINFO=" RXVT_TERMINFO); #endif - if (Xdepth <= 2) + if (display->depth <= 2) putenv ("COLORTERM=" COLORTERMENV "-mono"); else putenv ("COLORTERM=" COLORTERMENVFULL); if (rs[Rs_term_name] != NULL) { - env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); + env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -802,12 +808,14 @@ #if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); + SET_LOCALE (this->locale); + mbstate.reset (); #endif #if HAVE_NL_LANGINFO free (codeset); codeset = strdup (nl_langinfo (CODESET)); enc_utf8 = !STRCASECMP (codeset, "UTF-8") - || !STRCASECMP (codeset, "UTF8"); + || !STRCASECMP (codeset, "UTF8"); #else enc_utf8 = 1; #endif @@ -823,10 +831,10 @@ { 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)); + (unsigned char *)locale, STRLEN (locale)); if (!XSupportsLocale ()) { @@ -834,20 +842,17 @@ 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 } /*----------------------------------------------------------------------*/ void -rxvt_term::init_command(const char *const *argv) +rxvt_term::init_command (const char *const *argv) { /* * Initialize the command connection. @@ -856,15 +861,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], - &(xa[XA_WMDELETEWINDOW]), 1); + 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 @@ -873,15 +878,15 @@ get_ourmods (); - if (!(Options & Opt_scrollTtyOutput)) + if (! (Options & Opt_scrollTtyOutput)) PrivateModes |= PrivMode_TtyOutputInh; if (Options & Opt_scrollTtyKeypress) PrivateModes |= PrivMode_Keypress; - if (!(Options & Opt_jumpScroll)) + if (! (Options & Opt_jumpScroll)) PrivateModes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY - if (STRCMP(key_backspace, "DEC") == 0) + if (STRCMP (key_backspace, "DEC") == 0) PrivateModes |= PrivMode_HaveBackSpace; #endif @@ -898,13 +903,10 @@ } #ifdef GREEK_SUPPORT - greek_init(); + greek_init (); #endif - Xfd = XConnectionNumber (Xdisplay); - #ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) (void)gettimeofday (&lastcursorchange, NULL); #endif @@ -933,9 +935,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]; @@ -947,24 +947,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; } } } @@ -1001,25 +1001,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))) @@ -1033,9 +1033,9 @@ /*----------------------------------------------------------------------*/ /* color aliases, fg/bg bright-bold */ void -rxvt_term::color_aliases(int idx) +rxvt_term::color_aliases (int idx) { - if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) + if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) { int i = atoi (rs[Rs_color + idx]); @@ -1046,6 +1046,7 @@ rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; return; #endif + } if (i >= 0 && i <= 7) /* normal colors */ @@ -1074,10 +1075,10 @@ requestedmeta = realmeta = realalt = 0; rsmod = rs[Rs_modifier]; if (rsmod - && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) + && 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++) { @@ -1086,37 +1087,37 @@ { 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) + if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) requestedmeta = i; } } - XFreeModifiermap(map); + XFreeModifiermap (map); i = (requestedmeta ? requestedmeta : (realmeta ? realmeta : (realalt ? realalt : 0))); @@ -1125,7 +1126,7 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_Create_Windows() - Open and map the window */ +/* rxvt_Create_Windows () - Open and map the window */ void rxvt_term::create_windows (int argc, const char *const *argv) { @@ -1136,36 +1137,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 */ @@ -1177,7 +1152,7 @@ old_height = szHint.height; /* parent window - reverse video so we can see placement errors - * sub-window placement & size in rxvt_resize_subwindows() + * sub-window placement & size in rxvt_resize_subwindows () */ #ifdef PREFER_24BIT @@ -1185,23 +1160,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); @@ -1216,48 +1190,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 @@ -1272,37 +1248,39 @@ #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()) + 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)) + && ! (Options & Opt_transparent)) { const char *p = rs[Rs_backgroundPixmap]; - if ((p = STRCHR(p, ';')) != NULL) + if ((p = STRCHR (p, ';')) != NULL) { p++; scale_pixmap (p); @@ -1316,22 +1294,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); - gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg - : Color_scroll)]; - scrollbarGC = 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 (display->display, TermWin.vt, + GCForeground, &gcvalue); #endif } @@ -1347,21 +1324,12 @@ int cfd, er; /* get master (pty) */ - if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) + if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) { - rxvt_print_error("can't open pseudo-tty"); + rxvt_print_error ("can't open pseudo-tty"); 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) */ @@ -1373,73 +1341,75 @@ if ((tty_fd = rxvt_get_tty (ttydev)) < 0) { - close(cfd); - rxvt_print_error("can't open slave tty %s", ttydev); + close (cfd); + rxvt_print_error ("can't open slave tty %s", ttydev); return -1; } } #ifndef NO_BACKSPACE_KEY if (key_backspace[0] && !key_backspace[1]) er = key_backspace[0]; - else if (STRCMP(key_backspace, "DEC") == 0) + else if (STRCMP (key_backspace, "DEC") == 0) er = '\177'; /* the initial state anyway */ else #endif er = -1; - rxvt_get_ttymode (&(tio), er); + rxvt_get_ttymode (& (tio), er); #ifndef __QNX__ /* 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 */ + + init_env (); + + 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() */ +#else /* __QNX__ uses qnxspawn () */ fchmod (tty_fd, 0622); fcntl (tty_fd, F_SETFD, FD_CLOEXEC); fcntl (cfd, F_SETFD, FD_CLOEXEC); @@ -1463,7 +1433,7 @@ { char *login; - SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ + SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */ if (Options & Opt_console) { /* be virtual console, fail silently */ @@ -1481,6 +1451,7 @@ close (fd); } #endif /* SRIOCSREDIR */ + } /* reset signals and spin off the command interpreter */ @@ -1518,33 +1489,33 @@ int i; for (i = 0; argv[i]; i++) - fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); + fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]); # endif - execvp(argv[0], (char *const *)argv); + execvp (argv[0], (char *const *)argv); /* no error message: STDERR is closed! */ } else { const char *argv0, *shell; - if ((shell = getenv("SHELL")) == NULL || *shell == '\0') + if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') shell = "/bin/sh"; - argv0 = (const char *)rxvt_r_basename(shell); + argv0 = (const char *)rxvt_r_basename (shell); if (Options & Opt_loginShell) { - login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); + login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char)); login[0] = '-'; - STRCPY(&login[1], argv0); + STRCPY (&login[1], argv0); argv0 = login; } - execlp(shell, argv0, NULL); + execlp (shell, argv0, NULL); /* no error message: STDERR is closed! */ } -#else /* __QNX__ uses qnxspawn() */ +#else /* __QNX__ uses qnxspawn () */ char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; char *command = NULL, fullcommand[_MAX_PATH]; @@ -1552,15 +1523,15 @@ if (argv != NULL) { - if (access(argv[0], X_OK) == -1) + if (access (argv[0], X_OK) == -1) { - if (STRCHR(argv[0], '/') == NULL) + if (STRCHR (argv[0], '/') == NULL) { - searchenv(argv[0], "PATH", fullcommand); + searchenv (argv[0], "PATH", fullcommand); if (fullcommand[0] != '\0') command = fullcommand; } - if (access(command, X_OK) == -1) + if (access (command, X_OK) == -1) return -1; } else @@ -1569,28 +1540,28 @@ } else { - if ((command = getenv("SHELL")) == NULL || *command == '\0') + if ((command = getenv ("SHELL")) == NULL || *command == '\0') command = "/bin/sh"; - arg_a[0] = my_basename(command); + arg_a[0] = my_basename (command); if (Options & Opt_loginShell) { - login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); + login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char)); login[0] = '-'; - STRCPY(&login[1], arg_a[0]); + STRCPY (&login[1], arg_a[0]); arg_a[0] = login; } arg_v = arg_a; } 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); + cmd_pid = qnx_spawn (0, 0, 0, -1, -1, + _SPAWN_SETSID | _SPAWN_TCSETPGRP, + command, arg_v, environ, iov_a, 0); if (login) - free(login); + free (login); - close(tty_fd); + close (tty_fd); return cmd_fd; #endif @@ -1600,16 +1571,16 @@ /* ------------------------------------------------------------------------- * * GET TTY CURRENT STATE * * ------------------------------------------------------------------------- */ -/* rxvt_get_ttymode() */ +/* rxvt_get_ttymode () */ /* EXTPROTO */ void -rxvt_get_ttymode(ttymode_t *tio, int erase) +rxvt_get_ttymode (ttymode_t *tio, int erase) { #ifdef HAVE_TERMIOS_H /* * standard System V termios interface */ - if (GET_TERMIOS(STDIN_FILENO, tio) < 0) + if (GET_TERMIOS (STDIN_FILENO, tio) < 0) { /* return error - use system defaults */ tio->c_cc[VINTR] = CINTR; @@ -1693,7 +1664,7 @@ */ /* get parameters -- gtty */ - if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) + if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) { tio->sg.sg_erase = CERASE; /* ^H */ tio->sg.sg_kill = CKILL; /* ^U */ @@ -1704,7 +1675,7 @@ tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); /* get special characters */ - if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) + if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) { tio->tc.t_intrc = CINTR; /* ^C */ tio->tc.t_quitc = CQUIT; /* ^\ */ @@ -1714,7 +1685,7 @@ tio->tc.t_brkc = -1; } /* get local special chars */ - if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) + if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) { tio->lc.t_suspc = CSUSP; /* ^Z */ tio->lc.t_dsuspc = CDSUSP; /* ^Y */ @@ -1724,7 +1695,7 @@ tio->lc.t_lnextc = CLNEXT; /* ^V */ } /* get line discipline */ - ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); + ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); # ifdef NTTYDISC tio->line = NTTYDISC; @@ -1739,7 +1710,7 @@ #ifdef DEBUG_TTYMODE #ifdef HAVE_TERMIOS_H /* c_iflag bits */ - fprintf(stderr, "Input flags\n"); + fprintf (stderr, "Input flags\n"); /* cpp token stringize doesn't work on all machines */ # define FOO(flag,name) \ @@ -1747,80 +1718,80 @@ fprintf (stderr, "%s ", name) /* c_iflag bits */ - FOO(IGNBRK, "IGNBRK"); - FOO(BRKINT, "BRKINT"); - FOO(IGNPAR, "IGNPAR"); - FOO(PARMRK, "PARMRK"); - FOO(INPCK, "INPCK"); - FOO(ISTRIP, "ISTRIP"); - FOO(INLCR, "INLCR"); - FOO(IGNCR, "IGNCR"); - FOO(ICRNL, "ICRNL"); - FOO(IXON, "IXON"); - FOO(IXOFF, "IXOFF"); + FOO (IGNBRK, "IGNBRK"); + FOO (BRKINT, "BRKINT"); + FOO (IGNPAR, "IGNPAR"); + FOO (PARMRK, "PARMRK"); + FOO (INPCK, "INPCK"); + FOO (ISTRIP, "ISTRIP"); + FOO (INLCR, "INLCR"); + FOO (IGNCR, "IGNCR"); + FOO (ICRNL, "ICRNL"); + FOO (IXON, "IXON"); + FOO (IXOFF, "IXOFF"); # ifdef IUCLC - FOO(IUCLC, "IUCLC"); + FOO (IUCLC, "IUCLC"); # endif # ifdef IXANY - FOO(IXANY, "IXANY"); + FOO (IXANY, "IXANY"); # endif # ifdef IMAXBEL - FOO(IMAXBEL, "IMAXBEL"); + FOO (IMAXBEL, "IMAXBEL"); # endif - fprintf(stderr, "\n"); + fprintf (stderr, "\n"); # undef FOO # define FOO(entry, name) \ - fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) + fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) - FOO(VINTR, "VINTR"); - FOO(VQUIT, "VQUIT"); - FOO(VERASE, "VERASE"); - FOO(VKILL, "VKILL"); - FOO(VEOF, "VEOF"); - FOO(VEOL, "VEOL"); + FOO (VINTR, "VINTR"); + FOO (VQUIT, "VQUIT"); + FOO (VERASE, "VERASE"); + FOO (VKILL, "VKILL"); + FOO (VEOF, "VEOF"); + FOO (VEOL, "VEOL"); # ifdef VEOL2 - FOO(VEOL2, "VEOL2"); + FOO (VEOL2, "VEOL2"); # endif # ifdef VSWTC - FOO(VSWTC, "VSWTC"); + FOO (VSWTC, "VSWTC"); # endif # ifdef VSWTCH - FOO(VSWTCH, "VSWTCH"); + FOO (VSWTCH, "VSWTCH"); # endif - FOO(VSTART, "VSTART"); - FOO(VSTOP, "VSTOP"); - FOO(VSUSP, "VSUSP"); + FOO (VSTART, "VSTART"); + FOO (VSTOP, "VSTOP"); + FOO (VSUSP, "VSUSP"); # ifdef VDSUSP - FOO(VDSUSP, "VDSUSP"); + FOO (VDSUSP, "VDSUSP"); # endif # ifdef VREPRINT - FOO(VREPRINT, "VREPRINT"); + FOO (VREPRINT, "VREPRINT"); # endif # ifdef VDISCRD - FOO(VDISCRD, "VDISCRD"); + FOO (VDISCRD, "VDISCRD"); # endif # ifdef VWERSE - FOO(VWERSE, "VWERSE"); + FOO (VWERSE, "VWERSE"); # endif # ifdef VLNEXT - FOO(VLNEXT, "VLNEXT"); + FOO (VLNEXT, "VLNEXT"); # endif - fprintf(stderr, "\n"); + fprintf (stderr, "\n"); # undef FOO # endif /* HAVE_TERMIOS_H */ #endif /* DEBUG_TTYMODE */