--- rxvt-unicode/src/init.C 2003/12/02 21:49:46 1.9 +++ rxvt-unicode/src/init.C 2004/03/03 04:07:52 1.38 @@ -1,7 +1,6 @@ /*--------------------------------*-C-*---------------------------------* * File: init.c *----------------------------------------------------------------------* - * $Id: init.C,v 1.9 2003/12/02 21:49:46 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -12,6 +11,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - QNX support + * Copyright (c) 2003-2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -329,14 +329,16 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ + }; const char *const xa_names[NUM_XA] = { + "TEXT", "COMPOUND_TEXT", + "UTF8_STRING", "MULTIPLE", "TARGETS", - "TEXT", "TIMESTAMP", "VT_SELECTION", "INCR", @@ -352,22 +354,19 @@ }; bool -rxvt_term::init_vars() +rxvt_term::init_vars () { PixColors = new rxvt_color [TOTAL_COLORS]; if (PixColors == NULL) return false; #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) - TermWin.pixmap = None; #endif #ifdef UTMP_SUPPORT - next_utmp_action = SAVE; #endif #ifndef NO_SETOWNER_TTYDEV - next_tty_action = SAVE; #endif @@ -376,7 +375,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; @@ -386,38 +385,25 @@ TermWin.lineSpace = LINESPACE; TermWin.saveLines = SAVELINES; numPixColors = TOTAL_COLORS; -#ifndef NO_NEW_SELECTION +#ifndef NO_NEW_SELECTION selection_style = NEW_SELECT; #else - selection_style = OLD_SELECT; #endif -#ifndef NO_BRIGHTCOLOR +#ifndef NO_BRIGHTCOLOR colorfgbg = DEFAULT_RSTYLE; #endif -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) +#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) ks_bigfont = XK_greater; ks_smallfont = XK_less; #endif -#ifdef GREEK_SUPPORT - - ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH; -#endif refresh_limit = 1; refresh_type = SLOW_REFRESH; prev_nrow = prev_ncol = 0; -#ifdef MULTICHAR_SET -# ifdef MULTICHAR_ENCODING - - encoding_method = MULTICHAR_ENCODING; -# endif - - multichar_decode = rxvt_euc2jis; -#endif oldcursor.row = oldcursor.col = -1; #ifdef XPM_BACKGROUND @@ -427,42 +413,37 @@ #endif last_bot = last_state = -1; -#ifdef MENUBAR +#ifdef MENUBAR menu_readonly = 1; -# if !(MENUBAR_MAX > 1) - - CurrentBar = &(BarList); +# if ! (MENUBAR_MAX > 1) + CurrentBar = & (BarList); # endif /* (MENUBAR_MAX > 1) */ #endif return true; } -/* EXTPROTO */ void -rxvt_init_secondary (pR) +rxvt_term::init_secondary () { - int i; + int i; #ifdef TTY_GID_SUPPORT - struct group *gr = getgrnam ("tty"); + struct group *gr = getgrnam ("tty"); if (gr) { /* change group ownership of tty to "tty" */ - R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP; - R->ttygid = gr->gr_gid; + ttymode = S_IRUSR | S_IWUSR | S_IWGRP; + ttygid = gr->gr_gid; } else #endif /* TTY_GID_SUPPORT */ + { - R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; - R->ttygid = getgid (); + ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; + ttygid = getgid (); } -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - R->locale = setlocale (LC_CTYPE, ""); -#endif - /* * Close all unused file descriptors * We don't want them, we don't need them. @@ -479,87 +460,87 @@ } dup2 (STDERR_FILENO, STDOUT_FILENO); -#if 0 // schmorp sayz closing filies is murder - for (i = STDERR_FILENO + 1; i < R->num_fds; i++) +#if 0 // schmorp sayz closing filies is murder + for (i = STDERR_FILENO + 1; i < num_fds; i++) { #ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ if (i == 4 || i == 7) continue; #endif - - close(i); + close (i); } #endif } /*----------------------------------------------------------------------*/ -/* EXTPROTO */ -const char ** -rxvt_init_resources (pR_ int argc, const char *const *argv) +const char ** +rxvt_term::init_resources (int argc, const char *const *argv) { int i, r_argc; char *val; const char **cmd_argv, **r_argv; - const char **rs; /* * 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]; + r_argv[i] = NULL; + if (r_argc == argc) 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]; + cmd_argv[i] = NULL; } /* clear all resources */ - rs = R->rs; 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 */ - if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) + if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) rs[Rs_display_name] = ":0"; - rxvt_get_options(aR_ r_argc, r_argv); - free(r_argv); + get_options (r_argc, r_argv); + free (r_argv); #ifdef LOCAL_X_IS_UNIX - if (rs[Rs_display_name][0] == ':') { - val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name])); - STRCPY(val, "unix"); - STRCAT(val, rs[Rs_display_name]); - R->Xdisplay = XOpenDisplay(val); - free(val); + val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); + STRCPY (val, "unix"); + STRCAT (val, rs[Rs_display_name]); + display = displays.get (val); + free (val); } #endif - if (R->Xdisplay == NULL - && (R->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); + rxvt_print_error ("can't open display %s", rs[Rs_display_name]); + exit (EXIT_FAILURE); } - rxvt_extract_resources(aR_ R->Xdisplay, rs[Rs_name]); + extract_resources (display->display, rs[Rs_name]); /* * set any defaults not already set @@ -567,7 +548,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]; } @@ -578,121 +559,110 @@ if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_name]; } - if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) - R->TermWin.saveLines = BOUND_POSITIVE_INT16(i); -#ifndef NO_FRILLS - if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) - R->TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ - if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) - R->TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ + 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 */ #endif -#ifndef NO_LINESPACE - if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) - R->TermWin.lineSpace = min(i, 100); /* arbitrary limit */ +#ifndef NO_LINESPACE + 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) - R->pointerBlankDelay = i; + if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) + pointerBlankDelay = i; else - R->pointerBlankDelay = 2; + pointerBlankDelay = 2; #endif /* no point having a scrollbar without having any scrollback! */ - if (!R->TermWin.saveLines) - R->Options &= ~Opt_scrollBar; + if (!TermWin.saveLines) + Options &= ~Opt_scrollBar; #ifdef PRINTPIPE - if (!rs[Rs_print_pipe]) rs[Rs_print_pipe] = PRINTPIPE; #endif if (!rs[Rs_cutchars]) rs[Rs_cutchars] = CUTCHARS; -#ifdef ACS_ASCII +#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; } #endif + #ifndef NO_BACKSPACE_KEY if (!rs[Rs_backspace_key]) # ifdef DEFAULT_BACKSPACE - - R->key_backspace = DEFAULT_BACKSPACE; + key_backspace = DEFAULT_BACKSPACE; # else - - R->key_backspace = "DEC"; /* can toggle between \010 or \177 */ + key_backspace = "DEC"; /* can toggle between \010 or \177 */ # endif - else { - val = STRDUP(rs[Rs_backspace_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); - R->key_backspace = val; + val = STRDUP (rs[Rs_backspace_key]); + rxvt_Str_trim (val); + rxvt_Str_escaped (val); + key_backspace = val; } #endif + #ifndef NO_DELETE_KEY if (!rs[Rs_delete_key]) # ifdef DEFAULT_DELETE - - R->key_delete = DEFAULT_DELETE; + key_delete = DEFAULT_DELETE; # else - - R->key_delete = "\033[3~"; + key_delete = "\033[3~"; # endif - else { - val = STRDUP(rs[Rs_delete_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); - R->key_delete = 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) - R->selection_style = OLD_WORD_SELECT; + 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) - R->selection_style = OLD_SELECT; + else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0) + selection_style = OLD_SELECT; #endif } #ifdef HAVE_SCROLLBARS - rxvt_setup_scrollbar(aR_ rs[Rs_scrollBar_align], rs[Rs_scrollstyle], - rs[Rs_scrollBar_thickness]); + setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], + rs[Rs_scrollBar_thickness]); #endif - R->TermWin.fontset = new rxvt_fontset (aR); - R->TermWin.fontset->populate (rs[Rs_font]); - R->TermWin.fwidth = R->TermWin.fontset->base_font ()->width; - R->TermWin.fheight = R->TermWin.fontset->base_font ()->height; - R->TermWin.fbase = R->TermWin.fontset->base_font ()->ascent; - #ifdef XTERM_REVERSE_VIDEO /* this is how xterm implements reverseVideo */ - if (R->Options & Opt_reverseVideo) + if (Options & Opt_reverseVideo) { if (!rs[Rs_color + Color_fg]) rs[Rs_color + Color_fg] = def_colorName[Color_bg]; @@ -707,74 +677,71 @@ #ifndef XTERM_REVERSE_VIDEO /* this is how we implement reverseVideo */ - if (R->Options & Opt_reverseVideo) - SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); + if (Options & Opt_reverseVideo) + SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); #endif /* convenient aliases for setting fg/bg to colors */ - rxvt_color_aliases(aR_ Color_fg); - rxvt_color_aliases(aR_ Color_bg); + color_aliases (Color_fg); + color_aliases (Color_bg); #ifndef NO_CURSORCOLOR - - rxvt_color_aliases(aR_ Color_cursor); - rxvt_color_aliases(aR_ Color_cursor2); + color_aliases (Color_cursor); + color_aliases (Color_cursor2); #endif /* NO_CURSORCOLOR */ - - rxvt_color_aliases(aR_ Color_pointer); - rxvt_color_aliases(aR_ Color_border); + color_aliases (Color_pointer); + color_aliases (Color_border); #ifndef NO_BOLD_UNDERLINE_REVERSE - - rxvt_color_aliases(aR_ Color_BD); - rxvt_color_aliases(aR_ Color_UL); - rxvt_color_aliases(aR_ Color_RV); + color_aliases (Color_BD); + color_aliases (Color_UL); + color_aliases (Color_RV); #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ return cmd_argv; } /*----------------------------------------------------------------------*/ -/* EXTPROTO */ void -rxvt_init_env(pR) +rxvt_term::init_env () { - int i; - unsigned int u; - char *val; + int i; + unsigned int u; + char *val; #ifdef DISPLAY_IS_IP /* 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. * * Giving out the display_name also affords a potential security hole */ - val = rxvt_network_display(R->rs[Rs_display_name]); - R->rs[Rs_display_name] = (const char *)val; + val = rxvt_network_display (rs[Rs_display_name]); + rs[Rs_display_name] = (const char *)val; + if (val == NULL) #endif /* DISPLAY_IS_IP */ + val = XDisplayString (display->display); - val = XDisplayString(R->Xdisplay); - if (R->rs[Rs_display_name] == NULL) - R->rs[Rs_display_name] = val; /* use broken `:0' value */ + if (rs[Rs_display_name] == NULL) + rs[Rs_display_name] = val; /* use broken `:0' value */ - i = STRLEN(val); - R->env_display = (char *)rxvt_malloc((i + 9) * sizeof(char)); + i = STRLEN (val); + env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); - sprintf(R->env_display, "DISPLAY=%s", val); + sprintf (env_display, "DISPLAY=%s", val); /* avoiding the math library: - * i = (int)(ceil(log10((unsigned int)R->TermWin.parent[0]))) */ - for (i = 0, u = (unsigned int)R->TermWin.parent[0]; u; u /= 10, i++) + * 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); - R->env_windowid = (char *)rxvt_malloc((i + 10) * sizeof(char)); + MAX_IT (i, 1); + env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); - sprintf(R->env_windowid, "WINDOWID=%u", - (unsigned int)R->TermWin.parent[0]); + sprintf (env_windowid, "WINDOWID=%u", + (unsigned int)TermWin.parent[0]); /* add entries to the environment: * @ DISPLAY: in case we started with -display @@ -782,32 +749,36 @@ * @ COLORTERM: terminal sub-name and also indicates its color * @ TERM: terminal name * @ TERMINFO: path to terminfo directory + * @ COLORFGBG: fg;bg color codes */ - putenv(R->env_display); - putenv(R->env_windowid); -#ifdef RXVT_TERMINFO + putenv (env_display); + putenv (env_windowid); + if (env_colorfgbg) + putenv (env_colorfgbg); - putenv("TERMINFO=" RXVT_TERMINFO); +#ifdef RXVT_TERMINFO + putenv ("TERMINFO=" RXVT_TERMINFO); #endif - if (XDEPTH <= 2) - putenv("COLORTERM=" COLORTERMENV "-mono"); + if (display->depth <= 2) + putenv ("COLORTERM=" COLORTERMENV "-mono"); else - putenv("COLORTERM=" COLORTERMENVFULL); - if (R->rs[Rs_term_name] != NULL) + putenv ("COLORTERM=" COLORTERMENVFULL); + + if (rs[Rs_term_name] != NULL) { - R->env_term = (char *)rxvt_malloc((STRLEN(R->rs[Rs_term_name]) + 6) * sizeof(char)); - sprintf(R->env_term, "TERM=%s", R->rs[Rs_term_name]); - putenv(R->env_term); + 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); } else - putenv("TERM=" TERMENV); + putenv ("TERM=" TERMENV); #ifdef HAVE_UNSETENV /* avoid passing old settings and confusing term size */ - unsetenv("LINES"); - unsetenv("COLUMNS"); - unsetenv("TERMCAP"); /* terminfo should be okay */ + unsetenv ("LINES"); + unsetenv ("COLUMNS"); + unsetenv ("TERMCAP"); /* terminfo should be okay */ #endif /* HAVE_UNSETENV */ } @@ -816,44 +787,57 @@ * This is more or less stolen straight from XFree86 xterm. * This should support all European type languages. */ -/* EXTPROTO */ void -rxvt_init_xlocale(pR) +rxvt_term::set_locale (const char *locale) +{ +#if HAVE_XSETLOCALE || HAVE_SETLOCALE + free (this->locale); + this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); + 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"); +#else + enc_utf8 = 1; +#endif +} + +void +rxvt_term::init_xlocale () { #ifdef USE_XIM - if (R->locale == NULL) - rxvt_print_error("Setting locale failed."); + if (!locale) + rxvt_print_error ("Setting locale failed."); else { - Atom wmlocale; + Atom wmlocale; - wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); - XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, - XA_STRING, 8, PropModeReplace, - (unsigned char *)R->locale, STRLEN(R->locale)); + wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); + XChangeProperty (display->display, TermWin.parent[0], wmlocale, + XA_STRING, 8, PropModeReplace, + (unsigned char *)locale, STRLEN (locale)); - if (XSupportsLocale() != True) + if (!XSupportsLocale ()) { - rxvt_print_error("The locale is not supported by Xlib"); + rxvt_print_error ("The locale is not supported by Xlib"); return; } - rxvt_setTermFontSet(aR_ 0); - /* see if we can connect yet */ - rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); + im_ev.start (display); - /* To avoid Segmentation Fault in C locale: Solaris only? */ - if (STRCMP(R->locale, "C")) - XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, - rxvt_IMInstantiateCallback, NULL); + /* see if we can connect already */ + im_cb (); } #endif } /*----------------------------------------------------------------------*/ -/* EXTPROTO */ void -rxvt_init_command(pR_ const char *const *argv) +rxvt_term::init_command (const char *const *argv) { /* * Initialize the command connection. @@ -862,59 +846,53 @@ int i; for (i = 0; i < NUM_XA; i++) - R->xa[i] = XInternAtom(R->Xdisplay, xa_names[i], False); + xa[i] = XInternAtom (display->display, xa_names[i], False); /* Enable delete window protocol */ - XSetWMProtocols(R->Xdisplay, R->TermWin.parent[0], - &(R->xa[XA_WMDELETEWINDOW]), 1); + XSetWMProtocols (display->display, TermWin.parent[0], + & (xa[XA_WMDELETEWINDOW]), 1); #ifdef USING_W11LIB /* enable W11 callbacks */ - W11AddEventHandler(R->Xdisplay, rxvt_W11_process_x_event); + W11AddEventHandler (display->display, rxvt_W11_process_x_event); #endif #ifdef META8_OPTION - - R->meta_char = (R->Options & Opt_meta8 ? 0x80 : C0_ESC); + meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); #endif - rxvt_get_ourmods(aR); + get_ourmods (); - if (!(R->Options & Opt_scrollTtyOutput)) - R->PrivateModes |= PrivMode_TtyOutputInh; - if (R->Options & Opt_scrollTtyKeypress) - R->PrivateModes |= PrivMode_Keypress; - if (!(R->Options & Opt_jumpScroll)) - R->PrivateModes |= PrivMode_smoothScroll; -#ifndef NO_BACKSPACE_KEY + if (! (Options & Opt_scrollTtyOutput)) + PrivateModes |= PrivMode_TtyOutputInh; + if (Options & Opt_scrollTtyKeypress) + PrivateModes |= PrivMode_Keypress; + if (! (Options & Opt_jumpScroll)) + PrivateModes |= PrivMode_smoothScroll; - if (STRCMP(R->key_backspace, "DEC") == 0) - R->PrivateModes |= PrivMode_HaveBackSpace; +#ifndef NO_BACKSPACE_KEY + if (STRCMP (key_backspace, "DEC") == 0) + PrivateModes |= PrivMode_HaveBackSpace; #endif + /* add value for scrollBar */ - if (scrollbar_visible(R)) + if (scrollbar_visible ()) { - R->PrivateModes |= PrivMode_scrollBar; - R->SavedModes |= PrivMode_scrollBar; + PrivateModes |= PrivMode_scrollBar; + SavedModes |= PrivMode_scrollBar; } - if (menubar_visible(R)) + if (menubar_visible ()) { - R->PrivateModes |= PrivMode_menuBar; - R->SavedModes |= PrivMode_menuBar; + PrivateModes |= PrivMode_menuBar; + SavedModes |= PrivMode_menuBar; } -#ifdef GREEK_SUPPORT - greek_init(); -#endif - - R->Xfd = XConnectionNumber (R->Xdisplay); #ifdef CURSOR_BLINK - - if (R->Options & Opt_cursorBlink) - (void)gettimeofday(&R->lastcursorchange, NULL); + if (Options & Opt_cursorBlink) + (void)gettimeofday (&lastcursorchange, NULL); #endif - if ((R->cmd_fd = rxvt_run_command (aR_ argv)) < 0) + if ((cmd_fd = run_command (argv)) < 0) { rxvt_print_error ("aborting"); exit (EXIT_FAILURE); @@ -922,67 +900,64 @@ } /*----------------------------------------------------------------------*/ -/* INTPROTO */ void -rxvt_Get_Colours(pR) +rxvt_term::Get_Colours () { - int i; + int i; for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) { - rxvt_color xcol; + rxvt_color xcol; - if (!R->rs[Rs_color + i]) + if (!rs[Rs_color + i]) continue; - if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) + if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) { #ifndef XTERM_REVERSE_VIDEO - if (i < 2 && (R->Options & Opt_reverseVideo)) - { - R->rs[Rs_color + i] = def_colorName[!i]; - } + if (i < 2 && (Options & Opt_reverseVideo)) + rs[Rs_color + i] = def_colorName[!i]; else #endif + rs[Rs_color + i] = def_colorName[i]; - R->rs[Rs_color + i] = def_colorName[i]; - if (!R->rs[Rs_color + i]) + if (!rs[Rs_color + i]) continue; - if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) + + if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) { 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 = R->PixColors[Color_fg]; - break; + case Color_cursor2: + xcol = PixColors[Color_fg]; + break; #endif /* ! NO_CURSORCOLOR */ - - case Color_pointer: - xcol = R->PixColors[Color_fg]; - break; - default: - xcol = R->PixColors[Color_bg]; /* None */ - break; + case Color_pointer: + xcol = PixColors[Color_fg]; + break; + default: + xcol = PixColors[Color_bg]; /* None */ + break; } } } - R->PixColors[i] = xcol; - SET_PIXCOLOR(R, i); + + PixColors[i] = xcol; + SET_PIXCOLOR (i); } - if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) - R->PixColors[Color_pointer] = R->PixColors[Color_fg]; - if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) - R->PixColors[Color_border] = R->PixColors[Color_fg]; + if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) + PixColors[Color_pointer] = PixColors[Color_fg]; + if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) + PixColors[Color_border] = PixColors[Color_fg]; /* * get scrollBar/menuBar shadow colors @@ -994,9 +969,9 @@ if (XDEPTH <= 2) { /* Monochrome */ - R->PixColors[Color_scroll] = R->PixColors[Color_fg]; - R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; - R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; + PixColors[Color_scroll] = PixColors[Color_fg]; + PixColors[Color_topShadow] = PixColors[Color_bg]; + PixColors[Color_bottomShadow] = PixColors[Color_bg]; } else { @@ -1005,61 +980,58 @@ * xcol[1] == top shadow * xcol[2] == bot shadow */ - xcol[1] = R->PixColors[Color_scroll]; + xcol[1] = PixColors[Color_scroll]; # ifdef PREFER_24BIT - - xcol[0].set (r, -1, -1, -1); - /* XFreeColors(R->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 (WhitePixel(R->Xdisplay, Xscreen)); + xcol[0].set (display, WhitePixel (display->display, display->screen)); # endif - unsigned short R1, G1, B1, R0, G0, B0; + unsigned short pr1, pg1, pb1, pr0, pg0, pb0; - xcol[0].get (r, R0, G0, B0); - xcol[1].get (r, R1, G1, B1); + xcol[0].get (display, pr0, pg0, pb0); + xcol[1].get (display, pr1, pg1, pb1); /* bottomShadowColor */ - if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) - xcol[2] = R->PixColors[Color_Black]; + if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) + xcol[2] = PixColors[Color_Black]; - R->PixColors[Color_bottomShadow] = xcol[2]; + PixColors[Color_bottomShadow] = xcol[2]; /* topShadowColor */ - if (!xcol[1].set (aR_ - min (R0, max (R0 / 5, R1) * 7 / 5), - min (G0, max (G0 / 5, G1) * 7 / 5), - min (B0, max (B0 / 5, B1) * 7 / 5))) - xcol[1] = R->PixColors[Color_White]; + 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))) + xcol[1] = PixColors[Color_White]; - R->PixColors[Color_topShadow] = xcol[1]; + PixColors[Color_topShadow] = xcol[1]; } #endif /* KEEP_SCROLLCOLOR */ } /*----------------------------------------------------------------------*/ /* color aliases, fg/bg bright-bold */ -/* INTPROTO */ void -rxvt_color_aliases(pR_ int idx) +rxvt_term::color_aliases (int idx) { - if (R->rs[Rs_color + idx] && isdigit(*(R->rs[Rs_color + idx]))) + if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) { - int i = atoi(R->rs[Rs_color + idx]); + int i = atoi (rs[Rs_color + idx]); if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; #ifndef NO_BRIGHTCOLOR - - R->rs[Rs_color + idx] = R->rs[Rs_color + minBrightCOLOR + i]; + rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; return; #endif } + if (i >= 0 && i <= 7) /* normal colors */ - R->rs[Rs_color + idx] = R->rs[Rs_color + minCOLOR + i]; + rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; } } @@ -1068,9 +1040,8 @@ * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings * Use resource ``modifier'' to override the Meta modifier */ -/* INTPROTO */ void -rxvt_get_ourmods(pR) +rxvt_term::get_ourmods () { int i, j, k; int requestedmeta, realmeta, realalt; @@ -1083,12 +1054,12 @@ }; requestedmeta = realmeta = realalt = 0; - rsmod = R->rs[Rs_modifier]; + 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(R->Xdisplay); + map = XGetModifierMapping (display->display); kc = map->modifiermap; for (i = 1; i < 6; i++) { @@ -1097,256 +1068,236 @@ { if (kc[k] == 0) break; - switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) + switch (XKeycodeToKeysym (display->display, kc[k], 0)) { - case XK_Num_Lock: - R->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))); if (i) - R->ModMetaMask = modmasks[i - 1]; + ModMetaMask = modmasks[i - 1]; } /*----------------------------------------------------------------------*/ -/* rxvt_Create_Windows() - Open and map the window */ -/* EXTPROTO */ +/* rxvt_Create_Windows () - Open and map the window */ void -rxvt_Create_Windows(pR_ int argc, const char *const *argv) +rxvt_term::create_windows (int argc, const char *const *argv) { XClassHint classHint; XWMHints wmHint; XGCValues gcvalue; long vt_emask; -#ifdef PREFER_24BIT - - XSetWindowAttributes attributes; XWindowAttributes gattr; - XCMAP = DefaultColormap(R->Xdisplay, Xscreen); - XVISUAL = DefaultVisual(R->Xdisplay, Xscreen); - - if (R->Options & Opt_transparent) + if (Options & Opt_transparent) { - XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen), - &gattr); - XDEPTH = gattr.depth; + XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); + display->depth = gattr.depth; // doh //TODO, per-term not per-display? } - else - { - XDEPTH = DefaultDepth(R->Xdisplay, Xscreen); - /* - * If depth is not 24, look for a 24bit visual. - */ - if (XDEPTH != 24) - { - XVisualInfo vinfo; - - if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) - { - XDEPTH = 24; - XVISUAL = vinfo.visual; - XCMAP = XCreateColormap(R->Xdisplay, - RootWindow(R->Xdisplay, Xscreen), - XVISUAL, AllocNone); - } - } - } -#endif /* grab colors before netscape does */ - rxvt_Get_Colours(aR); + Get_Colours (); - rxvt_change_font(aR_ 1, NULL); - rxvt_window_calc(aR_ 0, 0); - R->old_width = R->szHint.width; - R->old_height = R->szHint.height; + if (!change_font (rs[Rs_font])) + { + fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); + destroy (); + return; + } + + window_calc (0, 0); + old_width = szHint.width; + 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 + XSetWindowAttributes attributes; - attributes.background_pixel = R->PixColors[Color_fg]; - attributes.border_pixel = R->PixColors[Color_border]; - attributes.colormap = XCMAP; - R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, - R->szHint.x, R->szHint.y, - R->szHint.width, R->szHint.height, - R->TermWin.ext_bwidth, - XDEPTH, InputOutput, - XVISUAL, - CWBackPixel | CWBorderPixel - | CWColormap, &attributes); + attributes.background_pixel = PixColors[Color_fg]; + attributes.border_pixel = PixColors[Color_border]; + 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 - - R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, - R->szHint.x, R->szHint.y, - R->szHint.width, - R->szHint.height, - R->TermWin.ext_bwidth, - R->PixColors[Color_border], - R->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 - rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); - rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); + xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); + xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); - classHint.res_name = (char *)R->rs[Rs_name]; - classHint.res_class = (char *)APL_CLASS; + classHint.res_name = (char *)rs[Rs_name]; + classHint.res_class = (char *)RESCLASS; wmHint.flags = (InputHint | StateHint | WindowGroupHint); wmHint.input = True; - wmHint.initial_state = (R->Options & Opt_iconic ? IconicState + wmHint.initial_state = (Options & Opt_iconic ? IconicState : NormalState); - wmHint.window_group = R->TermWin.parent[0]; + wmHint.window_group = TermWin.parent[0]; + + XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, + (char **)argv, argc, &szHint, &wmHint, &classHint); - XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, - (char **)argv, argc, &R->szHint, &wmHint, &classHint); - XSelectInput(R->Xdisplay, R->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 */ - R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); + TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) /* cursor (menuBar/scrollBar): Black-on-White */ - R->leftptr_cursor = XCreateFontCursor(R->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 (R->Xdisplay, "fixed"); - R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', - &blackcolour, &blackcolour); - XUnloadFont (R->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 */ - R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], - R->window_vt_x, R->window_vt_y, - TermWin_TotalWidth(), - TermWin_TotalHeight(), - 0, - R->PixColors[Color_fg], - R->PixColors[Color_bg]); -#ifdef DEBUG_X + 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]); - XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); +#ifdef DEBUG_X + XStoreName (display->display, TermWin.vt, "vt window"); #endif - R->pointer_unblank (); - vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask); + #ifdef POINTER_BLANK + pointer_unblank (); - if ((R->Options & Opt_pointerBlank)) + if ((Options & Opt_pointerBlank)) vt_emask |= PointerMotionMask; else #endif - vt_emask |= (Button1MotionMask | Button3MotionMask); - XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); -#if defined(MENUBAR) && (MENUBAR_MAX > 1) + XSelectInput (display->display, TermWin.vt, vt_emask); + vt_ev.start (display, TermWin.vt); - if (menuBar_height()) +#if defined(MENUBAR) && (MENUBAR_MAX > 1) + if (menuBar_height ()) { - R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], - R->window_vt_x, 0, - TermWin_TotalWidth(), - menuBar_TotalHeight(), - 0, - R->PixColors[Color_fg], - R->PixColors[Color_scroll]); -#ifdef DEBUG_X + menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], + window_vt_x, 0, + TermWin_TotalWidth (), + menuBar_TotalHeight (), + 0, + PixColors[Color_fg], + PixColors[Color_scroll]); - XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); +#ifdef DEBUG_X + XStoreName (display->display, menuBar.win, "menubar"); #endif - XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); - XSelectInput(R->Xdisplay, R->menuBar.win, + menuBar.drawable = new rxvt_drawable (display, menuBar.win); + + XDefineCursor (display->display, menuBar.win, + XCreateFontCursor (display->display, XC_left_ptr)); + + XSelectInput (display->display, menuBar.win, (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); + menubar_ev.start (display, menuBar.win); } #endif + #ifdef XPM_BACKGROUND - if (R->rs[Rs_backgroundPixmap] != NULL - && !(R->Options & Opt_transparent)) + if (rs[Rs_backgroundPixmap] != NULL + && ! (Options & Opt_transparent)) { - const char *p = R->rs[Rs_backgroundPixmap]; + const char *p = rs[Rs_backgroundPixmap]; - if ((p = STRCHR(p, ';')) != NULL) + if ((p = STRCHR (p, ';')) != NULL) { p++; - rxvt_scale_pixmap(aR_ p); + scale_pixmap (p); } - rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); - rxvt_scr_touch(aR_ True); + set_bgPixmap (rs[Rs_backgroundPixmap]); + scr_touch (True); } #endif /* graphics context for the vt window */ - gcvalue.foreground = R->PixColors[Color_fg]; - gcvalue.background = R->PixColors[Color_bg]; + gcvalue.foreground = PixColors[Color_fg]; + gcvalue.background = PixColors[Color_bg]; gcvalue.graphics_exposures = 1; - R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, - GCForeground | GCBackground - | GCGraphicsExposures, &gcvalue); + TermWin.gc = XCreateGC (display->display, TermWin.vt, + GCForeground | GCBackground + | GCGraphicsExposures, &gcvalue); -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) + TermWin.drawable = new rxvt_drawable (display, TermWin.vt); - gcvalue.foreground = R->PixColors[Color_topShadow]; - R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, - GCForeground, &gcvalue); - gcvalue.foreground = R->PixColors[Color_bottomShadow]; - R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, - GCForeground, &gcvalue); - gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg - : Color_scroll)]; - R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, - GCForeground, &gcvalue); +#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) + gcvalue.foreground = PixColors[Color_topShadow]; + topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + gcvalue.foreground = PixColors[Color_bottomShadow]; + 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 } @@ -1356,108 +1307,103 @@ * master end of the pseudo-teletype pair with the command talking to * the slave. */ -/* INTPROTO */ int -rxvt_run_command(pR_ const char *const *argv) +rxvt_term::run_command (const char *const *argv) { int cfd, er; /* get master (pty) */ - if ((cfd = rxvt_get_pty (&(R->tty_fd), &(R->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 (R->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) */ - if (R->tty_fd < 0) + if (tty_fd < 0) { #ifndef NO_SETOWNER_TTYDEV - rxvt_privileged_ttydev (aR_ SAVE); + privileged_ttydev (SAVE); #endif - if ((R->tty_fd = rxvt_get_tty (R->ttydev)) < 0) + if ((tty_fd = rxvt_get_tty (ttydev)) < 0) { - close(cfd); - rxvt_print_error("can't open slave tty %s", R->ttydev); + close (cfd); + rxvt_print_error ("can't open slave tty %s", ttydev); return -1; } } #ifndef NO_BACKSPACE_KEY - if (R->key_backspace[0] && !R->key_backspace[1]) - er = R->key_backspace[0]; - else if (STRCMP(R->key_backspace, "DEC") == 0) + if (key_backspace[0] && !key_backspace[1]) + er = key_backspace[0]; + else if (STRCMP (key_backspace, "DEC") == 0) er = '\177'; /* the initial state anyway */ else #endif er = -1; - rxvt_get_ttymode (&(R->tio), er); + rxvt_get_ttymode (& (tio), er); #ifndef __QNX__ /* spin off the command interpreter */ - switch (R->cmd_pid = fork ()) + switch (cmd_pid = fork ()) { - case -1: - rxvt_print_error("can't fork"); - return -1; - case 0: - close (cfd); /* only keep R->tty_fd and STDERR open */ - close (R->Xfd); - if (rxvt_control_tty (R->tty_fd, R->ttydev) < 0) - rxvt_print_error ("could not obtain control of tty"); - else - { - /* Reopen stdin, stdout and stderr over the tty file descriptor */ - dup2 (R->tty_fd, STDIN_FILENO); - dup2 (R->tty_fd, STDOUT_FILENO); - dup2 (R->tty_fd, STDERR_FILENO); + case -1: + rxvt_print_error ("can't fork"); + return -1; + case 0: + close (cfd); /* only keep tty_fd and STDERR open */ - if (R->tty_fd > 2) - close (R->tty_fd); + init_env (); - rxvt_run_child (aR_ argv); - } - exit (EXIT_FAILURE); - /* NOTREACHED */ - default: - { + 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: + { #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - int fdstdin; + int fdstdin; + + fdstdin = dup (STDIN_FILENO); + dup2 (tty_fd, STDIN_FILENO); +#endif - fdstdin = dup (STDIN_FILENO); - dup2 (R->tty_fd, STDIN_FILENO); +#ifdef UTMP_SUPPORT + privileged_utmp (SAVE); #endif - rxvt_privileged_utmp (aR_ SAVE); #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - dup2 (fdstdin, STDIN_FILENO); - close (fdstdin); + dup2 (fdstdin, STDIN_FILENO); + close (fdstdin); #endif - } - close (R->tty_fd); /* keep STDERR_FILENO, R->cmd_fd, R->Xfd open */ - break; + } + close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ + break; } -#else /* __QNX__ uses qnxspawn() */ - fchmod (R->tty_fd, 0622); - fcntl (R->tty_fd, F_SETFD, FD_CLOEXEC); +#else /* __QNX__ uses qnxspawn () */ + fchmod (tty_fd, 0622); + fcntl (tty_fd, F_SETFD, FD_CLOEXEC); fcntl (cfd, F_SETFD, FD_CLOEXEC); - if (rxvt_run_child (aR_ argv) == -1) + if (run_child (argv) == -1) exit (EXIT_FAILURE); #endif @@ -1471,22 +1417,20 @@ * The only open file descriptor is the slave tty - so no error messages. * returns are fatal */ -/* INTPROTO */ int -rxvt_run_child(pR_ const char *const *argv) +rxvt_term::run_child (const char *const *argv) { char *login; - SET_TTYMODE (STDIN_FILENO, &(R->tio)); /* init terminal attributes */ + SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */ - if (R->Options & Opt_console) + if (Options & Opt_console) { /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; ioctl (STDIN_FILENO, TIOCCONS, &on); #elif defined (SRIOCSREDIR) - int fd; fd = open (CONSOLE, O_WRONLY, 0); @@ -1508,7 +1452,6 @@ * a shell that wants them can turn them back on */ #ifdef SIGTSTP - signal (SIGTSTP, SIG_IGN); signal (SIGTTIN, SIG_IGN); signal (SIGTTOU, SIG_IGN); @@ -1517,8 +1460,8 @@ /* set window size */ struct winsize ws; - ws.ws_col = R->TermWin.ncol; - ws.ws_row = R->TermWin.nrow; + ws.ws_col = TermWin.ncol; + ws.ws_row = TermWin.nrow; ws.ws_xpixel = ws.ws_ypixel = 0; (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); @@ -1535,79 +1478,81 @@ 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); - if (R->Options & Opt_loginShell) + 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() */ - { - char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - char *command = NULL, fullcommand[_MAX_PATH]; - char **arg_v, *arg_a[2] = { NULL, NULL }; - - if (argv != NULL) - { - if (access(argv[0], X_OK) == -1) - { - if (STRCHR(argv[0], '/') == NULL) - { - searchenv(argv[0], "PATH", fullcommand); - if (fullcommand[0] != '\0') - command = fullcommand; - } - if (access(command, X_OK) == -1) - return -1; - } - else - command = argv[0]; - arg_v = argv; - } - else - { - if ((command = getenv("SHELL")) == NULL || *command == '\0') - command = "/bin/sh"; - arg_a[0] = my_basename(command); - if (R->Options & Opt_loginShell) - { - login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); +#else /* __QNX__ uses qnxspawn () */ + + char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; + char *command = NULL, fullcommand[_MAX_PATH]; + char **arg_v, *arg_a[2] = { NULL, NULL }; + + if (argv != NULL) + { + if (access (argv[0], X_OK) == -1) + { + if (STRCHR (argv[0], '/') == NULL) + { + searchenv (argv[0], "PATH", fullcommand); + if (fullcommand[0] != '\0') + command = fullcommand; + } + if (access (command, X_OK) == -1) + return -1; + } + else + command = argv[0]; + arg_v = argv; + } + else + { + if ((command = getenv ("SHELL")) == NULL || *command == '\0') + command = "/bin/sh"; + + arg_a[0] = my_basename (command); + if (Options & Opt_loginShell) + { + login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char)); + + login[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); + if (login) + free (login); + + close (tty_fd); + return cmd_fd; - login[0] = '-'; - STRCPY(&login[1], arg_a[0]); - arg_a[0] = login; - } - arg_v = arg_a; - } - iov_a[0] = iov_a[1] = iov_a[2] = R->tty_fd; - R->cmd_pid = qnx_spawn(0, 0, 0, -1, -1, - _SPAWN_SETSID | _SPAWN_TCSETPGRP, - command, arg_v, environ, iov_a, 0); - if (login) - free(login); - close(R->tty_fd); - return R->cmd_fd; - } #endif return -1; } @@ -1615,16 +1560,16 @@ /* ------------------------------------------------------------------------- * * GET TTY CURRENT STATE * * ------------------------------------------------------------------------- */ -/* rxvt_get_ttymode() */ -/* INTPROTO */ +/* 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; @@ -1708,7 +1653,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 */ @@ -1719,7 +1664,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; /* ^\ */ @@ -1729,7 +1674,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 */ @@ -1739,7 +1684,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; @@ -1754,7 +1699,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) \ @@ -1762,80 +1707,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 */